From 86ded9ddb375738677904ca83bb0560f0b05ef04 Mon Sep 17 00:00:00 2001 From: Kurounin Date: Tue, 9 Jul 2019 07:33:35 +0300 Subject: [PATCH 1/4] Remove invalid utf8 character Remove the character \u201c90 from installation script which caused an error --- .../hlds_server/egg-custom-h-l-d-s-engine-game.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json b/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json index 040c47a3..3cfe1a7a 100644 --- a/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json +++ b/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# SRCDS Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} +app_set_config \u201c90 mod ${HLDS_GAME} +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", + "script": "#!\/bin\/bash\r\n# SRCDS Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} +app_set_config mod ${HLDS_GAME} +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", "container": "ubuntu:18.04", "entrypoint": "bash" } @@ -60,4 +60,4 @@ "rules": "required|numeric|digits_between:1,5" } ] -} \ No newline at end of file +} From 52c5c6d4b2757279f94280dac3f97e13dc5fdf72 Mon Sep 17 00:00:00 2001 From: Kurounin Date: Mon, 22 Jul 2019 22:38:47 +0300 Subject: [PATCH 2/4] app_set_config 90 --- source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json b/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json index 3cfe1a7a..173dc848 100644 --- a/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json +++ b/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# SRCDS Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} +app_set_config mod ${HLDS_GAME} +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", + "script": "#!\/bin\/bash\r\n# SRCDS Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} +app_set_config 90 mod ${HLDS_GAME} +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", "container": "ubuntu:18.04", "entrypoint": "bash" } From 38a01b229711405ee157819388ff4866bf6e96ef Mon Sep 17 00:00:00 2001 From: Kurounin Date: Tue, 23 Jul 2019 09:49:26 +0300 Subject: [PATCH 3/4] Add MAX_PLAYERS variable --- .../hlds_server/egg-custom-h-l-d-s-engine-game.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json b/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json index 173dc848..692c7aa6 100644 --- a/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json +++ b/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json @@ -8,7 +8,7 @@ "author": "parker@parkervcp.com", "description": "This option allows modifying the startup arguments and other details to run a custom HLDS based game on the panel.", "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", - "startup": ".\/hlds_run -console -game {{HLDS_GAME}} -port {{SERVER_PORT}} -sport {{VAC_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart", + "startup": ".\/hlds_run -console -game {{HLDS_GAME}} -port {{SERVER_PORT}} -sport {{VAC_PORT}} +map {{SRCDS_MAP}} +maxplayers {{MAX_PLAYERS}} +ip 0.0.0.0 -strictportbind -norestart", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Connection to Steam servers successful\",\r\n \"userInteraction\": []\r\n}", @@ -58,6 +58,15 @@ "user_viewable": 1, "user_editable": 0, "rules": "required|numeric|digits_between:1,5" + }, + { + "name": "Max Players", + "description": "Maximum amount of players that can connect to the server.", + "env_variable": "MAX_PLAYERS", + "default_value": "18", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|numeric|digits_between:1,2" } ] } From b7f4a0ec8fbc4459517abf8159dc2ec9d17e37bd Mon Sep 17 00:00:00 2001 From: Kurounin Date: Tue, 23 Jul 2019 15:58:09 +0300 Subject: [PATCH 4/4] Revert commit to add MAX_PLAYERS --- .../hlds_server/egg-custom-h-l-d-s-engine-game.json | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json b/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json index 692c7aa6..173dc848 100644 --- a/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json +++ b/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json @@ -8,7 +8,7 @@ "author": "parker@parkervcp.com", "description": "This option allows modifying the startup arguments and other details to run a custom HLDS based game on the panel.", "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", - "startup": ".\/hlds_run -console -game {{HLDS_GAME}} -port {{SERVER_PORT}} -sport {{VAC_PORT}} +map {{SRCDS_MAP}} +maxplayers {{MAX_PLAYERS}} +ip 0.0.0.0 -strictportbind -norestart", + "startup": ".\/hlds_run -console -game {{HLDS_GAME}} -port {{SERVER_PORT}} -sport {{VAC_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Connection to Steam servers successful\",\r\n \"userInteraction\": []\r\n}", @@ -58,15 +58,6 @@ "user_viewable": 1, "user_editable": 0, "rules": "required|numeric|digits_between:1,5" - }, - { - "name": "Max Players", - "description": "Maximum amount of players that can connect to the server.", - "env_variable": "MAX_PLAYERS", - "default_value": "18", - "user_viewable": 1, - "user_editable": 0, - "rules": "required|numeric|digits_between:1,2" } ] }