From 00d9e3d7a34f3dbc32dc5f084b58d5e019b8873b Mon Sep 17 00:00:00 2001 From: mryoung Date: Sun, 13 Sep 2020 17:42:08 +0200 Subject: [PATCH] Update Variables and startup script --- .../openra_dune2000/egg-open-r-a--dune2000.json | 15 +++------------ openra/openra_red_alert/egg-open-r-a.json | 17 ++++------------- .../egg-open-r-a--tiberian-dawn.json | 15 +++------------ 3 files changed, 10 insertions(+), 37 deletions(-) diff --git a/openra/openra_dune2000/egg-open-r-a--dune2000.json b/openra/openra_dune2000/egg-open-r-a--dune2000.json index 681dd116..05d2ca9a 100644 --- a/openra/openra_dune2000/egg-open-r-a--dune2000.json +++ b/openra/openra_dune2000/egg-open-r-a--dune2000.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-09-13T12:43:08+02:00", + "exported_at": "2020-09-13T17:40:31+02:00", "name": "OpenRA - Dune2000", "author": "patz.michael@gmail.com", "description": "OpenRA is a project that recreates and modernizes the classic Command & Conquer real time strategy games. We have developed a flexible open source game engine (the OpenRA engine) that provides a common platform for rebuilding and reimagining classic 2D and 2.5D RTS games (the OpenRA mods).", "image": "quay.io\/parkervcp\/pterodactyl-images:debian_mono-6-complete", - "startup": ".\/squashfs-root\/AppRun --server Server.Name=\"{{SERVER_NAME}}\" Server.ListenPort={{PORT}} Server.AdvertiseOnline={{PUBLIC}} Server.EnableSingleplayer={{SINGLEPLAYER}} Server.Password=\"{{PASSWORD}}\" Server.EnableGeoIP={{GEOIP}} Server.ShareAnonymizedIPs={{ANONYMOUS}}", + "startup": ".\/squashfs-root\/AppRun --server Server.Name=\"{{SERVER_NAME}}\" Server.ListenPort={{SERVER_PORT}} Server.AdvertiseOnline={{PUBLIC}} Server.EnableSingleplayer={{SINGLEPLAYER}} Server.Password=\"{{PASSWORD}}\" Server.EnableGeoIP={{GEOIP}} Server.ShareAnonymizedIPs={{ANONYMOUS}}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Master server communication established.\",\r\n \"userInteraction\": []\r\n}", @@ -30,16 +30,7 @@ "default_value": "OpenRAServer", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" - }, - { - "name": "Port", - "description": "The Port the server should listen on", - "env_variable": "PORT", - "default_value": "5500", - "user_viewable": true, - "user_editable": false, - "rules": "required|numeric" + "rules": "required|string" }, { "name": "Public Server", diff --git a/openra/openra_red_alert/egg-open-r-a.json b/openra/openra_red_alert/egg-open-r-a.json index 46819d44..0dacccc1 100644 --- a/openra/openra_red_alert/egg-open-r-a.json +++ b/openra/openra_red_alert/egg-open-r-a.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-09-13T12:42:47+02:00", + "exported_at": "2020-09-13T17:40:21+02:00", "name": "OpenRA", "author": "patz.michael@gmail.com", "description": "OpenRA is a project that recreates and modernizes the classic Command & Conquer real time strategy games. We have developed a flexible open source game engine (the OpenRA engine) that provides a common platform for rebuilding and reimagining classic 2D and 2.5D RTS games (the OpenRA mods).", "image": "quay.io\/parkervcp\/pterodactyl-images:debian_mono-6-complete", - "startup": ".\/squashfs-root\/AppRun --server Server.Name=\"{{SERVER_NAME}}\" Server.ListenPort={{PORT}} Server.AdvertiseOnline={{PUBLIC}} Server.EnableSingleplayer={{SINGLEPLAYER}} Server.Password=\"{{PASSWORD}}\" Server.EnableGeoIP={{GEOIP}} Server.ShareAnonymizedIPs={{ANONYMOUS}}", + "startup": ".\/squashfs-root\/AppRun --server Server.Name=\"{{SERVER_NAME}}\" Server.ListenPort={{SERVER_PORT}} Server.AdvertiseOnline={{PUBLIC}} Server.EnableSingleplayer={{SINGLEPLAYER}} Server.Password=\"{{PASSWORD}}\" Server.EnableGeoIP={{GEOIP}} Server.ShareAnonymizedIPs={{ANONYMOUS}}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Master server communication established.\",\r\n \"userInteraction\": []\r\n}", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Vanilla Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n## install packages to get version and download links\r\napt update\r\napt install -y curl wget file jq\r\n\r\ncd \/mnt\/server\/\r\n\r\nif [ -z \"${GITHUB_USER}\" ] && [ -z \"${GITHUB_OAUTH_TOKEN}\" ] ; then\r\n echo -e \"using anon api call\"\r\nelse\r\n echo -e \"user and oauth token set\"\r\n alias curl='curl -u ${GITHUB_USER}:${GITHUB_OAUTH_TOKEN} '\r\nfi\r\n\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_LINK=$(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_LINK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH})\r\n else\r\n echo -e \"defaulting to latest release\"\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\nwget $DOWNLOAD_LINK\r\n\r\n#wget https:\/\/github.com\/OpenRA\/OpenRA\/releases\/download\/release-20200503\/OpenRA-Red-Alert-x86_64.AppImage\r\nchmod +x $MATCH\r\n.\/$MATCH\r\nrm $MATCH\r\nrm *.zsync\r\ncd squashfs-root\r\nchmod +x AppRun", + "script": "#!\/bin\/bash\r\n# Vanilla Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n## install packages to get version and download links\r\napt update\r\napt install -y curl wget file jq\r\n\r\ncd \/mnt\/server\/\r\n\r\nif [ -z \"${GITHUB_USER}\" ] && [ -z \"${GITHUB_OAUTH_TOKEN}\" ] ; then\r\n echo -e \"using anon api call\"\r\nelse\r\n echo -e \"user and oauth token set\"\r\n alias curl='curl -u ${GITHUB_USER}:${GITHUB_OAUTH_TOKEN} '\r\nfi\r\n\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_LINK=$(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_LINK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH})\r\n else\r\n echo -e \"defaulting to latest release\"\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\nwget $DOWNLOAD_LINK\r\n\r\n#wget https:\/\/github.com\/OpenRA\/OpenRA\/releases\/download\/release-20200503\/OpenRA-Red-Alert-x86_64.AppImage\r\nchmod +x $MATCH\r\n.\/$MATCH --appimage-extract\r\nrm $MATCH\r\nrm *.zsync\r\ncd squashfs-root\r\nchmod +x AppRun", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -30,16 +30,7 @@ "default_value": "OpenRAServer", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" - }, - { - "name": "Port", - "description": "The Port the server should listen on", - "env_variable": "PORT", - "default_value": "5500", - "user_viewable": true, - "user_editable": false, - "rules": "required|numeric" + "rules": "required|string" }, { "name": "Public Server", diff --git a/openra/openra_tiberian_dawn/egg-open-r-a--tiberian-dawn.json b/openra/openra_tiberian_dawn/egg-open-r-a--tiberian-dawn.json index 9571d0ad..36b0243f 100644 --- a/openra/openra_tiberian_dawn/egg-open-r-a--tiberian-dawn.json +++ b/openra/openra_tiberian_dawn/egg-open-r-a--tiberian-dawn.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-09-13T12:43:40+02:00", + "exported_at": "2020-09-13T17:40:41+02:00", "name": "OpenRA - Tiberian Dawn", "author": "patz.michael@gmail.com", "description": "OpenRA is a project that recreates and modernizes the classic Command & Conquer real time strategy games. We have developed a flexible open source game engine (the OpenRA engine) that provides a common platform for rebuilding and reimagining classic 2D and 2.5D RTS games (the OpenRA mods).", "image": "quay.io\/parkervcp\/pterodactyl-images:debian_mono-6-complete", - "startup": ".\/squashfs-root\/AppRun --server Server.Name=\"{{SERVER_NAME}}\" Server.ListenPort={{PORT}} Server.AdvertiseOnline={{PUBLIC}} Server.EnableSingleplayer={{SINGLEPLAYER}} Server.Password=\"{{PASSWORD}}\" Server.EnableGeoIP={{GEOIP}} Server.ShareAnonymizedIPs={{ANONYMOUS}}", + "startup": ".\/squashfs-root\/AppRun --server Server.Name=\"{{SERVER_NAME}}\" Server.ListenPort={{SERVER_PORT}} Server.AdvertiseOnline={{PUBLIC}} Server.EnableSingleplayer={{SINGLEPLAYER}} Server.Password=\"{{PASSWORD}}\" Server.EnableGeoIP={{GEOIP}} Server.ShareAnonymizedIPs={{ANONYMOUS}}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Master server communication established.\",\r\n \"userInteraction\": []\r\n}", @@ -30,16 +30,7 @@ "default_value": "OpenRAServer", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" - }, - { - "name": "Port", - "description": "The Port the server should listen on", - "env_variable": "PORT", - "default_value": "5500", - "user_viewable": true, - "user_editable": false, - "rules": "required|numeric" + "rules": "required|string" }, { "name": "Public Server",