From a7f70ab1ca16e25cee81243ec6eb3f0f50db9b9d Mon Sep 17 00:00:00 2001 From: Shigbeard <4262327+Shigbeard@users.noreply.github.com> Date: Wed, 19 Oct 2022 16:54:01 +1100 Subject: [PATCH 1/9] Create ReHLDS from HLDS --- .../hlds_server/rehlds/README.md | 18 ++++ .../egg-custom-re-h-l-d-s-engine-game.json | 97 +++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 game_eggs/steamcmd_servers/hlds_server/rehlds/README.md create mode 100644 game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json diff --git a/game_eggs/steamcmd_servers/hlds_server/rehlds/README.md b/game_eggs/steamcmd_servers/hlds_server/rehlds/README.md new file mode 100644 index 00000000..d511d109 --- /dev/null +++ b/game_eggs/steamcmd_servers/hlds_server/rehlds/README.md @@ -0,0 +1,18 @@ +# HLDS Servers + +This is for older games like CS 1.6 (default game) and other servers that still run on the older HLDS server under id 90 + +# ReHLDS + +ReHLDS is a reverse engineered build of the original HLDS (build 6152/6153), and provides a number of fixes and improvements over the vanilla engine files, while remaining compatible with vanilla clients. +Github:https://github.com/dreamstalker/rehlds + +## Server Ports + +HLDS servers require up to 6 ports + +| Port | default | +|-----------|---------| +| Game/rcon | 27015 | +| HLTV | 27020 | +| VAC | 26900 | diff --git a/game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json b/game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json new file mode 100644 index 00000000..e369925c --- /dev/null +++ b/game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json @@ -0,0 +1,97 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2022-10-19T16:26:34+11:00", + "name": "Custom ReHLDS Engine Game", + "author": "shigbeard@ndlee.com", + "description": "This option allows modifying the startup arguments and other details to run a custom HLDS based game on the panel, substituting the official Valve engine binaries with the ReHLDS binaries.", + "features": [ + "steam_disk_space" + ], + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source" + ], + "file_denylist": [], + "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}", + "logs": "{}", + "stop": "quit" + }, + "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 jq unzip wget\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 +force_install_dir \/mnt\/server +login anonymous +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\r\n\r\n# Github Release Grabber script\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\nelse\r\n VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n if [ \"${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -Ei ${MATCH})\r\n else\r\n echo -e \"defaulting to latest release\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\ncd \/tmp\r\nwget -N $DOWNLOAD_URL\r\nunzip -q $MATCH\r\nrm -fR $MATCH\r\n\r\ncp -r \/tmp\/bin\/linux32\/* \/mnt\/server\r\ncd \/mnt\/server", + "container": "ubuntu:18.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Game ID", + "description": "The ID corresponding to the game to download and run using HLDS.\r\n\r\nThe HLDS server ID is 90. This should not be changed.", + "env_variable": "SRCDS_APPID", + "default_value": "90", + "user_viewable": true, + "user_editable": false, + "rules": "required|numeric|digits_between:1,6" + }, + { + "name": "Game Name", + "description": "The name corresponding to the game to download and run using HLDS.\r\n\r\nall the HLDS server names are here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Server_Name_Enumeration", + "env_variable": "HLDS_GAME", + "default_value": "cstrike", + "user_viewable": true, + "user_editable": false, + "rules": "required|alpha_dash|between:1,100" + }, + { + "name": "Map", + "description": "The default map for the server.", + "env_variable": "SRCDS_MAP", + "default_value": "de_dust2", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|alpha_dash" + }, + { + "name": "VAC port", + "description": "Specifies the VAC port the server should use. Default is 26900.", + "env_variable": "VAC_PORT", + "default_value": "26900", + "user_viewable": true, + "user_editable": false, + "rules": "required|numeric|digits_between:1,5" + }, + { + "name": "Github Package", + "description": "The Github package for ReHLDS to download and install.", + "env_variable": "GITHUB_PACKAGE", + "default_value": "dreamstalker\/rehlds", + "user_viewable": false, + "user_editable": false, + "rules": "required|string" + }, + { + "name": "ReHLDS Version", + "description": "The version of ReHLDS to install, or 'latest' for the latest release.", + "env_variable": "VERSION", + "default_value": "latest", + "user_viewable": false, + "user_editable": false, + "rules": "required|string" + }, + { + "name": "Match", + "description": "The file name to match when downloading the ReHLDS package. Used with 'grep -i'", + "env_variable": "MATCH", + "default_value": "rehlds-bin", + "user_viewable": false, + "user_editable": false, + "rules": "required|string" + } + ] +} \ No newline at end of file From 56292bf00614e54301cf9685fdefe70ee1c2cf4b Mon Sep 17 00:00:00 2001 From: Shigbeard <4262327+Shigbeard@users.noreply.github.com> Date: Wed, 19 Oct 2022 16:56:17 +1100 Subject: [PATCH 2/9] Restructure hlds directory to comply with established structure --- game_eggs/steamcmd_servers/README.md | 2 ++ game_eggs/steamcmd_servers/hlds_server/{ => vanilla}/README.md | 0 .../{ => vanilla}/egg-custom-h-l-d-s-engine-game.json | 0 3 files changed, 2 insertions(+) rename game_eggs/steamcmd_servers/hlds_server/{ => vanilla}/README.md (100%) rename game_eggs/steamcmd_servers/hlds_server/{ => vanilla}/egg-custom-h-l-d-s-engine-game.json (100%) diff --git a/game_eggs/steamcmd_servers/README.md b/game_eggs/steamcmd_servers/README.md index 219e2918..d7abffa9 100644 --- a/game_eggs/steamcmd_servers/README.md +++ b/game_eggs/steamcmd_servers/README.md @@ -63,6 +63,8 @@ This is a collection of servers that use SteamCMD to install. ## HLDS Server [HLDS Server](hlds_server) + * [HLDS Vanilla](hlds_server/vanilla) + * [ReHLDS](hlds_server/rehlds) ## Holdfast: Nations At War diff --git a/game_eggs/steamcmd_servers/hlds_server/README.md b/game_eggs/steamcmd_servers/hlds_server/vanilla/README.md similarity index 100% rename from game_eggs/steamcmd_servers/hlds_server/README.md rename to game_eggs/steamcmd_servers/hlds_server/vanilla/README.md diff --git a/game_eggs/steamcmd_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json b/game_eggs/steamcmd_servers/hlds_server/vanilla/egg-custom-h-l-d-s-engine-game.json similarity index 100% rename from game_eggs/steamcmd_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json rename to game_eggs/steamcmd_servers/hlds_server/vanilla/egg-custom-h-l-d-s-engine-game.json From 75855d7ebf7da7450d9a8f365379f89f5e1e44e3 Mon Sep 17 00:00:00 2001 From: Shigbeard <4262327+Shigbeard@users.noreply.github.com> Date: Wed, 19 Oct 2022 16:59:27 +1100 Subject: [PATCH 3/9] Updated additional README files --- README.md | 2 ++ game_eggs/README.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/README.md b/README.md index 4117c4c6..bab57ea8 100644 --- a/README.md +++ b/README.md @@ -219,6 +219,8 @@ If you are reading this it looks like you are looking to add an egg to your serv * [ECO](game_eggs/steamcmd_servers/eco) * [Fistful of Frags](game_eggs/steamcmd_servers/fof) * [HLDS Server](game_eggs/steamcmd_servers/hlds_server) + * [HLDS Vanilla](game_eggs/steamcmd_servers/hlds_server/vanilla) + * [ReHLDS](game_eggs/steamcmd_servers/hlds_server/rehlds) * [Holdfast: Nations At War](game_eggs/steamcmd_servers/holdfast) * [Hurtworld](game_eggs/steamcmd_servers/hurtworld) * [Insurgency: Sandstorm](game_eggs/steamcmd_servers/insurgency_sandstorm) diff --git a/game_eggs/README.md b/game_eggs/README.md index 517f2c46..dd0fb2d3 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -120,6 +120,8 @@ * [ECO](steamcmd_servers/eco) * [Fistful of Frags](steamcmd_servers/fof) * [HLDS Server](steamcmd_servers/hlds_server) + * [HLDS Vanilla](steamcmd_servers/hlds_server/vanilla) + * [ReHLDS](steamcmd_servers/hlds_server/rehlds) * [Holdfast: Nations At War](steamcmd_servers/holdfast) * [Hurtworld](steamcmd_servers/hurtworld) * [Insurgency: Sandstorm](steamcmd_servers/insurgency_sandstorm) From 2e1de0928059d0cd1154386ae246dba7b881d22f Mon Sep 17 00:00:00 2001 From: Shigbeard <4262327+Shigbeard@users.noreply.github.com> Date: Wed, 19 Oct 2022 17:01:03 +1100 Subject: [PATCH 4/9] Cleaned up formatting --- game_eggs/steamcmd_servers/hlds_server/rehlds/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/hlds_server/rehlds/README.md b/game_eggs/steamcmd_servers/hlds_server/rehlds/README.md index d511d109..58b1b7e2 100644 --- a/game_eggs/steamcmd_servers/hlds_server/rehlds/README.md +++ b/game_eggs/steamcmd_servers/hlds_server/rehlds/README.md @@ -5,7 +5,8 @@ This is for older games like CS 1.6 (default game) and other servers that still # ReHLDS ReHLDS is a reverse engineered build of the original HLDS (build 6152/6153), and provides a number of fixes and improvements over the vanilla engine files, while remaining compatible with vanilla clients. -Github:https://github.com/dreamstalker/rehlds + +Github: https://github.com/dreamstalker/rehlds ## Server Ports From f5dca9b852a3da0339c5cb7003a01f47925dc4a3 Mon Sep 17 00:00:00 2001 From: Shigbeard <4262327+Shigbeard@users.noreply.github.com> Date: Wed, 19 Oct 2022 19:28:21 +1100 Subject: [PATCH 5/9] Implemented end-of-install echo --- .../hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json b/game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json index e369925c..15e3eaf3 100644 --- a/game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json +++ b/game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json @@ -24,7 +24,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 jq unzip wget\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 +force_install_dir \/mnt\/server +login anonymous +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\r\n\r\n# Github Release Grabber script\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\nelse\r\n VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n if [ \"${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -Ei ${MATCH})\r\n else\r\n echo -e \"defaulting to latest release\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\ncd \/tmp\r\nwget -N $DOWNLOAD_URL\r\nunzip -q $MATCH\r\nrm -fR $MATCH\r\n\r\ncp -r \/tmp\/bin\/linux32\/* \/mnt\/server\r\ncd \/mnt\/server", + "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 jq unzip wget\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 +force_install_dir \/mnt\/server +login anonymous +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\r\n\r\n# Github Release Grabber script\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\nelse\r\n VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n if [ \"${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -Ei ${MATCH})\r\n else\r\n echo -e \"defaulting to latest release\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\ncd \/tmp\r\nwget -N $DOWNLOAD_URL\r\nunzip -q $MATCH\r\nrm -fR $MATCH\r\n\r\ncp -r \/tmp\/bin\/linux32\/* \/mnt\/server\r\ncd \/mnt\/server\r\necho \"install complete\"", "container": "ubuntu:18.04", "entrypoint": "bash" } From bdb2539238786ab18bd6b609712ec8559dbb5a09 Mon Sep 17 00:00:00 2001 From: Shigbeard <4262327+Shigbeard@users.noreply.github.com> Date: Wed, 19 Oct 2022 19:30:13 +1100 Subject: [PATCH 6/9] Converted to PTDL_V2 format --- .../egg-custom-re-h-l-d-s-engine-game.json | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json b/game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json index 15e3eaf3..97f74e45 100644 --- a/game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json +++ b/game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json @@ -1,7 +1,7 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1", + "version": "PTDL_v2", "update_url": null }, "exported_at": "2022-10-19T16:26:34+11:00", @@ -11,9 +11,9 @@ "features": [ "steam_disk_space" ], - "images": [ - "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source" - ], + "docker_images": { + "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source" + }, "file_denylist": [], "startup": ".\/hlds_run -console -game {{HLDS_GAME}} -port {{SERVER_PORT}} -sport {{VAC_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart", "config": { @@ -37,7 +37,8 @@ "default_value": "90", "user_viewable": true, "user_editable": false, - "rules": "required|numeric|digits_between:1,6" + "rules": "required|numeric|digits_between:1,6", + "field_type": "text" }, { "name": "Game Name", @@ -46,7 +47,8 @@ "default_value": "cstrike", "user_viewable": true, "user_editable": false, - "rules": "required|alpha_dash|between:1,100" + "rules": "required|alpha_dash|between:1,100", + "field_type": "text" }, { "name": "Map", @@ -55,7 +57,8 @@ "default_value": "de_dust2", "user_viewable": true, "user_editable": true, - "rules": "required|string|alpha_dash" + "rules": "required|string|alpha_dash", + "field_type": "text" }, { "name": "VAC port", @@ -64,7 +67,8 @@ "default_value": "26900", "user_viewable": true, "user_editable": false, - "rules": "required|numeric|digits_between:1,5" + "rules": "required|numeric|digits_between:1,5", + "field_type": "text" }, { "name": "Github Package", @@ -73,7 +77,8 @@ "default_value": "dreamstalker\/rehlds", "user_viewable": false, "user_editable": false, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" }, { "name": "ReHLDS Version", @@ -82,7 +87,8 @@ "default_value": "latest", "user_viewable": false, "user_editable": false, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" }, { "name": "Match", @@ -91,7 +97,8 @@ "default_value": "rehlds-bin", "user_viewable": false, "user_editable": false, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" } ] } \ No newline at end of file From 1fc073222d68bcbe73959888924233e9184a56a2 Mon Sep 17 00:00:00 2001 From: Shigbeard <4262327+Shigbeard@users.noreply.github.com> Date: Wed, 19 Oct 2022 19:32:18 +1100 Subject: [PATCH 7/9] Changed default map and game 'cstrike' and by extension de_dust2 are not shipped by Valve when installing HLDS. 'valve' represents hldm, the default hlds game/mod, and crossfire is a map that ships with that. --- .../hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json b/game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json index 97f74e45..7210c671 100644 --- a/game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json +++ b/game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json @@ -44,7 +44,7 @@ "name": "Game Name", "description": "The name corresponding to the game to download and run using HLDS.\r\n\r\nall the HLDS server names are here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Server_Name_Enumeration", "env_variable": "HLDS_GAME", - "default_value": "cstrike", + "default_value": "valve", "user_viewable": true, "user_editable": false, "rules": "required|alpha_dash|between:1,100", @@ -54,7 +54,7 @@ "name": "Map", "description": "The default map for the server.", "env_variable": "SRCDS_MAP", - "default_value": "de_dust2", + "default_value": "crossfire", "user_viewable": true, "user_editable": true, "rules": "required|string|alpha_dash", From b4e56338034cf2fa197deb7b42d29716d4569aac Mon Sep 17 00:00:00 2001 From: Shigbeard <4262327+Shigbeard@users.noreply.github.com> Date: Wed, 19 Oct 2022 19:50:11 +1100 Subject: [PATCH 8/9] Updated Docker Image to currently maintained yolk Also added a variable to disable update validation, as it appears to be overwriting ReHLDS changes. --- .../rehlds/egg-custom-re-h-l-d-s-engine-game.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json b/game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json index 7210c671..84fb2ca6 100644 --- a/game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json +++ b/game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json @@ -12,7 +12,7 @@ "steam_disk_space" ], "docker_images": { - "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source" + "ghcr.io\/parkervcp\/games:source": "ghcr.io\/parkervcp\/games:source" }, "file_denylist": [], "startup": ".\/hlds_run -console -game {{HLDS_GAME}} -port {{SERVER_PORT}} -sport {{VAC_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart", @@ -99,6 +99,16 @@ "user_editable": false, "rules": "required|string", "field_type": "text" + }, + { + "name": "Validate", + "description": "Validate game files on update. Recommended to turn off with ReHLDS due to SteamCMD overwriting its changes", + "env_variable": "VALIDATE", + "default_value": "0", + "user_viewable": false, + "user_editable": false, + "rules": "required|boolean", + "field_type": "text" } ] } \ No newline at end of file From e5afee53f5086c63bbd96ad87109703c1f191f75 Mon Sep 17 00:00:00 2001 From: Shigbeard <4262327+Shigbeard@users.noreply.github.com> Date: Mon, 24 Oct 2022 20:01:32 +1100 Subject: [PATCH 9/9] Fixed issues with getting ReHLDS releases --- .../egg-custom-re-h-l-d-s-engine-game.json | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json b/game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json index 84fb2ca6..d54856d7 100644 --- a/game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json +++ b/game_eggs/steamcmd_servers/hlds_server/rehlds/egg-custom-re-h-l-d-s-engine-game.json @@ -24,7 +24,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 jq unzip wget\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 +force_install_dir \/mnt\/server +login anonymous +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\r\n\r\n# Github Release Grabber script\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\nelse\r\n VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n if [ \"${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -Ei ${MATCH})\r\n else\r\n echo -e \"defaulting to latest release\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\ncd \/tmp\r\nwget -N $DOWNLOAD_URL\r\nunzip -q $MATCH\r\nrm -fR $MATCH\r\n\r\ncp -r \/tmp\/bin\/linux32\/* \/mnt\/server\r\ncd \/mnt\/server\r\necho \"install complete\"", + "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 jq unzip wget\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 +force_install_dir \/mnt\/server +login anonymous +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\r\n\r\n# Github Release Grabber script\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/dreamstalker\/rehlds\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/dreamstalker\/rehlds\/releases\")\r\nMATCH=\"rehlds-bin\"\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\nelse\r\n VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n if [ \"${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -Ei ${MATCH})\r\n else\r\n echo -e \"defaulting to latest release\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\ncd \/tmp\r\nwget -N $DOWNLOAD_URL -O rehlds-bin.zip\r\nunzip -q -o rehlds-bin.zip\r\n\r\ncp -r \/tmp\/bin\/linux32\/* \/mnt\/server\r\ncd \/mnt\/server\r\necho \"install complete\"", "container": "ubuntu:18.04", "entrypoint": "bash" } @@ -70,16 +70,6 @@ "rules": "required|numeric|digits_between:1,5", "field_type": "text" }, - { - "name": "Github Package", - "description": "The Github package for ReHLDS to download and install.", - "env_variable": "GITHUB_PACKAGE", - "default_value": "dreamstalker\/rehlds", - "user_viewable": false, - "user_editable": false, - "rules": "required|string", - "field_type": "text" - }, { "name": "ReHLDS Version", "description": "The version of ReHLDS to install, or 'latest' for the latest release.", @@ -90,16 +80,6 @@ "rules": "required|string", "field_type": "text" }, - { - "name": "Match", - "description": "The file name to match when downloading the ReHLDS package. Used with 'grep -i'", - "env_variable": "MATCH", - "default_value": "rehlds-bin", - "user_viewable": false, - "user_editable": false, - "rules": "required|string", - "field_type": "text" - }, { "name": "Validate", "description": "Validate game files on update. Recommended to turn off with ReHLDS due to SteamCMD overwriting its changes",