From 823a1fe82b84b9aad1040dcf29eef3287b1a5233 Mon Sep 17 00:00:00 2001 From: Softwarenoob Date: Wed, 4 Aug 2021 04:22:18 +0300 Subject: [PATCH 0001/1001] fix: red bot startup Resolves invalid config path location that terminates the red bot startup. Fixes #1284 --- bots/discord/redbot/egg-red.json | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/bots/discord/redbot/egg-red.json b/bots/discord/redbot/egg-red.json index 499dded3..46dda344 100644 --- a/bots/discord/redbot/egg-red.json +++ b/bots/discord/redbot/egg-red.json @@ -1,13 +1,18 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-04-20T23:06:14-04:00", + "exported_at": "2021-08-04T04:19:56+03:00", "name": "Red", "author": "parker@parkervcp.com", "description": "A multifunction Discord bot \r\n\r\nhttps:\/\/github.com\/Cog-Creators\/Red-DiscordBot", - "image": "quay.io\/parkervcp\/pterodactyl-images:bot_red", + "features": null, + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:bot_red" + ], + "file_denylist": [], "startup": "PATH=$PATH:\/home\/container\/.local\/bin redbot pterodactyl --token {{TOKEN}} --prefix {{PREFIX}}", "config": { "files": "{}", @@ -17,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# red-discordbot install script\r\n\r\n## install deps\r\nmkdir -p \/usr\/share\/man\/man1\r\napt update\r\napt -y install git ca-certificates dnsutils iproute2 make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev libgdbm-dev uuid-dev git openjdk-11-jre\r\n\r\n## config folder layouts\r\necho -e \"generating config folder layout\"\r\nmkdir -p \/mnt\/server\/.config\/{Red-DiscordBot,share}\/ \/mnt\/server\/.local\/share\/Red-DiscordBot\/data\/pterodactyl\/\r\ncd \/mnt\/server\/\r\nln -s .local\/share\/Red-DiscordBot\/data\/pterodactyl\/ .\/configs\r\n\r\n## install red\r\necho -e \"add container user to install\"\r\nln -s \/mnt\/server\/ \/home\/container\r\nuseradd -m -d \/home\/container container\r\nchown -R container \/mnt\/server\/\r\necho -e \"install red locally as user\"\r\nsu - container -c 'pip install -U Red-DiscordBot'\r\n\r\n## ensure the config is in place if it doesn't exist\r\nif [ ! -f \/mnt\/server\/.config\/Red-DiscordBot\/config.json ]; then\r\n curl https:\/\/gist.githubusercontent.com\/parkervcp\/4a5a68aec5a26b35e4315b22dd6d6748\/raw\/a776b1610949dd242ff8ce5cdc8ad7d43e4f7dad\/config.json -o \/mnt\/server\/.config\/Red-DiscordBot\/config.json\r\nfi\r\n\r\necho -e \"install finished\"", + "script": "#!\/bin\/bash\r\n# red-discordbot install script\r\n\r\n## install deps\r\nmkdir -p \/usr\/share\/man\/man1\r\napt update\r\napt -y install git ca-certificates dnsutils iproute2 make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev libgdbm-dev uuid-dev git openjdk-11-jre\r\n\r\n## config folder layouts\r\necho -e \"generating config folder layout\"\r\nmkdir -p \/mnt\/server\/.config\/{Red-DiscordBot,share}\/ \/mnt\/server\/.local\/share\/Red-DiscordBot\/data\/pterodactyl\/\r\ncd \/mnt\/server\/\r\nln -s .local\/share\/Red-DiscordBot\/data\/pterodactyl\/ .\/configs\r\n\r\n## install red\r\necho -e \"add container user to install\"\r\nln -s \/mnt\/server\/ \/home\/container\r\nuseradd -m -d \/home\/container container\r\nchown -R container \/mnt\/server\/\r\necho -e \"install red locally as user\"\r\nsu - container -c 'pip install -U Red-DiscordBot'\r\n\r\n## ensure the config is in place if it doesn't exist\r\nif [ ! -f \/mnt\/server\/.config\/Red-DiscordBot\/config.json ]; then\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/bots\/discord\/redbot\/config.json -o \/mnt\/server\/.config\/Red-DiscordBot\/config.json\r\nfi\r\n\r\necho -e \"install finished\"", "container": "python:3.8-slim", "entrypoint": "bash" } @@ -28,8 +33,8 @@ "description": "Get your own token here - https:\/\/discordapp.com\/developers\/applications\/", "env_variable": "TOKEN", "default_value": "GET_YOUR_OWN", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string" }, { @@ -37,8 +42,8 @@ "description": "The prefix for commands from the bot.", "env_variable": "PREFIX", "default_value": ".", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string" } ] From c7c5622801e052db32ac8ab93c7f5478f85e071c Mon Sep 17 00:00:00 2001 From: Softwarenoob Date: Wed, 4 Aug 2021 05:41:03 +0300 Subject: [PATCH 0002/1001] fix: sogebot install for sogebot v13+ Sogebot now requires Nodejs 16 to build and run and is not backward compatible with previous versions. Didn't add backwards compatibility because of this, but we might have to add version detection for building similar to Spigot? Migrated MATCH and PACKAGE variables into the install script itself to make it cleaner. They're not something the end user needs to see. resolves #1271 --- bots/twitch/sogebot/egg-soge-bot.json | 33 +++++++-------------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/bots/twitch/sogebot/egg-soge-bot.json b/bots/twitch/sogebot/egg-soge-bot.json index be4093d2..8cd97ef6 100644 --- a/bots/twitch/sogebot/egg-soge-bot.json +++ b/bots/twitch/sogebot/egg-soge-bot.json @@ -4,38 +4,30 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-02-08T16:56:23+01:00", + "exported_at": "2021-08-04T05:39:15+03:00", "name": "SogeBot", "author": "info@goover.de", "description": "sogeBot - Free Twitch Bot built on Node.js https:\/\/sogebot.xyz\/", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-14" + "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-16" ], + "file_denylist": [], "startup": "npm start", "config": { "files": "{\r\n \".env\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"PORT\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"WebPanel is available at\"\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", - "stop": "^C" + "logs": "{}", + "stop": "^^C" }, "scripts": { "installation": { - "script": "#\/bin\/bash\r\napt -y update\r\napt -y upgrade\r\napt install -y curl unzip sqlite jq wget python3 build-essential\r\nexport NODE_OPTIONS=--max-old-space-size=8192\r\n\r\ncd \/mnt\/server\r\n\r\nrm -fR dest\r\nrm -fR public\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\n#echo $DOWNLOAD_LINK\r\nwget -N $DOWNLOAD_LINK\r\nunzip -o $MATCH-*.zip\r\nrm -fR $MATCH-*.zip\r\n\r\necho \"Installing depencies...\"\r\n\/usr\/local\/bin\/npm ci 2>&1 | tee npmlog.txt\r\n\r\nexit 0", - "container": "node:14-buster-slim", + "script": "#\/bin\/bash\r\napt -y update\r\napt install -y curl unzip sqlite jq wget python3 build-essential\r\nexport NODE_OPTIONS=--max-old-space-size=8192\r\nMATCH=sogeBot\r\ncd \/mnt\/server\r\n\r\nrm -fR dest\r\nrm -fR public\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/sogehige\/sogeBot\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/sogehige\/sogeBot\/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\necho -e \"Downloading from $DOWNLOAD_LINK\"\r\nwget -N $DOWNLOAD_LINK\r\nunzip -o $MATCH-*.zip\r\nrm -fR $MATCH-*.zip\r\n\r\necho \"Installing dependencies, this will take some time so sit back and relax...\"\r\n\/usr\/local\/bin\/npm ci 2>&1 | tee npmlog.txt\r\n\r\nexit 0", + "container": "node:16-buster-slim", "entrypoint": "bash" } }, "variables": [ - { - "name": "Github Package", - "description": "the Github Package", - "env_variable": "GITHUB_PACKAGE", - "default_value": "sogehige\/sogeBot", - "user_viewable": true, - "user_editable": false, - "rules": "required|string|max:20" - }, { "name": "Version", "description": "Choose Version, you want to install. Default: Latest", @@ -44,15 +36,6 @@ "user_viewable": true, "user_editable": true, "rules": "required|string|max:20" - }, - { - "name": "Filename", - "description": "Filename", - "env_variable": "MATCH", - "default_value": "sogeBot", - "user_viewable": true, - "user_editable": false, - "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From 6e82d5b2df321b062e06046cea818f6067a5637b Mon Sep 17 00:00:00 2001 From: Softwarenoob Date: Sat, 7 Aug 2021 17:17:36 +0300 Subject: [PATCH 0003/1001] refactor: Migrate to Yolks fork based images Migrates to Yolks fork based NodeJS and Python images that are rebuild every Monday to be up-to-date. --- .../discord.js/egg-discord-js-generic.json | 34 +++++++++---------- .../discord.py/egg-discord-py-generic.json | 12 +++---- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/bots/discord/discord.js/egg-discord-js-generic.json b/bots/discord/discord.js/egg-discord-js-generic.json index 8b3e9d7b..0c38dc6f 100644 --- a/bots/discord/discord.js/egg-discord-js-generic.json +++ b/bots/discord/discord.js/egg-discord-js-generic.json @@ -4,17 +4,16 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-06-30T14:47:33+03:00", + "exported_at": "2021-08-07T17:11:56+03:00", "name": "discord.js generic", "author": "parker@parkervcp.com", "description": "a generic discord js bot egg\r\n\r\nThis will clone a git repo for a bot. it defaults to master if no branch is specified.\r\n\r\nInstalls the node_modules on install. If you set user_upload then I assume you know what you are doing.", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-16", - "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-15", - "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-14", - "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-12", - "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-10" + "ghcr.io\/parkervcp\/yolks:nodejs_16", + "ghcr.io\/parkervcp\/yolks:nodejs_15", + "ghcr.io\/parkervcp\/yolks:nodejs_14", + "ghcr.io\/parkervcp\/yolks:nodejs_12" ], "file_denylist": [], "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; if [[ ! -z ${NODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm install ${NODE_PACKAGES}; fi; if [[ ! -z ${UNNODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm uninstall ${UNNODE_PACKAGES}; fi; if [ -f \/home\/container\/package.json ]; then \/usr\/local\/bin\/npm install; fi; \/usr\/local\/bin\/node \/home\/container\/{{BOT_JS_FILE}}", @@ -22,7 +21,7 @@ "files": "{}", "startup": "{\r\n \"done\": \"change this part\"\r\n}", "logs": "{}", - "stop": "^c" + "stop": "^^C" }, "scripts": { "installation": { @@ -31,8 +30,7 @@ "entrypoint": "bash" } }, - "variables": [ - { + "variables": [{ "name": "Git Repo Address", "description": "GitHub Repo to clone\r\n\r\nI.E. https:\/\/github.com\/parkervcp\/repo_name", "env_variable": "GIT_ADDRESS", @@ -86,15 +84,6 @@ "user_editable": true, "rules": "nullable|string" }, - { - "name": "Uninstall Node packages", - "description": "Uninstall node packages.\r\n\r\nUse spaces to separate.", - "env_variable": "UNNODE_PACKAGES", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|string" - }, { "name": "Git Username", "description": "Username to auth with git.", @@ -112,6 +101,15 @@ "user_viewable": true, "user_editable": true, "rules": "nullable|string" + }, + { + "name": "Uninstall Node packages", + "description": "Uninstall node packages.\r\n\r\nUse spaces to separate.", + "env_variable": "UNNODE_PACKAGES", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" } ] } diff --git a/bots/discord/discord.py/egg-discord-py-generic.json b/bots/discord/discord.py/egg-discord-py-generic.json index 3b94d31f..d13e7b48 100644 --- a/bots/discord/discord.py/egg-discord-py-generic.json +++ b/bots/discord/discord.py/egg-discord-py-generic.json @@ -4,15 +4,16 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-07-26T04:36:03+02:00", + "exported_at": "2021-08-07T17:13:40+03:00", "name": "discord.py generic", "author": "parker@parkervcp.com", "description": "A Discord bot written in Python using discord.py\r\n\r\nhttps:\/\/github.com\/Ispira\/pixel-bot", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:debian_python-3.9", - "quay.io\/parkervcp\/pterodactyl-images:debian_python-3.8", - "quay.io\/parkervcp\/pterodactyl-images:debian_python-2.7" + "ghcr.io\/parkervcp\/yolks:python_3.9", + "ghcr.io\/parkervcp\/yolks:python_3.8", + "ghcr.io\/parkervcp\/yolks:python_3.7", + "ghcr.io\/parkervcp\/yolks:python_2.7" ], "file_denylist": [], "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; if [[ ! -z {{PY_PACKAGES}} ]]; then pip install -U --prefix .local {{PY_PACKAGES}}; fi; if [[ -f \/home\/container\/${REQUIREMENTS_FILE} ]]; then pip install -U --prefix .local -r ${REQUIREMENTS_FILE}; fi; \/usr\/local\/bin\/python \/home\/container\/{{BOT_PY_FILE}}", @@ -29,8 +30,7 @@ "entrypoint": "bash" } }, - "variables": [ - { + "variables": [{ "name": "Git Repo Address", "description": "Git repo to clone\r\n\r\nI.E. https:\/\/github.com\/parkervcp\/repo_name", "env_variable": "GIT_ADDRESS", From 7f61ba8693f94ed821b903767c3122f70fdb32db Mon Sep 17 00:00:00 2001 From: TeddyTuned Date: Sun, 8 Aug 2021 20:51:15 -0400 Subject: [PATCH 0004/1001] Changed Minio Start parameters Change Minio Start parameters for latest version of Minio as well as depreciated Old keys for new root user method. --- storage/minio/minio.sh | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/storage/minio/minio.sh b/storage/minio/minio.sh index 777e5abb..9460824b 100644 --- a/storage/minio/minio.sh +++ b/storage/minio/minio.sh @@ -4,31 +4,31 @@ echo "$(tput setaf 2)Starting up...." echo "Startup Type: $(tput setaf 2)$STARTUP_TYPE" if [ -f "keys/key.txt" ]; then echo "$(tput setaf 2)Key file detected..." -export MINIO_ACCESS_KEY=`cat keys/key.txt` +export MINIO_ROOT_USER=`cat keys/key.txt` else echo minioadmin > keys/key.txt echo "$(tput setaf 3)No key file detected...Preparing First Time Boot" fi if [ -f "keys/secret.txt" ]; then echo "$(tput setaf 2)Secret file detected..." -export MINIO_SECRET_KEY=`cat keys/secret.txt` +export MINIO_ROOT_PASSWORD=`cat keys/secret.txt` else echo minioadmin > keys/secret.txt echo "No secret file detected...Preparing First Time Boot" fi if [ -f "keys/oldsecret.txt" ]; then echo "$(tput setaf 1)Old secret file detected..." -export MINIO_SECRET_KEY_OLD=`cat keys/oldsecret.txt` +export MINIO_ROOT_PASSWORD_OLD=`cat keys/oldsecret.txt` fi if [ -f "keys/oldkey.txt" ]; then echo "$(tput setaf 1)Old key file detected..." -export MINIO_ACCESS_KEY_OLD=`cat keys/oldkey.txt` +export MINIO_ROOT_USER_OLD=`cat keys/oldkey.txt` fi if [ -f "keys/justrotated.txt" ]; then echo "$(tput setaf 3)Previous key rotation detected...." echo "$(tput setaf 3)Clearing the Lanes...." -unset MINIO_ACCESS_KEY_OLD -unset MINIO_SECRET_KEY_OLD +unset MINIO_ROOT_USER_OLD +unset MINIO_ROOT_PASSWORD_OLD echo "$(tput setaf 2)Lanes Cleared!" STARTUP_TYPE=normal rm keys/justrotated.txt @@ -49,21 +49,21 @@ fi ########################################## if [ -z "$STARTUP_TYPE" ] || [ "$STARTUP_TYPE" == "rotate" ]; then touch keys/justrotated.txt -export MINIO_ACCESS_KEY_OLD=$MINIO_ACCESS_KEY -echo $MINIO_ACCESS_KEY_OLD > keys/oldkey.txt -export MINIO_SECRET_KEY_OLD=$MINIO_SECRET_KEY -echo $MINIO_SECRET_KEY_OLD > keys/oldsecret.txt -export MINIO_ACCESS_KEY=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1) -echo $MINIO_ACCESS_KEY > keys/key.txt -export MINIO_SECRET_KEY=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1) -echo $MINIO_SECRET_KEY > keys/secret.txt -echo "Your New Access Key is: $(tput setaf 2)$MINIO_ACCESS_KEY" -echo "Your New Secret Key is: $(tput setaf 2)$MINIO_SECRET_KEY" -echo "Your Old Access Key is: $(tput setaf 3)$MINIO_ACCESS_KEY_OLD" -echo "Your Old Access Key is: $(tput setaf 3)$MINIO_SECRET_KEY_OLD" +export MINIO_ROOT_USER_OLD=$MINIO_ROOT_USER +echo $MINIO_ROOT_USER_OLD > keys/oldkey.txt +export MINIO_ROOT_PASSWORD_OLD=$MINIO_ROOT_PASSWORD +echo $MINIO_ROOT_PASSWORD_OLD > keys/oldsecret.txt +export MINIO_ROOT_USER=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1) +echo $MINIO_ROOT_USER > keys/key.txt +export MINIO_ROOT_PASSWORD=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1) +echo $MINIO_ROOT_PASSWORD > keys/secret.txt +echo "Your New Access Key is: $(tput setaf 2)$MINIO_ROOT_USER" +echo "Your New Secret Key is: $(tput setaf 2)$MINIO_ROOT_PASSWORD" +echo "Your Old Access Key is: $(tput setaf 3)$MINIO_ROOT_USER_OLD" +echo "Your Old Access Key is: $(tput setaf 3)$MINIO_ROOT_PASSWORD_OLD" echo "$(tput setaf 2)Booting..." -./minio server data --address 0.0.0.0:$SERVER_PORT +./minio server data --console-address ":$SERVER_PORT" else echo "$(tput setaf 2)Booting..." -./minio server data --address 0.0.0.0:$SERVER_PORT +./minio server data --console-address ":$SERVER_PORT" fi From a12f615fb9a28b7b8a650bb24aa3c002a2427d7f Mon Sep 17 00:00:00 2001 From: TuEye Date: Wed, 18 Aug 2021 18:28:15 +0200 Subject: [PATCH 0005/1001] * Changed startup command to not use script anymore * Changed server startup verification messaage * Changed install container from mono to debian buster slim * Changed install source to compiled mod instead of compiling it when installing the server * Added the possibility to download the latest release from github (default) * Added variables for the savegame format (SterilizerMode) and for the auto portforwarding (AutoPortForward) * Added additional configuration parameters in the default config created by the install script * Removed now unused packages from install script --- .../subnautica_nitrox_mod/egg-subnautica.json | 37 ++++++++++++++----- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/game_eggs/steamcmd_servers/subnautica_nitrox_mod/egg-subnautica.json b/game_eggs/steamcmd_servers/subnautica_nitrox_mod/egg-subnautica.json index 24bf59f3..dadcb60b 100644 --- a/game_eggs/steamcmd_servers/subnautica_nitrox_mod/egg-subnautica.json +++ b/game_eggs/steamcmd_servers/subnautica_nitrox_mod/egg-subnautica.json @@ -4,25 +4,26 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-02-28T17:37:13+01:00", + "exported_at": "2021-08-18T18:12:41+02:00", "name": "Subnautica", "author": "tueye@tuworld.de", - "description": "Subnautica is an open world survival action-adventure video game developed and published by Unknown Worlds Entertainment. In it, players are free to explore the ocean on an alien planet, known as planet 4546B, after their spaceship, the Aurora, crashes on the planet's surface.", + "description": "Subnautica is an open world survival action-adventure video game developed and published by Unknown Worlds Entertainment. In it, players are free to explore the ocean on an alien planet, known as planet 4546B, after their spaceship, the Aurora, crashes on the planet's surface.\r\n\r\nNote: NitroxMod version >=1.5.0.0 is required", "features": null, "images": [ "quay.io\/pterodactyl\/core:mono" ], - "startup": ".\/start.sh", + "file_denylist": [], + "startup": "mono .\/nitrox\/NitroxServer-Subnautica.exe", "config": { - "files": "{\r\n \"server.cfg\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"ServerPort\": \"{{server.build.default.port}}\",\r\n \"SaveInterval\": \"{{server.build.env.SAVE_INTERVAL}}\",\r\n \"DisableAutoSave\": \"{{server.build.env.SAVE_DISABLE}}\",\r\n \"SaveName\": \"{{server.build.env.SAVE_NAME}}\",\r\n \"ServerPassword\": \"{{server.build.env.SUBNAUTICA_PASSWORD}}\",\r\n \"AdminPassword\": \"{{server.build.env.SUBNAUTICA_ADMIN_PASSWORD}}\",\r\n \"GameMode\": \"{{server.build.env.SERVER_MODE}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Server is waiting for players!\"\r\n}", + "files": "{\r\n \"server.cfg\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"ServerPort\": \"{{server.build.default.port}}\",\r\n \"SaveInterval\": \"{{server.build.env.SAVE_INTERVAL}}\",\r\n \"DisableAutoSave\": \"{{server.build.env.SAVE_DISABLE}}\",\r\n \"SaveName\": \"{{server.build.env.SAVE_NAME}}\",\r\n \"ServerPassword\": \"{{server.build.env.SUBNAUTICA_PASSWORD}}\",\r\n \"AdminPassword\": \"{{server.build.env.SUBNAUTICA_ADMIN_PASSWORD}}\",\r\n \"GameMode\": \"{{server.build.env.SERVER_MODE}}\",\r\n \"AutoPortForward\": \"{{server.build.env.PORTFORWARD_ENABLE}}\",\r\n \"SerializerMode\": \"{{server.build.env.SERIALIZER_MODE}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Server started\"\r\n}", "logs": "{}", "stop": "stop" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n# Install dependencies\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates nuget git\r\n\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n\r\n## Install game using steamcmd\r\nGUARDCODE=\"${STEAM_GUARDCODE}\"\r\nif [ -z $GUARDCODE ]\r\nthen\r\n echo \"\"\r\n echo \"### You did not specify a Steam Guardcode\"\r\n echo \"### A new one should be send to you shortly\"\r\n echo \"### Enter it in the startup-config after this installation is finished and reinstall the Server\"\r\n sleep 10\r\n timeout 60 .\/steamcmd.sh +login ${STEAM_USERNAME} ${STEAM_PASSWORD} +quit\r\n exit 1\r\nfi\r\n\r\nmkdir $HOME\/subnautica\r\n.\/steamcmd.sh +set_steam_guard_code ${STEAM_GUARDCODE} +login ${STEAM_USERNAME} ${STEAM_PASSWORD} +@sSteamCmdForcePlatformType windows +force_install_dir $HOME\/subnautica +app_update ${APPID} ${EXTRA_FLAGS} validate +quit\r\nstatus=$?\r\n\r\nif [ $status -ne 0 ]\r\nthen\r\n echo \"\"\r\n echo \"### The Download was not successful\"\r\n echo \"### Probably the entered Guardcode was wrong\"\r\n echo \"### A new one should be send to you shortly\"\r\n echo \"### Enter it in the startup-config after this installation is finished and reinstall the Server\"\r\n sleep 10\r\n sleep 10\r\n timeout 30 .\/steamcmd.sh +login ${STEAM_USERNAME} ${STEAM_PASSWORD} +quit\r\n exit 1\r\nfi\r\n\r\n\r\n## Install Nitrox using git\r\n[ -d \"$HOME\/nitrox\" ] && rm -r $HOME\/nitrox\r\ngit clone --recursive https:\/\/github.com\/SubnauticaNitrox\/Nitrox.git --branch ${NITROX_VERSION} $HOME\/nitrox\r\n\r\n\r\n## set up 32 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n\r\n## Prepare building Nitrox\r\ncd $HOME\/nitrox\r\nnuget restore\r\n\r\n\r\n## Create path files to Subnautica Install-Dir\r\necho \"\/home\/container\/subnautica\" > $HOME\/path.txt\r\ncp $HOME\/nitrox\/DevVars.targets.example $HOME\/nitrox\/DevVars.targets\r\nsed -i 's#C:\\\\Program Files\\\\Epic Games\\\\Subnautica<\/SubnauticaDir>#\/mnt\/server\/subnautica<\/SubnauticaDir>#' $HOME\/nitrox\/DevVars.targets\r\n\r\n\r\n## Build Nitrox\r\nmsbuild\r\n\r\n\r\n## Configure server startup config\r\necho \"#!\/bin\/sh\r\nexport MONO_PATH=$MONO_PATH:\/home\/container\/nitrox\/NitroxModel-Subnautica\/bin\/Debug\/\r\nmono .\/nitrox\/NitroxServer-Subnautica\/bin\/Debug\/NitroxServer-Subnautica.exe\" > \/mnt\/server\/start.sh\r\nchmod +x \/mnt\/server\/start.sh\r\n\r\n\r\n## Create Config\r\nif [ -e $HOME\/server.cfg ]; then\r\n echo \"server settings exists\"\r\nelse\r\n echo \"writing server default settings\"\r\n cat < $HOME\/server.cfg\r\n # Server settings can be changed here\r\n ServerPort=11000\r\n # Measured in milliseconds\r\n SaveInterval=120000\r\n MaxConnections=100\r\n DisableConsole=False\r\n DisableAutoSave=False\r\n SaveName=world\r\n ServerPassword=\r\n AdminPassword=PleaseChangeMe\r\n # Possible values: SURVIVAL, FREEDOM, HARDCORE, CREATIVE\r\n GameMode=SURVIVAL\r\n # Possible values: PROTOBUF, JSON\r\n SerializerMode=PROTOBUF\r\n #\r\n # Default player stats below here\r\n DefaultOxygenValue=45\r\n DefaultMaxOxygenValue=45\r\n DefaultHealthValue=80\r\n DefaultHungerValue=50.5\r\n DefaultThirstValue=90.5\r\n # Recommended to keep at 0.1f which is the default starting value. If set to 0 then new players are cured by default.\r\n DefaultInfectionValue=0.1\r\nEOT\r\nfi", - "container": "mono:latest", + "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n# Install dependencies\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\r\n\r\n## Get latest Nitrox-Mod build\r\nlatest_NitroxMod=$(curl --silent \"https:\/\/api.github.com\/repos\/SubnauticaNitrox\/Nitrox\/releases\/latest\" | grep '\"tag_name\":' | sed -E 's\/.*\"([^\"]+)\".*\/\\1\/')\r\n\r\nif [ -z \"${NITROX_VERSION}\" ] || [ \"${NITROX_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=$latest_NitroxMod\r\nelse\r\n DL_VERSION=${NITROX_VERSION}\r\nfi\r\n\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n\r\n## Install game using steamcmd\r\nGUARDCODE=\"${STEAM_GUARDCODE}\"\r\nif [ -z $GUARDCODE ]\r\nthen\r\n echo \"\"\r\n echo \"### You did not specify a Steam Guardcode\"\r\n echo \"### A new one should be send to you shortly\"\r\n echo \"### Enter it in the startup-config after this installation is finished and reinstall the Server\"\r\n sleep 10\r\n timeout 60 .\/steamcmd.sh +login ${STEAM_USERNAME} ${STEAM_PASSWORD} +quit\r\n exit 1\r\nfi\r\n\r\n[ -d \"$HOME\/subnautica\" ] && mkdir $HOME\/subnautica\r\n.\/steamcmd.sh +set_steam_guard_code ${STEAM_GUARDCODE} +login ${STEAM_USERNAME} ${STEAM_PASSWORD} +@sSteamCmdForcePlatformType windows +force_install_dir $HOME\/subnautica +app_update ${APPID} ${EXTRA_FLAGS} validate +quit\r\nstatus=$?\r\n\r\nif [ $status -ne 0 ]\r\nthen\r\n echo \"\"\r\n echo \"### The Download was not successful\"\r\n echo \"### Probably the entered Guardcode was wrong\"\r\n echo \"### A new one should be send to you shortly\"\r\n echo \"### Enter it in the startup-config after this installation is finished and reinstall the Server\"\r\n sleep 10\r\n sleep 10\r\n timeout 30 .\/steamcmd.sh +login ${STEAM_USERNAME} ${STEAM_PASSWORD} +quit\r\n exit 1\r\nfi\r\n\r\n\r\n## set up 32 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n\r\n## Download and extract Nitrox\r\n[ -d \"$HOME\/nitrox\" ] && rm -r $HOME\/nitrox\r\nmkdir $HOME\/nitrox\r\ncd $HOME\/nitrox\r\ncurl -sL https:\/\/github.com\/SubnauticaNitrox\/Nitrox\/releases\/download\/${DL_VERSION}\/Nitrox.${DL_VERSION}.zip -o Nitrox.${DL_VERSION}.zip\r\nunzip $HOME\/nitrox\/Nitrox.${DL_VERSION}.zip\r\n\r\n\r\n## Create path files to Subnautica Install-Dir\r\necho \"\/home\/container\/subnautica\" > $HOME\/path.txt\r\n\r\n\r\n## Create config\r\nif [ -e $HOME\/server.cfg ]; then\r\n echo \"server settings exists\"\r\nelse\r\n echo \"writing server default settings\"\r\n cat < $HOME\/server.cfg\r\n # Server settings can be changed here\r\n # Leave blank for a random spawn position\r\n Seed=\r\n ServerPort=11000\r\n # Measured in milliseconds\r\n SaveInterval=120000\r\n # Command to run following a successful world save (e.g. .exe, .bat, or PowerShell script). \r\n PostSaveCommandPath=\r\n MaxConnections=100\r\n DisableConsole=False\r\n DisableAutoSave=False\r\n SaveName=world\r\n ServerPassword=\r\n AdminPassword=PleaseChangeMe\r\n # Possible values: SURVIVAL, FREEDOM, HARDCORE, CREATIVE\r\n GameMode=SURVIVAL\r\n # Possible values: PROTOBUF, JSON\r\n SerializerMode=JSON\r\n # Possible values: NONE, PLAYER, MODERATOR, ADMIN, CONSOLE\r\n DefaultPlayerPerm=PLAYER\r\n #\r\n # Default player stats below here\r\n DefaultOxygenValue=45\r\n DefaultMaxOxygenValue=45\r\n DefaultHealthValue=80\r\n DefaultHungerValue=50.5\r\n DefaultThirstValue=90.5\r\n # Recommended to keep at 0.1f which is the default starting value. If set to 0 then new players are cured by default.\r\n DefaultInfectionValue=0.1\r\n # If set to true, the server will try to open port on your router via UPnP\r\n AutoPortForward=False\r\nEOT\r\nfi", + "container": "debian:buster-slim", "entrypoint": "bash" } }, @@ -65,9 +66,9 @@ }, { "name": "Nitrox Version", - "description": "Which version of Nitrox to install and use. Enter Github tags or branch name.", + "description": "Which version of Nitrox to install and use. Use the version e.g. 1.5.0.1 or latest for the newest release", "env_variable": "NITROX_VERSION", - "default_value": "1.4.0.0", + "default_value": "latest", "user_viewable": true, "user_editable": true, "rules": "required|string|between:3,12" @@ -125,6 +126,24 @@ "user_viewable": true, "user_editable": true, "rules": "required|string|in:SURVIVAL,FREEDOM,HARDCORE,CREATIVE" + }, + { + "name": "Auto Portforward via UPnP", + "description": "If set to true, the server will try to open port on your router via UPnP", + "env_variable": "PORTFORWARD_ENABLE", + "default_value": "False", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|in:True,False" + }, + { + "name": "Serializer Mode", + "description": "Switch between savegame formats.\r\nPossible values: PROTOBUF, JSON", + "env_variable": "SERIALIZER_MODE", + "default_value": "JSON", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|in:PROTOBUF,JSON" } ] } \ No newline at end of file From 1fde02871a3bb0c484bd7d50a9582289f69c104b Mon Sep 17 00:00:00 2001 From: TuEye Date: Wed, 18 Aug 2021 18:32:56 +0200 Subject: [PATCH 0006/1001] * Added note regarding the minimal version of Nitrox required to use this egg --- game_eggs/steamcmd_servers/subnautica_nitrox_mod/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/game_eggs/steamcmd_servers/subnautica_nitrox_mod/README.md b/game_eggs/steamcmd_servers/subnautica_nitrox_mod/README.md index bdb077f8..e780fdf0 100644 --- a/game_eggs/steamcmd_servers/subnautica_nitrox_mod/README.md +++ b/game_eggs/steamcmd_servers/subnautica_nitrox_mod/README.md @@ -12,6 +12,9 @@ Once the initial installation is complete, you will need to enter the Steamguard This will only work if you receive Steamguard codes via mail. The Authenticator app is not supported. +**NOTE** +NitroxMod version >=1.5.0.0 is required for this egg + ## Server Ports The nitrox server requires only the default Server port. From 42c03f1d81838472aff24eda5a460b0daba779b9 Mon Sep 17 00:00:00 2001 From: TuEye Date: Wed, 18 Aug 2021 21:33:17 +0200 Subject: [PATCH 0007/1001] * Added libsdl2-2.0-0:i386 to get rid of the "Failed to init SDL priority manager: SDL not found" warning * Added a few checks if folders exist before they get deleted/created --- .../subnautica_nitrox_mod/egg-subnautica.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/subnautica_nitrox_mod/egg-subnautica.json b/game_eggs/steamcmd_servers/subnautica_nitrox_mod/egg-subnautica.json index dadcb60b..77c00477 100644 --- a/game_eggs/steamcmd_servers/subnautica_nitrox_mod/egg-subnautica.json +++ b/game_eggs/steamcmd_servers/subnautica_nitrox_mod/egg-subnautica.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-08-18T18:12:41+02:00", + "exported_at": "2021-08-18T21:29:22+02:00", "name": "Subnautica", "author": "tueye@tuworld.de", "description": "Subnautica is an open world survival action-adventure video game developed and published by Unknown Worlds Entertainment. In it, players are free to explore the ocean on an alien planet, known as planet 4546B, after their spaceship, the Aurora, crashes on the planet's surface.\r\n\r\nNote: NitroxMod version >=1.5.0.0 is required", @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n# Install dependencies\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\r\n\r\n## Get latest Nitrox-Mod build\r\nlatest_NitroxMod=$(curl --silent \"https:\/\/api.github.com\/repos\/SubnauticaNitrox\/Nitrox\/releases\/latest\" | grep '\"tag_name\":' | sed -E 's\/.*\"([^\"]+)\".*\/\\1\/')\r\n\r\nif [ -z \"${NITROX_VERSION}\" ] || [ \"${NITROX_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=$latest_NitroxMod\r\nelse\r\n DL_VERSION=${NITROX_VERSION}\r\nfi\r\n\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n\r\n## Install game using steamcmd\r\nGUARDCODE=\"${STEAM_GUARDCODE}\"\r\nif [ -z $GUARDCODE ]\r\nthen\r\n echo \"\"\r\n echo \"### You did not specify a Steam Guardcode\"\r\n echo \"### A new one should be send to you shortly\"\r\n echo \"### Enter it in the startup-config after this installation is finished and reinstall the Server\"\r\n sleep 10\r\n timeout 60 .\/steamcmd.sh +login ${STEAM_USERNAME} ${STEAM_PASSWORD} +quit\r\n exit 1\r\nfi\r\n\r\n[ -d \"$HOME\/subnautica\" ] && mkdir $HOME\/subnautica\r\n.\/steamcmd.sh +set_steam_guard_code ${STEAM_GUARDCODE} +login ${STEAM_USERNAME} ${STEAM_PASSWORD} +@sSteamCmdForcePlatformType windows +force_install_dir $HOME\/subnautica +app_update ${APPID} ${EXTRA_FLAGS} validate +quit\r\nstatus=$?\r\n\r\nif [ $status -ne 0 ]\r\nthen\r\n echo \"\"\r\n echo \"### The Download was not successful\"\r\n echo \"### Probably the entered Guardcode was wrong\"\r\n echo \"### A new one should be send to you shortly\"\r\n echo \"### Enter it in the startup-config after this installation is finished and reinstall the Server\"\r\n sleep 10\r\n sleep 10\r\n timeout 30 .\/steamcmd.sh +login ${STEAM_USERNAME} ${STEAM_PASSWORD} +quit\r\n exit 1\r\nfi\r\n\r\n\r\n## set up 32 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n\r\n## Download and extract Nitrox\r\n[ -d \"$HOME\/nitrox\" ] && rm -r $HOME\/nitrox\r\nmkdir $HOME\/nitrox\r\ncd $HOME\/nitrox\r\ncurl -sL https:\/\/github.com\/SubnauticaNitrox\/Nitrox\/releases\/download\/${DL_VERSION}\/Nitrox.${DL_VERSION}.zip -o Nitrox.${DL_VERSION}.zip\r\nunzip $HOME\/nitrox\/Nitrox.${DL_VERSION}.zip\r\n\r\n\r\n## Create path files to Subnautica Install-Dir\r\necho \"\/home\/container\/subnautica\" > $HOME\/path.txt\r\n\r\n\r\n## Create config\r\nif [ -e $HOME\/server.cfg ]; then\r\n echo \"server settings exists\"\r\nelse\r\n echo \"writing server default settings\"\r\n cat < $HOME\/server.cfg\r\n # Server settings can be changed here\r\n # Leave blank for a random spawn position\r\n Seed=\r\n ServerPort=11000\r\n # Measured in milliseconds\r\n SaveInterval=120000\r\n # Command to run following a successful world save (e.g. .exe, .bat, or PowerShell script). \r\n PostSaveCommandPath=\r\n MaxConnections=100\r\n DisableConsole=False\r\n DisableAutoSave=False\r\n SaveName=world\r\n ServerPassword=\r\n AdminPassword=PleaseChangeMe\r\n # Possible values: SURVIVAL, FREEDOM, HARDCORE, CREATIVE\r\n GameMode=SURVIVAL\r\n # Possible values: PROTOBUF, JSON\r\n SerializerMode=JSON\r\n # Possible values: NONE, PLAYER, MODERATOR, ADMIN, CONSOLE\r\n DefaultPlayerPerm=PLAYER\r\n #\r\n # Default player stats below here\r\n DefaultOxygenValue=45\r\n DefaultMaxOxygenValue=45\r\n DefaultHealthValue=80\r\n DefaultHungerValue=50.5\r\n DefaultThirstValue=90.5\r\n # Recommended to keep at 0.1f which is the default starting value. If set to 0 then new players are cured by default.\r\n DefaultInfectionValue=0.1\r\n # If set to true, the server will try to open port on your router via UPnP\r\n AutoPortForward=False\r\nEOT\r\nfi", + "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n# Install dependencies\r\ndpkg --add-architecture i386\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates libsdl2-2.0-0:i386\r\n\r\n## Get latest Nitrox-Mod build\r\nlatest_NitroxMod=$(curl --silent \"https:\/\/api.github.com\/repos\/SubnauticaNitrox\/Nitrox\/releases\/latest\" | grep '\"tag_name\":' | sed -E 's\/.*\"([^\"]+)\".*\/\\1\/')\r\n\r\nif [ -z \"${NITROX_VERSION}\" ] || [ \"${NITROX_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=$latest_NitroxMod\r\nelse\r\n DL_VERSION=${NITROX_VERSION}\r\nfi\r\n\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n\r\n## Install game using steamcmd\r\nGUARDCODE=\"${STEAM_GUARDCODE}\"\r\nif [ -z $GUARDCODE ]\r\nthen\r\n echo \"\"\r\n echo \"### You did not specify a Steam Guardcode\"\r\n echo \"### A new one should be send to you shortly\"\r\n echo \"### Enter it in the startup-config after this installation is finished and reinstall the Server\"\r\n sleep 10\r\n timeout 60 .\/steamcmd.sh +login ${STEAM_USERNAME} ${STEAM_PASSWORD} +quit\r\n exit 1\r\nfi\r\n\r\n[ ! -d \"$HOME\/subnautica\" ] && mkdir $HOME\/subnautica\r\n.\/steamcmd.sh +set_steam_guard_code ${STEAM_GUARDCODE} +login ${STEAM_USERNAME} ${STEAM_PASSWORD} +@sSteamCmdForcePlatformType windows +force_install_dir $HOME\/subnautica +app_update ${APPID} ${EXTRA_FLAGS} validate +quit\r\nstatus=$?\r\n\r\nif [ $status -ne 0 ]\r\nthen\r\n echo \"\"\r\n echo \"### The Download was not successful\"\r\n echo \"### Probably the entered Guardcode was wrong\"\r\n echo \"### A new one should be send to you shortly\"\r\n echo \"### Enter it in the startup-config after this installation is finished and reinstall the Server\"\r\n sleep 10\r\n sleep 10\r\n timeout 30 .\/steamcmd.sh +login ${STEAM_USERNAME} ${STEAM_PASSWORD} +quit\r\n exit 1\r\nfi\r\n\r\n\r\n## set up 32 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n\r\n## Download and extract Nitrox\r\n[ -d \"$HOME\/nitrox\" ] && rm -r $HOME\/nitrox\r\nmkdir $HOME\/nitrox\r\ncd $HOME\/nitrox\r\ncurl -sL https:\/\/github.com\/SubnauticaNitrox\/Nitrox\/releases\/download\/${DL_VERSION}\/Nitrox.${DL_VERSION}.zip -o Nitrox.${DL_VERSION}.zip\r\nunzip $HOME\/nitrox\/Nitrox.${DL_VERSION}.zip\r\n\r\n\r\n## Create path files to Subnautica Install-Dir\r\necho \"\/home\/container\/subnautica\" > $HOME\/path.txt\r\n\r\n\r\n## Create config\r\nif [ -e $HOME\/server.cfg ]; then\r\n echo \"server settings exists\"\r\nelse\r\n echo \"writing server default settings\"\r\n cat < $HOME\/server.cfg\r\n # Server settings can be changed here\r\n # Leave blank for a random spawn position\r\n Seed=\r\n ServerPort=11000\r\n # Measured in milliseconds\r\n SaveInterval=120000\r\n # Command to run following a successful world save (e.g. .exe, .bat, or PowerShell script). \r\n PostSaveCommandPath=\r\n MaxConnections=100\r\n DisableConsole=False\r\n DisableAutoSave=False\r\n SaveName=world\r\n ServerPassword=\r\n AdminPassword=PleaseChangeMe\r\n # Possible values: SURVIVAL, FREEDOM, HARDCORE, CREATIVE\r\n GameMode=SURVIVAL\r\n # Possible values: PROTOBUF, JSON\r\n SerializerMode=JSON\r\n # Possible values: NONE, PLAYER, MODERATOR, ADMIN, CONSOLE\r\n DefaultPlayerPerm=PLAYER\r\n #\r\n # Default player stats below here\r\n DefaultOxygenValue=45\r\n DefaultMaxOxygenValue=45\r\n DefaultHealthValue=80\r\n DefaultHungerValue=50.5\r\n DefaultThirstValue=90.5\r\n # Recommended to keep at 0.1f which is the default starting value. If set to 0 then new players are cured by default.\r\n DefaultInfectionValue=0.1\r\n # If set to true, the server will try to open port on your router via UPnP\r\n AutoPortForward=False\r\nEOT\r\nfi", "container": "debian:buster-slim", "entrypoint": "bash" } From 5d9fa69f55aea843648b3dd9647122e5a9c6a3d8 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 21 Aug 2021 18:26:53 +0200 Subject: [PATCH 0008/1001] Updated Pocketmine to use recommended php8 builds (#1309) * Updated Pocketmine to use recommended php8 build --- .../minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json b/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json index 566fe904..0eaf57b8 100644 --- a/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json +++ b/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-07-02T03:55:48+03:00", + "exported_at": "2021-08-21T11:31:41+02:00", "name": "PocketmineMP", "author": "info@swisscrafting.ch", "description": "Pocketmine Egg\r\nby onekintaro from swisscrafting.ch\r\nwith the nice help from #eggs Channel on Pterodactyl-Discord :)", @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl jq\r\n\r\ncd \/mnt\/server\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\n## this is a simple script to validate a download url actaully exists\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\"]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} > PocketMine-MP.phar\r\n\r\necho -e \"\\n downloading latest php7.4 build from pocketmine\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-7.4-Aggregate\/lastSuccessfulBuild\/artifact\/PHP-7.4-Linux-x86_64.tar.gz\r\n\r\necho -e \"\\n getting default server.properties\"\r\ncurl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/pocketmine_mp\/server.properties > server.properties\r\n\r\necho -e \"\\n unpacking php7 binaries\"\r\ntar -xzvf php.binary.tar.gz\r\n\r\necho -e \"\\n removing php7 packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.txt banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs", + "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl jq\r\n\r\ncd \/mnt\/server\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\n## this is a simple script to validate a download url actaully exists\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\"]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} > PocketMine-MP.phar\r\n\r\necho -e \"\\n downloading latest php build from pocketmine\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\r\n\r\necho -e \"\\n getting default server.properties\"\r\ncurl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/pocketmine_mp\/server.properties > server.properties\r\n\r\necho -e \"\\n unpacking php binaries\"\r\ntar -xzvf php.binary.tar.gz\r\n\r\necho -e \"\\n removing php packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.txt banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -56,4 +56,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From 77317bb22cc3de258b17639fa271d4db168e0167 Mon Sep 17 00:00:00 2001 From: Nicholas Y Date: Mon, 23 Aug 2021 13:24:22 +0100 Subject: [PATCH 0009/1001] Update title from 'Example Server Name' to 'Ai...' (#1311) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Just updated the title from 'Example Server Name' to 'Airplane'. Didn't make any sense so changed it, nothing else to say. 🤷‍♂️ --- game_eggs/minecraft/java/airplane/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/minecraft/java/airplane/README.md b/game_eggs/minecraft/java/airplane/README.md index fe317ac3..04751ebf 100644 --- a/game_eggs/minecraft/java/airplane/README.md +++ b/game_eggs/minecraft/java/airplane/README.md @@ -1,4 +1,4 @@ -# Example Server Name +# Airplane ### From their [Github](https://github.com/TECHNOVE/Airplane) A stable, optimized and fast Paper fork. @@ -11,4 +11,4 @@ Approximately 2048MB | Port | default | |---------|---------| -| Game | 25565 | \ No newline at end of file +| Game | 25565 | From b557ac8860b27c69350f5b7e926581ebbb10fcc5 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Tue, 24 Aug 2021 18:09:59 +0200 Subject: [PATCH 0010/1001] Fix Startup for Eco (#1310) * Fix Startup for Eco * Added Extra Flags to Steam like mentioned in Eco Wiki * Update Steam Installscript from Parker to latest --- game_eggs/steamcmd_servers/eco/egg-eco.json | 27 +++++++++++++++------ 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/game_eggs/steamcmd_servers/eco/egg-eco.json b/game_eggs/steamcmd_servers/eco/egg-eco.json index c879c81c..85ffcfbf 100644 --- a/game_eggs/steamcmd_servers/eco/egg-eco.json +++ b/game_eggs/steamcmd_servers/eco/egg-eco.json @@ -1,24 +1,28 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2021-02-08T10:56:34-06:00", + "exported_at": "2021-08-24T17:43:23+02:00", "name": "Eco", "author": "info@goover.de", "description": "Eco is an online world from Strange Loop Games where players must build civilization using resources from an ecosystem that can be damaged and destroyed. The world of Eco is an incredibly reactive one, and whatever any player does in the world affects the underlying ecosystem.", "features": null, - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_dotnet-5", - "startup": "export DOTNET_BUNDLE_EXTRACT_BASE_DIR=.\/dotnet-bundle && .\/EcoServer", + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:debian_dotnet-5" + ], + "file_denylist": [], + "startup": ".\/EcoServer", "config": { "files": "{\r\n \"Configs\/Network.eco\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"GameServerPort\": \"{{server.build.default.port}}\",\r\n \"WebServerPort\": \"{{server.build.env.WEB_PORT}}\",\r\n \"PublicServer\": \"{{server.build.env.PUB_SRV}}\",\r\n \"Password\": \"{{server.build.env.SRV_PWD}}\",\r\n \"UPnPEnabled\": \"{{server.build.env.UPNP}}\",\r\n \"Description\": \"{{server.build.env.SRV_DES}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Web Server now listening on\",\r\n \"userInteraction\": []\r\n}", + "startup": "{\r\n \"done\": \" = Unix\",\r\n \"userInteraction\": []\r\n}", "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "exit" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\ncp -f $HOME\/Configs\/Network.eco.template $HOME\/Configs\/Network.eco", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\ncp -f $HOME\/Configs\/Network.eco.template $HOME\/Configs\/Network.eco", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -77,6 +81,15 @@ "user_viewable": true, "user_editable": false, "rules": "required|string|max:20" + }, + { + "name": "Install Flags", + "description": "", + "env_variable": "INSTALL_FLAGS", + "default_value": "-beta default", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:50" } ] -} +} \ No newline at end of file From c7d02b9e1c806462a39686ede52ba012251e83ba Mon Sep 17 00:00:00 2001 From: NickDevNL <70915191+nickdevnl@users.noreply.github.com> Date: Fri, 27 Aug 2021 05:17:15 +0200 Subject: [PATCH 0011/1001] Add/nodemon.js (#1281) * Add nodemon egg Co-authored-by: Alex --- README.md | 5 +- bots/discord/README.md | 4 + bots/discord/nodemon.js/README.md | 24 +++++ bots/discord/nodemon.js/egg-nodemon.json | 115 +++++++++++++++++++++++ 4 files changed, 146 insertions(+), 2 deletions(-) create mode 100644 bots/discord/nodemon.js/README.md create mode 100644 bots/discord/nodemon.js/egg-nodemon.json diff --git a/README.md b/README.md index 969f2d05..cdbb2568 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,8 @@ If you are reading this it looks like you are looking to add an egg to your serv * [discordgo](bots/discord/discordgo) Golang generic * [fragbot](/bots/discord/fragbot) Golang * [JMusicBot](/bots/discord/jmusicbot) Java -* [parkertron](/bots/discord/parkertron) Golang +* [nodemon.js](bots/discord/nodemon.js) Nodemon JS generic +* [parkertron](/bots/discord/parkertron) Golang * [pixel-bot](/bots/discord/pixelbot) Python * [Redbot](/bots/discord/redbot) Python * [SinusBot](/bots/discord/sinusbot) @@ -244,4 +245,4 @@ If you are reading this it looks like you are looking to add an egg to your serv ### Grafana * [Grafana](/software/grafana) ### haste-server -* [haste-server](/software/haste-server) \ No newline at end of file +* [haste-server](/software/haste-server) diff --git a/bots/discord/README.md b/bots/discord/README.md index e42c4d48..99f02d57 100644 --- a/bots/discord/README.md +++ b/bots/discord/README.md @@ -34,6 +34,10 @@ The bot that runs as the fragforce `@Fragbot` offering looking-for-group service [jagrosh/MusicBot](https://github.com/jagrosh/MusicBot) A Discord music bot that's easy to set up and run yourself! +#### nodemon +[nodemon](https://nodemon.io/) +A nodemon javascript egg for running and automatically restarting the node application when file changes in the directory are detected + #### parkertron [parkervcp/parkertron](https://github.com/parkervcp/parkertron) The bot that runs as the pterodactyl `@Support Bot` diff --git a/bots/discord/nodemon.js/README.md b/bots/discord/nodemon.js/README.md new file mode 100644 index 00000000..4b4f695b --- /dev/null +++ b/bots/discord/nodemon.js/README.md @@ -0,0 +1,24 @@ +# nodemon.js + +Tired of manually restarting your bot? Nodemon will do it by itself. + +Nodemon is a tool that helps develop node.js based applications by automatically restarting the node application when file changes in the directory are detected. Nodemon does not require any additional changes to your code or method of development. + +This egg is designed to run any generic Javascript application, allowing users to pull their own javascript discord bot from a Github repository. + +There is an option to allow a user to upload their own files to run a bot. + +The startup configs and commands may need changing to actually function properly. + +## Configuration +The server will be stuck as `starting` until the egg Start Configuration is modified. You have to edit the text to match something your bot will print for Pterodactyl panel to detect it as running. +![image](https://user-images.githubusercontent.com/10975908/126516861-c5cb4630-9f25-405c-8199-97bf5ec15a7f.png) + +You can use arrays to have multiple different values when different bots are being used +``` +{ + "done":[ + "change this text 1", + "change this text 2" + ] +} diff --git a/bots/discord/nodemon.js/egg-nodemon.json b/bots/discord/nodemon.js/egg-nodemon.json new file mode 100644 index 00000000..337f24f2 --- /dev/null +++ b/bots/discord/nodemon.js/egg-nodemon.json @@ -0,0 +1,115 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-08-26T23:09:55-04:00", + "name": "nodemon", + "author": "nick@blackfortmc.com", + "description": "Nodemon javascript egg that automatically restarts the node application when file changes in the directory are detected\r\n\r\nThis will clone a git repo for a bot. it defaults to master if no branch is specified.\r\n\r\nInstalls the node_modules on install. If you set user_upload, then I assume you know what you are doing.", + "features": null, + "images": [ + "ghcr.io\/parkervcp\/yolks:nodejs_16", + "ghcr.io\/parkervcp\/yolks:nodejs_15", + "ghcr.io\/parkervcp\/yolks:nodejs_14", + "ghcr.io\/parkervcp\/yolks:nodejs_12" + ], + "file_denylist": [], + "startup": "npm install nodemon; if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; if [[ ! -z ${NODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm install ${NODE_PACKAGES}; fi; if [[ ! -z ${UNNODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm uninstall ${UNNODE_PACKAGES}; fi; if [ -f \/home\/container\/package.json ]; then \/usr\/local\/bin\/npm install --production; fi; \/home\/container\/node_modules\/nodemon\/bin\/nodemon.js \/home\/container\/{{BOT_JS_FILE}}", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"change this text\"\r\n}", + "logs": "{}", + "stop": "^c" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# NodeJS Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git curl jq file unzip make gcc g++ python python-dev libtool\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n echo -e \"assuming user knows what they are doing have a good day.\"\r\n exit 0\r\nfi\r\n\r\n## add git ending if it's not on the address\r\nif [[ ${GIT_ADDRESS} != *.git ]]; then\r\n GIT_ADDRESS=${GIT_ADDRESS}.git\r\nfi\r\n\r\nif [ -z \"${USERNAME}\" ] && [ -z \"${ACCESS_TOKEN}\" ]; then\r\n echo -e \"using anon api call\"\r\nelse\r\n GIT_ADDRESS=\"https:\/\/${USERNAME}:${ACCESS_TOKEN}@$(echo -e ${GIT_ADDRESS} | cut -d\/ -f3-)\"\r\nfi\r\n\r\n## pull git js bot repo\r\nif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n echo -e \"\/mnt\/server directory is not empty.\"\r\n if [ -d .git ]; then\r\n echo -e \".git directory exists\"\r\n if [ -f .git\/config ]; then\r\n echo -e \"loading info from git config\"\r\n ORIGIN=$(git config --get remote.origin.url)\r\n else\r\n echo -e \"files found with no git config\"\r\n echo -e \"closing out without touching things to not break anything\"\r\n exit 10\r\n fi\r\n fi\r\n\r\n if [ \"${ORIGIN}\" == \"${GIT_ADDRESS}\" ]; then\r\n echo \"pulling latest from github\"\r\n git pull\r\n fi\r\nelse\r\n echo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n if [ -z ${BRANCH} ]; then\r\n echo -e \"cloning default branch\"\r\n git clone ${GIT_ADDRESS} .\r\n else\r\n echo -e \"cloning ${BRANCH}'\"\r\n git clone --single-branch --branch ${BRANCH} ${GIT_ADDRESS} .\r\n fi\r\n\r\nfi\r\n\r\necho \"Installing nodejs packages\"\r\nif [[ ! -z ${NODE_PACKAGES} ]]; then\r\n \/usr\/local\/bin\/npm install ${NODE_PACKAGES}\r\nfi\r\n\r\nif [ -f \/mnt\/server\/package.json ]; then\r\n \/usr\/local\/bin\/npm install --production\r\nfi\r\n\r\necho -e \"install complete\"\r\nexit 0", + "container": "node:14-buster-slim", + "entrypoint": "bash" + } + }, + "variables": [{ + "name": "Git Repo Address", + "description": "GitHub Repo to clone\r\n\r\nI.E. https:\/\/github.com\/nickdevnl\/repo_name", + "env_variable": "GIT_ADDRESS", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Install Branch", + "description": "The branch of the bot to install.", + "env_variable": "BRANCH", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "User Uploaded Files", + "description": "Skip all the install stuff if you are letting a user upload files.\r\n\r\n0 = false (default)\r\n1 = true", + "env_variable": "USER_UPLOAD", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "required|bool" + }, + { + "name": "Auto Update", + "description": "Pull the latest files on startup when using a GitHub repo. You must have .git folder, reinstall if you are missing it.", + "env_variable": "AUTO_UPDATE", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "required|boolean" + }, + { + "name": "Bot js file", + "description": "The file that starts the bot.", + "env_variable": "BOT_JS_FILE", + "default_value": "index.js", + "user_viewable": true, + "user_editable": true, + "rules": "required|string" + }, + { + "name": "Additional Node packages", + "description": "Install additional node packages.\r\n\r\nUse spaces to separate.", + "env_variable": "NODE_PACKAGES", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Uninstall Node packages", + "description": "Uninstall node packages.\r\n\r\nUse spaces to separate.", + "env_variable": "UNNODE_PACKAGES", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Git Username", + "description": "Username to auth with git.", + "env_variable": "USERNAME", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Git Access Token", + "description": "Password to use with git.\r\n\r\nIt's best practice to use a Personal Access Token.\r\nhttps:\/\/github.com\/settings\/tokens\r\nhttps:\/\/gitlab.com\/-\/profile\/personal_access_tokens", + "env_variable": "ACCESS_TOKEN", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + } + ] +} From 9b0e25181d07e043b12623637c78e1ab17c81e40 Mon Sep 17 00:00:00 2001 From: Pascal Zarrad Date: Fri, 27 Aug 2021 05:37:52 +0200 Subject: [PATCH 0012/1001] Add a RabbitMQ egg (#1276) * Add the RabbitMQ egg --- README.md | 4 +- software/rabbitmq/README.md | 40 + software/rabbitmq/egg-rabbit-m-q.json | 43 + software/rabbitmq/rabbitmq.conf | 1060 +++++++++++++++++++++++++ 4 files changed, 1146 insertions(+), 1 deletion(-) create mode 100644 software/rabbitmq/README.md create mode 100644 software/rabbitmq/egg-rabbit-m-q.json create mode 100644 software/rabbitmq/rabbitmq.conf diff --git a/README.md b/README.md index cdbb2568..e1f9fbd1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Parkers Pterodactyl eggs repo +# Parkers Pterodactyl eggs repo I am working on adding a large collection of public eggs for the Pterodactyl community. @@ -246,3 +246,5 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Grafana](/software/grafana) ### haste-server * [haste-server](/software/haste-server) +### RabbitMQ +* [rabbitmq](/software/rabbitmq) diff --git a/software/rabbitmq/README.md b/software/rabbitmq/README.md new file mode 100644 index 00000000..6fddaf19 --- /dev/null +++ b/software/rabbitmq/README.md @@ -0,0 +1,40 @@ +# RabbitMQ + +### From the [RabbitMQ](https://www.rabbitmq.com/) website +RabbitMQ is the most widely deployed open source message broker. + +### Installation +Follow the common egg installation guide to install the egg on your Pterodactyl instance. +When setting up a server, the latest RabbitMQ version will be used by default. + +With pretty new and old versions of RabbitMQ, you might have to adjust the used Erlang version. +This can be archived by adjusting the version number of the used image (e. g. `ghcr.io/pterodactyl/yolks:erlang_22` instead of `ghcr.io/parkervcp/yolks:erlang_24`). + +### Configuration +Configuring RabbitMQ in Pterodactyl is only possible using the config files. +This means: + - Configure the server itself as normal using `/home/container/etc/rabbitmq/rabbitmq.conf` + - Enable plugins using the plugin file located at `/home/container/etc/rabbitmq/enabled_plugins` + - Configure users and vhosts through a [definitions.json](https://www.rabbitmq.com/definitions.html) + +You can set the path to the used `definitions.json` using the `load_definitions` option in your config. +Note that RabbitMQ versions prior to 3.8.6 will require a properly configured management plugin to do so! +The easiest way to get a working `definitions.json` is to setup a local instance with the +management plugin. You can configure your instance there and load the definitions as stated by uploading them. + +By default, only `listeners.tcp.default` is configured to match your primary allocation. +If you want to expose some other port (e. g. the web management interface) you have to manually configure the +port in your `rabbitmq.conf`. + +### Update support +The egg _should_ keep the `etc` folder when reinstalling, to prevent destroying the configuration by accident. Therefore a reinstallation with "latest" as the selected version can be used to update RabbitMQ. + +If you want to reset the server completly, remove the `etc` directory manually before reinstalling. + +### Server Ports + +Ports required to run the server in a table format. + +| Port | default | +| --------------- | ------- | +| RabbitMQ Broker | 5672 | diff --git a/software/rabbitmq/egg-rabbit-m-q.json b/software/rabbitmq/egg-rabbit-m-q.json new file mode 100644 index 00000000..41125ca4 --- /dev/null +++ b/software/rabbitmq/egg-rabbit-m-q.json @@ -0,0 +1,43 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-08-02T15:24:45+02:00", + "name": "RabbitMQ", + "author": "p.zarrad@outlook.de", + "description": "RabbitMQ is a feature rich, multi-protocol messaging broker.", + "features": null, + "images": [ + "ghcr.io\/parkervcp\/yolks:erlang_24", + "ghcr.io\/parkervcp\/yolks:erlang_23", + "ghcr.io\/parkervcp\/yolks:erlang_22" + ], + "file_denylist": [], + "startup": ".\/sbin\/rabbitmq-server", + "config": { + "files": "{\r\n \"etc\/rabbitmq\/rabbitmq.conf\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"listeners.tcp.default\": \"listeners.tcp.default = 0.0.0.0:{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \" completed with\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/sh\r\n# Switch to mounted directory\r\ncd \/mnt\/server\r\n# Update and install xz\r\napk update\r\napk add xz\r\n# Cleanup previous install if available but leave etc untouched\r\nfind . -maxdepth 1 ! -name \"etc\" ! -name . -exec rm -rf {} \\;\r\n# Download and extract RabbitMQ\r\nversion=${RABBITMQ_VERSION}\r\nif [ \"$version\" = \"latest\" ]; then version=$(curl --silent \"https:\/\/api.github.com\/repos\/rabbitmq\/rabbitmq-server\/releases\/latest\" | grep '\"tag_name\":' | sed -E 's\/.*\"([^\"]+)\".*\/\\1\/' | cut -c2-); fi\r\ncurl -L https:\/\/github.com\/rabbitmq\/rabbitmq-server\/releases\/download\/v${version}\/rabbitmq-server-generic-unix-${version}.tar.xz --output rabbitmq.tar.xz\r\nxz -v -d rabbitmq.tar.xz && tar -xvf rabbitmq.tar\r\nmv -n rabbitmq_server-*\/* .\/\r\nrm -rf rabbitmq.tar rabbitmq_server-*\/\r\n# If there is no config, download default one\r\nif [ ! -f \"etc\/rabbitmq\/rabbitmq.conf\" ]; then mkdir -p etc\/rabbitmq\/ && curl -L https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/software\/rabbitmq\/rabbitmq.conf --output etc\/rabbitmq\/rabbitmq.conf; fi", + "container": "ghcr.io\/pterodactyl\/installers:alpine", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "RabbitMQ Version", + "description": "The version of RabbitMQ to install. By default the latest version is being installed.", + "env_variable": "RABBITMQ_VERSION", + "default_value": "latest", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + } + ] +} diff --git a/software/rabbitmq/rabbitmq.conf b/software/rabbitmq/rabbitmq.conf new file mode 100644 index 00000000..f8895459 --- /dev/null +++ b/software/rabbitmq/rabbitmq.conf @@ -0,0 +1,1060 @@ +# ====================================== +# RabbitMQ broker section +# ====================================== + +## Related doc guide: https://rabbitmq.com/configure.html. See +## https://rabbitmq.com/documentation.html for documentation ToC. + +## Networking +## ==================== +## +## Related doc guide: https://rabbitmq.com/networking.html. +## +## By default, RabbitMQ will listen on all interfaces, using +## the standard (reserved) AMQP 0-9-1 and 1.0 port. +## +listeners.tcp.default = 5672 + + +## To listen on a specific interface, provide an IP address with port. +## For example, to listen only on localhost for both IPv4 and IPv6: +## +# IPv4 +# listeners.tcp.local = 0.0.0.0:5672 +# IPv6 +# listeners.tcp.local_v6 = ::1:5672 + +## You can define multiple listeners using listener names +# listeners.tcp.other_port = 5673 +# listeners.tcp.other_ip = 10.10.10.10:5672 + + +## TLS listeners are configured in the same fashion as TCP listeners, +## including the option to control the choice of interface. +## +# listeners.ssl.default = 5671 + +## It is possible to disable regular TCP (non-TLS) listeners. Clients +## not configured to use TLS and the correct TLS-enabled port won't be able +## to connect to this node. +# listeners.tcp = none + +## Number of Erlang processes that will accept connections for the TCP +## and TLS listeners. +## +# num_acceptors.tcp = 10 +# num_acceptors.ssl = 10 + +## Socket writer will force GC every so many bytes transferred. +## Default is 1 GiB (`1000000000`). Set to 'off' to disable. +## +# socket_writer.gc_threshold = 1000000000 +# +## To disable: +# socket_writer.gc_threshold = off + +## Maximum amount of time allowed for the AMQP 0-9-1 and AMQP 1.0 handshake +## (performed after socket connection and TLS handshake) to complete, in milliseconds. +## +# handshake_timeout = 10000 + +## Set to 'true' to perform reverse DNS lookups when accepting a +## connection. rabbitmqctl and management UI will then display hostnames +## instead of IP addresses. Default value is `false`. +## +# reverse_dns_lookups = false + +## +## Security, Access Control +## ============== +## + +## Related doc guide: https://rabbitmq.com/access-control.html. + +## The default "guest" user is only permitted to access the server +## via a loopback interface (e.g. localhost). +## {loopback_users, [<<"guest">>]}, +## +# loopback_users.guest = true + +## Uncomment the following line if you want to allow access to the +## guest user from anywhere on the network. +# loopback_users.guest = false + +## TLS configuration. +## +## Related doc guide: https://rabbitmq.com/ssl.html. +## +# listeners.ssl.1 = 5671 +# +# ssl_options.verify = verify_peer +# ssl_options.fail_if_no_peer_cert = false +# ssl_options.cacertfile = /path/to/cacert.pem +# ssl_options.certfile = /path/to/cert.pem +# ssl_options.keyfile = /path/to/key.pem +# +# ssl_options.honor_cipher_order = true +# ssl_options.honor_ecc_order = true +# +## These are highly recommended for TLSv1.2 but cannot be used +## with TLSv1.3. If TLSv1.3 is enabled, these lines MUST be removed. +# ssl_options.client_renegotiation = false +# ssl_options.secure_renegotiate = true +# +## Limits what TLS versions the server enables for client TLS +## connections. See https://www.rabbitmq.com/ssl.html#tls-versions for details. +## +## Cutting edge TLS version which requires recent client runtime +## versions and has no cipher suite in common with earlier TLS versions. +# ssl_options.versions.1 = tlsv1.3 +## Enables TLSv1.2 for best compatibility +# ssl_options.versions.2 = tlsv1.2 +## Older TLS versions have known vulnerabilities and are being phased out +## from wide use. + +## Limits what cipher suites the server will use for client TLS +## connections. Narrowing this down can prevent some clients +## from connecting. +## If TLSv1.3 is enabled and cipher suites are overridden, TLSv1.3-specific +## cipher suites must also be explicitly enabled. +## See https://www.rabbitmq.com/ssl.html#cipher-suites and https://wiki.openssl.org/index.php/TLS1.3#Ciphersuites +## for details. +# +## The example below uses TLSv1.3 cipher suites only +# +# ssl_options.ciphers.1 = TLS_AES_256_GCM_SHA384 +# ssl_options.ciphers.2 = TLS_AES_128_GCM_SHA256 +# ssl_options.ciphers.3 = TLS_CHACHA20_POLY1305_SHA256 +# ssl_options.ciphers.4 = TLS_AES_128_CCM_SHA256 +# ssl_options.ciphers.5 = TLS_AES_128_CCM_8_SHA256 +# +## The example below uses TLSv1.2 cipher suites only +# +# ssl_options.ciphers.1 = ECDHE-ECDSA-AES256-GCM-SHA384 +# ssl_options.ciphers.2 = ECDHE-RSA-AES256-GCM-SHA384 +# ssl_options.ciphers.3 = ECDHE-ECDSA-AES256-SHA384 +# ssl_options.ciphers.4 = ECDHE-RSA-AES256-SHA384 +# ssl_options.ciphers.5 = ECDH-ECDSA-AES256-GCM-SHA384 +# ssl_options.ciphers.6 = ECDH-RSA-AES256-GCM-SHA384 +# ssl_options.ciphers.7 = ECDH-ECDSA-AES256-SHA384 +# ssl_options.ciphers.8 = ECDH-RSA-AES256-SHA384 +# ssl_options.ciphers.9 = DHE-RSA-AES256-GCM-SHA384 +# ssl_options.ciphers.10 = DHE-DSS-AES256-GCM-SHA384 +# ssl_options.ciphers.11 = DHE-RSA-AES256-SHA256 +# ssl_options.ciphers.12 = DHE-DSS-AES256-SHA256 +# ssl_options.ciphers.13 = ECDHE-ECDSA-AES128-GCM-SHA256 +# ssl_options.ciphers.14 = ECDHE-RSA-AES128-GCM-SHA256 +# ssl_options.ciphers.15 = ECDHE-ECDSA-AES128-SHA256 +# ssl_options.ciphers.16 = ECDHE-RSA-AES128-SHA256 +# ssl_options.ciphers.17 = ECDH-ECDSA-AES128-GCM-SHA256 +# ssl_options.ciphers.18 = ECDH-RSA-AES128-GCM-SHA256 +# ssl_options.ciphers.19 = ECDH-ECDSA-AES128-SHA256 +# ssl_options.ciphers.20 = ECDH-RSA-AES128-SHA256 +# ssl_options.ciphers.21 = DHE-RSA-AES128-GCM-SHA256 +# ssl_options.ciphers.22 = DHE-DSS-AES128-GCM-SHA256 +# ssl_options.ciphers.23 = DHE-RSA-AES128-SHA256 +# ssl_options.ciphers.24 = DHE-DSS-AES128-SHA256 +# ssl_options.ciphers.25 = ECDHE-ECDSA-AES256-SHA +# ssl_options.ciphers.26 = ECDHE-RSA-AES256-SHA +# ssl_options.ciphers.27 = DHE-RSA-AES256-SHA +# ssl_options.ciphers.28 = DHE-DSS-AES256-SHA +# ssl_options.ciphers.29 = ECDH-ECDSA-AES256-SHA +# ssl_options.ciphers.30 = ECDH-RSA-AES256-SHA +# ssl_options.ciphers.31 = ECDHE-ECDSA-AES128-SHA +# ssl_options.ciphers.32 = ECDHE-RSA-AES128-SHA +# ssl_options.ciphers.33 = DHE-RSA-AES128-SHA +# ssl_options.ciphers.34 = DHE-DSS-AES128-SHA +# ssl_options.ciphers.35 = ECDH-ECDSA-AES128-SHA +# ssl_options.ciphers.36 = ECDH-RSA-AES128-SHA + +# ssl_options.bypass_pem_cache = true + +## Select an authentication/authorisation backend to use. +## +## Alternative backends are provided by plugins, such as rabbitmq-auth-backend-ldap. +## +## NB: These settings require certain plugins to be enabled. +## +## Related doc guides: +## +## * https://rabbitmq.com/plugins.html +## * https://rabbitmq.com/access-control.html +## + +# auth_backends.1 = rabbit_auth_backend_internal + +## uses separate backends for authentication and authorisation, +## see below. +# auth_backends.1.authn = rabbit_auth_backend_ldap +# auth_backends.1.authz = rabbit_auth_backend_internal + +## The rabbitmq_auth_backend_ldap plugin allows the broker to +## perform authentication and authorisation by deferring to an +## external LDAP server. +## +## Relevant doc guides: +## +## * https://rabbitmq.com/ldap.html +## * https://rabbitmq.com/access-control.html +## +## uses LDAP for both authentication and authorisation +# auth_backends.1 = rabbit_auth_backend_ldap + +## uses HTTP service for both authentication and +## authorisation +# auth_backends.1 = rabbit_auth_backend_http + +## uses two backends in a chain: HTTP first, then internal +# auth_backends.1 = rabbit_auth_backend_http +# auth_backends.2 = rabbit_auth_backend_internal + +## Authentication +## The built-in mechanisms are 'PLAIN', +## 'AMQPLAIN', and 'EXTERNAL' Additional mechanisms can be added via +## plugins. +## +## Related doc guide: https://rabbitmq.com/authentication.html. +## +# auth_mechanisms.1 = PLAIN +# auth_mechanisms.2 = AMQPLAIN + +## The rabbitmq-auth-mechanism-ssl plugin makes it possible to +## authenticate a user based on the client's x509 (TLS) certificate. +## Related doc guide: https://rabbitmq.com/authentication.html. +## +## To use auth-mechanism-ssl, the EXTERNAL mechanism should +## be enabled: +## +# auth_mechanisms.1 = PLAIN +# auth_mechanisms.2 = AMQPLAIN +# auth_mechanisms.3 = EXTERNAL + +## To force x509 certificate-based authentication on all clients, +## exclude all other mechanisms (note: this will disable password-based +## authentication even for the management UI!): +## +# auth_mechanisms.1 = EXTERNAL + +## This pertains to both the rabbitmq-auth-mechanism-ssl plugin and +## STOMP ssl_cert_login configurations. See the RabbitMQ STOMP plugin +## configuration section later in this file and the README in +## https://github.com/rabbitmq/rabbitmq-auth-mechanism-ssl for further +## details. +## +## To use the TLS cert's CN instead of its DN as the username +## +# ssl_cert_login_from = common_name + +## TLS handshake timeout, in milliseconds. +## +# ssl_handshake_timeout = 5000 + + +## Cluster name +## +# cluster_name = dev3.eng.megacorp.local + +## Password hashing implementation. Will only affect newly +## created users. To recalculate hash for an existing user +## it's necessary to update her password. +## +## To use SHA-512, set to rabbit_password_hashing_sha512. +## +# password_hashing_module = rabbit_password_hashing_sha256 + +## When importing definitions exported from versions earlier +## than 3.6.0, it is possible to go back to MD5 (only do this +## as a temporary measure!) by setting this to rabbit_password_hashing_md5. +## +# password_hashing_module = rabbit_password_hashing_md5 + +## +## Default User / VHost +## ==================== +## + +## On first start RabbitMQ will create a vhost and a user. These +## config items control what gets created. +## Relevant doc guide: https://rabbitmq.com/access-control.html +## +# default_vhost = / +# default_user = guest +# default_pass = guest + +# default_permissions.configure = .* +# default_permissions.read = .* +# default_permissions.write = .* + +## Tags for default user +## +## For more details about tags, see the documentation for the +## Management Plugin at https://rabbitmq.com/management.html. +## +# default_user_tags.administrator = true + +## Define other tags like this: +# default_user_tags.management = true +# default_user_tags.custom_tag = true + +## +## Additional network and protocol related configuration +## ===================================================== +## + +## Set the server AMQP 0-9-1 heartbeat timeout in seconds. +## RabbitMQ nodes will send heartbeat frames at roughly +## the (timeout / 2) interval. Two missed heartbeats from +## a client will close its connection. +## +## Values lower than 6 seconds are very likely to produce +## false positives and are not recommended. +## +## Related doc guides: +## +## * https://rabbitmq.com/heartbeats.html +## * https://rabbitmq.com/networking.html +## +# heartbeat = 60 + +## Set the max permissible size of an AMQP frame (in bytes). +## +# frame_max = 131072 + +## Set the max frame size the server will accept before connection +## tuning occurs +## +# initial_frame_max = 4096 + +## Set the max permissible number of channels per connection. +## 0 means "no limit". +## +# channel_max = 128 + +## Customising TCP Listener (Socket) Configuration. +## +## Related doc guides: +## +## * https://rabbitmq.com/networking.html +## * https://www.erlang.org/doc/man/inet.html#setopts-2 +## + +# tcp_listen_options.backlog = 128 +# tcp_listen_options.nodelay = true +# tcp_listen_options.exit_on_close = false +# +# tcp_listen_options.keepalive = true +# tcp_listen_options.send_timeout = 15000 +# +# tcp_listen_options.buffer = 196608 +# tcp_listen_options.sndbuf = 196608 +# tcp_listen_options.recbuf = 196608 + +## +## Resource Limits & Flow Control +## ============================== +## +## Related doc guide: https://rabbitmq.com/memory.html. + +## Memory-based Flow Control threshold. +## +# vm_memory_high_watermark.relative = 0.4 + +## Alternatively, we can set a limit (in bytes) of RAM used by the node. +## +# vm_memory_high_watermark.absolute = 1073741824 + +## Or you can set absolute value using memory units (with RabbitMQ 3.6.0+). +## Absolute watermark will be ignored if relative is defined! +## +# vm_memory_high_watermark.absolute = 2GB +## +## Supported unit symbols: +## +## k, kiB: kibibytes (2^10 - 1,024 bytes) +## M, MiB: mebibytes (2^20 - 1,048,576 bytes) +## G, GiB: gibibytes (2^30 - 1,073,741,824 bytes) +## kB: kilobytes (10^3 - 1,000 bytes) +## MB: megabytes (10^6 - 1,000,000 bytes) +## GB: gigabytes (10^9 - 1,000,000,000 bytes) + + + +## Fraction of the high watermark limit at which queues start to +## page message out to disc in order to free up memory. +## For example, when vm_memory_high_watermark is set to 0.4 and this value is set to 0.5, +## paging can begin as early as when 20% of total available RAM is used by the node. +## +## Values greater than 1.0 can be dangerous and should be used carefully. +## +## One alternative to this is to use durable queues and publish messages +## as persistent (delivery mode = 2). With this combination queues will +## move messages to disk much more rapidly. +## +## Another alternative is to configure queues to page all messages (both +## persistent and transient) to disk as quickly +## as possible, see https://rabbitmq.com/lazy-queues.html. +## +# vm_memory_high_watermark_paging_ratio = 0.5 + +## Selects Erlang VM memory consumption calculation strategy. Can be `allocated`, `rss` or `legacy` (aliased as `erlang`), +## Introduced in 3.6.11. `rss` is the default as of 3.6.12. +## See https://github.com/rabbitmq/rabbitmq-server/issues/1223 and rabbitmq/rabbitmq-common#224 for background. +# vm_memory_calculation_strategy = rss + +## Interval (in milliseconds) at which we perform the check of the memory +## levels against the watermarks. +## +# memory_monitor_interval = 2500 + +## The total memory available can be calculated from the OS resources +## - default option - or provided as a configuration parameter. +# total_memory_available_override_value = 2GB + +## Set disk free limit (in bytes). Once free disk space reaches this +## lower bound, a disk alarm will be set - see the documentation +## listed above for more details. +## +## Absolute watermark will be ignored if relative is defined! +# disk_free_limit.absolute = 50000 + +## Or you can set it using memory units (same as in vm_memory_high_watermark) +## with RabbitMQ 3.6.0+. +# disk_free_limit.absolute = 500KB +# disk_free_limit.absolute = 50mb +# disk_free_limit.absolute = 5GB + +## Alternatively, we can set a limit relative to total available RAM. +## +## Values lower than 1.0 can be dangerous and should be used carefully. +# disk_free_limit.relative = 2.0 + +## +## Clustering +## ===================== +## +# cluster_partition_handling = ignore + +## Pauses all nodes on the minority side of a partition. The cluster +## MUST have an odd number of nodes (3, 5, etc) +# cluster_partition_handling = pause_minority + +## pause_if_all_down strategy require additional configuration +# cluster_partition_handling = pause_if_all_down + +## Recover strategy. Can be either 'autoheal' or 'ignore' +# cluster_partition_handling.pause_if_all_down.recover = ignore + +## Node names to check +# cluster_partition_handling.pause_if_all_down.nodes.1 = rabbit@localhost +# cluster_partition_handling.pause_if_all_down.nodes.2 = hare@localhost + +## Mirror sync batch size, in messages. Increasing this will speed +## up syncing but total batch size in bytes must not exceed 2 GiB. +## Available in RabbitMQ 3.6.0 or later. +## +# mirroring_sync_batch_size = 4096 + +## Make clustering happen *automatically* at startup. Only applied +## to nodes that have just been reset or started for the first time. +## +## Relevant doc guide: https://rabbitmq.com//cluster-formation.html +## + +# cluster_formation.peer_discovery_backend = rabbit_peer_discovery_classic_config +# +# cluster_formation.classic_config.nodes.1 = rabbit1@hostname +# cluster_formation.classic_config.nodes.2 = rabbit2@hostname +# cluster_formation.classic_config.nodes.3 = rabbit3@hostname +# cluster_formation.classic_config.nodes.4 = rabbit4@hostname + +## DNS-based peer discovery. This backend will list A records +## of the configured hostname and perform reverse lookups for +## the addresses returned. + +# cluster_formation.peer_discovery_backend = rabbit_peer_discovery_dns +# cluster_formation.dns.hostname = discovery.eng.example.local + +## This node's type can be configured. If you are not sure +## what node type to use, always use 'disc'. +# cluster_formation.node_type = disc + +## Interval (in milliseconds) at which we send keepalive messages +## to other cluster members. Note that this is not the same thing +## as net_ticktime; missed keepalive messages will not cause nodes +## to be considered down. +## +# cluster_keepalive_interval = 10000 + +## +## Statistics Collection +## ===================== +## + +## Statistics collection interval (in milliseconds). Increasing +## this will reduce the load on management database. +## +# collect_statistics_interval = 5000 + +## Fine vs. coarse statistics +# +# This value is no longer meant to be configured directly. +# +# See https://www.rabbitmq.com/management.html#fine-stats. + +## +## Ra Settings +## ===================== +## +# raft.segment_max_entries = 65536 +# raft.wal_max_size_bytes = 1048576 +# raft.wal_max_batch_size = 4096 +# raft.snapshot_chunk_size = 1000000 + +## +## Misc/Advanced Options +## ===================== +## +## NB: Change these only if you understand what you are doing! +## + +## Timeout used when waiting for Mnesia tables in a cluster to +## become available. +## +# mnesia_table_loading_retry_timeout = 30000 + +## Retries when waiting for Mnesia tables in the cluster startup. Note that +## this setting is not applied to Mnesia upgrades or node deletions. +## +# mnesia_table_loading_retry_limit = 10 + +## Size in bytes below which to embed messages in the queue index. +## Related doc guide: https://rabbitmq.com/persistence-conf.html +## +# queue_index_embed_msgs_below = 4096 + +## You can also set this size in memory units +## +# queue_index_embed_msgs_below = 4kb + +## Whether or not to enable background periodic forced GC runs for all +## Erlang processes on the node in "waiting" state. +## +## Disabling background GC may reduce latency for client operations, +## keeping it enabled may reduce median RAM usage by the binary heap +## (see https://www.erlang-solutions.com/blog/erlang-garbage-collector.html). +## +## Before trying this option, please take a look at the memory +## breakdown (https://www.rabbitmq.com/memory-use.html). +## +# background_gc_enabled = false + +## Target (desired) interval (in milliseconds) at which we run background GC. +## The actual interval will vary depending on how long it takes to execute +## the operation (can be higher than this interval). Values less than +## 30000 milliseconds are not recommended. +## +# background_gc_target_interval = 60000 + +## Whether or not to enable proxy protocol support. +## Once enabled, clients cannot directly connect to the broker +## anymore. They must connect through a load balancer that sends the +## proxy protocol header to the broker at connection time. +## This setting applies only to AMQP clients, other protocols +## like MQTT or STOMP have their own setting to enable proxy protocol. +## See the plugins documentation for more information. +## +# proxy_protocol = false + +## Overriden product name and version. +## They are set to "RabbitMQ" and the release version by default. +# product.name = RabbitMQ +# product.version = 1.2.3 + +## "Message of the day" file. +## Its content is used to expand the logged and printed banners. +## Default to /etc/rabbitmq/motd on Unix, %APPDATA%\RabbitMQ\motd.txt +## on Windows. +# motd_file = /etc/rabbitmq/motd + +## Consumer timeout +## If a message delivered to a consumer has not been acknowledge before this timer +## triggers the channel will be force closed by the broker. This ensure that +## faultly consumers that never ack will not hold on to messages indefinitely. +## +# consumer_timeout = 900000 + +## ---------------------------------------------------------------------------- +## Advanced Erlang Networking/Clustering Options. +## +## Related doc guide: https://rabbitmq.com/clustering.html +## ---------------------------------------------------------------------------- + +# ====================================== +# Kernel section +# ====================================== + +## Timeout used to detect peer unavailability, including CLI tools. +## Related doc guide: https://www.rabbitmq.com/nettick.html. +## +# net_ticktime = 60 + +## Inter-node communication port range. +## The parameters inet_dist_listen_min and inet_dist_listen_max +## can be configured in the classic config format only. +## Related doc guide: https://www.rabbitmq.com/networking.html#epmd-inet-dist-port-range. + + +## ---------------------------------------------------------------------------- +## RabbitMQ Management Plugin +## +## Related doc guide: https://rabbitmq.com/management.html. +## ---------------------------------------------------------------------------- + +# ======================================= +# Management section +# ======================================= + +## Preload schema definitions from the following JSON file. +## Related doc guide: https://rabbitmq.com/management.html#load-definitions. +## +# management.load_definitions = /path/to/exported/definitions.json + +## Log all requests to the management HTTP API to a file. +## +# management.http_log_dir = /path/to/access.log + +## HTTP listener and embedded Web server settings. +# ## See https://rabbitmq.com/management.html for details. +# +# management.tcp.port = 15672 +# management.tcp.ip = 0.0.0.0 +# +# management.tcp.shutdown_timeout = 7000 +# management.tcp.max_keepalive = 120 +# management.tcp.idle_timeout = 120 +# management.tcp.inactivity_timeout = 120 +# management.tcp.request_timeout = 120 +# management.tcp.compress = true + +## HTTPS listener settings. +## See https://rabbitmq.com/management.html and https://rabbitmq.com/ssl.html for details. +## +# management.ssl.port = 15671 +# management.ssl.cacertfile = /path/to/ca_certificate.pem +# management.ssl.certfile = /path/to/server_certificate.pem +# management.ssl.keyfile = /path/to/server_key.pem + +## More TLS options +# management.ssl.honor_cipher_order = true +# management.ssl.honor_ecc_order = true + +## These are highly recommended for TLSv1.2 but cannot be used +## with TLSv1.3. If TLSv1.3 is enabled, these lines MUST be removed. +# management.ssl.client_renegotiation = false +# management.ssl.secure_renegotiate = true + +## Supported TLS versions +# management.ssl.versions.1 = tlsv1.2 + +## Cipher suites the server is allowed to use +# management.ssl.ciphers.1 = ECDHE-ECDSA-AES256-GCM-SHA384 +# management.ssl.ciphers.2 = ECDHE-RSA-AES256-GCM-SHA384 +# management.ssl.ciphers.3 = ECDHE-ECDSA-AES256-SHA384 +# management.ssl.ciphers.4 = ECDHE-RSA-AES256-SHA384 +# management.ssl.ciphers.5 = ECDH-ECDSA-AES256-GCM-SHA384 +# management.ssl.ciphers.6 = ECDH-RSA-AES256-GCM-SHA384 +# management.ssl.ciphers.7 = ECDH-ECDSA-AES256-SHA384 +# management.ssl.ciphers.8 = ECDH-RSA-AES256-SHA384 +# management.ssl.ciphers.9 = DHE-RSA-AES256-GCM-SHA384 + +## URL path prefix for HTTP API and management UI +# management.path_prefix = /a-prefix + +## One of 'basic', 'detailed' or 'none'. See +## https://rabbitmq.com/management.html#fine-stats for more details. +# management.rates_mode = basic + +## Configure how long aggregated data (such as message rates and queue +## lengths) is retained. Please read the plugin's documentation in +## https://rabbitmq.com/management.html#configuration for more +## details. +## Your can use 'minute', 'hour' and 'day' keys or integer key (in seconds) +# management.sample_retention_policies.global.minute = 5 +# management.sample_retention_policies.global.hour = 60 +# management.sample_retention_policies.global.day = 1200 + +# management.sample_retention_policies.basic.minute = 5 +# management.sample_retention_policies.basic.hour = 60 + +# management.sample_retention_policies.detailed.10 = 5 + +## ---------------------------------------------------------------------------- +## RabbitMQ Shovel Plugin +## +## Related doc guide: https://rabbitmq.com/shovel.html +## ---------------------------------------------------------------------------- + +## See advanced.config.example for a Shovel plugin example + + +## ---------------------------------------------------------------------------- +## RabbitMQ STOMP Plugin +## +## Related doc guide: https://rabbitmq.com/stomp.html +## ---------------------------------------------------------------------------- + +# ======================================= +# STOMP section +# ======================================= + +## See https://rabbitmq.com/stomp.html for details. + +## TCP listeners. +## +# stomp.listeners.tcp.1 = 127.0.0.1:61613 +# stomp.listeners.tcp.2 = ::1:61613 + +## TCP listener settings +## +# stomp.tcp_listen_options.backlog = 2048 +# stomp.tcp_listen_options.recbuf = 131072 +# stomp.tcp_listen_options.sndbuf = 131072 +# +# stomp.tcp_listen_options.keepalive = true +# stomp.tcp_listen_options.nodelay = true +# +# stomp.tcp_listen_options.exit_on_close = true +# stomp.tcp_listen_options.send_timeout = 120 + +## Proxy protocol support +## +# stomp.proxy_protocol = false + +## TLS listeners +## See https://rabbitmq.com/stomp.html and https://rabbitmq.com/ssl.html for details. +# stomp.listeners.ssl.default = 61614 +# +# ssl_options.cacertfile = path/to/cacert.pem +# ssl_options.certfile = path/to/cert.pem +# ssl_options.keyfile = path/to/key.pem +# ssl_options.verify = verify_peer +# ssl_options.fail_if_no_peer_cert = true + + +## Number of Erlang processes that will accept connections for the TCP +## and TLS listeners. +## +# stomp.num_acceptors.tcp = 10 +# stomp.num_acceptors.ssl = 1 + +## Additional TLS options + +## Extract a name from the client's certificate when using TLS. +## +# stomp.ssl_cert_login = true + +## Set a default user name and password. This is used as the default login +## whenever a CONNECT frame omits the login and passcode headers. +## +## Please note that setting this will allow clients to connect without +## authenticating! +## +# stomp.default_user = guest +# stomp.default_pass = guest + +## If a default user is configured, or you have configured use TLS client +## certificate based authentication, you can choose to allow clients to +## omit the CONNECT frame entirely. If set to true, the client is +## automatically connected as the default user or user supplied in the +## TLS certificate whenever the first frame sent on a session is not a +## CONNECT frame. +## +# stomp.implicit_connect = true + +## Whether or not to enable proxy protocol support. +## Once enabled, clients cannot directly connect to the broker +## anymore. They must connect through a load balancer that sends the +## proxy protocol header to the broker at connection time. +## This setting applies only to STOMP clients, other protocols +## like MQTT or AMQP have their own setting to enable proxy protocol. +## See the plugins or broker documentation for more information. +## +# stomp.proxy_protocol = false + +## ---------------------------------------------------------------------------- +## RabbitMQ MQTT Adapter +## +## See https://github.com/rabbitmq/rabbitmq-mqtt/blob/stable/README.md +## for details +## ---------------------------------------------------------------------------- + +# ======================================= +# MQTT section +# ======================================= + +## TCP listener settings. +## +# mqtt.listeners.tcp.1 = 127.0.0.1:61613 +# mqtt.listeners.tcp.2 = ::1:61613 + +## TCP listener options (as per the broker configuration). +## +# mqtt.tcp_listen_options.backlog = 4096 +# mqtt.tcp_listen_options.recbuf = 131072 +# mqtt.tcp_listen_options.sndbuf = 131072 +# +# mqtt.tcp_listen_options.keepalive = true +# mqtt.tcp_listen_options.nodelay = true +# +# mqtt.tcp_listen_options.exit_on_close = true +# mqtt.tcp_listen_options.send_timeout = 120 + +## TLS listener settings +## ## See https://rabbitmq.com/mqtt.html and https://rabbitmq.com/ssl.html for details. +# +# mqtt.listeners.ssl.default = 8883 +# +# ssl_options.cacertfile = /path/to/tls/ca_certificate_bundle.pem +# ssl_options.certfile = /path/to/tls/server_certificate.pem +# ssl_options.keyfile = /path/to/tls/server_key.pem +# ssl_options.verify = verify_peer +# ssl_options.fail_if_no_peer_cert = true +# + + +## Number of Erlang processes that will accept connections for the TCP +## and TLS listeners. +## +# mqtt.num_acceptors.tcp = 10 +# mqtt.num_acceptors.ssl = 10 + +## Whether or not to enable proxy protocol support. +## Once enabled, clients cannot directly connect to the broker +## anymore. They must connect through a load balancer that sends the +## proxy protocol header to the broker at connection time. +## This setting applies only to STOMP clients, other protocols +## like STOMP or AMQP have their own setting to enable proxy protocol. +## See the plugins or broker documentation for more information. +## +# mqtt.proxy_protocol = false + +## Set the default user name and password used for anonymous connections (when client +## provides no credentials). Anonymous connections are highly discouraged! +## +# mqtt.default_user = guest +# mqtt.default_pass = guest + +## Enable anonymous connections. If this is set to false, clients MUST provide +## credentials in order to connect. See also the mqtt.default_user/mqtt.default_pass +## keys. Anonymous connections are highly discouraged! +## +# mqtt.allow_anonymous = true + +## If you have multiple vhosts, specify the one to which the +## adapter connects. +## +# mqtt.vhost = / + +## Specify the exchange to which messages from MQTT clients are published. +## +# mqtt.exchange = amq.topic + +## Specify TTL (time to live) to control the lifetime of non-clean sessions. +## +# mqtt.subscription_ttl = 1800000 + +## Set the prefetch count (governing the maximum number of unacknowledged +## messages that will be delivered). +## +# mqtt.prefetch = 10 + + +## ---------------------------------------------------------------------------- +## RabbitMQ AMQP 1.0 Support +## +## See https://github.com/rabbitmq/rabbitmq-amqp1.0/blob/stable/README.md. +## ---------------------------------------------------------------------------- + +# ======================================= +# AMQP 1.0 section +# ======================================= + + +## Connections that are not authenticated with SASL will connect as this +## account. See the README for more information. +## +## Please note that setting this will allow clients to connect without +## authenticating! +## +# amqp1_0.default_user = guest + +## Enable protocol strict mode. See the README for more information. +## +# amqp1_0.protocol_strict_mode = false + +## Logging settings. +## +## See https://rabbitmq.com/logging.html for details. +## + +## Log directory, taken from the RABBITMQ_LOG_BASE env variable by default. +## +# log.dir = /var/log/rabbitmq + +## Logging to file. Can be false or a filename. +## Default: +# log.file = rabbit.log + +## To disable logging to a file +# log.file = false + +## Log level for file logging +## +# log.file.level = info + +## File rotation config. No rotation by default. +## DO NOT SET rotation date to ''. Leave the value unset if "" is the desired value +# log.file.rotation.date = $D0 +# log.file.rotation.size = 0 + +## Logging to console (can be true or false) +## +# log.console = false + +## Log level for console logging +## +# log.console.level = info + +## Logging to the amq.rabbitmq.log exchange (can be true or false) +## +# log.exchange = false + +## Log level to use when logging to the amq.rabbitmq.log exchange +## +# log.exchange.level = info + + + +## ---------------------------------------------------------------------------- +## RabbitMQ LDAP Plugin +## +## Related doc guide: https://rabbitmq.com/ldap.html. +## +## ---------------------------------------------------------------------------- + +# ======================================= +# LDAP section +# ======================================= + +## +## Connecting to the LDAP server(s) +## ================================ +## + +## Specify servers to bind to. You *must* set this in order for the plugin +## to work properly. +## +# auth_ldap.servers.1 = your-server-name-goes-here + +## You can define multiple servers +# auth_ldap.servers.2 = your-other-server + +## Connect to the LDAP server using TLS +## +# auth_ldap.use_ssl = false + +## Specify the LDAP port to connect to +## +# auth_ldap.port = 389 + +## LDAP connection timeout, in milliseconds or 'infinity' +## +# auth_ldap.timeout = infinity + +## Or number +# auth_ldap.timeout = 500 + +## Enable logging of LDAP queries. +## One of +## - false (no logging is performed) +## - true (verbose logging of the logic used by the plugin) +## - network (as true, but additionally logs LDAP network traffic) +## +## Defaults to false. +## +# auth_ldap.log = false + +## Also can be true or network +# auth_ldap.log = true +# auth_ldap.log = network + +## +## Authentication +## ============== +## + +## Pattern to convert the username given through AMQP to a DN before +## binding +## +# auth_ldap.user_dn_pattern = cn=${username},ou=People,dc=example,dc=com + +## Alternatively, you can convert a username to a Distinguished +## Name via an LDAP lookup after binding. See the documentation for +## full details. + +## When converting a username to a dn via a lookup, set these to +## the name of the attribute that represents the user name, and the +## base DN for the lookup query. +## +# auth_ldap.dn_lookup_attribute = userPrincipalName +# auth_ldap.dn_lookup_base = DC=gopivotal,DC=com + +## Controls how to bind for authorisation queries and also to +## retrieve the details of users logging in without presenting a +## password (e.g., SASL EXTERNAL). +## One of +## - as_user (to bind as the authenticated user - requires a password) +## - anon (to bind anonymously) +## - {UserDN, Password} (to bind with a specified user name and password) +## +## Defaults to 'as_user'. +## +# auth_ldap.other_bind = as_user + +## Or can be more complex: +# auth_ldap.other_bind.user_dn = User +# auth_ldap.other_bind.password = Password + +## If user_dn and password defined - other options is ignored. + +# ----------------------------- +# Too complex section of LDAP +# ----------------------------- + +## +## Authorisation +## ============= +## + +## The LDAP plugin can perform a variety of queries against your +## LDAP server to determine questions of authorisation. +## +## Related doc guide: https://rabbitmq.com/ldap.html#authorisation. + +## Following configuration should be defined in advanced.config file +## DO NOT UNCOMMENT THESE LINES! + +## Set the query to use when determining vhost access +## +## {vhost_access_query, {in_group, +## "ou=${vhost}-users,ou=vhosts,dc=example,dc=com"}}, + +## Set the query to use when determining resource (e.g., queue) access +## +## {resource_access_query, {constant, true}}, + +## Set queries to determine which tags a user has +## +## {tag_queries, []} +# ]}, +# ----------------------------- From 32db9686b52ac82a411df915dd03ad934d6b5c41 Mon Sep 17 00:00:00 2001 From: Boy132 Date: Fri, 27 Aug 2021 06:39:18 +0200 Subject: [PATCH 0013/1001] Gmod egg Update (#1313) * Gmod egg Update Added Lua Refresh variable Updated server.cfg --- README.md | 4 +-- stock_eggs/source-engine/egg-garrys-mod.json | 32 ++++++++++++++------ 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index e1f9fbd1..2398ab8d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Parkers Pterodactyl eggs repo +# Parkers Pterodactyl eggs repo I am working on adding a large collection of public eggs for the Pterodactyl community. @@ -35,7 +35,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [fragbot](/bots/discord/fragbot) Golang * [JMusicBot](/bots/discord/jmusicbot) Java * [nodemon.js](bots/discord/nodemon.js) Nodemon JS generic -* [parkertron](/bots/discord/parkertron) Golang +* [parkertron](/bots/discord/parkertron) Golang * [pixel-bot](/bots/discord/pixelbot) Python * [Redbot](/bots/discord/redbot) Python * [SinusBot](/bots/discord/sinusbot) diff --git a/stock_eggs/source-engine/egg-garrys-mod.json b/stock_eggs/source-engine/egg-garrys-mod.json index e9d6d2d1..056a51bd 100644 --- a/stock_eggs/source-engine/egg-garrys-mod.json +++ b/stock_eggs/source-engine/egg-garrys-mod.json @@ -1,24 +1,29 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-10-19T23:34:44+00:00", + "exported_at": "2021-08-27T00:12:31-04:00", "name": "Garrys Mod", "author": "support@pterodactyl.io", "description": "Garrys Mod, is a sandbox physics game created by Garry Newman, and developed by his company, Facepunch Studios.", - "image": "quay.io\/pterodactyl\/core:source", - "startup": ".\/srcds_run -game garrysmod -console -port {{SERVER_PORT}} +ip 0.0.0.0 +host_workshop_collection {{WORKSHOP_ID}} +map {{SRCDS_MAP}} +gamemode {{GAMEMODE}} -strictportbind -norestart +sv_setsteamaccount {{STEAM_ACC}} +maxplayers {{MAX_PLAYERS}} -tickrate {{TICKRATE}}", + "features": null, + "images": [ + "ghcr.io\/pterodactyl\/games:source" + ], + "file_denylist": [], + "startup": ".\/srcds_run -game garrysmod -console -port {{SERVER_PORT}} +ip 0.0.0.0 +host_workshop_collection {{WORKSHOP_ID}} +map {{SRCDS_MAP}} +gamemode {{GAMEMODE}} -strictportbind -norestart +sv_setsteamaccount {{STEAM_ACC}} +maxplayers {{MAX_PLAYERS}} -tickrate {{TICKRATE}} $( [ \"$LUA_REFRESH\" == \"1\" ] || printf %s '-disableluarefresh' )", "config": { "files": "{}", - "startup": "{\r\n \"done\": \"gameserver Steam ID\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "startup": "{\r\n \"done\": \"gameserver Steam ID\"\r\n}", + "logs": "{}", "stop": "quit" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n# Creating needed default files for the game\r\ncd \/mnt\/server\/garrysmod\/lua\/autorun\/server\r\necho '\r\n-- Docs: https:\/\/wiki.facepunch.com\/gmod\/resource.AddWorkshop\r\n-- Place the ID of the workshop addon you want to be downloaded to people who join your server, not the collection ID\r\n-- Use https:\/\/beta.configcreator.com\/create\/gmod\/resources.lua to easily create a list based on your collection ID\r\n\r\nresource.AddWorkshop( \"\" )\r\n' > workshop.lua\r\n\r\ncd \/mnt\/server\/garrysmod\/cfg\r\necho '\r\n\/\/ Please do not set RCon in here, use the startup parameters.\r\n\r\nhostname\t\t\"New Gmod Server\"\r\nsv_password\t\t\"\"\r\nsv_loadingurl \"\"\r\n\r\n\/\/ Steam Server List Settings\r\nsv_region \"255\"\r\nsv_lan \"0\"\r\nsv_max_queries_sec_global \"30000\"\r\nsv_max_queries_window \"45\"\r\nsv_max_queries_sec \"5\"\r\n\r\n\/\/ Server Limits\r\nsbox_maxprops\t\t100\r\nsbox_maxragdolls\t5\r\nsbox_maxnpcs\t\t10\r\nsbox_maxballoons\t10\r\nsbox_maxeffects\t\t10\r\nsbox_maxdynamite\t10\r\nsbox_maxlamps\t\t10\r\nsbox_maxthrusters\t10\r\nsbox_maxwheels\t\t10\r\nsbox_maxhoverballs\t10\r\nsbox_maxvehicles\t20\r\nsbox_maxbuttons\t\t10\r\nsbox_maxsents\t\t20\r\nsbox_maxemitters\t5\r\nsbox_godmode\t\t0\r\nsbox_noclip\t\t 0\r\n\r\n\/\/ Network Settings - Please keep these set to default.\r\n\r\nsv_minrate\t\t75000\r\nsv_maxrate\t\t0\r\ngmod_physiterations\t2\r\nnet_splitpacket_maxrate\t45000\r\ndecalfrequency\t\t12 \r\n\r\n\/\/ Execute Ban Files - Please do not edit\r\nexec banned_ip.cfg \r\nexec banned_user.cfg \r\n\r\n\/\/ Add custom lines under here\r\n' > server.cfg", - "container": "debian:buster-slim", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n# Creating needed default files for the game\r\ncd \/mnt\/server\/garrysmod\/lua\/autorun\/server\r\necho '\r\n-- Docs: https:\/\/wiki.garrysmod.com\/page\/resource\/AddWorkshop\r\n-- Place the ID of the workshop addon you want to be downloaded to people who join your server, not the collection ID\r\n-- Use https:\/\/beta.configcreator.com\/create\/gmod\/resources.lua to easily create a list based on your collection ID\r\n\r\nresource.AddWorkshop( \"\" )\r\n' > workshop.lua\r\n\r\ncd \/mnt\/server\/garrysmod\/cfg\r\necho '\r\n\/\/ Please do not set RCon in here, use the startup parameters.\r\n\r\nhostname\t\t\"New Gmod Server\"\r\nsv_password\t\t\"\"\r\nsv_loadingurl \"\"\r\nsv_downloadurl \"\"\r\n\r\n\/\/ Steam Server List Settings\r\n\/\/ sv_location \"eu\"\r\nsv_region \"255\"\r\nsv_lan \"0\"\r\nsv_max_queries_sec_global \"30000\"\r\nsv_max_queries_window \"45\"\r\nsv_max_queries_sec \"5\"\r\n\r\n\/\/ Server Limits\r\nsbox_maxprops\t\t100\r\nsbox_maxragdolls\t5\r\nsbox_maxnpcs\t\t10\r\nsbox_maxballoons\t10\r\nsbox_maxeffects\t\t10\r\nsbox_maxdynamite\t10\r\nsbox_maxlamps\t\t10\r\nsbox_maxthrusters\t10\r\nsbox_maxwheels\t\t10\r\nsbox_maxhoverballs\t10\r\nsbox_maxvehicles\t20\r\nsbox_maxbuttons\t\t10\r\nsbox_maxsents\t\t20\r\nsbox_maxemitters\t5\r\nsbox_godmode\t\t0\r\nsbox_noclip\t\t 0\r\n\r\n\/\/ Network Settings - Please keep these set to default.\r\n\r\nsv_minrate\t\t75000\r\nsv_maxrate\t\t0\r\ngmod_physiterations\t2\r\nnet_splitpacket_maxrate\t45000\r\ndecalfrequency\t\t12 \r\n\r\n\/\/ Execute Ban Files - Please do not edit\r\nexec banned_ip.cfg \r\nexec banned_user.cfg \r\n\r\n\/\/ Add custom lines under here\r\n' > server.cfg", + "container": "ghcr.io\/pterodactyl\/installers:debian", "entrypoint": "bash" } }, @@ -85,6 +90,15 @@ "user_viewable": true, "user_editable": true, "rules": "required|integer|max:100" + }, + { + "name": "Lua Refresh", + "description": "0 = disable Lua refresh,\r\n1 = enable Lua refresh", + "env_variable": "LUA_REFRESH", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "required|boolean" } ] -} +} \ No newline at end of file From dd4c8885bad4742c88fcbd3a766fb42e6fdb5d50 Mon Sep 17 00:00:00 2001 From: Softwarenoob Date: Fri, 27 Aug 2021 07:46:33 +0300 Subject: [PATCH 0014/1001] fix(ark): bash OR operation Resolves the inverted bash OR operator. Co-authored-by: BlazeCode <84934108+BlazeCodeNet@users.noreply.github.com> --- .../ark_survival_evolved/egg-ark--survival-evolved.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json b/game_eggs/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json index 90b515a0..f0dfa7af 100644 --- a/game_eggs/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json +++ b/game_eggs/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json @@ -13,7 +13,7 @@ "quay.io\/parkervcp\/pterodactyl-images:debian_source" ], "file_denylist": [], - "startup": "rmv() { echo -e \"stopping server\"; rcon -t rcon -a 127.0.0.1:${RCON_PORT} -p ${ARK_ADMIN_PASSWORD} -c saveworld && rcon -a 127.0.0.1:${RCON_PORT} -p ${ARK_ADMIN_PASSWORD} -c DoExit; }; trap rmv 15; cd ShooterGame\/Binaries\/Linux && .\/ShooterGameServer {{SERVER_MAP}}?listen?SessionName=\"{{SESSION_NAME}}\"?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?Port={{SERVER_PORT}}?RCONPort={{RCON_PORT}}?QueryPort={{QUERY_PORT}}?RCONEnabled=True$( [ \"$BATTLE_EYE\" == \"0\" ] || printf %s '?-NoBattlEye' ) -server {{ARGS}} -log & until echo \"waiting for rcon connection...\"; rcon -t rcon -a 127.0.0.1:${RCON_PORT} -p ${ARK_ADMIN_PASSWORD}; do sleep 5; done", + "startup": "rmv() { echo -e \"stopping server\"; rcon -t rcon -a 127.0.0.1:${RCON_PORT} -p ${ARK_ADMIN_PASSWORD} -c saveworld && rcon -a 127.0.0.1:${RCON_PORT} -p ${ARK_ADMIN_PASSWORD} -c DoExit; }; trap rmv 15; cd ShooterGame\/Binaries\/Linux && .\/ShooterGameServer {{SERVER_MAP}}?listen?SessionName=\"{{SESSION_NAME}}\"?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?Port={{SERVER_PORT}}?RCONPort={{RCON_PORT}}?QueryPort={{QUERY_PORT}}?RCONEnabled=True$( [ \"$BATTLE_EYE\" == \"1\" ] || printf %s ' -NoBattlEye' ) -server {{ARGS}} -log & until echo \"waiting for rcon connection...\"; rcon -t rcon -a 127.0.0.1:${RCON_PORT} -p ${ARK_ADMIN_PASSWORD}; do sleep 5; done", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Waiting commands for 127.0.0.1:\"\r\n}", From 711e131af1dc66b8f1e4be4d4e3d67c3971b2b6a Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Fri, 27 Aug 2021 21:12:52 -0400 Subject: [PATCH 0015/1001] add wine generic to readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 2398ab8d..93f4c9dc 100644 --- a/README.md +++ b/README.md @@ -227,6 +227,8 @@ If you are reading this it looks like you are looking to add an egg to your serv [Vintage Story](game_eggs/vintage_story/vintage_story) +[Wine Generic](game_eggs/wine/generic) + [Xonotic](game_eggs/xonotic/xonotic) ## [Monitoring](/monitoring/) From 5c8778e604ba0069578a49952d770a972cbe422a Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sat, 28 Aug 2021 14:03:57 -0400 Subject: [PATCH 0016/1001] updates mordhau wine use vcrun2019 fix 'My Documents' folder --- .../mordhau/egg-mordhau-wine.json | 78 +++++++++++++------ 1 file changed, 55 insertions(+), 23 deletions(-) diff --git a/game_eggs/steamcmd_servers/mordhau/egg-mordhau-wine.json b/game_eggs/steamcmd_servers/mordhau/egg-mordhau-wine.json index 98bba824..5cdc11fb 100644 --- a/game_eggs/steamcmd_servers/mordhau/egg-mordhau-wine.json +++ b/game_eggs/steamcmd_servers/mordhau/egg-mordhau-wine.json @@ -1,23 +1,28 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-09-13T10:48:47-04:00", + "exported_at": "2021-08-28T18:01:27+00:00", "name": "Mordhau Wine", "author": "parker@parkervcp.com", "description": "Mordhau is a multiplayer medieval hack 'n slash video game, developed by Slovenian independent studio Triternion, with a prominent aspect of skill-based competitive play and customization.", - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_wine-5", - "startup": "xvfb-run --auto-servernum --server-args='-screen 0 1024x768x16:32' wine MordhauServer.exe {{DEFAULT_MAP}} -log MaxSlots={{MAX_PLAYERS}} -USEALLAVAILABLECORES -Port={{SERVER_PORT}} -QueryPort={{QUERY_PORT}} -Beaconport={{BEACON_PORT}}", + "features": null, + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:debian_wine" + ], + "file_denylist": [], + "startup": "xvfb-run --auto-servernum wine MordhauServer.exe {{DEFAULT_MAP}} -log MaxSlots={{MAX_PLAYERS}} -USEALLAVAILABLECORES -Port={{SERVER_PORT}} -QueryPort={{QUERY_PORT}} -Beaconport={{BEACON_PORT}}", "config": { - "files": "{\r\n \"Mordhau\/Saved\/Config\/WindowsServer\/Game.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"AdminPassword=\": \"AdminPassword={{server.build.env.ADMIN_PASSWORD}}\",\r\n \"ServerName=\": \"ServerName={{server.build.env.SERVER_NAME}}\",\r\n \"ServerPassword=\": \"ServerPassword={{server.build.env.GAME_PASSWORD}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"UpdateGameServer completed (bWasSuccessful: 1)\"\r\n}", + "files": "{\r\n \"Mordhau\/Saved\/Config\/WindowsServer\/Game.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"AdminPassword\": \"AdminPassword={{server.build.env.ADMIN_PASSWORD}}\",\r\n \"ServerName\": \"ServerName={{server.build.env.SERVER_NAME}}\",\r\n \"ServerPassword\": \"ServerPassword={{server.build.env.GAME_PASSWORD}}\"\r\n }\r\n }\r\n}", + "startup": "{\"done\": \"Session GameSession successfully created\"}", "logs": "{}", "stop": "^C" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id ffound here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# EXTRA_FLAGS - when a server has extra glas for things like beta installs or updates.\r\n#\r\n##\r\nDEBIAN_FRONTEND=noninteractive\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id ffound here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# EXTRA_FLAGS - when a server has extra glas for things like beta installs or updates.\r\n#\r\n##\r\nexport DEBIAN_FRONTEND=noninteractive\r\n\r\napt -y update\r\ndpkg --add-architecture i386\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates gnupg wget software-properties-common\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## Mordhau specific because reasons\r\ncd \/tmp\r\n\r\n## install latest wine\r\nwget -nc https:\/\/dl.winehq.org\/wine-builds\/winehq.key\r\napt-key add winehq.key\r\necho \"deb https:\/\/dl.winehq.org\/wine-builds\/debian\/ buster main\" >> \/etc\/apt\/sources.list\r\napt update\r\n\r\n## libfaudio needed to install wine\r\nwget -nc https:\/\/download.opensuse.org\/repositories\/Emulators:\/Wine:\/Debian\/Debian_10\/amd64\/libfaudio0_20.01-0~buster_amd64.deb\r\nwget -nc https:\/\/download.opensuse.org\/repositories\/Emulators:\/Wine:\/Debian\/Debian_10\/i386\/libfaudio0_20.01-0~buster_i386.deb\r\n\r\napt install -y .\/libfaudio0_20.01-0~buster_*\r\n\r\n## install wine, cabextract, and xvfb for winetricks\r\napt install -y --install-recommends winehq-stable cabextract xvfb\r\n\r\nexport WINEPREFIX=\/mnt\/server\/.wine\r\nexport WINEDLLOVERRIDES=\"mscoree,mshtml=\"\r\nexport DISPLAY=:0\r\nexport DISPLAY_WIDTH=1024\r\nexport DISPLAY_HEIGHT=768\r\nexport DISPLAY_DEPTH=16\r\nexport AUTO_UPDATE=1\r\nexport XVFB=1\r\n\r\n## install winetricks\r\nwget -q -O \/usr\/sbin\/winetricks https:\/\/raw.githubusercontent.com\/Winetricks\/winetricks\/master\/src\/winetricks \\\r\n&& chmod +x \/usr\/sbin\/winetricks\r\n\r\n## install vc redistributable\r\nxvfb-run --auto-servernum winetricks -q vcrun2019\r\n\r\n## fix issues with startup.\r\nif [[ ! -d \".wine\/drive_c\/users\/container\/My Documents\" ]]; then\r\n mkdir -p \"\/mnt\/server\/.wine\/drive_c\/users\/container\/My Documents\"\r\nfi", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -28,8 +33,8 @@ "description": "", "env_variable": "SRCDS_APPID", "default_value": "629800", - "user_viewable": 0, - "user_editable": 0, + "user_viewable": false, + "user_editable": false, "rules": "required|numeric" }, { @@ -37,8 +42,8 @@ "description": "", "env_variable": "QUERY_PORT", "default_value": "27015", - "user_viewable": 0, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "required|numeric|max:65535" }, { @@ -46,8 +51,8 @@ "description": "Mordhau Beacon Port", "env_variable": "BEACON_PORT", "default_value": "15000", - "user_viewable": 0, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "required|numeric|max:65535" }, { @@ -55,8 +60,8 @@ "description": "Required for windows game server installs", "env_variable": "WINDOWS_INSTALL", "default_value": "1", - "user_viewable": 0, - "user_editable": 0, + "user_viewable": false, + "user_editable": false, "rules": "required|boolean" }, { @@ -64,8 +69,8 @@ "description": "", "env_variable": "ADMIN_PASSWORD", "default_value": "aP@55word", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string" }, { @@ -73,8 +78,8 @@ "description": "", "env_variable": "SERVER_NAME", "default_value": "A Pterodactyl Hosted Server", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string" }, { @@ -82,8 +87,8 @@ "description": "", "env_variable": "GAME_PASSWORD", "default_value": "", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "nullable|string" }, { @@ -91,8 +96,35 @@ "description": "", "env_variable": "DEFAULT_MAP", "default_value": "\/Game\/Mordhau\/Maps\/Contraband\/FFA_Contraband", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Max Players", + "description": "Max Players for the server", + "env_variable": "MAX_PLAYERS", + "default_value": "24", + "user_viewable": true, + "user_editable": true, + "rules": "required|numeric" + }, + { + "name": "Auto Update", + "description": "Decide if you want the server to auto update", + "env_variable": "AUTO_UPDATE", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "required|boolean" + }, + { + "name": "Extra variables for install", + "description": "", + "env_variable": "EXTRA_FLAGS", + "default_value": "", + "user_viewable": false, + "user_editable": false, "rules": "nullable|string" } ] From 1860ee4b592c6a5378904bf0efb3635ef7a88b2b Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 29 Aug 2021 10:33:55 -0400 Subject: [PATCH 0017/1001] update teaspeak fixes issues with the start detection works around the issue with yaml parsing large nimbers weird. --- voice_servers/teaspeak/egg-tea-speak.json | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/voice_servers/teaspeak/egg-tea-speak.json b/voice_servers/teaspeak/egg-tea-speak.json index af92f78e..29b69c63 100644 --- a/voice_servers/teaspeak/egg-tea-speak.json +++ b/voice_servers/teaspeak/egg-tea-speak.json @@ -1,24 +1,28 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-12-13T16:59:05+01:00", + "exported_at": "2021-08-29T14:30:56+00:00", "name": "TeaSpeak", "author": "parker@parkervcp.com", "description": "TeaSpeak is a free to use client and server software for VoIP communication.\r\n\r\nIts the ideal deal software for everyone who is annoyed about limits and restrictions.", "features": null, - "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:base_debian" + ], + "file_denylist": [], "startup": ".\/TeaSpeakServer --property:binding.query.port={{QUERY_PORT}} --property:binding.file.port={{FILE_PORT}} --property:voice.default_port={{SERVER_PORT}}", "config": { - "files": "{\r\n \"config.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"voice.default_port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.env.QUERY_PORT}}\",\r\n \"file.port\": \"{{server.build.env.FILE_PORT}}\",\r\n \"query.motd\": \"\\\"{{server.build.env.SERVER_MOTD}}\\\"\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"config.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"voice.default_port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.env.QUERY_PORT}}\",\r\n \"file.port\": \"{{server.build.env.FILE_PORT}}\",\r\n \"query.motd\": \"\\\"{{server.build.env.SERVER_MOTD}}\\\"\",\r\n \"query.max_line_buffer\": \"10000\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Started server on \"\r\n}", "logs": "{}", "stop": "shutdown now" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n \r\n## install required packages\r\napt update\r\napt upgrade -y\r\napt install curl -y\r\n\r\n## make and change to directory\r\nmkdir \/mnt\/server\r\ncd \/mnt\/server\/\r\n\r\n## get download link\r\nif [ \"${VERSION}\" == \"\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/TeaSpeak-$(curl -sSLk https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/latest).tar.gz\")\r\nelif [ \"${VERSION}\" == \"\" ] || [ \"${VERSION}\" == \"nightly\" ]; then\r\n DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64_nightly\/TeaSpeak-$(curl -sSLk https:\/\/repo.teaspeak.de\/server\/linux\/amd64_nightly\/latest).tar.gz\")\r\nelse\r\n DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/TeaSpeak-${VERSION}.tar.gz\")\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\n## download files\r\necho -e \"running: curl -sSL -o teaspeak.tar.gz ${DOWNLOAD_LINK}\"\r\ncurl -sSL -o teaspeak.tar.gz ${DOWNLOAD_LINK}\r\n\r\n## unpack files\r\necho -e \"unpacking files\"\r\ntar xzvf teaspeak.tar.gz\r\n\r\necho -e \"install complete\"", + "script": "#!\/bin\/bash\r\n \r\n## install required packages\r\napt update\r\napt upgrade -y\r\napt install curl -y\r\n\r\n## make and change to directory\r\nmkdir \/mnt\/server\r\ncd \/mnt\/server\/\r\n\r\n## get download link\r\nif [ \"${VERSION}\" == \"\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/TeaSpeak-$(curl -sSLk https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/latest).tar.gz\")\r\nelif [ \"${VERSION}\" == \"\" ] || [ \"${VERSION}\" == \"beta\" ]; then\r\n DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64_nightly\/TeaSpeak-$(curl -sSLk https:\/\/repo.teaspeak.de\/server\/linux\/amd64_nightly\/latest).tar.gz\")\r\nelse\r\n DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/TeaSpeak-${VERSION}.tar.gz\")\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\n## download files\r\necho -e \"running: curl -sSL -o teaspeak.tar.gz ${DOWNLOAD_LINK}\"\r\ncurl -sSL -o teaspeak.tar.gz ${DOWNLOAD_LINK}\r\n\r\n## unpack files\r\necho -e \"unpacking files\"\r\ntar xzvf teaspeak.tar.gz\r\n\r\necho -e \"install complete\"", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -71,7 +75,7 @@ }, { "name": "Teaspeak Version", - "description": "What version of teaspeak to install: latest = latest stable ; nightly = latest nightly", + "description": "What version of teaspeak to install: latest = latest stable ; beta = latest beta", "env_variable": "VERSION", "default_value": "latest", "user_viewable": true, From b0d38ceac2f2277b7963ea089f319e1886e93856 Mon Sep 17 00:00:00 2001 From: Harry W Date: Thu, 9 Sep 2021 16:57:31 +0100 Subject: [PATCH 0018/1001] Update support email --- software/haste-server/egg-haste-server.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/haste-server/egg-haste-server.json b/software/haste-server/egg-haste-server.json index 48d21609..d913ef5c 100644 --- a/software/haste-server/egg-haste-server.json +++ b/software/haste-server/egg-haste-server.json @@ -6,7 +6,7 @@ }, "exported_at": "2021-03-26T17:25:19-04:00", "name": "haste-server", - "author": "freelance@harrydev.me", + "author": "eggs@harryw.link", "description": "Haste is an open-source pastebin software written in node.js, which is easily installable in any network. It can be backed by either redis or filesystem, and has a very easy adapter interface for other stores. A publicly available version can be found at hastebin.com", "features": null, "images": [ From 5c7d1854e4c17532e59e8070cc50d3017f5076e4 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 11 Sep 2021 01:56:25 +0200 Subject: [PATCH 0019/1001] Modified BuildTools startup (#1332) Specify memory for Spigot BuildTools, or it will fail because of too low memory that JVM won't use it all --- game_eggs/minecraft/java/spigot/egg-spigot.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/minecraft/java/spigot/egg-spigot.json b/game_eggs/minecraft/java/spigot/egg-spigot.json index fa0665df..319d3d73 100644 --- a/game_eggs/minecraft/java/spigot/egg-spigot.json +++ b/game_eggs/minecraft/java/spigot/egg-spigot.json @@ -26,7 +26,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt update \r\napt install -y curl wget git openssl bash bc apt-transport-https gnupg software-properties-common\r\nwget -qO - https:\/\/adoptopenjdk.jfrog.io\/adoptopenjdk\/api\/gpg\/key\/public | apt-key add -\r\nadd-apt-repository --yes https:\/\/adoptopenjdk.jfrog.io\/adoptopenjdk\/deb\/\r\napt update\r\nmkdir -p \/usr\/share\/man\/man1\r\nif [ \"${DL_VERSION}\" == \"latest\" ] || (( $(echo \"${DL_VERSION} >= 1.17\" | bc -l) )); then\r\n apt install -y adoptopenjdk-16-hotspot\r\nelse\r\n apt install -y adoptopenjdk-8-hotspot\r\nfi\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n cd \/mnt\/server\r\n\r\n MODIFIED_DOWNLOAD=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\n curl -sSL -o ${SERVER_JARFILE} ${MODIFIED_DOWNLOAD}\r\nelse\r\n mkdir -p \/srv\/\r\n cd \/srv\/\r\n \r\n wget https:\/\/hub.spigotmc.org\/jenkins\/job\/BuildTools\/lastSuccessfulBuild\/artifact\/target\/BuildTools.jar\r\n \r\n java -jar BuildTools.jar --rev ${DL_VERSION}\r\n\r\n mv spigot-*.jar \/mnt\/server\/${SERVER_JARFILE}\r\nfi", + "script": "#!\/bin\/bash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt update \r\napt install -y curl wget git openssl bash bc apt-transport-https gnupg software-properties-common\r\nwget -qO - https:\/\/adoptopenjdk.jfrog.io\/adoptopenjdk\/api\/gpg\/key\/public | apt-key add -\r\nadd-apt-repository --yes https:\/\/adoptopenjdk.jfrog.io\/adoptopenjdk\/deb\/\r\napt update\r\nmkdir -p \/usr\/share\/man\/man1\r\nif [ \"${DL_VERSION}\" == \"latest\" ] || (( $(echo \"${DL_VERSION} >= 1.17\" | bc -l) )); then\r\n apt install -y adoptopenjdk-16-hotspot\r\nelse\r\n apt install -y adoptopenjdk-8-hotspot\r\nfi\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n cd \/mnt\/server\r\n\r\n MODIFIED_DOWNLOAD=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\n curl -sSL -o ${SERVER_JARFILE} ${MODIFIED_DOWNLOAD}\r\nelse\r\n mkdir -p \/srv\/\r\n cd \/srv\/\r\n \r\n wget https:\/\/hub.spigotmc.org\/jenkins\/job\/BuildTools\/lastSuccessfulBuild\/artifact\/target\/BuildTools.jar\r\n \r\n java -Xms${SERVER_MEMORY}M -jar BuildTools.jar --rev ${DL_VERSION}\r\n\r\n mv spigot-*.jar \/mnt\/server\/${SERVER_JARFILE}\r\nfi", "container": "debian:buster-slim", "entrypoint": "bash" } From 56f44fe44040da1df387b5138b1361a3511c68a0 Mon Sep 17 00:00:00 2001 From: Hiraku Date: Mon, 13 Sep 2021 01:49:54 +0200 Subject: [PATCH 0020/1001] Updated Gmod Egg Added an option to change the game's version --- stock_eggs/source-engine/egg-garrys-mod.json | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/stock_eggs/source-engine/egg-garrys-mod.json b/stock_eggs/source-engine/egg-garrys-mod.json index 056a51bd..a5023551 100644 --- a/stock_eggs/source-engine/egg-garrys-mod.json +++ b/stock_eggs/source-engine/egg-garrys-mod.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-08-27T00:12:31-04:00", + "exported_at": "2021-09-13T01:38:39+02:00", "name": "Garrys Mod", "author": "support@pterodactyl.io", "description": "Garrys Mod, is a sandbox physics game created by Garry Newman, and developed by his company, Facepunch Studios.", @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n# Creating needed default files for the game\r\ncd \/mnt\/server\/garrysmod\/lua\/autorun\/server\r\necho '\r\n-- Docs: https:\/\/wiki.garrysmod.com\/page\/resource\/AddWorkshop\r\n-- Place the ID of the workshop addon you want to be downloaded to people who join your server, not the collection ID\r\n-- Use https:\/\/beta.configcreator.com\/create\/gmod\/resources.lua to easily create a list based on your collection ID\r\n\r\nresource.AddWorkshop( \"\" )\r\n' > workshop.lua\r\n\r\ncd \/mnt\/server\/garrysmod\/cfg\r\necho '\r\n\/\/ Please do not set RCon in here, use the startup parameters.\r\n\r\nhostname\t\t\"New Gmod Server\"\r\nsv_password\t\t\"\"\r\nsv_loadingurl \"\"\r\nsv_downloadurl \"\"\r\n\r\n\/\/ Steam Server List Settings\r\n\/\/ sv_location \"eu\"\r\nsv_region \"255\"\r\nsv_lan \"0\"\r\nsv_max_queries_sec_global \"30000\"\r\nsv_max_queries_window \"45\"\r\nsv_max_queries_sec \"5\"\r\n\r\n\/\/ Server Limits\r\nsbox_maxprops\t\t100\r\nsbox_maxragdolls\t5\r\nsbox_maxnpcs\t\t10\r\nsbox_maxballoons\t10\r\nsbox_maxeffects\t\t10\r\nsbox_maxdynamite\t10\r\nsbox_maxlamps\t\t10\r\nsbox_maxthrusters\t10\r\nsbox_maxwheels\t\t10\r\nsbox_maxhoverballs\t10\r\nsbox_maxvehicles\t20\r\nsbox_maxbuttons\t\t10\r\nsbox_maxsents\t\t20\r\nsbox_maxemitters\t5\r\nsbox_godmode\t\t0\r\nsbox_noclip\t\t 0\r\n\r\n\/\/ Network Settings - Please keep these set to default.\r\n\r\nsv_minrate\t\t75000\r\nsv_maxrate\t\t0\r\ngmod_physiterations\t2\r\nnet_splitpacket_maxrate\t45000\r\ndecalfrequency\t\t12 \r\n\r\n\/\/ Execute Ban Files - Please do not edit\r\nexec banned_ip.cfg \r\nexec banned_user.cfg \r\n\r\n\/\/ Add custom lines under here\r\n' > server.cfg", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\necho -e \"steam user is not set.\\n\"\r\necho -e \"Using anonymous user.\\n\"\r\nSTEAM_USER=anonymous\r\nSTEAM_PASS=\"\"\r\nSTEAM_AUTH=\"\"\r\nelse\r\necho -e \"user set to ${STEAM_USER}\"\r\nfi\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\r\ncd \/mnt\/server\/steamcmd\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\nexport HOME=\/mnt\/server\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} -beta ${BETA} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n# Creating needed default files for the game\r\ncd \/mnt\/server\/garrysmod\/lua\/autorun\/server\r\necho '\r\n-- Docs: https:\/\/wiki.garrysmod.com\/page\/resource\/AddWorkshop\r\n-- Place the ID of the workshop addon you want to be downloaded to people who join your server, not the collection ID\r\n-- Use https:\/\/beta.configcreator.com\/create\/gmod\/resources.lua to easily create a list based on your collection ID\r\nresource.AddWorkshop( \"\" )\r\n' > workshop.lua\r\ncd \/mnt\/server\/garrysmod\/cfg\r\necho '\r\n\/\/ Please do not set RCon in here, use the startup parameters.\r\nhostname \"New Gmod Server\"\r\nsv_password \"\"\r\nsv_loadingurl \"\"\r\nsv_downloadurl \"\"\r\n\/\/ Steam Server List Settings\r\n\/\/ sv_location \"eu\"\r\nsv_region \"255\"\r\nsv_lan \"0\"\r\nsv_max_queries_sec_global \"30000\"\r\nsv_max_queries_window \"45\"\r\nsv_max_queries_sec \"5\"\r\n\/\/ Server Limits\r\nsbox_maxprops 100\r\nsbox_maxragdolls\t5\r\nsbox_maxnpcs 10\r\nsbox_maxballoons\t10\r\nsbox_maxeffects 10\r\nsbox_maxdynamite\t10\r\nsbox_maxlamps 10\r\nsbox_maxthrusters\t10\r\nsbox_maxwheels 10\r\nsbox_maxhoverballs\t10\r\nsbox_maxvehicles\t20\r\nsbox_maxbuttons 10\r\nsbox_maxsents 20\r\nsbox_maxemitters\t5\r\nsbox_godmode 0\r\nsbox_noclip 0\r\n\/\/ Network Settings - Please keep these set to default.\r\nsv_minrate 75000\r\nsv_maxrate 0\r\ngmod_physiterations\t2\r\nnet_splitpacket_maxrate\t45000\r\ndecalfrequency 12\r\n\/\/ Execute Ban Files - Please do not edit\r\nexec banned_ip.cfg\r\nexec banned_user.cfg\r\n\/\/ Add custom lines under here\r\n' > server.cfg", "container": "ghcr.io\/pterodactyl\/installers:debian", "entrypoint": "bash" } @@ -99,6 +99,15 @@ "user_viewable": true, "user_editable": true, "rules": "required|boolean" + }, + { + "name": "Beta", + "description": "Determines which server version should be used. | NONE = stable release | x86-64 = 64Bit beta.\r\nIt is necessary to reinstall the server when changing the version here.", + "env_variable": "BETA", + "default_value": "NONE", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:10" } ] -} \ No newline at end of file +} From a13c03632bcb5063d5200b3017f21a470ac1069f Mon Sep 17 00:00:00 2001 From: Hiraku Date: Mon, 13 Sep 2021 01:54:01 +0200 Subject: [PATCH 0021/1001] syntax fix --- stock_eggs/source-engine/egg-garrys-mod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock_eggs/source-engine/egg-garrys-mod.json b/stock_eggs/source-engine/egg-garrys-mod.json index a5023551..327c95fa 100644 --- a/stock_eggs/source-engine/egg-garrys-mod.json +++ b/stock_eggs/source-engine/egg-garrys-mod.json @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\necho -e \"steam user is not set.\\n\"\r\necho -e \"Using anonymous user.\\n\"\r\nSTEAM_USER=anonymous\r\nSTEAM_PASS=\"\"\r\nSTEAM_AUTH=\"\"\r\nelse\r\necho -e \"user set to ${STEAM_USER}\"\r\nfi\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\r\ncd \/mnt\/server\/steamcmd\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\nexport HOME=\/mnt\/server\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} -beta ${BETA} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n# Creating needed default files for the game\r\ncd \/mnt\/server\/garrysmod\/lua\/autorun\/server\r\necho '\r\n-- Docs: https:\/\/wiki.garrysmod.com\/page\/resource\/AddWorkshop\r\n-- Place the ID of the workshop addon you want to be downloaded to people who join your server, not the collection ID\r\n-- Use https:\/\/beta.configcreator.com\/create\/gmod\/resources.lua to easily create a list based on your collection ID\r\nresource.AddWorkshop( \"\" )\r\n' > workshop.lua\r\ncd \/mnt\/server\/garrysmod\/cfg\r\necho '\r\n\/\/ Please do not set RCon in here, use the startup parameters.\r\nhostname \"New Gmod Server\"\r\nsv_password \"\"\r\nsv_loadingurl \"\"\r\nsv_downloadurl \"\"\r\n\/\/ Steam Server List Settings\r\n\/\/ sv_location \"eu\"\r\nsv_region \"255\"\r\nsv_lan \"0\"\r\nsv_max_queries_sec_global \"30000\"\r\nsv_max_queries_window \"45\"\r\nsv_max_queries_sec \"5\"\r\n\/\/ Server Limits\r\nsbox_maxprops 100\r\nsbox_maxragdolls\t5\r\nsbox_maxnpcs 10\r\nsbox_maxballoons\t10\r\nsbox_maxeffects 10\r\nsbox_maxdynamite\t10\r\nsbox_maxlamps 10\r\nsbox_maxthrusters\t10\r\nsbox_maxwheels 10\r\nsbox_maxhoverballs\t10\r\nsbox_maxvehicles\t20\r\nsbox_maxbuttons 10\r\nsbox_maxsents 20\r\nsbox_maxemitters\t5\r\nsbox_godmode 0\r\nsbox_noclip 0\r\n\/\/ Network Settings - Please keep these set to default.\r\nsv_minrate 75000\r\nsv_maxrate 0\r\ngmod_physiterations\t2\r\nnet_splitpacket_maxrate\t45000\r\ndecalfrequency 12\r\n\/\/ Execute Ban Files - Please do not edit\r\nexec banned_ip.cfg\r\nexec banned_user.cfg\r\n\/\/ Add custom lines under here\r\n' > server.cfg", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} -beta ${BETA} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n# Creating needed default files for the game\r\ncd \/mnt\/server\/garrysmod\/lua\/autorun\/server\r\necho '\r\n-- Docs: https:\/\/wiki.garrysmod.com\/page\/resource\/AddWorkshop\r\n-- Place the ID of the workshop addon you want to be downloaded to people who join your server, not the collection ID\r\n-- Use https:\/\/beta.configcreator.com\/create\/gmod\/resources.lua to easily create a list based on your collection ID\r\n\r\nresource.AddWorkshop( \"\" )\r\n' > workshop.lua\r\n\r\ncd \/mnt\/server\/garrysmod\/cfg\r\necho '\r\n\/\/ Please do not set RCon in here, use the startup parameters.\r\n\r\nhostname\t\t\"New Gmod Server\"\r\nsv_password\t\t\"\"\r\nsv_loadingurl \"\"\r\nsv_downloadurl \"\"\r\n\r\n\/\/ Steam Server List Settings\r\n\/\/ sv_location \"eu\"\r\nsv_region \"255\"\r\nsv_lan \"0\"\r\nsv_max_queries_sec_global \"30000\"\r\nsv_max_queries_window \"45\"\r\nsv_max_queries_sec \"5\"\r\n\r\n\/\/ Server Limits\r\nsbox_maxprops\t\t100\r\nsbox_maxragdolls\t5\r\nsbox_maxnpcs\t\t10\r\nsbox_maxballoons\t10\r\nsbox_maxeffects\t\t10\r\nsbox_maxdynamite\t10\r\nsbox_maxlamps\t\t10\r\nsbox_maxthrusters\t10\r\nsbox_maxwheels\t\t10\r\nsbox_maxhoverballs\t10\r\nsbox_maxvehicles\t20\r\nsbox_maxbuttons\t\t10\r\nsbox_maxsents\t\t20\r\nsbox_maxemitters\t5\r\nsbox_godmode\t\t0\r\nsbox_noclip\t\t 0\r\n\r\n\/\/ Network Settings - Please keep these set to default.\r\n\r\nsv_minrate\t\t75000\r\nsv_maxrate\t\t0\r\ngmod_physiterations\t2\r\nnet_splitpacket_maxrate\t45000\r\ndecalfrequency\t\t12 \r\n\r\n\/\/ Execute Ban Files - Please do not edit\r\nexec banned_ip.cfg \r\nexec banned_user.cfg \r\n\r\n\/\/ Add custom lines under here\r\n' > server.cfg", "container": "ghcr.io\/pterodactyl\/installers:debian", "entrypoint": "bash" } From 36dc9784530447590d0e2c2c425ed383c023c3be Mon Sep 17 00:00:00 2001 From: Hiraku Date: Mon, 13 Sep 2021 03:17:56 +0200 Subject: [PATCH 0022/1001] Changed `env_variable` from `BETA` to `SRCDS_BETAID` --- stock_eggs/source-engine/egg-garrys-mod.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stock_eggs/source-engine/egg-garrys-mod.json b/stock_eggs/source-engine/egg-garrys-mod.json index 327c95fa..1aec6687 100644 --- a/stock_eggs/source-engine/egg-garrys-mod.json +++ b/stock_eggs/source-engine/egg-garrys-mod.json @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} -beta ${BETA} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n# Creating needed default files for the game\r\ncd \/mnt\/server\/garrysmod\/lua\/autorun\/server\r\necho '\r\n-- Docs: https:\/\/wiki.garrysmod.com\/page\/resource\/AddWorkshop\r\n-- Place the ID of the workshop addon you want to be downloaded to people who join your server, not the collection ID\r\n-- Use https:\/\/beta.configcreator.com\/create\/gmod\/resources.lua to easily create a list based on your collection ID\r\n\r\nresource.AddWorkshop( \"\" )\r\n' > workshop.lua\r\n\r\ncd \/mnt\/server\/garrysmod\/cfg\r\necho '\r\n\/\/ Please do not set RCon in here, use the startup parameters.\r\n\r\nhostname\t\t\"New Gmod Server\"\r\nsv_password\t\t\"\"\r\nsv_loadingurl \"\"\r\nsv_downloadurl \"\"\r\n\r\n\/\/ Steam Server List Settings\r\n\/\/ sv_location \"eu\"\r\nsv_region \"255\"\r\nsv_lan \"0\"\r\nsv_max_queries_sec_global \"30000\"\r\nsv_max_queries_window \"45\"\r\nsv_max_queries_sec \"5\"\r\n\r\n\/\/ Server Limits\r\nsbox_maxprops\t\t100\r\nsbox_maxragdolls\t5\r\nsbox_maxnpcs\t\t10\r\nsbox_maxballoons\t10\r\nsbox_maxeffects\t\t10\r\nsbox_maxdynamite\t10\r\nsbox_maxlamps\t\t10\r\nsbox_maxthrusters\t10\r\nsbox_maxwheels\t\t10\r\nsbox_maxhoverballs\t10\r\nsbox_maxvehicles\t20\r\nsbox_maxbuttons\t\t10\r\nsbox_maxsents\t\t20\r\nsbox_maxemitters\t5\r\nsbox_godmode\t\t0\r\nsbox_noclip\t\t 0\r\n\r\n\/\/ Network Settings - Please keep these set to default.\r\n\r\nsv_minrate\t\t75000\r\nsv_maxrate\t\t0\r\ngmod_physiterations\t2\r\nnet_splitpacket_maxrate\t45000\r\ndecalfrequency\t\t12 \r\n\r\n\/\/ Execute Ban Files - Please do not edit\r\nexec banned_ip.cfg \r\nexec banned_user.cfg \r\n\r\n\/\/ Add custom lines under here\r\n' > server.cfg", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} -beta ${SRCDS_BETAID} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n# Creating needed default files for the game\r\ncd \/mnt\/server\/garrysmod\/lua\/autorun\/server\r\necho '\r\n-- Docs: https:\/\/wiki.garrysmod.com\/page\/resource\/AddWorkshop\r\n-- Place the ID of the workshop addon you want to be downloaded to people who join your server, not the collection ID\r\n-- Use https:\/\/beta.configcreator.com\/create\/gmod\/resources.lua to easily create a list based on your collection ID\r\n\r\nresource.AddWorkshop( \"\" )\r\n' > workshop.lua\r\n\r\ncd \/mnt\/server\/garrysmod\/cfg\r\necho '\r\n\/\/ Please do not set RCon in here, use the startup parameters.\r\n\r\nhostname\t\t\"New Gmod Server\"\r\nsv_password\t\t\"\"\r\nsv_loadingurl \"\"\r\nsv_downloadurl \"\"\r\n\r\n\/\/ Steam Server List Settings\r\n\/\/ sv_location \"eu\"\r\nsv_region \"255\"\r\nsv_lan \"0\"\r\nsv_max_queries_sec_global \"30000\"\r\nsv_max_queries_window \"45\"\r\nsv_max_queries_sec \"5\"\r\n\r\n\/\/ Server Limits\r\nsbox_maxprops\t\t100\r\nsbox_maxragdolls\t5\r\nsbox_maxnpcs\t\t10\r\nsbox_maxballoons\t10\r\nsbox_maxeffects\t\t10\r\nsbox_maxdynamite\t10\r\nsbox_maxlamps\t\t10\r\nsbox_maxthrusters\t10\r\nsbox_maxwheels\t\t10\r\nsbox_maxhoverballs\t10\r\nsbox_maxvehicles\t20\r\nsbox_maxbuttons\t\t10\r\nsbox_maxsents\t\t20\r\nsbox_maxemitters\t5\r\nsbox_godmode\t\t0\r\nsbox_noclip\t\t 0\r\n\r\n\/\/ Network Settings - Please keep these set to default.\r\n\r\nsv_minrate\t\t75000\r\nsv_maxrate\t\t0\r\ngmod_physiterations\t2\r\nnet_splitpacket_maxrate\t45000\r\ndecalfrequency\t\t12 \r\n\r\n\/\/ Execute Ban Files - Please do not edit\r\nexec banned_ip.cfg \r\nexec banned_user.cfg \r\n\r\n\/\/ Add custom lines under here\r\n' > server.cfg", "container": "ghcr.io\/pterodactyl\/installers:debian", "entrypoint": "bash" } @@ -102,8 +102,8 @@ }, { "name": "Beta", - "description": "Determines which server version should be used. | NONE = stable release | x86-64 = 64Bit beta.\r\nIt is necessary to reinstall the server when changing the version here.", - "env_variable": "BETA", + "description": "Determines which server version should be used. | NONE = stable release | x86-64 = 64Bit beta.", + "env_variable": "SRCDS_BETAID", "default_value": "NONE", "user_viewable": true, "user_editable": true, From dc267dee418b6137ff8350830ac0cd19b017887c Mon Sep 17 00:00:00 2001 From: Hiraku Date: Mon, 13 Sep 2021 12:52:37 +0200 Subject: [PATCH 0023/1001] Added variable to validate serverfiles This is required to run once after performing a version change via Beta variable. --- stock_eggs/source-engine/egg-garrys-mod.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/stock_eggs/source-engine/egg-garrys-mod.json b/stock_eggs/source-engine/egg-garrys-mod.json index 1aec6687..8ff1c43c 100644 --- a/stock_eggs/source-engine/egg-garrys-mod.json +++ b/stock_eggs/source-engine/egg-garrys-mod.json @@ -108,6 +108,14 @@ "user_viewable": true, "user_editable": true, "rules": "required|string|max:10" - } - ] + }, + { + "name": "Validate Serverfiles", + "description": "Should be enabled once after changing the server version.\r\n0 = disable validating serverfiles,\r\n1 = enable validating serverfiles", + "env_variable": "VALIDATE", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "required|boolean" + } ] } From 2f718bb1c2d949bc2228fdb18eda18d959f225b7 Mon Sep 17 00:00:00 2001 From: 1euro7cent Date: Sun, 19 Sep 2021 10:57:29 +0200 Subject: [PATCH 0024/1001] Added languagetool server --- README.md | 2 + software/language-tool/README.md | 5 +++ software/language-tool/egg-languagetool.json | 39 ++++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 software/language-tool/README.md create mode 100644 software/language-tool/egg-languagetool.json diff --git a/README.md b/README.md index 93f4c9dc..762f93ce 100644 --- a/README.md +++ b/README.md @@ -250,3 +250,5 @@ If you are reading this it looks like you are looking to add an egg to your serv * [haste-server](/software/haste-server) ### RabbitMQ * [rabbitmq](/software/rabbitmq) +### Language-Tool +* [languagetool](/software/language-tool) diff --git a/software/language-tool/README.md b/software/language-tool/README.md new file mode 100644 index 00000000..c3b71ce0 --- /dev/null +++ b/software/language-tool/README.md @@ -0,0 +1,5 @@ +# Language-Tool + +LanguageTool is an Open Source proofreading software for English, French, German, Polish, Russian, [and more than 20 other languages](https://languagetool.org/languages/). It finds many errors that a simple spell checker cannot detect. + +View https://languagetool.org for more information. diff --git a/software/language-tool/egg-languagetool.json b/software/language-tool/egg-languagetool.json new file mode 100644 index 00000000..d0f85458 --- /dev/null +++ b/software/language-tool/egg-languagetool.json @@ -0,0 +1,39 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-09-19T10:46:15+02:00", + "name": "Languagetool", + "author": "thomasruhl@live.de", + "description": "This egg installs a LanguageTool server\r\n\r\nLanguageTool is an Open Source proofreading software for English, French, German, Polish, Russian, and more than 20 other languages. It finds many errors that a simple spell checker cannot detect.\r\n\r\nView https://languagetool.org for more information.", + "features": null, + "images": ["ghcr.io/software-noob/pterodactyl-images:java_8"], + "file_denylist": [], + "startup": "java -cp languagetool-server.jar org.languagetool.server.HTTPServer --port {{SERVER_PORT}} --allow-origin \\\"*\\\" --public --config config.properties", + "config": { + "files": "{\r\n \"config.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"languageModel\": \"models/\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Server started\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!/bin/ash\r\napk add --no-cache unzip # to make shure the unzipper is working properly\r\nmkdir -p /mnt/server\r\nmkdir -p /mnt/server/models\r\ncd /mnt/server\r\ntouch config.properties\r\nMODEL_URL=\"https://languagetool.org/download/ngram-data/\"\r\n\r\nDATAS=\"ngrams-de-20150819.zip ngrams-en-20150817.zip ngrams-es-20150915.zip ngrams-fr-20150913.zip ngrams-nl-20181229.zip\"\r\n\r\necho downloading models\r\n\r\n\r\nfor i in $TRAIN_MODELS; do\r\nfor d in $DATAS; do\r\n if [[ $d =~ $i ]]; then\r\n DOWNLOAD_LINK=\"$MODEL_URL$d\"\r\n echo \"downloading $DOWNLOAD_LINK\"\r\n echo \"this could take some while\"\r\n curl $DOWNLOAD_LINK --output models/$d\r\n cd models/\r\n echo \"unziping $d\"\r\n unzip $d\r\n rm $d\r\n cd /mnt/server\r\n fi\r\n\r\n done\r\n\r\ndone\r\ncurl https://languagetool.org/download/LanguageTool-stable.zip --output download.zip\r\necho unziping\r\nunzip download.zip\r\necho moving files\r\nmv LanguageTool-*/* .\r\n\r\nrm -rf LanguageTool-*\r\nrm download.zip -rf\r\necho Finished install", + "container": "ghcr.io/pterodactyl/installers:alpine", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Include traindata", + "description": "WARNING!! This take up a lot of disk space. You have being warned.\r\nNothing = none.\r\nSeparate by spaces.\r\nCurrent language codes= \"de en es fr nl\" (15.09.2021 dd/mm/yyyyy)", + "env_variable": "TRAIN_MODELS", + "default_value": "none", + "user_viewable": true, + "user_editable": true, + "rules": "string" + } + ] +} From 17e13162f8ae79e7e32f404d583af2f0f7c52668 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 19 Sep 2021 15:22:16 +0300 Subject: [PATCH 0025/1001] Eggs/rust wipe (#1344) * eggs(rust): disallow invalid characters for RCON Do not allow invalid characters for RCON password that would break the connection, similar to original Rust egg. * docs(rust-autowipe): Specify that wipe is performed on reinstall --- .../rust/rust_autowipe/README.md | 4 +- .../rust/rust_autowipe/egg-rust-autowipe.json | 85 ++++++++++--------- 2 files changed, 47 insertions(+), 42 deletions(-) diff --git a/game_eggs/steamcmd_servers/rust/rust_autowipe/README.md b/game_eggs/steamcmd_servers/rust/rust_autowipe/README.md index 27532983..292eef0c 100644 --- a/game_eggs/steamcmd_servers/rust/rust_autowipe/README.md +++ b/game_eggs/steamcmd_servers/rust/rust_autowipe/README.md @@ -1,9 +1,9 @@ ### Rust Autowipe The only aim in Rust is to survive. To do this you will need to overcome struggles such as hunger, thirst and cold. Build a fire. Build a shelter. Kill animals for meat. Protect yourself from other players, and kill them for meat. Create alliances with other players and form a town. Do whatever it takes to survive. -Adds variables to wipe files based on a list you set. +Adds variables to wipe files based on a list you set. Reinstall to perform the wipe. -The variable `REGEN_SERVER` was added, default 0 set to 1 to generate a random seed and remove old files +The variable `REGEN_SERVER` was added, default 0, set to 1 to generate a random seed and remove old files on reinstall. Files listed in the `REMOVE_FILES` variabe, space separated, will be removed. diff --git a/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json b/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json index 6bb60689..2aed7dd3 100644 --- a/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json +++ b/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json @@ -1,24 +1,29 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-06-29T18:44:15-04:00", + "exported_at": "2021-09-19T08:13:28-04:00", "name": "Rust Autowipe", "author": "support@pterodactyl.io", "description": "The only aim in Rust is to survive. To do this you will need to overcome struggles such as hunger, thirst and cold. Build a fire. Build a shelter. Kill animals for meat. Protect yourself from other players, and kill them for meat. Create alliances with other players and form a town. Do whatever it takes to survive.", - "image": "quay.io\/pterodactyl\/core:rust", + "features": null, + "images": [ + "quay.io\/pterodactyl\/core:rust" + ], + "file_denylist": [], "startup": "\".\/RustDedicated -batchmode +server.port {{SERVER_PORT}} +server.identity \"rust\" +rcon.port {{RCON_PORT}} +rcon.web true +server.hostname \\\"{{HOSTNAME}}\\\" +server.level \\\"{{LEVEL}}\\\" +server.description \\\"{{DESCRIPTION}}\\\" +server.url \\\"{{SERVER_URL}}\\\" +server.headerimage \\\"{{SERVER_IMG}}\\\" +server.worldsize \\\"{{WORLD_SIZE}}\\\" +server.seed \\\"$( if [ -f seed.txt ] && [[ ${WORLD_SEED} == \"0\" ]]; then printf %s $(cat seed.txt); else printf %s '${WORLD_SEED}'; fi )\\\" +server.maxplayers {{MAX_PLAYERS}} +rcon.password \\\"{{RCON_PASS}}\\\" +server.saveinterval {{SAVEINTERVAL}} {{ADDITIONAL_ARGS}}\"", "config": { "files": "{}", - "startup": "{\r\n \"done\": \"Server startup complete\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"latest.log\"\r\n}", + "startup": "{\r\n \"done\": \"Server startup complete\"\r\n}", + "logs": "{}", "stop": "quit" }, "scripts": { "installation": { "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\nSRCDS_APPID=258550\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\nif [ ${REGEN_SERVER} == \"1\" ]; then\r\n cd \/mnt\/server\/\r\n rm -rf ${REMOVE_FILES}\r\nfi\r\n\r\nif [ $WORLD_SEED == \"0\" ]; then\r\n if [ ! -f \/mnt\/server\/seed.txt ]; then\r\n rm -sf \/mnt\/server\/seed.txt\r\n fi\r\n \r\n cat \/dev\/urandom | tr -dc '1-9' | fold -w 5 | head -n 1 > \/mnt\/server\/seed.txt\r\nfi", - "container": "ubuntu:18.04", + "container": "debian:buster-slim", "entrypoint": "bash" } }, @@ -28,8 +33,8 @@ "description": "The name of your server in the public server list.", "env_variable": "HOSTNAME", "default_value": "A Rust Server", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:40" }, { @@ -37,8 +42,8 @@ "description": "Set whether you want the server to use and auto update OxideMod or not. Valid options are \"1\" for true and \"0\" for false.", "env_variable": "OXIDE", "default_value": "0", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|boolean" }, { @@ -46,8 +51,8 @@ "description": "The world file for Rust to use.", "env_variable": "LEVEL", "default_value": "Procedural Map", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" }, { @@ -55,8 +60,8 @@ "description": "The description under your server title. Commonly used for rules & info. Use \\n for newlines.", "env_variable": "DESCRIPTION", "default_value": "Powered by Pterodactyl", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string" }, { @@ -64,8 +69,8 @@ "description": "The URL for your server. This is what comes up when clicking the \"Visit Website\" button.", "env_variable": "SERVER_URL", "default_value": "http:\/\/pterodactyl.io", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "nullable|url" }, { @@ -73,8 +78,8 @@ "description": "The world size for a procedural map.", "env_variable": "WORLD_SIZE", "default_value": "3000", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|integer" }, { @@ -82,8 +87,8 @@ "description": "The seed for a procedural map.", "env_variable": "WORLD_SEED", "default_value": "0", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "nullable|string" }, { @@ -91,8 +96,8 @@ "description": "The maximum amount of players allowed in the server at once.", "env_variable": "MAX_PLAYERS", "default_value": "40", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|integer" }, { @@ -100,8 +105,8 @@ "description": "The header image for the top of your server listing.", "env_variable": "SERVER_IMG", "default_value": "", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "nullable|url" }, { @@ -109,8 +114,8 @@ "description": "Port for RCON connections.", "env_variable": "RCON_PORT", "default_value": "28016", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "required|integer" }, { @@ -118,17 +123,17 @@ "description": "RCON access password.", "env_variable": "RCON_PASS", "default_value": "CHANGEME", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:64" + "user_viewable": true, + "user_editable": true, + "rules": "required|regex:\/^[\\w.-]*$\/|max:64" }, { "name": "Save Interval", "description": "Sets the server\u2019s auto-save interval in seconds.", "env_variable": "SAVEINTERVAL", "default_value": "60", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|integer" }, { @@ -136,27 +141,27 @@ "description": "Add additional startup parameters to the server.", "env_variable": "ADDITIONAL_ARGS", "default_value": "", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "nullable|string" }, { "name": "Regen Server", - "description": "If the server should have its files removed and regenerate the server seed.", + "description": "If the server should have its files removed and regenerate the server seed on reinstall.", "env_variable": "REGEN_SERVER", "default_value": "0", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|boolean" }, { "name": "Files to remove", - "description": "A space separated list of files to remove when regenerating the server.", + "description": "A space-separated list of files to remove when regenerating the server on reinstall.", "env_variable": "REMOVE_FILES", "default_value": "server\/rust\/player.deaths.*.db server\/rust\/player.identities.*.db server\/rust\/player.states.*.db server\/rust\/player.tokens.db proceduralmap.*.*.*.map server\/rust\/proceduralmap.*.*.*.sav oxide\/data\/Kits_Data.json oxide\/data\/NTeleportationHome.json oxide\/data\/ServerRewards\/player_data.json oxide\/data\/PTTracker\/playtime_data.json", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string" } ] -} +} \ No newline at end of file From 67bce9ce7de451e9041225d321694fdc82d6fb2c Mon Sep 17 00:00:00 2001 From: 1euro7cent Date: Mon, 20 Sep 2021 17:09:58 +0200 Subject: [PATCH 0026/1001] changed stuff with languagetool --- README.md | 4 +- software/language-tool/egg-languagetool.json | 39 ------------------ .../{language-tool => languagetool}/README.md | 2 +- software/languagetool/egg-languagetool.json | 41 +++++++++++++++++++ 4 files changed, 44 insertions(+), 42 deletions(-) delete mode 100644 software/language-tool/egg-languagetool.json rename software/{language-tool => languagetool}/README.md (94%) create mode 100644 software/languagetool/egg-languagetool.json diff --git a/README.md b/README.md index 762f93ce..ac6f4a97 100644 --- a/README.md +++ b/README.md @@ -248,7 +248,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Grafana](/software/grafana) ### haste-server * [haste-server](/software/haste-server) +### LanguageTool +* [languagetool](/software/languagetool) ### RabbitMQ * [rabbitmq](/software/rabbitmq) -### Language-Tool -* [languagetool](/software/language-tool) diff --git a/software/language-tool/egg-languagetool.json b/software/language-tool/egg-languagetool.json deleted file mode 100644 index d0f85458..00000000 --- a/software/language-tool/egg-languagetool.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1", - "update_url": null - }, - "exported_at": "2021-09-19T10:46:15+02:00", - "name": "Languagetool", - "author": "thomasruhl@live.de", - "description": "This egg installs a LanguageTool server\r\n\r\nLanguageTool is an Open Source proofreading software for English, French, German, Polish, Russian, and more than 20 other languages. It finds many errors that a simple spell checker cannot detect.\r\n\r\nView https://languagetool.org for more information.", - "features": null, - "images": ["ghcr.io/software-noob/pterodactyl-images:java_8"], - "file_denylist": [], - "startup": "java -cp languagetool-server.jar org.languagetool.server.HTTPServer --port {{SERVER_PORT}} --allow-origin \\\"*\\\" --public --config config.properties", - "config": { - "files": "{\r\n \"config.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"languageModel\": \"models/\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Server started\"\r\n}", - "logs": "{}", - "stop": "^C" - }, - "scripts": { - "installation": { - "script": "#!/bin/ash\r\napk add --no-cache unzip # to make shure the unzipper is working properly\r\nmkdir -p /mnt/server\r\nmkdir -p /mnt/server/models\r\ncd /mnt/server\r\ntouch config.properties\r\nMODEL_URL=\"https://languagetool.org/download/ngram-data/\"\r\n\r\nDATAS=\"ngrams-de-20150819.zip ngrams-en-20150817.zip ngrams-es-20150915.zip ngrams-fr-20150913.zip ngrams-nl-20181229.zip\"\r\n\r\necho downloading models\r\n\r\n\r\nfor i in $TRAIN_MODELS; do\r\nfor d in $DATAS; do\r\n if [[ $d =~ $i ]]; then\r\n DOWNLOAD_LINK=\"$MODEL_URL$d\"\r\n echo \"downloading $DOWNLOAD_LINK\"\r\n echo \"this could take some while\"\r\n curl $DOWNLOAD_LINK --output models/$d\r\n cd models/\r\n echo \"unziping $d\"\r\n unzip $d\r\n rm $d\r\n cd /mnt/server\r\n fi\r\n\r\n done\r\n\r\ndone\r\ncurl https://languagetool.org/download/LanguageTool-stable.zip --output download.zip\r\necho unziping\r\nunzip download.zip\r\necho moving files\r\nmv LanguageTool-*/* .\r\n\r\nrm -rf LanguageTool-*\r\nrm download.zip -rf\r\necho Finished install", - "container": "ghcr.io/pterodactyl/installers:alpine", - "entrypoint": "ash" - } - }, - "variables": [ - { - "name": "Include traindata", - "description": "WARNING!! This take up a lot of disk space. You have being warned.\r\nNothing = none.\r\nSeparate by spaces.\r\nCurrent language codes= \"de en es fr nl\" (15.09.2021 dd/mm/yyyyy)", - "env_variable": "TRAIN_MODELS", - "default_value": "none", - "user_viewable": true, - "user_editable": true, - "rules": "string" - } - ] -} diff --git a/software/language-tool/README.md b/software/languagetool/README.md similarity index 94% rename from software/language-tool/README.md rename to software/languagetool/README.md index c3b71ce0..8f6a1145 100644 --- a/software/language-tool/README.md +++ b/software/languagetool/README.md @@ -1,4 +1,4 @@ -# Language-Tool +# LanguageTool LanguageTool is an Open Source proofreading software for English, French, German, Polish, Russian, [and more than 20 other languages](https://languagetool.org/languages/). It finds many errors that a simple spell checker cannot detect. diff --git a/software/languagetool/egg-languagetool.json b/software/languagetool/egg-languagetool.json new file mode 100644 index 00000000..2c302986 --- /dev/null +++ b/software/languagetool/egg-languagetool.json @@ -0,0 +1,41 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-09-20T17:08:06+02:00", + "name": "Languagetool", + "author": "thomasruhl@live.de", + "description": "This egg installs a LanguageTool server\r\n\r\nLanguageTool is an Open Source proofreading software for English, French, German, Polish, Russian, and more than 20 other languages. It finds many errors that a simple spell checker cannot detect.\r\n\r\nView https:\/\/languagetool.org for more information.", + "features": null, + "images": [ + "ghcr.io\/pterodactyl\/yolks:java_8" + ], + "file_denylist": [], + "startup": "java -cp languagetool-server.jar org.languagetool.server.HTTPServer --port {{SERVER_PORT}} --allow-origin \\\"*\\\" --public --config config.properties", + "config": { + "files": "{\r\n \"config.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"languageModel\": \"models\/\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Server started\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/ash\r\napk add --no-cache unzip # to make shure the unzipper is working properly\r\nmkdir -p \/mnt\/server\r\nmkdir -p \/mnt\/server\/models\r\ncd \/mnt\/server\r\ntouch config.properties\r\nMODEL_URL=\"https:\/\/languagetool.org\/download\/ngram-data\"\r\n\r\necho downloading models\r\n\r\ncd models\/\r\nfor i in $TRAIN_MODELS; do\r\n DOWNLOAD_LINK=\"$MODEL_URL\/ngrams-$i.zip\"\r\n echo \"downloading $DOWNLOAD_LINK\"\r\n echo \"this could take some while\"\r\n curl $DOWNLOAD_LINK --output $i.zip\r\n echo \"unziping $i.zip\"\r\n unzip $i.zip\r\n rm $i.zip\r\ndone\r\ncd \/mnt\/server\r\n\r\ncurl https:\/\/languagetool.org\/download\/LanguageTool-stable.zip --output download.zip\r\necho unziping\r\nunzip download.zip\r\necho moving files\r\n\r\ncp -r LanguageTool-*\/* .\r\n\r\nrm -rf LanguageTool-*\r\nrm download.zip -rf\r\necho Finished install", + "container": "ghcr.io\/pterodactyl\/installers:alpine", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Include traindata", + "description": "This takes up a lot of disk space.\r\n\r\nSeparate each value with spaces. For example, \"de-20150819 en-20150817\"\r\n\r\nView all available models at https:\/\/languagetool.org\/download\/ngram-data\/", + "env_variable": "TRAIN_MODELS", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + } + ] +} \ No newline at end of file From 7545a7a2d10587f2461cce98cdfbd149e81ee11f Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Mon, 20 Sep 2021 14:38:08 -0400 Subject: [PATCH 0027/1001] switch to using ghcr yolk image --- voice_servers/teaspeak/egg-tea-speak.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/voice_servers/teaspeak/egg-tea-speak.json b/voice_servers/teaspeak/egg-tea-speak.json index 29b69c63..2a5c6d3b 100644 --- a/voice_servers/teaspeak/egg-tea-speak.json +++ b/voice_servers/teaspeak/egg-tea-speak.json @@ -10,7 +10,7 @@ "description": "TeaSpeak is a free to use client and server software for VoIP communication.\r\n\r\nIts the ideal deal software for everyone who is annoyed about limits and restrictions.", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:base_debian" + "ghcr.io\/parkervcp\/yolks:voice_teaspeak" ], "file_denylist": [], "startup": ".\/TeaSpeakServer --property:binding.query.port={{QUERY_PORT}} --property:binding.file.port={{FILE_PORT}} --property:voice.default_port={{SERVER_PORT}}", From 66296263a2c082197fd629b47a55ff075dbeec1e Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 20 Sep 2021 21:39:15 +0300 Subject: [PATCH 0028/1001] docs: fix stock_eggs URL (#1347) --- stock_eggs/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stock_eggs/README.md b/stock_eggs/README.md index 5dd6e42b..9800efe2 100644 --- a/stock_eggs/README.md +++ b/stock_eggs/README.md @@ -1,5 +1,5 @@ -# Stock pterodactyl eggs +# Stock Pterodactyl eggs -eggs based on the stock [pterodactyl eggs](https://github.com/pterodactyl/panel/tree/develop/database/seeds/eggs) +Eggs based on the stock [Pterodactyl eggs](https://github.com/pterodactyl/panel/tree/develop/database/Seeders/eggs). -These are mostly fixes that should make it into the main repo eventually as I pr them over. \ No newline at end of file +These are mostly fixes that should make it into the main repo eventually as I pr them over. From 08b44f076098464a5bc062f56e9a9070d9b70afe Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 20 Sep 2021 21:39:26 +0300 Subject: [PATCH 0029/1001] eggs(space-engineers): Fix auto-update (#1339) Fixes auto-updates by using correct variable for APP_ID, providing windows flag and removing unnecessary hard-coded install path. --- .../space_engineers/egg-space-engineers.json | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json b/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json index 747f0b71..40697ed3 100644 --- a/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json +++ b/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-07-02T04:22:12+03:00", + "exported_at": "2021-09-15T18:24:11-04:00", "name": "Space Engineers", "author": "tueye@tuworld.de", "description": "Space Engineers is a voxel-based sandbox game set in space and on planets.", @@ -13,7 +13,7 @@ "quay.io\/parkervcp\/pterodactyl-images:debian_wine-5" ], "file_denylist": [], - "startup": "cd \/home\/container\/spaceengineers\/DedicatedServer64\/; wine \/home\/container\/spaceengineers\/DedicatedServer64\/SpaceEngineersDedicated.exe -path Z:\\\\home\\\\container\\\\config -noconsole -ignorelastsession", + "startup": "cd \/home\/container\/DedicatedServer64\/; wine \/home\/container\/DedicatedServer64\/SpaceEngineersDedicated.exe -path Z:\\\\home\\\\container\\\\config -noconsole -ignorelastsession", "config": { "files": "{\r\n \"config\/SpaceEngineers-Dedicated.cfg\": {\r\n \"parser\": \"xml\",\r\n \"find\": {\r\n \"MyConfigDedicated.SessionSettings.GameMode\": \"{{server.build.env.SERVER_MODE}}\",\r\n \"MyConfigDedicated.SessionSettings.MaxPlayers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"MyConfigDedicated.SessionSettings.AutoSaveInMinutes\": \"{{server.build.env.SAVE_INTERVAL}}\",\r\n \"MyConfigDedicated.SessionSettings.EnableSaving\": \"{{server.build.env.SAVE_ENABLED}}\",\r\n \"MyConfigDedicated.LoadWorld\": \"Z:\\\\home\\\\container\\\\config\\\\Saves\\\\{{server.build.env.WORLD_NAME}}\\\\Sandbox.sbc\",\r\n \"MyConfigDedicated.ServerPort\": \"{{server.build.default.port}}\",\r\n \"MyConfigDedicated.SteamPort\": \"{{server.build.env.STEAM_PORT}}\",\r\n \"MyConfigDedicated.ServerName\": \"{{server.build.env.SERVER_NAME}}\",\r\n \"MyConfigDedicated.WorldName\": \"{{server.build.env.WORLD_NAME}}\",\r\n \"MyConfigDedicated.ServerDescription\": \"{{server.build.env.SERVER_DESC}}\",\r\n \"MyConfigDedicated.RemoteApiEnabled\": \"{{server.build.env.REMOTEAPI_ENABLE}}\",\r\n \"MyConfigDedicated.RemoteApiPort\": \"{{server.build.env.REMOTEAPI_PORT}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Game ready...\"\r\n}", @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n## Define variables\r\ndlurl=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/steamcmd_servers\/space_engineers\"\r\nexport HOME=\/mnt\/server\r\n\r\n## Install dependencies\r\ndpkg --add-architecture i386\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates libsdl2-2.0-0:i386 cabextract\r\napt install -y --install-recommends wine wine64 xvfb\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\nchown -R root:root \/mnt\r\n\r\n## Install game using steamcmd\r\nmkdir $HOME\/spaceengineers\r\n.\/steamcmd.sh +login anonymous +@sSteamCmdForcePlatformType windows +force_install_dir $HOME\/spaceengineers +app_update ${APPID} ${EXTRA_FLAGS} validate +quit\r\n\r\n## set up 32 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## Create world and config\r\nmkdir -p $HOME\/config\/Saves\r\nif [ ! -d $HOME\/config\/Saves\/World ]\r\nthen\r\n curl $dlurl\/World.zip -o \/tmp\/World.zip\r\n unzip \/tmp\/World.zip -d $HOME\/config\/Saves\/\r\nfi\r\nif [ ! -f $HOME\/config\/SpaceEngineers-Dedicated.cfg ]; then curl $dlurl\/SpaceEngineers-Dedicated.cfg -o $HOME\/config\/SpaceEngineers-Dedicated.cfg; fi\r\n\r\n## Install WineTricks\r\nexport DISPLAY=:0.0\r\nexport WINEPREFIX=$HOME\/.wine\r\nrm -r $HOME\/.wine\r\nrm -r $HOME\/.cache\r\nmkdir -p $HOME\/.wine\r\nmkdir \/tmp\/winetricks\r\ncurl https:\/\/raw.githubusercontent.com\/Winetricks\/winetricks\/master\/src\/winetricks -o \/tmp\/winetricks\/winetricks\r\nchmod +x \/tmp\/winetricks\/winetricks\r\nXvfb :0 -screen 0 1024x768x16 &\r\nenv WINEDLLOVERRIDES=\"mscoree=d;mshtml=d\" wineboot --init --force \/nogui\r\nenv \/tmp\/winetricks\/winetricks -q vcrun2017 \r\nenv \/tmp\/winetricks\/winetricks -q vcrun2013 \r\nenv \/tmp\/winetricks\/winetricks -q sound=disabled \r\nenv \/tmp\/winetricks\/winetricks -q corefonts\r\nenv \/tmp\/winetricks\/winetricks -q --force dotnet48", + "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n## Define variables\r\ndlurl=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/steamcmd_servers\/space_engineers\"\r\nexport HOME=\/mnt\/server\r\n\r\n## Install dependencies\r\ndpkg --add-architecture i386\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates libsdl2-2.0-0:i386 cabextract\r\napt install -y --install-recommends wine wine64 xvfb\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\r\ncd \/mnt\/server\/steamcmd\r\n\r\nchown -R root:root \/mnt\r\n\r\n## Install game using steamcmd\r\n.\/steamcmd.sh +login anonymous +@sSteamCmdForcePlatformType windows +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit\r\n\r\n## set up 32 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## Create world and config\r\nmkdir -p $HOME\/config\/Saves\r\nif [ ! -d $HOME\/config\/Saves\/World ]\r\nthen\r\n curl $dlurl\/World.zip -o \/tmp\/World.zip\r\n unzip \/tmp\/World.zip -d $HOME\/config\/Saves\/\r\nfi\r\nif [ ! -f $HOME\/config\/SpaceEngineers-Dedicated.cfg ]; then curl $dlurl\/SpaceEngineers-Dedicated.cfg -o $HOME\/config\/SpaceEngineers-Dedicated.cfg; fi\r\n\r\n## Install WineTricks\r\nexport DISPLAY=:0.0\r\nexport WINEPREFIX=$HOME\/.wine\r\nrm -r $HOME\/.wine\r\nrm -r $HOME\/.cache\r\nmkdir -p $HOME\/.wine\r\nmkdir \/tmp\/winetricks\r\ncurl https:\/\/raw.githubusercontent.com\/Winetricks\/winetricks\/master\/src\/winetricks -o \/tmp\/winetricks\/winetricks\r\nchmod +x \/tmp\/winetricks\/winetricks\r\nXvfb :0 -screen 0 1024x768x16 &\r\nenv WINEDLLOVERRIDES=\"mscoree=d;mshtml=d\" wineboot --init --force \/nogui\r\nenv \/tmp\/winetricks\/winetricks -q vcrun2017 \r\nenv \/tmp\/winetricks\/winetricks -q vcrun2013 \r\nenv \/tmp\/winetricks\/winetricks -q sound=disabled \r\nenv \/tmp\/winetricks\/winetricks -q corefonts\r\nenv \/tmp\/winetricks\/winetricks -q --force dotnet48", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -31,7 +31,7 @@ { "name": "APP ID", "description": "The ID corresponding to the game to download.", - "env_variable": "APPID", + "env_variable": "SRCDS_APPID", "default_value": "298740", "user_viewable": false, "user_editable": false, @@ -153,6 +153,15 @@ "user_viewable": false, "user_editable": false, "rules": "nullable|string|max:20" + }, + { + "name": "Windows Install", + "description": "Required for auto-update", + "env_variable": "WINDOWS_INSTALL", + "default_value": "1", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|in:1" } ] } \ No newline at end of file From e18a4450fd1f35345ffc989264c6f098d46cb77c Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 20 Sep 2021 21:54:57 +0300 Subject: [PATCH 0030/1001] feat(eggs): add ClassiCube egg (#1316) Rewrite of #1211 with proper start config, customizable variables, and Github version grabber. Co-authored-by koutsie <18449778+koutsie@users.noreply.github.com> --- README.md | 3 + game_eggs/README.md | 3 + game_eggs/classicube/mcgalaxy/README.md | 10 ++++ .../mcgalaxy/egg-classi-cube--m-g-c.json | 59 +++++++++++++++++++ 4 files changed, 75 insertions(+) create mode 100644 game_eggs/classicube/mcgalaxy/README.md create mode 100644 game_eggs/classicube/mcgalaxy/egg-classi-cube--m-g-c.json diff --git a/README.md b/README.md index 93f4c9dc..e4d90dd2 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,9 @@ If you are reading this it looks like you are looking to add an egg to your serv * [BeamMP Server](game_eggs/beamng/beammp) * [KissMP](game_eggs/beamng/kissmp) +[ClassiCube](game_eggs/classicube) +* [MCGalaxy](game_eggs/classicube/mcgalaxy) + [Cryofall](game_eggs/cryofall/cryofall) [Call of Duty 4X](game_eggs/cod/cod4x) diff --git a/game_eggs/README.md b/game_eggs/README.md index 06df3977..0f4b2778 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -7,6 +7,9 @@ * [BeamMP Server](beamng/beammp) * [KissMP](beamng/kissmp) +[ClassiCube](game_eggs/classicube) +* [MCGalaxy](game_eggs/classicube/mcgalaxy) + [Cryofall](cryofall/cryofall) [Call of Duty 4X](cod/cod4x) diff --git a/game_eggs/classicube/mcgalaxy/README.md b/game_eggs/classicube/mcgalaxy/README.md new file mode 100644 index 00000000..ce3248fa --- /dev/null +++ b/game_eggs/classicube/mcgalaxy/README.md @@ -0,0 +1,10 @@ +# Classicube MCGalaxy +[MCGalaxy](https://github.com/UnknownShadow200/MCGalaxy) + +MCGalaxy is a fully featured and customisable ClassiCube Server Software based on MCForge/MCLawl. + + +| Port | default | +|---------|---------| +| Game | 25565 | + diff --git a/game_eggs/classicube/mcgalaxy/egg-classi-cube--m-g-c.json b/game_eggs/classicube/mcgalaxy/egg-classi-cube--m-g-c.json new file mode 100644 index 00000000..c6398d32 --- /dev/null +++ b/game_eggs/classicube/mcgalaxy/egg-classi-cube--m-g-c.json @@ -0,0 +1,59 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-08-27T01:20:58-04:00", + "name": "ClassiCube(MGC)", + "author": "panel@qoutsy.33mail.com", + "description": "Debian based MCGalaxy Egg.", + "features": null, + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:debian_mono-5-complete" + ], + "file_denylist": [], + "startup": "mono MCGalaxyCLI.exe", + "config": { + "files": "{\r\n \"\/properties\/server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-name\": \"{{server.build.env.HOSTNAME}}\",\r\n \"motd\": \"{{server.build.env.MOTD}}\",\r\n \"public\": \"true\",\r\n \"port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Finished setting up server\"\r\n}", + "logs": "{}", + "stop": "\/shutdown 3 SIGTERM Server shutting down..." + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\napt update \r\napt -y install curl jq unzip\r\n\r\nMATCH=mcgalaxy_\r\nmkdir -p \/mnt\/server\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\/UnknownShadow200\/MCGalaxy\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/UnknownShadow200\/MCGalaxy\/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 -i ${MATCH})\r\n else\r\n echo -e \"Specified install version not found. 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\n\r\necho -e \"Downloading ClassiCube version ${VERSION}\"\r\necho -e \"Download URL is ${DOWNLOAD_URL}\"\r\ncurl -ssL -o mcgalaxy.zip ${DOWNLOAD_URL}\r\nunzip -j mcgalaxy.zip\r\nrm mcgalaxy.zip\r\nchmod +X *.dll *.exe\r\necho \"Install complete\"", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Install Version", + "description": "Specify the version to install from https:\/\/github.com\/UnknownShadow200\/MCGalaxy\/releases. Leave latest to install the latest version.", + "env_variable": "VERSION", + "default_value": "latest", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + }, + { + "name": "Server Name", + "description": "Specify the server name", + "env_variable": "HOSTNAME", + "default_value": "Pterodactyl Server", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:30" + }, + { + "name": "MOTD", + "description": "Specify the message of the day", + "env_variable": "MOTD", + "default_value": "Welcome to the server", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + } + ] +} \ No newline at end of file From 4302566c22f84d7fb2c1efe508277d7eb100d212 Mon Sep 17 00:00:00 2001 From: Ree-jp Date: Wed, 22 Sep 2021 00:40:14 +0900 Subject: [PATCH 0031/1001] Add waterdog pe (#1346) * add waterdog pe * update add waterdog pe * fix README * update egg * Shutdown not detected --- README.md | 12 ++-- game_eggs/minecraft/README.md | 6 +- game_eggs/minecraft/proxy/README.md | 2 + game_eggs/minecraft/proxy/bedrock/README.md | 5 ++ .../proxy/bedrock/waterdog_pe/README.md | 8 +++ .../proxy/bedrock/waterdog_pe/config.yml | 70 +++++++++++++++++++ .../bedrock/waterdog_pe/egg-waterdog-p-e.json | 52 ++++++++++++++ 7 files changed, 148 insertions(+), 7 deletions(-) create mode 100644 game_eggs/minecraft/proxy/bedrock/README.md create mode 100644 game_eggs/minecraft/proxy/bedrock/waterdog_pe/README.md create mode 100644 game_eggs/minecraft/proxy/bedrock/waterdog_pe/config.yml create mode 100644 game_eggs/minecraft/proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json diff --git a/README.md b/README.md index e4d90dd2..50e04b83 100644 --- a/README.md +++ b/README.md @@ -97,11 +97,11 @@ If you are reading this it looks like you are looking to add an egg to your serv * [FiveM](game_eggs/gta/fivem) * [RageMP](game_eggs/gta/ragemp) * [alt:V](game_eggs/gta/altv) - + * GTA SA * [Multi Theft Auto](game_eggs/gta/mtasa) * [SA-MP](game_eggs/gta/samp) - + * GTA * [GTAC](game_eggs/gta/gtac) @@ -124,7 +124,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Java](game_eggs/minecraft/java) Servers for Java Minecraft * [Airplane](game_eggs/minecraft/java/airplane) * [Cuberite](game_eggs/minecraft/java/cuberite) - * [Fabric](game_eggs/minecraft/java/fabric) + * [Fabric](game_eggs/minecraft/java/fabric) * [Feather](game_eggs/minecraft/java/feather) * [Feed The Beast](game_eggs/minecraft/java/ftb) * [Forge](game_eggs/minecraft/java/forge) @@ -141,17 +141,19 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Proxies](game_eggs/minecraft/proxy) Minecraft Server Proxies * [Java](game_eggs/minecraft/proxy/java) - * [FlameCord](game_eggs/minecraft/proxy/java/flamecord) + * [FlameCord](game_eggs/minecraft/proxy/java/flamecord) * [Travertine](game_eggs/minecraft/proxy/java/travertine) * [TyphoonLimbo](game_eggs/minecraft/proxy/java/typhoonlimbo) * [Velocity](game_eggs/minecraft/proxy/java/velocity) * [Waterfall](game_eggs/minecraft/proxy/java/waterfall) + * [Bedrock](game_eggs/minecraft/proxy/bedrock) + * [Waterdog PE](game_eggs/minecraft/proxy/bedrock/waterdog_pe) * [Cross Platform](game_eggs/minecraft/proxy/cross_platform) * [GeyserMC](game_eggs/minecraft/proxy/cross_platform/geyser) * [Waterdog](game_eggs/minecraft/proxy/cross_platform/waterdog) [OpenArena](game_eggs/openarena) - * [openarena](game_eggs/openarena/openarena) + * [openarena](game_eggs/openarena/openarena) [OpenRA](game_eggs/openra) * [OpenRA Dune2000](game_eggs/openra/openra_dune2000) diff --git a/game_eggs/minecraft/README.md b/game_eggs/minecraft/README.md index 3b27c2a6..7e358d68 100644 --- a/game_eggs/minecraft/README.md +++ b/game_eggs/minecraft/README.md @@ -13,7 +13,7 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, [Java](/game_eggs/minecraft/java/) Servers for Java Minecraft * [Airplane](/game_eggs/minecraft/java/airplane) * [Cuberite](/game_eggs/minecraft/java/cuberite) -* [Fabric](/game_eggs/minecraft/java/fabric) +* [Fabric](/game_eggs/minecraft/java/fabric) * [Feather](/game_eggs/minecraft/java/feather) * [Feed The Beast](/game_eggs/minecraft/java/ftb) * [Forge](/game_eggs/minecraft/java/forge) @@ -30,12 +30,14 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [Proxies](/game_eggs/minecraft/proxy) Minecraft Server Proxies * [Java](/game_eggs/minecraft/proxy/java) - * [FlameCord](/game_eggs/minecraft/proxy/java/flamecord) + * [FlameCord](/game_eggs/minecraft/proxy/java/flamecord) * [Travertine](/game_eggs/minecraft/proxy/java/travertine) * [TyphoonLimbo](/game_eggs/minecraft/proxy/java/typhoonlimbo) * [Velocity](/game_eggs/minecraft/proxy/java/velocity) * [VIAaaS](/game_eggs/minecraft/proxy/java/viaaas) * [Waterfall](/game_eggs/minecraft/proxy/java/waterfall) + * [Bedrock](/game_eggs/minecraft/proxy/bedrock) + * [Waterdog PE](/game_eggs/minecraft/proxy/bedrock/waterdogpe) * [Cross Platform](/game_eggs/minecraft/proxy/cross_platform) * [GeyserMC](/game_eggs/minecraft/proxy/cross_platform/geyser) * [Waterdog](/game_eggs/minecraft/proxy/cross_platform/waterdog) diff --git a/game_eggs/minecraft/proxy/README.md b/game_eggs/minecraft/proxy/README.md index ff55f480..10ba31bf 100644 --- a/game_eggs/minecraft/proxy/README.md +++ b/game_eggs/minecraft/proxy/README.md @@ -7,6 +7,8 @@ * [Velocity](/game_eggs/minecraft/proxy/java/velocity) * [VIAaaS](/game_eggs/minecraft/proxy/java/viaaas) * [Waterfall](/game_eggs/minecraft/proxy/java/waterfall) +* [Bedrock](/game_eggs/minecraft/proxy/bedrock) + * [Waterdog PE](/game_eggs/minecraft/proxy/bedrock/waterdogpe) * [Cross Platform](/game_eggs/minecraft/proxy/cross_platform) * [GeyserMC](/game_eggs/minecraft/proxy/cross_platform/geyser) * [Waterdog](/game_eggs/minecraft/proxy/cross_platform/waterdog) diff --git a/game_eggs/minecraft/proxy/bedrock/README.md b/game_eggs/minecraft/proxy/bedrock/README.md new file mode 100644 index 00000000..54e84395 --- /dev/null +++ b/game_eggs/minecraft/proxy/bedrock/README.md @@ -0,0 +1,5 @@ +# Mineraft Bedrock Proxies + +### Waterdog PE +[Waterdog PE](https://github.com/WaterdogPE/WaterdogPE) +WaterdogPE is a brand new Minecraft: Bedrock Edition proxy software developed by the developers of the old Waterdog Proxy. diff --git a/game_eggs/minecraft/proxy/bedrock/waterdog_pe/README.md b/game_eggs/minecraft/proxy/bedrock/waterdog_pe/README.md new file mode 100644 index 00000000..44bc3a27 --- /dev/null +++ b/game_eggs/minecraft/proxy/bedrock/waterdog_pe/README.md @@ -0,0 +1,8 @@ +# Waterdog PE +Brand new proxy server for Minecraft: Bedrock Edition + +## Server Ports + +| Port | default | +|----------|---------| +| server | 19132 | diff --git a/game_eggs/minecraft/proxy/bedrock/waterdog_pe/config.yml b/game_eggs/minecraft/proxy/bedrock/waterdog_pe/config.yml new file mode 100644 index 00000000..1ff35f43 --- /dev/null +++ b/game_eggs/minecraft/proxy/bedrock/waterdog_pe/config.yml @@ -0,0 +1,70 @@ +# Waterdog Main Configuration file +# Configure your desired network settings here. + +# A list of all downstream servers that are available right after starting +# address field is formatted using ip:port +# publicAddress is optional and can be set to the ip players can directly connect through +servers: + lobby1: + address: 127.0.0.1:19133 + public_address: play.myserver.com:19133 +listener: + # The Motd which will be displayed in the server tab of a player and returned during ping + motd: §bWaterdog§3PE + # The server priority list. If not changed by plugins, the proxy will connect the player to the first of those servers + priorities: + - lobby1 + # The address to bind the server to + host: 0.0.0.0:19132 + # The maximum amount of players that can connect to this proxy instance + max_players: 20 + # Map the ip a player joined through to a specific server + # for example skywars.xyz.com => SkyWars-1 + # when a player connects using skywars-xyz.com as the serverIp, he will be connected to SkyWars-1 directly + forced_hosts: {} +# Case-Sensitive permission list for players (empty using {}) +permissions: + TobiasDev: + - waterdog.player.transfer + - waterdog.player.list + alemiz003: + - waterdog.player.transfer + - waterdog.player.list +# List of permissions each player should get by default (empty using []) +permissions_default: +- waterdog.command.help +- waterdog.command.info +# Whether the debug output in the console should be enabled or not +enable_debug: false +# If enabled, encrypted connection between client and proxy will be created +upstream_encryption: true +# If enabled, only players which are authenticated with XBOX Live can join. If disabled, anyone can connect *with any name* +online_mode: true +# If enabled, the proxy will be able to bind to an Ipv6 Address +enable_ipv6: false +# If enabled, the proxy will pass information like XUID or IP to the downstream server using custom fields in the LoginPacket +use_login_extras: true +# Replaces username spaces with underscores if enabled +replace_username_spaces: false +# Whether server query should be enabled +enable_query: true +# If enabled, when receiving a McpeTransferPacket, the proxy will check if the target server is in the downstream list, and if yes, use the fast transfer mechanism +prefer_fast_transfer: true +# Fast-codec only decodes the packets required by the proxy, everything else will be passed rawly. Disabling this can create a performance hit +use_fast_codec: true +# If enabled, the proxy will inject all the proxy commands in the AvailableCommandsPacket, enabling autocompletion +inject_proxy_commands: true +# Upstream server compression ratio(proxy to client), higher = less bandwidth, more cpu, lower vice versa +upstream_compression_level: 6 +# Upstream server compression ratio(proxy to downstream server), higher = less bandwidth, more cpu, lower vice versa +downstream_compression_level: 2 +# Education features require small adjustments to work correctly. Enable this option if any of downstream servers support education features. +enable_edu_features: false +# Enable/Disable the resource pack system +enable_packs: true +# Whether texture packs should be enforced +force_apply_packs: false +# You can set maximum pack size in MB to be cached. +pack_cache_size: 16 +# Creating threads may be in some situations expensive. Specify minimum count of idle threads per internal thread executors. Set to -1 to auto-detect by core count. +default_idle_threads: -1 diff --git a/game_eggs/minecraft/proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json b/game_eggs/minecraft/proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json new file mode 100644 index 00000000..b376474c --- /dev/null +++ b/game_eggs/minecraft/proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json @@ -0,0 +1,52 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-09-20T15:28:45+09:00", + "name": "Waterdog PE", + "author": "parker@pterodactyl.io", + "description": "Brand new proxy server for Minecraft: Bedrock Edition", + "features": null, + "images": [ + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_14", + "ghcr.io\/pterodactyl\/yolks:java_16" + ], + "file_denylist": [], + "startup": "java -Dterminal.ansi=true -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Started query on \"\r\n}", + "logs": "{}", + "stop": "end" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl\r\n\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n# Adding '.jar' if it isn't part of the file name\r\nif [[ \"${SERVER_JARFILE}\" == \"*\\.jar\" ]]; then\r\n echo -e \"adding.jar to server file name\"\r\n SERVER_JARFILE=\"${SERVER_JARFILE}.jar\"\r\nfi\r\n\r\nif [ -z \"${WATERDOG_VERSION}\" ] || [ \"${WATERDOG_VERSION}\" == \"latest\" ]; then\r\n echo -e \"downloading latest waterdog pe build\\n\"\r\n curl -sSL -o ${SERVER_JARFILE} https:\/\/jenkins.waterdog.dev\/job\/Waterdog\/job\/WaterdogPE\/job\/release\/lastSuccessfulBuild\/artifact\/target\/Waterdog.jar\r\nelse \r\n echo -e \"downloading waterdog pe build ${WATERDOG_VERSION}\\n\"\r\n curl -sSL -o ${SERVER_JARFILE} https:\/\/jenkins.waterdog.dev\/job\/Waterdog\/job\/WaterdogPE\/job\/release\/${WATERDOG_VERSION}\/artifact\/target\/Waterdog.jar\r\nfi\r\n\r\nif [ ! -f config.yml ]; then\r\n echo -e \"Downloading waterdog pe config.yml\"\r\n curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/proxy\/bedrock\/waterdog_pe\/config.yml\r\nelse\r\n echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Waterdog PE Version", + "description": "The build to pull and install. (Ex. 23), or set to latest\r\n\r\nThis is the build number on https:\/\/jenkins.waterdog.dev\/", + "env_variable": "WATERDOG_VERSION", + "default_value": "latest", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + }, + { + "name": "Server Jar File", + "description": "The jar to run to", + "env_variable": "SERVER_JARFILE", + "default_value": "server.jar", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + } + ] +} From a8865b5e07d5dabb7566c97cfa0242f0ca71b63b Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sat, 25 Sep 2021 23:52:41 -0400 Subject: [PATCH 0032/1001] remove ld_proload --- voice_servers/teaspeak/egg-tea-speak.json | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/voice_servers/teaspeak/egg-tea-speak.json b/voice_servers/teaspeak/egg-tea-speak.json index 2a5c6d3b..412b24e9 100644 --- a/voice_servers/teaspeak/egg-tea-speak.json +++ b/voice_servers/teaspeak/egg-tea-speak.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-08-29T14:30:56+00:00", + "exported_at": "2021-09-26T03:45:00+00:00", "name": "TeaSpeak", "author": "parker@parkervcp.com", "description": "TeaSpeak is a free to use client and server software for VoIP communication.\r\n\r\nIts the ideal deal software for everyone who is annoyed about limits and restrictions.", @@ -64,15 +64,6 @@ "user_editable": false, "rules": "required|string" }, - { - "name": "ld preload", - "description": "Don't touch this if you want the server to start", - "env_variable": "LD_PRELOAD", - "default_value": ".\/libs\/libjemalloc.so.2", - "user_viewable": false, - "user_editable": false, - "rules": "required|string" - }, { "name": "Teaspeak Version", "description": "What version of teaspeak to install: latest = latest stable ; beta = latest beta", From b7936c96d4a267ddef507b7c754f50cf36502a53 Mon Sep 17 00:00:00 2001 From: Th3Dilli Date: Thu, 30 Sep 2021 22:54:16 +0200 Subject: [PATCH 0033/1001] add mohaa egg --- game_eggs/mohaa/egg-mohaa.json | 104 +++++++++++++++++++++++++++++++ game_eggs/mohaa/server.cfg | 109 +++++++++++++++++++++++++++++++++ 2 files changed, 213 insertions(+) create mode 100644 game_eggs/mohaa/egg-mohaa.json create mode 100644 game_eggs/mohaa/server.cfg diff --git a/game_eggs/mohaa/egg-mohaa.json b/game_eggs/mohaa/egg-mohaa.json new file mode 100644 index 00000000..b4b392ba --- /dev/null +++ b/game_eggs/mohaa/egg-mohaa.json @@ -0,0 +1,104 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-09-29T23:01:20+02:00", + "name": "mohaa", + "author": "th3dilli@gmx.at", + "description": null, + "features": null, + "images": [ + "ghcr.io\/parkervcp\/games:mohaa" + ], + "file_denylist": [], + "startup": ".\/mohaa_lnxded +set sv_punkbuster 0 +set fs_basepath {{BASE_PATH}} +set fs_outputpath {{LOG_DIR}} +set dedicated 2 +set sv_maxclients {{SERVER_MAXCLIENTS}} +set net_ip 0.0.0.0 +set net_port {{SERVER_PORT}} +exec server.cfg", + "config": { + "files": "{\r\n \"main\/server.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"seta sv_hostname\": \"seta sv_hostname \\\"{{env.SERVER_NAME}}\\\"\",\r\n \"seta sv_maxClients\": \"seta sv_maxClients \\\"{{env.SERVER_MAXCLIENTS}}\\\"\",\r\n \"seta rconPassword\": \"seta rconPassword \\\"{{env.RCON_PASSWORD}}\\\"\",\r\n \"seta g_password\": \"seta g_password \\\"{{env.SERVER_PASSWORD}}\\\"\",\r\n \"Map\": \"Map {{env.SERVER_MAP}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"------ Server Initialization Complete ------\",\r\n \"userInteraction\": []\r\n}", + "logs": "{}", + "stop": "quit" + }, + "scripts": { + "installation": { + "script": "apk --no-cache add curl\r\n\r\nif [[ ! -d \/mnt\/server\/ ]]; then\r\n mkdir -p \/mnt\/server\/\r\nfi\r\n\r\ncd \/mnt\/server\/\r\n\r\nDOWNLOAD_URL=https:\/\/linuxgsm.download\/MedalofHonorAlliedAssault\/moh_revival_v1.12_RC3.5.1.tar.xz\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\necho -e \"running 'curl -sSL ${DOWNLOAD_LINK} -o mohaaserver.tar.xz'\" \r\ncurl -sSL ${DOWNLOAD_LINK} -o mohaaserver.tar.xz\r\n\r\necho -e \"Unpacking server files\"\r\ntar xvf mohaaserver.tar.xz\r\n\r\nrm mohaaserver.tar.xz\r\n\r\necho -e \"checking for default server.cfg\"\r\n[[ -f main\/server.cfg ]] || curl -sSL ${CONFIG_URL} -o main\/server.cfg\r\n\r\necho -e \"running 'chmod +x .\/mohaa_lnxded'\"\r\nchmod +x .\/mohaa_lnxded", + "container": "alpine:3.4", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "SERVER_MAXCLIENTS", + "description": "", + "env_variable": "SERVER_MAXCLIENTS", + "default_value": "14", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer" + }, + { + "name": "CONFIG_URL", + "description": "URL from where to get the initial server.cfg", + "env_variable": "CONFIG_URL", + "default_value": "https:\/\/raw.githubusercontent.com\/Th3Dilli\/eggs\/master\/game_eggs\/mohaa\/server.cfg", + "user_viewable": true, + "user_editable": true, + "rules": "required|string" + }, + { + "name": "SERVER_NAME", + "description": "The name of the server", + "env_variable": "SERVER_NAME", + "default_value": "MOHAA Server running on Pterodactyl", + "user_viewable": true, + "user_editable": true, + "rules": "required|string" + }, + { + "name": "RCON_PASSWORD", + "description": "Admin password for rcon", + "env_variable": "RCON_PASSWORD", + "default_value": "ADMINPASSWORD", + "user_viewable": true, + "user_editable": true, + "rules": "required|string" + }, + { + "name": "SERVER_MAP", + "description": "Select the map\r\n\r\nobj\/obj_team2\r\ndm\/mohdm7\r\ndm\/mohdm1\r\ndm\/mohdm3\r\ndm\/mohdm2\r\ndm\/mohdm6", + "env_variable": "SERVER_MAP", + "default_value": "dm\/mohdm7", + "user_viewable": true, + "user_editable": true, + "rules": "required|string" + }, + { + "name": "LOG_DIR", + "description": "", + "env_variable": "LOG_DIR", + "default_value": "\/home\/container\/Logs", + "user_viewable": true, + "user_editable": true, + "rules": "required|string" + }, + { + "name": "BASE_PATH", + "description": "", + "env_variable": "BASE_PATH", + "default_value": "\/home\/container", + "user_viewable": true, + "user_editable": true, + "rules": "required|string" + }, + { + "name": "SERVER_PASSWORD", + "description": "", + "env_variable": "SERVER_PASSWORD", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "required|string" + } + ] +} \ No newline at end of file diff --git a/game_eggs/mohaa/server.cfg b/game_eggs/mohaa/server.cfg new file mode 100644 index 00000000..48a6edd2 --- /dev/null +++ b/game_eggs/mohaa/server.cfg @@ -0,0 +1,109 @@ +// General Settings + +seta sv_hostname "SERVERNAME" +seta sv_maxRate "10000" // DO NOT SET OVER 15000 OR YOUR ACCOUNT WILL BE LOCKED! +seta sv_timeout "200" //amount of time before assuming a disconnected state +seta sv_precache "1" +seta sv_fps "19" //max frame rate to clients - increasing will raise pings +seta sv_maxClients "14" +seta sv_allowDownload "0" +seta sv_reconnectlimit "3" +seta sv_zombietime "1" +seta g_inactivity "180" +seta g_forcerespawn "30" +seta g_syncronousclients "0" +seta sv_chatter "1" + + +// Server Passwords + +seta rconPassword "ADMINPASSWORD" +seta g_password "" +seta sv_privateClients "" //LOCKED SERVER PASSWORD +seta sv_privatePassword "" //PRIVATE SLOTS PASSWORD + + +// Server Network Settings + +set sv_flood_waitdelay "10" //not too sure on this, possibly time before flooder is allowed to type again (default) +set sv_flood_persecond "4" //messages per second to be considered a flood ?? (default) +set sv_flood_msgs "4" // ?? (default) +net_noipx "1" //Disallows IPX connections, TCP only (network protocol) + +// Logs + +//Logging +seta logfile "3" +seta g_log "mohserver.log" +seta g_logSync "0" + + +// Extras + +seta sv_maxPing "1000" +seta sv_minPing "0" +seta sv_floodProtect "1" + + +// Game Type Settings - ATTN-May be overwritten by MOH config file below +// Set the type of game: 1=Deathmatch 2= Team match 3 = OBJ 4 = Roundbased + +seta g_gametype "3" +seta timelimit "10" +seta fraglimit "0" + +set g_ft_settings "cvar: meltgun scanvis" + +set g_extgametype_mohdm1 ctf // Free-For-All for Southern France +set g_extgametype_mohdm2 ft // Team-Match on Destroyed Village +set g_extgametype_mohdm3 ftctf // Freeze-Tag on Remagen +set g_extgametype_mohdm4 ftctf // Freeze-Tag on Crossroads +set g_extgametype_mohdm5 ftdem // Round-Based-Match on Snowy Park +set g_extgametype_mohdm6 ftdem // Demolition on Stalingrad +set g_extgametype_mohdm7 ft// Capture-The-Flag on Algiers +set g_extgametype_obj_team1 ftobj // Freeze-Tag-Objective on The Hunt +set g_extgametype_obj_team2 ftobj // Objective-Match on V2 Rocket Facility +set g_extgametype_obj_team3 ftctf // Capture-The-Flag on Omaha Beach +set g_extgametype_obj_team4 ftobj // Freeze-Tag-Objective on The Bridge + +// seta capturelimit "6" +seta sv_gamespy "1" // Show our server in gamespy + +// Game Play Default Settings +//seta g_gravity "800" +//seta g_knockback "1000" +//seta g_quadfactor "3" +//seta g_speed "320" +//seta g_weaponRespawn "5" +//seta g_weaponTeamRespawn "30" //respawn time in seconds for team games +//seta dmflags "0" // 8 (no falling damage) 16 (fixed FOV) 32 (no footsteps) + +// Match Settings + +seta g_doWarmup "0" +seta g_warmup "20" + +// Team Preferences +seta g_teamAutoJoin "0" +seta g_teamForceBalance "1" + +// seta g_friendlyFire "0" +seta g_teamdamage "0" // FF on or Off 1 = on + +// Voting +seta g_allowVote "1" + +// Master Servers +seta sv_master1 "mohmaster.2015.com" +seta sv_master2 "master0.gamespy.com" +seta sv_master3 "master1.gamespy.com" + +set g_mef_settings "meltgun: on" + + +// Banned Players +seta g_filterBan "1" + + +seta sv_maplist "obj/obj_team2 dm/mohdm7 dm/mohdm1 dm/mohdm3 dm/mohdm2 dm/mohdm6" +Map dm/mohdm7 From d747aeb43d250ac416f2044e97e9bf15def35f2a Mon Sep 17 00:00:00 2001 From: Th3Dilli Date: Thu, 30 Sep 2021 22:58:36 +0200 Subject: [PATCH 0034/1001] fix config url temporary --- game_eggs/mohaa/egg-mohaa.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/mohaa/egg-mohaa.json b/game_eggs/mohaa/egg-mohaa.json index b4b392ba..388db113 100644 --- a/game_eggs/mohaa/egg-mohaa.json +++ b/game_eggs/mohaa/egg-mohaa.json @@ -41,7 +41,7 @@ "name": "CONFIG_URL", "description": "URL from where to get the initial server.cfg", "env_variable": "CONFIG_URL", - "default_value": "https:\/\/raw.githubusercontent.com\/Th3Dilli\/eggs\/master\/game_eggs\/mohaa\/server.cfg", + "default_value": "https:\/\/raw.githubusercontent.com\/Th3Dilli\/eggs\/mohaa\/game_eggs\/mohaa\/server.cfg", "user_viewable": true, "user_editable": true, "rules": "required|string" From f363ce958c2681af663a95258b30b51ce15c383d Mon Sep 17 00:00:00 2001 From: Th3Dilli Date: Thu, 30 Sep 2021 23:16:26 +0200 Subject: [PATCH 0035/1001] add mohaa readme --- game_eggs/mohaa/README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 game_eggs/mohaa/README.md diff --git a/game_eggs/mohaa/README.md b/game_eggs/mohaa/README.md new file mode 100644 index 00000000..5c61607b --- /dev/null +++ b/game_eggs/mohaa/README.md @@ -0,0 +1,15 @@ +# Medal of Honor: Allied Assault + +Medal of Honor: Allied Assault is a first-person shooter video game developed by 2015, Inc. + +### Server Ports + +| Port | default | +| ---- | ------- | +| Game | 12203 | + +This egg uses the Unofficial MoH:AA 1.12 Patch that addes several features and security updates to allow a fair multiplayer experience. + +Ones the server is installed you can check the File Manager for `Medal of Honor Reborn Patch Documentation RC3.5.1.pdf` for more information. + +Check the `main/server.cfg` in the File Manager for more configuration options. From 139d803b1eb762e766be4974e91ca946f2852bed Mon Sep 17 00:00:00 2001 From: Michal Date: Fri, 1 Oct 2021 15:18:38 +0200 Subject: [PATCH 0036/1001] Change Game request to Egg request --- .github/ISSUE_TEMPLATE/egg-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/egg-request.yml b/.github/ISSUE_TEMPLATE/egg-request.yml index 4a144ed2..91366078 100644 --- a/.github/ISSUE_TEMPLATE/egg-request.yml +++ b/.github/ISSUE_TEMPLATE/egg-request.yml @@ -1,4 +1,4 @@ -name: 🎮 Game Request +name: 🥚 Egg Request description: Suggest a server to build an egg for title: "[Egg Request]: " body: From d91c5d7034eaaa39b9cc36711691cba790819bdf Mon Sep 17 00:00:00 2001 From: Th3Dilli Date: Fri, 1 Oct 2021 18:36:01 +0200 Subject: [PATCH 0037/1001] add mohaa to main readme --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 50e04b83..0a3804c0 100644 --- a/README.md +++ b/README.md @@ -105,12 +105,14 @@ If you are reading this it looks like you are looking to add an egg to your serv * GTA * [GTAC](game_eggs/gta/gtac) -[Mindustry](game_eggs/mindustry) - * [Mindustry](game_eggs/mindustry/mindustry) - [League Sandbox](game_eggs/leaguesandbox) * [League Sandbox](game_eggs/leaguesandbox/leaguesandbox) +[Medal of Honor: Allied Assault](game_eggs/mohaa) + +[Mindustry](game_eggs/mindustry) + * [Mindustry](game_eggs/mindustry/mindustry) + [Minetest](game_eggs/minetest) (including MTG) * [Minetest](game_eggs/minetest/minetest) From b7fae8441aa05e0acf4b502c792edb0b50970b42 Mon Sep 17 00:00:00 2001 From: Callum Seabrook Date: Sun, 10 Oct 2021 22:09:56 +0100 Subject: [PATCH 0038/1001] Add Minecraft Krypton (#1139) --- game_eggs/README.md | 3 +- game_eggs/minecraft/README.md | 3 +- game_eggs/minecraft/java/README.md | 3 + game_eggs/minecraft/java/krypton/README.md | 13 +++ game_eggs/minecraft/java/krypton/config.conf | 92 +++++++++++++++++++ .../minecraft/java/krypton/egg-krypton.json | 50 ++++++++++ 6 files changed, 162 insertions(+), 2 deletions(-) create mode 100644 game_eggs/minecraft/java/krypton/README.md create mode 100644 game_eggs/minecraft/java/krypton/config.conf create mode 100644 game_eggs/minecraft/java/krypton/egg-krypton.json diff --git a/game_eggs/README.md b/game_eggs/README.md index 0f4b2778..f70084ee 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -57,7 +57,8 @@ * [Fabric](minecraft/java/fabric) * [Feather](minecraft/java/feather) * [Feed The Beast](minecraft/java/ftb) - * [Forge](minecraft/java/forge) + * [Forge](minecraft/java/forge) + * [Krypton](/minecraft/java/krypton) * [Magma](minecraft/java/magma) * [Mohist](minecraft/java/mohist) * [Paper](minecraft/java/paper) diff --git a/game_eggs/minecraft/README.md b/game_eggs/minecraft/README.md index 7e358d68..26fefe82 100644 --- a/game_eggs/minecraft/README.md +++ b/game_eggs/minecraft/README.md @@ -16,7 +16,8 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [Fabric](/game_eggs/minecraft/java/fabric) * [Feather](/game_eggs/minecraft/java/feather) * [Feed The Beast](/game_eggs/minecraft/java/ftb) -* [Forge](/game_eggs/minecraft/java/forge) +* [Forge](/game_eggs/minecraft/java/forge) +* [Krypton](/minecraft/java/krypton) * [Magma](/game_eggs/minecraft/java/magma) * [Mohist](/game_eggs/minecraft/java/mohist) * [Paper](/game_eggs/minecraft/java/paper) diff --git a/game_eggs/minecraft/java/README.md b/game_eggs/minecraft/java/README.md index c2552ef8..45fab8a6 100644 --- a/game_eggs/minecraft/java/README.md +++ b/game_eggs/minecraft/java/README.md @@ -30,6 +30,9 @@ A generic service to pull forge mod packs from the curseforge site. [Magma](https://magmafoundation.org) Magma is most powerful Forge server providing you with Forge mods and Bukkit Plugins using Spigot and Paper for Performance Optimization and Stability. +[Krypton](https://github.com/KryptonMC/Krypton) +A fast, lightweight Minecraft server written in Kotlin. + ## FTB Packs [FTB Modpacks](https://api.modpacks.ch) A generic service to pull FTB modpacks from api.modpacks.ch. diff --git a/game_eggs/minecraft/java/krypton/README.md b/game_eggs/minecraft/java/krypton/README.md new file mode 100644 index 00000000..217b8e3c --- /dev/null +++ b/game_eggs/minecraft/java/krypton/README.md @@ -0,0 +1,13 @@ +# Krypton +A fast, lightweight Minecraft server written in Kotlin + +## Server Ports +Krypton only requires a single port to run, just like vanilla, though plugins may need extra ports. + +## Notes +Please note that the server will not function correctly unless a pre-generated world is provided. + + +| Port | default | +|-------|---------| +| Game | 25565 | diff --git a/game_eggs/minecraft/java/krypton/config.conf b/game_eggs/minecraft/java/krypton/config.conf new file mode 100644 index 00000000..8fa9a591 --- /dev/null +++ b/game_eggs/minecraft/java/krypton/config.conf @@ -0,0 +1,92 @@ +# This is the main Krypton configuration file. All settings in this file apply globally +# across the entire server, regardless of what they are. +# +# If you need any help with any of the settings in this file, you can join us on Discord +# at https://discord.gg/4QuwYACDRX + +# Advanced settings. Don't touch these unless you know what you're doing. +advanced { + # Whether to attempt to register the server as a JMX bean. + enable-jmx-monitoring=true + # Whether we should use the DSYNC option for saving region files to disk. + synchronize-chunk-writes=true +} +# Other settings that don't quite fit in anywhere else. +other { + # If we should enable bStats metrics for the server + metrics=true + # The duration (in seconds) a single tick must take before the single tick profiler reports it. + save-threshold=5 +} +# Proxy IP forwarding settings. +proxy { + # + # The method to use for forwarding a connecting user's information on + # to Krypton from a proxy server. Supported values are: + # - NONE - Disable forwarding support completely + # - LEGACY - Use the BungeeCord/pre-1.13 method + # - MODERN - Use Velocity's modern forwarding protocol + # When any mode other than NONE is used, the server will be forced offline + # and will ONLY accept connections from proxies. No users will be able to + # direct connect. + mode=NONE + # The forwarding secret from Velocity. Only used in the MODERN forwarding protocol. + secret="" +} +# Settings for the GS4 query protocol listener. If you don't know what that means, don't touch these :) +query { + # Whether to enable the query protocol. + enabled=false + # The port the query listener should listen on. + port=25566 +} +# The main server settings. +server { + # The threshold at which packets larger will be compressed. Set to -1 to disable. + compression-threshold=256 + # The IP used by players to connect. 0.0.0.0 means listen on all interfaces. + ip="0.0.0.0" + # Whether the server authenticates users with Mojang. + online-mode=true + # The port used by players to connect. + port=25565 +} +# Status configuration +status { + # The upper limit of the player count. Any players that try to join when this is reached will be kicked. + max-players=20 + # The message of the day. Supports legacy and hex codes (using &#). + motd="ὀffKrypton is a Minecraft server written in Kotlin!" +} +# Watchdog settings. The watchdog monitors the server for freezes. +watchdog { + # The time (in milliseconds) before watchdog first warns you about the server not responding + early-warning-delay=10000 + # How often (in milliseconds) watchdog should warn you in advanced that the server isn't responding + early-warning-interval=5000 + # The message to send to players when we restart the server. Supports legacy and hex codes (&# format). + restart-message="&cServer closed." + # Whether we should attempt to restart the server if it crashes + restart-on-crash=true + # The script we should use to attempt to restart the server. + restart-script="./start.sh" + # The time (in seconds) that the server must not respond for before watchdog considers it dead. + timeout-time=60 +} +# Global world configuration options +world { + # The amount of time (in ticks) between automatic world saves. + autosave-interval=6000 + # The default difficulty. Valid values are: 0-3 (legacy), peaceful, easy, normal and hard (case insensitive). + difficulty=normal + # Forces the above gamemode for all players in all worlds. + force-default-gamemode=false + # The gamemode for this world. Valid values are: 0-3 (legacy), survival, creative, adventure and spectator (case insensitive). + gamemode=survival + # If this server is in hardcore mode. Currently does nothing. + hardcore=false + # The name of the folder with the world to load in it. + name=world + # The render distance of the server. This is how many chunks you can see in front of you, excluding the one you are in. + view-distance=10 +} diff --git a/game_eggs/minecraft/java/krypton/egg-krypton.json b/game_eggs/minecraft/java/krypton/egg-krypton.json new file mode 100644 index 00000000..9f5530d0 --- /dev/null +++ b/game_eggs/minecraft/java/krypton/egg-krypton.json @@ -0,0 +1,50 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-05-09T06:18:25-04:00", + "name": "Krypton", + "author": "callum.seabrook@prevarinite.com", + "description": "A fast, lightweight Minecraft server written in Kotlin", + "features": null, + "images": [ + "ghcr.io/pterodactyl/yolks:java_16" + ], + "file_denylist": "", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JAR}}", + "config": { + "files": "{\r\n \"config.conf\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \" port\": \" port = {{server.build.default.port}}\",\r\n \" ip\": \" ip = \\\"0.0.0.0\\\"\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \")! Type \\\"help\\\" for help.\"\r\n}", + "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "stop": "stop" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n#\r\n# Krypton installation script for Pterodactyl\r\n# Created by BomBardyGamer\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt-get update\r\napt-get install -y curl jq unzip\r\n\r\ncd \/mnt\/server\r\nif [ -z \"${KRYPTON_VERSION}\" ] || [ \"${KRYPTON_VERSION}\" == \"latest\" ]; then\r\n KRYPTON_VERSION=\"lastSuccessfulBuild\"\r\nfi\r\n\r\nBASE_URL=\"https:\/\/ci.kryptonmc.org\/job\/Krypton\/${KRYPTON_VERSION}\"\r\nARTIFACT=`curl \"${BASE_URL}\/api\/json?tree=artifacts%5BrelativePath%5D\" | jq '.artifacts[0].relativePath' | sed 's\/\"\/\/g'`\r\n\r\ncurl -o ${SERVER_JAR} ${BASE_URL}\/artifact\/${ARTIFACT}\r\nunzip ${SERVER_JAR} \"config.conf\"", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Server JAR File", + "description": "The name of the server JAR to run the server with.", + "env_variable": "SERVER_JAR", + "default_value": "Krypton.jar", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + }, + { + "name": "Krypton Version", + "description": "The version of Krypton to download and use.", + "env_variable": "KRYPTON_VERSION", + "default_value": "latest", + "user_viewable": true, + "user_editable": true, + "rules": "required|alpha_num|between:1,6" + } + ] +} From 426b77e61837c3f86342f578d6476bd5bfebb8ec Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Wed, 13 Oct 2021 19:25:32 -0400 Subject: [PATCH 0039/1001] update startup --- voice_servers/teaspeak/egg-tea-speak.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/voice_servers/teaspeak/egg-tea-speak.json b/voice_servers/teaspeak/egg-tea-speak.json index 412b24e9..42c68e56 100644 --- a/voice_servers/teaspeak/egg-tea-speak.json +++ b/voice_servers/teaspeak/egg-tea-speak.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-09-26T03:45:00+00:00", + "exported_at": "2021-10-13T23:25:12+00:00", "name": "TeaSpeak", "author": "parker@parkervcp.com", "description": "TeaSpeak is a free to use client and server software for VoIP communication.\r\n\r\nIts the ideal deal software for everyone who is annoyed about limits and restrictions.", @@ -16,7 +16,7 @@ "startup": ".\/TeaSpeakServer --property:binding.query.port={{QUERY_PORT}} --property:binding.file.port={{FILE_PORT}} --property:voice.default_port={{SERVER_PORT}}", "config": { "files": "{\r\n \"config.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"voice.default_port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.env.QUERY_PORT}}\",\r\n \"file.port\": \"{{server.build.env.FILE_PORT}}\",\r\n \"query.motd\": \"\\\"{{server.build.env.SERVER_MOTD}}\\\"\",\r\n \"query.max_line_buffer\": \"10000\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Started server on \"\r\n}", + "startup": "{\r\n \"done\": \"Loaded \"\r\n}", "logs": "{}", "stop": "shutdown now" }, From c4e6745b1c9b866f6d1cbb12618e28508a6c1ec3 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 14 Oct 2021 07:40:02 +0300 Subject: [PATCH 0040/1001] eggs(spigot): fix buildtools for 1.17 and newer minor versions (#1356) Fixes minor version detection, and updates docker images to the yolks one --- .../minecraft/java/spigot/egg-spigot.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/game_eggs/minecraft/java/spigot/egg-spigot.json b/game_eggs/minecraft/java/spigot/egg-spigot.json index 319d3d73..2b77191f 100644 --- a/game_eggs/minecraft/java/spigot/egg-spigot.json +++ b/game_eggs/minecraft/java/spigot/egg-spigot.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-06-11T16:45:35+01:00", + "exported_at": "2021-10-05T15:36:31-04:00", "name": "Spigot", "author": "support@pterodactyl.io", "description": "Spigot is the most widely-used modded Minecraft server software in the world. It powers many of the top Minecraft server networks around to ensure they can cope with their huge player base and ensure the satisfaction of their players. Spigot works by reducing and eliminating many causes of lag, as well as adding in handy features and settings that help make your job of server administration easier.", @@ -12,21 +12,21 @@ "eula" ], "images": [ - "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-16", - "quay.io\/pterodactyl\/core:java-11", - "quay.io\/pterodactyl\/core:java" + "ghcr.io\/pterodactyl\/yolks:java_8", + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_16" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { - "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"enable-query\": \"true\",\r\n \"server-port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \")! For help, type \",\r\n \"userInteraction\": [\r\n \"Go to eula.txt for more info.\"\r\n ]\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \")! For help, type \"\r\n}", + "logs": "{}", "stop": "stop" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt update \r\napt install -y curl wget git openssl bash bc apt-transport-https gnupg software-properties-common\r\nwget -qO - https:\/\/adoptopenjdk.jfrog.io\/adoptopenjdk\/api\/gpg\/key\/public | apt-key add -\r\nadd-apt-repository --yes https:\/\/adoptopenjdk.jfrog.io\/adoptopenjdk\/deb\/\r\napt update\r\nmkdir -p \/usr\/share\/man\/man1\r\nif [ \"${DL_VERSION}\" == \"latest\" ] || (( $(echo \"${DL_VERSION} >= 1.17\" | bc -l) )); then\r\n apt install -y adoptopenjdk-16-hotspot\r\nelse\r\n apt install -y adoptopenjdk-8-hotspot\r\nfi\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n cd \/mnt\/server\r\n\r\n MODIFIED_DOWNLOAD=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\n curl -sSL -o ${SERVER_JARFILE} ${MODIFIED_DOWNLOAD}\r\nelse\r\n mkdir -p \/srv\/\r\n cd \/srv\/\r\n \r\n wget https:\/\/hub.spigotmc.org\/jenkins\/job\/BuildTools\/lastSuccessfulBuild\/artifact\/target\/BuildTools.jar\r\n \r\n java -Xms${SERVER_MEMORY}M -jar BuildTools.jar --rev ${DL_VERSION}\r\n\r\n mv spigot-*.jar \/mnt\/server\/${SERVER_JARFILE}\r\nfi", + "script": "#!\/bin\/bash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl wget git openssl apt-transport-https gnupg software-properties-common\r\nwget -qO - https:\/\/adoptopenjdk.jfrog.io\/adoptopenjdk\/api\/gpg\/key\/public | apt-key add -\r\nadd-apt-repository --yes https:\/\/adoptopenjdk.jfrog.io\/adoptopenjdk\/deb\/\r\napt update\r\n\r\nmkdir -p \/usr\/share\/man\/man1\r\n\r\nif [[ $DL_VERSION == *\"1.17.\"* || $DL_VERSION == *\"1.18.\"* || $DL_VERSION == *\"1.19.\"* || $DL_VERSION == \"latest\" ]]; then\r\n apt install -y adoptopenjdk-16-hotspot\r\nelse\r\n apt install -y adoptopenjdk-8-hotspot\r\nfi\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n cd \/mnt\/server\r\n MODIFIED_DOWNLOAD=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\n curl -sSL -o ${SERVER_JARFILE} ${MODIFIED_DOWNLOAD}\r\nelse\r\n mkdir -p \/srv\/\r\n cd \/srv\/\r\n wget https:\/\/hub.spigotmc.org\/jenkins\/job\/BuildTools\/lastSuccessfulBuild\/artifact\/target\/BuildTools.jar\r\n java -Xms${SERVER_MEMORY}M -jar BuildTools.jar --rev ${DL_VERSION}\r\n mv spigot-*.jar \/mnt\/server\/${SERVER_JARFILE}\r\nfi", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -60,4 +60,4 @@ "rules": "required|string|between:3,7" } ] -} +} \ No newline at end of file From 87917a8f2bc0baa5bebdc710814db92551d22937 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 14 Oct 2021 07:40:22 +0300 Subject: [PATCH 0041/1001] eggs(forge): support 1.17+ versions (#1354) Support new 1.17+ Forge JPMS arguments that doesn't ship any executable jar Fix forge latest build version option to actually use latest instead of recommended Set build version input rules to only accept valid values of latest and recommended Remove spaces from the version variables to avoid issues with curl. Forge site displays versions with spaces to end users --- .../java/forge/forge/egg-forge-enhanced.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json b/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json index 41e65001..7af5e413 100644 --- a/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json +++ b/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json @@ -4,30 +4,30 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-06-14T21:29:51+03:00", + "exported_at": "2021-10-05T15:04:09-04:00", "name": "Forge Enhanced", "author": "parker@parkervcp.com", "description": "Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.", "features": [ - "eula" + "eula", + "java_version" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_8", "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_14", "ghcr.io\/pterodactyl\/yolks:java_16" ], "file_denylist": [], - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true $( [ ! -f unix_args.txt ] && printf %s \"-jar {{SERVER_JARFILE}}\" || printf %s \"@unix_args.txt\" )", "config": { "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"enable-query\": \"true\",\r\n \"server-port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \")! For help, type \",\r\n \"userInteraction\": [\r\n \"Go to eula.txt for more info.\"\r\n ]\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "startup": "{\r\n \"done\": \")! For help, type \"\r\n}", + "logs": "{}", "stop": "stop" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\n#Go into main direction\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\nif [ ! -z ${FORGE_VERSION} ]; then\r\n DOWNLOAD_LINK=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/${FORGE_VERSION}\/forge-${FORGE_VERSION}\r\n FORGE_JAR=forge-${FORGE_VERSION}*.jar\r\nelse\r\n JSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\n if [ \"${MC_VERSION}\" == \"latest\" ] || [ \"${MC_VERSION}\" == \"\" ] ; then\r\n echo -e \"getting latest recommended version of forge.\"\r\n MC_VERSION=$(echo -e ${JSON_DATA} | jq -r '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains(\"recommended\")) | split(\"-\")[0]' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)\r\n \tBUILD_TYPE=recommended\r\n fi\r\n\r\n if [ \"${BUILD_TYPE}\" != \"recommended\" ] && [ \"${BUILD_TYPE}\" != \"latest\" ]; then\r\n BUILD_TYPE=recommended\r\n fi\r\n\r\n echo -e \"minecraft version: ${MC_VERSION}\"\r\n echo -e \"build type: ${BUILD_TYPE}\"\r\n\r\n ## some variables for getting versions and things\r\n\tFILE_SITE=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n ## locating the forge version\r\n if [ \"${VERSION_KEY}\" == \"\" ] && [ \"${BUILD_TYPE}\" == \"recommended\" ]; then\r\n echo -e \"dropping back to latest from recommended due to there not being a recommended version of forge for the mc version requested.\"\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"recommended\"))')\r\n fi\r\n\r\n ## Error if the mc version set wasn't valid.\r\n if [ \"${VERSION_KEY}\" == \"\" ] || [ \"${VERSION_KEY}\" == \"null\" ]; then\r\n \techo -e \"The install failed because there is no valid version of forge for the version on minecraft selected.\"\r\n \texit 1\r\n fi\r\n\r\n FORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\n if [ \"${MC_VERSION}\" == \"1.7.10\" ] || [ \"${MC_VERSION}\" == \"1.8.9\" ]; then\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}.jar\r\n if [ \"${MC_VERSION}\" == \"1.7.10\" ]; then\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}-universal.jar\r\n fi\r\n else\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}.jar\r\n fi\r\nfi\r\n\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version ${FORGE_VERSION}\"\r\necho -e \"Download link is ${DOWNLOAD_LINK}\"\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-installer.jar; then\r\n echo -e \"installer jar download link is valid.\"\r\n else\r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nelse\r\n echo -e \"no download link closing out\"\r\n exit 3\r\nfi\r\n\r\ncurl -s -o installer.jar -sS ${DOWNLOAD_LINK}-installer.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ]; then\r\n echo \"!!! Error by downloading forge version ${FORGE_VERSION} !!!\"\r\n exit\r\nfi\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n\r\nmv $FORGE_JAR $SERVER_JARFILE\r\n\r\n#Deleting installer.jar\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar", + "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n# Remove spaces from the version number to avoid issues with curl\r\nFORGE_VERSION=\"$(echo \"$FORGE_VERSION\" | tr -d ' ')\"\r\nMC_VERSION=\"$(echo \"$MC_VERSION\" | tr -d ' ')\"\r\n\r\nif [ ! -z ${FORGE_VERSION} ]; then\r\n DOWNLOAD_LINK=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/${FORGE_VERSION}\/forge-${FORGE_VERSION}\r\n FORGE_JAR=forge-${FORGE_VERSION}*.jar\r\nelse\r\n JSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\n if [ \"${MC_VERSION}\" == \"latest\" ] || [ \"${MC_VERSION}\" == \"\" ] ; then\r\n echo -e \"getting latest version of forge.\"\r\n MC_VERSION=$(echo -e ${JSON_DATA} | jq -r '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains(\"recommended\")) | split(\"-\")[0]' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)\r\n \tBUILD_TYPE=latest\r\n fi\r\n\r\n if [ \"${BUILD_TYPE}\" != \"recommended\" ] && [ \"${BUILD_TYPE}\" != \"latest\" ]; then\r\n BUILD_TYPE=recommended\r\n fi\r\n\r\n echo -e \"minecraft version: ${MC_VERSION}\"\r\n echo -e \"build type: ${BUILD_TYPE}\"\r\n\r\n ## some variables for getting versions and things\r\n\tFILE_SITE=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n ## locating the forge version\r\n if [ \"${VERSION_KEY}\" == \"\" ] && [ \"${BUILD_TYPE}\" == \"recommended\" ]; then\r\n echo -e \"dropping back to latest from recommended due to there not being a recommended version of forge for the mc version requested.\"\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"recommended\"))')\r\n fi\r\n\r\n ## Error if the mc version set wasn't valid.\r\n if [ \"${VERSION_KEY}\" == \"\" ] || [ \"${VERSION_KEY}\" == \"null\" ]; then\r\n \techo -e \"The install failed because there is no valid version of forge for the version of minecraft selected.\"\r\n \texit 1\r\n fi\r\n\r\n FORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\n if [ \"${MC_VERSION}\" == \"1.7.10\" ] || [ \"${MC_VERSION}\" == \"1.8.9\" ]; then\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}.jar\r\n if [ \"${MC_VERSION}\" == \"1.7.10\" ]; then\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}-universal.jar\r\n fi\r\n else\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}.jar\r\n fi\r\nfi\r\n\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version ${FORGE_VERSION}\"\r\necho -e \"Download link is ${DOWNLOAD_LINK}\"\r\n\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-installer.jar; then\r\n echo -e \"installer jar download link is valid.\"\r\n else\r\n echo -e \"link is invalid. Exiting now\"\r\n exit 2\r\n fi\r\nelse\r\n echo -e \"no download link provided. Exiting now\"\r\n exit 3\r\nfi\r\n\r\ncurl -s -o installer.jar -sS ${DOWNLOAD_LINK}-installer.jar\r\n\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ]; then\r\n echo \"!!! Error by downloading forge version ${FORGE_VERSION} !!!\"\r\n exit\r\nfi\r\n\r\n# Delete args file to support downgrading to versions below 1.17\r\nif [ -f unix_args.txt ]; then\r\n rm unix_args.txt\r\n exit\r\nfi\r\n\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n\r\nif [[ $MC_VERSION == *\"1.17.\"* || $MC_VERSION == *\"1.18.\"* || $FORGE_VERSION == *\"1.17.\"* || $FORGE_VERSION == *\"1.18.\"* ]]; then\r\n # Create a symlink for 1.17+ Forge args\r\n ln -sf libraries\/net\/minecraftforge\/forge\/*\/unix_args.txt unix_args.txt\r\n else\r\n # For versions below 1.17 that ship with jar delete installer.jar\r\n mv $FORGE_JAR $SERVER_JARFILE\r\n echo -e \"Deleting installer.jar file.\\n\"\r\n rm -rf installer.jar\r\nfi", "container": "openjdk:8-jdk-slim", "entrypoint": "bash" } @@ -35,7 +35,7 @@ "variables": [ { "name": "Server Jar File", - "description": "The name of the Jarfile to use when running Forge Mod.", + "description": "The name of the Jarfile to use when running Forge version below 1.17.", "env_variable": "SERVER_JARFILE", "default_value": "server.jar", "user_viewable": true, @@ -58,7 +58,7 @@ "default_value": "recommended", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|string|in:recommended,latest" }, { "name": "Forge Version", From 21dd478a3523829663048baef3a724dd102ccf87 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 17 Oct 2021 01:21:02 +0300 Subject: [PATCH 0042/1001] Improve issue template (#1364) * ci(egg request): enable labels, remove wrong field and add issue URL * ci(bug report): Add notice to search existing issues --- .github/ISSUE_TEMPLATE/bug-report.yml | 32 ++++++++++++++------------ .github/ISSUE_TEMPLATE/egg-request.yml | 15 ++++-------- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 5ef1390c..5bb78cc2 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -6,9 +6,11 @@ body: - type: markdown attributes: value: | - If you see any of the following, go to [Discord](https://discord.gg/pterodactyl) and report your error in a support channel. - * `A fatal error was encountered while starting this server.` - * `No server egg configuration could be located; aborting startup.` + If you see any of the following, go to [Discord](https://discord.gg/pterodactyl) and report your error in a support channel. + * `A fatal error was encountered while starting this server.` + * `No server egg configuration could be located; aborting startup.` + + Make sure there are no existing bug reports by searching the [repository issues](https://github.com/parkervcp/eggs/issues?q=is%3Aopen+is%3Aissue+label%3ABug). - type: input id: panel-version attributes: @@ -24,7 +26,7 @@ body: description: Version number of your Wings (latest is not a version) placeholder: 1.x.x validations: - required: true + required: true - type: input id: service attributes: @@ -32,18 +34,18 @@ body: description: Service you are experiencing issues with placeholder: minecraft/factorio/etc validations: - required: true + required: true - type: dropdown id: modified attributes: label: Modified description: Did you add or change things, this includes startup configs/install scripts/variables options: - - Yes, I modified the egg (will provide details below) - - No, I did not modify the egg + - Yes, I modified the egg (will provide details below) + - No, I did not modify the egg validations: - required: true - - type: textarea + required: true + - type: textarea id: expected-behavior attributes: label: Expected Behavior @@ -51,7 +53,7 @@ body: placeholder: Install the server, start it, play validations: required: true - - type: textarea + - type: textarea id: actual-behavior attributes: label: Actual Behavior @@ -59,15 +61,15 @@ body: placeholder: Server crashed with error X validations: required: true - - type: textarea + - type: textarea id: reproduce-steps attributes: label: Steps To Reproduce description: Step by step what to do to cause the issue placeholder: | - Step 1 Set version to latest - Step 2 install - Step 3 Receive error X or Y + Step 1 Set version to latest + Step 2 install + Step 3 Receive error X or Y validations: required: true - type: textarea @@ -75,4 +77,4 @@ body: attributes: label: Relevant log output description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. - render: shell \ No newline at end of file + render: shell diff --git a/.github/ISSUE_TEMPLATE/egg-request.yml b/.github/ISSUE_TEMPLATE/egg-request.yml index 91366078..731f4cfd 100644 --- a/.github/ISSUE_TEMPLATE/egg-request.yml +++ b/.github/ISSUE_TEMPLATE/egg-request.yml @@ -1,19 +1,12 @@ name: 🥚 Egg Request description: Suggest a server to build an egg for title: "[Egg Request]: " +labels: [Egg Request] body: - type: markdown attributes: value: | - Make sure there are no existing egg requests by searching the repository issues. Please understand how Pterodactyl works when you are requesting an egg. (ie. docker-compose doesn't work for a pterodactyl server) - - type: input - id: service - attributes: - label: Service - description: Service you are experiencing issues with - placeholder: minecraft/factorio/etc - validations: - required: true + Make sure there are no existing egg requests by searching the [repository issues](https://github.com/parkervcp/eggs/issues?q=is%3Aissue+is%3Aopen+label%3A%22Egg+Request%22). Please understand how Pterodactyl works when you are requesting an egg. (ie. docker-compose doesn't work for a pterodactyl server) - type: dropdown id: expand attributes: @@ -26,14 +19,14 @@ body: - type: input id: game-link attributes: - label: Link to game + label: Link to a game or software placeholder: minecraft.net/factorio.com/etc validations: required: true - type: input id: download-link attributes: - label: Links for server downloads + label: Links for the download description: This needs to be an official link and not one that is hosted on some forum page or a personal Github page. validations: required: true From f617331ab379f6609a93b656eeebfb92ba4978f5 Mon Sep 17 00:00:00 2001 From: Softwarenoob Date: Tue, 19 Oct 2021 20:26:34 +0300 Subject: [PATCH 0043/1001] feat(discord.py): add 3.10 Python Docker image --- bots/discord/discord.py/egg-discord-py-generic.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bots/discord/discord.py/egg-discord-py-generic.json b/bots/discord/discord.py/egg-discord-py-generic.json index d13e7b48..884599f6 100644 --- a/bots/discord/discord.py/egg-discord-py-generic.json +++ b/bots/discord/discord.py/egg-discord-py-generic.json @@ -4,12 +4,13 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-08-07T17:13:40+03:00", + "exported_at": "2021-10-19T13:22:35-04:00", "name": "discord.py generic", "author": "parker@parkervcp.com", "description": "A Discord bot written in Python using discord.py\r\n\r\nhttps:\/\/github.com\/Ispira\/pixel-bot", "features": null, "images": [ + "ghcr.io\/parkervcp\/yolks:python_3.10", "ghcr.io\/parkervcp\/yolks:python_3.9", "ghcr.io\/parkervcp\/yolks:python_3.8", "ghcr.io\/parkervcp\/yolks:python_3.7", @@ -30,7 +31,8 @@ "entrypoint": "bash" } }, - "variables": [{ + "variables": [ + { "name": "Git Repo Address", "description": "Git repo to clone\r\n\r\nI.E. https:\/\/github.com\/parkervcp\/repo_name", "env_variable": "GIT_ADDRESS", @@ -112,4 +114,4 @@ "rules": "required|string" } ] -} +} \ No newline at end of file From 3c34301e7ae431936934a84c2ded5283c01a8fdc Mon Sep 17 00:00:00 2001 From: Softwarenoob Date: Fri, 22 Oct 2021 14:45:53 +0300 Subject: [PATCH 0044/1001] feat(nodejs): Add Node.js 17 Docker image --- bots/discord/discord.js/egg-discord-js-generic.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bots/discord/discord.js/egg-discord-js-generic.json b/bots/discord/discord.js/egg-discord-js-generic.json index 0c38dc6f..673356ba 100644 --- a/bots/discord/discord.js/egg-discord-js-generic.json +++ b/bots/discord/discord.js/egg-discord-js-generic.json @@ -4,12 +4,13 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-08-07T17:11:56+03:00", + "exported_at": "2021-10-22T07:43:48-04:00", "name": "discord.js generic", "author": "parker@parkervcp.com", "description": "a generic discord js bot egg\r\n\r\nThis will clone a git repo for a bot. it defaults to master if no branch is specified.\r\n\r\nInstalls the node_modules on install. If you set user_upload then I assume you know what you are doing.", "features": null, "images": [ + "ghcr.io\/parkervcp\/yolks:nodejs_17", "ghcr.io\/parkervcp\/yolks:nodejs_16", "ghcr.io\/parkervcp\/yolks:nodejs_15", "ghcr.io\/parkervcp\/yolks:nodejs_14", @@ -30,7 +31,8 @@ "entrypoint": "bash" } }, - "variables": [{ + "variables": [ + { "name": "Git Repo Address", "description": "GitHub Repo to clone\r\n\r\nI.E. https:\/\/github.com\/parkervcp\/repo_name", "env_variable": "GIT_ADDRESS", @@ -112,4 +114,4 @@ "rules": "nullable|string" } ] -} +} \ No newline at end of file From f2d167638454dda669e82f122d8b90a167cf88f1 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 24 Oct 2021 16:56:13 +0200 Subject: [PATCH 0045/1001] Remove version selection for pocketmine and use Yolks image (#1371) Removes version variable and makes use of the new Yolks Debian image --- .../bedrock/pocketmine_mp/egg-pocketmine-m-p.json | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json b/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json index 0eaf57b8..8ff807a6 100644 --- a/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json +++ b/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json @@ -4,13 +4,13 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-08-21T11:31:41+02:00", + "exported_at": "2021-10-24T16:47:50+02:00", "name": "PocketmineMP", "author": "info@swisscrafting.ch", "description": "Pocketmine Egg\r\nby onekintaro from swisscrafting.ch\r\nwith the nice help from #eggs Channel on Pterodactyl-Discord :)", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:base_debian" + "ghcr.io\/parkervcp\/yolks:debian" ], "file_denylist": [], "startup": ".\/bin\/php7\/bin\/php .\/PocketMine-MP.phar --no-wizard --disable-ansi", @@ -22,21 +22,12 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl jq\r\n\r\ncd \/mnt\/server\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\n## this is a simple script to validate a download url actaully exists\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\"]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} > PocketMine-MP.phar\r\n\r\necho -e \"\\n downloading latest php build from pocketmine\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\r\n\r\necho -e \"\\n getting default server.properties\"\r\ncurl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/pocketmine_mp\/server.properties > server.properties\r\n\r\necho -e \"\\n unpacking php binaries\"\r\ntar -xzvf php.binary.tar.gz\r\n\r\necho -e \"\\n removing php packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.txt banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs", + "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl jq\r\n\r\ncd \/mnt\/server\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\nDOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\n\r\n## this is a simple script to validate a download url actaully exists\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\"]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} > PocketMine-MP.phar\r\n\r\necho -e \"\\n downloading latest php build from pocketmine\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\r\n\r\necho -e \"\\n getting default server.properties\"\r\ncurl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/pocketmine_mp\/server.properties > server.properties\r\n\r\necho -e \"\\n unpacking php binaries\"\r\ntar -xzvf php.binary.tar.gz\r\n\r\necho -e \"\\n removing php packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.txt banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs", "container": "debian:buster-slim", "entrypoint": "bash" } }, "variables": [ - { - "name": "PocketmineMP Version", - "description": "Version from Github", - "env_variable": "VERSION", - "default_value": "latest", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:20" - }, { "name": "Github Package", "description": "", From c108ce39171015131d7bfe018a923aede8e138cc Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Tue, 26 Oct 2021 15:42:36 -0700 Subject: [PATCH 0046/1001] Initial Upload README is currently a placeholder and will be updated with the following commit. --- .../steamcmd_servers/satisfactory/README.md | 99 +++++++++++++++++++ .../satisfactory/egg-satisfactory.json | 76 ++++++++++++++ 2 files changed, 175 insertions(+) create mode 100644 game_eggs/steamcmd_servers/satisfactory/README.md create mode 100644 game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json diff --git a/game_eggs/steamcmd_servers/satisfactory/README.md b/game_eggs/steamcmd_servers/satisfactory/README.md new file mode 100644 index 00000000..73aa486c --- /dev/null +++ b/game_eggs/steamcmd_servers/satisfactory/README.md @@ -0,0 +1,99 @@ +# Arma 3 +***Updating your Egg? Please see [How to Update Egg](#how-to-update-egg) to avoid any issues!*** +___ +### Authors / Contributors + + + + + + + + +
+ +
Red-Thirten + +
+ 💻 + 🔨 + 		+ +
Aussie Server Hosts + +
+ 💻 + 💡 + 		+ +
Daave + +
+ 💻 + ⭐ + 💤 +
+ + + +___ +### Game Description +From Bohemia Interactive's [Website](https://arma3.com/): +> Experience true combat gameplay in a massive military sandbox. Deploying a wide variety of single and multiplayer content, over 20 vehicles and 40 weapons, and limitless opportunities for content creation, this is the PC’s premier military game. Authentic, diverse, open - Arma 3 sends you to war. +___ +### Egg Capabilities +- Configurable to run 32 or 64-bit versions of the server +- Max Players is configurable and able to be host enforced (\*see [Recommended Egg Modifications](#recommended-egg-modifications)) +- Able to download server updates on startup +- Able to download, update, and load Steam Workshop mods on startup (\*see [Installation Requirements](#installation-requirements)) + - Accepts uploaded HTML modlist files exported from the Arma 3 Launcher to define mods to load on the server. + - Also accepts manually listed mods, CDLCs, and server-side only mods. + - Checks for mod updates against their Steam Workshop page's last update for quick and efficient update checks. + - Automatically moves mod `.bikey`'s to the `/keys/` directory. +- Configurable to download Creator DLCs +- Configurable to run Beta/Performance binaries of the server (if desired; advanced users only) +- Additional [Arma 3 startup parameters](https://community.bistudio.com/wiki/Arma_3_Startup_Parameters) can be added to fine-tune performance +- Configurable to run up to 5 Headless Clients in parallel with the main server (may require additional performance overhead) +- [WHMCS](https://www.whmcs.com/) compatible (\*see [Recommended Egg Modifications](#recommended-egg-modifications)) +___ +### Installation Requirements +- A valid, **real** Steam account, with **Steam Guard turned off**, is required to install the server (default "anonymous" login cannot be used). For security reasons it is [recommended by Valve](https://developer.valvesoftware.com/wiki/SteamCMD#With_a_Steam_account) that you create a new Steam account just for your dedicated servers. This account *does not* need to own Arma 3. +- For automatic Steam Workshop mod downloading to work, the Steam account *does* need to own Arma 3. However, this is optional functionality, and mods can be manually uploaded to the server if desired. Hosts may feel free to change the "Disable Mod Downloads/Updates" variable to `1` if they would not like to offer it's functionality to clients. +___ +### Server Ports +Default server ports are listed below, but the Main port can be any port. There are three more ports after the Main port are relative to the Main port (For example: The BattlEye port is always 4 ports higher than the main port). **All four ports are required for normal server behavior.** It is [recommended](https://community.bistudio.com/wiki/Arma_3:_Dedicated_Server#Port_Forwarding) that each server be 100 ports separate from each other. + +| Port | Default | +|---------|---------| +| **Arma 3 Game & VON (Main)** | 2302 | +| Steam Query (+1) | 2303 | +| Steam Port (+2) | 2304 | +| BattleEye (+4) | 2306 | + +#### Mods/Plugins may require ports to be added to the server. +___ +### CPU Usage Information +ARMA 3 is mainly CPU intensive. Contrary to popular belief, the server binary *can* run on multiple cores/threads. However, it's ability to manage asynchronous tasks and hyperthread is *very* limited, meaning additional cores/threads reach diminishing returns very quickly. In addition, it's ability to utilize all of the CPU allotted to it for AI processing seems to be limited as well. Therefore, a Headless Client ***and*** a properly written mission file are highly recommended if large amounts of AI units will be used. +___ +### Minimum RAM Requirement +This server requires about 2048 MB of RAM to run properly. If used, every Headless Client uses an additional 2048 MB of RAM as well. +___ +### Minimum Disk Requirement +This server requires just under 10 GB of disk space to safely run properly with no mods. However, mods can easily increase disk usage to 50 GB or more, depending on how many are downloaded. +___ +### Recommended Egg Modifications +The following are highly recommended variable modifications you can make to the egg after importing it to your panel. While viewing this egg, simply go to the "Variables" tab of the egg editor to make these changes. +#### Default Steam Username & Password +- To make deploying servers easy (**or if you are using WHMCS**), it is recommended to edit the default values of "Steam Username" and "Steam Password" to your Steam account dedicated for hosting. This will make all newly installed servers use these credentials. **DO NOT** make these fields visible to the end user so that they can use their own Steam accounts; the panel will save their Steam credentials in **plain text**, which is a BIG NO NO for security and privacy. +#### Restrict Max Players +- If you would like to restrict the maximum number of players that can join your client's server, you can change the permissions of the "Max Players" variable so that clients can only view this value (and not edit it). It's default value can also be changed, or the value can be changed on a server-by-server basis as desired. +___ +### How to Update Egg +If you already have an Arma 3 egg installed on your panel, there are a couple things to consider before updating to this egg: +- The Startup Command has changed, but Pterodactyl currently does not update this across all your existing servers. Servers will still boot with their old Startup Command, but the new HTML Modlist feature will not work, and depreciated variables for config files will be used. Servers will have to be manually updated to the new Startup Command via the Startup tab. +- Startup Variables have been completely rehauled. While most important existing variables have retained their Environment Variable names, a lot of their titles and order have been adjusted. Simply updating your existing egg with this egg may lead to Startup Variables being terribly out of order and cluttered. Therefore, the following steps are recommended to avoid this: + 1. Change the name of your existing Arma 3 egg to "Arma 3 (Old)". + 2. Install this updated egg as a new egg in your nest. + 3. Make any egg modifications you would like. (\*see [Recommended Egg Modifications](#recommended-egg-modifications)) + 4. Change all existing Arma 3 servers to the new egg via the Startup tab. + 5. Delete the old egg. diff --git a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json new file mode 100644 index 00000000..41b90d73 --- /dev/null +++ b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json @@ -0,0 +1,76 @@ +{ + "_comment": "Pterodactyl Satisfactory Egg ~ Kubi, matthewp, and Red-Thirten ~ 2021-10-26", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "name": "Satisfactory", + "author": "rehlmgaming@gmail.com", + "description": "Satisfactory is a first-person open-world factory building game with a dash of exploration and combat. Play alone or with friends, explore an alien planet, create multi-story factories, and enter conveyor belt heaven!", + "features": null, + "images": [ + "ghcr.io\/pterodactyl\/games:source" + ], + "file_denylist": [], + "startup": ".\/FactoryServer.sh -GamePort={{SERVER_PORT}} -ServerQueryPort={{QUERY_PORT}} -BeaconPort={{BEACON_PORT}}", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Engine Initialization\"\r\n}", + "logs": "{}", + "stop": "^CC" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl Satisfactory Egg - egg-satisfactory.json\r\n## Authors: ryan@kubiq.io (Kubi), matthew@pterodactyl.io (matthewp), & David Wolfe (Red-Thirten)\r\n## Date: 2021\/10\/26\r\n## License: MIT License\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n# Download and install SteamCMD\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${APP_ID} validate +exit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "[REQUIRED] Server Query Port", + "description": "This is the port that you need to enter in the game when you first connect to a dedicated server.", + "env_variable": "QUERY_PORT", + "default_value": "15777", + "user_viewable": true, + "user_editable": false, + "rules": "required|integer|min:1024|max:65536" + }, + { + "name": "[REQUIRED] Beacon Port", + "description": "This port's internal opening on this server *must* match it's external opening on your network (ie. If you set this value to 3333, your externally open port, which is linked to this port, must also be 3333). This is also true for the master Game Port.", + "env_variable": "BEACON_PORT", + "default_value": "15000", + "user_viewable": true, + "user_editable": false, + "rules": "required|integer|min:1024|max:65536" + }, + { + "name": "Automatic Updates", + "description": "Quickly checks for any server updates on startup, and updates if necessary. (1 Enable | 0 Disable)", + "env_variable": "AUTO_UPDATE", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "boolean" + }, + { + "name": "[Repair] Validate Server Files", + "description": "Leave empty (no value) for OFF or type \"true\" or \"1\" for ON. Validates all server files when Automatic Updates is enabled. Note: This will significantly increase server startup times, so it is recommended to only enable this when needed.", + "env_variable": "VALIDATE", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "string|nullable" + }, + { + "name": "[Advanced] Satisfactory Dedicated Server App ID", + "description": "Steam App ID used for installation and updates. Rarely needs to be changed.", + "env_variable": "SRCDS_APPID", + "default_value": "1690800", + "user_viewable": false, + "user_editable": false, + "rules": "required|integer|min:1" + } + ] +} \ No newline at end of file From bb10d01f1115d39e7f1300131fceb63a34215524 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Tue, 26 Oct 2021 15:45:13 -0700 Subject: [PATCH 0047/1001] Add Satisfactory to steamcmd_servers README --- game_eggs/steamcmd_servers/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/game_eggs/steamcmd_servers/README.md b/game_eggs/steamcmd_servers/README.md index c7098796..04694fa2 100644 --- a/game_eggs/steamcmd_servers/README.md +++ b/game_eggs/steamcmd_servers/README.md @@ -82,6 +82,9 @@ This is a collection of servers that use SteamCMD to install. * [Autowipe](rust/rust_autowipe) * [Staging](rust/rust_staging) +## Satisfactory +[Satisfactory](satisfactory) + ## SCP: Secret Laboratory * [SCP: Secret Laboratory](scpsl) * [dedicated](scpsl/dedicated) From a3036cc4fbcda3b3a1bb22bdd6b2d845b12ea98b Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Tue, 26 Oct 2021 15:46:02 -0700 Subject: [PATCH 0048/1001] Add Satisfactory to game_eggs README --- game_eggs/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/game_eggs/README.md b/game_eggs/README.md index f70084ee..01b64fd0 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -124,6 +124,7 @@ * [Rust](steamcmd_servers/rust) * [Autowipe](steamcmd_servers/rust/rust_autowipe) * [Staging](steamcmd_servers/rust/rust_staging) +* [Satisfactory](steamcmd_servers/Satisfactory) * [SCP: Secret Laboratory](steamcmd_servers/scpsl) * [dedicated](steamcmd_servers/scpsl/dedicated) * [multiadmin](steamcmd_servers/scpsl/multiadmin) From 08b00b5e245685e79c658052a4ed7dd64be26f1e Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Tue, 26 Oct 2021 15:46:50 -0700 Subject: [PATCH 0049/1001] Add Satisfactory to eggs README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 50e04b83..a7d1d00d 100644 --- a/README.md +++ b/README.md @@ -195,6 +195,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Rust](game_eggs/steamcmd_servers/rust) * [Autowipe](game_eggs/steamcmd_servers/rust/rust_autowipe) * [Staging](game_eggs/steamcmd_servers/rust/rust_staging) +* [Satisfactory](game_eggs/steamcmd_servers/satisfactory) * [SCP: Secret Laboratory](game_eggs/steamcmd_servers/scpsl) * [dedicated](game_eggs/steamcmd_servers/scpsl/dedicated) * [multiadmin](game_eggs/steamcmd_servers/scpsl/multiadmin) From a93931e9d4da28624d1ae706db4e242526f4c5b8 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Tue, 26 Oct 2021 15:47:59 -0700 Subject: [PATCH 0050/1001] Fix Satisfactory link Accidentally had uppercase "S" in link. --- game_eggs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/README.md b/game_eggs/README.md index 01b64fd0..d059f869 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -124,7 +124,7 @@ * [Rust](steamcmd_servers/rust) * [Autowipe](steamcmd_servers/rust/rust_autowipe) * [Staging](steamcmd_servers/rust/rust_staging) -* [Satisfactory](steamcmd_servers/Satisfactory) +* [Satisfactory](steamcmd_servers/satisfactory) * [SCP: Secret Laboratory](steamcmd_servers/scpsl) * [dedicated](steamcmd_servers/scpsl/dedicated) * [multiadmin](steamcmd_servers/scpsl/multiadmin) From 3b00cdc5b68eb6ecea1b1be659c484c3e83c90e4 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Tue, 26 Oct 2021 16:16:09 -0700 Subject: [PATCH 0051/1001] Update Satisfactory README Removed placeholder and filled in correct information. --- .../steamcmd_servers/satisfactory/README.md | 82 ++++++------------- 1 file changed, 27 insertions(+), 55 deletions(-) diff --git a/game_eggs/steamcmd_servers/satisfactory/README.md b/game_eggs/steamcmd_servers/satisfactory/README.md index 73aa486c..5f93ed2c 100644 --- a/game_eggs/steamcmd_servers/satisfactory/README.md +++ b/game_eggs/steamcmd_servers/satisfactory/README.md @@ -1,5 +1,5 @@ -# Arma 3 -***Updating your Egg? Please see [How to Update Egg](#how-to-update-egg) to avoid any issues!*** +# Satisfactory +***Server version currently marked as experimental by the Satisfactory developers! Egg loads fine, but your mileage may very in-game.*** ___ ### Authors / Contributors @@ -15,21 +15,20 @@ ___ 🔨 - -
Aussie Server Hosts + +
Kubi
- 💻 - 💡 + 💻 + 💡 - -
Daave + +
matthewpi
- 💻 - ⭐ - 💤 + 💻 + 💡 @@ -38,62 +37,35 @@ ___ ___ ### Game Description -From Bohemia Interactive's [Website](https://arma3.com/): -> Experience true combat gameplay in a massive military sandbox. Deploying a wide variety of single and multiplayer content, over 20 vehicles and 40 weapons, and limitless opportunities for content creation, this is the PC’s premier military game. Authentic, diverse, open - Arma 3 sends you to war. +From Coffee Stain's [Website](https://www.satisfactorygame.com/): +> Satisfactory is a first-person open-world factory building game with a dash of exploration and combat. Play alone or with friends, explore an alien planet, create multi-story factories, and enter conveyor belt heaven! ___ ### Egg Capabilities -- Configurable to run 32 or 64-bit versions of the server -- Max Players is configurable and able to be host enforced (\*see [Recommended Egg Modifications](#recommended-egg-modifications)) -- Able to download server updates on startup -- Able to download, update, and load Steam Workshop mods on startup (\*see [Installation Requirements](#installation-requirements)) - - Accepts uploaded HTML modlist files exported from the Arma 3 Launcher to define mods to load on the server. - - Also accepts manually listed mods, CDLCs, and server-side only mods. - - Checks for mod updates against their Steam Workshop page's last update for quick and efficient update checks. - - Automatically moves mod `.bikey`'s to the `/keys/` directory. -- Configurable to download Creator DLCs -- Configurable to run Beta/Performance binaries of the server (if desired; advanced users only) -- Additional [Arma 3 startup parameters](https://community.bistudio.com/wiki/Arma_3_Startup_Parameters) can be added to fine-tune performance -- Configurable to run up to 5 Headless Clients in parallel with the main server (may require additional performance overhead) -- [WHMCS](https://www.whmcs.com/) compatible (\*see [Recommended Egg Modifications](#recommended-egg-modifications)) +- Port configuration for Game, Query, and Beacon ports. +- Configurable to automatically check for server updates on start via SteamCMD. Forcing validation is also configurable. +- Misc. settings listed below can be configured by an admin client via the game's UI, and are currently **not** set via the Egg: + - Server Password + - Admin Password + - Auto-Save on Player Disconnect + - Pause When No Players Online + - ...and possibly more as the client's UI is developed further for more configuration options. ___ ### Installation Requirements -- A valid, **real** Steam account, with **Steam Guard turned off**, is required to install the server (default "anonymous" login cannot be used). For security reasons it is [recommended by Valve](https://developer.valvesoftware.com/wiki/SteamCMD#With_a_Steam_account) that you create a new Steam account just for your dedicated servers. This account *does not* need to own Arma 3. -- For automatic Steam Workshop mod downloading to work, the Steam account *does* need to own Arma 3. However, this is optional functionality, and mods can be manually uploaded to the server if desired. Hosts may feel free to change the "Disable Mod Downloads/Updates" variable to `1` if they would not like to offer it's functionality to clients. +- No major requirements, other than RAM and Disk space noted below. You *do not* need to own the base game to host this server. ___ ### Server Ports -Default server ports are listed below, but the Main port can be any port. There are three more ports after the Main port are relative to the Main port (For example: The BattlEye port is always 4 ports higher than the main port). **All four ports are required for normal server behavior.** It is [recommended](https://community.bistudio.com/wiki/Arma_3:_Dedicated_Server#Port_Forwarding) that each server be 100 ports separate from each other. +Default server ports are listed below, but all can be configured differently (at least according to the [wiki](https://satisfactory.fandom.com/wiki/Dedicated_servers); developers highly recommend using the default ports during the experimental release). **All three ports are required for normal server behavior.** | Port | Default | |---------|---------| -| **Arma 3 Game & VON (Main)** | 2302 | -| Steam Query (+1) | 2303 | -| Steam Port (+2) | 2304 | -| BattleEye (+4) | 2306 | +| **Game Port (Main Server Port in Pterodactyl)** | 7777 | +| Server Query Port | 15777 | +| Beacon Port | 15000 | -#### Mods/Plugins may require ports to be added to the server. -___ -### CPU Usage Information -ARMA 3 is mainly CPU intensive. Contrary to popular belief, the server binary *can* run on multiple cores/threads. However, it's ability to manage asynchronous tasks and hyperthread is *very* limited, meaning additional cores/threads reach diminishing returns very quickly. In addition, it's ability to utilize all of the CPU allotted to it for AI processing seems to be limited as well. Therefore, a Headless Client ***and*** a properly written mission file are highly recommended if large amounts of AI units will be used. ___ ### Minimum RAM Requirement -This server requires about 2048 MB of RAM to run properly. If used, every Headless Client uses an additional 2048 MB of RAM as well. +This server requires a minimum of 4096 MiB of RAM to boot, but the developers recommend 8192 MiB of RAM for 4 players. ___ ### Minimum Disk Requirement -This server requires just under 10 GB of disk space to safely run properly with no mods. However, mods can easily increase disk usage to 50 GB or more, depending on how many are downloaded. +This server requires just under 5 GB of disk space to safely run properly. However, save files could easily surpass this amount, so 7-10 GB is recommended. ___ -### Recommended Egg Modifications -The following are highly recommended variable modifications you can make to the egg after importing it to your panel. While viewing this egg, simply go to the "Variables" tab of the egg editor to make these changes. -#### Default Steam Username & Password -- To make deploying servers easy (**or if you are using WHMCS**), it is recommended to edit the default values of "Steam Username" and "Steam Password" to your Steam account dedicated for hosting. This will make all newly installed servers use these credentials. **DO NOT** make these fields visible to the end user so that they can use their own Steam accounts; the panel will save their Steam credentials in **plain text**, which is a BIG NO NO for security and privacy. -#### Restrict Max Players -- If you would like to restrict the maximum number of players that can join your client's server, you can change the permissions of the "Max Players" variable so that clients can only view this value (and not edit it). It's default value can also be changed, or the value can be changed on a server-by-server basis as desired. -___ -### How to Update Egg -If you already have an Arma 3 egg installed on your panel, there are a couple things to consider before updating to this egg: -- The Startup Command has changed, but Pterodactyl currently does not update this across all your existing servers. Servers will still boot with their old Startup Command, but the new HTML Modlist feature will not work, and depreciated variables for config files will be used. Servers will have to be manually updated to the new Startup Command via the Startup tab. -- Startup Variables have been completely rehauled. While most important existing variables have retained their Environment Variable names, a lot of their titles and order have been adjusted. Simply updating your existing egg with this egg may lead to Startup Variables being terribly out of order and cluttered. Therefore, the following steps are recommended to avoid this: - 1. Change the name of your existing Arma 3 egg to "Arma 3 (Old)". - 2. Install this updated egg as a new egg in your nest. - 3. Make any egg modifications you would like. (\*see [Recommended Egg Modifications](#recommended-egg-modifications)) - 4. Change all existing Arma 3 servers to the new egg via the Startup tab. - 5. Delete the old egg. From b661cd4b8d7f0b940e73885f1826530f59729b11 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Tue, 26 Oct 2021 16:45:57 -0700 Subject: [PATCH 0052/1001] Add "Errors/Warnings" Section to README Added a section detailing some common errors and warnings that can safely be ignored. --- .../steamcmd_servers/satisfactory/README.md | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/game_eggs/steamcmd_servers/satisfactory/README.md b/game_eggs/steamcmd_servers/satisfactory/README.md index 5f93ed2c..1085002f 100644 --- a/game_eggs/steamcmd_servers/satisfactory/README.md +++ b/game_eggs/steamcmd_servers/satisfactory/README.md @@ -69,3 +69,24 @@ ___ ### Minimum Disk Requirement This server requires just under 5 GB of disk space to safely run properly. However, save files could easily surpass this amount, so 7-10 GB is recommended. ___ +### Errors/Warnings +The following errors or warnings you see in the console can safely be ignored: +```log +steamclient.so: cannot open shared object file: No such file or directory +[S_API] SteamAPI_Init(): Loaded '/home/container/.steam/sdk64/steamclient.so' OK. (First tried local 'steamclient.so') +LogSteamShared: Warning: Steam Dedicated Server API failed to initialize. +``` +The local file of 'steamclient.so' was attempted to be loaded, but could not because it is not present, causing the warning message. However, the backup `/home/container/.steam/sdk64/steamclient.so` is loaded successfully (this is the correct behavior according to the [Wiki](https://satisfactory.fandom.com/wiki/Dedicated_servers)). +```log +...Error: Couldn't find file for package... +``` +```log +...Error: Navmesh bounds are too large!... +``` +```log +...Warning: NiagaraSystem... +``` +```log +LogStreaming: Warning: Failed to read file '../../../FactoryGame/Saved/SaveGames/GameAnalytics.sav' error. +``` +These seem to be common error messages with the current experimental version of the game. From 468aeb3b72fdd5e8251d96c224fc130234187be3 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Tue, 26 Oct 2021 19:05:06 -0700 Subject: [PATCH 0053/1001] Port Info Corrections and Small Changes for README - Fixed misinformation of required ports and made it clear that the default ports are currently required to be used for the server to work. - Fixed typos. - Updated the recommended RAM amount, based off an update to the developer's wiki made today. --- .../steamcmd_servers/satisfactory/README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/game_eggs/steamcmd_servers/satisfactory/README.md b/game_eggs/steamcmd_servers/satisfactory/README.md index 1085002f..01fd8246 100644 --- a/game_eggs/steamcmd_servers/satisfactory/README.md +++ b/game_eggs/steamcmd_servers/satisfactory/README.md @@ -1,5 +1,5 @@ # Satisfactory -***Server version currently marked as experimental by the Satisfactory developers! Egg loads fine, but your mileage may very in-game.*** +***Server version currently marked as experimental by the Satisfactory developers! Egg loads fine, but your mileage may vary in-game.*** ___ ### Authors / Contributors @@ -41,7 +41,7 @@ From Coffee Stain's [Website](https://www.satisfactorygame.com/): > Satisfactory is a first-person open-world factory building game with a dash of exploration and combat. Play alone or with friends, explore an alien planet, create multi-story factories, and enter conveyor belt heaven! ___ ### Egg Capabilities -- Port configuration for Game, Query, and Beacon ports. +- Configuration of the Server Query port. - Configurable to automatically check for server updates on start via SteamCMD. Forcing validation is also configurable. - Misc. settings listed below can be configured by an admin client via the game's UI, and are currently **not** set via the Egg: - Server Password @@ -50,21 +50,21 @@ ___ - Pause When No Players Online - ...and possibly more as the client's UI is developed further for more configuration options. ___ -### Installation Requirements -- No major requirements, other than RAM and Disk space noted below. You *do not* need to own the base game to host this server. -___ ### Server Ports -Default server ports are listed below, but all can be configured differently (at least according to the [wiki](https://satisfactory.fandom.com/wiki/Dedicated_servers); developers highly recommend using the default ports during the experimental release). **All three ports are required for normal server behavior.** +Default server ports are listed below, and **only** the Server Query port can currently be changed. The current experimental version limits the default Game and Beacon ports from being changed, unless two instances of the server are ran on the **same system** (which cannot be done with Pterodactyl, since every server is ran on it's own containerized system). This is expected to change as the dedicated server is further developed. **All three ports are required to be open for normal server behavior!** -| Port | Default | +| Description | REQUIRED UDP Port | |---------|---------| | **Game Port (Main Server Port in Pterodactyl)** | 7777 | -| Server Query Port | 15777 | +| Server Query Port | 15777 *(Configurable)* | | Beacon Port | 15000 | +___ +### Installation Requirements +- No major requirements, other than RAM and Disk space noted below. You *do not* need to own the base game to host this server. ___ ### Minimum RAM Requirement -This server requires a minimum of 4096 MiB of RAM to boot, but the developers recommend 8192 MiB of RAM for 4 players. +This server requires a minimum of 4096 MiB of RAM to boot, but the developers recommend 6144 to 8192 MiB of RAM for 4 players. ___ ### Minimum Disk Requirement This server requires just under 5 GB of disk space to safely run properly. However, save files could easily surpass this amount, so 7-10 GB is recommended. From 8634ba7d8b3736d8ab7b6aaea3b481262b279668 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Tue, 26 Oct 2021 19:24:14 -0700 Subject: [PATCH 0054/1001] Update egg's port variables - Removed them from view of the end user as they less relevant at the moment (because they cannot be changed from the defaults). - Reworded the Beacon port's description to be more correct and clear. - Temporarily restricted the Beacon port to 15000 because it currently cannot be changed. --- .../satisfactory/egg-satisfactory.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json index 41b90d73..d458ca82 100644 --- a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json +++ b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json @@ -32,18 +32,18 @@ "description": "This is the port that you need to enter in the game when you first connect to a dedicated server.", "env_variable": "QUERY_PORT", "default_value": "15777", - "user_viewable": true, + "user_viewable": false, "user_editable": false, "rules": "required|integer|min:1024|max:65536" }, { "name": "[REQUIRED] Beacon Port", - "description": "This port's internal opening on this server *must* match it's external opening on your network (ie. If you set this value to 3333, your externally open port, which is linked to this port, must also be 3333). This is also true for the master Game Port.", + "description": "This port's default value currently cannot be changed due to the server's experimental status. However, it is left here for posterity, as changing this value is expected to be possible after the developer further develops the dedicated server. This is also true for the main Game Port (must be 7777)!", "env_variable": "BEACON_PORT", "default_value": "15000", - "user_viewable": true, + "user_viewable": false, "user_editable": false, - "rules": "required|integer|min:1024|max:65536" + "rules": "required|integer|min:15000|max:15000" }, { "name": "Automatic Updates", @@ -73,4 +73,4 @@ "rules": "required|integer|min:1" } ] -} \ No newline at end of file +} From a066c373e52cfced7090dd226ff3029d709f47e2 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Tue, 26 Oct 2021 19:32:11 -0700 Subject: [PATCH 0055/1001] Additional Port Clarification in the README - Mentioned only one server can be run on Ptero due to the port limitation. - Added mention that external ports must match internal ports (because the game client only looks for port 7777 at the moment) --- game_eggs/steamcmd_servers/satisfactory/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/satisfactory/README.md b/game_eggs/steamcmd_servers/satisfactory/README.md index 01fd8246..c73f5922 100644 --- a/game_eggs/steamcmd_servers/satisfactory/README.md +++ b/game_eggs/steamcmd_servers/satisfactory/README.md @@ -1,5 +1,6 @@ # Satisfactory ***Server version currently marked as experimental by the Satisfactory developers! Egg loads fine, but your mileage may vary in-game.*** +**Note: At this time, you can only run *one* Satisfactory server on your Pterodactyl panel. See [Server Ports](#server-ports) for more info.** ___ ### Authors / Contributors @@ -51,7 +52,7 @@ ___ - ...and possibly more as the client's UI is developed further for more configuration options. ___ ### Server Ports -Default server ports are listed below, and **only** the Server Query port can currently be changed. The current experimental version limits the default Game and Beacon ports from being changed, unless two instances of the server are ran on the **same system** (which cannot be done with Pterodactyl, since every server is ran on it's own containerized system). This is expected to change as the dedicated server is further developed. **All three ports are required to be open for normal server behavior!** +Default server ports are listed below, and **only** the Server Query port can currently be changed. The current experimental version limits the default Game and Beacon ports from being changed, unless two instances of the server are ran on the same system (which cannot be done with Pterodactyl, since every server is ran on it's own containerized system). This is expected to change as the dedicated server is further developed. Also, your internal ports **must match** your external ports on your network (ie. you can't have an external port of 7778 forwarded to your 7777 internal port; they must match). **All three ports are required to be open for normal server behavior!** | Description | REQUIRED UDP Port | |---------|---------| From e80ee5ac8eaa4b4a027bcbb3a70d61e2f7d36840 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Tue, 26 Oct 2021 19:45:25 -0700 Subject: [PATCH 0056/1001] Small Fixes to README - Added correct anchor to wiki link on the SteamAPI library error - Added new line to top warning lines. --- game_eggs/steamcmd_servers/satisfactory/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/satisfactory/README.md b/game_eggs/steamcmd_servers/satisfactory/README.md index c73f5922..285533ca 100644 --- a/game_eggs/steamcmd_servers/satisfactory/README.md +++ b/game_eggs/steamcmd_servers/satisfactory/README.md @@ -1,5 +1,6 @@ # Satisfactory ***Server version currently marked as experimental by the Satisfactory developers! Egg loads fine, but your mileage may vary in-game.*** + **Note: At this time, you can only run *one* Satisfactory server on your Pterodactyl panel. See [Server Ports](#server-ports) for more info.** ___ ### Authors / Contributors @@ -77,7 +78,7 @@ steamclient.so: cannot open shared object file: No such file or directory [S_API] SteamAPI_Init(): Loaded '/home/container/.steam/sdk64/steamclient.so' OK. (First tried local 'steamclient.so') LogSteamShared: Warning: Steam Dedicated Server API failed to initialize. ``` -The local file of 'steamclient.so' was attempted to be loaded, but could not because it is not present, causing the warning message. However, the backup `/home/container/.steam/sdk64/steamclient.so` is loaded successfully (this is the correct behavior according to the [Wiki](https://satisfactory.fandom.com/wiki/Dedicated_servers)). +The local file of 'steamclient.so' was attempted to be loaded, but could not because it is not present, causing the warning message. However, the backup `/home/container/.steam/sdk64/steamclient.so` is loaded successfully (this is the correct behavior according to the [Wiki](https://satisfactory.fandom.com/wiki/Dedicated_servers#SteamAPI_library_error)). ```log ...Error: Couldn't find file for package... ``` From 58eadedb6984de6a4d90f3d859d82b912603373c Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Tue, 26 Oct 2021 20:12:46 -0700 Subject: [PATCH 0057/1001] Add Save File Info to README - Added save file location information to the readme (since the location differs on Ptero compared to the wiki). - Additional formatting tweaks. --- game_eggs/steamcmd_servers/satisfactory/README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/satisfactory/README.md b/game_eggs/steamcmd_servers/satisfactory/README.md index 285533ca..5a202df4 100644 --- a/game_eggs/steamcmd_servers/satisfactory/README.md +++ b/game_eggs/steamcmd_servers/satisfactory/README.md @@ -63,7 +63,7 @@ Default server ports are listed below, and **only** the Server Query port can cu ___ ### Installation Requirements -- No major requirements, other than RAM and Disk space noted below. You *do not* need to own the base game to host this server. +No major requirements, other than RAM and Disk space noted below. You *do not* need to own the base game to host this server. ___ ### Minimum RAM Requirement This server requires a minimum of 4096 MiB of RAM to boot, but the developers recommend 6144 to 8192 MiB of RAM for 4 players. @@ -71,14 +71,23 @@ ___ ### Minimum Disk Requirement This server requires just under 5 GB of disk space to safely run properly. However, save files could easily surpass this amount, so 7-10 GB is recommended. ___ +### Save File Location +[According to the developer](https://www.youtube.com/watch?v=Nn-1s87JJxc), save files will be able to be download by clients via their game in the future. Until then, below is the save file location incase you would like to upload or download a save file (note that it is different from their wiki): + +`/home/container/.config/Epic/FactoryGame/Saved/SaveGames/server` + +Single-player save files can be uploaded here and are playable if desired. +___ ### Errors/Warnings The following errors or warnings you see in the console can safely be ignored: + ```log steamclient.so: cannot open shared object file: No such file or directory [S_API] SteamAPI_Init(): Loaded '/home/container/.steam/sdk64/steamclient.so' OK. (First tried local 'steamclient.so') LogSteamShared: Warning: Steam Dedicated Server API failed to initialize. ``` The local file of 'steamclient.so' was attempted to be loaded, but could not because it is not present, causing the warning message. However, the backup `/home/container/.steam/sdk64/steamclient.so` is loaded successfully (this is the correct behavior according to the [Wiki](https://satisfactory.fandom.com/wiki/Dedicated_servers#SteamAPI_library_error)). + ```log ...Error: Couldn't find file for package... ``` From dc403d418cba5376a7872eaee1737c7a04c4ec9d Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Tue, 26 Oct 2021 21:47:27 -0700 Subject: [PATCH 0058/1001] Fix Install Script using Wrong App ID Variable Name Changed `APP_ID` to `SRCDS_APPID` in the install script to match the corresponding variable. --- game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json index d458ca82..b4222b1d 100644 --- a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json +++ b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json @@ -21,7 +21,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl Satisfactory Egg - egg-satisfactory.json\r\n## Authors: ryan@kubiq.io (Kubi), matthew@pterodactyl.io (matthewp), & David Wolfe (Red-Thirten)\r\n## Date: 2021\/10\/26\r\n## License: MIT License\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n# Download and install SteamCMD\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${APP_ID} validate +exit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so", + "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl Satisfactory Egg - egg-satisfactory.json\r\n## Authors: ryan@kubiq.io (Kubi), matthew@pterodactyl.io (matthewp), & David Wolfe (Red-Thirten)\r\n## Date: 2021\/10\/26\r\n## License: MIT License\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n# Download and install SteamCMD\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} validate +exit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so", "container": "debian:buster-slim", "entrypoint": "bash" } From 2085de58374b92d1c10de9567438f7aac3df5442 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Wed, 27 Oct 2021 02:12:07 -0700 Subject: [PATCH 0059/1001] Migrate Install Script to use Debian Yolk Image - Changed the Install Script Container to use Pterodactyl Debian Installer Yolk image. - Removed the apt update code that is already handled by the installer image. --- game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json index b4222b1d..7440ddd7 100644 --- a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json +++ b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json @@ -21,8 +21,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl Satisfactory Egg - egg-satisfactory.json\r\n## Authors: ryan@kubiq.io (Kubi), matthew@pterodactyl.io (matthewp), & David Wolfe (Red-Thirten)\r\n## Date: 2021\/10\/26\r\n## License: MIT License\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n# Download and install SteamCMD\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} validate +exit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so", - "container": "debian:buster-slim", + "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl Satisfactory Egg - egg-satisfactory.json\r\n## Authors: ryan@kubiq.io (Kubi), matthew@pterodactyl.io (matthewp), & David Wolfe (Red-Thirten)\r\n## Date: 2021\/10\/26\r\n## License: MIT License\r\n\r\n# Download and install SteamCMD\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} validate +exit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so", + "container": "ghcr.io\/pterodactyl\/installers:debian", "entrypoint": "bash" } }, From 9057ce2aa23c9f2de1446f1fe2c2208dab96799e Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Wed, 27 Oct 2021 02:18:33 -0700 Subject: [PATCH 0060/1001] Small fixes to Save Location section in README Fixed typo --- game_eggs/steamcmd_servers/satisfactory/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/satisfactory/README.md b/game_eggs/steamcmd_servers/satisfactory/README.md index 5a202df4..b09070ef 100644 --- a/game_eggs/steamcmd_servers/satisfactory/README.md +++ b/game_eggs/steamcmd_servers/satisfactory/README.md @@ -72,7 +72,7 @@ ___ This server requires just under 5 GB of disk space to safely run properly. However, save files could easily surpass this amount, so 7-10 GB is recommended. ___ ### Save File Location -[According to the developer](https://www.youtube.com/watch?v=Nn-1s87JJxc), save files will be able to be download by clients via their game in the future. Until then, below is the save file location incase you would like to upload or download a save file (note that it is different from their wiki): +[According to the developer](https://www.youtube.com/watch?v=Nn-1s87JJxc), save files will be able to be uploaded and downloaded by clients via their game client in the future. Until then, below is the save file location incase you would like to upload or download a save file manually (note that it is different from their wiki): `/home/container/.config/Epic/FactoryGame/Saved/SaveGames/server` From 127bea6a4dd253f2238935d83ce52e4281b49adc Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Wed, 27 Oct 2021 16:11:17 -0700 Subject: [PATCH 0061/1001] Custom Ports Update + More Egg: - Changed the startup command to call the binary directly to avoid end-users changing the provided bash file to run whatever they'd like. - Changed the install script to check that the server successfully installed, and makes the server binary executable. Also added Software-Noob as a contributor. - Fixed the startup command to support custom ports. The SERVER_PORT variable is now tied to the Server Query Port (because that is what clients use to connect to the server). The GAME_PORT variable was added for the Game Port. Also changed the Game Port to use the correct flag. - Changed the Server Query Port variable to be the Game Port and provided a better description. - Updated the Beacon Port description to be more accurate. Also unlocked it's restriction to port 15000 because it can be changed now. README: - Updated any text mentioning restricted ports to text explaining their configuration. Also used clearer verbiage for the port table. - Added Software-Noob as a contributor. - Added info on "initializing"/"claiming" a server. - Added info on the command line. - Added "SDL" warning as a warning to safely ignore. --- .../steamcmd_servers/satisfactory/README.md | 39 +++++++++++++------ .../satisfactory/egg-satisfactory.json | 18 ++++----- 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/game_eggs/steamcmd_servers/satisfactory/README.md b/game_eggs/steamcmd_servers/satisfactory/README.md index b09070ef..31e0ae66 100644 --- a/game_eggs/steamcmd_servers/satisfactory/README.md +++ b/game_eggs/steamcmd_servers/satisfactory/README.md @@ -1,7 +1,5 @@ # Satisfactory ***Server version currently marked as experimental by the Satisfactory developers! Egg loads fine, but your mileage may vary in-game.*** - -**Note: At this time, you can only run *one* Satisfactory server on your Pterodactyl panel. See [Server Ports](#server-ports) for more info.** ___ ### Authors / Contributors @@ -32,6 +30,14 @@ ___ 💻 💡 + + +
Software-Noob + +
+ 💻 + 💡 + @@ -43,7 +49,7 @@ From Coffee Stain's [Website](https://www.satisfactorygame.com/): > Satisfactory is a first-person open-world factory building game with a dash of exploration and combat. Play alone or with friends, explore an alien planet, create multi-story factories, and enter conveyor belt heaven! ___ ### Egg Capabilities -- Configuration of the Server Query port. +- Configuration of the Server Query, Beacon, and Game ports. - Configurable to automatically check for server updates on start via SteamCMD. Forcing validation is also configurable. - Misc. settings listed below can be configured by an admin client via the game's UI, and are currently **not** set via the Egg: - Server Password @@ -53,17 +59,19 @@ ___ - ...and possibly more as the client's UI is developed further for more configuration options. ___ ### Server Ports -Default server ports are listed below, and **only** the Server Query port can currently be changed. The current experimental version limits the default Game and Beacon ports from being changed, unless two instances of the server are ran on the same system (which cannot be done with Pterodactyl, since every server is ran on it's own containerized system). This is expected to change as the dedicated server is further developed. Also, your internal ports **must match** your external ports on your network (ie. you can't have an external port of 7778 forwarded to your 7777 internal port; they must match). **All three ports are required to be open for normal server behavior!** +Default server ports are listed below, but all three ports can be changed freely. Note: The Primary/Default/"Game" Port for your server in Pterodactyl will be your Server Query port. It is recommended to distance ports of other running Satisfactory servers in Pterodactyl by increments of 100 (it is currently unknown what the minimum increment is, but an increment of +1 caused cross-server talk in testing). Also, your internal ports **must match** your external ports on your network (ie. you can't have an external port of 7778 forwarded to your 7777 internal port; they must match). **All three ports are required to be open for normal server behavior!** -| Description | REQUIRED UDP Port | +| Port | Default (UDP) | |---------|---------| -| **Game Port (Main Server Port in Pterodactyl)** | 7777 | -| Server Query Port | 15777 *(Configurable)* | -| Beacon Port | 15000 | +| **Server Query (Primary Port in Pterodactyl)** | 15777 | +| Beacon | 15000 | +| Game | 7777 | ___ -### Installation Requirements -No major requirements, other than RAM and Disk space noted below. You *do not* need to own the base game to host this server. +### Installation Requirements/Instructions +- No major requirements, other than RAM and Disk space noted below. +- You *do not* need to own the base game to host this server. +- However, to fully "initialize" your server, a client who owns the game must log into the server to "claim" it and create a new session. The generated session will not be written to disk until the first save occurs. ___ ### Minimum RAM Requirement This server requires a minimum of 4096 MiB of RAM to boot, but the developers recommend 6144 to 8192 MiB of RAM for 4 players. @@ -72,12 +80,15 @@ ___ This server requires just under 5 GB of disk space to safely run properly. However, save files could easily surpass this amount, so 7-10 GB is recommended. ___ ### Save File Location -[According to the developer](https://www.youtube.com/watch?v=Nn-1s87JJxc), save files will be able to be uploaded and downloaded by clients via their game client in the future. Until then, below is the save file location incase you would like to upload or download a save file manually (note that it is different from their wiki): +[According to the developer](https://www.youtube.com/watch?v=Nn-1s87JJxc), save files will be able to be uploaded and downloaded by clients via their game client in the future. Until then, below is the save file location in case you would like to upload or download a save file manually (note that it is different from their wiki): `/home/container/.config/Epic/FactoryGame/Saved/SaveGames/server` Single-player save files can be uploaded here and are playable if desired. ___ +### Console +Currently, it does not appear that commands sent through the console register with the server. The in-game client command line can be used instead (but valid commands are currently unknown at this time). +___ ### Errors/Warnings The following errors or warnings you see in the console can safely be ignored: @@ -88,6 +99,12 @@ LogSteamShared: Warning: Steam Dedicated Server API failed to initialize. ``` The local file of 'steamclient.so' was attempted to be loaded, but could not because it is not present, causing the warning message. However, the backup `/home/container/.steam/sdk64/steamclient.so` is loaded successfully (this is the correct behavior according to the [Wiki](https://satisfactory.fandom.com/wiki/Dedicated_servers#SteamAPI_library_error)). +```log +Warning: failed to init SDL thread priority manager: SDL not found +``` + +This is a common error with Steam related software on Linux, but can safely be ignored. + ```log ...Error: Couldn't find file for package... ``` diff --git a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json index 7440ddd7..4150fa86 100644 --- a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json +++ b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json @@ -12,7 +12,7 @@ "ghcr.io\/pterodactyl\/games:source" ], "file_denylist": [], - "startup": ".\/FactoryServer.sh -GamePort={{SERVER_PORT}} -ServerQueryPort={{QUERY_PORT}} -BeaconPort={{BEACON_PORT}}", + "startup": ".\/Engine\/Binaries\/Linux\/UE4Server-Linux-Shipping FactoryGame -ServerQueryPort={{SERVER_PORT}} -Port={{GAME_PORT}} -BeaconPort={{BEACON_PORT}}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Engine Initialization\"\r\n}", @@ -21,29 +21,29 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl Satisfactory Egg - egg-satisfactory.json\r\n## Authors: ryan@kubiq.io (Kubi), matthew@pterodactyl.io (matthewp), & David Wolfe (Red-Thirten)\r\n## Date: 2021\/10\/26\r\n## License: MIT License\r\n\r\n# Download and install SteamCMD\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} validate +exit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so", + "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl Satisfactory Egg - egg-satisfactory.json\r\n## Authors: ryan@kubiq.io (Kubi), matthew@pterodactyl.io (matthewp), admin@softwarenoob.com (Software-Noob) & David Wolfe (Red-Thirten)\r\n## Date: 2021\/10\/27\r\n## License: MIT License\r\n\r\n# Download and install SteamCMD\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} validate +exit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so\r\n\r\n# Satisfactory setup\r\ncd \/mnt\/server\/Engine\/Binaries\/Linux\r\nif [[ ! -f UE4Server-Linux-Shipping ]]; then\r\n echo -e \"\\n\\nSteamCMD failed to install the Satisfactory Dedicated Server!\"\r\n echo -e \"\\tTry reinstalling the server again.\\n\"\r\n exit 1\r\nelse\r\n chmod +x UE4Server-Linux-Shipping\r\nfi\r\n\r\necho -e \"\\n\\nSatisfactory Dedicated Server successfully installed!\\n\"", "container": "ghcr.io\/pterodactyl\/installers:debian", "entrypoint": "bash" } }, "variables": [ { - "name": "[REQUIRED] Server Query Port", - "description": "This is the port that you need to enter in the game when you first connect to a dedicated server.", - "env_variable": "QUERY_PORT", - "default_value": "15777", + "name": "[REQUIRED] Game Port", + "description": "This is the port that the game client uses to connect to the game world (not the lobby). Ensure this port matches your externally forwarded port, and is distanced from other running Satisfactory servers in Pterodactyl (increments of 100 are recommended). This is also true for the Primary (Query) Port!", + "env_variable": "GAME_PORT", + "default_value": "7777", "user_viewable": false, "user_editable": false, "rules": "required|integer|min:1024|max:65536" }, { "name": "[REQUIRED] Beacon Port", - "description": "This port's default value currently cannot be changed due to the server's experimental status. However, it is left here for posterity, as changing this value is expected to be possible after the developer further develops the dedicated server. This is also true for the main Game Port (must be 7777)!", + "description": "This port provides a lightweight way for clients to contact a server and interact with it without committing to a normal game connection (likely used for client administration). Ensure this port matches your externally forwarded port, and is distanced from other running Satisfactory servers in Pterodactyl (increments of 100 are recommended).", "env_variable": "BEACON_PORT", "default_value": "15000", "user_viewable": false, "user_editable": false, - "rules": "required|integer|min:15000|max:15000" + "rules": "required|integer|min:1024|max:65536" }, { "name": "Automatic Updates", @@ -73,4 +73,4 @@ "rules": "required|integer|min:1" } ] -} +} \ No newline at end of file From 40e73bb26b358cae42c71ba2de73c4171c051f48 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Thu, 28 Oct 2021 16:27:30 -0700 Subject: [PATCH 0062/1001] Add Max Players & Revert Port Change Egg: - Reverted the startup command so that the game port is the primary port and QUERY_PORT is the Server Query Port. I honestly think it will be confusing either way, so it's a wash for me; but ultimately, if Ptero calls the primary port the "Game Port" in Allocation Management, it should be Satisfactory's "game" port. - Added the capability to override the server's default max players of 4. This consists of a new variable, default config file creation during install (because the server doesn't auto-create it), and a Configuration Files replacement on boot to accommodate variable changes. - Reverted Game Port variable to Server Query Port variable. - Changed port rules to use the more intuitive `between` rule. README: - Added Zarklord as a contributor. - Added Max Players as an Egg Capability. - Rewrote the Server Ports section (again) to accommodate the egg change and be as clear as possible. - Added warning about stopping the server and saves. - Added note to Minimum RAM Requirement that large saves can also cause excessive RAM usage. - Updated Console Commands section with newly published Wiki information. - Updated `steamclient.so` Wiki reference link (which will probably break again soon because the Wiki is being changed almost every hour now). Co-Authored-By: Zarklord <1622280+Zarklord@users.noreply.github.com> --- .../steamcmd_servers/satisfactory/README.md | 31 ++++++++++++++----- .../satisfactory/egg-satisfactory.json | 29 +++++++++++------ 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/game_eggs/steamcmd_servers/satisfactory/README.md b/game_eggs/steamcmd_servers/satisfactory/README.md index 31e0ae66..e8c1782a 100644 --- a/game_eggs/steamcmd_servers/satisfactory/README.md +++ b/game_eggs/steamcmd_servers/satisfactory/README.md @@ -38,6 +38,14 @@ ___ 💻 💡 + + +
Zarklord + +
+ 💻 + 💡 + @@ -51,6 +59,7 @@ ___ ### Egg Capabilities - Configuration of the Server Query, Beacon, and Game ports. - Configurable to automatically check for server updates on start via SteamCMD. Forcing validation is also configurable. +- *[Experimental]* Max player configuration. - Misc. settings listed below can be configured by an admin client via the game's UI, and are currently **not** set via the Egg: - Server Password - Admin Password @@ -59,35 +68,41 @@ ___ - ...and possibly more as the client's UI is developed further for more configuration options. ___ ### Server Ports -Default server ports are listed below, but all three ports can be changed freely. Note: The Primary/Default/"Game" Port for your server in Pterodactyl will be your Server Query port. It is recommended to distance ports of other running Satisfactory servers in Pterodactyl by increments of 100 (it is currently unknown what the minimum increment is, but an increment of +1 caused cross-server talk in testing). Also, your internal ports **must match** your external ports on your network (ie. you can't have an external port of 7778 forwarded to your 7777 internal port; they must match). **All three ports are required to be open for normal server behavior!** +- Default server ports are listed below, but all three ports can be changed freely. +- **Note:** The Primary/Default/Game Port for your server in Pterodactyl will be Satisfactory's `-Port=????` game port, even though clients will **connect with the Query port**. +- It is recommended to distance ports of other running Satisfactory servers in Pterodactyl by **increments of 100** (it is currently unknown what the minimum increment is, but an increment of +1 caused cross-server talk in testing). Also, your internal ports **must match** your external ports on your network (ie. you can't have an external port of 7778 forwarded to your 7777 internal port; they must match). +- ***All three ports are required to be open for normal server behavior!*** | Port | Default (UDP) | |---------|---------| -| **Server Query (Primary Port in Pterodactyl)** | 15777 | +| **Game (Primary Port in Pterodactyl)** | 7777 | | Beacon | 15000 | -| Game | 7777 | +| Server Query | 15777 | ___ ### Installation Requirements/Instructions - No major requirements, other than RAM and Disk space noted below. - You *do not* need to own the base game to host this server. - However, to fully "initialize" your server, a client who owns the game must log into the server to "claim" it and create a new session. The generated session will not be written to disk until the first save occurs. +- Currently, there is no way to save the session on server stop. Therefore, ensure the session is saved or the last player has disconnected (causing an auto-save) before stopping the server. ___ ### Minimum RAM Requirement -This server requires a minimum of 4096 MiB of RAM to boot, but the developers recommend 6144 to 8192 MiB of RAM for 4 players. +This server requires a minimum of 4096 MiB of RAM to boot, but the developers recommend 6144 to 8192 MiB of RAM for 4 players or large save files. ___ ### Minimum Disk Requirement This server requires just under 5 GB of disk space to safely run properly. However, save files could easily surpass this amount, so 7-10 GB is recommended. ___ ### Save File Location -[According to the developer](https://www.youtube.com/watch?v=Nn-1s87JJxc), save files will be able to be uploaded and downloaded by clients via their game client in the future. Until then, below is the save file location in case you would like to upload or download a save file manually (note that it is different from their wiki): +[According to the developer](https://www.youtube.com/watch?v=Nn-1s87JJxc), save files will be able to be uploaded and downloaded by clients via their game client in the future. Until then, below is the save file location in case you would like to upload or download a save file manually: `/home/container/.config/Epic/FactoryGame/Saved/SaveGames/server` Single-player save files can be uploaded here and are playable if desired. ___ -### Console -Currently, it does not appear that commands sent through the console register with the server. The in-game client command line can be used instead (but valid commands are currently unknown at this time). +### Console Commands +As of v5.0.4, the console tab in the client server manager is the only way to execute commands. Entering commands via Pterodactyl do nothing. + +[List of known commands can be found via the Wiki](https://satisfactory.fandom.com/wiki/Dedicated_servers#Commands) ___ ### Errors/Warnings The following errors or warnings you see in the console can safely be ignored: @@ -97,7 +112,7 @@ steamclient.so: cannot open shared object file: No such file or directory [S_API] SteamAPI_Init(): Loaded '/home/container/.steam/sdk64/steamclient.so' OK. (First tried local 'steamclient.so') LogSteamShared: Warning: Steam Dedicated Server API failed to initialize. ``` -The local file of 'steamclient.so' was attempted to be loaded, but could not because it is not present, causing the warning message. However, the backup `/home/container/.steam/sdk64/steamclient.so` is loaded successfully (this is the correct behavior according to the [Wiki](https://satisfactory.fandom.com/wiki/Dedicated_servers#SteamAPI_library_error)). +The local file of 'steamclient.so' was attempted to be loaded, but could not because it is not present, causing the warning message. However, the backup `/home/container/.steam/sdk64/steamclient.so` is loaded successfully (this is the correct behavior according to the [Wiki](https://satisfactory.fandom.com/wiki/Dedicated_servers#No_Such_File_or_Directory)). ```log Warning: failed to init SDL thread priority manager: SDL not found diff --git a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json index 4150fa86..0e4a7f55 100644 --- a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json +++ b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json @@ -1,5 +1,5 @@ { - "_comment": "Pterodactyl Satisfactory Egg ~ Kubi, matthewp, and Red-Thirten ~ 2021-10-26", + "_comment": "Pterodactyl Satisfactory Egg ~ Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord ~ 2021-10-28", "meta": { "version": "PTDL_v1", "update_url": null @@ -12,29 +12,29 @@ "ghcr.io\/pterodactyl\/games:source" ], "file_denylist": [], - "startup": ".\/Engine\/Binaries\/Linux\/UE4Server-Linux-Shipping FactoryGame -ServerQueryPort={{SERVER_PORT}} -Port={{GAME_PORT}} -BeaconPort={{BEACON_PORT}}", + "startup": ".\/Engine\/Binaries\/Linux\/UE4Server-Linux-Shipping FactoryGame -Port={{SERVER_PORT}} -ServerQueryPort={{QUERY_PORT}} -BeaconPort={{BEACON_PORT}}", "config": { - "files": "{}", + "files": "{\r\n \"FactoryGame\/Saved\/Config\/LinuxServer\/Game.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"MaxPlayers\": \"MaxPlayers={{server.build.env.MAX_PLAYERS}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Engine Initialization\"\r\n}", "logs": "{}", "stop": "^CC" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl Satisfactory Egg - egg-satisfactory.json\r\n## Authors: ryan@kubiq.io (Kubi), matthew@pterodactyl.io (matthewp), admin@softwarenoob.com (Software-Noob) & David Wolfe (Red-Thirten)\r\n## Date: 2021\/10\/27\r\n## License: MIT License\r\n\r\n# Download and install SteamCMD\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} validate +exit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so\r\n\r\n# Satisfactory setup\r\ncd \/mnt\/server\/Engine\/Binaries\/Linux\r\nif [[ ! -f UE4Server-Linux-Shipping ]]; then\r\n echo -e \"\\n\\nSteamCMD failed to install the Satisfactory Dedicated Server!\"\r\n echo -e \"\\tTry reinstalling the server again.\\n\"\r\n exit 1\r\nelse\r\n chmod +x UE4Server-Linux-Shipping\r\nfi\r\n\r\necho -e \"\\n\\nSatisfactory Dedicated Server successfully installed!\\n\"", + "script": "#!\/bin\/bash\r\n\r\n# File: Pterodactyl Satisfactory Egg - egg-satisfactory.json\r\n# Authors: Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord\r\n# Date: 2021\/10\/28\r\n# License: MIT License\r\n\r\n## Download and install SteamCMD\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\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\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} validate +exit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so\r\n\r\n## Satisfactory setup\r\n# Check for successful installation and make the core binary executable.\r\ncd \/mnt\/server\/Engine\/Binaries\/Linux\r\nif [[ ! -f UE4Server-Linux-Shipping ]]; then\r\n echo -e \"\\n\\nSteamCMD failed to install the Satisfactory Dedicated Server!\"\r\n echo -e \"\\tTry reinstalling the server again.\\n\"\r\n exit 1\r\nelse\r\n chmod +x UE4Server-Linux-Shipping\r\nfi\r\n\r\n# Make Config directory and default Game.ini file (since it is not created automatically by the server)\r\nmkdir -p \/mnt\/server\/FactoryGame\/Saved\/Config\/LinuxServer\/ && cd \"$_\"\r\nif [ ! -f Game.ini ]; then\r\n echo -e \"\\nGame.ini config file missing. Creating default.\"\r\n cat > Game.ini << EOF\r\n[\/Script\/Engine.GameSession]\r\nMaxPlayers=${MAX_PLAYERS}\r\nEOF\r\nfi\r\n\r\necho -e \"\\n\\nSatisfactory Dedicated Server successfully installed!\\n\"", "container": "ghcr.io\/pterodactyl\/installers:debian", "entrypoint": "bash" } }, "variables": [ { - "name": "[REQUIRED] Game Port", - "description": "This is the port that the game client uses to connect to the game world (not the lobby). Ensure this port matches your externally forwarded port, and is distanced from other running Satisfactory servers in Pterodactyl (increments of 100 are recommended). This is also true for the Primary (Query) Port!", - "env_variable": "GAME_PORT", - "default_value": "7777", + "name": "[REQUIRED] Server Query Port", + "description": "This is the port that your clients will type in and use to connect to the lobby (not the game world). Ensure this port matches your externally forwarded port, and is distanced from other running Satisfactory servers in Pterodactyl (increments of 100 are recommended). This is also true for the Primary\/Game Port!", + "env_variable": "QUERY_PORT", + "default_value": "15777", "user_viewable": false, "user_editable": false, - "rules": "required|integer|min:1024|max:65536" + "rules": "required|integer|between:1024,65536" }, { "name": "[REQUIRED] Beacon Port", @@ -43,7 +43,7 @@ "default_value": "15000", "user_viewable": false, "user_editable": false, - "rules": "required|integer|min:1024|max:65536" + "rules": "required|integer|between:1024,65536" }, { "name": "Automatic Updates", @@ -63,6 +63,15 @@ "user_editable": true, "rules": "string|nullable" }, + { + "name": "[Experimental] Max Players", + "description": "The server and client are currently not optimized to support more than 4 players. However, you can override this value here at your own risk of poor performance.", + "env_variable": "MAX_PLAYERS", + "default_value": "4", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|min:1" + }, { "name": "[Advanced] Satisfactory Dedicated Server App ID", "description": "Steam App ID used for installation and updates. Rarely needs to be changed.", From 2d7c8e2ca915cb51657515350c38526fdc52f2ca Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Fri, 29 Oct 2021 14:49:34 -0700 Subject: [PATCH 0063/1001] Satisfactory Port Visibility Hotfix (#1376) --- game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json index 0e4a7f55..ca6d5ef9 100644 --- a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json +++ b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json @@ -32,7 +32,7 @@ "description": "This is the port that your clients will type in and use to connect to the lobby (not the game world). Ensure this port matches your externally forwarded port, and is distanced from other running Satisfactory servers in Pterodactyl (increments of 100 are recommended). This is also true for the Primary\/Game Port!", "env_variable": "QUERY_PORT", "default_value": "15777", - "user_viewable": false, + "user_viewable": true, "user_editable": false, "rules": "required|integer|between:1024,65536" }, @@ -41,7 +41,7 @@ "description": "This port provides a lightweight way for clients to contact a server and interact with it without committing to a normal game connection (likely used for client administration). Ensure this port matches your externally forwarded port, and is distanced from other running Satisfactory servers in Pterodactyl (increments of 100 are recommended).", "env_variable": "BEACON_PORT", "default_value": "15000", - "user_viewable": false, + "user_viewable": true, "user_editable": false, "rules": "required|integer|between:1024,65536" }, From a6963bbb411a800c019206a1ef85a2ad0f4f2064 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Wed, 3 Nov 2021 16:14:44 -0700 Subject: [PATCH 0064/1001] 0.5.0.6 Boot Crash Hotfix & Explicit Game Port Declaration - Adds the newly discovered `-multihome` flag to fix 0.5.0.6 update's IPv6 related issue, where the IP binds to IPv6 by default, causing a crash on boot. Server will now bind to IPv4 by default. As this is a hotfix, IPv6's possible support will be investigated at a later date. - Adds the newly discovered `?listen` flag to the `-Port` flag to explicitly declare the port. This will prevent the server from possibly auto-incrementing the port if, for whatever reason, it thinks there's another Satisfactory server present in the same container. --- game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json index ca6d5ef9..c03d1ee1 100644 --- a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json +++ b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json @@ -12,7 +12,7 @@ "ghcr.io\/pterodactyl\/games:source" ], "file_denylist": [], - "startup": ".\/Engine\/Binaries\/Linux\/UE4Server-Linux-Shipping FactoryGame -Port={{SERVER_PORT}} -ServerQueryPort={{QUERY_PORT}} -BeaconPort={{BEACON_PORT}}", + "startup": ".\/Engine\/Binaries\/Linux\/UE4Server-Linux-Shipping FactoryGame ?listen -Port={{SERVER_PORT}} -ServerQueryPort={{QUERY_PORT}} -BeaconPort={{BEACON_PORT}} -multihome=0.0.0.0", "config": { "files": "{\r\n \"FactoryGame\/Saved\/Config\/LinuxServer\/Game.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"MaxPlayers\": \"MaxPlayers={{server.build.env.MAX_PLAYERS}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Engine Initialization\"\r\n}", @@ -82,4 +82,4 @@ "rules": "required|integer|min:1" } ] -} \ No newline at end of file +} From 308948c7521dfb203973def5e8e1024e9a95a2c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lassi=20S=C3=A4ike?= Date: Fri, 5 Nov 2021 20:04:13 +0200 Subject: [PATCH 0065/1001] Fix tshock egg stuck on reinstallation The tshock egg currently uses `unzip` command in the installation script to extract the downloaded files. If the user reinstalls the server, the extracted files already exist, and `unzip` prompts for whether to overwrite the files or not. This causes the installation script to get stuck. This fixes the problem by adding the `-o` option to overwrite the files without prompting. --- game_eggs/terraria/tshock/egg-tshock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/terraria/tshock/egg-tshock.json b/game_eggs/terraria/tshock/egg-tshock.json index 7cf576d7..0fed9f67 100644 --- a/game_eggs/terraria/tshock/egg-tshock.json +++ b/game_eggs/terraria/tshock/egg-tshock.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Vanilla tModloader 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 jq file unzip\r\n\r\nGITHUB_PACKAGE=Pryaxis\/TShock\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 \"$TSHOCK_VERSION\" ] || [ \"$TSHOCK_VERSION\" == \"latest\" ]; then\r\n DOWNLOAD_LINK=$(echo $LATEST_JSON | jq .assets | jq -r .[].browser_download_url)\r\nelse\r\n VERSION_CHECK=$(echo $RELEASES | jq -r --arg VERSION \"$TSHOCK_VERSION\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n if [ \"$TSHOCK_VERSION\" == \"$VERSION_CHECK\" ]; then\r\n DOWNLOAD_LINK=$(echo $RELEASES | jq -r --arg VERSION \"$TSHOCK_VERSION\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url')\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\n## mkdir and cd to \/mnt\/server\/\r\nmkdir -p \/mnt\/server\r\n\r\ncd \/mnt\/server\r\n\r\n## download release\r\necho -e \"running: wget $DOWNLOAD_LINK\"\r\nwget $DOWNLOAD_LINK\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip ${DOWNLOAD_LINK##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exeting\"\r\n exit 2 \r\nfi\r\n\r\necho -e \"install complete\"", + "script": "#!\/bin\/bash\r\n# Vanilla tModloader 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 jq file unzip\r\n\r\nGITHUB_PACKAGE=Pryaxis\/TShock\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 \"$TSHOCK_VERSION\" ] || [ \"$TSHOCK_VERSION\" == \"latest\" ]; then\r\n DOWNLOAD_LINK=$(echo $LATEST_JSON | jq .assets | jq -r .[].browser_download_url)\r\nelse\r\n VERSION_CHECK=$(echo $RELEASES | jq -r --arg VERSION \"$TSHOCK_VERSION\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n if [ \"$TSHOCK_VERSION\" == \"$VERSION_CHECK\" ]; then\r\n DOWNLOAD_LINK=$(echo $RELEASES | jq -r --arg VERSION \"$TSHOCK_VERSION\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url')\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\n## mkdir and cd to \/mnt\/server\/\r\nmkdir -p \/mnt\/server\r\n\r\ncd \/mnt\/server\r\n\r\n## download release\r\necho -e \"running: wget $DOWNLOAD_LINK\"\r\nwget $DOWNLOAD_LINK\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip -o ${DOWNLOAD_LINK##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exeting\"\r\n exit 2 \r\nfi\r\n\r\necho -e \"install complete\"", "container": "debian:buster-slim", "entrypoint": "\/bin\/bash" } @@ -60,4 +60,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From 4878d66622e626433ec205a7c0e072dd750f62b3 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 6 Nov 2021 00:15:38 +0200 Subject: [PATCH 0066/1001] docs: rename and add discord.java to readme --- README.md | 3 ++- bots/discord/{discord java => discord.java}/README.md | 0 .../{discord java => discord.java}/egg-discord-java.json | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename bots/discord/{discord java => discord.java}/README.md (100%) rename bots/discord/{discord java => discord.java}/egg-discord-java.json (100%) diff --git a/README.md b/README.md index a7d1d00d..76ce7316 100644 --- a/README.md +++ b/README.md @@ -29,9 +29,10 @@ If you are reading this it looks like you are looking to add an egg to your serv * [ATL Bot](/bots/discord/atlbot) Node JS * [Bastion](/bots/discord/bastion) Node JS * [CorpBot](/bots/discord/corpbot) Python +* [discordgo](bots/discord/discordgo) Golang generic +* [discord.js](bots/discord/discord.java) Java generic * [discord.js](bots/discord/discord.js) Node JS generic * [discord.py](bots/discord/discord.py) Python generic -* [discordgo](bots/discord/discordgo) Golang generic * [fragbot](/bots/discord/fragbot) Golang * [JMusicBot](/bots/discord/jmusicbot) Java * [nodemon.js](bots/discord/nodemon.js) Nodemon JS generic diff --git a/bots/discord/discord java/README.md b/bots/discord/discord.java/README.md similarity index 100% rename from bots/discord/discord java/README.md rename to bots/discord/discord.java/README.md diff --git a/bots/discord/discord java/egg-discord-java.json b/bots/discord/discord.java/egg-discord-java.json similarity index 100% rename from bots/discord/discord java/egg-discord-java.json rename to bots/discord/discord.java/egg-discord-java.json From 1829ca14146a307c28338a872dbdab502dbefc34 Mon Sep 17 00:00:00 2001 From: Softwarenoob Date: Sat, 6 Nov 2021 00:19:14 +0200 Subject: [PATCH 0067/1001] docs: fix readme typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 76ce7316..302c1ad3 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Bastion](/bots/discord/bastion) Node JS * [CorpBot](/bots/discord/corpbot) Python * [discordgo](bots/discord/discordgo) Golang generic -* [discord.js](bots/discord/discord.java) Java generic +* [discord.java](bots/discord/discord.java) Java generic * [discord.js](bots/discord/discord.js) Node JS generic * [discord.py](bots/discord/discord.py) Python generic * [fragbot](/bots/discord/fragbot) Golang From ec2dd71648d46daf41aa53c53eb331eaea136d0d Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 8 Nov 2021 10:13:05 +0200 Subject: [PATCH 0068/1001] docs: fix Tower Unite link --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index 302c1ad3..07c0046b 100644 --- a/README.md +++ b/README.md @@ -210,6 +210,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Sven Co-op](game_eggs/steamcmd_servers/svencoop) * [The Forest](game_eggs/steamcmd_servers/the_forest) * [Team Fortress 2 Classic](game_eggs/steamcmd_servers/team_fortress_2_classic) +* [Tower Unite](game_eggs/steamcmd_servers/tower_unite) * [Unturned](game_eggs/steamcmd_servers/unturned) * [Valheim](game_eggs/steamcmd_servers/valheim) * [Valheim Vanilla](game_eggs/steamcmd_servers/valheim/valheim_vanilla) @@ -226,10 +227,6 @@ If you are reading this it looks like you are looking to add an egg to your serv [Tycoon Games](game_eggs/tycoon_games) * [OpenTTD](game_eggs/tycoon_games/openttd) -[Unreal Engine](game_eggs/unreal_engine) -* [Tower Unite](game_eggs/unreal_engine/tower_unite) -* [Tower Unite](game_eggs/steamcmd_servers/tower_unite) - [Veloren](game_eggs/veloren/veloren) [Vintage Story](game_eggs/vintage_story/vintage_story) From c09e016002ef63770c1d95db2f9799c9bff0f4b1 Mon Sep 17 00:00:00 2001 From: Gorian <1012176+Gorian@users.noreply.github.com> Date: Wed, 10 Nov 2021 10:51:15 -0800 Subject: [PATCH 0069/1001] Create README.md --- game_eggs/FoundryVTT/README.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 game_eggs/FoundryVTT/README.md diff --git a/game_eggs/FoundryVTT/README.md b/game_eggs/FoundryVTT/README.md new file mode 100644 index 00000000..8176c4dc --- /dev/null +++ b/game_eggs/FoundryVTT/README.md @@ -0,0 +1,7 @@ +# Foundry VTT +Foundry VTT is a standalone application built for experiencing multiplayer tabletop RPGs using a feature-rich and modern self-hosted application where your players connect directly through the browser. + +# Installation +Foundry requires a license. In order to use this egg, you will need to purchase a foundry license, select the linux platform from your profile on the website, and then paste the "Timed URL" into the variable when seting up the server. + +![image](https://user-images.githubusercontent.com/1012176/141174950-840fbf28-37d9-4244-8402-a72821458f41.png) From 251d65fb974b18227a7174d28506ea91b4b9b4ae Mon Sep 17 00:00:00 2001 From: Gorian <1012176+Gorian@users.noreply.github.com> Date: Wed, 10 Nov 2021 10:56:08 -0800 Subject: [PATCH 0070/1001] Update README.md --- game_eggs/FoundryVTT/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/game_eggs/FoundryVTT/README.md b/game_eggs/FoundryVTT/README.md index 8176c4dc..1e4fdacf 100644 --- a/game_eggs/FoundryVTT/README.md +++ b/game_eggs/FoundryVTT/README.md @@ -5,3 +5,8 @@ Foundry VTT is a standalone application built for experiencing multiplayer table Foundry requires a license. In order to use this egg, you will need to purchase a foundry license, select the linux platform from your profile on the website, and then paste the "Timed URL" into the variable when seting up the server. ![image](https://user-images.githubusercontent.com/1012176/141174950-840fbf28-37d9-4244-8402-a72821458f41.png) + +Note that this egg only runs the node application. You will need to manage TLS, reverse proxying, etc. on your own. + +# Server Ports +This is a node application and only needs a single port that you will connect to over http(s) From c80e2d30fd7465d6844011a06988aeaef851be15 Mon Sep 17 00:00:00 2001 From: Gorian <1012176+Gorian@users.noreply.github.com> Date: Wed, 10 Nov 2021 11:07:00 -0800 Subject: [PATCH 0071/1001] Create egg-FoundryVTT.json --- game_eggs/FoundryVTT/egg-FoundryVTT.json | 59 ++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 game_eggs/FoundryVTT/egg-FoundryVTT.json diff --git a/game_eggs/FoundryVTT/egg-FoundryVTT.json b/game_eggs/FoundryVTT/egg-FoundryVTT.json new file mode 100644 index 00000000..ab2244fc --- /dev/null +++ b/game_eggs/FoundryVTT/egg-FoundryVTT.json @@ -0,0 +1,59 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-11-10T11:06:17-08:00", + "name": "Foundry VTT", + "author": "pterodactyl@demi.cloud", + "description": "Foundry VTT is a standalone application built for experiencing multiplayer tabletop RPGs using a feature-rich and modern self-hosted application where your players connect directly through the browser.", + "features": null, + "images": [ + "ghcr.io\/parkervcp\/yolks:nodejs_17" + ], + "file_denylist": [], + "startup": "node .\/app\/resources\/app\/main.js --dataPath=\"\/home\/container\/data\"", + "config": { + "files": "{\r\n \"data\/Config\/options.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"port\": \"{{server.build.default.port}}\",\r\n \"language\": \"{{server.build.env.FOUNDRY_LANGUAGE}}\",\r\n \"updateChannel\": \"{{server.build.env.UPDATE_CHANNEL}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Server started and listening on port\"\r\n}", + "logs": "{}", + "stop": "^c" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# FoundryVTT install script\r\n#\r\n# Server Files: \/mnt\/server\r\ndeclare -r DIR_ROOT=\"\/mnt\/server\"\r\ndeclare -r DIR_APP=\"${DIR_ROOT}\/app\"\r\ndeclare -r DIR_DATA=\"${DIR_ROOT}\/data\"\r\ndeclare -r ZIP_FILE_NAME=\"foundryvtt.zip\"\r\n\r\nmain() {\r\n apt update\r\n apt install -y wget unzip\r\n\r\n printf \"\\nBuilding directory structure...\\n\"\r\n mkdir -p \"${DIR_ROOT}\/\"{data\/Config,app}\r\n # shellcheck disable=SC2164\r\n cd \"${DIR_APP}\"\r\n printf \"\\nDownloading FoundryVTT files...\\n\"\r\n wget \"${TIMED_URL}\" -O \"${ZIP_FILE_NAME}\"\r\n printf \"\\nunzipping FoundryVTT files...\\n\"\r\n unzip \"${ZIP_FILE_NAME}\" -d \"${DIR_APP}\"\r\n rm \"${ZIP_FILE_NAME}\"\r\n\r\n printf \"\\nGenerating default configuration...\\n\"\r\n cat <\"${DIR_DATA}\/Config\/options.json\"\r\n{\r\n \"port\": 30000,\r\n \"upnp\": false,\r\n \"fullscreen\": false,\r\n \"hostname\": null,\r\n \"localHostname\": null,\r\n \"routePrefix\": null,\r\n \"sslCert\": null,\r\n \"sslKey\": null,\r\n \"awsConfig\": null,\r\n \"dataPath\": \"\/home\/container\/data\",\r\n \"passwordSalt\": null,\r\n \"proxySSL\": false,\r\n \"proxyPort\": null,\r\n \"minifyStaticFiles\": true,\r\n \"updateChannel\": \"release\",\r\n \"language\": \"en.core\",\r\n \"upnpLeaseDuration\": null,\r\n \"world\": null\r\n} \r\nEOF\r\n printf \"Installation Done.\\n\"\r\n}\r\nmain \"@\"", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Timed URL", + "description": "This is required to download the foundry files. Available in your https:\/\/foundryvtt.com\/ profile after you've purchased a license. This link generally lasts for about 5 minutes.", + "env_variable": "TIMED_URL", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "required|url" + }, + { + "name": "Language", + "description": "As may be expected, this setting configures the localization of the program and can be leveraged by localization modules to ensure that the interface is translated to the language of your choosing wherever possible.", + "env_variable": "FOUNDRY_LANGUAGE", + "default_value": "en.core", + "user_viewable": true, + "user_editable": true, + "rules": "string|max:20" + }, + { + "name": "Update Channel", + "description": "Select what channel you want to use for automatic updates", + "env_variable": "UPDATE_CHANNEL", + "default_value": "release", + "user_viewable": true, + "user_editable": true, + "rules": "string|max:256" + } + ] +} From 291e650469d0ae071d7b8e8a806b629b19ade7a3 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 12 Nov 2021 21:44:50 +0100 Subject: [PATCH 0072/1001] Update redbot readme link for Wings documentation (#1391) Add link to new Wings docs and remove legacy daemon link --- bots/discord/redbot/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bots/discord/redbot/README.md b/bots/discord/redbot/README.md index 6dfd2521..445b1485 100644 --- a/bots/discord/redbot/README.md +++ b/bots/discord/redbot/README.md @@ -10,6 +10,7 @@ if you want to use the internal Lavalink Server, you need to allocate port 2333 ### Additional Requirements When using the Audio Cog the bot will attempt to save files to /tmp resulting in a disk space error. To resolve this error you must increase the size of `tmpfs` using custom container policy. -For additional details see: https://pterodactyl.io/daemon/0.6/configuration.html#container-policy +For additional details see: +https://pterodactyl.io/wings/1.0/configuration.html#other-values #### Mods/Plugins may require ports to be added to the server. From 6b71e839c838f67e3350368863636882b0eb8aa3 Mon Sep 17 00:00:00 2001 From: Gorian <1012176+Gorian@users.noreply.github.com> Date: Sat, 13 Nov 2021 13:08:43 -0800 Subject: [PATCH 0073/1001] Update to use new image updated to use suggested ghcr.io/pterodactyl/installers:debian --- game_eggs/FoundryVTT/egg-FoundryVTT.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/FoundryVTT/egg-FoundryVTT.json b/game_eggs/FoundryVTT/egg-FoundryVTT.json index ab2244fc..a61725ca 100644 --- a/game_eggs/FoundryVTT/egg-FoundryVTT.json +++ b/game_eggs/FoundryVTT/egg-FoundryVTT.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-11-10T11:06:17-08:00", + "exported_at": "2021-11-13T13:06:21-08:00", "name": "Foundry VTT", "author": "pterodactyl@demi.cloud", "description": "Foundry VTT is a standalone application built for experiencing multiplayer tabletop RPGs using a feature-rich and modern self-hosted application where your players connect directly through the browser.", @@ -22,8 +22,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# FoundryVTT install script\r\n#\r\n# Server Files: \/mnt\/server\r\ndeclare -r DIR_ROOT=\"\/mnt\/server\"\r\ndeclare -r DIR_APP=\"${DIR_ROOT}\/app\"\r\ndeclare -r DIR_DATA=\"${DIR_ROOT}\/data\"\r\ndeclare -r ZIP_FILE_NAME=\"foundryvtt.zip\"\r\n\r\nmain() {\r\n apt update\r\n apt install -y wget unzip\r\n\r\n printf \"\\nBuilding directory structure...\\n\"\r\n mkdir -p \"${DIR_ROOT}\/\"{data\/Config,app}\r\n # shellcheck disable=SC2164\r\n cd \"${DIR_APP}\"\r\n printf \"\\nDownloading FoundryVTT files...\\n\"\r\n wget \"${TIMED_URL}\" -O \"${ZIP_FILE_NAME}\"\r\n printf \"\\nunzipping FoundryVTT files...\\n\"\r\n unzip \"${ZIP_FILE_NAME}\" -d \"${DIR_APP}\"\r\n rm \"${ZIP_FILE_NAME}\"\r\n\r\n printf \"\\nGenerating default configuration...\\n\"\r\n cat <\"${DIR_DATA}\/Config\/options.json\"\r\n{\r\n \"port\": 30000,\r\n \"upnp\": false,\r\n \"fullscreen\": false,\r\n \"hostname\": null,\r\n \"localHostname\": null,\r\n \"routePrefix\": null,\r\n \"sslCert\": null,\r\n \"sslKey\": null,\r\n \"awsConfig\": null,\r\n \"dataPath\": \"\/home\/container\/data\",\r\n \"passwordSalt\": null,\r\n \"proxySSL\": false,\r\n \"proxyPort\": null,\r\n \"minifyStaticFiles\": true,\r\n \"updateChannel\": \"release\",\r\n \"language\": \"en.core\",\r\n \"upnpLeaseDuration\": null,\r\n \"world\": null\r\n} \r\nEOF\r\n printf \"Installation Done.\\n\"\r\n}\r\nmain \"@\"", - "container": "debian:buster-slim", + "script": "#!\/bin\/bash\r\n# FoundryVTT install script\r\n#\r\n# Server Files: \/mnt\/server\r\ndeclare -r DIR_ROOT=\"\/mnt\/server\"\r\ndeclare -r DIR_APP=\"${DIR_ROOT}\/app\"\r\ndeclare -r DIR_DATA=\"${DIR_ROOT}\/data\"\r\ndeclare -r ZIP_FILE_NAME=\"foundryvtt.zip\"\r\n\r\nmain() {\r\n apt update\r\n apt install -y unzip\r\n\r\n printf \"\\nBuilding directory structure...\\n\"\r\n mkdir -p \"${DIR_ROOT}\/data\/Config\"\r\n mkdir -p \"${DIR_ROOT}\/app\"\r\n # shellcheck disable=SC2164\r\n cd \"${DIR_APP}\"\r\n printf \"\\nDownloading FoundryVTT files...\\n\"\r\n wget \"${TIMED_URL}\" -O \"${ZIP_FILE_NAME}\"\r\n printf \"\\nunzipping FoundryVTT files...\\n\"\r\n unzip \"${ZIP_FILE_NAME}\" -d \"${DIR_APP}\"\r\n rm \"${ZIP_FILE_NAME}\"\r\n\r\n printf \"\\nGenerating default configuration...\\n\"\r\n cat <\"${DIR_DATA}\/Config\/options.json\"\r\n{\r\n \"port\": 30000,\r\n \"upnp\": false,\r\n \"fullscreen\": false,\r\n \"hostname\": null,\r\n \"localHostname\": null,\r\n \"routePrefix\": null,\r\n \"sslCert\": null,\r\n \"sslKey\": null,\r\n \"awsConfig\": null,\r\n \"dataPath\": \"\/home\/container\/data\",\r\n \"passwordSalt\": null,\r\n \"proxySSL\": false,\r\n \"proxyPort\": null,\r\n \"minifyStaticFiles\": true,\r\n \"updateChannel\": \"release\",\r\n \"language\": \"en.core\",\r\n \"upnpLeaseDuration\": null,\r\n \"world\": null\r\n} \r\nEOF\r\n printf \"Installation Done.\\n\"\r\n}\r\nmain \"@\"", + "container": "ghcr.io\/pterodactyl\/installers:debian", "entrypoint": "bash" } }, From ebbcf2cef03746f89afea788550404ce6dc016d3 Mon Sep 17 00:00:00 2001 From: Gorian <1012176+Gorian@users.noreply.github.com> Date: Sat, 13 Nov 2021 13:09:51 -0800 Subject: [PATCH 0074/1001] Added FoundryVTT to list --- game_eggs/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/game_eggs/README.md b/game_eggs/README.md index d059f869..e9725fbb 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -163,3 +163,5 @@ [Vintage Story](vintage_story/vintage_story) [Xonotic](xonotic/xonotic) + +[FoundryVTT](FoundryVTT) From 3163de17eedc1e5f8233dc6b5e0385f944d64233 Mon Sep 17 00:00:00 2001 From: Gorian <1012176+Gorian@users.noreply.github.com> Date: Sat, 13 Nov 2021 13:10:42 -0800 Subject: [PATCH 0075/1001] Add FoundryVTT --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 302c1ad3..65561a44 100644 --- a/README.md +++ b/README.md @@ -238,6 +238,8 @@ If you are reading this it looks like you are looking to add an egg to your serv [Xonotic](game_eggs/xonotic/xonotic) +[FoundryVTT](game_eggs/FoundryVTT) + ## [Monitoring](/monitoring/) ### Prometheus * [Prometheus](/monitoring/prometheus) From 1ab8c6867e48c07129f8aaf61431be750ab7361c Mon Sep 17 00:00:00 2001 From: Sascha_T Date: Sun, 14 Nov 2021 23:36:07 +0100 Subject: [PATCH 0076/1001] feat(fabric): add option to select Fabric version(#1381) --- .../minecraft/java/fabric/egg-fabric.json | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/game_eggs/minecraft/java/fabric/egg-fabric.json b/game_eggs/minecraft/java/fabric/egg-fabric.json index b7063d16..833d0c1f 100644 --- a/game_eggs/minecraft/java/fabric/egg-fabric.json +++ b/game_eggs/minecraft/java/fabric/egg-fabric.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-06-14T21:30:32+03:00", + "exported_at": "2021-11-06T19:02:28+00:00", "name": "Fabric", "author": "accounts@bofanodes.io", "description": "Fabric is a modular modding toolchain targeting Minecraft 1.14 and above, including snapshots.", @@ -12,9 +12,8 @@ "eula" ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_11", "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_14", + "ghcr.io\/pterodactyl\/yolks:java_11", "ghcr.io\/pterodactyl\/yolks:java_16" ], "file_denylist": [], @@ -27,7 +26,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Fabric MC Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq unzip dos2unix wget\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\n# Enable snapshots\r\nif [ -z \"$MC_VERSION\" ] || [ \"$MC_VERSION\" == \"latest\" ]; then\r\n MC_VERSION=$(curl -sSL https:\/\/meta.fabricmc.net\/v2\/versions\/game | jq -r '.[] | select(.stable== true )|.version' | head -n1)\r\nelif [ \"$MC_VERSION\" == \"snapshot\" ]; then\r\n MC_VERSION=$(curl -sSL https:\/\/meta.fabricmc.net\/v2\/versions\/game | jq -r '.[] | select(.stable== false )|.version' | head -n1)\r\nfi\r\n\r\nif [ -z \"$FABRIC_VERSION\" ] || [ \"$FABRIC_VERSION\" == \"latest\" ]; then\r\n FABRIC_VERSION=$(curl -sSL https:\/\/meta.fabricmc.net\/v2\/versions\/installer | jq -r '.[0].version')\r\nfi\r\nwget -O fabric-installer.jar https:\/\/maven.fabricmc.net\/net\/fabricmc\/fabric-installer\/$FABRIC_VERSION\/fabric-installer-$FABRIC_VERSION.jar\r\njava -jar fabric-installer.jar server -mcversion $MC_VERSION -downloadMinecraft\r\necho -e \"Install Complete\"", + "script": "#!\/bin\/bash\r\n# Fabric MC Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq unzip dos2unix wget\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\n# Enable snapshots\r\nif [ -z \"$MC_VERSION\" ] || [ \"$MC_VERSION\" == \"latest\" ]; then\r\n MC_VERSION=$(curl -sSL https:\/\/meta.fabricmc.net\/v2\/versions\/game | jq -r '.[] | select(.stable== true )|.version' | head -n1)\r\nelif [ \"$MC_VERSION\" == \"snapshot\" ]; then\r\n MC_VERSION=$(curl -sSL https:\/\/meta.fabricmc.net\/v2\/versions\/game | jq -r '.[] | select(.stable== false )|.version' | head -n1)\r\nfi\r\n\r\nif [ -z \"$FABRIC_VERSION\" ] || [ \"$FABRIC_VERSION\" == \"latest\" ]; then\r\n FABRIC_VERSION=$(curl -sSL https:\/\/meta.fabricmc.net\/v2\/versions\/installer | jq -r '.[0].version')\r\nfi\r\n\r\nif [ -z \"$LOADER_VERSION\" ] || [ \"$LOADER_VERSION\" == \"latest\" ]; then\r\n LOADER_VERSION=$(curl -sSL https:\/\/meta.fabricmc.net\/v2\/versions\/loader | jq -r '.[] | select(.stable== true )|.version' | head -n1)\r\nelif [ \"$LOADER_VERSION\" == \"snapshot\" ]; then\r\n LOADER_VERSION=$(curl -sSL https:\/\/meta.fabricmc.net\/v2\/versions\/loader | jq -r '.[] | select(.stable== false )|.version' | head -n1)\r\nfi\r\n\r\nwget -O fabric-installer.jar https:\/\/maven.fabricmc.net\/net\/fabricmc\/fabric-installer\/$FABRIC_VERSION\/fabric-installer-$FABRIC_VERSION.jar\r\njava -jar fabric-installer.jar server -mcversion $MC_VERSION -loader $LOADER_VERSION -downloadMinecraft\r\necho -e \"Install Complete\"", "container": "openjdk:11-jdk-slim", "entrypoint": "bash" } @@ -59,6 +58,15 @@ "user_viewable": true, "user_editable": true, "rules": "required|string|between:3,15" + }, + { + "name": "Fabric Loader Version", + "description": "The version of Fabric Loader to install.", + "env_variable": "LOADER_VERSION", + "default_value": "latest", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|between:3,15" } ] -} \ No newline at end of file +} From da22608468d5e233e3cc6b0212b334da4ec2014e Mon Sep 17 00:00:00 2001 From: Faye Date: Sun, 14 Nov 2021 23:44:24 +0100 Subject: [PATCH 0077/1001] feat: Elasticsearch egg (#1265) --- README.md | 2 + software/elasticsearch/README.md | 16 ++++++ software/elasticsearch/egg-elasticsearch.json | 50 +++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 software/elasticsearch/README.md create mode 100644 software/elasticsearch/egg-elasticsearch.json diff --git a/README.md b/README.md index 302c1ad3..9102864b 100644 --- a/README.md +++ b/README.md @@ -249,6 +249,8 @@ If you are reading this it looks like you are looking to add an egg to your serv ## [Software](/software/) ### Code Server * [Code-Server](/software/code-server) +### Elasticsearch +* [Elasticsearch](/software/elasticsearch) ### Gitea * [Gitea](/software/gitea) ### Grafana diff --git a/software/elasticsearch/README.md b/software/elasticsearch/README.md new file mode 100644 index 00000000..78721fc6 --- /dev/null +++ b/software/elasticsearch/README.md @@ -0,0 +1,16 @@ +# Elasticsearch + +### From the [Elasticsearch](https://github.com/elastic/elasticsearch) GitHub + +Run [Elasticsearch](https://github.com/elastic/elasticsearch) on any machine anywhere and access it in the browser. + +### vm.max_map_count requirement +Please follow this for the vm.max_map_count requirement: https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#_set_vm_max_map_count_to_at_least_262144 + +### Server Ports + +Ports required to run the server in a table format. + +| Port | default | +| ---- | ------- | +| Game | 9200 | diff --git a/software/elasticsearch/egg-elasticsearch.json b/software/elasticsearch/egg-elasticsearch.json new file mode 100644 index 00000000..47938199 --- /dev/null +++ b/software/elasticsearch/egg-elasticsearch.json @@ -0,0 +1,50 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-07-27T08:27:04-05:00", + "name": "Elasticsearch", + "author": "dominic@stilma.net", + "description": null, + "features": null, + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:ubuntu" + ], + "file_denylist": [], + "startup": ".\/bin\/elasticsearch -E network.host=0.0.0.0 -E http.port={{SERVER_PORT}} -E discovery.type={{DISCOVERY_SEED_HOSTS}}", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"started\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# Elasticsearch Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## Install Requirements\r\n\r\napt update\r\napt install -y jq ca-certificates gnupg2 wget tar curl\r\n\r\ncd \/mnt\/server\r\n\r\n## Install Elasticsearch\r\nwget https:\/\/artifacts.elastic.co\/downloads\/elasticsearch\/elasticsearch-$VERSION-linux-x86_64.tar.gz\r\ntar -zxf elasticsearch-*-linux-x86_64.tar.gz --directory \/mnt\/server\r\nmv elasticsearch*\/* \/mnt\/server\r\nrm elasticsearch-*-linux-x86_64.tar.gz\r\nrm -R elasticsearch-*\r\n\r\n## Finish command\r\necho \"All done! Just start it up :)\"", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Discovery Seed Hosts", + "description": "Please keep default if you are unsure.", + "env_variable": "DISCOVERY_SEED_HOSTS", + "default_value": "single-node", + "user_viewable": true, + "user_editable": true, + "rules": "required" + }, + { + "name": "Elasticsearch Version", + "description": "Go to https:\/\/www.elastic.co\/downloads\/elasticsearch and look at the version at the top.", + "env_variable": "VERSION", + "default_value": "7.15.1", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + } + ] +} From e0e7ae699eeec863df4d00646110d6b29170f09a Mon Sep 17 00:00:00 2001 From: creeper123123321 <7974274+creeper123123321@users.noreply.github.com> Date: Mon, 15 Nov 2021 10:47:24 -0300 Subject: [PATCH 0078/1001] VIAaaS: update java, startup detection, use ash (#1362) --- .../proxy/java/viaaas/egg-v-i-aaa-s.json | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json b/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json index 19837abd..48095697 100644 --- a/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json +++ b/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json @@ -4,33 +4,34 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-06-28T11:55:37-04:00", + "exported_at": "2021-10-16T11:26:14-03:00", "name": "VIAaaS", "author": "regulad@outlook.com", "description": "VIAaaS - ViaVersion as a Service - Standalone ViaVersion proxy", "features": null, "images": [ - "ghcr.io\/pterodactyl\/yolks:java_16" + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}} -sslPort={{WEBSERVER_PORT}}", "config": { "files": "{\r\n \"config\/viaaas.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"port\": \"{{server.build.default.port}}\",\r\n \"bind-address\": \"0.0.0.0\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Application started:\"\r\n}", + "startup": "{\r\n \"done\": \"Application started in \"\r\n}", "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "end" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# VIAaaS Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl\r\n\r\ncd \/mnt\/server\r\n\r\ncurl -Lf -o ${SERVER_JARFILE} \"https:\/\/jitpack.io\/com\/github\/ViaVersion\/VIAaaS\/master-SNAPSHOT\/VIAaaS-master-SNAPSHOT-all.jar\"", - "container": "debian:buster-slim", - "entrypoint": "bash" + "script": "#!\/bin\/ash\r\n# VIAaaS Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\ncd \/mnt\/server\r\nwget -O ${SERVER_JARFILE} \"https:\/\/jitpack.io\/com\/github\/ViaVersion\/VIAaaS\/master-SNAPSHOT\/VIAaaS-master-SNAPSHOT-all.jar\"", + "container": "ghcr.io/pterodactyl/installers:alpine", + "entrypoint": "ash" } }, "variables": [ { - "name": "VIAaaS Jar File", - "description": "The name of the jarfile to be used when downloading & running VIAaaS.", + "name": "VIAaaS JAR File", + "description": "The name of the JAR file to be used when downloading & running VIAaaS.", "env_variable": "SERVER_JARFILE", "default_value": "VIAaaS-all.jar", "user_viewable": true, @@ -38,8 +39,8 @@ "rules": "required|string" }, { - "name": "Webserver Port", - "description": "The port to listen to webserver connections on.", + "name": "Web Server Port", + "description": "The port to listen to web server connections on.", "env_variable": "WEBSERVER_PORT", "default_value": "25543", "user_viewable": true, @@ -47,4 +48,4 @@ "rules": "required|string" } ] -} \ No newline at end of file +} From 60abe76d556a92f81d0abc78d4a3e51ff0a21ae3 Mon Sep 17 00:00:00 2001 From: Gorian <1012176+Gorian@users.noreply.github.com> Date: Mon, 15 Nov 2021 13:39:20 -0800 Subject: [PATCH 0079/1001] Create README.md --- software/5e-tools/README.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 software/5e-tools/README.md diff --git a/software/5e-tools/README.md b/software/5e-tools/README.md new file mode 100644 index 00000000..b8ffb15b --- /dev/null +++ b/software/5e-tools/README.md @@ -0,0 +1,4 @@ +# 5e Tools +> A suite of tools for 5th Edition Dungeons & Dragons players and Dungeon Masters. + +This is a self-hosted mirror of https://5e.tools. It will clone a github repository mirror on install and update on container reboot. From 563b828958492515df1f5af577fab2d36e5e932a Mon Sep 17 00:00:00 2001 From: Gorian <1012176+Gorian@users.noreply.github.com> Date: Mon, 15 Nov 2021 13:40:02 -0800 Subject: [PATCH 0080/1001] Create egg-5e-tools.json --- software/5e-tools/egg-5e-tools.json | 41 +++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 software/5e-tools/egg-5e-tools.json diff --git a/software/5e-tools/egg-5e-tools.json b/software/5e-tools/egg-5e-tools.json new file mode 100644 index 00000000..7643cad4 --- /dev/null +++ b/software/5e-tools/egg-5e-tools.json @@ -0,0 +1,41 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-11-15T13:39:55-08:00", + "name": "5e Tools", + "author": "pterodactyl@demi.cloud", + "description": "A suite of tools for 5th Edition Dungeons & Dragons players and Dungeon Masters.", + "features": null, + "images": [ + "ghcr.io\/parkervcp\/yolks:debian" + ], + "file_denylist": [], + "startup": "cd ~\/5e-tools && git pull && cd && .\/caddy run -config ~\/caddy.json", + "config": { + "files": "{\r\n \"caddy.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"apps.http.servers.srv0.listen.0\": \":{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"serving initial configuration\",\r\n \"userInteraction\": []\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# 5e Tools install script\r\n#\r\n# Server Files: \/mnt\/server\r\ndeclare -r DIR=\"\/mnt\/server\"\r\ndeclare -r CADDY_INSTALL_URL=\"https:\/\/caddyserver.com\/api\/download?os=linux&arch=amd64&idempotency=41554620449867\"\r\ndeclare -r LOCAL_REPO=\"${DIR}\/5e-tools\"\r\n\r\ndie() {\r\n local message=\"$1\"\r\n printf \"\\n%s\\n\" \"${message}\"\r\n exit 2\r\n}\r\ncd_error() {\r\n die \"ERROR: installation encountered an error while trying to change directory\"\r\n}\r\n\r\nmain() {\r\n local git_origin\r\n apt update\r\n apt install -y wget\r\n cd \"${DIR}\" || cd_error\r\n printf \"\\nInstalling Caddy...\\n\"\r\n wget \"${CADDY_INSTALL_URL}\" -O .\/caddy\r\n chmod +x .\/caddy\r\n printf \"\\nGenerating Caddy configuration...\\n\"\r\n # this is a default config\r\n # key variables, such as the port, will get overwritten with the pterodactyl\r\n # configuration parser\r\n cat <\"${DIR}\/caddy.json\"\r\n{\r\n \"apps\": {\r\n \"http\": {\r\n \"servers\": {\r\n \"srv0\": {\r\n \"listen\": [\r\n \":8080\"\r\n ],\r\n \"routes\": [\r\n {\r\n \"handle\": [\r\n {\r\n \"handler\": \"vars\",\r\n \"root\": \"\/home\/container\/5e-tools\"\r\n },\r\n {\r\n \"encodings\": {\r\n \"gzip\": {},\r\n \"zstd\": {}\r\n },\r\n \"handler\": \"encode\",\r\n \"prefer\": [\r\n \"zstd\",\r\n \"gzip\"\r\n ]\r\n },\r\n {\r\n \"handler\": \"file_server\"\r\n }\r\n ]\r\n }\r\n ]\r\n }\r\n }\r\n }\r\n }\r\n}\r\nEOF\r\n git config --global pull.ff only\r\n if [[ ! -d \"${LOCAL_REPO}\" ]]; then\r\n printf \"\\nCloning latest version (this may take a while)...\\n\"\r\n # $REPOSITORY is passed via environment variable from pterodactyl\r\n git clone \"${REPOSITORY}\" \"${LOCAL_REPO}\"\r\n else\r\n cd \"${LOCAL_REPO}\" || cd_error\r\n git_origin=\"$(git config --get remote.origin.url)\"\r\n cd \"${DIR}\" || cd_error\r\n printf \"\\n\\ngit origin is %s\\n\\n\" \"${git_origin}\"\r\n # if the user hasn't change the repository variable\r\n if [[ \"${git_origin}\" == \"${REPOSITORY}\" ]]; then\r\n cd \"${LOCAL_REPO}\" || cd_error\r\n printf \"\\nRepository already installed - updating...\\n\"\r\n git fetch --all\r\n git reset --hard origin\/master\r\n git pull\r\n cd \"${DIR}\" || cd_error\r\n else\r\n printf \"\\nRepository variable changed since last update\\n...\\n\"\r\n rm -rf \"${LOCAL_REPO}\"\r\n git clone \"${REPOSITORY}\" \"${LOCAL_REPO}\"\r\n fi\r\n fi\r\n printf \"\\nInstallation Complete\\n\"\r\n}\r\nmain \"@\"", + "container": "ghcr.io\/pterodactyl\/installers:debian", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "5e Tools Repository", + "description": "Git Repository to use for cloning 5e Tools", + "env_variable": "REPOSITORY", + "default_value": "https:\/\/github.com\/5etools-mirror-1\/5etools-mirror-1.github.io", + "user_viewable": false, + "user_editable": false, + "rules": "required|url" + } + ] +} From dcf1db3c5596c5ec82d730e32077b4bda2e02104 Mon Sep 17 00:00:00 2001 From: Gorian <1012176+Gorian@users.noreply.github.com> Date: Mon, 15 Nov 2021 13:41:19 -0800 Subject: [PATCH 0081/1001] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 302c1ad3..248a7d2f 100644 --- a/README.md +++ b/README.md @@ -257,3 +257,5 @@ If you are reading this it looks like you are looking to add an egg to your serv * [haste-server](/software/haste-server) ### RabbitMQ * [rabbitmq](/software/rabbitmq) +### 5e Tools +* [5e Tools](/software/5e-tools) From 3309ceb82caffd4e97e3834bed75e8811fc4d092 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Tue, 16 Nov 2021 22:07:28 +0100 Subject: [PATCH 0082/1001] Add SCPSL Exiled and update SCPSL Egg to use yolks image (#1396) --- game_eggs/steamcmd_servers/README.md | 1 + game_eggs/steamcmd_servers/scpsl/README.md | 3 + .../scpsl/dedicated/egg-scpsl.json | 13 ++-- .../steamcmd_servers/scpsl/exiled/README.md | 24 ++++++ .../scpsl/exiled/egg-s-c-p--s-l--exiled.json | 77 +++++++++++++++++++ ...s-c-p--secret-laboratory--multi-admin.json | 15 ++-- 6 files changed, 122 insertions(+), 11 deletions(-) create mode 100644 game_eggs/steamcmd_servers/scpsl/exiled/README.md create mode 100644 game_eggs/steamcmd_servers/scpsl/exiled/egg-s-c-p--s-l--exiled.json diff --git a/game_eggs/steamcmd_servers/README.md b/game_eggs/steamcmd_servers/README.md index 04694fa2..d58bed4f 100644 --- a/game_eggs/steamcmd_servers/README.md +++ b/game_eggs/steamcmd_servers/README.md @@ -88,6 +88,7 @@ This is a collection of servers that use SteamCMD to install. ## SCP: Secret Laboratory * [SCP: Secret Laboratory](scpsl) * [dedicated](scpsl/dedicated) + * [exiled](scpsl/exiled) * [multiadmin](scpsl/multiadmin) ## Soldat diff --git a/game_eggs/steamcmd_servers/scpsl/README.md b/game_eggs/steamcmd_servers/scpsl/README.md index 33b220b1..b908d1a2 100644 --- a/game_eggs/steamcmd_servers/scpsl/README.md +++ b/game_eggs/steamcmd_servers/scpsl/README.md @@ -9,6 +9,9 @@ SCP: Secret Laboratory Pterodactyl egg. Works with MP2. Steam AppID: [996560](ht This server is **NOT** compatible with SMod2 due to it not being updated for MP2. This server is **NOT** compatible with LocalAdmin due to server input causing it to crash. MultiAdmin with a config option is used instead. +### [Exiled Plugin Framework](exiled) +SCP: Secret Laboratory Pterodactyl egg with Exiled Plugin Framework (https://github.com/Exiled-Team/EXILED) + ### Minimum RAM Minimum memory required to run the server: 3096 MB diff --git a/game_eggs/steamcmd_servers/scpsl/dedicated/egg-scpsl.json b/game_eggs/steamcmd_servers/scpsl/dedicated/egg-scpsl.json index 07e48723..08d6502c 100644 --- a/game_eggs/steamcmd_servers/scpsl/dedicated/egg-scpsl.json +++ b/game_eggs/steamcmd_servers/scpsl/dedicated/egg-scpsl.json @@ -4,25 +4,26 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-01-08T14:18:35+01:00", + "exported_at": "2021-11-14T11:16:57+01:00", "name": "SCP:SL", "author": "info@goover.de", "description": "Egg for SCP: Secret Laboratory Dedicated Linux Server", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:debian_mono-5-complete" + "ghcr.io\/parkervcp\/yolks:mono_latest" ], + "file_denylist": [], "startup": ".\/LocalAdmin {{SERVER_PORT}}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Waiting for players..\",\r\n \"userInteraction\": []\r\n}", "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", - "stop": "^C" + "stop": "EXIT" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\nmkdir -p $HOME\/.config", - "container": "debian:buster-slim", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\nmkdir -p $HOME\/.config", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, @@ -46,4 +47,4 @@ "rules": "required|string" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/scpsl/exiled/README.md b/game_eggs/steamcmd_servers/scpsl/exiled/README.md new file mode 100644 index 00000000..37b488a0 --- /dev/null +++ b/game_eggs/steamcmd_servers/scpsl/exiled/README.md @@ -0,0 +1,24 @@ +# SCP: Secret Laboratory Exiled +SCP: Secret Laboratory Pterodactyl egg with Exiled Plugin Framework (https://github.com/Exiled-Team/EXILED) + +### Minimum RAM +Minimum memory required to run the server: 4096 MB + + +### Server Port +Default port required to run the server. + +| Port | Default | +|---------|---------| +| Game | 7777 | + + +### Verification + +The server must be verified with the SCP:SL developers in order for it to be visible in the server browser. + +Instructions are as follows: +* Make sure your server complies with the [Verified Server Rules](https://scpslgame.com/Verified_server_rules.pdf). +* Send an email to `server.verification@scpslgame.com` from your configured contact email with the following information: + 1. The **public** IPv4 address of your server, with port. e.g. `69.69.69.69:7777` + 2. If the server's IP is static or dynamic. diff --git a/game_eggs/steamcmd_servers/scpsl/exiled/egg-s-c-p--s-l--exiled.json b/game_eggs/steamcmd_servers/scpsl/exiled/egg-s-c-p--s-l--exiled.json new file mode 100644 index 00000000..75433fac --- /dev/null +++ b/game_eggs/steamcmd_servers/scpsl/exiled/egg-s-c-p--s-l--exiled.json @@ -0,0 +1,77 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-11-14T10:56:47+01:00", + "name": "SCP:SL - Exiled", + "author": "info@goover.de", + "description": "Egg for SCP: Secret Laboratory Dedicated Linux Server with Exiled Plugin Framework", + "features": null, + "images": [ + "ghcr.io\/parkervcp\/yolks:mono_latest" + ], + "file_denylist": [], + "startup": ".\/LocalAdmin {{SERVER_PORT}}", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Waiting for players..\"\r\n}", + "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "stop": "EXIT" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates jq file unzip wget\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nchmod -R +rw \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\nmkdir -p $HOME\/.config\r\n\r\n# Install Exiled\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_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 -i ${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\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\nwget ${DOWNLOAD_LINK}\r\ntar xzvf Exiled.tar.gz\r\n\r\nmv -f Assembly-CSharp.dll \/mnt\/server\/SCPSL_Data\/Managed\r\nmv -f EXILED \/mnt\/server\/.config\/", + "container": "ghcr.io\/parkervcp\/installers:debian", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "SRCDS_APPID", + "description": "", + "env_variable": "SRCDS_APPID", + "default_value": "996560", + "user_viewable": true, + "user_editable": false, + "rules": "required|string|max:20" + }, + { + "name": "Dotnet Bundle", + "description": "Only used for EXILED Framework Updater.", + "env_variable": "DOTNET_BUNDLE_EXTRACT_BASE_DIR", + "default_value": ".\/dotnet-bundle", + "user_viewable": false, + "user_editable": false, + "rules": "required|string" + }, + { + "name": "Github Package", + "description": "", + "env_variable": "GITHUB_PACKAGE", + "default_value": "Exiled-Team\/EXILED", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:50" + }, + { + "name": "Version", + "description": "", + "env_variable": "VERSION", + "default_value": "latest", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + }, + { + "name": "Match", + "description": "", + "env_variable": "MATCH", + "default_value": "Exiled.tar.gz", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:20" + } + ] +} diff --git a/game_eggs/steamcmd_servers/scpsl/multiadmin/egg-s-c-p--secret-laboratory--multi-admin.json b/game_eggs/steamcmd_servers/scpsl/multiadmin/egg-s-c-p--secret-laboratory--multi-admin.json index b4dc6046..75239ecb 100644 --- a/game_eggs/steamcmd_servers/scpsl/multiadmin/egg-s-c-p--secret-laboratory--multi-admin.json +++ b/game_eggs/steamcmd_servers/scpsl/multiadmin/egg-s-c-p--secret-laboratory--multi-admin.json @@ -1,13 +1,18 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-09-05T22:38:43+02:00", + "exported_at": "2021-11-14T11:18:28+01:00", "name": "SCP: Secret Laboratory - MultiAdmin", "author": "info@goover.de", "description": "The latest vanilla version of SCP:SL running through MultiAdmin for compatibility. LocalAdmin does not work. No SMod2.", - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_mono-5-complete", + "features": null, + "images": [ + "ghcr.io\/parkervcp\/yolks:mono_latest" + ], + "file_denylist": [], "startup": "mono MultiAdmin.exe --port {{SERVER_PORT}}", "config": { "files": "{\r\n \"scp_multiadmin.cfg\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"use_new_input_system\": \"false\",\r\n \"max_players:\": \" {{server.build.env.MAX_PLAYERS}}\"\r\n }\r\n },\r\n \".config\/SCP Secret Laboratory\/config\/{{SERVER_PORT}}\/config_gameplay.txt\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server_ip:\": \"0.0.0.0\",\r\n \"forward_ports\": \" false\",\r\n \"contact_email:\": \"{{server.build.env.CONTACT_EMAIL}}\",\r\n \"max_players:\": \"{{server.build.env.MAX_PLAYERS}}\"\r\n }\r\n }\r\n}", @@ -17,8 +22,8 @@ }, "scripts": { "installation": { - "script": "# Downloads SteamCMD\r\napt update\r\napt -y --no-install-recommends install curl unzip lib32gcc1 ca-certificates wget jq\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\n# Extracts SteamCMD\r\nmkdir -p \/mnt\/server\/steam\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steam\r\ncd \/mnt\/server\/steam\r\nchown -R root:root \/mnt\r\n\r\n# Downloads the server\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 996560 +quit\r\n\r\n# Hoster policy\r\necho 'gamedir_for_configs: true' >> \/mnt\/server\/hoster_policy.txt\r\nchmod +x \/mnt\/server\/hoster_policy.txt\r\n\r\n# Downloads MultiAdmin\r\ncd $HOME\r\nwget -qN https:\/\/github.com\/ServerMod\/MultiAdmin\/releases\/latest\/download\/MultiAdmin.exe\r\nchmod +x \/mnt\/server\/MultiAdmin.exe\r\n\r\n# Compatibility fix for MultiAdmin\r\necho \"use_new_input_system: false\" >> \/mnt\/server\/scp_multiadmin.cfg\r\necho \"max_players: 20\" >> \/mnt\/server\/scp_multiadmin.cfg", - "container": "ubuntu:latest", + "script": "# Downloads SteamCMD\r\napt update\r\napt -y --no-install-recommends install curl unzip lib32gcc-s1 ca-certificates wget jq\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\n# Extracts SteamCMD\r\nmkdir -p \/mnt\/server\/steam\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steam\r\ncd \/mnt\/server\/steam\r\nchown -R root:root \/mnt\r\n\r\n# Downloads the server\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 996560 +quit\r\n\r\n# Hoster policy\r\necho 'gamedir_for_configs: true' >> \/mnt\/server\/hoster_policy.txt\r\nchmod +x \/mnt\/server\/hoster_policy.txt\r\n\r\n# Downloads MultiAdmin\r\ncd $HOME\r\nwget -qN https:\/\/github.com\/ServerMod\/MultiAdmin\/releases\/latest\/download\/MultiAdmin.exe\r\nchmod +x \/mnt\/server\/MultiAdmin.exe\r\n\r\n# Compatibility fix for MultiAdmin\r\necho \"use_new_input_system: false\" >> \/mnt\/server\/scp_multiadmin.cfg\r\necho \"max_players: 20\" >> \/mnt\/server\/scp_multiadmin.cfg", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, From dec4688fb2ecb9cda46270878ff595d3ad05ec24 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Thu, 18 Nov 2021 23:37:02 +0200 Subject: [PATCH 0083/1001] refactor: add debug messages and fix PHP extension path Add debug messages for debugging when users complain. Do not overwrite `server.properties` if it exists. Correctly configure PHP `extensions_dir`to fix issues with loading extensions like opcache.so. Change install image to our installer for faster installation. --- .../bedrock/pocketmine_mp/egg-pocketmine-m-p.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json b/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json index 8ff807a6..04b5eda6 100644 --- a/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json +++ b/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-10-24T16:47:50+02:00", + "exported_at": "2021-11-18T21:36:31+00:00", "name": "PocketmineMP", "author": "info@swisscrafting.ch", "description": "Pocketmine Egg\r\nby onekintaro from swisscrafting.ch\r\nwith the nice help from #eggs Channel on Pterodactyl-Discord :)", @@ -16,14 +16,14 @@ "startup": ".\/bin\/php7\/bin\/php .\/PocketMine-MP.phar --no-wizard --disable-ansi", "config": { "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"enable-query\": \"true\",\r\n \"server-port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \")! For help, type \",\r\n \"userInteraction\": [\r\n \"Go to eula.txt for more info.\"\r\n ]\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"server.log\"\r\n}", + "startup": "{\r\n \"done\": \")! For help, type \"\r\n}", + "logs": "{}", "stop": "stop" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl jq\r\n\r\ncd \/mnt\/server\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\nDOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\n\r\n## this is a simple script to validate a download url actaully exists\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\"]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} > PocketMine-MP.phar\r\n\r\necho -e \"\\n downloading latest php build from pocketmine\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\r\n\r\necho -e \"\\n getting default server.properties\"\r\ncurl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/pocketmine_mp\/server.properties > server.properties\r\n\r\necho -e \"\\n unpacking php binaries\"\r\ntar -xzvf php.binary.tar.gz\r\n\r\necho -e \"\\n removing php packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.txt banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs", - "container": "debian:buster-slim", + "script": "#!\/bin\/bash\r\n\r\n# This is already installed in our Script container image. Leaving it here for future reference | apt install -y curl jq\r\n\r\ncd \/mnt\/server\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\nDOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\n\r\n## this is a simple script to validate a download url actually exists\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\"]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\necho -e \"performing curl -sSL ${DOWNLOAD_LINK}\"\r\ncurl -sSL ${DOWNLOAD_LINK} > PocketMine-MP.phar\r\n\r\necho -e \"\\n downloading latest php build from pocketmine from https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"\\n downloading default server.properties\"\r\n curl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/pocketmine_mp\/server.properties > server.properties\r\nfi\r\n\r\necho -e \"\\n unpacking php binaries\"\r\ntar -xzvf php.binary.tar.gz\r\n\r\necho -e \"\\n removing php packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n configuring PHP extensions library directory\"\r\nEXTENSION_DIR=$(find \"bin\" -name *debug-zts*)\r\ngrep -q '^extension_dir' bin\/php7\/bin\/php.ini && sed -i'bak' \"s{^extension_dir=.*{extension_dir=\\\"$EXTENSION_DIR\\\"{\" bin\/php7\/bin\/php.ini || echo \"extension_dir=\\\"$EXTENSION_DIR\\\"\" >> bin\/php7\/bin\/php.ini\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.txt banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, From 1c69c370ba001aa45bd9de0ee0bdc27589a25e8a Mon Sep 17 00:00:00 2001 From: DaFray31 Date: Fri, 19 Nov 2021 22:00:49 +0100 Subject: [PATCH 0084/1001] docs: Fix Veloren Link (#1405) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a994b5d9..e721ba3f 100644 --- a/README.md +++ b/README.md @@ -227,7 +227,7 @@ If you are reading this it looks like you are looking to add an egg to your serv [Tycoon Games](game_eggs/tycoon_games) * [OpenTTD](game_eggs/tycoon_games/openttd) -[Veloren](game_eggs/veloren/veloren) +[Veloren](game_eggs/veloren) [Vintage Story](game_eggs/vintage_story/vintage_story) From 4d5d8e983b3dfe7c39dc0afa3cb178aefc124b7a Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Fri, 19 Nov 2021 22:13:18 +0100 Subject: [PATCH 0085/1001] Update Cryofall to use SteamCMD (#1403) --- README.md | 3 +- .../cryofall/cryofall/egg-cryo-fall.json | 41 ------------------- game_eggs/steamcmd_servers/README.md | 3 ++ .../cryofall/README.md | 2 +- .../cryofall/egg-cryo-fall.json | 41 +++++++++++++++++++ 5 files changed, 46 insertions(+), 44 deletions(-) delete mode 100644 game_eggs/cryofall/cryofall/egg-cryo-fall.json rename game_eggs/{cryofall => steamcmd_servers}/cryofall/README.md (80%) create mode 100644 game_eggs/steamcmd_servers/cryofall/egg-cryo-fall.json diff --git a/README.md b/README.md index e721ba3f..5ed4f127 100644 --- a/README.md +++ b/README.md @@ -81,8 +81,6 @@ If you are reading this it looks like you are looking to add an egg to your serv [ClassiCube](game_eggs/classicube) * [MCGalaxy](game_eggs/classicube/mcgalaxy) -[Cryofall](game_eggs/cryofall/cryofall) - [Call of Duty 4X](game_eggs/cod/cod4x) [ET Legacy](game_eggs/enemy_territory/etlegacy) @@ -174,6 +172,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Barotrauma](game_eggs/steamcmd_servers/barotrauma) * [Citadel: Forged with Fire](game_eggs/steamcmd_servers/citadel) * [Conan Exiles](game_eggs/steamcmd_servers/conan_exiles) +* [Cryofall](game_eggs/steamcmd_servers/cryofall) * [Don't Starve Together](game_eggs/steamcmd_servers/dont_starve) * [ECO](game_eggs/steamcmd_servers/eco) * [Fistful of Frags](game_eggs/steamcmd_servers/fof) diff --git a/game_eggs/cryofall/cryofall/egg-cryo-fall.json b/game_eggs/cryofall/cryofall/egg-cryo-fall.json deleted file mode 100644 index 8a912438..00000000 --- a/game_eggs/cryofall/cryofall/egg-cryo-fall.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1", - "update_url": null - }, - "exported_at": "2021-01-22T16:39:06+01:00", - "name": "CryoFall", - "author": "contact@zennodes.dk", - "description": "NOTE: For now you have to change SettingsServer.xml under CryoFall_Server_v(Version)_NetCore\/Data\/SettingsServer.xml\r\n\r\nCryoFall is a sci-fi multiplayer colony simulation survival game set on a forgotten planet in a distant future.\r\n\r\nJoin the vast world of CryoFall together with other survivors to rebuild your civilization from scratch. Start with primitive technology and simple tools and use them to progress towards modern industrial might and even beyond, eventually reaching space-age technology only seen in science fiction.\r\n\r\nCryoFall can be played either as a relaxed PvE experience with no competition or as a brutal and unforgiving PvP. Make your choice and join one of many available servers with different game modes or host your own and invite your friends to join you!\r\n\r\nBuild your house or a large base together with other players. Dig wells and create farms to sustain basic needs. Build vehicles to explore the world faster. Establish basics of science, all the way from medicine and chemistry to fuel creation and even lithium extraction to create electronic devices. Cook food or prepare drinks to sell them from vending machines in your store.\r\n\r\nBuild factories to produce on an industrial scale: Weapons and defense systems, bionic implants to augment yourself, even large war machines and artillery guns to use against the biggest of opponents", - "features": null, - "images": [ - "quay.io\/parkervcp\/pterodactyl-images:debian_dotnet-5" - ], - "file_denylist": "", - "startup": "dotnet Binaries\/Server\/CryoFall_Server.dll loadOrNew", - "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"[IMP] UDPServer: Socket-server listening on \"\r\n}", - "logs": "{}", - "stop": "stop 10 stopping server" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n#Server Files: \/mnt\/server\r\napt update\r\napt install -y curl zip unzip\r\n\r\nif [[ ! -d \/mnt\/server\/ ]]; then\r\n mkdir -p \/mnt\/server\/\r\nfi\r\n\r\ncd \/mnt\/server\/\r\n\r\nif [ \"${VERSION}\" == \"latest\" ] || [ \"${VERSION}\" == \"\" ]; then\r\n DOWNLOAD_URL=$(curl -sSL https:\/\/wiki.atomictorch.com\/CryoFall\/Server\/Setup | grep 'SERVER DOWNLOAD' | grep -Eoi ']+>' | grep -Eo 'href=\\\"[^\\\\\\\"]+\\\"' | grep -Eo '(http|https):\\\/\\\/[^\\\"]+' | tail -1 | cut -d'?' -f1)\r\nelse\r\n DOWNLOAD_URL=https:\/\/atomictorch.com\/Files\/CryoFall_Server_v${VERSION}_NetCore.zip\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\ncurl -L -o cryofall_server.zip ${DOWNLOAD_LINK}\r\n\r\nunzip cryofall_server.zip\r\n\r\ncp -rf CryoFall_Server*NetCore\/. \/mnt\/server\r\n\r\nrm -rf cryofall_server.zip CryoFall_Server*NetCore\/", - "container": "debian:buster-slim", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Game server version", - "description": "type game server version", - "env_variable": "VERSION", - "default_value": "latest", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:20" - } - ] -} \ No newline at end of file diff --git a/game_eggs/steamcmd_servers/README.md b/game_eggs/steamcmd_servers/README.md index d58bed4f..f65d36e1 100644 --- a/game_eggs/steamcmd_servers/README.md +++ b/game_eggs/steamcmd_servers/README.md @@ -26,6 +26,9 @@ This is a collection of servers that use SteamCMD to install. ## Conan Exiles [Conan Exiles](conan_exiles) +## CryoFall +* [Cryofall](cryofall) + ## Don't Starve Together [Don't Starve Together](dont_starve) diff --git a/game_eggs/cryofall/cryofall/README.md b/game_eggs/steamcmd_servers/cryofall/README.md similarity index 80% rename from game_eggs/cryofall/cryofall/README.md rename to game_eggs/steamcmd_servers/cryofall/README.md index 12385a54..88c44a53 100644 --- a/game_eggs/cryofall/cryofall/README.md +++ b/game_eggs/steamcmd_servers/cryofall/README.md @@ -10,4 +10,4 @@ The default is 6000 can be changed in SettingsServer.xml |---------|---------| | Game | 6000 | -#### Plugins may require ports to be added to the server. \ No newline at end of file +#### Plugins may require ports to be added to the server. diff --git a/game_eggs/steamcmd_servers/cryofall/egg-cryo-fall.json b/game_eggs/steamcmd_servers/cryofall/egg-cryo-fall.json new file mode 100644 index 00000000..a780101a --- /dev/null +++ b/game_eggs/steamcmd_servers/cryofall/egg-cryo-fall.json @@ -0,0 +1,41 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-11-19T11:47:49+01:00", + "name": "CryoFall", + "author": "contact@zennodes.dk", + "description": "NOTE: For now you have to change SettingsServer.xml under CryoFall_Server_v(Version)_NetCore\/Data\/SettingsServer.xml\r\n\r\nCryoFall is a sci-fi multiplayer colony simulation survival game set on a forgotten planet in a distant future.\r\n\r\nJoin the vast world of CryoFall together with other survivors to rebuild your civilization from scratch. Start with primitive technology and simple tools and use them to progress towards modern industrial might and even beyond, eventually reaching space-age technology only seen in science fiction.\r\n\r\nCryoFall can be played either as a relaxed PvE experience with no competition or as a brutal and unforgiving PvP. Make your choice and join one of many available servers with different game modes or host your own and invite your friends to join you!\r\n\r\nBuild your house or a large base together with other players. Dig wells and create farms to sustain basic needs. Build vehicles to explore the world faster. Establish basics of science, all the way from medicine and chemistry to fuel creation and even lithium extraction to create electronic devices. Cook food or prepare drinks to sell them from vending machines in your store.\r\n\r\nBuild factories to produce on an industrial scale: Weapons and defense systems, bionic implants to augment yourself, even large war machines and artillery guns to use against the biggest of opponents", + "features": null, + "images": [ + "ghcr.io\/parkervcp\/yolks:dotnet_5" + ], + "file_denylist": [], + "startup": "dotnet Binaries\/Server\/CryoFall_Server.dll loadOrNew", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"[IMP] UDPServer: Socket-server listening on \"\r\n}", + "logs": "{}", + "stop": "stop 10 stopping server" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id ffound here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# INSTALL_FLAGS - when a server has extra glas for things like beta installs or updates.\r\n#\r\n##\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", + "container": "ghcr.io\/parkervcp\/installers:debian", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "SRCDS_APPID", + "description": "", + "env_variable": "SRCDS_APPID", + "default_value": "1061710", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:20" + } + ] +} \ No newline at end of file From 0c4b7fb3b6df1e328f19d8e80eb115b9e011db93 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Fri, 19 Nov 2021 21:15:41 -0800 Subject: [PATCH 0086/1001] [Satisfactory] 0.5.0.12 General QoL Update & EA Readiness (#1407) --- .../steamcmd_servers/satisfactory/README.md | 79 +++++++++++------ .../satisfactory/egg-satisfactory.json | 84 +++++++++++++++++-- 2 files changed, 130 insertions(+), 33 deletions(-) diff --git a/game_eggs/steamcmd_servers/satisfactory/README.md b/game_eggs/steamcmd_servers/satisfactory/README.md index e8c1782a..3b74719f 100644 --- a/game_eggs/steamcmd_servers/satisfactory/README.md +++ b/game_eggs/steamcmd_servers/satisfactory/README.md @@ -1,5 +1,5 @@ # Satisfactory -***Server version currently marked as experimental by the Satisfactory developers! Egg loads fine, but your mileage may vary in-game.*** +***Updating your Egg?**: Ensure any existing servers have the latest Startup Command, new Startup Variables are set, **and you reinstall server!*** ___ ### Authors / Contributors @@ -46,6 +46,13 @@ ___ 💻 💡 + + +
AlienXAXS + +
+ 💡 + @@ -60,18 +67,15 @@ ___ - Configuration of the Server Query, Beacon, and Game ports. - Configurable to automatically check for server updates on start via SteamCMD. Forcing validation is also configurable. - *[Experimental]* Max player configuration. -- Misc. settings listed below can be configured by an admin client via the game's UI, and are currently **not** set via the Egg: - - Server Password - - Admin Password - - Auto-Save on Player Disconnect - - Pause When No Players Online - - ...and possibly more as the client's UI is developed further for more configuration options. +- Autosave amount and interval configuration. +- Disable crash reporting if desired. +- ...and other advanced networking and server branch configurable settings. ___ ### Server Ports - Default server ports are listed below, but all three ports can be changed freely. - **Note:** The Primary/Default/Game Port for your server in Pterodactyl will be Satisfactory's `-Port=????` game port, even though clients will **connect with the Query port**. - It is recommended to distance ports of other running Satisfactory servers in Pterodactyl by **increments of 100** (it is currently unknown what the minimum increment is, but an increment of +1 caused cross-server talk in testing). Also, your internal ports **must match** your external ports on your network (ie. you can't have an external port of 7778 forwarded to your 7777 internal port; they must match). -- ***All three ports are required to be open for normal server behavior!*** +- ***All three ports are required to be open/allocated for normal server behavior!*** | Port | Default (UDP) | |---------|---------| @@ -80,39 +84,60 @@ ___ | Server Query | 15777 | ___ -### Installation Requirements/Instructions -- No major requirements, other than RAM and Disk space noted below. -- You *do not* need to own the base game to host this server. -- However, to fully "initialize" your server, a client who owns the game must log into the server to "claim" it and create a new session. The generated session will not be written to disk until the first save occurs. -- Currently, there is no way to save the session on server stop. Therefore, ensure the session is saved or the last player has disconnected (causing an auto-save) before stopping the server. -___ -### Minimum RAM Requirement -This server requires a minimum of 4096 MiB of RAM to boot, but the developers recommend 6144 to 8192 MiB of RAM for 4 players or large save files. -___ -### Minimum Disk Requirement -This server requires just under 5 GB of disk space to safely run properly. However, save files could easily surpass this amount, so 7-10 GB is recommended. -___ -### Save File Location -[According to the developer](https://www.youtube.com/watch?v=Nn-1s87JJxc), save files will be able to be uploaded and downloaded by clients via their game client in the future. Until then, below is the save file location in case you would like to upload or download a save file manually: +### Installation/System Requirements -`/home/container/.config/Epic/FactoryGame/Saved/SaveGames/server` +| | Bare Minimum | Recommended | +|---------|---------|---------| +| Processor | Recent x86/64 (AMD/Intel) processor. No 32 bit or ARM support. | Favours higher single-core performance over multiple cores. | +| RAM | 4096 MiB | 6144-8192 MiB (especially for 4 players or large save files) | +| Storage | 5 GB | 7-10 GB (or more, depending on save size or frequency) | +| Network | 0.512 Mbit/s | 1-5 Mbit/s ([may require server *and* client config tweeks](https://satisfactory.fandom.com/wiki/Multiplayer#Temporary_lag_solution)) | +| Host OS | Most stable Linux OS branches should work | Using the latest kernel version for your installed OS can prevent some edge-case installation/boot issues. | +| Game Ownership | Not required to start. | Required to fully "initialize" (see [Server Initialization](#server-initialization) below) | -Single-player save files can be uploaded here and are playable if desired. +___ +### Server Initialization +For a server to be fully "initialized", a client who owns the game must log into the server to "claim" it and create an administrator password. Then, a new session can be created via the "Create Game" tab in-game, or an existing save file can be uploaded (see [Save Files](#save-files) below). + +Misc. settings listed below can be configured by an admin client via the game's "Server Settings" tab, and are currently **not** set via the Egg: +- Server Password +- Admin Password +- Auto-Save on Player Disconnect +- Pause When No Players Online +- ...and possibly more as the client's UI is developed further for more configuration options. +___ +### Save Files +An existing save file (including single-player saves) can currently be uploaded to the server via two different methods: +- "Manage Saves" tab via a client in-game (Recommended) +- Manually via the File Manager or SFTP + +Save files are located in this directory: +``` +/home/container/.config/Epic/FactoryGame/Saved/SaveGames/server +``` +*Note: A manually uploaded save will only load if it is (a.) loaded manually via the "Manage Saves" tab in-game, (b.) it is the only save file present, or (c.) its existing session name (not its file name) matches the existing save's session name *and* has the most recent time stamp.* + +***Warning:*** Stopping the server **does not** currently save your game! Ensure it is saved before stopping the server. + +If you have forgotten your administrator password or would generally like to reset your server as if it were new, you can delete the following file: +``` +/home/container/.config/Epic/FactoryGame/Saved/SaveGames/ServerSettings. +``` ___ ### Console Commands As of v5.0.4, the console tab in the client server manager is the only way to execute commands. Entering commands via Pterodactyl do nothing. -[List of known commands can be found via the Wiki](https://satisfactory.fandom.com/wiki/Dedicated_servers#Commands) +[List of known commands can be found via the Wiki.](https://satisfactory.fandom.com/wiki/Dedicated_servers#Console_commands) ___ ### Errors/Warnings -The following errors or warnings you see in the console can safely be ignored: +##### The following errors or warnings you see in the console can safely be ignored: ```log steamclient.so: cannot open shared object file: No such file or directory [S_API] SteamAPI_Init(): Loaded '/home/container/.steam/sdk64/steamclient.so' OK. (First tried local 'steamclient.so') LogSteamShared: Warning: Steam Dedicated Server API failed to initialize. ``` -The local file of 'steamclient.so' was attempted to be loaded, but could not because it is not present, causing the warning message. However, the backup `/home/container/.steam/sdk64/steamclient.so` is loaded successfully (this is the correct behavior according to the [Wiki](https://satisfactory.fandom.com/wiki/Dedicated_servers#No_Such_File_or_Directory)). +The local file of 'steamclient.so' was attempted to be loaded, but could not because it is not present, causing the warning message. However, the backup `/home/container/.steam/sdk64/steamclient.so` is loaded successfully (this is the correct behavior according to the [Wiki](https://satisfactory.fandom.com/wiki/Dedicated_servers#SteamAPI_Init.28.29:_Sys_LoadModule_filed_to_load:_.2Fpath.2Fto.2F.steam.2Fsdk64.2Fsteamclient.so)). ```log Warning: failed to init SDL thread priority manager: SDL not found diff --git a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json index c03d1ee1..eba455ed 100644 --- a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json +++ b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json @@ -1,5 +1,5 @@ { - "_comment": "Pterodactyl Satisfactory Egg ~ Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord ~ 2021-10-28", + "_comment": "Pterodactyl Satisfactory Egg ~ Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord ~ 2021-11-19", "meta": { "version": "PTDL_v1", "update_url": null @@ -9,19 +9,19 @@ "description": "Satisfactory is a first-person open-world factory building game with a dash of exploration and combat. Play alone or with friends, explore an alien planet, create multi-story factories, and enter conveyor belt heaven!", "features": null, "images": [ - "ghcr.io\/pterodactyl\/games:source" + "ghcr.io\/parkervcp\/games:source" ], "file_denylist": [], "startup": ".\/Engine\/Binaries\/Linux\/UE4Server-Linux-Shipping FactoryGame ?listen -Port={{SERVER_PORT}} -ServerQueryPort={{QUERY_PORT}} -BeaconPort={{BEACON_PORT}} -multihome=0.0.0.0", "config": { - "files": "{\r\n \"FactoryGame\/Saved\/Config\/LinuxServer\/Game.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"MaxPlayers\": \"MaxPlayers={{server.build.env.MAX_PLAYERS}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"FactoryGame\/Saved\/Config\/LinuxServer\/Game.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"MaxPlayers\": \"MaxPlayers={{server.build.env.MAX_PLAYERS}}\"\r\n }\r\n },\r\n \"FactoryGame\/Saved\/Config\/LinuxServer\/Engine.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"mNumRotatingAutosaves\": \"mNumRotatingAutosaves={{server.build.env.NUM_AUTOSAVES}}\",\r\n \"bAgreeToCrashUpload\": \"bAgreeToCrashUpload={{server.build.env.UPLOAD_CRASH_REPORT}}\",\r\n \"InitialConnectTimeout\": \"InitialConnectTimeout={{server.build.env.INIT_CONNECT_TIMEOUT}}\",\r\n \"ConnectionTimeout\": \"ConnectionTimeout={{server.build.env.CONNECT_TIMEOUT}}\"\r\n }\r\n },\r\n \"FactoryGame\/Saved\/Config\/LinuxServer\/GameUserSettings.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"mFloatValues\": \"mFloatValues=((\\\"FG.AutosaveInterval\\\", {{server.build.env.AUTOSAVE_INTERVAL}}))\",\r\n \"mIntValues\": \"mIntValues=((\\\"FG.NetworkQuality\\\", {{server.build.env.NETWORK_QUALITY}}))\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Engine Initialization\"\r\n}", "logs": "{}", - "stop": "^CC" + "stop": "^C" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\n# File: Pterodactyl Satisfactory Egg - egg-satisfactory.json\r\n# Authors: Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord\r\n# Date: 2021\/10\/28\r\n# License: MIT License\r\n\r\n## Download and install SteamCMD\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\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\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} validate +exit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so\r\n\r\n## Satisfactory setup\r\n# Check for successful installation and make the core binary executable.\r\ncd \/mnt\/server\/Engine\/Binaries\/Linux\r\nif [[ ! -f UE4Server-Linux-Shipping ]]; then\r\n echo -e \"\\n\\nSteamCMD failed to install the Satisfactory Dedicated Server!\"\r\n echo -e \"\\tTry reinstalling the server again.\\n\"\r\n exit 1\r\nelse\r\n chmod +x UE4Server-Linux-Shipping\r\nfi\r\n\r\n# Make Config directory and default Game.ini file (since it is not created automatically by the server)\r\nmkdir -p \/mnt\/server\/FactoryGame\/Saved\/Config\/LinuxServer\/ && cd \"$_\"\r\nif [ ! -f Game.ini ]; then\r\n echo -e \"\\nGame.ini config file missing. Creating default.\"\r\n cat > Game.ini << EOF\r\n[\/Script\/Engine.GameSession]\r\nMaxPlayers=${MAX_PLAYERS}\r\nEOF\r\nfi\r\n\r\necho -e \"\\n\\nSatisfactory Dedicated Server successfully installed!\\n\"", + "script": "#!\/bin\/bash\r\n\r\n# File: Pterodactyl Satisfactory Egg - egg-satisfactory.json\r\n# Authors: Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord\r\n# Date: 2021\/11\/19\r\n# License: MIT License\r\n\r\n## Download and install SteamCMD\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\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\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login anonymous +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) validate +exit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so\r\n\r\n## Satisfactory setup\r\n# Check for successful installation and make the core binary executable.\r\ncd \/mnt\/server\/Engine\/Binaries\/Linux\r\nif [[ ! -f UE4Server-Linux-Shipping ]]; then\r\n echo -e \"\\n\\nSteamCMD failed to install the Satisfactory Dedicated Server!\"\r\n echo -e \"\\tTry reinstalling the server again.\\n\"\r\n exit 1\r\nelse\r\n chmod +x UE4Server-Linux-Shipping\r\nfi\r\n\r\n# Make Config directory and default .ini files (since they are not initially present before first server start)\r\nmkdir -p \/mnt\/server\/FactoryGame\/Saved\/Config\/LinuxServer\/ && cd \"$_\"\r\n# Currently, this will delete & re-create certain .ini files during a re-install if they are already present.\r\n# While undesirable, this is required due to a current Pterodactyl ini config parser limitation.\r\n# When the patch to this limitation hits the production branch, this will be updated.\r\nrm -f Engine.ini Game.ini GameUserSettings.ini\r\n\r\necho -e '\\nCreating default \"Engine.ini\" configuration file...'\r\ncat > Engine.ini << EOF\r\n[\/Script\/FactoryGame.FGSaveSession]\r\nmNumRotatingAutosaves=${NUM_AUTOSAVES}\r\n\r\n[CrashReportClient]\r\nbAgreeToCrashUpload=${UPLOAD_CRASH_REPORT}\r\n\r\n[\/Script\/OnlineSubsystemUtils.IpNetDriver]\r\nInitialConnectTimeout=${INIT_CONNECT_TIMEOUT}\r\nConnectionTimeout=${CONNECT_TIMEOUT}\r\nEOF\r\n\r\necho -e 'Creating default \"Game.ini\" configuration file...'\r\ncat > Game.ini << EOF\r\n[\/Script\/Engine.GameSession]\r\nMaxPlayers=${MAX_PLAYERS}\r\nEOF\r\n\r\necho -e 'Creating default \"GameUserSettings.ini\" configuration file...'\r\ncat > GameUserSettings.ini << EOF\r\n[\/Script\/FactoryGame.FGGameUserSettings]\r\nmIntValues=((\"FG.NetworkQuality\", ${NETWORK_QUALITY}))\r\nmFloatValues=((\"FG.AutosaveInterval\", ${AUTOSAVE_INTERVAL}))\r\nEOF\r\n\r\necho -e \"\\nSatisfactory Dedicated Server successfully installed!\\n\"", "container": "ghcr.io\/pterodactyl\/installers:debian", "entrypoint": "bash" } @@ -63,15 +63,87 @@ "user_editable": true, "rules": "string|nullable" }, + { + "name": "Autosave Interval", + "description": "How often, in seconds, the server should generate a new autosave (ex. 300 = 5 min). Keep in mind that shorter times mean that while the server will save the game more often, it also means a potential drop in server performance. NOTE: This overrides any \"FG.AutosaveInterval\" commands made to the console!", + "env_variable": "AUTOSAVE_INTERVAL", + "default_value": "300", + "user_viewable": true, + "user_editable": true, + "rules": "required|numeric|min:1" + }, + { + "name": "Number of Rotating Autosaves", + "description": "Number of session auto-saves for the server to keep before the oldest save is deleted and the others are moved down the list.", + "env_variable": "NUM_AUTOSAVES", + "default_value": "3", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|min:0" + }, + { + "name": "Upload Crash Reports", + "description": "Accepted values are \"true\" or \"false\". Determines if the server should upload any crash reports to the developer to help pinpoint issues for future patches.", + "env_variable": "UPLOAD_CRASH_REPORT", + "default_value": "true", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:true,false" + }, { "name": "[Experimental] Max Players", - "description": "The server and client are currently not optimized to support more than 4 players. However, you can override this value here at your own risk of poor performance.", + "description": "[Requires server re-install to change default value!] The server and client are currently not optimized to support more than 4 players. However, you can override this value here at your own risk of poor performance.", "env_variable": "MAX_PLAYERS", "default_value": "4", "user_viewable": true, "user_editable": true, "rules": "required|integer|min:1" }, + { + "name": "[Advanced] Client Initial Connection Timeout", + "description": "Time in seconds to wait for a new client connection to be established before destroying the connection.", + "env_variable": "INIT_CONNECT_TIMEOUT", + "default_value": "30", + "user_viewable": true, + "user_editable": true, + "rules": "required|numeric|min:1" + }, + { + "name": "[Advanced] Client Established Connection Timeout", + "description": "Time in seconds to wait before considering an established client connection timed out. Typically shorter than the time to wait on an initial connection because this connection should already have been setup and any interruption should be trapped quicker.", + "env_variable": "CONNECT_TIMEOUT", + "default_value": "20", + "user_viewable": true, + "user_editable": true, + "rules": "required|numeric|min:1" + }, + { + "name": "[Advanced] Network Quality", + "description": "[0 = Low, 1 = Medium, 2 = High, 3 = Ultra] Sets the network configuration for the game server (shouldn't need to be changed). NOTE: This overrides any \"FG.NetworkQuality\" commands made to the console!", + "env_variable": "NETWORK_QUALITY", + "default_value": "3", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|between:0,3" + }, + { + "name": "[Advanced] Beta ID", + "description": "Used to download or switch to any current\/future non-primary branches of the game server. Leave empty to use the main branch of the server. \"Automatic Updates\" and \"Validate Server Files\" must be set to \"1\" to switch branches if the server is already installed. NOTE: Any non-primary branches may not be fully compatible!", + "env_variable": "SRCDS_BETAID", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "string|nullable" + }, + { + "name": "[Advanced] Beta Password", + "description": "To be used in tandem with \"Beta ID\" if any branches require a password. Leave empty when not using \"Beta ID\".", + "env_variable": "SRCDS_BETAPASS", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "string|nullable" + }, { "name": "[Advanced] Satisfactory Dedicated Server App ID", "description": "Steam App ID used for installation and updates. Rarely needs to be changed.", From b2a6dc80b4f9b1f1b2886748288cf9b663eed182 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Wed, 24 Nov 2021 09:49:48 +0200 Subject: [PATCH 0087/1001] fix: Xonotic egg Updates Docker images to use yolks Delete config parser that was leftover from tshock egg Fixes glibc missing Fixes missing server config file and does not overwrite it on reinstall Fixes server shutdown resolves #1410 --- game_eggs/xonotic/xonotic/egg-xonotic.json | 29 +++++++++++++--------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/game_eggs/xonotic/xonotic/egg-xonotic.json b/game_eggs/xonotic/xonotic/egg-xonotic.json index 4fa357c9..4817c6a8 100644 --- a/game_eggs/xonotic/xonotic/egg-xonotic.json +++ b/game_eggs/xonotic/xonotic/egg-xonotic.json @@ -1,24 +1,29 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2018-02-23T15:46:08-05:00", + "exported_at": "2021-11-24T07:45:11+00:00", "name": "Xonotic", "author": "parker@parkervcp.com", "description": "This is for the default xonotic setup.", - "image": "quay.io\/pterodactyl\/core:source", + "features": null, + "images": [ + "ghcr.io\/pterodactyl\/games:source" + ], + "file_denylist": [], "startup": ".\/xonotic-linux64-dedicated +log_file latest.log +net_address 0.0.0.0 +port {{SERVER_PORT}} +maxplayers {{MAX_PLAYERS}}", "config": { - "files": "{\r\n \"tshock\/config.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {}\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Server listening on address 0.0.0.0:\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", - "stop": "^C" + "files": "{}", + "startup": "{\r\n \"done\": \"Server listening on address 0.0.0.0:\"\r\n}", + "logs": "{}", + "stop": "quit" }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Vanilla Xonotic Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add rsync --no-cache\r\n\r\ncd \/mnt\/server\r\n\r\nwget http:\/\/dl.xonotic.org\/xonotic-0.8.2.zip\r\n\r\nunzip xonotic-0.8.2.zip\r\n\r\nmv Xonotic\/* .\/\r\n\r\n.\/misc\/tools\/rsync-updater\/update-to-autobuild.sh\r\n\r\nrm -rf COPYING Makefile *glx* *glx *sdl* *sdl *linux32* *exe *.app *.sh bin* GPL* Docs\/ gmqcc\/ source\/ misc\/ Xonotic\/ xonotic-0.8.2.zip", - "container": "alpine:3.9", + "script": "#!\/bin\/ash\r\n# Vanilla Xonotic Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add rsync --no-cache\r\n\r\ncd \/mnt\/server\r\n\r\nwget http:\/\/dl.xonotic.org\/xonotic-0.8.2.zip\r\n\r\nunzip xonotic-0.8.2.zip\r\n\r\nmv Xonotic\/* .\/\r\n\r\n.\/misc\/tools\/rsync-updater\/update-to-autobuild.sh\r\n\r\n# create initial folder structure to copy the default config to, because it only gets created on first startup\r\nmkdir -p .xonotic\/data\r\ncp-n server\/server.cfg .xonotic\/data\/server.cfg || true # do not overwrite existing config file\r\n\r\nrm -rf COPYING Makefile *glx* *glx *sdl* *sdl *linux32* *exe *.app *.sh bin* GPL* Docs\/ gmqcc\/ source\/ misc\/ Xonotic\/ xonotic-0.8.2.zip", + "container": "ghcr.io\/pterodactyl\/installers:alpine", "entrypoint": "ash" } }, @@ -28,9 +33,9 @@ "description": "Max players allowed on the server", "env_variable": "MAX_PLAYERS", "default_value": "16", - "user_viewable": 1, - "user_editable": 0, - "rules": "required|numeric|digits_between:1,3" + "user_viewable": true, + "user_editable": true, + "rules": "required|numeric|digits_between:1,2" } ] } From 7fdba40e0155cd7d08a47a8545b300618ed9f0a0 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Thu, 25 Nov 2021 22:26:55 +0200 Subject: [PATCH 0088/1001] fix: Forge latest version fetching Fixes a typo in fetching latest versions. It was overwritten to "recommended" by mistake. --- .../minecraft/java/forge/forge/egg-forge-enhanced.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json b/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json index 7af5e413..763a3f88 100644 --- a/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json +++ b/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-10-05T15:04:09-04:00", + "exported_at": "2021-11-25T20:19:52+00:00", "name": "Forge Enhanced", "author": "parker@parkervcp.com", "description": "Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.", @@ -15,19 +15,20 @@ "images": [ "ghcr.io\/pterodactyl\/yolks:java_8", "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_16" + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true $( [ ! -f unix_args.txt ] && printf %s \"-jar {{SERVER_JARFILE}}\" || printf %s \"@unix_args.txt\" )", "config": { - "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"enable-query\": \"true\",\r\n \"server-port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \")! For help, type \"\r\n}", "logs": "{}", "stop": "stop" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n# Remove spaces from the version number to avoid issues with curl\r\nFORGE_VERSION=\"$(echo \"$FORGE_VERSION\" | tr -d ' ')\"\r\nMC_VERSION=\"$(echo \"$MC_VERSION\" | tr -d ' ')\"\r\n\r\nif [ ! -z ${FORGE_VERSION} ]; then\r\n DOWNLOAD_LINK=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/${FORGE_VERSION}\/forge-${FORGE_VERSION}\r\n FORGE_JAR=forge-${FORGE_VERSION}*.jar\r\nelse\r\n JSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\n if [ \"${MC_VERSION}\" == \"latest\" ] || [ \"${MC_VERSION}\" == \"\" ] ; then\r\n echo -e \"getting latest version of forge.\"\r\n MC_VERSION=$(echo -e ${JSON_DATA} | jq -r '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains(\"recommended\")) | split(\"-\")[0]' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)\r\n \tBUILD_TYPE=latest\r\n fi\r\n\r\n if [ \"${BUILD_TYPE}\" != \"recommended\" ] && [ \"${BUILD_TYPE}\" != \"latest\" ]; then\r\n BUILD_TYPE=recommended\r\n fi\r\n\r\n echo -e \"minecraft version: ${MC_VERSION}\"\r\n echo -e \"build type: ${BUILD_TYPE}\"\r\n\r\n ## some variables for getting versions and things\r\n\tFILE_SITE=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n ## locating the forge version\r\n if [ \"${VERSION_KEY}\" == \"\" ] && [ \"${BUILD_TYPE}\" == \"recommended\" ]; then\r\n echo -e \"dropping back to latest from recommended due to there not being a recommended version of forge for the mc version requested.\"\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"recommended\"))')\r\n fi\r\n\r\n ## Error if the mc version set wasn't valid.\r\n if [ \"${VERSION_KEY}\" == \"\" ] || [ \"${VERSION_KEY}\" == \"null\" ]; then\r\n \techo -e \"The install failed because there is no valid version of forge for the version of minecraft selected.\"\r\n \texit 1\r\n fi\r\n\r\n FORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\n if [ \"${MC_VERSION}\" == \"1.7.10\" ] || [ \"${MC_VERSION}\" == \"1.8.9\" ]; then\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}.jar\r\n if [ \"${MC_VERSION}\" == \"1.7.10\" ]; then\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}-universal.jar\r\n fi\r\n else\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}.jar\r\n fi\r\nfi\r\n\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version ${FORGE_VERSION}\"\r\necho -e \"Download link is ${DOWNLOAD_LINK}\"\r\n\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-installer.jar; then\r\n echo -e \"installer jar download link is valid.\"\r\n else\r\n echo -e \"link is invalid. Exiting now\"\r\n exit 2\r\n fi\r\nelse\r\n echo -e \"no download link provided. Exiting now\"\r\n exit 3\r\nfi\r\n\r\ncurl -s -o installer.jar -sS ${DOWNLOAD_LINK}-installer.jar\r\n\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ]; then\r\n echo \"!!! Error by downloading forge version ${FORGE_VERSION} !!!\"\r\n exit\r\nfi\r\n\r\n# Delete args file to support downgrading to versions below 1.17\r\nif [ -f unix_args.txt ]; then\r\n rm unix_args.txt\r\n exit\r\nfi\r\n\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n\r\nif [[ $MC_VERSION == *\"1.17.\"* || $MC_VERSION == *\"1.18.\"* || $FORGE_VERSION == *\"1.17.\"* || $FORGE_VERSION == *\"1.18.\"* ]]; then\r\n # Create a symlink for 1.17+ Forge args\r\n ln -sf libraries\/net\/minecraftforge\/forge\/*\/unix_args.txt unix_args.txt\r\n else\r\n # For versions below 1.17 that ship with jar delete installer.jar\r\n mv $FORGE_JAR $SERVER_JARFILE\r\n echo -e \"Deleting installer.jar file.\\n\"\r\n rm -rf installer.jar\r\nfi", + "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n# Remove spaces from the version number to avoid issues with curl\r\nFORGE_VERSION=\"$(echo \"$FORGE_VERSION\" | tr -d ' ')\"\r\nMC_VERSION=\"$(echo \"$MC_VERSION\" | tr -d ' ')\"\r\n\r\nif [ ! -z ${FORGE_VERSION} ]; then\r\n DOWNLOAD_LINK=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/${FORGE_VERSION}\/forge-${FORGE_VERSION}\r\n FORGE_JAR=forge-${FORGE_VERSION}*.jar\r\nelse\r\n JSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\n if [ \"${MC_VERSION}\" == \"latest\" ] || [ \"${MC_VERSION}\" == \"\" ] ; then\r\n echo -e \"getting latest version of forge.\"\r\n MC_VERSION=$(echo -e ${JSON_DATA} | jq -r '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains(\"latest\")) | split(\"-\")[0]' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)\r\n \tBUILD_TYPE=latest\r\n fi\r\n\r\n if [ \"${BUILD_TYPE}\" != \"recommended\" ] && [ \"${BUILD_TYPE}\" != \"latest\" ]; then\r\n BUILD_TYPE=recommended\r\n fi\r\n\r\n echo -e \"minecraft version: ${MC_VERSION}\"\r\n echo -e \"build type: ${BUILD_TYPE}\"\r\n\r\n ## some variables for getting versions and things\r\n\tFILE_SITE=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n ## locating the forge version\r\n if [ \"${VERSION_KEY}\" == \"\" ] && [ \"${BUILD_TYPE}\" == \"recommended\" ]; then\r\n echo -e \"dropping back to latest from recommended due to there not being a recommended version of forge for the mc version requested.\"\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"latest\"))')\r\n fi\r\n\r\n ## Error if the mc version set wasn't valid.\r\n if [ \"${VERSION_KEY}\" == \"\" ] || [ \"${VERSION_KEY}\" == \"null\" ]; then\r\n \techo -e \"The install failed because there is no valid version of forge for the version of minecraft selected.\"\r\n \texit 1\r\n fi\r\n\r\n FORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\n if [ \"${MC_VERSION}\" == \"1.7.10\" ] || [ \"${MC_VERSION}\" == \"1.8.9\" ]; then\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}.jar\r\n if [ \"${MC_VERSION}\" == \"1.7.10\" ]; then\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}-universal.jar\r\n fi\r\n else\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}.jar\r\n fi\r\nfi\r\n\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version ${FORGE_VERSION}\"\r\necho -e \"Download link is ${DOWNLOAD_LINK}\"\r\n\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-installer.jar; then\r\n echo -e \"installer jar download link is valid.\"\r\n else\r\n echo -e \"link is invalid. Exiting now\"\r\n exit 2\r\n fi\r\nelse\r\n echo -e \"no download link provided. Exiting now\"\r\n exit 3\r\nfi\r\n\r\ncurl -s -o installer.jar -sS ${DOWNLOAD_LINK}-installer.jar\r\n\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ]; then\r\n echo \"!!! Error by downloading forge version ${FORGE_VERSION} !!!\"\r\n exit\r\nfi\r\n\r\n# Delete args file to support downgrading to versions below 1.17\r\nif [ -f unix_args.txt ]; then\r\n rm unix_args.txt\r\n exit\r\nfi\r\n\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n\r\nif [[ $MC_VERSION == *\"1.17.\"* || $MC_VERSION == *\"1.18.\"* || $FORGE_VERSION == *\"1.17.\"* || $FORGE_VERSION == *\"1.18.\"* ]]; then\r\n # Create a symlink for 1.17+ Forge args\r\n ln -sf libraries\/net\/minecraftforge\/forge\/*\/unix_args.txt unix_args.txt\r\n else\r\n # For versions below 1.17 that ship with jar delete installer.jar\r\n mv $FORGE_JAR $SERVER_JARFILE\r\n echo -e \"Deleting installer.jar file.\\n\"\r\n rm -rf installer.jar\r\nfi", "container": "openjdk:8-jdk-slim", "entrypoint": "bash" } From 87840a32c993a953158453715afa420551a40a25 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Fri, 26 Nov 2021 01:22:11 +0200 Subject: [PATCH 0089/1001] refactor(forest): rewrite the egg Changes docker images, startup parameters, enables auto-updates, removes shellscript from startup, fixes DHCP network config --- .../the_forest/egg-the-forest.json | 35 ++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/game_eggs/steamcmd_servers/the_forest/egg-the-forest.json b/game_eggs/steamcmd_servers/the_forest/egg-the-forest.json index f23cea77..1fff9c86 100644 --- a/game_eggs/steamcmd_servers/the_forest/egg-the-forest.json +++ b/game_eggs/steamcmd_servers/the_forest/egg-the-forest.json @@ -4,25 +4,26 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-01-03T20:24:12+01:00", + "exported_at": "2021-11-25T23:18:02+00:00", "name": "The Forest", "author": "admin@softwarenoob.com", "description": "As the lone survivor of a passenger jet crash, you find yourself in a mysterious forest battling to stay alive against a society of cannibalistic mutants. Build, explore, survive in this terrifying first-person survival horror simulator.", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:ubuntu_wine-xvfb" + "ghcr.io\/parkervcp\/yolks:wine_latest" ], - "startup": ".\/start.sh", + "file_denylist": [], + "startup": "xvfb-run --auto-servernum --server-args='-screen 0 640x480x24:32' wine64 \/home\/container\/TheForestDedicatedServer.exe -batchmode -nographics -nosteamclient -savefolderpath \/home\/container\/TheForestDedicatedServer_Data -configfilepath \/home\/container\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg |grep -v 'RenderTexture.Create failed: format unsupported - 2.'", "config": { - "files": "{\r\n \"\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"serverIP\": \"serverIP {{server.build.default.ip}}:{{server.build.default.port}}\",\r\n \"serverSteamPort\": \"serverSteamPort {{server.build.env.STEAM_PORT}}\",\r\n \"serverGamePort\": \"serverGamePort {{server.build.default.port}}\",\r\n \"serverQueryPort\": \"serverQueryPort {{server.build.env.QUERY_PORT}}\",\r\n \"serverName\": \"serverName {{server.build.env.SERVER_NAME}}\",\r\n \"serverPlayers\": \"serverPlayers {{server.build.env.MAX_PLAYERS}}\",\r\n \"serverPassword\": \"serverPassword {{server.build.env.SERVER_PASS}}\",\r\n \"serverPasswordAdmin\": \"serverPasswordAdmin {{server.build.env.ADMIN_PASS}}\",\r\n \"serverSteamAccount\": \"serverSteamAccount {{server.build.env.STEAM_ACC}}\",\r\n \"enableVAC\": \"enableVAC {{server.build.env.VAC}}\",\r\n \"difficulty\": \"difficulty {{server.build.env.SERVER_DIFFICULTY}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"serverIP\": \"serverIP 0.0.0.0\",\r\n \"serverSteamPort\": \"serverSteamPort {{server.build.env.STEAM_PORT}}\",\r\n \"serverGamePort\": \"serverGamePort {{server.build.default.port}}\",\r\n \"serverQueryPort\": \"serverQueryPort {{server.build.env.QUERY_PORT}}\",\r\n \"serverName\": \"serverName {{server.build.env.SERVER_NAME}}\",\r\n \"serverPlayers\": \"serverPlayers {{server.build.env.MAX_PLAYERS}}\",\r\n \"serverPassword\": \"serverPassword {{server.build.env.SERVER_PASS}}\",\r\n \"serverPasswordAdmin\": \"serverPasswordAdmin {{server.build.env.ADMIN_PASS}}\",\r\n \"serverSteamAccount\": \"serverSteamAccount {{server.build.env.STEAM_ACC}}\",\r\n \"enableVAC\": \"enableVAC {{server.build.env.VAC}}\",\r\n \"difficulty\": \"difficulty {{server.build.env.SERVER_DIFFICULTY}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Game autosave started\"\r\n}", "logs": "{}", "stop": "^C" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n# Install dependencies\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\r\n\r\n\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## Install game using steamcmd\r\n.\/steamcmd.sh +login anonymous +@sSteamCmdForcePlatformType windows +force_install_dir \/mnt\/server +app_update ${APPID} ${EXTRA_FLAGS} validate +quit\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## Configure wine and server startup config\r\nmkdir -p \/home\/container\/.wine64\r\necho \"#!\/bin\/sh\r\nexport WINEARCH=win64\r\nexport WINEPREFIX=\/home\/container\/.wine64\r\nxvfb-run --auto-servernum --server-args='-screen 0 640x480x24:32' wine64 \/home\/container\/TheForestDedicatedServer.exe -batchmode -nographics -nosteamclient -savefolderpath \/home\/container\/TheForestDedicatedServer_Data -configfilepath \/home\/container\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg |grep -v 'RenderTexture.Create failed: format unsupported - 2.'\" > \/mnt\/server\/start.sh\r\nchmod +x \/mnt\/server\/start.sh\r\n\r\n## Create Config\r\n\r\nmkdir -p $HOME\/TheForestDedicatedServer_Data\/forest\/config\/\r\n#rm -fR $HOME\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg\r\ncat < $HOME\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg\r\n\/\/ Dedicated Server Settings.\r\n\/\/ Server IP address - Note: If you have a router, this address is the internal address, and you need to configure ports forwarding, append the current game port here as well\r\nserverIP\r\n\/\/ Steam Communication Port - Note: If you have a router you will need to open this port.\r\nserverSteamPort\r\n\/\/ Game Communication Port - Note: If you have a router you will need to open this port.\r\nserverGamePort\r\n\/\/ Query Communication Port - Note: If you have a router you will need to open this port.\r\nserverQueryPort\r\n\/\/ Server display name\r\nserverName\r\n\/\/ Maximum number of players\r\nserverPlayers 5\r\n\/\/ Server password. blank means no password\r\nserverPassword\r\n\/\/ Server administration password. blank means no password\r\nserverPasswordAdmin\r\n\/\/ Your Steam account name. blank means anonymous (see Steam server account bellow)\r\nserverSteamAccount\r\n\/\/ Enable VAC (Valve Anti Cheat) on the server. off by default, uncomment to enable\r\nenableVAC on\r\n\/\/ Time between server auto saves in minutes\r\nserverAutoSaveInterval 15\r\n\/\/ Game difficulty mode. Must be set to \"Peaceful\" \"Normal\" or \"Hard\"\r\ndifficulty Normal\r\n\/\/ New or continue a game. Must be set to \"New\" or \"Continue\"\r\ninitType New\r\n\/\/ Slot to save the game. Must be set 1 2 3 4 or 5\r\nslot 1\r\n\/\/ Show event log. Must be set \"off\" or \"on\"\r\nshowLogs off\r\n\/\/ Contact email for server admin\r\nserverContact email@gmail.com\r\n\/\/ No enemies. Must be set to \"on\" or \"off\"\r\nveganMode off\r\n\/\/ No enemies during day time. Must be set to \"on\" or \"off\"\r\nvegetarianMode off\r\n\/\/ Reset all structure holes when loading a save. Must be set to \"on\" or \"off\"\r\nresetHolesMode off\r\n\/\/ Regrow 10% of cut down trees when sleeping. Must be set to \"on\" or \"off\"\r\ntreeRegrowMode off\r\n\/\/ Allow building destruction. Must be set to \"on\" or \"off\"\r\nallowBuildingDestruction on\r\n\/\/ Allow enemies in creative games. Must be set to \"on\" or \"off\"\r\nallowEnemiesCreativeMode off\r\n\/\/ Allow clients to use the built in development console. Must be set to \"on\" or \"off\"\r\nallowCheats off\r\n\/\/ Allows defining a custom folder for save slots, leave empty to use the default location\r\nsaveFolderPath\r\n\/\/ Target FPS when no client is connected\r\ntargetFpsIdle 5\r\n\/\/ Target FPS when there is at least one client connected\r\ntargetFpsActive 60\r\nEOT", - "container": "debian:buster-slim", + "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n# Install dependencies\r\napt -y --no-install-recommends install libstdc++6 lib32gcc-s1 ca-certificates\r\n\r\nexport WINEARCH=win64\r\nexport WINEPREFIX=\/home\/container\/.wine64\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## Install game using steamcmd\r\n.\/steamcmd.sh +login anonymous +@sSteamCmdForcePlatformType windows +force_install_dir \/mnt\/server +app_update ${APPID} ${EXTRA_FLAGS} validate +quit\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## Configure wine and server startup config\r\nmkdir -p \/home\/container\/.wine64\r\nexport WINEARCH=win64\r\nexport WINEPREFIX=\/home\/container\/.wine64\r\n\r\n## Create Config\r\n\r\nmkdir -p $HOME\/TheForestDedicatedServer_Data\/forest\/config\/\r\n#rm -fR $HOME\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg\r\ncat < $HOME\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg\r\n\/\/ Dedicated Server Settings.\r\n\/\/ Server IP address - Note: If you have a router, this address is the internal address, and you need to configure ports forwarding, append the current game port here as well\r\nserverIP\r\n\/\/ Steam Communication Port - Note: If you have a router you will need to open this port.\r\nserverSteamPort\r\n\/\/ Game Communication Port - Note: If you have a router you will need to open this port.\r\nserverGamePort\r\n\/\/ Query Communication Port - Note: If you have a router you will need to open this port.\r\nserverQueryPort\r\n\/\/ Server display name\r\nserverName\r\n\/\/ Maximum number of players\r\nserverPlayers 5\r\n\/\/ Server password. blank means no password\r\nserverPassword\r\n\/\/ Server administration password. blank means no password\r\nserverPasswordAdmin\r\n\/\/ Your Steam account name. blank means anonymous (see Steam server account bellow)\r\nserverSteamAccount\r\n\/\/ Enable VAC (Valve Anti Cheat) on the server. off by default, uncomment to enable\r\nenableVAC on\r\n\/\/ Time between server auto saves in minutes\r\nserverAutoSaveInterval 15\r\n\/\/ Game difficulty mode. Must be set to \"Peaceful\" \"Normal\" or \"Hard\"\r\ndifficulty Normal\r\n\/\/ New or continue a game. Must be set to \"New\" or \"Continue\"\r\ninitType New\r\n\/\/ Slot to save the game. Must be set 1 2 3 4 or 5\r\nslot 1\r\n\/\/ Show event log. Must be set \"off\" or \"on\"\r\nshowLogs off\r\n\/\/ Contact email for server admin\r\nserverContact email@gmail.com\r\n\/\/ No enemies. Must be set to \"on\" or \"off\"\r\nveganMode off\r\n\/\/ No enemies during day time. Must be set to \"on\" or \"off\"\r\nvegetarianMode off\r\n\/\/ Reset all structure holes when loading a save. Must be set to \"on\" or \"off\"\r\nresetHolesMode off\r\n\/\/ Regrow 10% of cut down trees when sleeping. Must be set to \"on\" or \"off\"\r\ntreeRegrowMode off\r\n\/\/ Allow building destruction. Must be set to \"on\" or \"off\"\r\nallowBuildingDestruction on\r\n\/\/ Allow enemies in creative games. Must be set to \"on\" or \"off\"\r\nallowEnemiesCreativeMode off\r\n\/\/ Allow clients to use the built in development console. Must be set to \"on\" or \"off\"\r\nallowCheats off\r\n\/\/ Allows defining a custom folder for save slots, leave empty to use the default location\r\nsaveFolderPath\r\n\/\/ Target FPS when no client is connected\r\ntargetFpsIdle 5\r\n\/\/ Target FPS when there is at least one client connected\r\ntargetFpsActive 60\r\nEOT", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, @@ -30,7 +31,7 @@ { "name": "APP ID", "description": "The ID corresponding to the game to download.", - "env_variable": "APPID", + "env_variable": "SRCDS_APPID", "default_value": "556450", "user_viewable": false, "user_editable": false, @@ -55,7 +56,7 @@ "rules": "required|string|max:20" }, { - "name": "Query Port", + "name": "[Connection Port] Query Port", "description": "Query port, this port is also used for connecting to the server", "env_variable": "QUERY_PORT", "default_value": "27016", @@ -116,6 +117,24 @@ "user_viewable": true, "user_editable": true, "rules": "required|string|max:3" + }, + { + "name": "Windows Install", + "description": "This is required to install the correct Forest version. Removing or touching this will overwrite the files with a non-existing Linux releases.", + "env_variable": "WINDOWS_INSTALL", + "default_value": "1", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|in:1" + }, + { + "name": "Auto-Update", + "description": "0 disables auto-update on each server startup, while 1 enables it.", + "env_variable": "AUTO_UPDATE", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "required|boolean" } ] } \ No newline at end of file From c2a17a19f42822c7264650d9a3c0fbf070db949b Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Fri, 26 Nov 2021 02:14:52 +0200 Subject: [PATCH 0090/1001] chore(minecraft): update images to Yolks and include feature modals Updates Minecraft eggs to have the new Yolks images and features for EULA and Java version selector popup modals. --- .../minecraft/bedrock/gomint/egg-go-mint.json | 13 ++++++++----- .../minecraft/java/airplane/egg-airplane.json | 6 ++++-- .../minecraft/java/cuberite/egg-cuberite.json | 16 ++++++++++------ game_eggs/minecraft/java/fabric/egg-fabric.json | 6 ++++-- .../minecraft/java/feather/egg-feather.json | 10 +++++++--- .../egg-curseforge-generic.json | 11 +++++++---- .../java/ftb/egg-ftb-modpacksch-server.json | 11 +++++++---- .../minecraft/java/krypton/egg-krypton.json | 12 +++++++++--- game_eggs/minecraft/java/magma/egg-magma.json | 11 +++++++---- game_eggs/minecraft/java/mohist/egg-mohist.json | 11 +++++++---- game_eggs/minecraft/java/paper/egg-paper.json | 9 +++++---- game_eggs/minecraft/java/purpur/egg-purpur.json | 10 ++++++---- game_eggs/minecraft/java/spigot/egg-spigot.json | 8 +++++--- .../java/spongeforge/egg-sponge-forge.json | 9 +++++---- .../java/spongevanilla/egg-sponge-vanilla.json | 9 +++++---- .../java/technic/Tekkit/egg-tekkit.json | 10 ++++++++-- .../tekkit-classic/egg-tekkit-classic.json | 10 ++++++++-- .../minecraft/java/tuinity/egg-tuinity.json | 11 ++++++----- .../java/vanillacord/egg-vanilla-cord.json | 9 +++++---- .../bedrock/waterdog_pe/egg-waterdog-p-e.json | 10 +++++++--- .../cross_platform/waterdog/egg-waterdog.json | 11 +++++++---- .../proxy/java/flamecord/egg-flamecord.json | 13 ++++++++----- .../proxy/java/travertine/egg-travertine.json | 13 ++++++++----- .../java/typhoonlimbo/egg-typhoon-limbo.json | 13 +++++++++---- .../proxy/java/velocity/egg-velocity.json | 12 +++++++----- .../proxy/java/viaaas/egg-v-i-aaa-s.json | 9 +++++++-- .../proxy/java/waterfall/egg-waterfall.json | 13 ++++++++----- 27 files changed, 184 insertions(+), 102 deletions(-) diff --git a/game_eggs/minecraft/bedrock/gomint/egg-go-mint.json b/game_eggs/minecraft/bedrock/gomint/egg-go-mint.json index 07044e87..598e5697 100644 --- a/game_eggs/minecraft/bedrock/gomint/egg-go-mint.json +++ b/game_eggs/minecraft/bedrock/gomint/egg-go-mint.json @@ -8,12 +8,15 @@ "name": "GoMint", "author": "parker@parkervcp.com", "description": "A performant and stable Minecraft server software for the Bedrock Edition that comes with a modern API and support for Java 11 LTS.", - "features": null, + "features": [ + "eula", + "java_version" + ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_11", "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_14", - "ghcr.io\/pterodactyl\/yolks:java_16" + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java --add-opens java.base\/java.nio=io.netty.common --add-exports java.base\/jdk.internal.misc=io.netty.common -p modules -m gomint.server\/io.gomint.server.Bootstrap", @@ -31,4 +34,4 @@ } }, "variables": [] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/airplane/egg-airplane.json b/game_eggs/minecraft/java/airplane/egg-airplane.json index aa0ca689..14b4d2ef 100644 --- a/game_eggs/minecraft/java/airplane/egg-airplane.json +++ b/game_eggs/minecraft/java/airplane/egg-airplane.json @@ -9,10 +9,12 @@ "author": "info@ttr3.eu", "description": "A stable, optimized and fast Paper fork.\r\nhttps:\/\/github.com\/TECHNOVE\/Airplane", "features": [ - "eula" + "eula", + "java_version" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17", "ghcr.io\/pterodactyl\/yolks:java_11" ], "file_denylist": [], @@ -59,4 +61,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/cuberite/egg-cuberite.json b/game_eggs/minecraft/java/cuberite/egg-cuberite.json index a99ef76d..ca8c546b 100644 --- a/game_eggs/minecraft/java/cuberite/egg-cuberite.json +++ b/game_eggs/minecraft/java/cuberite/egg-cuberite.json @@ -1,14 +1,18 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-12-08T17:25:20-08:00", + "exported_at": "2021-11-26T00:05:33+00:00", "name": "Cuberite", "author": "parker@parkervcp.com", "description": "A lightweight, fast and extensible game server for Minecraft", "features": null, - "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", + "images": [ + "ghcr.io\/parkervcp\/yolks:debian" + ], + "file_denylist": [], "startup": ".\/Cuberite", "config": { "files": "{\r\n \"settings.ini\": {\r\n \"parser\": \"ini\",\r\n \"find\": {\r\n \"Server.Ports\": \"{{server.build.default.port}}\",\r\n \"Server.Description\": \"{{server.build.env.SERV_DESC}}\"\r\n }\r\n },\r\n \"webadmin.ini\": {\r\n \"parser\": \"ini\",\r\n \"find\": {\r\n \"User:admin.Password\": \"{{server.build.env.ADMIN_PASS}}\",\r\n \"WebAdmin.Ports\": \"{{server.build.env.WEB_PORT}}\"\r\n }\r\n }\r\n}", @@ -18,8 +22,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Cuberite\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y wget\r\n\r\ncd \/mnt\/server\r\n\r\nwget https:\/\/download.cuberite.org\/linux-x86_64\/Cuberite.tar.gz\r\n\r\ntar -xzf Cuberite.tar.gz", - "container": "debian:buster-slim", + "script": "#!\/bin\/ash\r\n# Cuberite\r\n#\r\n# Server Files: \/mnt\/server\r\napt install -y wget\r\n\r\ncd \/mnt\/server\r\n\r\nwget https:\/\/download.cuberite.org\/linux-x86_64\/Cuberite.tar.gz\r\n\r\ntar -xzf Cuberite.tar.gz", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, @@ -52,4 +56,4 @@ "rules": "required|integer|between:1,65535" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/fabric/egg-fabric.json b/game_eggs/minecraft/java/fabric/egg-fabric.json index 833d0c1f..fe349871 100644 --- a/game_eggs/minecraft/java/fabric/egg-fabric.json +++ b/game_eggs/minecraft/java/fabric/egg-fabric.json @@ -9,12 +9,14 @@ "author": "accounts@bofanodes.io", "description": "Fabric is a modular modding toolchain targeting Minecraft 1.14 and above, including snapshots.", "features": [ - "eula" + "eula", + "java_version" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_8", "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_16" + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", diff --git a/game_eggs/minecraft/java/feather/egg-feather.json b/game_eggs/minecraft/java/feather/egg-feather.json index 882e525a..d1181ec8 100644 --- a/game_eggs/minecraft/java/feather/egg-feather.json +++ b/game_eggs/minecraft/java/feather/egg-feather.json @@ -1,14 +1,18 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-12-12T16:29:02+00:00", + "exported_at": "2021-11-26T00:03:20+00:00", "name": "Feather", "author": "parker@parkervcp.com", "description": "An experimental Minecraft server implementation written in Rust.", "features": null, - "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", + "images": [ + "ghcr.io\/parkervcp\/yolks:debian" + ], + "file_denylist": [], "startup": ".\/feather-server", "config": { "files": "{\r\n \"feather.toml\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"port\": \"port = {{server.build.default.port}}\",\r\n \"address\": \"address = \\\"0.0.0.0\\\"\"\r\n }\r\n }\r\n}", diff --git a/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json b/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json index 00d94e28..50a67d53 100644 --- a/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json +++ b/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json @@ -8,12 +8,15 @@ "name": "Curseforge Generic", "author": "parker@parkervcp.com", "description": "A generic egg for a forge modpack", - "features": null, + "features": [ + "eula", + "java_version" + ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_8", "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_14", - "ghcr.io\/pterodactyl\/yolks:java_16" + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar server.jar", @@ -50,4 +53,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/ftb/egg-ftb-modpacksch-server.json b/game_eggs/minecraft/java/ftb/egg-ftb-modpacksch-server.json index ae3bc611..20d983be 100644 --- a/game_eggs/minecraft/java/ftb/egg-ftb-modpacksch-server.json +++ b/game_eggs/minecraft/java/ftb/egg-ftb-modpacksch-server.json @@ -8,12 +8,15 @@ "name": "FTB-modpacks.ch Server", "author": "runemaster580@gmail.com", "description": "Since the release of the FTB APP, FTB modpacks are now distributed through modpacks.ch. This egg was developed for support for modpacks that are distributed through this.", - "features": null, + "features": [ + "eula", + "java_version" + ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_8", "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_14", - "ghcr.io\/pterodactyl\/yolks:java_16" + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar forge-server.jar", @@ -68,4 +71,4 @@ "rules": "nullable|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/krypton/egg-krypton.json b/game_eggs/minecraft/java/krypton/egg-krypton.json index 9f5530d0..258262fd 100644 --- a/game_eggs/minecraft/java/krypton/egg-krypton.json +++ b/game_eggs/minecraft/java/krypton/egg-krypton.json @@ -8,10 +8,16 @@ "name": "Krypton", "author": "callum.seabrook@prevarinite.com", "description": "A fast, lightweight Minecraft server written in Kotlin", - "features": null, + "features": [ + "eula", + "java_version" +], "images": [ - "ghcr.io/pterodactyl/yolks:java_16" - ], + "ghcr.io\/pterodactyl\/yolks:java_8", + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" +], "file_denylist": "", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JAR}}", "config": { diff --git a/game_eggs/minecraft/java/magma/egg-magma.json b/game_eggs/minecraft/java/magma/egg-magma.json index 79ba9949..879f7eec 100644 --- a/game_eggs/minecraft/java/magma/egg-magma.json +++ b/game_eggs/minecraft/java/magma/egg-magma.json @@ -8,12 +8,15 @@ "name": "Magma", "author": "support@pterodactyl.io", "description": "Magma is most powerful Forge server providing you with Forge mods and Bukkit Plugins using Spigot and Paper for Performance Optimization and Stability.", - "features": null, + "features": [ + "eula", + "java_version" + ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_8", "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_14", - "ghcr.io\/pterodactyl\/yolks:java_16" + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", @@ -50,4 +53,4 @@ "rules": "nullable|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/mohist/egg-mohist.json b/game_eggs/minecraft/java/mohist/egg-mohist.json index d52b6dc0..d2f5c960 100644 --- a/game_eggs/minecraft/java/mohist/egg-mohist.json +++ b/game_eggs/minecraft/java/mohist/egg-mohist.json @@ -8,12 +8,15 @@ "name": "Mohist", "author": "alex.chang-lam@protonmail.com", "description": "Spigot fork with performance optimizations.", - "features": null, + "features": [ + "eula", + "java_version" + ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_8", "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_14", - "ghcr.io\/pterodactyl\/yolks:java_16" + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}} pause", @@ -68,4 +71,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/paper/egg-paper.json b/game_eggs/minecraft/java/paper/egg-paper.json index ecabd8c5..1ad1196a 100644 --- a/game_eggs/minecraft/java/paper/egg-paper.json +++ b/game_eggs/minecraft/java/paper/egg-paper.json @@ -9,13 +9,14 @@ "author": "parker@pterodactyl.io", "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", "features": [ - "eula" + "eula", + "java_version" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_8", "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_14", - "ghcr.io\/pterodactyl\/yolks:java_16" + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", @@ -70,4 +71,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/purpur/egg-purpur.json b/game_eggs/minecraft/java/purpur/egg-purpur.json index ff5ef25e..a99db5a0 100644 --- a/game_eggs/minecraft/java/purpur/egg-purpur.json +++ b/game_eggs/minecraft/java/purpur/egg-purpur.json @@ -9,12 +9,14 @@ "author": "purpur@birdflop.com", "description": "Fork of Paper and Tuinity providing new configuration options.", "features": [ - "eula" + "eula", + "java_version" ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_8", "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_8" + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", @@ -60,4 +62,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/spigot/egg-spigot.json b/game_eggs/minecraft/java/spigot/egg-spigot.json index 2b77191f..54474b96 100644 --- a/game_eggs/minecraft/java/spigot/egg-spigot.json +++ b/game_eggs/minecraft/java/spigot/egg-spigot.json @@ -9,12 +9,14 @@ "author": "support@pterodactyl.io", "description": "Spigot is the most widely-used modded Minecraft server software in the world. It powers many of the top Minecraft server networks around to ensure they can cope with their huge player base and ensure the satisfaction of their players. Spigot works by reducing and eliminating many causes of lag, as well as adding in handy features and settings that help make your job of server administration easier.", "features": [ - "eula" + "eula", + "java_version" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_8", "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_16" + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", @@ -60,4 +62,4 @@ "rules": "required|string|between:3,7" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/spongeforge/egg-sponge-forge.json b/game_eggs/minecraft/java/spongeforge/egg-sponge-forge.json index 8628c2ae..8924dba4 100644 --- a/game_eggs/minecraft/java/spongeforge/egg-sponge-forge.json +++ b/game_eggs/minecraft/java/spongeforge/egg-sponge-forge.json @@ -9,13 +9,14 @@ "author": "parker@parkervcp.com", "description": "A community-driven open source Minecraft: Java Edition modding platform.", "features": [ - "eula" + "eula", + "java_version" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_8", "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_14", - "ghcr.io\/pterodactyl\/yolks:java_16" + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", @@ -52,4 +53,4 @@ "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/spongevanilla/egg-sponge-vanilla.json b/game_eggs/minecraft/java/spongevanilla/egg-sponge-vanilla.json index f490fd4a..8729d985 100644 --- a/game_eggs/minecraft/java/spongevanilla/egg-sponge-vanilla.json +++ b/game_eggs/minecraft/java/spongevanilla/egg-sponge-vanilla.json @@ -9,13 +9,14 @@ "author": "parker@parkervcp.com", "description": "SpongeVanilla is the implementation of the Sponge API on top of Vanilla Minecraft.", "features": [ - "eula" + "eula", + "java_version" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_8", "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_14", - "ghcr.io\/pterodactyl\/yolks:java_16" + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", @@ -52,4 +53,4 @@ "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/technic/Tekkit/egg-tekkit.json b/game_eggs/minecraft/java/technic/Tekkit/egg-tekkit.json index 04db594d..e0d122d2 100644 --- a/game_eggs/minecraft/java/technic/Tekkit/egg-tekkit.json +++ b/game_eggs/minecraft/java/technic/Tekkit/egg-tekkit.json @@ -8,9 +8,15 @@ "name": "Tekkit", "author": "contact@zennodes.dk", "description": "Tekkit is set to reignite the same sort of wonder and awe that we all received from booting up Minecraft for the first time. With the skies open, the moon ready to be colonized (by force if need be) and dimensional mysteries to be plied, with tesseracts to be networked, \u201cmeat\u201d to be processed, items to be digitized, and power suits to be manufactured, there is virtually limitless engineering projects to be assembled.", - "features": null, + "features": [ + "eula", + "java_version" + ], "images": [ - "quay.io\/pterodactyl\/core:java" + "ghcr.io\/pterodactyl\/yolks:java_8", + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar Tekkit.jar", diff --git a/game_eggs/minecraft/java/technic/tekkit-classic/egg-tekkit-classic.json b/game_eggs/minecraft/java/technic/tekkit-classic/egg-tekkit-classic.json index abce0996..d7f332be 100644 --- a/game_eggs/minecraft/java/technic/tekkit-classic/egg-tekkit-classic.json +++ b/game_eggs/minecraft/java/technic/tekkit-classic/egg-tekkit-classic.json @@ -8,9 +8,15 @@ "name": "Tekkit Classic", "author": "geoffrey@remedygaming.net", "description": "Created by the Technic team, Tekkit Classic is a modpack for the record breaking sandbox construction game Minecraft. \r\nIt brings together some of the best mods from the Minecraft community for automating, industrializing and powering your worlds and bundles them into one easy download!", - "features": null, + "features": [ + "eula", + "java_version" + ], "images": [ - "quay.io\/pterodactyl\/core:java" + "ghcr.io\/pterodactyl\/yolks:java_8", + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar Tekkit.jar", diff --git a/game_eggs/minecraft/java/tuinity/egg-tuinity.json b/game_eggs/minecraft/java/tuinity/egg-tuinity.json index a598264b..866f95a6 100644 --- a/game_eggs/minecraft/java/tuinity/egg-tuinity.json +++ b/game_eggs/minecraft/java/tuinity/egg-tuinity.json @@ -9,13 +9,14 @@ "author": "unknown@unknown.com", "description": "Fork of Paper aimed at improving server performance at high playercounts.", "features": [ - "eula" + "eula", + "java_version" ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_11", "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_14", - "ghcr.io\/pterodactyl\/yolks:java_16" + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", @@ -43,4 +44,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/vanillacord/egg-vanilla-cord.json b/game_eggs/minecraft/java/vanillacord/egg-vanilla-cord.json index ff17d0b5..eb2ce8b1 100644 --- a/game_eggs/minecraft/java/vanillacord/egg-vanilla-cord.json +++ b/game_eggs/minecraft/java/vanillacord/egg-vanilla-cord.json @@ -9,13 +9,14 @@ "author": "support@pterodactyl.io", "description": "Minecraft is a game about placing blocks and going on adventures. Explore randomly generated worlds and build amazing things from the simplest of homes to the grandest of castles. Play in Creative Mode with unlimited resources or mine deep in Survival Mode, crafting weapons and armor to fend off dangerous mobs. Do all this alone or with friends.\r\n\r\nVanillaCord adds support for BungeeCord's ip_forward setting.", "features": [ - "eula" + "eula", + "java_version" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_8", "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_14", - "ghcr.io\/pterodactyl\/yolks:java_16" + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", @@ -52,4 +53,4 @@ "rules": "required|string|between:3,15" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json b/game_eggs/minecraft/proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json index b376474c..2825f7db 100644 --- a/game_eggs/minecraft/proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json +++ b/game_eggs/minecraft/proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json @@ -8,11 +8,15 @@ "name": "Waterdog PE", "author": "parker@pterodactyl.io", "description": "Brand new proxy server for Minecraft: Bedrock Edition", - "features": null, + "features": [ + "eula", + "java_version" + ], "images": [ + "ghcr.io\/pterodactyl\/yolks:java_8", "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_14", - "ghcr.io\/pterodactyl\/yolks:java_16" + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Dterminal.ansi=true -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", diff --git a/game_eggs/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json b/game_eggs/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json index 5bbadf7e..119629cc 100644 --- a/game_eggs/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json +++ b/game_eggs/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json @@ -8,12 +8,15 @@ "name": "Waterdog", "author": "parker@pterodactyl.io", "description": "Waterdog is fork of the well-known Waterfall, which is a fork of the well-known BungeeCord, server teleportation suite.", - "features": null, + "features": [ + "eula", + "java_version" + ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_8", "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_14", - "ghcr.io\/pterodactyl\/yolks:java_16" + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", @@ -50,4 +53,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json b/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json index 5ca1e67e..8e0e431b 100644 --- a/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json +++ b/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json @@ -8,12 +8,15 @@ "name": "Flamecord", "author": "admin@softwarenoob.com", "description": "FlameCord is a patch for Travertine to fix possible exploits and add useful functionalities. FlameCord aims to fix Netty related exploits to keep your server safe from attacks.", - "features": null, + "features": [ + "eula", + "java_version" + ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_11", "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_14", - "ghcr.io\/pterodactyl\/yolks:java_16" + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", @@ -50,4 +53,4 @@ "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/proxy/java/travertine/egg-travertine.json b/game_eggs/minecraft/proxy/java/travertine/egg-travertine.json index 47246c2c..e2e7a1f2 100644 --- a/game_eggs/minecraft/proxy/java/travertine/egg-travertine.json +++ b/game_eggs/minecraft/proxy/java/travertine/egg-travertine.json @@ -8,12 +8,15 @@ "name": "Travertine", "author": "parker@parkervcp.com", "description": "Travertine is a fork of Waterfall with 1.7 protocol support. Waterfall is a fork of the well-known BungeeCord server teleportation suite.", - "features": null, + "features": [ + "eula", + "java_version" + ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_11", "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_14", - "ghcr.io\/pterodactyl\/yolks:java_16" + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", @@ -68,4 +71,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json b/game_eggs/minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json index e19feef8..5695c710 100644 --- a/game_eggs/minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json +++ b/game_eggs/minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json @@ -1,13 +1,18 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-06-20T11:37:02-04:00", + "exported_at": "2021-11-25T23:59:39+00:00", "name": "TyphoonLimbo", "author": "parker@parkervcp.com", "description": "Lightweight minecraft limbo server", - "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", + "features": null, + "images": [ + "ghcr.io\/parkervcp\/yolks:debian" + ], + "file_denylist": [], "startup": "`sleep 2 && .\/TyphoonLimbo`", "config": { "files": "{\r\n \"config.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"listen_address\": \":{{server.build.default.port}}\"\r\n }\r\n }\r\n}", @@ -23,4 +28,4 @@ } }, "variables": [] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json b/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json index 5f9234d1..661ac6e6 100644 --- a/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json +++ b/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json @@ -8,13 +8,15 @@ "name": "Velocity", "author": "parker@parkervcp.com", "description": "Velocity is a Minecraft server proxy with unparalleled server support, scalability, and flexibility.", - "features": null, + "features": [ + "eula", + "java_version" + ], "images": [ - "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-15-hotspot", "ghcr.io\/pterodactyl\/yolks:java_8", "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_14", - "ghcr.io\/pterodactyl\/yolks:java_16" + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -XX:MaxInlineLevel=15 -jar {{SERVER_JARFILE}}", @@ -51,4 +53,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json b/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json index 48095697..976deac7 100644 --- a/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json +++ b/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json @@ -8,10 +8,15 @@ "name": "VIAaaS", "author": "regulad@outlook.com", "description": "VIAaaS - ViaVersion as a Service - Standalone ViaVersion proxy", - "features": null, + "features": [ + "eula", + "java_version" + ], "images": [ + "ghcr.io\/pterodactyl\/yolks:java_17", "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_17" + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_8" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}} -sslPort={{WEBSERVER_PORT}}", diff --git a/game_eggs/minecraft/proxy/java/waterfall/egg-waterfall.json b/game_eggs/minecraft/proxy/java/waterfall/egg-waterfall.json index 059ece4c..94597a3d 100644 --- a/game_eggs/minecraft/proxy/java/waterfall/egg-waterfall.json +++ b/game_eggs/minecraft/proxy/java/waterfall/egg-waterfall.json @@ -8,12 +8,15 @@ "name": "Waterfall", "author": "hostmaster@waterfallgaming.net", "description": "Waterfall is a fork of the well-known BungeeCord server teleportation suite.", - "features": null, + "features": [ + "eula", + "java_version" + ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_11", "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_14", - "ghcr.io\/pterodactyl\/yolks:java_16" + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", @@ -68,4 +71,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From 3f69481372742a9a5497068f89c334ec946445a7 Mon Sep 17 00:00:00 2001 From: VibeGAMESNL <66668585+VibeGAMESNL@users.noreply.github.com> Date: Sat, 27 Nov 2021 02:34:05 +0100 Subject: [PATCH 0091/1001] Fix Rust RCON connection RCON IP address has to be 0.0.0.0, else the rcon connection can't be established using the default pterodactyl networking. --- .../rust/rust_autowipe/egg-rust-autowipe.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json b/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json index 2aed7dd3..0e2e2f9d 100644 --- a/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json +++ b/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json @@ -13,7 +13,7 @@ "quay.io\/pterodactyl\/core:rust" ], "file_denylist": [], - "startup": "\".\/RustDedicated -batchmode +server.port {{SERVER_PORT}} +server.identity \"rust\" +rcon.port {{RCON_PORT}} +rcon.web true +server.hostname \\\"{{HOSTNAME}}\\\" +server.level \\\"{{LEVEL}}\\\" +server.description \\\"{{DESCRIPTION}}\\\" +server.url \\\"{{SERVER_URL}}\\\" +server.headerimage \\\"{{SERVER_IMG}}\\\" +server.worldsize \\\"{{WORLD_SIZE}}\\\" +server.seed \\\"$( if [ -f seed.txt ] && [[ ${WORLD_SEED} == \"0\" ]]; then printf %s $(cat seed.txt); else printf %s '${WORLD_SEED}'; fi )\\\" +server.maxplayers {{MAX_PLAYERS}} +rcon.password \\\"{{RCON_PASS}}\\\" +server.saveinterval {{SAVEINTERVAL}} {{ADDITIONAL_ARGS}}\"", + "startup": "\".\/RustDedicated -batchmode +server.port {{SERVER_PORT}} +server.identity \"rust\" +rcon.ip 0.0.0.0 +rcon.port {{RCON_PORT}} +rcon.web true +server.hostname \\\"{{HOSTNAME}}\\\" +server.level \\\"{{LEVEL}}\\\" +server.description \\\"{{DESCRIPTION}}\\\" +server.url \\\"{{SERVER_URL}}\\\" +server.headerimage \\\"{{SERVER_IMG}}\\\" +server.worldsize \\\"{{WORLD_SIZE}}\\\" +server.seed \\\"$( if [ -f seed.txt ] && [[ ${WORLD_SEED} == \"0\" ]]; then printf %s $(cat seed.txt); else printf %s '${WORLD_SEED}'; fi )\\\" +server.maxplayers {{MAX_PLAYERS}} +rcon.password \\\"{{RCON_PASS}}\\\" +server.saveinterval {{SAVEINTERVAL}} {{ADDITIONAL_ARGS}}\"", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Server startup complete\"\r\n}", @@ -164,4 +164,4 @@ "rules": "required|string" } ] -} \ No newline at end of file +} From 701838ddca82fc35aaac4e981082fa7edb920199 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Sat, 27 Nov 2021 05:38:52 +0200 Subject: [PATCH 0092/1001] fix(spigot): regex versions for buildtools java 8, 16, 17 Fixes minor version detection for Spigot buildtools and adds Java 17 support for 1.18+ --- game_eggs/minecraft/java/spigot/egg-spigot.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/minecraft/java/spigot/egg-spigot.json b/game_eggs/minecraft/java/spigot/egg-spigot.json index 54474b96..6b71dbc5 100644 --- a/game_eggs/minecraft/java/spigot/egg-spigot.json +++ b/game_eggs/minecraft/java/spigot/egg-spigot.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-10-05T15:36:31-04:00", + "exported_at": "2021-11-27T03:38:30+00:00", "name": "Spigot", "author": "support@pterodactyl.io", "description": "Spigot is the most widely-used modded Minecraft server software in the world. It powers many of the top Minecraft server networks around to ensure they can cope with their huge player base and ensure the satisfaction of their players. Spigot works by reducing and eliminating many causes of lag, as well as adding in handy features and settings that help make your job of server administration easier.", @@ -28,7 +28,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl wget git openssl apt-transport-https gnupg software-properties-common\r\nwget -qO - https:\/\/adoptopenjdk.jfrog.io\/adoptopenjdk\/api\/gpg\/key\/public | apt-key add -\r\nadd-apt-repository --yes https:\/\/adoptopenjdk.jfrog.io\/adoptopenjdk\/deb\/\r\napt update\r\n\r\nmkdir -p \/usr\/share\/man\/man1\r\n\r\nif [[ $DL_VERSION == *\"1.17.\"* || $DL_VERSION == *\"1.18.\"* || $DL_VERSION == *\"1.19.\"* || $DL_VERSION == \"latest\" ]]; then\r\n apt install -y adoptopenjdk-16-hotspot\r\nelse\r\n apt install -y adoptopenjdk-8-hotspot\r\nfi\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n cd \/mnt\/server\r\n MODIFIED_DOWNLOAD=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\n curl -sSL -o ${SERVER_JARFILE} ${MODIFIED_DOWNLOAD}\r\nelse\r\n mkdir -p \/srv\/\r\n cd \/srv\/\r\n wget https:\/\/hub.spigotmc.org\/jenkins\/job\/BuildTools\/lastSuccessfulBuild\/artifact\/target\/BuildTools.jar\r\n java -Xms${SERVER_MEMORY}M -jar BuildTools.jar --rev ${DL_VERSION}\r\n mv spigot-*.jar \/mnt\/server\/${SERVER_JARFILE}\r\nfi", + "script": "#!\/bin\/bash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl wget git openssl apt-transport-https gnupg software-properties-common\r\nwget -qO - https:\/\/adoptopenjdk.jfrog.io\/adoptopenjdk\/api\/gpg\/key\/public | apt-key add -\r\nadd-apt-repository --yes https:\/\/adoptopenjdk.jfrog.io\/adoptopenjdk\/deb\/\r\napt update\r\n\r\nmkdir -p \/usr\/share\/man\/man1\r\n\r\nif [[ $DL_VERSION =~ ^1\\.(18|19|20|21|22) || $DL_VERSION == \"latest\" ]]; then\r\n apt install -y adoptopenjdk-17-hotspot\r\nelif [[ $DL_VERSION =~ ^1\\.(17) ]]; then\r\n apt install -y adoptopenjdk-16-hotspot\r\nelse\r\n apt install -y adoptopenjdk-8-hotspot\r\nfi\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n cd \/mnt\/server\r\n MODIFIED_DOWNLOAD=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\n curl -sSL -o ${SERVER_JARFILE} ${MODIFIED_DOWNLOAD}\r\nelse\r\n mkdir -p \/srv\/\r\n cd \/srv\/\r\n wget https:\/\/hub.spigotmc.org\/jenkins\/job\/BuildTools\/lastSuccessfulBuild\/artifact\/target\/BuildTools.jar\r\n java -Xms${SERVER_MEMORY}M -jar BuildTools.jar --rev ${DL_VERSION}\r\n mv spigot-*.jar \/mnt\/server\/${SERVER_JARFILE}\r\nfi", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -62,4 +62,4 @@ "rules": "required|string|between:3,7" } ] -} +} \ No newline at end of file From 2c94c458e8d070ffc8d2dceb6a73e84db78b338c Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Sat, 27 Nov 2021 07:16:24 +0200 Subject: [PATCH 0093/1001] refactor(spigot) Proper support for all versions add support for Spigot 1.18 - 1.23 including snapshots that should future proof it change install image and remove packages from installation since our install image contains them all add troubleshooting steps and messages should install fail use temurin Java images for building since adoptopenjdk is deprecated and doesn't have 17 overwrite used memory for building to 1024 if less than 1024 is used . Wings allocates minimum of 1024MB memory, however, it's not enough to build 1.17+ --- game_eggs/minecraft/java/spigot/egg-spigot.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/game_eggs/minecraft/java/spigot/egg-spigot.json b/game_eggs/minecraft/java/spigot/egg-spigot.json index 6b71dbc5..76ce9ba7 100644 --- a/game_eggs/minecraft/java/spigot/egg-spigot.json +++ b/game_eggs/minecraft/java/spigot/egg-spigot.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-11-27T03:38:30+00:00", + "exported_at": "2021-11-27T05:14:42+00:00", "name": "Spigot", "author": "support@pterodactyl.io", "description": "Spigot is the most widely-used modded Minecraft server software in the world. It powers many of the top Minecraft server networks around to ensure they can cope with their huge player base and ensure the satisfaction of their players. Spigot works by reducing and eliminating many causes of lag, as well as adding in handy features and settings that help make your job of server administration easier.", @@ -28,8 +28,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl wget git openssl apt-transport-https gnupg software-properties-common\r\nwget -qO - https:\/\/adoptopenjdk.jfrog.io\/adoptopenjdk\/api\/gpg\/key\/public | apt-key add -\r\nadd-apt-repository --yes https:\/\/adoptopenjdk.jfrog.io\/adoptopenjdk\/deb\/\r\napt update\r\n\r\nmkdir -p \/usr\/share\/man\/man1\r\n\r\nif [[ $DL_VERSION =~ ^1\\.(18|19|20|21|22) || $DL_VERSION == \"latest\" ]]; then\r\n apt install -y adoptopenjdk-17-hotspot\r\nelif [[ $DL_VERSION =~ ^1\\.(17) ]]; then\r\n apt install -y adoptopenjdk-16-hotspot\r\nelse\r\n apt install -y adoptopenjdk-8-hotspot\r\nfi\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n cd \/mnt\/server\r\n MODIFIED_DOWNLOAD=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\n curl -sSL -o ${SERVER_JARFILE} ${MODIFIED_DOWNLOAD}\r\nelse\r\n mkdir -p \/srv\/\r\n cd \/srv\/\r\n wget https:\/\/hub.spigotmc.org\/jenkins\/job\/BuildTools\/lastSuccessfulBuild\/artifact\/target\/BuildTools.jar\r\n java -Xms${SERVER_MEMORY}M -jar BuildTools.jar --rev ${DL_VERSION}\r\n mv spigot-*.jar \/mnt\/server\/${SERVER_JARFILE}\r\nfi", - "container": "debian:buster-slim", + "script": "#!\/bin\/bash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\nmkdir -p \/usr\/share\/man\/man1\r\n\r\nfunction install_java() {\r\n curl -L $1 -o java.tar.gz\r\n tar xzf java.tar.gz\r\n export PATH=$PWD\/$2\/bin:$PATH\r\n java -version\r\n}\r\n\r\nfunction build_spigot()\r\n{\r\n java -Xms$1M -jar BuildTools.jar --rev ${DL_VERSION} || { echo -e \"\\n install failed! Attempted to install ${DL_VERSION} with memory of ${SERVER_MEMORY} and Java version of:\"; java -version; exit 1; }\r\n}\r\n\r\n# Detect the required Java version for building Spigot. Currently temurin only provides archives of their releases, and adoptopenjdk is deprecated. Update this when packages are released.\r\nif [[ $DL_VERSION =~ ^1\\.(18|19|20|21|22|23) || $DL_VERSION == \"latest\" ]]; then\r\n install_java \"https:\/\/github.com\/adoptium\/temurin17-binaries\/releases\/download\/jdk-17.0.1%2B12\/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz\" jdk-17.0.1+12\r\nelif [[ $DL_VERSION =~ ^1\\.(17) ]]; then\r\n install_java \"https:\/\/github.com\/adoptium\/temurin16-binaries\/releases\/download\/jdk-16.0.2%2B7\/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz\" jdk-16.0.2+7\r\nelse\r\n install_java \"https:\/\/github.com\/adoptium\/temurin8-binaries\/releases\/download\/jdk8u312-b07\/OpenJDK8U-jdk_x64_linux_hotspot_8u312b07.tar.gz\" jdk8u312-b07\r\nfi\r\n\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n cd \/mnt\/server\r\n MODIFIED_DOWNLOAD=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\n echo -e \"Using custom provided download link ${MODIFIED_DOWNLOAD}\"\r\n curl -L ${MODIFIED_DOWNLOAD} -o ${SERVER_JARFILE}\r\nelse\r\n mkdir -p \/srv\/\r\n cd \/srv\/\r\n curl -L https:\/\/hub.spigotmc.org\/jenkins\/job\/BuildTools\/lastSuccessfulBuild\/artifact\/target\/BuildTools.jar -o BuildTools.jar\r\n\r\n # Force the minimum Wings install container memory should someone provide less or 0 as it will break the Java build process\r\n if [ $SERVER_MEMORY -lt 1024 ]; then\r\n echo -e \"Do not use 0 for memory with Java applications. Defaulting to 1024MB.\\n WARNING! 1024MB might not be enough to build 1.17+ releases.\"\r\n SERVER_MEMORY=1024\r\n build_spigot ${SERVER_MEMORY}\r\n else\r\n build_spigot ${SERVER_MEMORY}\r\n fi\r\n mv spigot-*.jar \/mnt\/server\/${SERVER_JARFILE}\r\nfi", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, @@ -54,12 +54,12 @@ }, { "name": "Spigot Version", - "description": "The version of Spigot to download (using the --rev tag). Use \"latest\" for latest.", + "description": "The version of Spigot to download (using the --rev tag from https:\/\/hub.spigotmc.org\/versions). Use \"latest\" for latest.", "env_variable": "DL_VERSION", "default_value": "latest", "user_viewable": true, "user_editable": true, - "rules": "required|string|between:3,7" + "rules": "required|string|between:3,10" } ] } \ No newline at end of file From f550c7c2dcd4bad03760cd47e6386982bf012692 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 27 Nov 2021 07:28:42 +0100 Subject: [PATCH 0094/1001] chore: update steamcmd example script Co-authored-by: Alex --- scripts/steamcmd_installer.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/steamcmd_installer.sh b/scripts/steamcmd_installer.sh index 7035e145..499c5cfd 100644 --- a/scripts/steamcmd_installer.sh +++ b/scripts/steamcmd_installer.sh @@ -2,7 +2,7 @@ # steamcmd Base Installation Script # # Server Files: /mnt/server -# Image to install with is 'debian:buster-slim' +# Image to install with is 'ghcr.io/parkervcp/installers:debian' ## # @@ -15,7 +15,7 @@ ## apt -y update -apt -y --no-install-recommends install curl lib32gcc1 ca-certificates +apt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates ## just in case someone removed the defaults. if [[ "${STEAM_USER}" == "" ]] || [[ "${STEAM_PASS}" == "" ]]; then @@ -42,7 +42,7 @@ chown -R root:root /mnt export HOME=/mnt/server ## install game using steamcmd -./steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir /mnt/server +app_update ${SRCDS_APPID} ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6 +./steamcmd.sh +force_install_dir /mnt/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6 ## set up 32 bit libraries mkdir -p /mnt/server/.steam/sdk32 From f70e200f6301828092c79e1216dbcf45606b7193 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Mon, 29 Nov 2021 18:39:21 -0800 Subject: [PATCH 0095/1001] [JMusicBot] QoL Update & Fixes Egg: - Updated image to use new yolks Java image. - Removed unused `-Djavax.accessibility.assistive_technologies=" "` flag from startup command. - Updated and added as many Startup Variables as possible for basic/common settings in the `config.txt` file. - Updated the install script to (1.) have more verbose/clear logging, (2.) update old `config.txt` files with newer versions (while retaining the old one for posterity at `config.txt-old`), and (3.) moving the `example_playlist.txt` file to the correct directory. `config.txt` File: - Updated to the latest version. `playlist.txt` File: - Renamed to `example_playlist.txt`. - Updated in general to match Wiki's example. Readme: - Added authors - Added a better bot description. - Improved "Configuration" section. - Added "Updating" section. --- bots/discord/jmusicbot/README.md | 83 ++++++++++++++-- bots/discord/jmusicbot/config.txt | 12 ++- bots/discord/jmusicbot/egg-j-music-bot.json | 102 +++++++++++++++++--- bots/discord/jmusicbot/example_playlist.txt | 21 ++++ bots/discord/jmusicbot/playlist.txt | 31 ------ 5 files changed, 193 insertions(+), 56 deletions(-) create mode 100644 bots/discord/jmusicbot/example_playlist.txt delete mode 100644 bots/discord/jmusicbot/playlist.txt diff --git a/bots/discord/jmusicbot/README.md b/bots/discord/jmusicbot/README.md index aabb1bb9..addeb37b 100644 --- a/bots/discord/jmusicbot/README.md +++ b/bots/discord/jmusicbot/README.md @@ -1,10 +1,81 @@ # JMusicBot -### Their [Github](https://github.com/jagrosh/MusicBot) -A Discord music bot that's easy to set up and run yourself! +___ +### Authors / Contributors + + + + + + + + + + +
+ +
John Grosh + +
+ 💻 + 🤖 + 		+ +
parkervcp + +
+ 💻 + 🥚 + 		+ +
Software-Noob + +
+ 💻 + 💡 + 		+ +
Proxymiity + +
+ 💻 + 💡 + 		+ +
Red-Thirten + +
+ 💻 + 💡 +
+ + -### Config - -Edit the startup variables before starting the bot, otherwise it will fail to start +___ +### Bot Description & Features +From the developer's [Github](https://github.com/jagrosh/MusicBot): +> A Discord music bot that's easy to set up and run yourself! +- Easy to run +- Fast loading of songs +- No external keys needed (besides a Discord Bot token) +- Smooth playback +- Server-specific setup for the "DJ" role that can moderate the music +- Clean and beautiful menus +- Supports many sites, including YouTube, Soundcloud, and more +- Supports many online radio/streams +- Supports local files +- Playlist support (both web/youtube, and local) +___ +### Configuration +- If you can, edit the Startup Variables before starting the bot, because otherwise it will fail to start. +- Most settings found in `config.txt` can be edited via the Startup Variables. Advanced settings not listed can still be edited manually via the File Manager. Available Startup Variables will take precedent over manual edits. +___ ### Server Ports -There are no ports required for JMusicBot \ No newline at end of file +There are no ports required for JMusicBot. +___ +### Updating +Re-Installing the server via the panel will do the following: + +1. Update the bot to the latest version. +2. Update the `config.txt` file to the latest version, and place the old one at `config.txt-old`. +3. Any local songs will remain and not be touched. \ No newline at end of file diff --git a/bots/discord/jmusicbot/config.txt b/bots/discord/jmusicbot/config.txt index 60e0c9cf..7ef90ec6 100644 --- a/bots/discord/jmusicbot/config.txt +++ b/bots/discord/jmusicbot/config.txt @@ -27,7 +27,6 @@ owner = 0 // The prefix is used to control the commands // If you use !!, the play command will be !!play // If you do not set this, the prefix will be a mention of the bot (@Botname play) -// If you make this blank, the bot will not use a prefix prefix = "@mention" @@ -52,7 +51,7 @@ status = ONLINE // "Playing" status. Note that this will ONLY work if the bot is playing music on ONE guild; // if the bot is playing on multiple guilds, this will not work. -songinstatus=false +songinstatus = false // If you set this, the bot will also use this prefix in addition to @@ -98,6 +97,11 @@ stayinchannel = false maxtime = 0 +// This sets the amount of seconds the bot will stay alone on a voice channel until it +// automatically leaves the voice channel and clears the queue. If not set or set +// to any number less than or equal to zero, the bot won't leave when alone. + +alonetimeuntilstop = 0 // This sets an alternative folder to be used as the Playlists folder // This can be a relative or absolute path @@ -108,11 +112,11 @@ playlistsfolder = "Playlists" // By default, the bot will DM the owner if the bot is running and a new version of the bot // becomes available. Set this to false to disable this feature. -updatealerts=true +updatealerts = true // Changing this changes the lyrics provider -// Currently available providers: "A-Z Lyrics", "Genius", "MusicMatch" +// Currently available providers: "A-Z Lyrics", "Genius", "MusicMatch", "LyricsFreak" // At the time of writing, I would recommend sticking with A-Z Lyrics or MusicMatch, // as Genius tends to have a lot of non-song results and you might get something // completely unrelated to what you want. diff --git a/bots/discord/jmusicbot/egg-j-music-bot.json b/bots/discord/jmusicbot/egg-j-music-bot.json index 83cce79d..f44f601e 100644 --- a/bots/discord/jmusicbot/egg-j-music-bot.json +++ b/bots/discord/jmusicbot/egg-j-music-bot.json @@ -1,58 +1,130 @@ { - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "_comment": "Pterodactyl JMusicBot Egg ~ parkervcp, Software-Noob, Proxymiity, and Red-Thirten ~ 2021-11-29", "meta": { "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-01-29T22:41:09+02:00", "name": "JMusicBot", "author": "parker@parkervcp.com", "description": "A Discord music bot that's easy to set up and run yourself!", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-8-jre" + "ghcr.io\/parkervcp\/yolks:java_8" ], - "startup": "java -Djavax.accessibility.assistive_technologies=\" \" -Dnogui=true -jar JMusicBot.jar", + "file_denylist": [], + "startup": "java -Dnogui=true -jar JMusicBot.jar", "config": { - "files": "{\r\n \"config.txt\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"token =\": \"token = \\\"{{env.BOT_TOKEN}}\\\"\",\r\n \"prefix =\": \"prefix = \\\"{{env.BOT_PREFIX}}\\\"\",\r\n \"owner =\": \"owner = \\\"{{env.BOT_OWNER}}\\\"\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"config.txt\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"token =\": \"token = \\\"{{server.build.env.BOT_TOKEN}}\\\"\",\r\n \"owner =\": \"owner = {{server.build.env.BOT_OWNER}}\",\r\n \"prefix =\": \"prefix = \\\"{{server.build.env.BOT_PREFIX}}\\\"\",\r\n \"game =\": \"game = \\\"{{server.build.env.BOT_GAME}}\\\"\",\r\n \"status =\": \"status = {{server.build.env.BOT_STATUS}}\",\r\n \"songinstatus =\": \"songinstatus = {{server.build.env.BOT_SONG_STATUS}}\",\r\n \"altprefix =\": \"altprefix = \\\"{{server.build.env.BOT_ALT_PREFIX}}\\\"\",\r\n \"npimages =\": \"npimages = {{server.build.env.BOT_NPIMAGES}}\",\r\n \"stayinchannel =\": \"stayinchannel = {{server.build.env.BOT_STAY_IN_CHANNEL}}\",\r\n \"maxtime =\": \"maxtime = {{server.build.env.BOT_MAXTIME}}\",\r\n \"alonetimeuntilstop =\": \"alonetimeuntilstop = {{server.build.env.BOT_ALONE_TIME}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Finished Loading\"\r\n}", "logs": "{}", "stop": "^C" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n## this is a simple script to use the github API for release versions.\r\n## this requires the egg has a variable for GITHUB_PACKAGE and VERSION\r\n## this supports using oauth\/personal access tokens via GITHUB_USER and GITHUB_OAUTH_TOKEN (both are required.)\r\n## if you are getting hit with GitHub API limit issues then you need to have the user and token set.\r\n\r\napt update\r\napt install -y jq curl\r\n\r\nGITHUB_PACKAGE=\"jagrosh\/MusicBot\"\r\nCONFIG_LINK=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/bots\/discord\/jmusicbot\/config.txt\"\r\nPLAYLIST_LINK=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/bots\/discord\/jmusicbot\/playlist.txt\"\r\n\r\nif [ -z \"${GITHUB_USER}\" ] && [ -z \"${GITHUB_OAUTH_TOKEN}\" ] ; then\r\n echo -e \"no github user set, 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)\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 config)\r\n else\r\n echo -e \"defaulting to the latest release\"\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\n[ ! -d \/mnt\/server ] && mkdir \/mnt\/server\r\n\r\ncd \/mnt\/server\r\n\r\nif [ -f JMusicBot.jar ]; then\r\n mv -f JMusicBot.jar JMusicBot.jar-old\r\nfi\r\n\r\ncurl -Lo JMusicBot.jar ${DOWNLOAD_LINK}\r\n\r\nif [ -f config.txt ]; then\r\n echo -e \"config already exists\"\r\nelse\r\n echo -e \"config not found, downloading default config\"\r\n curl -Lo config.txt ${CONFIG_LINK}\r\nfi\r\n\r\nif [ -f playlist.txt ]; then\r\n echo -e \"playlist already exists\"\r\nelse\r\n echo -e \"playlist not found, downloading default playlist\"\r\n curl -Lo playlist.txt ${PLAYLIST_LINK}\r\nfi\r\n\r\necho \"Job's Done\"", + "script": "#!\/bin\/bash\r\n## this is a simple script to use the github API for release versions.\r\n## this requires the egg has a variable for GITHUB_PACKAGE and VERSION\r\n## this supports using oauth\/personal access tokens via GITHUB_USER and GITHUB_OAUTH_TOKEN (both are required.)\r\n## if you are getting hit with GitHub API limit issues then you need to have the user and token set.\r\n\r\napt update\r\napt install -y jq curl\r\n\r\nGITHUB_PACKAGE=\"jagrosh\/MusicBot\"\r\nCONFIG_LINK=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/bots\/discord\/jmusicbot\/config.txt\"\r\nPLAYLIST_LINK=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/bots\/discord\/jmusicbot\/example_playlist.txt\"\r\n\r\nif [ -z \"${GITHUB_USER}\" ] && [ -z \"${GITHUB_OAUTH_TOKEN}\" ] ; then\r\n echo -e \"no github user set, 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)\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 config)\r\n else\r\n echo -e \"defaulting to the latest release\"\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\n## JMusicBot Setup\r\n[ ! -d \/mnt\/server ] && mkdir \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ -f JMusicBot.jar ]; then\r\n echo -e \"Updating JMusicBot.jar to latest version...\"\r\n echo -e '\\t(Old version can be found at \"JMusicBot.jar-old\")'\r\n mv -f JMusicBot.jar JMusicBot.jar-old\r\nfi\r\ncurl -sSLo JMusicBot.jar ${DOWNLOAD_LINK}\r\n\r\nif [ -f config.txt ]; then\r\n echo -e \"Updating config.txt to latest version...\"\r\n echo -e '\\t(Old version can be found at \"config.txt-old\")'\r\n mv -f config.txt config.txt-old\r\nfi\r\ncurl -sSLo config.txt ${CONFIG_LINK}\r\n\r\n[ ! -d Playlists ] && mkdir Playlists\r\ncd Playlists\r\nif [ -f example_playlist.txt ]; then\r\n echo -e \"example_playlist.txt already exists. Skipping default download.\"\r\nelse\r\n echo -e \"example_playlist.txt not found. Downloading default example_playlist...\"\r\n curl -sSLo example_playlist.txt ${PLAYLIST_LINK}\r\nfi\r\n\r\necho -e \"\\nJMusicBot Successfully Installed!\"", "container": "debian:buster-slim", - "entrypoint": "\/bin\/bash" + "entrypoint": "bash" } }, "variables": [ { - "name": "Discord Bot Token", - "description": "The token for your discord bot.\r\n\r\nhttps:\/\/discord.com\/developers\/applications\/", + "name": "[REQUIRED] Discord Bot Token", + "description": "The token for your Discord bot. Learn how to obtain a token and configure your bot application properly here: https:\/\/jmusicbot.com\/getting-a-bot-token\/", "env_variable": "BOT_TOKEN", "default_value": "You need to get a token", "user_viewable": true, "user_editable": true, "rules": "required|string|max:64" }, + { + "name": "[REQUIRED] Bot Owner ID", + "description": "This is the Discord User ID of the bot owner. Learn how to obtain this ID here: https:\/\/jmusicbot.com\/finding-your-user-id\/", + "env_variable": "BOT_OWNER", + "default_value": "Change This To Your Discord User ID", + "user_viewable": true, + "user_editable": true, + "rules": "required|digits:18" + }, { "name": "Bot Prefix", - "description": "The prefix for the bot.\r\n\r\nDefault is to @mention the bot.", + "description": "This sets the prefix for the bot. The prefix is used to control the commands. If you use !, the play command will be !play. If you do not set this, the prefix will be a mention of the bot (@Botname play).", "env_variable": "BOT_PREFIX", "default_value": "@mention", "user_viewable": true, "user_editable": true, + "rules": "nullable|string|max:20" + }, + { + "name": "Bot Alternate Prefix", + "description": "If you set this, the bot will also use this prefix in addition to \"Bot Prefix\". Set to NONE to not have an alternate prefix.", + "env_variable": "BOT_ALT_PREFIX", + "default_value": "NONE", + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" }, { - "name": "Bot Owner ID", - "description": "This is the user ID of the bot owner. It's a long numeric ID, such as 4440512350692326306", - "env_variable": "BOT_OWNER", - "default_value": "Change This To Your Discord User ID", + "name": "Bot Default Game", + "description": "If you change this, it modifies the default game of the bot. Set this to NONE to have no game. Set this to DEFAULT to use the default game. You can make the game \"Playing X\", \"Listening to X\", or \"Watching X\" where X is the title. If you don't include an action, it will use the default of \"Playing\".", + "env_variable": "BOT_GAME", + "default_value": "DEFAULT", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:32" + "rules": "nullable|string|max:20" + }, + { + "name": "Bot Default Status", + "description": "[ Accepted Values: ONLINE IDLE DND INVISIBLE ] Will modify the default status of bot.", + "env_variable": "BOT_STATUS", + "default_value": "ONLINE", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:ONLINE,IDLE,DND,INVISIBLE" + }, + { + "name": "Bot Show Song in Status", + "description": "If you set this to true, the bot will list the title of the song it is currently playing in its \"Playing\" status. NOTE: This will ONLY work if the bot is playing music on ONE Discord server; if the bot is playing in multiple servers, this will not work!", + "env_variable": "BOT_SONG_STATUS", + "default_value": "false", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:true,false" + }, + { + "name": "Bot Show Images for \"Now Playing\"", + "description": "If set to true, the \"nowplaying\" command will show YouTube thumbnails. NOTE: If you set this to true, the nowplaying boxes will NOT refresh. This is because refreshing the boxes causes the image to be reloaded every time it refreshes.", + "env_variable": "BOT_NPIMAGES", + "default_value": "false", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:true,false" + }, + { + "name": "Bot Stay In Channel", + "description": "If set to true, the bot will not leave a voice channel after it finishes a queue. Keep in mind that being connected to a voice channel uses additional bandwidth, so this option is not recommended if bandwidth is a concern.", + "env_variable": "BOT_STAY_IN_CHANNEL", + "default_value": "false", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:true,false" + }, + { + "name": "Bot Alone Time Until Disconnect", + "description": "This sets the amount of seconds the bot will stay alone on a voice channel until it automatically leaves the voice channel and clears the queue. If not set or set to any number less than or equal to zero, the bot won't leave when alone.", + "env_variable": "BOT_ALONE_TIME", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer" + }, + { + "name": "Bot Max Song Length", + "description": "This sets the maximum amount of seconds any track loaded can be. If not set or set to any number less than or equal to zero, there is no maximum time length. This time restriction applies to songs loaded from any source.", + "env_variable": "BOT_MAXTIME", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer" } ] } \ No newline at end of file diff --git a/bots/discord/jmusicbot/example_playlist.txt b/bots/discord/jmusicbot/example_playlist.txt new file mode 100644 index 00000000..226bb714 --- /dev/null +++ b/bots/discord/jmusicbot/example_playlist.txt @@ -0,0 +1,21 @@ +# This is an example playlist +# More information about playlists can be found here: https://jmusicbot.com/playlists/ +# Command to play this playlist: @Botname play playlist example_playlist +# A new playlist can be made by making a new file in this directory called: my_playlist_name.txt + +# The following line currently makes the playlist shuffle +# Remove this line entirely if you don't want shuffling +#shuffle + +# Search Examples: +ytsearch:gorillaz dare audio +scsearch:lights metrognome + +# Direct Link Example: +https://www.youtube.com/watch?v=dQw4w9WgXcQ + +# YouTube Playlist ID Example: +PLUib4KwT0DMJaPgg_nr1ia8FY5JcXksvb + +# Local File Example: +# /home/container/music/mysong.mp3 \ No newline at end of file diff --git a/bots/discord/jmusicbot/playlist.txt b/bots/discord/jmusicbot/playlist.txt deleted file mode 100644 index 86ca97de..00000000 --- a/bots/discord/jmusicbot/playlist.txt +++ /dev/null @@ -1,31 +0,0 @@ -# THIS IS AN EXAMPLE PLAYLIST, EDIT TI TO YOUR OWN REQUIREMENTS -# jagrosh's playlist -# lots of formats are supported, as shown below -# JustSomeBots playlist format is supported as well - -# This next line (the word "shuffle" on a comment line) makes it so that the playlist is always shuffled when loaded. - -# shuffle - - -# examples of searches on youtube -ytsearch:juicy fruit williams -ytsearch:gorillaz dare audio - -# examples of searches on soundcloud -scsearch:lights metrognome - -# examples of specific youtube videos -https://www.youtube.com/watch?v=x7ogV49WGco - -# examples of youtube playlists -PLUib4KwT0DMJaPgg_nr1ia8FY5JcXksvb - - -# Lots of formats are supported -# ############################# -# Links (to youtube videos, soundcloud, radio, streams, etc) -# Searches (prefixed with ytsearch or scsearch as shown above) -# Youtube video or playlist IDs -# Youtube playlist links (https://github.com/jagrosh/MusicBot/wiki/Playlists) -# Local files (/home/container/music/mysong.mp3) \ No newline at end of file From be4d853e000f002338da72ef50c276347f779840 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Mon, 29 Nov 2021 20:08:59 -0800 Subject: [PATCH 0096/1001] Fix Egg's installation entrypoint To prevent an attack via poisoning environment variables. --- bots/discord/jmusicbot/egg-j-music-bot.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bots/discord/jmusicbot/egg-j-music-bot.json b/bots/discord/jmusicbot/egg-j-music-bot.json index f44f601e..8921686b 100644 --- a/bots/discord/jmusicbot/egg-j-music-bot.json +++ b/bots/discord/jmusicbot/egg-j-music-bot.json @@ -23,7 +23,7 @@ "installation": { "script": "#!\/bin\/bash\r\n## this is a simple script to use the github API for release versions.\r\n## this requires the egg has a variable for GITHUB_PACKAGE and VERSION\r\n## this supports using oauth\/personal access tokens via GITHUB_USER and GITHUB_OAUTH_TOKEN (both are required.)\r\n## if you are getting hit with GitHub API limit issues then you need to have the user and token set.\r\n\r\napt update\r\napt install -y jq curl\r\n\r\nGITHUB_PACKAGE=\"jagrosh\/MusicBot\"\r\nCONFIG_LINK=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/bots\/discord\/jmusicbot\/config.txt\"\r\nPLAYLIST_LINK=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/bots\/discord\/jmusicbot\/example_playlist.txt\"\r\n\r\nif [ -z \"${GITHUB_USER}\" ] && [ -z \"${GITHUB_OAUTH_TOKEN}\" ] ; then\r\n echo -e \"no github user set, 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)\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 config)\r\n else\r\n echo -e \"defaulting to the latest release\"\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\n## JMusicBot Setup\r\n[ ! -d \/mnt\/server ] && mkdir \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ -f JMusicBot.jar ]; then\r\n echo -e \"Updating JMusicBot.jar to latest version...\"\r\n echo -e '\\t(Old version can be found at \"JMusicBot.jar-old\")'\r\n mv -f JMusicBot.jar JMusicBot.jar-old\r\nfi\r\ncurl -sSLo JMusicBot.jar ${DOWNLOAD_LINK}\r\n\r\nif [ -f config.txt ]; then\r\n echo -e \"Updating config.txt to latest version...\"\r\n echo -e '\\t(Old version can be found at \"config.txt-old\")'\r\n mv -f config.txt config.txt-old\r\nfi\r\ncurl -sSLo config.txt ${CONFIG_LINK}\r\n\r\n[ ! -d Playlists ] && mkdir Playlists\r\ncd Playlists\r\nif [ -f example_playlist.txt ]; then\r\n echo -e \"example_playlist.txt already exists. Skipping default download.\"\r\nelse\r\n echo -e \"example_playlist.txt not found. Downloading default example_playlist...\"\r\n curl -sSLo example_playlist.txt ${PLAYLIST_LINK}\r\nfi\r\n\r\necho -e \"\\nJMusicBot Successfully Installed!\"", "container": "debian:buster-slim", - "entrypoint": "bash" + "entrypoint": "\/bin\/bash" } }, "variables": [ From 6da972915f601337fb5f1293440bad7c76d42f20 Mon Sep 17 00:00:00 2001 From: Softwarenoob Date: Thu, 2 Dec 2021 18:12:46 +0200 Subject: [PATCH 0097/1001] fix: Forge version regex for 1.17+ JPMS For 1.17 JPMS arguments, fix regex to match`^1\.(17|18|19|20|21|22|23)` or latest instead of only dot . minor versions, which is something I didn't notice in a previous PR. This should future proof it. --- game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json b/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json index 763a3f88..c042e6ef 100644 --- a/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json +++ b/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-11-25T20:19:52+00:00", + "exported_at": "2021-12-02T11:04:11-05:00", "name": "Forge Enhanced", "author": "parker@parkervcp.com", "description": "Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.", @@ -28,7 +28,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n# Remove spaces from the version number to avoid issues with curl\r\nFORGE_VERSION=\"$(echo \"$FORGE_VERSION\" | tr -d ' ')\"\r\nMC_VERSION=\"$(echo \"$MC_VERSION\" | tr -d ' ')\"\r\n\r\nif [ ! -z ${FORGE_VERSION} ]; then\r\n DOWNLOAD_LINK=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/${FORGE_VERSION}\/forge-${FORGE_VERSION}\r\n FORGE_JAR=forge-${FORGE_VERSION}*.jar\r\nelse\r\n JSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\n if [ \"${MC_VERSION}\" == \"latest\" ] || [ \"${MC_VERSION}\" == \"\" ] ; then\r\n echo -e \"getting latest version of forge.\"\r\n MC_VERSION=$(echo -e ${JSON_DATA} | jq -r '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains(\"latest\")) | split(\"-\")[0]' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)\r\n \tBUILD_TYPE=latest\r\n fi\r\n\r\n if [ \"${BUILD_TYPE}\" != \"recommended\" ] && [ \"${BUILD_TYPE}\" != \"latest\" ]; then\r\n BUILD_TYPE=recommended\r\n fi\r\n\r\n echo -e \"minecraft version: ${MC_VERSION}\"\r\n echo -e \"build type: ${BUILD_TYPE}\"\r\n\r\n ## some variables for getting versions and things\r\n\tFILE_SITE=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n ## locating the forge version\r\n if [ \"${VERSION_KEY}\" == \"\" ] && [ \"${BUILD_TYPE}\" == \"recommended\" ]; then\r\n echo -e \"dropping back to latest from recommended due to there not being a recommended version of forge for the mc version requested.\"\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"latest\"))')\r\n fi\r\n\r\n ## Error if the mc version set wasn't valid.\r\n if [ \"${VERSION_KEY}\" == \"\" ] || [ \"${VERSION_KEY}\" == \"null\" ]; then\r\n \techo -e \"The install failed because there is no valid version of forge for the version of minecraft selected.\"\r\n \texit 1\r\n fi\r\n\r\n FORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\n if [ \"${MC_VERSION}\" == \"1.7.10\" ] || [ \"${MC_VERSION}\" == \"1.8.9\" ]; then\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}.jar\r\n if [ \"${MC_VERSION}\" == \"1.7.10\" ]; then\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}-universal.jar\r\n fi\r\n else\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}.jar\r\n fi\r\nfi\r\n\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version ${FORGE_VERSION}\"\r\necho -e \"Download link is ${DOWNLOAD_LINK}\"\r\n\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-installer.jar; then\r\n echo -e \"installer jar download link is valid.\"\r\n else\r\n echo -e \"link is invalid. Exiting now\"\r\n exit 2\r\n fi\r\nelse\r\n echo -e \"no download link provided. Exiting now\"\r\n exit 3\r\nfi\r\n\r\ncurl -s -o installer.jar -sS ${DOWNLOAD_LINK}-installer.jar\r\n\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ]; then\r\n echo \"!!! Error by downloading forge version ${FORGE_VERSION} !!!\"\r\n exit\r\nfi\r\n\r\n# Delete args file to support downgrading to versions below 1.17\r\nif [ -f unix_args.txt ]; then\r\n rm unix_args.txt\r\n exit\r\nfi\r\n\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n\r\nif [[ $MC_VERSION == *\"1.17.\"* || $MC_VERSION == *\"1.18.\"* || $FORGE_VERSION == *\"1.17.\"* || $FORGE_VERSION == *\"1.18.\"* ]]; then\r\n # Create a symlink for 1.17+ Forge args\r\n ln -sf libraries\/net\/minecraftforge\/forge\/*\/unix_args.txt unix_args.txt\r\n else\r\n # For versions below 1.17 that ship with jar delete installer.jar\r\n mv $FORGE_JAR $SERVER_JARFILE\r\n echo -e \"Deleting installer.jar file.\\n\"\r\n rm -rf installer.jar\r\nfi", + "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n# Remove spaces from the version number to avoid issues with curl\r\nFORGE_VERSION=\"$(echo \"$FORGE_VERSION\" | tr -d ' ')\"\r\nMC_VERSION=\"$(echo \"$MC_VERSION\" | tr -d ' ')\"\r\n\r\nif [ ! -z ${FORGE_VERSION} ]; then\r\n DOWNLOAD_LINK=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/${FORGE_VERSION}\/forge-${FORGE_VERSION}\r\n FORGE_JAR=forge-${FORGE_VERSION}*.jar\r\nelse\r\n JSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\n if [ \"${MC_VERSION}\" == \"latest\" ] || [ \"${MC_VERSION}\" == \"\" ] ; then\r\n echo -e \"getting latest version of forge.\"\r\n MC_VERSION=$(echo -e ${JSON_DATA} | jq -r '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains(\"latest\")) | split(\"-\")[0]' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)\r\n \tBUILD_TYPE=latest\r\n fi\r\n\r\n if [ \"${BUILD_TYPE}\" != \"recommended\" ] && [ \"${BUILD_TYPE}\" != \"latest\" ]; then\r\n BUILD_TYPE=recommended\r\n fi\r\n\r\n echo -e \"minecraft version: ${MC_VERSION}\"\r\n echo -e \"build type: ${BUILD_TYPE}\"\r\n\r\n ## some variables for getting versions and things\r\n\tFILE_SITE=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n ## locating the forge version\r\n if [ \"${VERSION_KEY}\" == \"\" ] && [ \"${BUILD_TYPE}\" == \"recommended\" ]; then\r\n echo -e \"dropping back to latest from recommended due to there not being a recommended version of forge for the mc version requested.\"\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"latest\"))')\r\n fi\r\n\r\n ## Error if the mc version set wasn't valid.\r\n if [ \"${VERSION_KEY}\" == \"\" ] || [ \"${VERSION_KEY}\" == \"null\" ]; then\r\n \techo -e \"The install failed because there is no valid version of forge for the version of minecraft selected.\"\r\n \texit 1\r\n fi\r\n\r\n FORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\n if [ \"${MC_VERSION}\" == \"1.7.10\" ] || [ \"${MC_VERSION}\" == \"1.8.9\" ]; then\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}.jar\r\n if [ \"${MC_VERSION}\" == \"1.7.10\" ]; then\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}-universal.jar\r\n fi\r\n else\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}.jar\r\n fi\r\nfi\r\n\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version ${FORGE_VERSION}\"\r\necho -e \"Download link is ${DOWNLOAD_LINK}\"\r\n\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-installer.jar; then\r\n echo -e \"installer jar download link is valid.\"\r\n else\r\n echo -e \"link is invalid. Exiting now\"\r\n exit 2\r\n fi\r\nelse\r\n echo -e \"no download link provided. Exiting now\"\r\n exit 3\r\nfi\r\n\r\ncurl -s -o installer.jar -sS ${DOWNLOAD_LINK}-installer.jar\r\n\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ]; then\r\n echo \"!!! Error by downloading forge version ${FORGE_VERSION} !!!\"\r\n exit\r\nfi\r\n\r\n# Delete args file to support downgrading to versions below 1.17\r\nif [ -f unix_args.txt ]; then\r\n rm unix_args.txt\r\n exit\r\nfi\r\n\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n\r\nif [[ $MC_VERSION =~ ^1\\.(17|18|19|20|21|22|23) || $MC_VERSION == \"latest\" || $FORGE_VERSION =~ ^1\\.(17|18|19|20|21|22|23) || $FORGE_VERSION == \"latest\" ]]; then\r\n # Create a symlink for 1.17+ Forge args\r\n ln -sf libraries\/net\/minecraftforge\/forge\/*\/unix_args.txt unix_args.txt\r\n else\r\n # For versions below 1.17 that ship with jar delete installer.jar\r\n mv $FORGE_JAR $SERVER_JARFILE\r\n echo -e \"Deleting installer.jar file.\\n\"\r\n rm -rf installer.jar\r\nfi", "container": "openjdk:8-jdk-slim", "entrypoint": "bash" } From c196d17d5381e046b32b397fac8d0cc8606cbf2a Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Thu, 2 Dec 2021 18:24:03 +0200 Subject: [PATCH 0098/1001] chore: change order of Java images --- .../minecraft/java/forge/forge/egg-forge-enhanced.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json b/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json index c042e6ef..51a5f38e 100644 --- a/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json +++ b/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-12-02T11:04:11-05:00", + "exported_at": "2021-12-02T16:23:24+00:00", "name": "Forge Enhanced", "author": "parker@parkervcp.com", "description": "Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.", @@ -13,10 +13,10 @@ "java_version" ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_17", "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_17" + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_8" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true $( [ ! -f unix_args.txt ] && printf %s \"-jar {{SERVER_JARFILE}}\" || printf %s \"@unix_args.txt\" )", From c19ebdc246d937a4955979f867352db9c5dd9e5d Mon Sep 17 00:00:00 2001 From: James Harrison Date: Thu, 2 Dec 2021 16:55:42 +0000 Subject: [PATCH 0099/1001] Update Velocity Egg to support Paper API v2 (#1434) Co-authored-by: softwarenoob --- .../proxy/java/velocity/egg-velocity.json | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json b/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json index 661ac6e6..b9643632 100644 --- a/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json +++ b/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-07-02T04:14:48+03:00", + "exported_at": "2021-12-02T16:47:41+00:00", "name": "Velocity", "author": "parker@parkervcp.com", "description": "Velocity is a Minecraft server proxy with unparalleled server support, scalability, and flexibility.", @@ -13,10 +13,10 @@ "java_version" ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_17", "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_17" + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_8" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -XX:MaxInlineLevel=15 -jar {{SERVER_JARFILE}}", @@ -28,8 +28,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Velocity Proxy Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napk add --no-cache curl\r\n\r\nmkdir -p \/mnt\/server\/\r\n\r\ncd \/mnt\/server\/\r\n\r\nif [ -z ${VELOCITY_VERSION} ] || [ ${VELOCITY_VERSION} == \"latest\" ]; then\r\n\tVELOCITY_VERSION=\"latest\"\r\nfi\r\n\r\necho -e \"Getting download link\"\r\nDOWNLOAD_LINK=https:\/\/versions.velocitypowered.com\/download\/${VELOCITY_VERSION}\r\n\r\necho -e \"Downloading ${DOWNLOAD_LINK}\"\r\ncurl ${DOWNLOAD_LINK} -o ${SERVER_JARFILE}\r\n\r\nif [ -f velocity.toml ]; then\r\n echo -e \"velocity config file exists\"\r\nelse\r\n echo -e \"downloading velocity config file.\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/proxy\/java\/velocity\/velocity.toml -o velocity.toml\r\nfi\r\n\r\necho -e \"install complete\"", - "container": "alpine:3.10", + "script": "#!\/bin\/ash\r\n# Velocity Proxy Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=velocity\r\n\r\nif [[ -z ${VELOCITY_VERSION} ]] || [[ ${VELOCITY_VERSION} == \"latest\" ]]; then\r\n VELOCITY_VERSION=\"latest\"\r\nfi\r\n\r\nif [[ -n \"${DOWNLOAD_LINK}\" ]]; then\r\n echo -e \"Using supplied download url: ${DOWNLOAD_LINK}\"\r\n DOWNLOAD_URL=$(eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g'))\r\nelse\r\n\r\n VER_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r --arg VERSION $VELOCITY_VERSION '.versions[] | contains($VERSION)' | grep true)\r\n LATEST_VERSION=$(curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]')\r\n\r\n if [[ \"${VER_EXISTS}\" == \"true\" ]]; then\r\n echo -e \"Version is valid. Using version ${VELOCITY_VERSION}\"\r\n else\r\n\r\n echo -e \"Using the latest ${PROJECT} version\"\r\n VELOCITY_VERSION=${LATEST_VERSION}\r\n fi\r\n BUILD_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${VELOCITY_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | tostring | contains($BUILD)' | grep true)\r\n LATEST_BUILD=$(curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${VELOCITY_VERSION} | jq -r '.builds' | jq -r '.[-1]')\r\n\r\n if [[ \"${BUILD_EXISTS}\" == \"true\" ]]; then\r\n echo -e \"Build is valid for version ${VELOCITY_VERSION}. Using build ${BUILD_NUMBER}\"\r\n else\r\n echo -e \"Using the latest ${PROJECT} build for version ${VELOCITY_VERSION}\"\r\n BUILD_NUMBER=${LATEST_BUILD}\r\n fi\r\n\r\n JAR_NAME=${PROJECT}-${VELOCITY_VERSION}-${BUILD_NUMBER}.jar\r\n\r\n echo \"Version being downloaded\"\r\n echo -e \"Velocity Version: ${VELOCITY_VERSION}\"\r\n echo -e \"Build: ${BUILD_NUMBER}\"\r\n echo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\r\n DOWNLOAD_URL=https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${VELOCITY_VERSION}\/builds\/${BUILD_NUMBER}\/downloads\/${JAR_NAME}\r\nfi\r\n\r\ncd \/mnt\/server\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [[ -f ${SERVER_JARFILE} ]]; then\r\n mv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\nif [[ -f velocity.toml ]]; then\r\n echo -e \"velocity config file exists\"\r\nelse\r\n echo -e \"downloading velocity config file.\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/proxy\/java\/velocity\/velocity.toml -o velocity.toml\r\n\r\nfi\r\necho -e \"install complete\"", + "container": "ghcr.io\/pterodactyl\/installers:alpine", "entrypoint": "ash" } }, @@ -51,6 +51,24 @@ "user_viewable": true, "user_editable": false, "rules": "required|string|max:20" + }, + { + "name": "Download Path", + "description": "A URL to use to download a server.jar rather than the ones in the install script. This is not user viewable.", + "env_variable": "DL_PATH", + "default_value": "", + "user_viewable": false, + "user_editable": false, + "rules": "nullable|string" + }, + { + "name": "Build Number", + "description": "The build number for the velocity release.\r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.", + "env_variable": "BUILD_NUMBER", + "default_value": "latest", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" } ] } From b0cc71b141d39dbe95d356c16dbae82d76487205 Mon Sep 17 00:00:00 2001 From: Boy132 Date: Thu, 2 Dec 2021 17:56:00 +0100 Subject: [PATCH 0100/1001] Update Terraria Vanilla variables (#1426) --- .../vanilla/egg-terraria-vanilla.json | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/game_eggs/terraria/vanilla/egg-terraria-vanilla.json b/game_eggs/terraria/vanilla/egg-terraria-vanilla.json index 221f5218..ebeb0706 100644 --- a/game_eggs/terraria/vanilla/egg-terraria-vanilla.json +++ b/game_eggs/terraria/vanilla/egg-terraria-vanilla.json @@ -1,18 +1,22 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-12-06T02:18:03-08:00", + "exported_at": "2021-11-29T09:48:58+01:00", "name": "Terraria Vanilla", "author": "iamkubi@gmail.com", "description": "Dig, fight, explore, build! Nothing is impossible in this action-packed adventure game.", "features": null, - "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:base_debian" + ], + "file_denylist": [], "startup": ".\/TerrariaServer.bin.x86_64 -config serverconfig.txt", "config": { "files": "{\r\n \"serverconfig.txt\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"worldpath\": \"\/home\/container\/saves\/Worlds\",\r\n \"worldname\": \"{{server.build.env.WORLD_NAME}}\",\r\n \"world\": \"\/home\/container\/saves\/Worlds\/{{server.build.env.WORLD_NAME}}.wld\",\r\n \"difficulty\": \"{{server.build.env.WORLD_DIFFICULTY}}\",\r\n \"autocreate\": \"{{server.build.env.WORLD_SIZE}}\",\r\n \"port\": \"{{server.build.default.port}}\",\r\n \"maxplayers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"motd\": \"{{server.build.env.SERVER_MOTD}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Type 'help' for a list of commands\",\r\n \"userInteraction\": []\r\n}", + "startup": "{\"done\": \"Type 'help' for a list of commands\"}", "logs": "{}", "stop": "exit" }, @@ -48,8 +52,8 @@ "env_variable": "MAX_PLAYERS", "default_value": "8", "user_viewable": true, - "user_editable": false, - "rules": "required|numeric|digits_between:1,3" + "user_editable": true, + "rules": "required|numeric|max:255" }, { "name": "World Size", @@ -58,7 +62,7 @@ "default_value": "1", "user_viewable": true, "user_editable": true, - "rules": "required|numeric|digits_between:1,3" + "rules": "required|numeric|in:1,2,3" }, { "name": "Difficulty", @@ -67,7 +71,7 @@ "default_value": "3", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|numeric|in:0,1,2,3" }, { "name": "MOTD", @@ -79,4 +83,4 @@ "rules": "required|string|max:128" } ] -} \ No newline at end of file +} From 2f50380f4d92b8fcc9581ac8fa1e2af3f84a94dd Mon Sep 17 00:00:00 2001 From: AlaRubra123 <70891925+AlaRubra123@users.noreply.github.com> Date: Thu, 2 Dec 2021 10:58:46 -0600 Subject: [PATCH 0101/1001] Add clarification to Red egg readme (#1425) --- bots/discord/redbot/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bots/discord/redbot/README.md b/bots/discord/redbot/README.md index 445b1485..cad24c5a 100644 --- a/bots/discord/redbot/README.md +++ b/bots/discord/redbot/README.md @@ -8,7 +8,7 @@ No port are required to run Red. if you want to use the internal Lavalink Server, you need to allocate port 2333 as primary ### Additional Requirements -When using the Audio Cog the bot will attempt to save files to /tmp resulting in a disk space error. To resolve this error you must increase the size of `tmpfs` using custom container policy. +When using the Audio Cog the bot will attempt to save files to /tmp resulting in a disk space error. You may also see this same error when attempting to install a cog, due to pip using /tmp to build the requirements. To resolve this error you must increase the size of `tmpfs` using custom container policy. For additional details see: https://pterodactyl.io/wings/1.0/configuration.html#other-values From f5c785112f467e6e13d438ee36a27ab44b326c6f Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Thu, 2 Dec 2021 18:00:04 +0100 Subject: [PATCH 0102/1001] chore: update Java images for default Minecraft eggs (#1427) --- stock_eggs/minecraft/egg-bungeecord.json | 8 +++++--- stock_eggs/minecraft/egg-paper.json | 10 ++++++---- stock_eggs/minecraft/egg-vanilla-minecraft.json | 10 ++++++---- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/stock_eggs/minecraft/egg-bungeecord.json b/stock_eggs/minecraft/egg-bungeecord.json index e53ed759..370b3ec4 100644 --- a/stock_eggs/minecraft/egg-bungeecord.json +++ b/stock_eggs/minecraft/egg-bungeecord.json @@ -3,14 +3,16 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-10-19T23:22:26+00:00", + "exported_at": "2021-11-29T23:22:26+00:00", "name": "Bungeecord", "author": "support@pterodactyl.io", "description": "For a long time, Minecraft server owners have had a dream that encompasses a free, easy, and reliable way to connect multiple Minecraft servers together. BungeeCord is the answer to said dream. Whether you are a small server wishing to string multiple game-modes together, or the owner of the ShotBow Network, BungeeCord is the ideal solution for you. With the help of BungeeCord, you will be able to unlock your community's full potential.", "image": "quay.io\/pterodactyl\/core:java", "images": [ - "quay.io\/pterodactyl\/core:java", - "quay.io\/pterodactyl\/core:java-11" + "ghcr.io\/pterodactyl\/yolks:java_8", + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { diff --git a/stock_eggs/minecraft/egg-paper.json b/stock_eggs/minecraft/egg-paper.json index 7278a7f5..7c310fbc 100644 --- a/stock_eggs/minecraft/egg-paper.json +++ b/stock_eggs/minecraft/egg-paper.json @@ -3,14 +3,16 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-10-19T23:26:07+00:00", + "exported_at": "2021-11-29T23:26:07+00:00", "name": "Paper", "author": "parker@pterodactyl.io", "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", "image": "quay.io\/pterodactyl\/core:java-11", "images": [ - "quay.io\/pterodactyl\/core:java", - "quay.io\/pterodactyl\/core:java-11" + "ghcr.io\/pterodactyl\/yolks:java_8", + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { @@ -64,4 +66,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/stock_eggs/minecraft/egg-vanilla-minecraft.json b/stock_eggs/minecraft/egg-vanilla-minecraft.json index df90f74a..61643ad3 100644 --- a/stock_eggs/minecraft/egg-vanilla-minecraft.json +++ b/stock_eggs/minecraft/egg-vanilla-minecraft.json @@ -3,14 +3,16 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-10-23T23:04:17+00:00", + "exported_at": "2021-11-29T23:04:17+00:00", "name": "Vanilla Minecraft", "author": "support@pterodactyl.io", "description": "Minecraft is a game about placing blocks and going on adventures. Explore randomly generated worlds and build amazing things from the simplest of homes to the grandest of castles. Play in Creative Mode with unlimited resources or mine deep in Survival Mode, crafting weapons and armor to fend off dangerous mobs. Do all this alone or with friends.", "image": "quay.io\/pterodactyl\/core:java", "images": [ - "quay.io\/pterodactyl\/core:java", - "quay.io\/pterodactyl\/core:java-11" + "ghcr.io\/pterodactyl\/yolks:java_8", + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { @@ -46,4 +48,4 @@ "rules": "required|string|between:3,15" } ] -} \ No newline at end of file +} From 9d470cb1e5b086d26824b9d9a76098aabffd97de Mon Sep 17 00:00:00 2001 From: NgLoader Date: Thu, 2 Dec 2021 18:12:24 +0100 Subject: [PATCH 0103/1001] feat: add NanoLimbo (#1413) --- README.md | 1 + game_eggs/README.md | 1 + game_eggs/minecraft/README.md | 1 + game_eggs/minecraft/java/README.md | 6 +- game_eggs/minecraft/java/nanolimbo/README.MD | 12 ++++ .../java/nanolimbo/egg-nano-limbo.json | 59 +++++++++++++++++++ 6 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 game_eggs/minecraft/java/nanolimbo/README.MD create mode 100644 game_eggs/minecraft/java/nanolimbo/egg-nano-limbo.json diff --git a/README.md b/README.md index 5ed4f127..f9ac72fe 100644 --- a/README.md +++ b/README.md @@ -129,6 +129,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Forge](game_eggs/minecraft/java/forge) * [Magma](game_eggs/minecraft/java/magma) * [Mohist](game_eggs/minecraft/java/mohist) + * [NanoLimbo](/game_eggs/minecraft/java/nanolimbo) * [Paper](game_eggs/minecraft/java/paper) * [Purpur](game_eggs/minecraft/java/purpur) * [Spigot](game_eggs/minecraft/java/spigot) diff --git a/game_eggs/README.md b/game_eggs/README.md index d059f869..8516677e 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -61,6 +61,7 @@ * [Krypton](/minecraft/java/krypton) * [Magma](minecraft/java/magma) * [Mohist](minecraft/java/mohist) + * [NanoLimbo](/minecraft/java/nanolimbo) * [Paper](minecraft/java/paper) * [Purpur](minecraft/java/purpur) * [Spigot](minecraft/java/spigot) diff --git a/game_eggs/minecraft/README.md b/game_eggs/minecraft/README.md index 26fefe82..cf9cef67 100644 --- a/game_eggs/minecraft/README.md +++ b/game_eggs/minecraft/README.md @@ -20,6 +20,7 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [Krypton](/minecraft/java/krypton) * [Magma](/game_eggs/minecraft/java/magma) * [Mohist](/game_eggs/minecraft/java/mohist) +* [NanoLimbo](/game_eggs/minecraft/java/nanolimbo) * [Paper](/game_eggs/minecraft/java/paper) * [Purpur](/game_eggs/minecraft/java/purpur) * [Spigot](/game_eggs/minecraft/java/spigot) diff --git a/game_eggs/minecraft/java/README.md b/game_eggs/minecraft/java/README.md index 45fab8a6..7c0198b7 100644 --- a/game_eggs/minecraft/java/README.md +++ b/game_eggs/minecraft/java/README.md @@ -57,6 +57,10 @@ The second method requires you to know the id for both the modpack and version i may not get updated with the correct ip address and port at first launch. Please restart the server after first launch to fix this.** +## NanoLimbo +[NanoLimbo](https://github.com/Nan1t/NanoLimbo) +A lightweight minecraft limbo server, written on Java with Netty. The main goal of the project is maximum simplicity with a minimum number of sent and processed packets. + ## Spigot A collection of spigot and forked spigot eggs. @@ -103,4 +107,4 @@ The official Tekkit Classic modpack. Build factories, automate crafting! ## VanillaCord [VanillaCord](https://github.com/ME1312/VanillaCord) -VanillaCord adds support for BungeeCord's ip-forwarding option on vanilla Minecraft servers \ No newline at end of file +VanillaCord adds support for BungeeCord's ip-forwarding option on vanilla Minecraft servers. \ No newline at end of file diff --git a/game_eggs/minecraft/java/nanolimbo/README.MD b/game_eggs/minecraft/java/nanolimbo/README.MD new file mode 100644 index 00000000..8fc18833 --- /dev/null +++ b/game_eggs/minecraft/java/nanolimbo/README.MD @@ -0,0 +1,12 @@ +# NanoLimbo + +A lightweight minecraft limbo server, written on Java with Netty. The main goal of the project is maximum simplicity with a minimum number of sent and processed packets. This limbo is empty, there are no ability to set schematic building since this is not necessary. You can send useful information in chat or BossBar. +No plugins, no logs. The server is fully clear. It only able keep a lot of players while the main server is down. + +## Server Ports +The nanolimbo server requires a single port for access (default 25565). + + +| Port | default | +|-------|---------| +| Game | 25565 | \ No newline at end of file diff --git a/game_eggs/minecraft/java/nanolimbo/egg-nano-limbo.json b/game_eggs/minecraft/java/nanolimbo/egg-nano-limbo.json new file mode 100644 index 00000000..d851618f --- /dev/null +++ b/game_eggs/minecraft/java/nanolimbo/egg-nano-limbo.json @@ -0,0 +1,59 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-11-28T04:47:00+01:00", + "name": "NanoLimbo", + "author": "mail@wuffy.eu", + "description": "This is lightweight minecraft limbo server, written on Java with Netty. The main goal of the project is maximum simplicity with a minimum number of sent and processed packets. This limbo is empty, there are no ability to set schematic building since this is not necessary. You can send useful information in chat or BossBar.\r\n\r\nNo plugins, no logs. The server is fully clear. It only able keep a lot of players while the main server is down.", + "features": null, + "images": [ + "ghcr.io\/pterodactyl\/yolks:java_8" + ], + "file_denylist": [], + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", + "config": { + "files": "{\r\n \"settings.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"bind.ip\": \"0.0.0.0\",\r\n \"bind.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Server started on\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# NanoLimbo Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt update\r\napt install -y curl jq git openssl bash bc apt-transport-https gnupg software-properties-common\r\n\r\nif [ -z \"${DOWNLOAD_URL}\" ]; then\r\n GITHUB_PACKAGE=\"Nan1t\/NanoLimbo\"\r\n MATCH=\"NanoLimbo-\"\r\n\r\n ## get release info and download links\r\n LATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\n RELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n \r\n if [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\n else\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 -i ${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\n fi\r\nelse\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}.jar; then\r\n echo -e \"Provided download link is valid. Proceeding to download\"\r\n else\r\n echo -e \"Provided download link is invalid. Exiting now\"\r\n exit 2\r\n fi\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading server file...\"\r\necho -e \"performing curl -sSL ${DOWNLOAD_URL}\"\r\ncurl -sSL -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f \"settings.yml\" ]; then\r\necho \"Creating settings file...\"\r\n cat < settings.yml\r\nbind:\r\n ip: 0.0.0.0\r\n port: 25000\r\nbossBar:\r\n color: PINK\r\n division: SOLID\r\n enable: true\r\n health: 1\r\n text: '{\"text\": \"Welcome to the Limbo!\"}'\r\ndebugLevel: 3\r\ndimension: THE_END\r\ngameMode: 3\r\ninfoForwarding:\r\n secret: \r\n tokens:\r\n - \r\n type: NONE\r\njoinMessage:\r\n enable: true\r\n text: '{\"text\": \"&eWelcome to the Limbo!\"}'\r\nmaxPlayers: 100\r\nnetty:\r\n threads:\r\n bossGroup: 1\r\n workerGroup: 4\r\n useEpoll: true\r\nping:\r\n description: '{\"text\": \"&9NanoLimbo\"}'\r\n version: NanoLimbo\r\nreadTimeout: 30000\r\nspawnPosition:\r\n pitch: 0\r\n \"true\": 64\r\n x: 0\r\n yaw: 0\r\n z: 0\r\ntitle:\r\n enable: true\r\n fadeIn: 10\r\n fadeOut: 10\r\n stay: 100\r\n subtitle: '{\"text\": \"&6NanoLimbo\"}'\r\n title: '{\"text\": \"&9&lWelcome!\"}'\r\nEOT\r\nfi", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Server jar File", + "description": "The name of the server jarfile to run the server with.", + "env_variable": "SERVER_JARFILE", + "default_value": "server.jar", + "user_viewable": true, + "user_editable": true, + "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" + }, + { + "name": "Download URL", + "description": "A URL to use to download.\r\nThis is optional! Let this field empty for the latest version.", + "env_variable": "DOWNLOAD_URL", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Version", + "description": "The version of NanoLimbo to download. Use \"latest\" for latest.", + "env_variable": "VERSION", + "default_value": "latest", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + } + ] +} \ No newline at end of file From 8a74a512dad35636e3c7bf338758c19a28f7d51e Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Thu, 2 Dec 2021 09:31:33 -0800 Subject: [PATCH 0104/1001] [Satisfactory] 0.5.1.2 General QoL Update (#1430) --- .../steamcmd_servers/satisfactory/README.md | 10 ++++---- .../satisfactory/egg-satisfactory.json | 23 ++++++------------- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/game_eggs/steamcmd_servers/satisfactory/README.md b/game_eggs/steamcmd_servers/satisfactory/README.md index 3b74719f..eb260cd1 100644 --- a/game_eggs/steamcmd_servers/satisfactory/README.md +++ b/game_eggs/steamcmd_servers/satisfactory/README.md @@ -125,25 +125,25 @@ If you have forgotten your administrator password or would generally like to res ``` ___ ### Console Commands -As of v5.0.4, the console tab in the client server manager is the only way to execute commands. Entering commands via Pterodactyl do nothing. +As of v0.5.1.2, the console tab in the client server manager is the only way to execute commands. Entering commands via Pterodactyl do nothing. [List of known commands can be found via the Wiki.](https://satisfactory.fandom.com/wiki/Dedicated_servers#Console_commands) ___ ### Errors/Warnings -##### The following errors or warnings you see in the console can safely be ignored: +The following errors or warnings you see in the console can safely be ignored: ```log steamclient.so: cannot open shared object file: No such file or directory [S_API] SteamAPI_Init(): Loaded '/home/container/.steam/sdk64/steamclient.so' OK. (First tried local 'steamclient.so') LogSteamShared: Warning: Steam Dedicated Server API failed to initialize. ``` -The local file of 'steamclient.so' was attempted to be loaded, but could not because it is not present, causing the warning message. However, the backup `/home/container/.steam/sdk64/steamclient.so` is loaded successfully (this is the correct behavior according to the [Wiki](https://satisfactory.fandom.com/wiki/Dedicated_servers#SteamAPI_Init.28.29:_Sys_LoadModule_filed_to_load:_.2Fpath.2Fto.2F.steam.2Fsdk64.2Fsteamclient.so)). +↑ The local file of 'steamclient.so' was attempted to be loaded, but could not because it is not present, causing the warning message. However, the backup `/home/container/.steam/sdk64/steamclient.so` is loaded successfully (this is the correct behavior according to the [Wiki](https://satisfactory.fandom.com/wiki/Dedicated_servers#SteamAPI_Init.28.29:_Sys_LoadModule_filed_to_load:_.2Fpath.2Fto.2F.steam.2Fsdk64.2Fsteamclient.so)). ```log Warning: failed to init SDL thread priority manager: SDL not found ``` -This is a common error with Steam related software on Linux, but can safely be ignored. +↑ This is a common error with Steam related software on Linux, but can safely be ignored. ```log ...Error: Couldn't find file for package... @@ -157,4 +157,4 @@ This is a common error with Steam related software on Linux, but can safely be i ```log LogStreaming: Warning: Failed to read file '../../../FactoryGame/Saved/SaveGames/GameAnalytics.sav' error. ``` -These seem to be common error messages with the current experimental version of the game. +↑ These seem to be common error messages with the current experimental version of the game. diff --git a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json index eba455ed..a8d64c18 100644 --- a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json +++ b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json @@ -1,5 +1,5 @@ { - "_comment": "Pterodactyl Satisfactory Egg ~ Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord ~ 2021-11-19", + "_comment": "Pterodactyl Satisfactory Egg ~ Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord ~ 2021-11-29", "meta": { "version": "PTDL_v1", "update_url": null @@ -14,16 +14,16 @@ "file_denylist": [], "startup": ".\/Engine\/Binaries\/Linux\/UE4Server-Linux-Shipping FactoryGame ?listen -Port={{SERVER_PORT}} -ServerQueryPort={{QUERY_PORT}} -BeaconPort={{BEACON_PORT}} -multihome=0.0.0.0", "config": { - "files": "{\r\n \"FactoryGame\/Saved\/Config\/LinuxServer\/Game.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"MaxPlayers\": \"MaxPlayers={{server.build.env.MAX_PLAYERS}}\"\r\n }\r\n },\r\n \"FactoryGame\/Saved\/Config\/LinuxServer\/Engine.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"mNumRotatingAutosaves\": \"mNumRotatingAutosaves={{server.build.env.NUM_AUTOSAVES}}\",\r\n \"bAgreeToCrashUpload\": \"bAgreeToCrashUpload={{server.build.env.UPLOAD_CRASH_REPORT}}\",\r\n \"InitialConnectTimeout\": \"InitialConnectTimeout={{server.build.env.INIT_CONNECT_TIMEOUT}}\",\r\n \"ConnectionTimeout\": \"ConnectionTimeout={{server.build.env.CONNECT_TIMEOUT}}\"\r\n }\r\n },\r\n \"FactoryGame\/Saved\/Config\/LinuxServer\/GameUserSettings.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"mFloatValues\": \"mFloatValues=((\\\"FG.AutosaveInterval\\\", {{server.build.env.AUTOSAVE_INTERVAL}}))\",\r\n \"mIntValues\": \"mIntValues=((\\\"FG.NetworkQuality\\\", {{server.build.env.NETWORK_QUALITY}}))\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"FactoryGame\/Saved\/Config\/LinuxServer\/Game.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"MaxPlayers\": \"MaxPlayers={{server.build.env.MAX_PLAYERS}}\"\r\n }\r\n },\r\n \"FactoryGame\/Saved\/Config\/LinuxServer\/Engine.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"mNumRotatingAutosaves\": \"mNumRotatingAutosaves={{server.build.env.NUM_AUTOSAVES}}\",\r\n \"bImplicitSend\": \"bImplicitSend={{server.build.env.UPLOAD_CRASH_REPORT}}\",\r\n \"InitialConnectTimeout\": \"InitialConnectTimeout={{server.build.env.INIT_CONNECT_TIMEOUT}}\",\r\n \"ConnectionTimeout\": \"ConnectionTimeout={{server.build.env.CONNECT_TIMEOUT}}\"\r\n }\r\n },\r\n \"FactoryGame\/Saved\/Config\/LinuxServer\/GameUserSettings.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"mFloatValues\": \"mFloatValues=((\\\"FG.AutosaveInterval\\\", {{server.build.env.AUTOSAVE_INTERVAL}}))\",\r\n \"mIntValues\": \"mIntValues=((\\\"FG.NetworkQuality\\\", {{server.build.env.NETWORK_QUALITY}}))\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Engine Initialization\"\r\n}", "logs": "{}", "stop": "^C" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\n# File: Pterodactyl Satisfactory Egg - egg-satisfactory.json\r\n# Authors: Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord\r\n# Date: 2021\/11\/19\r\n# License: MIT License\r\n\r\n## Download and install SteamCMD\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\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\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login anonymous +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) validate +exit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so\r\n\r\n## Satisfactory setup\r\n# Check for successful installation and make the core binary executable.\r\ncd \/mnt\/server\/Engine\/Binaries\/Linux\r\nif [[ ! -f UE4Server-Linux-Shipping ]]; then\r\n echo -e \"\\n\\nSteamCMD failed to install the Satisfactory Dedicated Server!\"\r\n echo -e \"\\tTry reinstalling the server again.\\n\"\r\n exit 1\r\nelse\r\n chmod +x UE4Server-Linux-Shipping\r\nfi\r\n\r\n# Make Config directory and default .ini files (since they are not initially present before first server start)\r\nmkdir -p \/mnt\/server\/FactoryGame\/Saved\/Config\/LinuxServer\/ && cd \"$_\"\r\n# Currently, this will delete & re-create certain .ini files during a re-install if they are already present.\r\n# While undesirable, this is required due to a current Pterodactyl ini config parser limitation.\r\n# When the patch to this limitation hits the production branch, this will be updated.\r\nrm -f Engine.ini Game.ini GameUserSettings.ini\r\n\r\necho -e '\\nCreating default \"Engine.ini\" configuration file...'\r\ncat > Engine.ini << EOF\r\n[\/Script\/FactoryGame.FGSaveSession]\r\nmNumRotatingAutosaves=${NUM_AUTOSAVES}\r\n\r\n[CrashReportClient]\r\nbAgreeToCrashUpload=${UPLOAD_CRASH_REPORT}\r\n\r\n[\/Script\/OnlineSubsystemUtils.IpNetDriver]\r\nInitialConnectTimeout=${INIT_CONNECT_TIMEOUT}\r\nConnectionTimeout=${CONNECT_TIMEOUT}\r\nEOF\r\n\r\necho -e 'Creating default \"Game.ini\" configuration file...'\r\ncat > Game.ini << EOF\r\n[\/Script\/Engine.GameSession]\r\nMaxPlayers=${MAX_PLAYERS}\r\nEOF\r\n\r\necho -e 'Creating default \"GameUserSettings.ini\" configuration file...'\r\ncat > GameUserSettings.ini << EOF\r\n[\/Script\/FactoryGame.FGGameUserSettings]\r\nmIntValues=((\"FG.NetworkQuality\", ${NETWORK_QUALITY}))\r\nmFloatValues=((\"FG.AutosaveInterval\", ${AUTOSAVE_INTERVAL}))\r\nEOF\r\n\r\necho -e \"\\nSatisfactory Dedicated Server successfully installed!\\n\"", + "script": "#!\/bin\/bash\r\n\r\n# File: Pterodactyl Satisfactory Egg - egg-satisfactory.json\r\n# Authors: Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord\r\n# Date: 2021\/11\/29\r\n# License: MIT License\r\n\r\n## Download and install SteamCMD\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\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\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login anonymous +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) validate +exit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so\r\n\r\n## Satisfactory setup\r\n# Check for successful installation and make the core binary executable.\r\ncd \/mnt\/server\/Engine\/Binaries\/Linux\r\nif [[ ! -f UE4Server-Linux-Shipping ]]; then\r\n echo -e \"\\n\\nSteamCMD failed to install the Satisfactory Dedicated Server!\"\r\n echo -e \"\\tTry reinstalling the server again.\\n\"\r\n exit 1\r\nelse\r\n chmod +x UE4Server-Linux-Shipping\r\nfi\r\n\r\n# Make Config directory and default .ini files (since they are not initially present before first server start)\r\nmkdir -p \/mnt\/server\/FactoryGame\/Saved\/Config\/LinuxServer\/ && cd \"$_\"\r\n# Currently, this will delete & re-create certain .ini files during a re-install if they are already present.\r\n# While undesirable, this is required due to a current Pterodactyl ini config parser limitation.\r\n# When the patch to this limitation hits the production branch, this will be updated.\r\nrm -f Engine.ini Game.ini GameUserSettings.ini\r\n\r\necho -e '\\nCreating default \"Engine.ini\" configuration file...'\r\ncat > Engine.ini << EOF\r\n[\/Script\/FactoryGame.FGSaveSession]\r\nmNumRotatingAutosaves=${NUM_AUTOSAVES}\r\n\r\n[CrashReportClient]\r\nbImplicitSend=${UPLOAD_CRASH_REPORT}\r\n\r\n[\/Script\/OnlineSubsystemUtils.IpNetDriver]\r\nInitialConnectTimeout=${INIT_CONNECT_TIMEOUT}\r\nConnectionTimeout=${CONNECT_TIMEOUT}\r\nEOF\r\n\r\necho -e 'Creating default \"Game.ini\" configuration file...'\r\ncat > Game.ini << EOF\r\n[\/Script\/Engine.GameSession]\r\nMaxPlayers=${MAX_PLAYERS}\r\nEOF\r\n\r\necho -e 'Creating default \"GameUserSettings.ini\" configuration file...'\r\ncat > GameUserSettings.ini << EOF\r\n[\/Script\/FactoryGame.FGGameUserSettings]\r\nmIntValues=((\"FG.NetworkQuality\", ${NETWORK_QUALITY}))\r\nmFloatValues=((\"FG.AutosaveInterval\", ${AUTOSAVE_INTERVAL}))\r\nEOF\r\n\r\necho -e \"\\nSatisfactory Dedicated Server successfully installed!\\n\"", "container": "ghcr.io\/pterodactyl\/installers:debian", - "entrypoint": "bash" + "entrypoint": "\/bin\/bash" } }, "variables": [ @@ -127,22 +127,13 @@ "rules": "required|integer|between:0,3" }, { - "name": "[Advanced] Beta ID", - "description": "Used to download or switch to any current\/future non-primary branches of the game server. Leave empty to use the main branch of the server. \"Automatic Updates\" and \"Validate Server Files\" must be set to \"1\" to switch branches if the server is already installed. NOTE: Any non-primary branches may not be fully compatible!", + "name": "[Advanced] Branch Name", + "description": "[Accepted Values: \"public\", \"experimental\", or leave empty to use the primary branch of the server] Used to download or switch to a non-primary branch of the game server. \"Automatic Updates\" and \"Validate Server Files\" must be set to \"1\" to switch branches if the server is already installed. NOTE: Any non-primary branches may not be fully compatible\/stable!", "env_variable": "SRCDS_BETAID", "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "string|nullable" - }, - { - "name": "[Advanced] Beta Password", - "description": "To be used in tandem with \"Beta ID\" if any branches require a password. Leave empty when not using \"Beta ID\".", - "env_variable": "SRCDS_BETAPASS", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "string|nullable" + "rules": "string|nullable|in:public,experimental" }, { "name": "[Advanced] Satisfactory Dedicated Server App ID", From 72765cc479faea75d0b624f8fa1303a9fd0285eb Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Sat, 4 Dec 2021 14:30:19 -0800 Subject: [PATCH 0105/1001] Updated install script to be more verbose --- bots/discord/jmusicbot/egg-j-music-bot.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bots/discord/jmusicbot/egg-j-music-bot.json b/bots/discord/jmusicbot/egg-j-music-bot.json index 8921686b..84d3ee81 100644 --- a/bots/discord/jmusicbot/egg-j-music-bot.json +++ b/bots/discord/jmusicbot/egg-j-music-bot.json @@ -21,7 +21,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n## this is a simple script to use the github API for release versions.\r\n## this requires the egg has a variable for GITHUB_PACKAGE and VERSION\r\n## this supports using oauth\/personal access tokens via GITHUB_USER and GITHUB_OAUTH_TOKEN (both are required.)\r\n## if you are getting hit with GitHub API limit issues then you need to have the user and token set.\r\n\r\napt update\r\napt install -y jq curl\r\n\r\nGITHUB_PACKAGE=\"jagrosh\/MusicBot\"\r\nCONFIG_LINK=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/bots\/discord\/jmusicbot\/config.txt\"\r\nPLAYLIST_LINK=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/bots\/discord\/jmusicbot\/example_playlist.txt\"\r\n\r\nif [ -z \"${GITHUB_USER}\" ] && [ -z \"${GITHUB_OAUTH_TOKEN}\" ] ; then\r\n echo -e \"no github user set, 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)\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 config)\r\n else\r\n echo -e \"defaulting to the latest release\"\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\n## JMusicBot Setup\r\n[ ! -d \/mnt\/server ] && mkdir \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ -f JMusicBot.jar ]; then\r\n echo -e \"Updating JMusicBot.jar to latest version...\"\r\n echo -e '\\t(Old version can be found at \"JMusicBot.jar-old\")'\r\n mv -f JMusicBot.jar JMusicBot.jar-old\r\nfi\r\ncurl -sSLo JMusicBot.jar ${DOWNLOAD_LINK}\r\n\r\nif [ -f config.txt ]; then\r\n echo -e \"Updating config.txt to latest version...\"\r\n echo -e '\\t(Old version can be found at \"config.txt-old\")'\r\n mv -f config.txt config.txt-old\r\nfi\r\ncurl -sSLo config.txt ${CONFIG_LINK}\r\n\r\n[ ! -d Playlists ] && mkdir Playlists\r\ncd Playlists\r\nif [ -f example_playlist.txt ]; then\r\n echo -e \"example_playlist.txt already exists. Skipping default download.\"\r\nelse\r\n echo -e \"example_playlist.txt not found. Downloading default example_playlist...\"\r\n curl -sSLo example_playlist.txt ${PLAYLIST_LINK}\r\nfi\r\n\r\necho -e \"\\nJMusicBot Successfully Installed!\"", + "script": "#!\/bin\/bash\r\n## this is a simple script to use the github API for release versions.\r\n## this requires the egg has a variable for GITHUB_PACKAGE and VERSION\r\n## this supports using oauth\/personal access tokens via GITHUB_USER and GITHUB_OAUTH_TOKEN (both are required.)\r\n## if you are getting hit with GitHub API limit issues then you need to have the user and token set.\r\n\r\napt update\r\napt install -y jq curl\r\n\r\nGITHUB_PACKAGE=\"jagrosh\/MusicBot\"\r\nCONFIG_LINK=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/bots\/discord\/jmusicbot\/config.txt\"\r\nPLAYLIST_LINK=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/bots\/discord\/jmusicbot\/example_playlist.txt\"\r\n\r\nif [ -z \"${GITHUB_USER}\" ] && [ -z \"${GITHUB_OAUTH_TOKEN}\" ] ; then\r\n echo -e \"No Github user set. Using anonymous 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)\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 config)\r\n else\r\n echo -e \"Defaulting to the latest release.\"\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\n## JMusicBot Setup\r\n[ ! -d \/mnt\/server ] && mkdir \/mnt\/server\r\ncd \/mnt\/server\r\necho -e \"\\nInstalling\/Updating JMusicBot...\\n\"\r\n\r\nif [ -f JMusicBot.jar ]; then\r\n echo -e \"Updating JMusicBot.jar to latest version...\"\r\n echo -e '\\t(Old version can be found at \"JMusicBot.jar-old\")'\r\n mv -f JMusicBot.jar JMusicBot.jar-old\r\nfi\r\necho -e \"Running: curl -sSLo JMusicBot.jar ${DOWNLOAD_LINK}\\n\"\r\ncurl -sSLo JMusicBot.jar ${DOWNLOAD_LINK}\r\n\r\nif [ -f config.txt ]; then\r\n echo -e \"Updating config.txt to latest version...\"\r\n echo -e '\\t(Old version can be found at \"config.txt-old\")'\r\n mv -f config.txt config.txt-old\r\nfi\r\necho -e \"Running: curl -sSLo config.txt ${CONFIG_LINK}\\n\"\r\ncurl -sSLo config.txt ${CONFIG_LINK}\r\n\r\n[ ! -d Playlists ] && mkdir Playlists\r\ncd Playlists\r\nif [ -f example_playlist.txt ]; then\r\n echo -e \"example_playlist.txt already exists. Skipping default download.\"\r\nelse\r\n echo -e \"example_playlist.txt not found. Downloading default example_playlist...\"\r\n echo -e \"Running: curl -sSLo example_playlist.txt ${PLAYLIST_LINK}\"\r\n curl -sSLo example_playlist.txt ${PLAYLIST_LINK}\r\nfi\r\n\r\necho -e \"\\nJMusicBot Successfully Installed!\"", "container": "debian:buster-slim", "entrypoint": "\/bin\/bash" } From b7747651f6d738597d617dc5f6c1799fee42a902 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 7 Dec 2021 06:19:51 -0500 Subject: [PATCH 0106/1001] update purpur install script (#1444) --- game_eggs/minecraft/java/purpur/egg-purpur.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/game_eggs/minecraft/java/purpur/egg-purpur.json b/game_eggs/minecraft/java/purpur/egg-purpur.json index a99db5a0..7e0bc1ed 100644 --- a/game_eggs/minecraft/java/purpur/egg-purpur.json +++ b/game_eggs/minecraft/java/purpur/egg-purpur.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-07-17T01:51:57+03:00", + "exported_at": "2021-12-07T02:27:26+00:00", "name": "Purpur", "author": "purpur@birdflop.com", "description": "Fork of Paper and Tuinity providing new configuration options.", @@ -28,9 +28,9 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Purpur Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt update\r\napt install -y curl jq\r\n\r\nVER_EXISTS=`curl -s https:\/\/api.pl3x.net\/v2\/purpur\/ | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)?' | grep true`\r\nLATEST_PURPUR_VERSION=`curl -s https:\/\/api.pl3x.net\/v2\/purpur\/ | jq -r '.versions' | jq -r '.[0]?'`\r\n\r\nif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n echo -e \"Chosen version is valid. Using version ${MINECRAFT_VERSION}\"\r\nelse\r\n echo -e \"Chosen version is invalid. Defaulting to the latest Purpur version\"\r\n MINECRAFT_VERSION=${LATEST_PURPUR_VERSION}\r\nfi\r\n\r\nBUILD_EXISTS=`curl -s https:\/\/api.pl3x.net\/v2\/purpur\/${MINECRAFT_VERSION}\/ | jq -r --arg BUILD $BUILD_NUMBER '.builds.all[] | contains($BUILD)?' | grep true`\r\nLATEST_PURPUR_BUILD=`curl -s https:\/\/api.pl3x.net\/v2\/purpur\/${MINECRAFT_VERSION}\/ | jq -r '.builds.latest'`\r\n\r\nif [ \"${BUILD_EXISTS}\" == \"true\" ] || [ ${BUILD_NUMBER} == \"latest\" ]; then\r\n echo -e \"Chosen build is valid. Using version ${BUILD_NUMBER}\"\r\nelse\r\n echo -e \"Chosen version is invalid. Using the latest Purpur build\"\r\n BUILD_NUMBER=${LATEST_PURPUR_BUILD}\r\nfi\r\n\r\necho \"Version being downloaded\"\r\necho -e \"MC Version: ${MINECRAFT_VERSION}\"\r\necho -e \"Build: ${BUILD_NUMBER}\"\r\nDOWNLOAD_URL=https:\/\/api.pl3x.net\/v2\/purpur\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download \r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n mv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"Downloading MC server.properties\"\r\n curl -sSL -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/java\/server.properties\r\nfi", - "container": "debian:buster-slim", - "entrypoint": "bash" + "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=purpur\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} version\"\r\n\t\tMINECRAFT_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\t\r\n\tBUILD_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all | tostring | contains($BUILD)' | grep true`\r\n\tLATEST_BUILD=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r '.builds.latest'`\r\n\t\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\t\tBUILD_NUMBER=${LATEST_BUILD}\r\n\tfi\r\n\t\r\n\tJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n\techo \"Version being downloaded\"\r\n\techo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n\techo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\tDOWNLOAD_URL=https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"Downloading MC server.properties\"\r\n curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", + "container": "ghcr.io\/pterodactyl\/installers:alpine", + "entrypoint": "ash" } }, "variables": [ @@ -62,4 +62,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From 2a5e180ceb717dda578220909bc2303b0df15a9e Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Tue, 7 Dec 2021 14:19:03 +0200 Subject: [PATCH 0107/1001] docs(steamcmd): specify betaid variables --- scripts/steamcmd_installer.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/steamcmd_installer.sh b/scripts/steamcmd_installer.sh index 499c5cfd..c03a2bc0 100644 --- a/scripts/steamcmd_installer.sh +++ b/scripts/steamcmd_installer.sh @@ -9,11 +9,15 @@ # Variables # STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install. # WINDOWS_INSTALL - if it's a windows server you want to install set to 1 -# SRCDS_APPID - steam app id ffound here - https://developer.valvesoftware.com/wiki/Dedicated_Servers_List -# INSTALL_FLAGS - when a server has extra glas for things like beta installs or updates. +# SRCDS_APPID - steam app id found here - https://developer.valvesoftware.com/wiki/Dedicated_Servers_List +# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch +# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password. +# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot. +# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable. # -## + ## +# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process. apt -y update apt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates @@ -42,7 +46,7 @@ chown -R root:root /mnt export HOME=/mnt/server ## install game using steamcmd -./steamcmd.sh +force_install_dir /mnt/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6 +./steamcmd.sh +force_install_dir /mnt/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s "-beta ${SRCDS_BETAID}" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s "-betapassword ${SRCDS_BETAPASS}" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6 ## set up 32 bit libraries mkdir -p /mnt/server/.steam/sdk32 From 20b4bcf72ac84d4ef033382145b20bc6a905f7e5 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Tue, 7 Dec 2021 14:40:57 +0200 Subject: [PATCH 0108/1001] fix(sogebot): new Github repository URL Uses new SogeBot GitHub repository and changes Docker image to new Yolks. closes #1440 --- bots/twitch/sogebot/egg-soge-bot.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bots/twitch/sogebot/egg-soge-bot.json b/bots/twitch/sogebot/egg-soge-bot.json index 8cd97ef6..a80e9212 100644 --- a/bots/twitch/sogebot/egg-soge-bot.json +++ b/bots/twitch/sogebot/egg-soge-bot.json @@ -4,13 +4,13 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-08-04T05:39:15+03:00", + "exported_at": "2021-12-07T12:36:17+00:00", "name": "SogeBot", "author": "info@goover.de", "description": "sogeBot - Free Twitch Bot built on Node.js https:\/\/sogebot.xyz\/", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-16" + "ghcr.io\/parkervcp\/yolks:nodejs_16" ], "file_denylist": [], "startup": "npm start", @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#\/bin\/bash\r\napt -y update\r\napt install -y curl unzip sqlite jq wget python3 build-essential\r\nexport NODE_OPTIONS=--max-old-space-size=8192\r\nMATCH=sogeBot\r\ncd \/mnt\/server\r\n\r\nrm -fR dest\r\nrm -fR public\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/sogehige\/sogeBot\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/sogehige\/sogeBot\/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\necho -e \"Downloading from $DOWNLOAD_LINK\"\r\nwget -N $DOWNLOAD_LINK\r\nunzip -o $MATCH-*.zip\r\nrm -fR $MATCH-*.zip\r\n\r\necho \"Installing dependencies, this will take some time so sit back and relax...\"\r\n\/usr\/local\/bin\/npm ci 2>&1 | tee npmlog.txt\r\n\r\nexit 0", + "script": "#\/bin\/bash\r\napt -y update\r\napt install -y curl unzip sqlite jq wget python3 build-essential\r\nexport NODE_OPTIONS=--max-old-space-size=8192\r\nMATCH=sogeBot\r\ncd \/mnt\/server\r\n\r\nrm -fR dest\r\nrm -fR public\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/sogebot\/sogeBot\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/sogebot\/sogeBot\/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\necho -e \"Downloading from $DOWNLOAD_LINK\"\r\nwget -N $DOWNLOAD_LINK\r\nunzip -o $MATCH-*.zip\r\nrm -fR $MATCH-*.zip\r\n\r\necho \"Installing dependencies, this will take some time so sit back and relax...\"\r\n\/usr\/local\/bin\/npm ci 2>&1 | tee npmlog.txt\r\n\r\necho -e \"install completed\"\r\nexit 0", "container": "node:16-buster-slim", "entrypoint": "bash" } @@ -30,7 +30,7 @@ "variables": [ { "name": "Version", - "description": "Choose Version, you want to install. Default: Latest", + "description": "Version to install. Latest will install the latest available version.", "env_variable": "VERSION", "default_value": "latest", "user_viewable": true, @@ -38,4 +38,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From e9ad7f6ca268f22e7ade84bdd95847c1b91e680b Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Tue, 7 Dec 2021 15:01:16 +0100 Subject: [PATCH 0109/1001] Update steamcmd eggs to use new Yolks images (#1420) --- .../steamcmd_servers/7_days_to_die/README.md | 6 +- .../7_days_to_die/egg-7-days-to-die.json | 35 ++++---- .../egg-ark--survival-evolved.json | 8 +- .../arma/arma3/egg-arma3.json | 12 +-- .../assetto_corsa/egg-assetto-corsa.json | 32 +++++-- .../steamcmd_servers/avorion/egg-avorion.json | 90 +++++++++++-------- .../barotrauma/egg-barotrauma.json | 35 ++++++-- .../citadel/egg-citadel-forged-with-fire.json | 38 +++++--- .../egg-insurgency--sandstorm.json | 48 ++++++---- .../valheim/valheim_plus/README.md | 4 +- 10 files changed, 198 insertions(+), 110 deletions(-) diff --git a/game_eggs/steamcmd_servers/7_days_to_die/README.md b/game_eggs/steamcmd_servers/7_days_to_die/README.md index b046957b..10d93cf6 100644 --- a/game_eggs/steamcmd_servers/7_days_to_die/README.md +++ b/game_eggs/steamcmd_servers/7_days_to_die/README.md @@ -5,12 +5,8 @@ Set in a brutally unforgiving post-apocalyptic world overrun by the undead, 7 Da ### Server Ports 7 Days to Die requires up to 6 ports -game ports (default 26900-26902) -remote control (default 8080, 8081) -allocs webmap (default 8082) - | Port | default | |---------|---------------| | Game | 26900 - 26902 | | RCON | 8080 - 8081 | -| webmap | 8082 | \ No newline at end of file +| webmap | 8082 | diff --git a/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json b/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json index 858e871d..9f195ba0 100644 --- a/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json +++ b/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json @@ -1,13 +1,18 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2019-11-06T20:06:59-05:00", + "exported_at": "2021-11-26T13:46:12+01:00", "name": "7 Days To Die", "author": "kristoffer.norman@bahnhof.se", "description": "7 days to die server", - "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", + "features": null, + "images": [ + "ghcr.io\/parkervcp\/games:source" + ], + "file_denylist": [], "startup": ".\/7DaysToDieServer.x86_64 -configfile=serverconfig.xml -quit -batchmode -nographics -dedicated -ServerPort=${SERVER_PORT} -ServerMaxPlayerCount=${MAX_PLAYERS} -GameDifficulty=${GAME_DIFFICULTY} -ControlPanelEnabled=false -TelnetEnabled=true -TelnetPort=8081 -logfile logs\/latest.log & echo -e \"Checing on telnet connection\" && until nc -z -v -w5 127.0.0.1 8081; do echo \"Waiting for telnet connection...\"; sleep 5; done && telnet -E 127.0.0.1 8081", "config": { "files": "{}", @@ -17,8 +22,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# 7 days to die 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 \/mnt\/server\/logs\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 294420 +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", - "container": "ubuntu:18.04", + "script": "#!\/bin\/bash\r\n# 7 days to die Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, @@ -28,8 +33,8 @@ "description": "Maximum Concurrent Players", "env_variable": "MAX_PLAYERS", "default_value": "8", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "required|string|max:20" }, { @@ -37,8 +42,8 @@ "description": "0 - 5, 0=easiest, 5=hardest", "env_variable": "GAME_DIFFICULTY", "default_value": "2", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|integer|between:0,5" }, { @@ -46,8 +51,8 @@ "description": "This is the app id for 7dtd please no step on snek.", "env_variable": "SRCDS_APPID", "default_value": "294420", - "user_viewable": 0, - "user_editable": 0, + "user_viewable": false, + "user_editable": false, "rules": "required|string|max:20" }, { @@ -55,8 +60,8 @@ "description": "This is to auto update the server on start.\r\n\r\nOptions are 0 or 1\r\nDefault is 1", "env_variable": "AUTO_UPDATE", "default_value": "1", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|boolean" }, { @@ -64,8 +69,8 @@ "description": "This is really annoying that more games are doing this.", "env_variable": "LD_LIBRARY_PATH", "default_value": ".", - "user_viewable": 0, - "user_editable": 0, + "user_viewable": false, + "user_editable": false, "rules": "required|string|max:20" } ] diff --git a/game_eggs/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json b/game_eggs/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json index f0dfa7af..eb40fa9d 100644 --- a/game_eggs/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json +++ b/game_eggs/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json @@ -4,13 +4,13 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-07-27T14:22:41+03:00", + "exported_at": "2021-11-26T13:48:52+01:00", "name": "Ark: Survival Evolved", "author": "dev@shepper.fr", "description": "As a man or woman stranded, naked, freezing, and starving on the unforgiving shores of a mysterious island called ARK, use your skill and cunning to kill or tame and ride the plethora of leviathan dinosaurs and other primeval creatures roaming the land. Hunt, harvest resources, craft items, grow crops, research technologies, and build shelters to withstand the elements and store valuables, all while teaming up with (or preying upon) hundreds of other players to survive, dominate... and escape! \u2014 Gamepedia: ARK", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:debian_source" + "ghcr.io\/parkervcp\/games:source" ], "file_denylist": [], "startup": "rmv() { echo -e \"stopping server\"; rcon -t rcon -a 127.0.0.1:${RCON_PORT} -p ${ARK_ADMIN_PASSWORD} -c saveworld && rcon -a 127.0.0.1:${RCON_PORT} -p ${ARK_ADMIN_PASSWORD} -c DoExit; }; trap rmv 15; cd ShooterGame\/Binaries\/Linux && .\/ShooterGameServer {{SERVER_MAP}}?listen?SessionName=\"{{SESSION_NAME}}\"?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?Port={{SERVER_PORT}}?RCONPort={{RCON_PORT}}?QueryPort={{QUERY_PORT}}?RCONEnabled=True$( [ \"$BATTLE_EYE\" == \"1\" ] || printf %s ' -NoBattlEye' ) -server {{ARGS}} -log & until echo \"waiting for rcon connection...\"; rcon -t rcon -a 127.0.0.1:${RCON_PORT} -p ${ARK_ADMIN_PASSWORD}; do sleep 5; done", @@ -22,8 +22,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends --no-install-suggests install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\n\r\nmkdir -p \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## create a symbolic link for loading mods\r\ncd \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\nln -sf ..\/..\/..\/..\/..\/Steam\/steamapps steamapps\r\ncd \/mnt\/server", - "container": "debian:buster-slim", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends --no-install-suggests install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\n\r\nmkdir -p \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## create a symbolic link for loading mods\r\ncd \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\nln -sf ..\/..\/..\/..\/..\/Steam\/steamapps steamapps\r\ncd \/mnt\/server", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, diff --git a/game_eggs/steamcmd_servers/arma/arma3/egg-arma3.json b/game_eggs/steamcmd_servers/arma/arma3/egg-arma3.json index f2d68d29..80c66e54 100644 --- a/game_eggs/steamcmd_servers/arma/arma3/egg-arma3.json +++ b/game_eggs/steamcmd_servers/arma/arma3/egg-arma3.json @@ -1,16 +1,16 @@ { - "_comment": "Pterodactyl Arma 3 Egg ~ David Wolfe (Red-Thirten) ~ 2021-07-11", + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { "version": "PTDL_v1", "update_url": null }, + "exported_at": "2021-11-26T13:51:11+01:00", "name": "Arma 3", "author": "rehlmgaming@gmail.com", "description": "Experience true combat gameplay in a massive military sandbox. Deploying a wide variety of single- and multiplayer content, over 20 vehicles and 40 weapons, and limitless opportunities for content creation, this is the PC's premier military game. Authentic, diverse, open - Arma 3 sends you to war.", "features": null, "images": [ - "ghcr.io\/parkervcp\/games:arma3", - "quay.io\/parkervcp\/pterodactyl-images:game_arma3" + "ghcr.io\/parkervcp\/games:arma3" ], "file_denylist": [], "startup": ".\/{{SERVER_BINARY}} -ip=0.0.0.0 -port={{SERVER_PORT}} -profiles=.\/serverprofile -bepath=.\/battleye -cfg=basic.cfg -config=server.cfg -mod=\\\"{{CLIENT_MODS}}\\\" -serverMod=\\\"{{SERVERMODS}}\\\" {{STARTUP_PARAMS}}", @@ -22,8 +22,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl Arma 3 Egg - egg-arma3.json\r\n## Author: David Wolfe (Red-Thirten)\r\n## Date: 2021\/07\/11\r\n## License: MIT License\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n# Download and install SteamCMD\r\ncd \/tmp\r\nmkdir -p \"\/mnt\/server\/steamcmd\" \"\/mnt\/server\/steamapps\"\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh \"+login \\\"${STEAM_USER}\\\" \\\"${STEAM_PASS}\\\"\" +force_install_dir \/mnt\/server +app_update ${STEAMCMD_APPID} ${STEAMCMD_EXTRA_FLAGS} validate +quit\r\n\r\n# Set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n# Set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n# Arma 3 setup\r\ncd \/mnt\/server\/\r\n\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\n\r\n[[ -f basic.cfg ]] || curl -sSLO ${BASIC_URL}\r\n[[ -f server.cfg ]] || curl -sSLO ${BASIC_URL%\/*}\/server.cfg\r\nchmod 755 basic.cfg server.cfg", - "container": "debian:buster-slim", + "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl Arma 3 Egg - egg-arma3.json\r\n## Author: David Wolfe (Red-Thirten)\r\n## Date: 2021\/07\/11\r\n## License: MIT License\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n# Download and install SteamCMD\r\ncd \/tmp\r\nmkdir -p \"\/mnt\/server\/steamcmd\" \"\/mnt\/server\/steamapps\"\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server \"+login \\\"${STEAM_USER}\\\" \\\"${STEAM_PASS}\\\"\" +app_update ${STEAMCMD_APPID} ${STEAMCMD_EXTRA_FLAGS} validate +quit\r\n\r\n# Set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n# Set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n# Arma 3 setup\r\ncd \/mnt\/server\/\r\n\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\n\r\n[[ -f basic.cfg ]] || curl -sSLO ${BASIC_URL}\r\n[[ -f server.cfg ]] || curl -sSLO ${BASIC_URL%\/*}\/server.cfg\r\nchmod 755 basic.cfg server.cfg", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, @@ -236,4 +236,4 @@ "rules": "required|string" } ] -} +} \ No newline at end of file diff --git a/game_eggs/steamcmd_servers/assetto_corsa/egg-assetto-corsa.json b/game_eggs/steamcmd_servers/assetto_corsa/egg-assetto-corsa.json index 84b8d2b6..131c140c 100644 --- a/game_eggs/steamcmd_servers/assetto_corsa/egg-assetto-corsa.json +++ b/game_eggs/steamcmd_servers/assetto_corsa/egg-assetto-corsa.json @@ -1,14 +1,18 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-12-14T03:20:46+02:00", + "exported_at": "2021-11-26T13:56:27+01:00", "name": "Assetto Corsa", "author": "admin@softwarenoob.com", "description": "Assetto Corsa (Italian for \"Race Setup\") is a sim racing video game developed by the Italian video game developer Kunos Simulazioni. It is designed with an emphasis on a realistic racing experience with support for extensive customization and moddability", "features": null, - "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", + "images": [ + "ghcr.io\/parkervcp\/games:source" + ], + "file_denylist": [], "startup": ".\/acServer", "config": { "files": "{\r\n \"cfg\/server_cfg.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"NAME\": \"NAME={{server.build.env.HOSTNAME}}\",\r\n \"PASSWORD\": \"PASSWORD={{server.build.env.PASSWORD}}\",\r\n \"ADMIN_PASSWORD\": \"ADMIN_PASSWORD={{server.build.env.ADM_PASSWORD}}\",\r\n \"UDP_PORT\": \"UDP_PORT={{server.build.default.port}}\",\r\n \"TCP_PORT\": \"TCP_PORT={{server.build.default.port}}\",\r\n \"HTTP_PORT\": \"HTTP_PORT={{server.build.env.HTTP_PORT}}\"\r\n }\r\n }\r\n}", @@ -18,8 +22,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"Downloading the game as Steam user ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +@sSteamCmdForcePlatformType windows +force_install_dir \/mnt\/server +app_update 302550 ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\nif [ \"${STEAM_USER}\" == \"anonymous\" ]; then\r\n echo -e \"ERROR - STEAM USER NOT SET\\n\"\r\n echo -e \"Steam account must have the dedicated server in his library in order to install and host the game\\n\"\r\n echo -e \"You must configure Steam account in the server startup variables, after that reinstall the server\\n\"\r\nfi", - "container": "debian:buster-slim", + "script": "#!\/bin\/bash\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\nif [ \"${STEAM_USER}\" == \"anonymous\" ]; then\r\n echo -e \"ERROR - STEAM USER NOT SET\\n\"\r\n echo -e \"Steam account must have the dedicated server in his library in order to install and host the game\\n\"\r\n echo -e \"You must configure Steam account in the server startup variables, after that reinstall the server\\n\"\r\nfi", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, @@ -86,6 +90,24 @@ "user_viewable": false, "user_editable": false, "rules": "required|string|max:20" + }, + { + "name": "SRCDS_APPID", + "description": "", + "env_variable": "SRCDS_APPID", + "default_value": "302550", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:20" + }, + { + "name": "Auto Update", + "description": "autoupdate Server on start or restart. 1 = on; 0 = off", + "env_variable": "AUTO_UPDATE", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:1" } ] } \ No newline at end of file diff --git a/game_eggs/steamcmd_servers/avorion/egg-avorion.json b/game_eggs/steamcmd_servers/avorion/egg-avorion.json index 1df72421..fff7445e 100644 --- a/game_eggs/steamcmd_servers/avorion/egg-avorion.json +++ b/game_eggs/steamcmd_servers/avorion/egg-avorion.json @@ -1,14 +1,19 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-10-04T11:49:22-07:00", + "exported_at": "2021-11-26T14:35:45+01:00", "name": "Avorion", "author": "iamkubi@gmail.com", "description": "A procedural co-op space sandbox where players can build their own space ships out of dynamically scalable blocks. Fight epic space battles, explore, mine, trade, wage wars and build your own empire to save your galaxy from being torn apart by an unknown enemy.", - "image": "quay.io\/pterodactyl\/core:source", - "startup": ".\/server.sh --galaxy-name \\\"{{GALAXY_NAME}}\\\" --admin {{ADMIN_ID}} --datapath galaxy --port {{SERVER_PORT}} --query-port {{QUERY_PORT}} --steam-master-port {{STEAM_MASTER_PORT}} --steam-query-port {{STEAM_QUERY_PORT}} --max-players {{MAX_PLAYERS}} --difficulty {{DIFFICULTY}} --collision-damage {{COLLISION_DMG}} --save-interval {{SAVE_INTERVAL}} --same-start-sector {{SAME_START_SECTOR}} --server-name \\\"{{SERVER_NAME}}\\\" --threads {{GAME_THREADS}} --listed {{SERVER_LISTED}}", + "features": null, + "images": [ + "ghcr.io\/parkervcp\/games:source" + ], + "file_denylist": [], + "startup": ".\/bin\/AvorionServer --galaxy-name {{GALAXY_NAME}} --admin {{ADMIN_ID}} --datapath galaxy --port {{SERVER_PORT}} --query-port {{QUERY_PORT}} --steam-master-port {{STEAM_MASTER_PORT}} --steam-query-port {{STEAM_QUERY_PORT}} --max-players {{MAX_PLAYERS}} --difficulty {{DIFFICULTY}} --collision-damage {{COLLISION_DMG}} --save-interval {{SAVE_INTERVAL}} --same-start-sector {{SAME_START_SECTOR}} --server-name \\\"{{SERVER_NAME}}\\\" --threads {{GAME_THREADS}} --listed {{SERVER_LISTED}}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Server startup complete\",\r\n \"userInteraction\": []\r\n}", @@ -17,8 +22,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Avorion 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\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\nmkdir -p \/mnt\/server\/steamcmd\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\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\nexport HOME=\/mnt\/server\r\n[[ \"$SERVER_BETA\" == \"true\" ]] && beta_arg=\"beta\" || beta_arg=\"NONE\"\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${APP_ID} -beta \"$beta_arg\" validate +exit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/steamclient.so\r\nmkdir -p \/mnt\/server\/backups\r\nmkdir -p \/mnt\/server\/galaxy\/\"${GALAXY_NAME}\"\r\ncurl https:\/\/raw.githubusercontent.com\/iamkubi\/eggs\/master\/avorion\/server.ini --output \/mnt\/server\/galaxy\/\"${GALAXY_NAME}\"\/server.ini", - "container": "debian:buster-slim", + "script": "#!\/bin\/bash\r\n# Avorion Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\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\r\n[[ \"$SERVER_BETA\" == \"true\" ]] && beta_arg=\"beta\" || beta_arg=\"NONE\"\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login anonymous +force_install_dir \/mnt\/server +app_update ${APP_ID} -beta \"$beta_arg\" validate +exit\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\nmkdir -p \/mnt\/server\/backups\r\nmkdir -p \/mnt\/server\/galaxy\/${GALAXY_NAME}\r\ncurl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/steamcmd_servers\/avorion\/server.ini --output \/mnt\/server\/galaxy\/${GALAXY_NAME}\/server.ini", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, @@ -28,8 +33,8 @@ "description": "Name of the Galaxy to create", "env_variable": "GALAXY_NAME", "default_value": "Avorion", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:32" }, { @@ -37,8 +42,8 @@ "description": "The name of the server, shown in the server list.", "env_variable": "SERVER_NAME", "default_value": "Avorion Server", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:64" }, { @@ -46,8 +51,8 @@ "description": "Steam64 ID for the player to make Server Admin", "env_variable": "ADMIN_ID", "default_value": "", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" }, { @@ -55,8 +60,8 @@ "description": "Maximum number of players allowed", "env_variable": "MAX_PLAYERS", "default_value": "10", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "required|int|max:64" }, { @@ -64,8 +69,8 @@ "description": "Difficulty of the server, allowed values are: -3, -2, -1, 0, 1, 2, 3 Default: 0", "env_variable": "DIFFICULTY", "default_value": "0", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|integer|max:3|min:-3" }, { @@ -73,8 +78,8 @@ "description": "A multiplier for damage to colliding objects. Accepts floating-point numbers, e.g. 0.5 is 50% collision damage. 0: no damage, 1: full damage. default: 1", "env_variable": "COLLISION_DMG", "default_value": "1", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" }, { @@ -82,8 +87,8 @@ "description": "Time between automatic saves in seconds. Defaults to 300 (5 minutes).", "env_variable": "SAVE_INTERVAL", "default_value": "300", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" }, { @@ -91,8 +96,8 @@ "description": "Indicates if all players should start in the same sector. If false, a random empty sector on the outer rim is populated and used as the home sector for each new player.", "env_variable": "SAME_START_SECTOR", "default_value": "true", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|in:true,false" }, { @@ -100,8 +105,8 @@ "description": "Number of concurrent threads that are used to update sectors. (Identical to the 'Threads' setting ingame.)", "env_variable": "GAME_THREADS", "default_value": "1", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|integer|max:20" }, { @@ -109,8 +114,8 @@ "description": "Privacy setting. If enabled together with useSteam, the server will show up in public server lists. (Same as the ingame setting 'List Publicly')", "env_variable": "SERVER_LISTED", "default_value": "true", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|in:true,false" }, { @@ -118,8 +123,8 @@ "description": "Set to true to enable beta, false for stable.", "env_variable": "SERVER_BETA", "default_value": "false", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|in:true,false" }, { @@ -127,8 +132,8 @@ "description": "", "env_variable": "APP_ID", "default_value": "565060", - "user_viewable": 0, - "user_editable": 0, + "user_viewable": false, + "user_editable": false, "rules": "required|string|max:20" }, { @@ -136,8 +141,8 @@ "description": "", "env_variable": "LD_LIBRARY_PATH", "default_value": ".\/linux64", - "user_viewable": 0, - "user_editable": 0, + "user_viewable": false, + "user_editable": false, "rules": "required|string|max:20" }, { @@ -145,8 +150,8 @@ "description": "", "env_variable": "STEAM_MASTER_PORT", "default_value": "27021", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "required|string|max:20" }, { @@ -154,8 +159,8 @@ "description": "", "env_variable": "STEAM_QUERY_PORT", "default_value": "27020", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "required|string|max:20" }, { @@ -163,8 +168,17 @@ "description": "", "env_variable": "QUERY_PORT", "default_value": "27003", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, + "rules": "required|string|max:20" + }, + { + "name": "Auto Update", + "description": "1 = on; 0 = off", + "env_variable": "AUTO_UPDATE", + "default_value": "1", + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" } ] diff --git a/game_eggs/steamcmd_servers/barotrauma/egg-barotrauma.json b/game_eggs/steamcmd_servers/barotrauma/egg-barotrauma.json index 3db84636..c72a2666 100644 --- a/game_eggs/steamcmd_servers/barotrauma/egg-barotrauma.json +++ b/game_eggs/steamcmd_servers/barotrauma/egg-barotrauma.json @@ -1,14 +1,18 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-12-14T04:12:32+02:00", + "exported_at": "2021-11-26T14:40:35+01:00", "name": "Barotrauma", "author": "admin@softwarenoob.com", "description": "Barotrauma is a 2D co-op survival horror submarine simulator, inspired by games like FTL: Faster Than Light, Rimworld, Dwarf Fortress and Space Station 13. It\u2019s a Sci-Fi game that combines ragdoll physics and alien sea monsters with teamwork and existential fear.", "features": null, - "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", + "images": [ + "ghcr.io\/parkervcp\/games:source" + ], + "file_denylist": [], "startup": ".\/DedicatedServer -batchmode", "config": { "files": "{}", @@ -18,10 +22,29 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\nSRCDS_APPID=1026340\r\n\r\n## just in case someone removed the defaults.\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\n\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", - "container": "debian:buster-slim", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, - "variables": [] + "variables": [ + { + "name": "SRCDS_APPID", + "description": "", + "env_variable": "SRCDS_APPID", + "default_value": "1026340", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:20" + }, + { + "name": "Auto Update", + "description": "1 = on; 0 = off", + "env_variable": "AUTO_UPDATE", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + } + ] } \ No newline at end of file diff --git a/game_eggs/steamcmd_servers/citadel/egg-citadel-forged-with-fire.json b/game_eggs/steamcmd_servers/citadel/egg-citadel-forged-with-fire.json index d8f8e048..d2b94ae1 100644 --- a/game_eggs/steamcmd_servers/citadel/egg-citadel-forged-with-fire.json +++ b/game_eggs/steamcmd_servers/citadel/egg-citadel-forged-with-fire.json @@ -1,13 +1,18 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-04-21T09:35:15+02:00", + "exported_at": "2021-11-26T14:44:12+01:00", "name": "Citadel: Forged with Fire", "author": "info@goover.de", "description": "Citadel: Forged With Fire is a massive online sandbox RPG set in the mystical world of Ignus. Featuring magic, spellcasting, building, exploring and crafting as you fight to make a name for yourself and achieve notoriety across the land.", - "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", + "features": null, + "images": [ + "ghcr.io\/parkervcp\/games:source" + ], + "file_denylist": [], "startup": ".\/CitadelServer.sh", "config": { "files": "{\r\n \"Config\/Game.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"ConnectionPort=\": \"ConnectionPort={{server.build.default.port}}\",\r\n \"QueryPort=\": \"QueryPort={{server.build.env.QPORT}}\",\r\n \"Password\": \"Password={{server.build.env.ADMIN_PASSWD}}\"\r\n }\r\n }\r\n}", @@ -17,19 +22,19 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n##Copy steamclient.so to correct Dir\r\nmkdir -p $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\r\nchmod -R a+w,a+x $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\r\nif [[ ! -f $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\/steamclient.so ]]; then \r\n\tln -s ..\/..\/..\/..\/..\/..\/linux64\/steamclient.so $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\/steamclient.so\r\n\r\nfi\r\n\r\n## Create Game.ini\r\nmkdir $HOME\/Config\r\n\r\nif [[ -d $HOME\/Citadel\/Saved\/Config\/LinuxServer ]]; then \r\n\trm -rf $HOME\/Citadel\/Saved\/Config\/LinuxServer\r\nfi\r\n\r\nif [[ -d $HOME\/Engine\/Saved\/Config\/LinuxServer ]]; then \r\n\trm -rf $HOME\/Engine\/Saved\/Config\/LinuxServer\r\nfi\r\n\r\nmkdir -p $HOME\/Citadel\/Saved\/Config\r\nmkdir -p $HOME\/Engine\/Saved\/Config\r\n\r\nln -s ..\/..\/..\/Config $HOME\/Citadel\/Saved\/Config\/LinuxServer\r\nln -s ..\/..\/..\/Config $HOME\/Engine\/Saved\/Config\/LinuxServer\r\n\r\n#rm -fR $HOME\/Citadel\/Saved\/Config\/LinuxServer\/Game.ini\r\ncat < $HOME\/Config\/Game.ini\r\n[UWorks]\r\nConnectionPort=7777\r\nQueryPort=27015\r\n\r\n[\/Script\/Citadel.SocialManager]\r\nPassword=changeme\r\n\r\n[\/Script\/Citadel.CitadelGameInstance]\r\nWorldCreationSettings=(ServerName=\"CitadelServer\",Password=\"YourServerPassword\",ServerType=PVP,PlayerLimit=20,bPrivate=true,ExperienceMultiplier=1.000000,InventoryCapacityMultipler=1.000000,KnowledgePointEarnedMultiplier=1.000000,CharacterPointEarnedMultiplier=1.000000,bUnlimitedResources=false,PlayerDamageMultiplier=1.000000,ArmorMultiplier=1.000000,BaseManaRegen=1.000000,bInventoryWeightRestrictions=true,MagicFindMultiplier=1.000000,CraftingMagicFindChanceMultiplier=1.000000,FlyingCostMultiplier=1.000000,FlyingSpeedMultiplier=1.000000,ResourceCollectionMultiplier=1.000000,StructureDamageMultiplier=1.000000,bRespectNoBuildZones=true,MagicStructureManaRegenerationMultiplier=1.000000,MagicStructureManaConsumptionMultiplier=0.000000,bFreeBuildMode=false,TimeOfDayLock=Auto,NPCPopulationMultiplier=1.000000,StructureDecayMultiplier=2.000000,bThronesDecay=true)\r\nEOT\r\n\r\nchmod +x $HOME\/CitadelServer.sh", - "container": "debian:buster-slim", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n##Copy steamclient.so to correct Dir\r\nmkdir -p $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\r\nchmod -R a+w,a+x $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\r\nif [[ ! -f $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\/steamclient.so ]]; then \r\n\tln -s ..\/..\/..\/..\/..\/..\/linux64\/steamclient.so $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\/steamclient.so\r\n\r\nfi\r\n\r\n## Create Game.ini\r\nmkdir $HOME\/Config\r\n\r\nif [[ -d $HOME\/Citadel\/Saved\/Config\/LinuxServer ]]; then \r\n\trm -rf $HOME\/Citadel\/Saved\/Config\/LinuxServer\r\nfi\r\n\r\nif [[ -d $HOME\/Engine\/Saved\/Config\/LinuxServer ]]; then \r\n\trm -rf $HOME\/Engine\/Saved\/Config\/LinuxServer\r\nfi\r\n\r\nmkdir -p $HOME\/Citadel\/Saved\/Config\r\nmkdir -p $HOME\/Engine\/Saved\/Config\r\n\r\nln -s ..\/..\/..\/Config $HOME\/Citadel\/Saved\/Config\/LinuxServer\r\nln -s ..\/..\/..\/Config $HOME\/Engine\/Saved\/Config\/LinuxServer\r\n\r\n#rm -fR $HOME\/Citadel\/Saved\/Config\/LinuxServer\/Game.ini\r\ncat < $HOME\/Config\/Game.ini\r\n[UWorks]\r\nConnectionPort=7777\r\nQueryPort=27015\r\n\r\n[\/Script\/Citadel.SocialManager]\r\nPassword=changeme\r\n\r\n[\/Script\/Citadel.CitadelGameInstance]\r\nWorldCreationSettings=(ServerName=\"CitadelServer\",Password=\"YourServerPassword\",ServerType=PVP,PlayerLimit=20,bPrivate=true,ExperienceMultiplier=1.000000,InventoryCapacityMultipler=1.000000,KnowledgePointEarnedMultiplier=1.000000,CharacterPointEarnedMultiplier=1.000000,bUnlimitedResources=false,PlayerDamageMultiplier=1.000000,ArmorMultiplier=1.000000,BaseManaRegen=1.000000,bInventoryWeightRestrictions=true,MagicFindMultiplier=1.000000,CraftingMagicFindChanceMultiplier=1.000000,FlyingCostMultiplier=1.000000,FlyingSpeedMultiplier=1.000000,ResourceCollectionMultiplier=1.000000,StructureDamageMultiplier=1.000000,bRespectNoBuildZones=true,MagicStructureManaRegenerationMultiplier=1.000000,MagicStructureManaConsumptionMultiplier=0.000000,bFreeBuildMode=false,TimeOfDayLock=Auto,NPCPopulationMultiplier=1.000000,StructureDecayMultiplier=2.000000,bThronesDecay=true)\r\nEOT\r\n\r\nchmod +x $HOME\/CitadelServer.sh", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, "variables": [ { - "name": "Game ID", + "name": "SRCDS_APPID", "description": "ID", "env_variable": "SRCDS_APPID", "default_value": "489650", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": false, + "user_editable": false, "rules": "required|numeric|digits_between:1,6" }, { @@ -37,8 +42,8 @@ "description": "port", "env_variable": "QPORT", "default_value": "27015", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:100" }, { @@ -46,9 +51,18 @@ "description": "", "env_variable": "ADMIN_PASSWD", "default_value": "changeme", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:100" + }, + { + "name": "Auto Update", + "description": "1 = on; 0 = off", + "env_variable": "AUTO_UPDATE", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" } ] } \ No newline at end of file diff --git a/game_eggs/steamcmd_servers/insurgency_sandstorm/egg-insurgency--sandstorm.json b/game_eggs/steamcmd_servers/insurgency_sandstorm/egg-insurgency--sandstorm.json index 03c21356..966e11fb 100644 --- a/game_eggs/steamcmd_servers/insurgency_sandstorm/egg-insurgency--sandstorm.json +++ b/game_eggs/steamcmd_servers/insurgency_sandstorm/egg-insurgency--sandstorm.json @@ -1,13 +1,18 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-06-27T05:17:21-04:00", + "exported_at": "2021-11-26T14:52:26+01:00", "name": "Insurgency: Sandstorm", "author": "brycea@terrahost.cloud", "description": "Insurgency: Sandstorm is a team-based, tactical FPS based on lethal close quarters combat and objective-oriented multiplayer gameplay. Experience the intensity of modern combat where skill is rewarded, and teamwork wins the fight.", - "image": "quay.io\/pterodactyl\/core:source", + "features": null, + "images": [ + "ghcr.io\/parkervcp\/games:source" + ], + "file_denylist": [], "startup": "\/home\/container\/Insurgency\/Binaries\/Linux\/InsurgencyServer-Linux-Shipping {{MAP_NAME}}?Scenario={{SCENARIO}}?MaxPlayers={{MAX_PLAYERS}} -Port={{SERVER_PORT}} -QueryPort={{QUERY_PORT}} -log -hostname=\"{{HOSTNAME}}\"", "config": { "files": "{}", @@ -17,8 +22,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n## install required packages to install insurgency: sandstorm\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\r\n## install steamcmd\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\nmkdir -p \/mnt\/server\/steam\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steam\r\ncd \/mnt\/server\/steam\r\n## needs to be used for steamcmd to operate correctly\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n## install insurgency: sandstorm\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\nchmod +x \/mnt\/server\/Insurgency\/Binaries\/Linux\/InsurgencyServer-Linux-Shipping", - "container": "ubuntu:20.04", + "script": "apt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\nchmod +x \/mnt\/server\/Insurgency\/Binaries\/Linux\/InsurgencyServer-Linux-Shipping", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, @@ -28,8 +33,8 @@ "description": "The ID corresponding to the game to download and run. Leave blank to avoid auto update.", "env_variable": "SRCDS_APPID", "default_value": "581330", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "nullable|numeric" }, { @@ -37,8 +42,8 @@ "description": "The name to appear in the server in the server list.", "env_variable": "HOSTNAME", "default_value": "My Insurgency Server", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:64" }, { @@ -46,8 +51,8 @@ "description": "Query port for your Insurgency server.", "env_variable": "QUERY_PORT", "default_value": "27131", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|numeric" }, { @@ -55,8 +60,8 @@ "description": "Sets the maximum number of players.", "env_variable": "MAXPLAYERS", "default_value": "28", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|numeric" }, { @@ -64,8 +69,8 @@ "description": "Default map to run when starting the server. Scenario must be available with the provided map.", "env_variable": "MAP_NAME", "default_value": "Canyon", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string" }, { @@ -73,9 +78,18 @@ "description": "By default, a server will cycle through all Versus (PVP) scenarios available.", "env_variable": "SCENARIO", "default_value": "Scenario_Crossing_Checkpoint_Insurgents", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string" + }, + { + "name": "Auto Update", + "description": "", + "env_variable": "AUTO_UPDATE", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" } ] } \ No newline at end of file diff --git a/game_eggs/steamcmd_servers/valheim/valheim_plus/README.md b/game_eggs/steamcmd_servers/valheim/valheim_plus/README.md index d6a9a2ef..072e70f7 100644 --- a/game_eggs/steamcmd_servers/valheim/valheim_plus/README.md +++ b/game_eggs/steamcmd_servers/valheim/valheim_plus/README.md @@ -11,7 +11,7 @@ Discord: https://discord.gg/AmH6Va97GT ***!!! ATTENTION !!!*** -***All (Server + Clients) need to have a installed Valheim Plus Mod !!!!*** +***All (Server + Clients) need to have a installed Valheim Plus Mod !!!!*** ## Server Ports @@ -19,4 +19,4 @@ Discord: https://discord.gg/AmH6Va97GT | Port | default | |-------|---------| | Game | 2456 | -| Query | 2457 | \ No newline at end of file +| Query | 2457 | From ad1d5fc501c65be72f67efa77d3b37fd74c66f9a Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Tue, 7 Dec 2021 18:18:09 +0200 Subject: [PATCH 0110/1001] feat(7d2d): allow specifying beta branch Adds SRCDS_BETAID for specifying beta branches Fixes telnet echo message "checing" typo Removes deprecated logs params resolves #1443 --- .../7_days_to_die/egg-7-days-to-die.json | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json b/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json index 9f195ba0..f0e44222 100644 --- a/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json +++ b/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-11-26T13:46:12+01:00", + "exported_at": "2021-12-07T16:16:58+00:00", "name": "7 Days To Die", "author": "kristoffer.norman@bahnhof.se", "description": "7 days to die server", @@ -13,16 +13,16 @@ "ghcr.io\/parkervcp\/games:source" ], "file_denylist": [], - "startup": ".\/7DaysToDieServer.x86_64 -configfile=serverconfig.xml -quit -batchmode -nographics -dedicated -ServerPort=${SERVER_PORT} -ServerMaxPlayerCount=${MAX_PLAYERS} -GameDifficulty=${GAME_DIFFICULTY} -ControlPanelEnabled=false -TelnetEnabled=true -TelnetPort=8081 -logfile logs\/latest.log & echo -e \"Checing on telnet connection\" && until nc -z -v -w5 127.0.0.1 8081; do echo \"Waiting for telnet connection...\"; sleep 5; done && telnet -E 127.0.0.1 8081", + "startup": ".\/7DaysToDieServer.x86_64 -configfile=serverconfig.xml -quit -batchmode -nographics -dedicated -ServerPort=${SERVER_PORT} -ServerMaxPlayerCount=${MAX_PLAYERS} -GameDifficulty=${GAME_DIFFICULTY} -ControlPanelEnabled=false -TelnetEnabled=true -TelnetPort=8081 -logfile logs\/latest.log & echo -e \"Checking on telnet connection\" && until nc -z -v -w5 127.0.0.1 8081; do echo \"Waiting for telnet connection...\"; sleep 5; done && telnet -E 127.0.0.1 8081", "config": { "files": "{}", - "startup": "{\r\n \"done\": \"Connected with 7DTD server\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "startup": "{\r\n \"done\": \"Connected with 7DTD server\"\r\n}", + "logs": "{}", "stop": "shutdown" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# 7 days to die Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", + "script": "#!\/bin\/bash\r\n# 7 days to die Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit \r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } @@ -72,6 +72,15 @@ "user_viewable": false, "user_editable": false, "rules": "required|string|max:20" + }, + { + "name": "Beta Branch", + "description": "Installs beta branch if specified. For example, latest_experimental would install the latest experimental branch release. Requires a reinstall to switch branches properly.", + "env_variable": "SRCDS_BETAID", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|max:20" } ] } \ No newline at end of file From 5fdf58c90df78ced3a48cbf61987615915fc0e9a Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 7 Dec 2021 18:25:32 +0200 Subject: [PATCH 0111/1001] fix(assetto): Specify Windows platform for update (#1447) --- .../assetto_corsa/egg-assetto-corsa.json | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/game_eggs/steamcmd_servers/assetto_corsa/egg-assetto-corsa.json b/game_eggs/steamcmd_servers/assetto_corsa/egg-assetto-corsa.json index 131c140c..5046c263 100644 --- a/game_eggs/steamcmd_servers/assetto_corsa/egg-assetto-corsa.json +++ b/game_eggs/steamcmd_servers/assetto_corsa/egg-assetto-corsa.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-11-26T13:56:27+01:00", + "exported_at": "2021-12-07T16:03:51+00:00", "name": "Assetto Corsa", "author": "admin@softwarenoob.com", "description": "Assetto Corsa (Italian for \"Race Setup\") is a sim racing video game developed by the Italian video game developer Kunos Simulazioni. It is designed with an emphasis on a realistic racing experience with support for extensive customization and moddability", @@ -17,12 +17,12 @@ "config": { "files": "{\r\n \"cfg\/server_cfg.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"NAME\": \"NAME={{server.build.env.HOSTNAME}}\",\r\n \"PASSWORD\": \"PASSWORD={{server.build.env.PASSWORD}}\",\r\n \"ADMIN_PASSWORD\": \"ADMIN_PASSWORD={{server.build.env.ADM_PASSWORD}}\",\r\n \"UDP_PORT\": \"UDP_PORT={{server.build.default.port}}\",\r\n \"TCP_PORT\": \"TCP_PORT={{server.build.default.port}}\",\r\n \"HTTP_PORT\": \"HTTP_PORT={{server.build.env.HTTP_PORT}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Server started\"\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", - "stop": "^C" + "logs": "{}", + "stop": "^^C" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\nif [ \"${STEAM_USER}\" == \"anonymous\" ]; then\r\n echo -e \"ERROR - STEAM USER NOT SET\\n\"\r\n echo -e \"Steam account must have the dedicated server in his library in order to install and host the game\\n\"\r\n echo -e \"You must configure Steam account in the server startup variables, after that reinstall the server\\n\"\r\nfi", + "script": "#!\/bin\/bash\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\nif [ \"${STEAM_USER}\" == \"anonymous\" ]; then\r\n echo -e \"ERROR - STEAM USER NOT SET\\n\"\r\n echo -e \"Steam account must have the dedicated server in library to install and host the game\\n\"\r\n echo -e \"You must configure Steam account in the server startup variables, after that reinstall the server\\n\"\r\nfi", "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } @@ -35,7 +35,7 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "required|string" }, { "name": "Steam Password", @@ -44,11 +44,11 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "required|string" }, { "name": "Steam Auth Code", - "description": "Steam Auth Code required if the Steam Account is using Steam Auth", + "description": "Steam Auth Code required if the Steam Account is using Steam Auth. Slow installs will cause the code to expire before it can be used.", "env_variable": "STEAM_AUTH", "default_value": "", "user_viewable": true, @@ -108,6 +108,15 @@ "user_viewable": true, "user_editable": true, "rules": "required|string|max:1" + }, + { + "name": "Windows param", + "description": "Required to always install and update the correct version of the game.", + "env_variable": "WINDOWS_INSTALL", + "default_value": "1", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:20" } ] } \ No newline at end of file From a8230eb7f9c8162000600037c3584f6a2d2a1dfa Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 08:13:26 -0500 Subject: [PATCH 0112/1001] fixed heading levels added blank lines as needed removed trailing spaces added code block for install process removed punctuation from headers --- CONTRIBUTING.md | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cc795afc..d8d9ed07 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,45 +2,47 @@ ## General rules -1. Keep it simple. - We don't need 8 miles of install script. +1. Keep it simple. + We don't need 8 miles of install script. -2. Keep it Small. - Only use what is absolutely needed. +2. Keep it Small. + Only use what is absolutely needed. -3. Try to stay in the stock containers. +3. Try to stay in the stock containers. If you need something in a container, open a PR in [my yolks repo](https://github.com/parkervcp/yolks) where I can review and pull it up to the main repo. In addition, there is a larger quantity of [images here](https://github.com/parkervcp/images) for you to use that have not been migrated to Yolks yet. -4. Don't be afraid to submit PR's to the egg repo. +4. Don't be afraid to submit PR's to the egg repo. I don't bite. I will work with you on the egg and the required things to run it. -## Step 1. -#### Be aware of the pterodactyl install process. +## Step 1 + +### Be aware of the pterodactyl install process The Pterodactyl install process is fairly simple once you know. - + +```md 1. Spin up install container This uses a volume mount on /mnt/server for the server files. This can pull or set up all that is needed to run the server. It is regularly used to just download the files required. Such as server files and configs. - 2. Stop install container - 3. Start a new container with the server files in /home/container This is where the server is actually run. Any dependencies installed during the install process are gone. The container that is started should have everything you need. +``` -## Step 2. -#### Testing +## Step 2 + +### Testing Make sure your install process is rock solid as I will be testing eggs before they ever hit my repo. -I will make suggestions and changes at will. +I will make suggestions and changes at will. This is to maintain a clean repo that others can pull and be fully aware of what is being done. +## Step 3 -## Step 3. -#### Make a branch and do your work in there. +### Make a branch and do your work in there I have been getting messy PR's due to people always PRing from their master branch. Please make a seperate branch and PR from there. From e94e0c2d276f170fe7ae8b4027e0d9b50a069069 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 08:14:21 -0500 Subject: [PATCH 0113/1001] fixed heading levels added blank lines as needed --- README.md | 74 +++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 58 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index f9ac72fe..3cae0836 100644 --- a/README.md +++ b/README.md @@ -18,14 +18,14 @@ If you are reading this it looks like you are looking to add an egg to your serv 5. Select what nest you want to put the egg in. 1. If you want a new nest you need to create it before importing the egg. -# You must restart your daemon after importing an egg if you are using 0.7. This is not required on 1.X. - +## You must restart your daemon after importing an egg if you are using 0.7. This is not required on 1.X ## Please read the CONTRIBUTING.md before submitting PRs ## [Bots](/bots) [Discord](/bots/discord) + * [ATL Bot](/bots/discord/atlbot) Node JS * [Bastion](/bots/discord/bastion) Node JS * [CorpBot](/bots/discord/corpbot) Python @@ -42,43 +42,56 @@ If you are reading this it looks like you are looking to add an egg to your serv * [SinusBot](/bots/discord/sinusbot) [Other](/bots/other) + * [Big Brother Bot](/bots/other/bigbrotherbot) [Twitch](/bots/twitch) - * [PhantomBot](/bots/twitch/phantombot) - * [SogeBot](/bots/twitch/sogebot) + +* [PhantomBot](/bots/twitch/phantombot) +* [SogeBot](/bots/twitch/sogebot) [TeamSpeak3](bots/teamspeak3) - * [JTS3ServerMod](/bots/teamspeak3/jts3servermod) + +* [JTS3ServerMod](/bots/teamspeak3/jts3servermod) ## [Database](/database) + ### In-Memory Databases + [Redis](/database/redis) + * [Redis 5](/database/redis/redis-5) * [Redis 6](/database/redis/redis-6) ### noSQL + * [mongoDB](/database/nosql/mongodb) ### SQL Databases + * [MariaDB](/database/sql/mariadb) * [PostgreSQL](/database/sql/postgres) ## [Voice Servers](/voice_servers) + * [Lavalink](/voice_servers/lavalink) * [TeaSpeak](/voice_servers/teaspeak) * [TS3-Manager](/voice_servers/ts3_manager) ## [Game Eggs](/game_eggs) + [Among Us](game_eggs/among_us) + * [Impostor Server](game_eggs/among_us/impostor_server) * [CrewLink Server](game_eggs/among_us/crewlink_server) [BeamNG.drive](game_eggs/beamng) + * [BeamMP Server](game_eggs/beamng/beammp) * [KissMP](game_eggs/beamng/kissmp) [ClassiCube](game_eggs/classicube) + * [MCGalaxy](game_eggs/classicube/mcgalaxy) [Call of Duty 4X](game_eggs/cod/cod4x) @@ -88,10 +101,12 @@ If you are reading this it looks like you are looking to add an egg to your serv [FTL: Tachyon](game_eggs/ftl/tachyon) [Factorio](game_eggs/factorio) + * [Vanilla](game_eggs/factorio/factorio) * [ModUpdate](game_eggs/factorio/factorio-modupdate) [Grand Theft Auto](game_eggs/gta) + * GTA V * [FiveM](game_eggs/gta/fivem) * [RageMP](game_eggs/gta/ragemp) @@ -105,28 +120,32 @@ If you are reading this it looks like you are looking to add an egg to your serv * [GTAC](game_eggs/gta/gtac) [Mindustry](game_eggs/mindustry) - * [Mindustry](game_eggs/mindustry/mindustry) + +* [Mindustry](game_eggs/mindustry/mindustry) [League Sandbox](game_eggs/leaguesandbox) - * [League Sandbox](game_eggs/leaguesandbox/leaguesandbox) + +* [League Sandbox](game_eggs/leaguesandbox/leaguesandbox) [Minetest](game_eggs/minetest) (including MTG) - * [Minetest](game_eggs/minetest/minetest) + +* [Minetest](game_eggs/minetest/minetest) [Minecraft](game_eggs/minecraft) + * [Bedrock](game_eggs/minecraft/bedrock) Servers for Bedrock Minecraft (Windows 10, mobile, console) * [Bedrock](game_eggs/minecraft/bedrock/bedrock) * [gomint](game_eggs/minecraft/bedrock/gomint) - * [Nukkit](game_eggs/minecraft/bedrock/nukkit) - * [PocketMine MP](game_eggs/minecraft/bedrock/pocketmine_mp) + * [Nukkit](game_eggs/minecraft/bedrock/nukkit) + * [PocketMine MP](game_eggs/minecraft/bedrock/pocketmine_mp) * [Java](game_eggs/minecraft/java) Servers for Java Minecraft * [Airplane](game_eggs/minecraft/java/airplane) * [Cuberite](game_eggs/minecraft/java/cuberite) * [Fabric](game_eggs/minecraft/java/fabric) - * [Feather](game_eggs/minecraft/java/feather) - * [Feed The Beast](game_eggs/minecraft/java/ftb) - * [Forge](game_eggs/minecraft/java/forge) + * [Feather](game_eggs/minecraft/java/feather) + * [Feed The Beast](game_eggs/minecraft/java/ftb) + * [Forge](game_eggs/minecraft/java/forge) * [Magma](game_eggs/minecraft/java/magma) * [Mohist](game_eggs/minecraft/java/mohist) * [NanoLimbo](/game_eggs/minecraft/java/nanolimbo) @@ -141,7 +160,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Proxies](game_eggs/minecraft/proxy) Minecraft Server Proxies * [Java](game_eggs/minecraft/proxy/java) - * [FlameCord](game_eggs/minecraft/proxy/java/flamecord) + * [FlameCord](game_eggs/minecraft/proxy/java/flamecord) * [Travertine](game_eggs/minecraft/proxy/java/travertine) * [TyphoonLimbo](game_eggs/minecraft/proxy/java/typhoonlimbo) * [Velocity](game_eggs/minecraft/proxy/java/velocity) @@ -152,18 +171,22 @@ If you are reading this it looks like you are looking to add an egg to your serv * [GeyserMC](game_eggs/minecraft/proxy/cross_platform/geyser) * [Waterdog](game_eggs/minecraft/proxy/cross_platform/waterdog) -[OpenArena](game_eggs/openarena) - * [openarena](game_eggs/openarena/openarena) +[OpenArena](game_eggs/openarena) + +* [openarena](game_eggs/openarena/openarena) [OpenRA](game_eggs/openra) + * [OpenRA Dune2000](game_eggs/openra/openra_dune2000) * [OpenRA Red Alert](game_eggs/openra/openra_red_alert) * [OpenRA Tiberian Dawn](game_eggs/openra/openra_tiberian_dawn) [Red Dead Redemption](game_eggs/rdr) + * [RedM](game_eggs/rdr/redm) [SteamCMD Servers](game_eggs/steamcmd_servers) These eggs use SteamCMD to install + * [7 Days to Die](game_eggs/steamcmd_servers/7_days_to_die) * [ARK: Survival Evolved](game_eggs/steamcmd_servers/ark_survival_evolved) * [Arma](game_eggs/steamcmd_servers/arma) @@ -217,14 +240,17 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Valheim Plus Mod](game_eggs/steamcmd_servers/valheim/valheim_plus) [Teeworlds](game_eggs/teeworlds) + * [Teeworlds](game_eggs/teeworlds/teeworlds) [Terraria](game_eggs/terraria) + * [Vanilla](game_eggs/terraria/vanilla) * [tModLoader](game_eggs/terraria/tmodloader) * [TShock](game_eggs/terraria/tshock) [Tycoon Games](game_eggs/tycoon_games) + * [OpenTTD](game_eggs/tycoon_games/openttd) [Veloren](game_eggs/veloren) @@ -236,23 +262,39 @@ If you are reading this it looks like you are looking to add an egg to your serv [Xonotic](game_eggs/xonotic/xonotic) ## [Monitoring](/monitoring/) + ### Prometheus + * [Prometheus](/monitoring/prometheus) ## [Storage](/storage/) + ### S3 Storage + * [minio](/storage/minio) ## [Software](/software/) + ### Code Server + * [Code-Server](/software/code-server) + ### Elasticsearch + * [Elasticsearch](/software/elasticsearch) + ### Gitea + * [Gitea](/software/gitea) + ### Grafana + * [Grafana](/software/grafana) + ### haste-server + * [haste-server](/software/haste-server) + ### RabbitMQ + * [rabbitmq](/software/rabbitmq) From b5877645e5aa6412ec6edc4f8453111d34a1defb Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 08:25:39 -0500 Subject: [PATCH 0114/1001] fixed heading levels added blank lines as needed made headers into links --- bots/discord/README.md | 73 +++++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 30 deletions(-) diff --git a/bots/discord/README.md b/bots/discord/README.md index 99f02d57..6d7490ad 100644 --- a/bots/discord/README.md +++ b/bots/discord/README.md @@ -1,56 +1,69 @@ # Discord Bots -### Some of these bots support other services but are primarily Discord bots +## Some of these bots support other services but are primarily Discord bots -#### ATLauncher Discord Bot -[ATLauncher/discord-bot](https://github.com/ATLauncher/discord-bot) -Their github has all the info you need +### [ATLauncher Discord Bot](atlbot) -#### Bastion -[TheBastionBot/Bastion](https://github.com/TheBastionBot/Bastion) +[ATLauncher/discord-bot](https://github.com/ATLauncher/discord-bot) +Their github has all the info you need + +### [Bastion](bastion) + +[TheBastionBot/Bastion](https://github.com/TheBastionBot/Bastion) Give awesome perks to your Discord server! -### Corpbot +### [Corpbot](corpbot) + [corpnewt/CorpBot.py](https://github.com/corpnewt/CorpBot.py) A very clumsy python bot for discord -#### DiscordJS -[discord.js](https://discord.js.org/) +### [DiscordJS](discord.js) + +[discord.js](https://discord.js.org/) A generic discord.js egg for running discord bots. -#### DiscordPY -[discord.py](https://discordpy.readthedocs.io/en/latest/) +### [DiscordPY](discord.py) + +[discord.py](https://discordpy.readthedocs.io/en/latest/) A generic discord.py egg for running discord bots. -#### discordgo +### [discordgo](discordgo) + [discordgo](https://github.com/bwmarrin/discordgo) A generic go application egg. -#### FragBot -[fragforce/fragbot](https://github.com/fragforce/fragbot) -The bot that runs as the fragforce `@Fragbot` offering looking-for-group services for now +### [FragBot](fragbot) -#### MusicBot -[jagrosh/MusicBot](https://github.com/jagrosh/MusicBot) -A Discord music bot that's easy to set up and run yourself! +[fragforce/fragbot](https://github.com/fragforce/fragbot) +The bot that runs as the fragforce `@Fragbot` offering looking-for-group services for now -#### nodemon -[nodemon](https://nodemon.io/) +### [JMusicBot](jmusicbot) + +[jagrosh/MusicBot](https://github.com/jagrosh/MusicBot) +A Discord music bot that's easy to set up and run yourself! + +### [nodemon](nodemon.js) + +[nodemon](https://nodemon.io/) A nodemon javascript egg for running and automatically restarting the node application when file changes in the directory are detected -#### parkertron -[parkervcp/parkertron](https://github.com/parkervcp/parkertron) -The bot that runs as the pterodactyl `@Support Bot` +### [parkertron](parkertron) -#### PixelBot -[possatti/pixelbot](https://github.com/possatti/pixelbot) -No longer actively developed. -Was used to test python services. +[parkervcp/parkertron](https://github.com/parkervcp/parkertron) +The bot that runs as the pterodactyl `@Support Bot` + +### [PixelBot](pixelbot) + +[possatti/pixelbot](https://github.com/possatti/pixelbot) +No longer actively developed. +Was used to test python services. + +### [RedBot](redbot) -### RedBot [Cog-Creators/Red-DiscordBot](https://github.com/Cog-Creators/Red-DiscordBot) A multifunction Discord bot -#### SinusBot -[SinusBot](https://www.sinusbot.com/) +### [SinusBot](sinusbot) + +[SinusBot](https://www.sinusbot.com/) Please Check their site for an in depth on the bot. From 40a00f8e343b1c9d2c19a7ca96c4f33587ae9c9d Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 08:25:55 -0500 Subject: [PATCH 0115/1001] fixed heading levels added blank lines as needed --- bots/discord/atlbot/README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bots/discord/atlbot/README.md b/bots/discord/atlbot/README.md index 008d3906..f20d135c 100644 --- a/bots/discord/atlbot/README.md +++ b/bots/discord/atlbot/README.md @@ -1,6 +1,9 @@ # ATLBot -### Their [Github](https://github.com/ATLauncher/discord-bot) + +## Their [Github](https://github.com/ATLauncher/discord-bot) + This is the code for our Discord bot which runs on the official ATLauncher Discord server -### Server Ports -There are no ports required for the atl bot \ No newline at end of file +## Server Ports + +There are no ports required for the atl bot From a26bd65979d153ff10510b5b859ff00aad0502f9 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 08:26:24 -0500 Subject: [PATCH 0116/1001] fixed heading levels added blank lines as needed removed trailing spaces --- bots/discord/bastion/README.md | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/bots/discord/bastion/README.md b/bots/discord/bastion/README.md index 1dc840db..06e0baf1 100644 --- a/bots/discord/bastion/README.md +++ b/bots/discord/bastion/README.md @@ -1,13 +1,18 @@ # Bastion -### From their [Github](https://github.com/TheBastionBot/Bastion) -Give awesome perks to your Discord server! -### Install notes -Due to rate limiting the console on the panel cannot keep up with the game console and the build will complete before the panel console may show it. Reloading the console will load it to the latest part of the log. +## From their [Github](https://github.com/TheBastionBot/Bastion) + +Give awesome perks to your Discord server! + +## Install notes + +Due to rate limiting the console on the panel cannot keep up with the game console and the build will complete before the panel console may show it. Reloading the console will load it to the latest part of the log. ## Running the bot + You need to enable both `Privileged Gateway Intents` for the bot to run. Enable this from `https://discord.com/developers/applications//bot` -### Server Ports -No Ports are required for the bastion bot. \ No newline at end of file +## Server Ports + +No Ports are required for the bastion bot. From 20db612dbe913e90c49c6027674cdba6648fc32b Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 08:27:03 -0500 Subject: [PATCH 0117/1001] fixed heading levels added blank lines as needed removed trailing spaces removed punctuation from headers --- bots/discord/corpbot/README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bots/discord/corpbot/README.md b/bots/discord/corpbot/README.md index 8fd994f9..20d8c2b2 100644 --- a/bots/discord/corpbot/README.md +++ b/bots/discord/corpbot/README.md @@ -1,8 +1,11 @@ # CorpBot.py -### From their [Github](https://github.com/corpnewt/CorpBot.py) -A very clumsy python bot for discord -### Server Ports +## From their [Github](https://github.com/corpnewt/CorpBot.py) + +A very clumsy python bot for discord + +## Server Ports + No ports are required to run CorpBot. You can assign a random port to the bot. -#### Mods/Plugins may require ports to be added to the server. +### Mods/Plugins may require ports to be added to the server From 80ea31a7705be77d93bcee2e208bd34b98e5ca55 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 08:28:03 -0500 Subject: [PATCH 0118/1001] fixed heading levels added blank lines as needed added code block tag --- bots/discord/deno/README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bots/discord/deno/README.md b/bots/discord/deno/README.md index bf981cfc..4e47367d 100644 --- a/bots/discord/deno/README.md +++ b/bots/discord/deno/README.md @@ -1,6 +1,6 @@ # Deno generic -### From their [site](https://deno.land/) +## From their [site](https://deno.land/) This egg is designed to run any generic Deno application, allowing users to pull their own Deno discord bot from a Github repository. @@ -9,14 +9,16 @@ There is an option to allow a user to upload their own files to run a server. The startup configs and commands may need changing to actually function properly. ## Configuration + The server will be stuck as `starting` until the egg Start Configuration is modified. You have to edit the text to match something your bot will print for Pterodactyl panel to detect it as running. ![image](https://user-images.githubusercontent.com/10975908/126516861-c5cb4630-9f25-405c-8199-97bf5ec15a7f.png) You can use arrays to have multiple different values when different bots are being used -``` + +```json { "done":[ "change this text 1", "change this text 2" ] -} \ No newline at end of file +} From cdd22e70525e9febd2008862cffd28709eb29136 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 08:28:28 -0500 Subject: [PATCH 0119/1001] fixed heading levels added blank lines as needed added code block tag --- bots/discord/discord.java/README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bots/discord/discord.java/README.md b/bots/discord/discord.java/README.md index 1f18f7d4..57d230ed 100644 --- a/bots/discord/discord.java/README.md +++ b/bots/discord/discord.java/README.md @@ -1,4 +1,5 @@ # discord.java generic + This egg is designed to run any generic Java application, allowing users to pull their own Java discord bot from a Github repository. There is an option to allow a user to upload their own files to run a bot. @@ -6,14 +7,16 @@ There is an option to allow a user to upload their own files to run a bot. The startup configs and commands may need changing to actually function properly. ## Configuration + The server will be stuck as `starting` until the egg Start Configuration is modified. You have to edit the text to match something your bot will print for Pterodactyl panel to detect it as running. ![image](https://user-images.githubusercontent.com/10975908/126516861-c5cb4630-9f25-405c-8199-97bf5ec15a7f.png) You can use arrays to have multiple different values when different bots are being used -``` + +```json { "done":[ "change this text 1", "change this text 2" ] -} \ No newline at end of file +} From 1f9e2ff7b578259b598c5f328c35928ba3762a53 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 08:28:50 -0500 Subject: [PATCH 0120/1001] added code block tag added blank lines as needed --- bots/discord/discord.js/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bots/discord/discord.js/README.md b/bots/discord/discord.js/README.md index cab8f28f..1d7a903d 100644 --- a/bots/discord/discord.js/README.md +++ b/bots/discord/discord.js/README.md @@ -7,11 +7,13 @@ There is an option to allow a user to upload their own files to run a bot. The startup configs and commands may need changing to actually function properly. ## Configuration + The server will be stuck as `starting` until the egg Start Configuration is modified. You have to edit the text to match something your bot will print for Pterodactyl panel to detect it as running. ![image](https://user-images.githubusercontent.com/10975908/126516861-c5cb4630-9f25-405c-8199-97bf5ec15a7f.png) You can use arrays to have multiple different values when different bots are being used -``` + +```json { "done":[ "change this text 1", From cb9558a6b47635fbd6eda2c163bef09675c87ce0 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 08:29:09 -0500 Subject: [PATCH 0121/1001] added code block tag added blank lines as needed --- bots/discord/discord.py/README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bots/discord/discord.py/README.md b/bots/discord/discord.py/README.md index 80b3ffb5..2a823146 100644 --- a/bots/discord/discord.py/README.md +++ b/bots/discord/discord.py/README.md @@ -1,4 +1,5 @@ # discord.py generic + This egg is designed to run any generic Python application, allowing users to pull their own Python discord bot from a Github repository. There is an option to allow a user to upload their own files to run a bot. @@ -6,14 +7,16 @@ There is an option to allow a user to upload their own files to run a bot. The startup configs and commands may need changing to actually function properly. ## Configuration + The server will be stuck as `starting` until the egg Start Configuration is modified. You have to edit the text to match something your bot will print for Pterodactyl panel to detect it as running. ![image](https://user-images.githubusercontent.com/10975908/126516861-c5cb4630-9f25-405c-8199-97bf5ec15a7f.png) You can use arrays to have multiple different values when different bots are being used -``` + +```json { "done":[ "change this text 1", "change this text 2" ] -} \ No newline at end of file +} From 799092e81d5d2e52b2805d4d66572f5ddff1e41a Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 08:29:57 -0500 Subject: [PATCH 0122/1001] added code block tag added blank lines as needed removed trailing spaces --- bots/discord/discordgo/README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bots/discord/discordgo/README.md b/bots/discord/discordgo/README.md index 02aaf500..9aaf837b 100644 --- a/bots/discord/discordgo/README.md +++ b/bots/discord/discordgo/README.md @@ -1,22 +1,25 @@ # discordgo generic + This egg is designed to run any generic Golang application, allowing users to pull their own Golang discord bot from a Github repository. The startup configs and commands may need changing to actually function properly. Users cannot upload their own code as this is built to build the resulting bot. -`GO_PACKAGE` is the variable for the go repo i.e. `github.com/aurieh/ddg-ng` +`GO_PACKAGE` is the variable for the go repo i.e. `github.com/aurieh/ddg-ng` `EXECUTABLE` is the variable for the executable that is built i.e. `ddg-ng` ## Configuration + The server will be stuck as `starting` until the egg Start Configuration is modified. You have to edit the text to match something your bot will print for Pterodactyl panel to detect it as running. ![image](https://user-images.githubusercontent.com/10975908/126516861-c5cb4630-9f25-405c-8199-97bf5ec15a7f.png) You can use arrays to have multiple different values when different bots are being used -``` + +```json { "done":[ "change this text 1", "change this text 2" ] -} \ No newline at end of file +} From d051a250793b2ebb12bb16a23494e187e9473299 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 08:30:17 -0500 Subject: [PATCH 0123/1001] fixed heading levels added blank lines as needed --- bots/discord/fragbot/README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bots/discord/fragbot/README.md b/bots/discord/fragbot/README.md index 6ef6eedd..2ffdb8d7 100644 --- a/bots/discord/fragbot/README.md +++ b/bots/discord/fragbot/README.md @@ -1,8 +1,11 @@ # fragbot -### Their [Github](https://github.com/fragforce/fragbot) -The golang based discord bot for fragforce. + +## Their [Github](https://github.com/fragforce/fragbot) + +The golang based discord bot for fragforce. Runs the fragforce `@fragbot` -### Server Ports -There are no ports required for fragbot \ No newline at end of file +## Server Ports + +There are no ports required for fragbot From 959db5b535cbb3830ddf127fcb7adb4600265537 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 08:30:41 -0500 Subject: [PATCH 0124/1001] fixed heading levels added blank lines as needed --- bots/discord/jmusicbot/README.md | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/bots/discord/jmusicbot/README.md b/bots/discord/jmusicbot/README.md index addeb37b..67c1252d 100644 --- a/bots/discord/jmusicbot/README.md +++ b/bots/discord/jmusicbot/README.md @@ -1,6 +1,9 @@ # JMusicBot + ___ -### Authors / Contributors + +## Authors / Contributors + @@ -51,7 +54,9 @@ ___ ___ -### Bot Description & Features + +## Bot Description & Features + From the developer's [Github](https://github.com/jagrosh/MusicBot): > A Discord music bot that's easy to set up and run yourself! @@ -65,17 +70,25 @@ From the developer's [Github](https://github.com/jagrosh/MusicBot): - Supports many online radio/streams - Supports local files - Playlist support (both web/youtube, and local) + ___ -### Configuration + +## Configuration + - If you can, edit the Startup Variables before starting the bot, because otherwise it will fail to start. - Most settings found in `config.txt` can be edited via the Startup Variables. Advanced settings not listed can still be edited manually via the File Manager. Available Startup Variables will take precedent over manual edits. + ___ -### Server Ports + +## Server Ports + There are no ports required for JMusicBot. ___ -### Updating + +## Updating + Re-Installing the server via the panel will do the following: 1. Update the bot to the latest version. 2. Update the `config.txt` file to the latest version, and place the old one at `config.txt-old`. -3. Any local songs will remain and not be touched. \ No newline at end of file +3. Any local songs will remain and not be touched. From 63610a5975699564271e482970ded10e58b6fe11 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 08:31:01 -0500 Subject: [PATCH 0125/1001] added blank line as needed --- bots/discord/lua/luvit/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bots/discord/lua/luvit/README.md b/bots/discord/lua/luvit/README.md index 8c51a6c3..5a4114c2 100644 --- a/bots/discord/lua/luvit/README.md +++ b/bots/discord/lua/luvit/README.md @@ -4,4 +4,4 @@ This egg was designed to allow a user to pull their own lua discord bot from a r There is an option to allow a user to upload their own files to run a bot. -The startup configs and commands may need changing to actually function properly. \ No newline at end of file +The startup configs and commands may need changing to actually function properly. From 5a8c76e0093a6015a19e02576b5871146ea4ab70 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 08:32:29 -0500 Subject: [PATCH 0126/1001] added blank lines as needed added code block tag --- bots/discord/nodemon.js/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bots/discord/nodemon.js/README.md b/bots/discord/nodemon.js/README.md index 4b4f695b..c50d7e1a 100644 --- a/bots/discord/nodemon.js/README.md +++ b/bots/discord/nodemon.js/README.md @@ -11,11 +11,13 @@ There is an option to allow a user to upload their own files to run a bot. The startup configs and commands may need changing to actually function properly. ## Configuration + The server will be stuck as `starting` until the egg Start Configuration is modified. You have to edit the text to match something your bot will print for Pterodactyl panel to detect it as running. ![image](https://user-images.githubusercontent.com/10975908/126516861-c5cb4630-9f25-405c-8199-97bf5ec15a7f.png) You can use arrays to have multiple different values when different bots are being used -``` + +```json { "done":[ "change this text 1", From d08c4deb3c70ed31ee07a0914e74dfe1d201d0cf Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 08:33:32 -0500 Subject: [PATCH 0127/1001] fixed heading levels added blank lines as needed --- bots/discord/parkertron/README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bots/discord/parkertron/README.md b/bots/discord/parkertron/README.md index e66546f7..24975d02 100644 --- a/bots/discord/parkertron/README.md +++ b/bots/discord/parkertron/README.md @@ -1,8 +1,11 @@ # parkertron -### Their [Github](https://github.com/parkervcp/parkertron) -Purely a chatbot. Not even a smart one. + +## Their [Github](https://github.com/parkervcp/parkertron) + +Purely a chatbot. Not even a smart one. Runs the Pterodactyl `@support bot` -### Server Ports -There are no ports required for parkertron \ No newline at end of file +## Server Ports + +There are no ports required for parkertron From 26c6ce3a7389ce3614df815173adfc12edf88afd Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 08:33:50 -0500 Subject: [PATCH 0128/1001] fixed heading levels added blank lines as needed removed trailing spaces --- bots/discord/pixelbot/README.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/bots/discord/pixelbot/README.md b/bots/discord/pixelbot/README.md index 4726344e..99c92060 100644 --- a/bots/discord/pixelbot/README.md +++ b/bots/discord/pixelbot/README.md @@ -1,9 +1,13 @@ # pixelbot -### Their [Github](https://github.com/possatti/pixelbot) -Bot for pixelcanvas.io -### Server Ports +## Their [Github](https://github.com/possatti/pixelbot) + +Bot for pixelcanvas.io + +## Server Ports + There are no ports required for pixelbot -### Side notes -This was to make sure the parkervcp/images:python 3 image worked. \ No newline at end of file +## Side notes + +This was to make sure the parkervcp/images:python 3 image worked. From ab384b322cfd75e31c4bbde1bdb8ef4011e3bc70 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 08:35:13 -0500 Subject: [PATCH 0129/1001] fixed heading levels added blank lines as needed removed trailing spaces incased url --- bots/discord/redbot/README.md | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/bots/discord/redbot/README.md b/bots/discord/redbot/README.md index cad24c5a..64a78c16 100644 --- a/bots/discord/redbot/README.md +++ b/bots/discord/redbot/README.md @@ -1,16 +1,20 @@ # Red-DiscordBot -### From their [Github](https://github.com/Cog-Creators/Red-DiscordBot) -A multifunction Discord bot -### Server Ports +## From their [Github](https://github.com/Cog-Creators/Red-DiscordBot) + +A multifunction Discord bot + +## Server Ports + No port are required to run Red. if you want to use the internal Lavalink Server, you need to allocate port 2333 as primary -### Additional Requirements +## Additional Requirements + When using the Audio Cog the bot will attempt to save files to /tmp resulting in a disk space error. You may also see this same error when attempting to install a cog, due to pip using /tmp to build the requirements. To resolve this error you must increase the size of `tmpfs` using custom container policy. -For additional details see: -https://pterodactyl.io/wings/1.0/configuration.html#other-values +For additional details see: + -#### Mods/Plugins may require ports to be added to the server. +### Mods/Plugins may require ports to be added to the server From e6b695fcc835c8fdb0d6b9800d259873b75c6b9f Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 08:35:27 -0500 Subject: [PATCH 0130/1001] fixed heading levels added blank lines as needed --- bots/discord/sinusbot/README.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/bots/discord/sinusbot/README.md b/bots/discord/sinusbot/README.md index 9fe05294..81ab0f0f 100644 --- a/bots/discord/sinusbot/README.md +++ b/bots/discord/sinusbot/README.md @@ -1,15 +1,19 @@ # SinusBot -### Their [Site](https://www.sinusbot.com/) -Listen to your favorite music together with all of your friends -Welcome the Simple, Elegant & great sounding TS3- and Discord-Bot! +## Their [Site](https://www.sinusbot.com/) + +Listen to your favorite music together with all of your friends + +Welcome the Simple, Elegant & great sounding TS3- and Discord-Bot! + +## Server Ports -### Server Ports 1 port is required to run SinusBot. | Port | default | |---------|---------| | Game | 8087 | -### Side notes -This uses a custom image. \ No newline at end of file +## Side notes + +This uses a custom image. From 8e37048b2f1fd1c67da2fe52c84378c2ad0ee9b8 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 08:36:14 -0500 Subject: [PATCH 0131/1001] fixed heading levels added blank lines as needed --- bots/other/bigbrotherbot/README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bots/other/bigbrotherbot/README.md b/bots/other/bigbrotherbot/README.md index 7ff6f9e6..27580e60 100644 --- a/bots/other/bigbrotherbot/README.md +++ b/bots/other/bigbrotherbot/README.md @@ -1,8 +1,11 @@ # Big Brother Bot -### From their [Github](https://github.com/BigBrotherBot/big-brother-bot) -Big Brother Bot B3 is a complete and total server administration package for online games. B3 is designed primarily to keep your server free from the derelicts of online gaming, but offers more, much more -### Server Ports +## From their [Github](https://github.com/BigBrotherBot/big-brother-bot) + +Big Brother Bot B3 is a complete and total server administration package for online games. B3 is designed primarily to keep your server free from the derelicts of online gaming, but offers more, much more + +## Server Ports + No ports are required to run Big Brother Bot. You can assign a random port to the bot. -#### Mods/Plugins may require ports to be added to the server. \ No newline at end of file +### Mods/Plugins may require ports to be added to the server From 7f1dde47653517c252dfd52ee64240bc87ba1d31 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 08:38:19 -0500 Subject: [PATCH 0132/1001] fixed heading levels added blank lines as needed added links to headers --- bots/teamspeak3/README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bots/teamspeak3/README.md b/bots/teamspeak3/README.md index f430ca9f..f6362c22 100644 --- a/bots/teamspeak3/README.md +++ b/bots/teamspeak3/README.md @@ -1,7 +1,8 @@ # TeamSpeak3 Bots -### Some of these bots support other services but are primarily TeamSpeak3 bots +## Some of these bots support other services but are primarily TeamSpeak3 bots -#### JTS3ServerMod -[JTS3ServerMod](https://www.stefan1200.de/forum/index.php?topic=2.0) -Please Check their site for an in depth on the bot. \ No newline at end of file +### [JTS3ServerMod](jts3servermod) + +[JTS3ServerMod](https://www.stefan1200.de/forum/index.php?topic=2.0) +Please Check their site for an in depth on the bot. From eed515401f2dab61dfb1bb3e16c9b30a74f6ab75 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 09:02:28 -0500 Subject: [PATCH 0133/1001] fixed heading levels added blank lines as needed added links to headers added bot descriptions from their githubs added their github links --- bots/twitch/README.md | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/bots/twitch/README.md b/bots/twitch/README.md index 8c12388f..365ec895 100644 --- a/bots/twitch/README.md +++ b/bots/twitch/README.md @@ -1,6 +1,15 @@ # Twitch Bots -### Some of these bots support other services but are primarily Twitch bots +## Some of these bots support other services but are primarily Twitch bots -#### PhantomBot [Homepage](https://phantombot.github.io/PhantomBot/) [Egg](/bots/twitch/phantombot/) -#### sogeBot [Homepage](https://sogebot.xyz) [Egg](/bots/twitch/sogebots/) +### [PhantomBot](phantombot) + +[Website](https://phantombot.github.io/PhantomBot/) +[GitHub](https://github.com/phantombot/PhantomBot) +PhantomBot is an actively developed open source interactive Twitch bot with a vibrant community that provides entertainment and moderation for your channel, allowing you to focus on what matters the most to you - your game and your viewers. + +### [SogeBot](sogebot) + +[Website](https://sogebot.xyz) +[GitHub](https://github.com/sogebot/sogeBot) +Free Twitch Bot built on Node.js From 6c902a7982edc1d3005f9b5faa9c6e70e60e464f Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 09:04:36 -0500 Subject: [PATCH 0134/1001] fixed heading levels added blank lines as needed added github link updated description from their github --- bots/twitch/phantombot/README.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/bots/twitch/phantombot/README.md b/bots/twitch/phantombot/README.md index de58899c..ab9e186f 100644 --- a/bots/twitch/phantombot/README.md +++ b/bots/twitch/phantombot/README.md @@ -1,10 +1,11 @@ # PhantomBot -### Their [Site](https://phantombot.github.io/PhantomBot/) -PhantomBot is an actively developed open source interactive Twitch bot -with a vibrant community that provides entertainment and moderation for your channel, -allowing you to focus on what matters the most to you - your game and your viewers. -### Server Ports +[WebSite](https://phantombot.github.io/PhantomBot/) +[GitHub](https://github.com/phantombot/PhantomBot) +PhantomBot is an actively developed open source interactive Twitch bot with a vibrant community that provides entertainment and moderation for your channel, allowing you to focus on what matters the most to you - your game and your viewers. + +## Server Ports + 3 ports are required to run PhantomBot. | Port | default | @@ -13,7 +14,8 @@ allowing you to focus on what matters the most to you - your game and your viewe | YoutubeSocketServer | 25003 | | PanelSocketServer | 25004 | -# NOTES +### NOTES + You need to define one main port and the other 2 port need to be +3 and +4! Example: From 9d1ebf9a1d44f8895b5a79dd6101fc13008f74d0 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 09:08:29 -0500 Subject: [PATCH 0135/1001] fixed heading levels added blank lines as needed added github link updated description with latest from there website/github --- bots/twitch/sogebot/README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/bots/twitch/sogebot/README.md b/bots/twitch/sogebot/README.md index c2c82425..02a15492 100644 --- a/bots/twitch/sogebot/README.md +++ b/bots/twitch/sogebot/README.md @@ -1,15 +1,17 @@ # SogeBot -### Their [Site](https://www.sogebot.xyz) -sogeBot is an actively developed open source interactive Twitch bot that provides entertainment and moderation for your channel, -allowing you to focus on what matters the most to you - your game and your viewers. -### Server Ports +[Website](https://sogebot.xyz) +[GitHub](https://github.com/sogebot/sogeBot) +Free Twitch Bot built on Node.js + +## Server Ports + 1 port is required to run sogeBot. | Port | default | |---------------------|---------| | Game (HTTP Server) | 20000 | -#NOTES +## NOTES The installation take a long time, because a lot of things must be compiled. It can take 5 or more minutes !!! From 7a2112ba09bf563eb7c2c74ff722b631bea151f9 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 09:09:15 -0500 Subject: [PATCH 0136/1001] fixed heading levels added blank lines as needed incased url --- database/sql/postgres/README.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/database/sql/postgres/README.md b/database/sql/postgres/README.md index 68feb186..317c23e5 100644 --- a/database/sql/postgres/README.md +++ b/database/sql/postgres/README.md @@ -1,14 +1,17 @@ # PostgreSQL -### From their [Website](https://www.postgresql.org/) -The World's Most Advanced Open Source Relational Database -### Minimum RAM warning +## From their [Website](https://www.postgresql.org/) + +The World's Most Advanced Open Source Relational Database + +## Minimum RAM warning + 2 Gigabytes minimum recommended -See here https://www.commandprompt.com/blog/postgresql_mininum_requirements/ +See here +## Server Ports -### Server Ports Ports required to run the server in a table format. | Port | default | From 62fdcbaa8e79e55ca27fa95f8877b5e91f22f908 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 09:09:41 -0500 Subject: [PATCH 0137/1001] fixed heading levels added blank lines as needed incased url removed trailing spaces --- database/sql/mariadb/README.md | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/database/sql/mariadb/README.md b/database/sql/mariadb/README.md index 10acde47..51c8f277 100644 --- a/database/sql/mariadb/README.md +++ b/database/sql/mariadb/README.md @@ -1,15 +1,18 @@ # MariaDB -### From their [Website](https://mariadb.org/) -One of the most popular database servers. Made by the original developers of MySQL. -Guaranteed to stay open source. -### Minimum RAM warning +## From their [Website](https://mariadb.org/) + +One of the most popular database servers. Made by the original developers of MySQL. +Guaranteed to stay open source. + +## Minimum RAM warning + There is no actual minimum suggested for MariaDB. -See here https://mariadb.com/kb/en/library/mariadb-hardware-requirements/ +See here +## Server Ports -### Server Ports Ports required to run the server in a table format. | Port | default | From 9ca0dab98395a974897a5fbb396ccf3e9819c1ed Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 09:10:02 -0500 Subject: [PATCH 0138/1001] fixed heading levels added blank lines as needed incased url --- database/redis/redis-6/README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/database/redis/redis-6/README.md b/database/redis/redis-6/README.md index 4c89fc87..3531c1d1 100644 --- a/database/redis/redis-6/README.md +++ b/database/redis/redis-6/README.md @@ -1,14 +1,17 @@ # Redis -### From their [Website](https://redis.io/) + +## From their [Website](https://redis.io/) + Redis is an open source (BSD licensed), in-memory data structure store, used as a database, cache and message broker. -### Minimum RAM warning +## Minimum RAM warning + It's recommended to have 4gb of RAM for redis -See here https://docs.redislabs.com/latest/rs/administering/designing-production/hardware-requirements/ +See here +## Server Ports -### Server Ports Ports required to run the server in a table format. | Port | default | From 519cb1bd63b8eb67d75b95a0326cbada78e7f049 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 09:10:16 -0500 Subject: [PATCH 0139/1001] fixed heading levels added blank lines as needed incased url --- database/redis/redis-5/README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/database/redis/redis-5/README.md b/database/redis/redis-5/README.md index 4c89fc87..3531c1d1 100644 --- a/database/redis/redis-5/README.md +++ b/database/redis/redis-5/README.md @@ -1,14 +1,17 @@ # Redis -### From their [Website](https://redis.io/) + +## From their [Website](https://redis.io/) + Redis is an open source (BSD licensed), in-memory data structure store, used as a database, cache and message broker. -### Minimum RAM warning +## Minimum RAM warning + It's recommended to have 4gb of RAM for redis -See here https://docs.redislabs.com/latest/rs/administering/designing-production/hardware-requirements/ +See here +## Server Ports -### Server Ports Ports required to run the server in a table format. | Port | default | From c7ac54b92f17b19ec5e9bfba415ba63e641caf51 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 09:10:38 -0500 Subject: [PATCH 0140/1001] fixed heading levels added blank lines as needed removed trailing spaces --- database/nosql/mongodb/README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/database/nosql/mongodb/README.md b/database/nosql/mongodb/README.md index 9a2f5090..0a6415ae 100644 --- a/database/nosql/mongodb/README.md +++ b/database/nosql/mongodb/README.md @@ -1,12 +1,15 @@ # mongoDB -### From their [Website](https://www.mongodb.com/) -MongoDB is a general purpose, document-based, distributed database built for modern application developers and for the cloud era. -### Minimum RAM warning +## From their [Website](https://www.mongodb.com/) + +MongoDB is a general purpose, document-based, distributed database built for modern application developers and for the cloud era. + +## Minimum RAM warning + MongoDB requires approximately 1GB of RAM per 100.000 assets. If the system has to start swapping memory to disk, this will have a severely negative impact on performance, and should be avoided. +## Server Ports -### Server Ports Ports required to run the server in a table format. | Port | default | From 8444e5d189388ac2675a71dedf7880915595e553 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 09:11:05 -0500 Subject: [PATCH 0141/1001] added blank lines as needed --- database/README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/database/README.md b/database/README.md index 0c58f9a3..9efc7435 100644 --- a/database/README.md +++ b/database/README.md @@ -1,16 +1,23 @@ # databases ## In-Memory Databases + ### [redis](/redis/) + https://redis.io/ ## NoSQL + ### [mongodb](/nosql/mongodb/) + https://www.mongodb.com/ ## SQL Databases + ### [mariadb](/sql/mariadb/) + https://mariadb.org/ ### [postgres](/sql/postgres/) - https://www.postgresql.org/ \ No newline at end of file + + https://www.postgresql.org/ From 6aec87187baea285e2e9abdda5565e2433b9c9c9 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 09:37:59 -0500 Subject: [PATCH 0142/1001] added comments to help users who are summiting new eggs added documentation example added minimum storage warning section added server port notes section fixed heading levels added blank lines as needed --- example/README.md | 42 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/example/README.md b/example/README.md index 94d7f62b..5b9852aa 100644 --- a/example/README.md +++ b/example/README.md @@ -1,20 +1,46 @@ # Example Server Name -### From their [Github](https://github.com/parkervcp/eggs) -A link to the site that you download game files from. -The description of the server usually provided by the game/server maker. -### Install notes -Due to rate limiting the console on the panel cannot keep up with the game console and the build will complete before the panel console may show it. Reloading the console will load it to the latest part of the log. + + +## From their [Github](https://github.com/parkervcp/eggs) + +A link to the site that you download the server files from. + +## [Documentation](https://github.com/parkervcp/eggs/blob/master/README.md) + +A link to relevent documentation for the server. + +The description of the server usually provided by the game/server maker. + + +## Install notes + + +Due to rate limiting the console on the panel, it cannot keep up with the game console and the build will complete before the panel console may show it. Reloading the console will load it to the latest part of the log. + +## Minimum RAM warning -### Minimum RAM warning Minimum required memory to run the server. + +## Minumim Sorage warning + +Minimum required storage to run the server. + + + + +## Server Ports -### Server Ports Ports required to run the server in a table format. | Port | default | |---------|---------| | Game | 25565 | -#### Mods/Plugins may require ports to be added to the server. +### Notes + + +25565 is the default port, but any port can be used. + +### Mods/Plugins may require ports to be added to the server From dcb7f48585521f5d2b7299a3352d227238c12c1b Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:07:05 -0500 Subject: [PATCH 0143/1001] reordered items to match folder structure fixed broken links removed links that went to non existing folders fixed heading levels added blank lines as needed removed trailing spaces --- game_eggs/README.md | 85 ++++++++++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 36 deletions(-) diff --git a/game_eggs/README.md b/game_eggs/README.md index 8516677e..106be812 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -1,13 +1,17 @@ -## Game Eggs +# Game Eggs + [Among Us](among_us) + * [Impostor Server](among_us/impostor_server) * [CrewLink Server](among_us/crewlink_server) [BeamNG.drive](beamng) + * [BeamMP Server](beamng/beammp) * [KissMP](beamng/kissmp) [ClassiCube](game_eggs/classicube) + * [MCGalaxy](game_eggs/classicube/mcgalaxy) [Cryofall](cryofall/cryofall) @@ -16,48 +20,48 @@ [ET Legacy](enemy_territory/etlegacy) -[FTL: Tachyon](ftl/tachyon) - [Factorio](factorio) + * [Vanilla](factorio/factorio) * [ModUpdate](factorio/factorio-modupdate) +[FTL: Tachyon](ftl/tachyon) + [Grand Theft Auto](gta) + * GTA V * [FiveM](gta/fivem) * [RageMP](gta/ragemp) * [alt:V](gta/altv) - + * GTA SA * [Multi Theft Auto](gta/mtasa) * [SA-MP](gta/samp) - + * GTA * [GTAC](gta/gtac) -[Mindustry](mindustry) - * [Mindustry](mindustry/mindustry) - [League Sandbox](leaguesandbox) - * [League Sandbox](leaguesandbox/leaguesandbox) -[Minetest](minetest) (including MTG) - * [Minetest](minetest/minetest) +[Mindustry](mindustry) [Minecraft](minecraft) + * [Bedrock](minecraft/bedrock) Servers for Bedrock Minecraft (Windows 10, mobile, console) * [Bedrock](minecraft/bedrock/bedrock) * [gomint](minecraft/bedrock/gomint) - * [Nukkit](minecraft/bedrock/nukkit) - * [PocketMine MP](minecraft/bedrock/pocketmine_mp) + * [Nukkit](minecraft/bedrock/nukkit) + * [PocketMine MP](minecraft/bedrock/pocketmine_mp) * [Java](minecraft/java) Servers for Java Minecraft * [Airplane](minecraft/java/airplane) * [Cuberite](minecraft/java/cuberite) - * [Fabric](minecraft/java/fabric) - * [Feather](minecraft/java/feather) - * [Feed The Beast](minecraft/java/ftb) + * [Fabric](minecraft/java/fabric) + * [Feather](minecraft/java/feather) * [Forge](minecraft/java/forge) + * [Forge](minecraft/java/forge/forge) + * [CusreForge Generic](minecraft/java/forge/curseforge-generic) + * [Feed The Beast](minecraft/java/ftb) * [Krypton](/minecraft/java/krypton) * [Magma](minecraft/java/magma) * [Mohist](minecraft/java/mohist) @@ -72,28 +76,37 @@ * [VanillaCord](minecraft/java/vanillacord) * [Proxies](minecraft/proxy) Minecraft Server Proxies - * [Java](minecraft/proxy/java) - * [FlameCord](minecraft/proxy/java/flamecord) - * [Travertine](minecraft/proxy/java/travertine) - * [TyphoonLimbo](minecraft/proxy/java/typhoonlimbo) - * [Velocity](minecraft/proxy/java/velocity) - * [Waterfall](minecraft/proxy/java/waterfall) + * [Bedrock](minecraft/proxy/bedrock) + * [Waterdog PE](minecraft/proxy/bedrock/waterdog_pe) * [Cross Platform](minecraft/proxy/cross_platform) * [GeyserMC](minecraft/proxy/cross_platform/geyser) * [Waterdog](minecraft/proxy/cross_platform/waterdog) + * [Java](minecraft/proxy/java) + * [FlameCord](minecraft/proxy/java/flamecord) + * [Travertine](minecraft/proxy/java/travertine) + * [TyphoonLimbo](minecraft/proxy/java/typhoonlimbo) + * [Velocity](minecraft/proxy/java/velocity) + * [VIAaas](minecraft/proxy/java/viaaas) + * [Waterfall](minecraft/proxy/java/waterfall) -[OpenArena](openarena) - * [openarena](openarena/openarena) +[Minetest](minetest) (including MTG) + +[OpenArena](openarena) [OpenRA](openra) + * [OpenRA Dune2000](openra/openra_dune2000) * [OpenRA Red Alert](openra/openra_red_alert) * [OpenRA Tiberian Dawn](openra/openra_tiberian_dawn) [Red Dead Redemption](rdr) + * [RedM](rdr/redm) +[Starmade](starmade) + [SteamCMD Servers](steamcmd_servers) These eggs use SteamCMD to install + * [7 Days to Die](steamcmd_servers/7_days_to_die) * [ARK: Survival Evolved](steamcmd_servers/ark_survival_evolved) * [Arma](steamcmd_servers/arma) @@ -103,6 +116,7 @@ * [Barotrauma](steamcmd_servers/barotrauma) * [Citadel: Forged with Fire](steamcmd_servers/citadel) * [Conan Exiles](steamcmd_servers/conan_exiles) +* [CryoFall](steamcmd_servers/cryofall) * [Don't Starve Together](steamcmd_servers/dont_starve) * [ECO](steamcmd_servers/eco) * [Fistful of Frags](steamcmd_servers/fof) @@ -127,8 +141,9 @@ * [Staging](steamcmd_servers/rust/rust_staging) * [Satisfactory](steamcmd_servers/satisfactory) * [SCP: Secret Laboratory](steamcmd_servers/scpsl) - * [dedicated](steamcmd_servers/scpsl/dedicated) - * [multiadmin](steamcmd_servers/scpsl/multiadmin) + * [Dedicated](steamcmd_servers/scpsl/dedicated) + * [Exiled](steamcmd_servers/scpsl/exiled) + * [Multiadmin](steamcmd_servers/scpsl/multiadmin) * [Soldat](steamcmd_servers/soldat) * [Space Engineers](steamcmd_servers/space_engineers) * [Squad](steamcmd_servers/squad) @@ -137,30 +152,28 @@ * [Stormworks: Build and Rescue](steamcmd_servers/stormworks) * [Subnautica: Nitrox Mod](steamcmd_servers/subnautica_nitrox_mod) * [Sven Co-op](steamcmd_servers/svencoop) -* [The Forest](steamcmd_servers/the_forest) * [Team Fortress 2 Classic](steamcmd_servers/team_fortress_2_classic) +* [The Forest](steamcmd_servers/the_forest) +* [Tower Unite](steamcmd_servers/tower_unite) * [Unturned](steamcmd_servers/unturned) * [Valheim](steamcmd_servers/valheim) - * [Valheim Vanilla](steamcmd_servers/valheim/valheim_vanilla) * [Valheim Plus Mod](steamcmd_servers/valheim/valheim_plus) + * [Valheim Vanilla](steamcmd_servers/valheim/valheim_vanilla) [Teeworlds](teeworlds) -* [Teeworlds](teeworlds/teeworlds) [Terraria](terraria) -* [Vanilla](terraria/vanilla) + * [tModLoader](terraria/tmodloader) * [TShock](terraria/tshock) +* [Vanilla](terraria/vanilla) [Tycoon Games](tycoon_games) + * [OpenTTD](tycoon_games/openttd) -[Unreal Engine](unreal_engine) -* [Tower Unite](unreal_engine/tower_unite) -* [Tower Unite](steamcmd_servers/tower_unite) +[Veloren](veloren) -[Veloren](veloren/veloren) - -[Vintage Story](vintage_story/vintage_story) +[Vintage Story](vintage_story) [Xonotic](xonotic/xonotic) From 38fbd923be86e3d879666f266e4d80fdc3dc6f6b Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:07:25 -0500 Subject: [PATCH 0144/1001] removed trailing spaces --- game_eggs/among_us/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/among_us/README.md b/game_eggs/among_us/README.md index 42fa5f9f..a87d34a4 100644 --- a/game_eggs/among_us/README.md +++ b/game_eggs/among_us/README.md @@ -1,7 +1,7 @@ # Among Us -[CrewLink Server](crewlink_server) +[CrewLink Server](crewlink_server) This project implements proximity voice chat in Among Us. Everyone in an Among Us lobby with this program running will be able to communicate over voice in-game, with no third-party programs required. -[Impostor Server](impostor_server) -Impostor is one of the first Among Us private servers, written in C#. \ No newline at end of file +[Impostor Server](impostor_server) +Impostor is one of the first Among Us private servers, written in C#. From 3db7563e7474148fb7355bb5fa3732cf667a70ad Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:08:36 -0500 Subject: [PATCH 0145/1001] fixed heading levels added blank lines as needed added ports table --- game_eggs/among_us/crewlink_server/README.md | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/game_eggs/among_us/crewlink_server/README.md b/game_eggs/among_us/crewlink_server/README.md index 871ce5d9..14264cfd 100644 --- a/game_eggs/among_us/crewlink_server/README.md +++ b/game_eggs/among_us/crewlink_server/README.md @@ -1,7 +1,15 @@ # Among Us - CrewLink Server -### From their [Github](https://github.com/ottomated/CrewLink) + +## From their [Github](https://github.com/ottomated/CrewLink) This project implements proximity voice chat in Among Us. Everyone in an Among Us lobby with this program running will be able to communicate over voice in-game, with no third-party programs required. Spatial audio ensures that you can only hear people close to you. -### Server Port -Default port is 9736 but you can change to any port or domain/ip in the egg \ No newline at end of file +## Server Port + +Ports required to run the server in a table format. + +| Port | default | +|---------|---------| +| Game | 9736 | + +Default port is 9736 but you can change to any port or domain/ip in the egg From d0ad6e1ac645a5d6a6410ec7348e7b294effd88d Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:08:48 -0500 Subject: [PATCH 0146/1001] fixed heading levels added blank lines as needed --- game_eggs/among_us/impostor_server/README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/game_eggs/among_us/impostor_server/README.md b/game_eggs/among_us/impostor_server/README.md index f0e9d9c0..4a0b2088 100644 --- a/game_eggs/among_us/impostor_server/README.md +++ b/game_eggs/among_us/impostor_server/README.md @@ -1,14 +1,16 @@ # Among Us - Impostor Server -### From their [Github](https://github.com/AeonLucid/Impostor) + +## From their [Github](https://github.com/AeonLucid/Impostor) Impostor is one of the first Among Us private servers, written in C#. There are no special features at this moment, the goal is aiming to be as close as possible to the real server, for now. In a later stage, making modifications to game logic by modifying GameData packets can be looked at. -### Install notes +## Install notes You MUST use Port 22023 for the Master Server. To host multiple servers, please read [Impostor Multiple Servers Documentation](https://github.com/Impostor/Impostor/blob/master/docs/Running-the-server.md#multiple-servers). -### Server Ports +## Server Ports + Ports required to run the server in a table format. | Port | default | From eeecc631557122d7e8466c17215330e9fca43383 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:09:00 -0500 Subject: [PATCH 0147/1001] added blank lines as needed --- game_eggs/beamng/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/beamng/README.md b/game_eggs/beamng/README.md index 95cceb92..80b3c68f 100644 --- a/game_eggs/beamng/README.md +++ b/game_eggs/beamng/README.md @@ -3,4 +3,4 @@ BeamMP Bringing Multiplayer to BeamNG.drive! With a smooth and enjoyable experience. * [BeamMP Server](beammp) -* [KissMP](kissmp) \ No newline at end of file +* [KissMP](kissmp) From b32108345871640985916b56f39e99b4bd3e05e3 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:09:14 -0500 Subject: [PATCH 0148/1001] added blank lines as needed --- game_eggs/beamng/beammp/README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/game_eggs/beamng/beammp/README.md b/game_eggs/beamng/beammp/README.md index b4e401bf..a2844bc3 100644 --- a/game_eggs/beamng/beammp/README.md +++ b/game_eggs/beamng/beammp/README.md @@ -1,7 +1,6 @@ - # BeamMP BeamMP Bringing Multiplayer to BeamNG.drive! With a smooth and enjoyable experience. * [BeamMP Server](game_eggs/beamng/beammp) -* [KissMP](game_eggs/beamng/kissmp) \ No newline at end of file +* [KissMP](game_eggs/beamng/kissmp) From bb6d16f82e4afc710edc61f475fa5b4abb635d76 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:09:25 -0500 Subject: [PATCH 0149/1001] fixed heading levels --- game_eggs/beamng/kissmp/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/beamng/kissmp/README.md b/game_eggs/beamng/kissmp/README.md index 0aaed1e9..49a9c6ad 100644 --- a/game_eggs/beamng/kissmp/README.md +++ b/game_eggs/beamng/kissmp/README.md @@ -1,5 +1,5 @@ # BeamNG.drive - KISS Multiplayer -### From their [Github](https://github.com/TheHellBox/KISS-multiplayer) +## From their [Github](https://github.com/TheHellBox/KISS-multiplayer) Server settings such as the map can be changed in the `config.json` file. Port is automatically set on each boot. From 7c87f6ede2ed85a198f36c6f82d08a6fd205a38e Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:10:33 -0500 Subject: [PATCH 0150/1001] added server ports heading added blank lines as needed --- game_eggs/classicube/mcgalaxy/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/game_eggs/classicube/mcgalaxy/README.md b/game_eggs/classicube/mcgalaxy/README.md index ce3248fa..08717160 100644 --- a/game_eggs/classicube/mcgalaxy/README.md +++ b/game_eggs/classicube/mcgalaxy/README.md @@ -1,10 +1,11 @@ # Classicube MCGalaxy -[MCGalaxy](https://github.com/UnknownShadow200/MCGalaxy) + +[MCGalaxy](https://github.com/UnknownShadow200/MCGalaxy) MCGalaxy is a fully featured and customisable ClassiCube Server Software based on MCForge/MCLawl. +## Server Ports | Port | default | |---------|---------| | Game | 25565 | - From 80f08a9fcbc8930747c72f1aef5d4f7329e10787 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:11:43 -0500 Subject: [PATCH 0151/1001] fixed heading levels added blank lines as needed incased url removed trailing spaces added code block tags --- game_eggs/cod/cod4x/README.md | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/game_eggs/cod/cod4x/README.md b/game_eggs/cod/cod4x/README.md index bbb6555e..a1b5047c 100644 --- a/game_eggs/cod/cod4x/README.md +++ b/game_eggs/cod/cod4x/README.md @@ -1,20 +1,22 @@ # Call of Duty 4X ## Game files mounting + The server does **not** contain the base game files, but they are necessary to use the server. While the server itself is open-source, the game files are copyrighted and you will need to own a legitimate copy of the game (Call of Duty 4: Modern Warfare) in order to provide the game files to the server. -More information here: https://github.com/callofduty4x/CoD4x_Server#setting-up-a-call-of-duty-4-server-with-cod4x-18 +More information here: + +## Correctly mounting the game files -### Correctly mounting the game files In order to give the server access to the needed game files you will need to create a new mount. Let's say you copied the game files to your node into the directory `/home/pterodactyl/serverfiles/cod4x` (you can choose any directory you want of course). The directory structure will look like this:
- -``` + +```md /home/pterodactyl/serverfiles/cod4x ├── main │ ├── iw_00.iwd @@ -115,16 +117,20 @@ The directory structure will look like this:
3 directories, 93 files ``` +
First of all add the directory of the mount to the config.yml (in `/etc/pterodactyl`) of your node. -``` + +```md allowed_mounts: - /home/pterodactyl/serverfiles ``` + After you've done this, restart wings with `systemctl restart wings`. Now you simply create a mount in the Pterodactyl Panel with the following settings: + 1. Set the source to `/home/pterodactyl/serverfiles/cod4x` 2. Set the target to any directory you want (but not something in `/home/container`, I suggest something like `/mnt/gamefiles/cod4`) 3. Set read-only to "true" ("false" will also work, but then you risk that one instance overwrites files for all other instances) @@ -134,21 +140,23 @@ Now you simply create a mount in the Pterodactyl Panel with the following settin 7. Add the CoD4X egg to the list of eggs for the mount ### Correctly configuring the servers -In order for the server to find the game files you have to set "Game file path" variable in the server to the same directory that you used in the "target" field of the mount. + +In order for the server to find the game files you have to set "Game file path" variable in the server to the same directory that you used in the "target" field of the mount. When you start the server for the first time it will prompt you to mount the game files under the configured path. + 1. In the admin interface open your server 2. Go to the tab "Mounts" 3. Klick on the green "+" button on the correct mount in order to mount the game files 4. Restart the server - **Congratulations!** Your server should be able to find the game files and start. ## Default Server Ports + The default is 28960, but the server will automatically use the port defined in the allocation. | Port | default | |---------|---------| | Game | 28960 | -#### Plugins may require ports to be added to the server. +### Plugins may require ports to be added to the server From 9b45691bdfb57035d1dc5ed2f310cbf98727c1bf Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:12:21 -0500 Subject: [PATCH 0152/1001] fixed heading levels added blank lines as needed removed trailing spaces --- game_eggs/enemy_territory/etlegacy/README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/game_eggs/enemy_territory/etlegacy/README.md b/game_eggs/enemy_territory/etlegacy/README.md index 43b83406..09555dd7 100644 --- a/game_eggs/enemy_territory/etlegacy/README.md +++ b/game_eggs/enemy_territory/etlegacy/README.md @@ -1,20 +1,20 @@ # ET: Legacy -#### The ET: Legacy Server +## The ET: Legacy Server - -#### from the developers +## from the developers Wolfenstein: Enemy Territory is a free multiplayer first-person shooter. Set during World War II and heavily focused on team work, it was initially released in 2003 by Splash Damage and id Software. More than a decade after its release, after spending countless hours of escorting tanks and trucks, stealing gold and radar parts and transmitting confidential documents, it was time to dust off the game which consistently refused to go down. -Enemy Territory: Legacy is an open source project based on the code of Wolfenstein: Enemy Territory which was released in 2010 under the terms of GPLv3 license. The main goal of this project is to fix bugs, remove old dependencies and make it playable on all major operating systems while still remaining compatible with the ET 2.60b version and as many of its mods as possible. We do appreciate any contribution to the project such as patches, suggestions or comments. +Enemy Territory: Legacy is an open source project based on the code of Wolfenstein: Enemy Territory which was released in 2010 under the terms of GPLv3 license. The main goal of this project is to fix bugs, remove old dependencies and make it playable on all major operating systems while still remaining compatible with the ET 2.60b version and as many of its mods as possible. We do appreciate any contribution to the project such as patches, suggestions or comments. Make sure to checkout their [Home Page](https://www.etlegacy.com/). -### Server Ports -ET: Legacy requires a single port +## Server Ports + +ET: Legacy requires a single port | Port | default | |---------|---------| -| Game | 27960 | \ No newline at end of file +| Game | 27960 | From ae897c5b77af4cf697e5b416c8e1767a3ac6b365 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:12:40 -0500 Subject: [PATCH 0153/1001] fixed heading levels added blank lines as needed removed trailing spaces --- game_eggs/factorio/README.md | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/game_eggs/factorio/README.md b/game_eggs/factorio/README.md index 714d66d2..5095e4a6 100644 --- a/game_eggs/factorio/README.md +++ b/game_eggs/factorio/README.md @@ -1,12 +1,13 @@ # Factorio -#### The Factorio Server -The server supports mods. -The factorio-modupdate egg uses the factorio-mod-updater (https://github.com/pdemonaco/factorio-mod-updater) to update your mods when ReInstalling the Server. +## The Factorio Server -#### from the developers +The server supports mods. +The factorio-modupdate egg uses the [factorio-mod-updater](https://github.com/pdemonaco/factorio-mod-updater) to update your mods when ReInstalling the Server. -Factorio is a game in which you build and maintain factories. +## from the developers + +Factorio is a game in which you build and maintain factories. You will be mining resources, researching technologies, building infrastructure, automating production and fighting enemies. Use your imagination to design your factory, combine simple elements into ingenious structures, apply management skills to keep it working, and protect it from the creatures who don't really like you. @@ -16,9 +17,10 @@ Factorio has been in development since the spring of 2012. So far over 1,400,000 New to the game? Make sure to checkout their [starter page](https://factorio.com/starter-page). -### Server Ports -Factorio requires a single port +## Server Ports + +Factorio requires a single port | Port | default | |---------|---------| -| Game | 34197 | \ No newline at end of file +| Game | 34197 | From 2bdfabbd7934d4710d0d5603e59870f4dd92482d Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:12:53 -0500 Subject: [PATCH 0154/1001] incased url --- game_eggs/ftl/tachyon/README.MD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/ftl/tachyon/README.MD b/game_eggs/ftl/tachyon/README.MD index c4c03499..cfccac50 100644 --- a/game_eggs/ftl/tachyon/README.MD +++ b/game_eggs/ftl/tachyon/README.MD @@ -12,4 +12,4 @@ The Tachyon server requires a single port for access. ## Server Specific -Latest client and standalone server can be found at https://github.com/Dav-Edward/TachyonsCE/releases +Latest client and standalone server can be found at From fd742eec70cced600a6ff205fcf6a595ec3f9662 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:13:11 -0500 Subject: [PATCH 0155/1001] removed trailing spaces --- game_eggs/gta/README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/game_eggs/gta/README.md b/game_eggs/gta/README.md index 2847f0a3..d79f00a7 100644 --- a/game_eggs/gta/README.md +++ b/game_eggs/gta/README.md @@ -1,11 +1,11 @@ -# Grand Theft Auto +# Grand Theft Auto ## GTA V -[FiveM](https://fivem.net/) -FiveM is a modification for Grand Theft Auto V enabling you to play multiplayer on customized dedicated servers. +[FiveM](https://fivem.net/) +FiveM is a modification for Grand Theft Auto V enabling you to play multiplayer on customized dedicated servers. -[Rage MP](https://rage.mp/) +[Rage MP](https://rage.mp/) RAGE Multiplayer is an multiplayer modification for Grand Theft Auto V that is alternative to GTA Online. [alt:V](https://altv.mp) @@ -13,10 +13,10 @@ alt:V Multiplayer a third-party multiplayer modification for Grand Theft Auto: V ## San Andreas -[GTA SA:MP](https://www.sa-mp.com/) -SA-MP is a free Massively Multiplayer Online game mod for the PC version of Rockstar Games Grand Theft Auto: San Andreas (tm). +[GTA SA:MP](https://www.sa-mp.com/) +SA-MP is a free Massively Multiplayer Online game mod for the PC version of Rockstar Games Grand Theft Auto: San Andreas (tm). -[MTA SA](https://mtasa.com/) +[MTA SA](https://mtasa.com/) What more could you want? Multi Theft Auto provides the best online Grand Theft Auto experience there is. Read on to find out more. ## GTAC From 203d7264c66587fca2f4565f38bd7c399b9f4bd9 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:13:19 -0500 Subject: [PATCH 0156/1001] fixed heading levels added blank lines as needed --- game_eggs/gta/altv/README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/game_eggs/gta/altv/README.md b/game_eggs/gta/altv/README.md index dddd7a36..25850aeb 100644 --- a/game_eggs/gta/altv/README.md +++ b/game_eggs/gta/altv/README.md @@ -1,9 +1,11 @@ # alt:v -### From the [alt:V](https://altv.mp) Site +## From the [alt:V](https://altv.mp) Site + alt:V Multiplayer a third-party multiplayer modification for Grand Theft Auto: V. -### Server Ports +## Server Ports + Ports required to run the server in a table format. | Port | default | From 5972bd2e23f8a6762acb22d8c4c94435c527144f Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:15:07 -0500 Subject: [PATCH 0157/1001] added note about fivem and pterodactyl added link to pterodactyl fivem discord announcement fixed heading levels added blank lines as needed --- game_eggs/gta/fivem/README.md | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/game_eggs/gta/fivem/README.md b/game_eggs/gta/fivem/README.md index 25c312f2..12f44451 100644 --- a/game_eggs/gta/fivem/README.md +++ b/game_eggs/gta/fivem/README.md @@ -1,24 +1,37 @@ -# FiveM +# FiveM + +## Note on FiveM support from Pteroadactyl + +Pterodactyl will not be providing support for FiveM. You are free to run a FiveM server but no support will be provided in the Pterodactyl Discord, check the discord annoucement below for details. + +Worth a read if you plan on running a FiveM server +[Pterodactyl Discord Announcement](https://ptb.discord.com/channels/122900397965705216/124919575534895105/869733533495746560) + ## From the [FiveM](https://fivem.net/) Site + FiveM is a modification for Grand Theft Auto V enabling you to play multiplayer on customized dedicated servers. -# Notice +## Notice + Currently the script can get versions from the builds site. The `FIVEM_VERSION` variable. + * Defaults to `latest` which is the latest recommended * Can be set to a specific version Ex. `2431-350dd7bd5c0176216c38625ad5b1108ead44674d`. The `DOWNLOAD_URL` only needs to be used if they turn on ddos protection. The variable needs to point to a `fx.tar.xz` file as I am too lazy to update the entire script. -# txAdmin +## txAdmin + txAdmin is now supported and disabled by default. You set `TXADMIN_ENABLED` to `1` to enable it. The last update to the egg changes the server to use txadmin to run. On first startup it will print a key to use to sign into the txadmin panel. -### Your server will not go online until it's started from txadmin. +### Your server will not go online until it's started from txadmin ## Server Ports + Ports required to run the server in a table format. | Port | default | From 042d168bbab5e37f8359eba9a177805bab888eeb Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:15:16 -0500 Subject: [PATCH 0158/1001] fixed heading levels added blank lines as needed --- game_eggs/gta/gtac/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/game_eggs/gta/gtac/README.md b/game_eggs/gta/gtac/README.md index fe3be939..b32b1f37 100644 --- a/game_eggs/gta/gtac/README.md +++ b/game_eggs/gta/gtac/README.md @@ -1,10 +1,11 @@ # Grand Theft Auto Connected + The [GTAC](https://gtaconnected.com/) Grand Theft Auto Connected is a custom scriptable multiplayer modification for multiple Grand Theft Auto games. -### Server Ports +## Server Ports GTAC requires one port for both UDP/TCP | Port | default | |---------|----------| -| Game | 22000 | \ No newline at end of file +| Game | 22000 | From ebf8106b978ea803546b679c6554d3956453abc2 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:15:23 -0500 Subject: [PATCH 0159/1001] fixed heading levels added blank lines as needed --- game_eggs/gta/mtasa/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game_eggs/gta/mtasa/README.md b/game_eggs/gta/mtasa/README.md index ed5c0ff2..171b0eae 100644 --- a/game_eggs/gta/mtasa/README.md +++ b/game_eggs/gta/mtasa/README.md @@ -1,7 +1,8 @@ # Multi Theft Auto + [Multi Theft Auto](https://mtasa.com/) is a Open Source Grand Theft Auto: San Andreas Multiplayer modification. -### Server Ports +## Server Ports Multi Theft Auto requires 3 ports. From fb1d7ef61c964191f96101207d8fdc176417927d Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:15:31 -0500 Subject: [PATCH 0160/1001] fixed heading levels added blank lines as needed --- game_eggs/gta/ragemp/README.MD | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/game_eggs/gta/ragemp/README.MD b/game_eggs/gta/ragemp/README.MD index b35e9c35..62b9c3e2 100644 --- a/game_eggs/gta/ragemp/README.MD +++ b/game_eggs/gta/ragemp/README.MD @@ -1,12 +1,13 @@ # Rage-MP -The [Rage-MP](https://rage.mp/) GTA 5 dedicated server + +The [Rage-MP](https://rage.mp/) GTA 5 dedicated server RAGE Multiplayer is an multiplayer modification for Grand Theft Auto V that is alternative to GTA Online. -### Server Ports +## Server Ports Warband requires a 2 ports (default 22005, 22006) | Port | default | |---------|----------| | Game | 22005 | -| http | 22006 | \ No newline at end of file +| http | 22006 | From c8bb25cecca9353675b68b39a925bcc4f09fde3f Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:15:46 -0500 Subject: [PATCH 0161/1001] added blank lines as needed --- game_eggs/gta/samp/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game_eggs/gta/samp/README.md b/game_eggs/gta/samp/README.md index d4fcf00c..dff71cfd 100644 --- a/game_eggs/gta/samp/README.md +++ b/game_eggs/gta/samp/README.md @@ -1,2 +1,3 @@ # SA:MP -The [SA:MP](https://www.sa-mp.com/) GTA San Andreas dedicated server \ No newline at end of file + +The [SA:MP](https://www.sa-mp.com/) GTA San Andreas dedicated server From 8c6618e9a804d47782849c1ee34d8534709696d5 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:16:25 -0500 Subject: [PATCH 0162/1001] removed duplicated folder --- .../leaguesandbox/{leaguesandbox => }/LeagueSandbox_Egg.json | 0 game_eggs/mindustry/{mindustry => }/egg-mindustry.json | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename game_eggs/leaguesandbox/{leaguesandbox => }/LeagueSandbox_Egg.json (100%) rename game_eggs/mindustry/{mindustry => }/egg-mindustry.json (100%) diff --git a/game_eggs/leaguesandbox/leaguesandbox/LeagueSandbox_Egg.json b/game_eggs/leaguesandbox/LeagueSandbox_Egg.json similarity index 100% rename from game_eggs/leaguesandbox/leaguesandbox/LeagueSandbox_Egg.json rename to game_eggs/leaguesandbox/LeagueSandbox_Egg.json diff --git a/game_eggs/mindustry/mindustry/egg-mindustry.json b/game_eggs/mindustry/egg-mindustry.json similarity index 100% rename from game_eggs/mindustry/mindustry/egg-mindustry.json rename to game_eggs/mindustry/egg-mindustry.json From 09087cb0c134d0831d7774ee9dbb151e4b7d7e16 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:17:00 -0500 Subject: [PATCH 0163/1001] removed duplicated folder fixed heading levels added blank lines as needed removed trailing spaces --- .../{leaguesandbox => }/README.md | 20 ++++++++++++------- game_eggs/mindustry/{mindustry => }/README.md | 7 +++---- 2 files changed, 16 insertions(+), 11 deletions(-) rename game_eggs/leaguesandbox/{leaguesandbox => }/README.md (70%) rename game_eggs/mindustry/{mindustry => }/README.md (87%) diff --git a/game_eggs/leaguesandbox/leaguesandbox/README.md b/game_eggs/leaguesandbox/README.md similarity index 70% rename from game_eggs/leaguesandbox/leaguesandbox/README.md rename to game_eggs/leaguesandbox/README.md index e5022466..136badf3 100644 --- a/game_eggs/leaguesandbox/leaguesandbox/README.md +++ b/game_eggs/leaguesandbox/README.md @@ -1,19 +1,25 @@ # League Sandbox -### From their [Github](https://github.com/parkervcp/eggs) + +## From their [Github](https://github.com/LeagueSandbox/leaguesandbox.github.io) + [![Build status](https://ci.appveyor.com/api/projects/status/7olahkndcs3r295p/branch/indev?svg=true)](https://ci.appveyor.com/project/MythicManiac/gameserver/branch/indev) [![Build Status](https://travis-ci.org/LeagueSandbox/GameServer.svg?branch=indev)](https://travis-ci.org/LeagueSandbox/GameServer) -Project website along with more specifications can be found from: https://leaguesandbox.github.io/ -Project chat on Discord: https://discord.gg/Bz3znAM +Project website along with more specifications can be found from: + +Project chat on Discord: + +## Install notes + +Post install you are required to set -### Install notes -Post install you are required to set - `/home/container/Settings/GameInfo.json` `CONTENT_PATH` to just `Content` - `/home/container/Settings/GameServerSettings.json` `autoStartClient` to `false` -### Server Ports +## Server Ports + Ports required to run the server in a table format. | Port | default | | ---- | ------- | -| Game | 5119 | \ No newline at end of file +| Game | 5119 | diff --git a/game_eggs/mindustry/mindustry/README.md b/game_eggs/mindustry/README.md similarity index 87% rename from game_eggs/mindustry/mindustry/README.md rename to game_eggs/mindustry/README.md index b47636ed..0521f66a 100644 --- a/game_eggs/mindustry/mindustry/README.md +++ b/game_eggs/mindustry/README.md @@ -1,15 +1,14 @@ # Mindustry -#### About the game +## About the game Mindustry is a hybrid tower-defense sandbox factory game. Create elaborate supply chains of conveyor belts to feed ammo into your turrets, produce materials to use for building, and defend your structures from waves of enemies. Features include a map editor, 24 built-in maps, cross-platform multiplayer and large-scale PvP unit battles. - You can get it from [Steam](https://store.steampowered.com/app/1127400) +## Server Port -### Server Port -Mindustry requires a single port +Mindustry requires a single port | Port | Default | |---------|---------| From 2cdcd28b496290f737ccb0f633ce31586281ec13 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:19:51 -0500 Subject: [PATCH 0164/1001] reordered list to match folder structure added headers added blank lines as needed --- game_eggs/minecraft/README.md | 78 ++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 37 deletions(-) diff --git a/game_eggs/minecraft/README.md b/game_eggs/minecraft/README.md index cf9cef67..3de2f28e 100644 --- a/game_eggs/minecraft/README.md +++ b/game_eggs/minecraft/README.md @@ -4,43 +4,47 @@ It’s a game about placing blocks and going on adventures It’s set in infinitely-generated worlds of wide open terrain - icy mountains, swampy bayous, vast pastures and much more - filled with secrets, wonders and peril! -[Bedrock](/game_eggs/minecraft/bedrock) Servers for Bedrock Minecraft (Windows 10, mobile, console) -* [Bedrock](/game_eggs/game_eggs/minecraft/bedrock/bedrock) -* [gomint](/game_eggs/minecraft/bedrock/gomint) -* [Nukkit](/game_eggs/minecraft/bedrock/nukkit) -* [PocketMine MP](/game_eggs/minecraft/bedrock/pocketmine_mp) +## [Bedrock](bedrock) Servers for Bedrock Minecraft (Windows 10, mobile, console) -[Java](/game_eggs/minecraft/java/) Servers for Java Minecraft -* [Airplane](/game_eggs/minecraft/java/airplane) -* [Cuberite](/game_eggs/minecraft/java/cuberite) -* [Fabric](/game_eggs/minecraft/java/fabric) -* [Feather](/game_eggs/minecraft/java/feather) -* [Feed The Beast](/game_eggs/minecraft/java/ftb) -* [Forge](/game_eggs/minecraft/java/forge) +* [Bedrock](bedrock/bedrock) +* [gomint](bedrock/gomint) +* [Nukkit](bedrock/nukkit) +* [PocketMine MP](bedrock/pocketmine_mp) + +## [Java](java) Servers for Java Minecraft + +* [Airplane](minecraft/java/airplane) +* [Cuberite](minecraft/java/cuberite) +* [Fabric](minecraft/java/fabric) +* [Feather](minecraft/java/feather) +* [Forge](minecraft/java/forge) + * [Forge](minecraft/java/forge/forge) + * [CusreForge Generic](minecraft/java/forge/curseforge-generic) +* [Feed The Beast](minecraft/java/ftb) * [Krypton](/minecraft/java/krypton) -* [Magma](/game_eggs/minecraft/java/magma) -* [Mohist](/game_eggs/minecraft/java/mohist) -* [NanoLimbo](/game_eggs/minecraft/java/nanolimbo) -* [Paper](/game_eggs/minecraft/java/paper) -* [Purpur](/game_eggs/minecraft/java/purpur) -* [Spigot](/game_eggs/minecraft/java/spigot) -* [SpongeForge](/game_eggs/minecraft/java/spongeforge) -* [SpongeVanilla](/game_eggs/minecraft/java/spongevanilla) -* [Technic](/game_eggs/minecraft/java/technic) -* [Tuinity](/game_eggs/minecraft/java/tuinity) -* [VanillaCord](/game_eggs/minecraft/java/vanillacord) +* [Magma](minecraft/java/magma) +* [Mohist](minecraft/java/mohist) +* [NanoLimbo](/minecraft/java/nanolimbo) +* [Paper](minecraft/java/paper) +* [Purpur](minecraft/java/purpur) +* [Spigot](minecraft/java/spigot) +* [SpongeForge](minecraft/java/spongeforge) +* [SpongeVanilla](minecraft/java/spongevanilla) +* [Technic](minecraft/java/technic) +* [Tuinity](minecraft/java/tuinity) +* [VanillaCord](minecraft/java/vanillacord) -* [Proxies](/game_eggs/minecraft/proxy) Minecraft Server Proxies - * [Java](/game_eggs/minecraft/proxy/java) - * [FlameCord](/game_eggs/minecraft/proxy/java/flamecord) - * [Travertine](/game_eggs/minecraft/proxy/java/travertine) - * [TyphoonLimbo](/game_eggs/minecraft/proxy/java/typhoonlimbo) - * [Velocity](/game_eggs/minecraft/proxy/java/velocity) - * [VIAaaS](/game_eggs/minecraft/proxy/java/viaaas) - * [Waterfall](/game_eggs/minecraft/proxy/java/waterfall) - * [Bedrock](/game_eggs/minecraft/proxy/bedrock) - * [Waterdog PE](/game_eggs/minecraft/proxy/bedrock/waterdogpe) - * [Cross Platform](/game_eggs/minecraft/proxy/cross_platform) - * [GeyserMC](/game_eggs/minecraft/proxy/cross_platform/geyser) - * [Waterdog](/game_eggs/minecraft/proxy/cross_platform/waterdog) - * DragonProxy abandoned in favour of GeyserMC. +## [Proxies](proxy) Minecraft Server Proxies + +* [Bedrock](minecraft/proxy/bedrock) + * [Waterdog PE](minecraft/proxy/bedrock/waterdog_pe) +* [Cross Platform](minecraft/proxy/cross_platform) + * [GeyserMC](minecraft/proxy/cross_platform/geyser) + * [Waterdog](minecraft/proxy/cross_platform/waterdog) +* [Java](minecraft/proxy/java) + * [FlameCord](minecraft/proxy/java/flamecord) + * [Travertine](minecraft/proxy/java/travertine) + * [TyphoonLimbo](minecraft/proxy/java/typhoonlimbo) + * [Velocity](minecraft/proxy/java/velocity) + * [VIAaas](minecraft/proxy/java/viaaas) + * [Waterfall](minecraft/proxy/java/waterfall) From 556f5b264769b33015501dff5a1d596147ea226f Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:55:02 -0500 Subject: [PATCH 0165/1001] removed duplicated folders --- game_eggs/minetest/{minetest => }/egg-minetest.json | 0 game_eggs/openarena/{openarena => }/egg-open-arena.json | 0 game_eggs/starmade/{starmade => }/egg-starmade.json | 0 .../vintage_story/{vintage_story => }/egg-vintage-story.json | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename game_eggs/minetest/{minetest => }/egg-minetest.json (100%) rename game_eggs/openarena/{openarena => }/egg-open-arena.json (100%) rename game_eggs/starmade/{starmade => }/egg-starmade.json (100%) rename game_eggs/vintage_story/{vintage_story => }/egg-vintage-story.json (100%) diff --git a/game_eggs/minetest/minetest/egg-minetest.json b/game_eggs/minetest/egg-minetest.json similarity index 100% rename from game_eggs/minetest/minetest/egg-minetest.json rename to game_eggs/minetest/egg-minetest.json diff --git a/game_eggs/openarena/openarena/egg-open-arena.json b/game_eggs/openarena/egg-open-arena.json similarity index 100% rename from game_eggs/openarena/openarena/egg-open-arena.json rename to game_eggs/openarena/egg-open-arena.json diff --git a/game_eggs/starmade/starmade/egg-starmade.json b/game_eggs/starmade/egg-starmade.json similarity index 100% rename from game_eggs/starmade/starmade/egg-starmade.json rename to game_eggs/starmade/egg-starmade.json diff --git a/game_eggs/vintage_story/vintage_story/egg-vintage-story.json b/game_eggs/vintage_story/egg-vintage-story.json similarity index 100% rename from game_eggs/vintage_story/vintage_story/egg-vintage-story.json rename to game_eggs/vintage_story/egg-vintage-story.json From 658d51f92cad216c2d667ecbff3d0035bd257e76 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 10:57:09 -0500 Subject: [PATCH 0166/1001] removed duplicated folders fixed heading levels added blank lines as needed removed trailing spaces --- game_eggs/minetest/{minetest => }/README.md | 0 game_eggs/openarena/{openarena => }/README.md | 9 ++++++--- game_eggs/starmade/{starmade => }/README.md | 7 +++++-- 3 files changed, 11 insertions(+), 5 deletions(-) rename game_eggs/minetest/{minetest => }/README.md (100%) rename game_eggs/openarena/{openarena => }/README.md (68%) rename game_eggs/starmade/{starmade => }/README.md (74%) diff --git a/game_eggs/minetest/minetest/README.md b/game_eggs/minetest/README.md similarity index 100% rename from game_eggs/minetest/minetest/README.md rename to game_eggs/minetest/README.md diff --git a/game_eggs/openarena/openarena/README.md b/game_eggs/openarena/README.md similarity index 68% rename from game_eggs/openarena/openarena/README.md rename to game_eggs/openarena/README.md index 269abf84..23630319 100644 --- a/game_eggs/openarena/openarena/README.md +++ b/game_eggs/openarena/README.md @@ -1,12 +1,15 @@ # OpenArena -### From their [site](http://www.openarena.ws) + +## From their [site](http://www.openarena.ws) + OpenArena is a community-produced deathmatch FPS based on GPL idTech3 technology. There are many game types supported including Free For All, Capture The Flag, Domination, Overload, Harvester, and more. -### Server Ports +## Server Ports + | Port | default | |---------|---------| | Game | 27960 | -#### Mods/Plugins may require ports to be added to the server. +### Mods/Plugins may require ports to be added to the server diff --git a/game_eggs/starmade/starmade/README.md b/game_eggs/starmade/README.md similarity index 74% rename from game_eggs/starmade/starmade/README.md rename to game_eggs/starmade/README.md index 33583884..4a7bdc61 100644 --- a/game_eggs/starmade/starmade/README.md +++ b/game_eggs/starmade/README.md @@ -1,8 +1,11 @@ # Starmade Server -### From their [Homepage](https://starmadedock.net/) - [Guide](https://www.star-made.org/help/setting_up_a_server) + +## From their [Homepage](https://starmadedock.net/) - [Guide](https://www.star-made.org/help/setting_up_a_server) + The ultimate space sandbox. Participate in epic fleet battles, form alliances, strive to dominate entire galaxies and harness the universe’s resources for your industrious empire or the destruction of others. Customise your experience, the universe is yours! -### Server Ports +## Server Ports + Ports required to run the server | Port | default | From dcf88c2c1572f1c8fd4523cb3f67659e73052744 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:08:05 -0500 Subject: [PATCH 0167/1001] updated gomint description from their github updated title from PE to Bedrock added header links fixed heading levels added blank lines as needed removed trailing spaces --- game_eggs/minecraft/bedrock/README.md | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/game_eggs/minecraft/bedrock/README.md b/game_eggs/minecraft/bedrock/README.md index 7c5df3df..888a88cc 100644 --- a/game_eggs/minecraft/bedrock/README.md +++ b/game_eggs/minecraft/bedrock/README.md @@ -1,17 +1,22 @@ -# Minecraft PE (bedrock edition) +# Minecraft Bedrock (Formerly Pocket Edition) + +## [Bedrock](/game_eggs/minecraft/bedrock/bedrock) -#### Bedrock [Minecraft Bedrock Server](https://minecraft.net/en-us/download/server/bedrock/) The official Minecraft Bedrock (Formerly Minecraft Pocket Edition) server. -#### gomint +## [gomint](/game_eggs/minecraft/bedrock/gomint) + [Gomint Bedrock Server](https://github.com/gomint/gomint) -Easy-to-use, highly configurable Minecraft Bedrock Edition
 server software with the ability to sustain in a low-resource environment. +No longer actively maintained. +GoMint is a modern Minecraft Bedrock Edition server enabling you to make your visions come true -#### Nukkit -[Nukkit GitHub](https://github.com/Nukkit/Nukkit) -Nukkit is a Nuclear-Powered Server Software For Minecraft: Pocket Edition +## [Nukkit](/game_eggs/minecraft/bedrock/nukkit) -#### PocketMine MP -[PocketMine MP](https://github.com/pmmp/PocketMine-MP) -A server software for Minecraft: Bedrock Edition in PHP +[Nukkit GitHub](https://github.com/Nukkit/Nukkit) +Nukkit is a Nuclear-Powered Server Software For Minecraft: Pocket Edition + +## [PocketMine MP](/game_eggs/minecraft/bedrock/pocketmine_mp) + +[PocketMine MP](https://github.com/pmmp/PocketMine-MP) +A server software for Minecraft: Bedrock Edition in PHP From ca69ab4383b7e60a1a3bb552e1d13047af3ede7e Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:17:35 -0500 Subject: [PATCH 0168/1001] updated purpur description from purpur's website updated airplace description from airplane's github added header links fixed heading levels added blank lines as needed removed trailing spaces --- game_eggs/minecraft/java/README.md | 146 +++++++++++++++++++---------- 1 file changed, 96 insertions(+), 50 deletions(-) diff --git a/game_eggs/minecraft/java/README.md b/game_eggs/minecraft/java/README.md index 7c0198b7..ed9f8cc2 100644 --- a/game_eggs/minecraft/java/README.md +++ b/game_eggs/minecraft/java/README.md @@ -5,106 +5,152 @@ It’s a game about placing blocks and going on adventures It’s set in infinitely-generated worlds of wide open terrain - icy mountains, swampy bayous, vast pastures and much more - filled with secrets, wonders and peril! ## Server Ports -The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. -## Cuberite -[Cuberite](https://cuberite.org) +The minecraft server requires a single port for access (default 25565) but plugins or mods may require extra ports to enabled for the server. + +## [Cuberite](cuberite) + +[Cuberite Website](https://cuberite.org) A lightweight, fast and extensible game server for Minecraft -## Fabric -[Fabric](https://fabricmc.net) +## [Fabric](fabric) + +[Fabric Website](https://fabricmc.net) Fabric is a lightweight, experimental modding toolchain for Minecraft. -## Feather -[Feather](https://github.com/feather-rs/feather) -An experimental Minecraft server implementation in Rust +## [Feather](feather) -## Forge -[Forge MC](https://files.minecraftforge.net) -This is a direct fork of the default forge service -- Has a version detection fix for "latest" +[Feather GitHub](https://github.com/feather-rs/feather) +An experimental Minecraft server implementation in Rust -[Curse Generic](https://www.curseforge.com) -A generic service to pull forge mod packs from the curseforge site. +## Forge Based -[Magma](https://magmafoundation.org) +### [Forge](forge/forge) + +[Forge MC Website](https://files.minecraftforge.net) +This is a direct fork of the default forge service + +- Has a version detection fix for "latest" + +### [CurseForge Generic](forge/curseforge-generic) + +[CurseForge Generic Website](https://www.curseforge.com) +A generic service to pull forge mod packs from the curseforge site. + +### [Magma](magma) + +[Magma Website](https://magmafoundation.org) Magma is most powerful Forge server providing you with Forge mods and Bukkit Plugins using Spigot and Paper for Performance Optimization and Stability. -[Krypton](https://github.com/KryptonMC/Krypton) +### [Krypton](krypton) + +[Krypton GitHub](https://github.com/KryptonMC/Krypton) A fast, lightweight Minecraft server written in Kotlin. -## FTB Packs -[FTB Modpacks](https://api.modpacks.ch) +### [Mohist](mohist) + +[Mohist Github](https://github.com/Mohist-Community/Mohist) +Mohist is a minecraft forge server software that implements the Paper/Spigot/Bukkit API. + +## [FTB Packs](ftb) + +[FTB Modpacks API](https://api.modpacks.ch) A generic service to pull FTB modpacks from api.modpacks.ch. There are 2 ways to install a server through this service. The first method only requires you to know the modpacks name and version. The second method requires you to know the id for both the modpack and version in the api. -**Method 1 (Recommended)** +### Method 1 (Recommended) + - FTB_SEARCH_TERM: the modpack name to query for, must be at least 4 characters long. EX: for FTB: Interactions you would do "interactions". - FTB_VERSION_STRING: the string version that you want to install. EX: for FTB: Interactions 2.0.2, you would put "2.0.2". - -**Method 2** + +### Method 2 + - FTB_MODPACK_ID: the id that directs to the modpack in the api. - EX: for FTB: Interactions the id would be "5". https://api.modpacks.ch/public/modpack/5 + EX: for FTB: Interactions the id would be "5". `https://api.modpacks.ch/public/modpack/5` - FTB_MODPACK_VERSION_ID: the version id in the api. - EX: for FTB: Interactions 2.0.2 the id is "86". https://api.modpacks.ch/public/modpack/5/86 + EX: for FTB: Interactions 2.0.2 the id is "86". `https://api.modpacks.ch/public/modpack/5/86` **NOTE** **Not all FTB packs come with a server.properties file, due to this the server.properties file may not get updated with the correct ip address and port at first launch. -Please restart the server after first launch to fix this.** +Please restart the server after first launch to fix this.** -## NanoLimbo -[NanoLimbo](https://github.com/Nan1t/NanoLimbo) +## [NanoLimbo](nanolimbo) + +[NanoLimbo GitHub](https://github.com/Nan1t/NanoLimbo) A lightweight minecraft limbo server, written on Java with Netty. The main goal of the project is maximum simplicity with a minimum number of sent and processed packets. -## Spigot +## Spigot Based + A collection of spigot and forked spigot eggs. +### [Paper](paper) + [PaperMC GitHub](https://github.com/PaperMC/Paper) -High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies +High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies Currently the default on pterodactyl for many reasons. First being that you don't need to build the jar. -[Purpur](https://purpur.pl3x.net) -Purpur is a fork of Paper and Tuinity with the goal of providing new and interesting configuration options, which allow for creating a unique gameplay experience not seen anywhere else +### [Purpur](purpur) + +[Purpur Website](https://purpurmc.org/) +Purpur is a drop-in replacement for Paper servers designed for configurability, and new fun and exciting gameplay features. + +### [Spigot](spigot) + +[Spigot Website](https://www.spigotmc.org) +This is a direct fork of the default spigot service with the added benefit of being able to build the spigot jar. -[Spigot](https://www.spigotmc.org) -This is a direct fork of the default spigot service with the added benefit of being able to build the spigot jar. - (It's noted that building the jar is intensive and time consuming) -[Mohist Github](https://github.com/Mohist-Community/Mohist) -Fork of Spigot focused on performance optimizations. +### [Airplane](airplane) [Airplane Github](https://github.com/TECHNOVE/Airplane) -A stable, optimized and fast Paper fork. +A stable, optimized and well supported Paper fork. -[Tuinity GitHub](https://github.com/Spottedleaf/Tuinity) +### [Tuinity](tuinity) + +[Tuinity GitHub](https://github.com/Spottedleaf/Tuinity) Fork of Paper aimed at improving server performance at high playercounts. - ## Sponge Powered -[SpongeForge](https://www.spongepowered.org) + +### [SpongeForge](spongeforge) + +[SpongeForge Website](https://www.spongepowered.org) SpongeForge is the implementation of the Sponge API on the Minecraft Forge platform. -[SpongeVanilla](https://www.spongepowered.org) +### [SpongeVanilla](spongevanilla) + +[SpongeVanilla Website](https://www.spongepowered.org) A community-driven open source Minecraft: Java Edition modding platform. -## Technic Packs -[Hexxit](https://www.technicpack.net/modpack/hexxit) -Gear up and set forth on a campaign worthy of legend, for Hexxit has been unearthed! +## [Technic Packs](technic) -[Blightfall](https://www.technicpack.net/modpack/blightfall) -Blightfall is a combination modpack and adventure map about surviving on an alien planet. +### [Hexxit](technic/hexxit) -[Tekkit Legends](https://www.technicpack.net/modpack/tekkit-legends) +[Hexxit Modpack Page](https://www.technicpack.net/modpack/hexxit) +Gear up and set forth on a campaign worthy of legend, for Hexxit has been unearthed! + +### [Blightfall](technic/blightfall) + +[Blightfall Modpack Page](https://www.technicpack.net/modpack/blightfall) +Blightfall is a combination modpack and adventure map about surviving on an alien planet. + +### [Tekkit Legends](technic/technic-legends) + +[Tekkit Legends Modpack Page](https://www.technicpack.net/modpack/tekkit-legends) The ancient power of Tekkits past return in this legendary pack! -[Tekkit Classic](https://www.technicpack.net/modpack/tekkit.552560) -The official Tekkit Classic modpack. Build factories, automate crafting! +### [Tekkit Classic](technic/tekkit-classic) -## VanillaCord -[VanillaCord](https://github.com/ME1312/VanillaCord) -VanillaCord adds support for BungeeCord's ip-forwarding option on vanilla Minecraft servers. \ No newline at end of file +[Tekkit Classic Modpack Page](https://www.technicpack.net/modpack/tekkit.552560) +The official Tekkit Classic modpack. Build factories, automate crafting! + +## [VanillaCord](vanillacord) + +[VanillaCord GitHub](https://github.com/ME1312/VanillaCord) +VanillaCord adds support for BungeeCord's ip-forwarding option on vanilla Minecraft servers. From 98b0aae663ae449e68effdc7c658c69ea4edb9de Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:18:12 -0500 Subject: [PATCH 0169/1001] updated description from airplane's github fixed heading levels added blank lines as needed --- game_eggs/minecraft/java/airplane/README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/game_eggs/minecraft/java/airplane/README.md b/game_eggs/minecraft/java/airplane/README.md index 04751ebf..5771f165 100644 --- a/game_eggs/minecraft/java/airplane/README.md +++ b/game_eggs/minecraft/java/airplane/README.md @@ -1,13 +1,14 @@ # Airplane -### From their [Github](https://github.com/TECHNOVE/Airplane) -A stable, optimized and fast Paper fork. +A stable, optimized, well supported Paper fork. + +[Airplane Github](https://github.com/TECHNOVE/Airplane) + +## Minimum RAM warning -### Minimum RAM warning Approximately 2048MB - -### Server Ports +## Server Ports | Port | default | |---------|---------| From 949e6061e9cf1e8076d7fef6d880df7580863663 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:18:37 -0500 Subject: [PATCH 0170/1001] added website and github links added blank lines as needed --- game_eggs/minecraft/java/cuberite/README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/game_eggs/minecraft/java/cuberite/README.md b/game_eggs/minecraft/java/cuberite/README.md index 495a718b..f4c97196 100644 --- a/game_eggs/minecraft/java/cuberite/README.md +++ b/game_eggs/minecraft/java/cuberite/README.md @@ -2,11 +2,14 @@ A lightweight, fast and extensible game server for Minecraft -## Server Ports -The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. +[Cuberite Website](https://cuberite.org/) +[Cuberite GitHub](https://github.com/cuberite/cuberite) +## Server Ports + +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. | Port | default | |----------|---------| | Game | 25565 | -| WebAdmin | 8080 | \ No newline at end of file +| WebAdmin | 8080 | From 1e881da948a2ee9c61a286057a6822809c9dd030 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:19:03 -0500 Subject: [PATCH 0171/1001] added fabric website link added blank lines as needed --- game_eggs/minecraft/java/fabric/README.MD | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/game_eggs/minecraft/java/fabric/README.MD b/game_eggs/minecraft/java/fabric/README.MD index 745eced2..1da85717 100644 --- a/game_eggs/minecraft/java/fabric/README.MD +++ b/game_eggs/minecraft/java/fabric/README.MD @@ -2,9 +2,11 @@ Fabric is a lightweight, experimental modding toolchain for Minecraft. -## Server Ports -The fabric server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. +[Fabric Website](https://fabricmc.net/) +## Server Ports + +The fabric server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. | Port | default | |-------|---------| From de7651597ea26df759c604ca7ff1c60c3cc9d48a Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:19:22 -0500 Subject: [PATCH 0172/1001] added feather github link added blank lines as needed --- game_eggs/minecraft/java/feather/README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/game_eggs/minecraft/java/feather/README.md b/game_eggs/minecraft/java/feather/README.md index 927f8d84..a5d3accc 100644 --- a/game_eggs/minecraft/java/feather/README.md +++ b/game_eggs/minecraft/java/feather/README.md @@ -2,10 +2,12 @@ An experimental Minecraft server implementation written in Rust. -## Server Ports -The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. +[Feather GitHub](https://github.com/feather-rs/feather) +## Server Ports + +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. | Port | default | |-------|---------| -| Game | 25565 | \ No newline at end of file +| Game | 25565 | From a29956df854659d893b15fcef16d3c7d0fc91775 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:19:50 -0500 Subject: [PATCH 0173/1001] fixed heading levels added blank lines as needed removed trailing spaces --- .../minecraft/java/forge/curseforge-generic/README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/game_eggs/minecraft/java/forge/curseforge-generic/README.md b/game_eggs/minecraft/java/forge/curseforge-generic/README.md index cc1647db..31a4eb0e 100644 --- a/game_eggs/minecraft/java/forge/curseforge-generic/README.md +++ b/game_eggs/minecraft/java/forge/curseforge-generic/README.md @@ -1,18 +1,18 @@ # Forge Generic -### This is a generic egg for curseforge modpacks +## This is a generic egg for curseforge modpacks -You will need to give it a modpack ID. The ID for BOFA mods is `375152` for example. +You will need to give it a modpack ID. The ID for BOFA mods is `375152` for example. This can be found on the modpack page in the `About Project` section in the upper right corner. -This will grab the latest release when the version is set to latest. +This will grab the latest release when the version is set to latest. It "should" grab versions of the pack based on the modpack version numbers ## Server Ports -The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. | Port | default | |-------|---------| -| Game | 25565 | \ No newline at end of file +| Game | 25565 | From d0fd2e91f12fd7acb2d82899f43845131581a660 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:20:01 -0500 Subject: [PATCH 0174/1001] fixed heading levels added blank lines as needed --- game_eggs/minecraft/java/forge/forge/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/minecraft/java/forge/forge/README.md b/game_eggs/minecraft/java/forge/forge/README.md index 634470a8..0417423e 100644 --- a/game_eggs/minecraft/java/forge/forge/README.md +++ b/game_eggs/minecraft/java/forge/forge/README.md @@ -1,15 +1,15 @@ # Forge Generic -### This is a generic egg for the forge standalone server +## This is a generic egg for the forge standalone server This will download the latest jar for a specific forge version. this has a fix for the broken 1.7.10 and 1.8.9 versions forge has ## Server Ports -The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. | Port | default | |-------|---------| -| Game | 25565 | \ No newline at end of file +| Game | 25565 | From f5d11fec5fd858d877cce4a5c0deac3c684849e4 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:20:42 -0500 Subject: [PATCH 0175/1001] fixed heading levels added blank lines as needed incased urls --- game_eggs/minecraft/java/ftb/README.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/game_eggs/minecraft/java/ftb/README.md b/game_eggs/minecraft/java/ftb/README.md index fcf4d375..8aa27f8a 100644 --- a/game_eggs/minecraft/java/ftb/README.md +++ b/game_eggs/minecraft/java/ftb/README.md @@ -1,31 +1,33 @@ -## FTB Modpacks +# FTB Modpacks + A generic service to pull FTB modpacks from api.modpacks.ch. There are 2 ways to install a server through this service. The first method only requires you to know the modpacks name and version. The second method requires you to know the id for both the modpack and version in the api. -**Method 1 (Recommended)** +## Method 1 (Recommended) + - FTB_SEARCH_TERM: the modpack name to query for, must be at least 4 characters long. EX: for FTB: Interactions you would do "interactions". - FTB_VERSION_STRING: the string version that you want to install. EX: for FTB: Interactions 2.0.2, you would put "2.0.2". - -**Method 2** + +## Method 2 + - FTB_MODPACK_ID: the id that directs to the modpack in the api. - EX: for FTB: Interactions the id would be "5". https://api.modpacks.ch/public/modpack/5 + EX: for FTB: Interactions the id would be "5". `https://api.modpacks.ch/public/modpack/5` - FTB_MODPACK_VERSION_ID: the version id in the api. - EX: for FTB: Interactions 2.0.2 the id is "86". https://api.modpacks.ch/public/modpack/5/86 + EX: for FTB: Interactions 2.0.2 the id is "86". `https://api.modpacks.ch/public/modpack/5/86` **NOTE** **Not all FTB packs come with a server.properties file, due to this the server.properties file may not get updated with the correct ip address and port at first launch. -Please restart the server after first launch to fix this.** +Please restart the server after first launch to fix this.** ## Server Ports -The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. | Port | default | |-------|---------| | Game | 25565 | - From de4e059d32ffa9918ca3159defbe375983be683b Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:21:29 -0500 Subject: [PATCH 0176/1001] added krypton github link added blank lines as needed --- game_eggs/minecraft/java/krypton/README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/game_eggs/minecraft/java/krypton/README.md b/game_eggs/minecraft/java/krypton/README.md index 217b8e3c..f45dd559 100644 --- a/game_eggs/minecraft/java/krypton/README.md +++ b/game_eggs/minecraft/java/krypton/README.md @@ -1,12 +1,16 @@ # Krypton + A fast, lightweight Minecraft server written in Kotlin +[Krypton GitHub](https://github.com/KryptonMC/Krypton) + ## Server Ports + Krypton only requires a single port to run, just like vanilla, though plugins may need extra ports. ## Notes -Please note that the server will not function correctly unless a pre-generated world is provided. +Please note that the server will not function correctly unless a pre-generated world is provided. | Port | default | |-------|---------| From 3cf236dbb18a7c3a46dba986219992639ff87ac0 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:21:52 -0500 Subject: [PATCH 0177/1001] added magma website link added blank lines as needed --- game_eggs/minecraft/java/magma/README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/game_eggs/minecraft/java/magma/README.md b/game_eggs/minecraft/java/magma/README.md index 51847897..009ea1ca 100644 --- a/game_eggs/minecraft/java/magma/README.md +++ b/game_eggs/minecraft/java/magma/README.md @@ -2,10 +2,12 @@ Magma is most powerful Forge server providing you with Forge mods and Bukkit Plugins using Spigot and Paper for Performance Optimization and Stability. -## Server Ports -The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. +[Magma Website](https://magmefoundation.org/) +## Server Ports + +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. | Port | default | |-------|---------| -| Game | 25565 | \ No newline at end of file +| Game | 25565 | From 98394b4c2d9f031d3c08538fb2eacf1f26884241 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:23:28 -0500 Subject: [PATCH 0178/1001] updated description from website added mohist website link added discontinued to 1.7.x versions as per their website fixed heading levels added blank lines as needed --- game_eggs/minecraft/java/mohist/README.MD | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/game_eggs/minecraft/java/mohist/README.MD b/game_eggs/minecraft/java/mohist/README.MD index 825d5523..76f44ea4 100644 --- a/game_eggs/minecraft/java/mohist/README.MD +++ b/game_eggs/minecraft/java/mohist/README.MD @@ -1,10 +1,12 @@ # Mohist -Mohist is a Spigot fork that prioritizes performance optimizations. +Mohist is a minecraft forge server software that implements the Paper/Spigot/Bukkit API. + +[Mohist Website](https://mohistmc.com/) ## Server Ports -The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. | Port | default | |-------|---------| @@ -12,9 +14,10 @@ The minecraft server requires a single port for access (default 25565) but plugi ## Server Specific -### Supported versions: +### Supported versions + - 1.16.4 series build 132+ - 1.12.x series -- 1.7.x series build 13+ +- 1.7.x series (discontinued) build 13+ -Requires changing Minecraft_Version variable on each new Minecraft version release. \ No newline at end of file +Requires changing Minecraft_Version variable on each new Minecraft version release. From dce48dada5726149d55aec06d9db0488f0ec41e3 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:23:52 -0500 Subject: [PATCH 0179/1001] added github link added blank lines as needed --- game_eggs/minecraft/java/nanolimbo/README.MD | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/game_eggs/minecraft/java/nanolimbo/README.MD b/game_eggs/minecraft/java/nanolimbo/README.MD index 8fc18833..4e8407cb 100644 --- a/game_eggs/minecraft/java/nanolimbo/README.MD +++ b/game_eggs/minecraft/java/nanolimbo/README.MD @@ -3,10 +3,12 @@ A lightweight minecraft limbo server, written on Java with Netty. The main goal of the project is maximum simplicity with a minimum number of sent and processed packets. This limbo is empty, there are no ability to set schematic building since this is not necessary. You can send useful information in chat or BossBar. No plugins, no logs. The server is fully clear. It only able keep a lot of players while the main server is down. -## Server Ports -The nanolimbo server requires a single port for access (default 25565). +[NanoLimbo Github](https://github.com/Nan1t/NanoLimbo) +## Server Ports + +The nanolimbo server requires a single port for access (default 25565). | Port | default | |-------|---------| -| Game | 25565 | \ No newline at end of file +| Game | 25565 | From a30d7655a9860c74c5199292211707559b0fc5d6 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:25:58 -0500 Subject: [PATCH 0180/1001] added website link added blank lines as needed --- game_eggs/minecraft/java/paper/README.MD | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/game_eggs/minecraft/java/paper/README.MD b/game_eggs/minecraft/java/paper/README.MD index 87eef00a..0b39fd4a 100644 --- a/game_eggs/minecraft/java/paper/README.MD +++ b/game_eggs/minecraft/java/paper/README.MD @@ -2,10 +2,12 @@ Paper is the next generation of Minecraft server, compatible with Spigot plugins and offering uncompromising performance. -## Server Ports -The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. +Check out the [Paper Website](https://papermc.io/) for more information. +## Server Ports + +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. | Port | default | |-------|---------| -| Game | 25565 | \ No newline at end of file +| Game | 25565 | From 1759694ccf5596088908fd5b43b26669457c3883 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:40:29 -0500 Subject: [PATCH 0181/1001] updated website link added github link updated description added blank lines as needed --- game_eggs/minecraft/java/purpur/README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/game_eggs/minecraft/java/purpur/README.md b/game_eggs/minecraft/java/purpur/README.md index 59789e93..92735500 100644 --- a/game_eggs/minecraft/java/purpur/README.md +++ b/game_eggs/minecraft/java/purpur/README.md @@ -1,13 +1,14 @@ # Purpur -Purpur is a fork of Paper and Tuinity which provides new configuration options. +Purpur is a drop-in replacement for Paper servers designed for configurability, and new fun and exciting gameplay features. -See https://github.com/pl3xgaming/purpur for additional information. +[Purpur GitHub](https://github.com/PurpurMC/Purpur) +[Purpur Website](https://purpurmc.org/) ## Server Ports -The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. | Port | default | |-------|---------| -| Game | 25565 | \ No newline at end of file +| Game | 25565 | From 309eb8352973b584d7b03b4d08c1cd5032742904 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:40:54 -0500 Subject: [PATCH 0182/1001] added website link fixed heading levels added blank lines as needed --- game_eggs/minecraft/java/spigot/README.MD | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/game_eggs/minecraft/java/spigot/README.MD b/game_eggs/minecraft/java/spigot/README.MD index 92ed0f4f..9910d5f4 100644 --- a/game_eggs/minecraft/java/spigot/README.MD +++ b/game_eggs/minecraft/java/spigot/README.MD @@ -2,9 +2,11 @@ A high performance Minecraft server implementation -## Server Ports -The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. +[Spigot Website](https://www.spigotmc.org/) +## Server Ports + +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. | Port | default | |-------|---------| @@ -14,6 +16,6 @@ The minecraft server requires a single port for access (default 25565) but plugi Spigot was hit with a DMCA and now requires that it be built by the user. -#### This egg will build spigot for you. +### This egg will build spigot for you -You can also supply a download link to a server jar if you want. \ No newline at end of file +You can also supply a download link to a server jar if you want. From 8e2a326ed442043bf974e78515613b1b2757a1e6 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:41:14 -0500 Subject: [PATCH 0183/1001] added website link added blank lines as needed --- game_eggs/minecraft/java/spongeforge/README.MD | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/game_eggs/minecraft/java/spongeforge/README.MD b/game_eggs/minecraft/java/spongeforge/README.MD index deedf5a3..a46e896e 100644 --- a/game_eggs/minecraft/java/spongeforge/README.MD +++ b/game_eggs/minecraft/java/spongeforge/README.MD @@ -1,10 +1,13 @@ # SpongeForge + SpongeForge is the implementation of the Sponge API on the Minecraft Forge platform. -## Server Ports -The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. +[SpongePowered Website](https://www.spongepowered.org/) +## Server Ports + +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. | Port | default | |-------|---------| -| Game | 25565 | \ No newline at end of file +| Game | 25565 | From d20d51da80fe86b88c6438effb6750fc2adba4a2 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:42:10 -0500 Subject: [PATCH 0184/1001] added website link added blank lines as needed --- game_eggs/minecraft/java/spongevanilla/README.MD | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/game_eggs/minecraft/java/spongevanilla/README.MD b/game_eggs/minecraft/java/spongevanilla/README.MD index 611b3648..33383c50 100644 --- a/game_eggs/minecraft/java/spongevanilla/README.MD +++ b/game_eggs/minecraft/java/spongevanilla/README.MD @@ -1,10 +1,13 @@ # SpongeVanilla + A community-driven open source Minecraft: Java Edition modding platform. -## Server Ports -The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. +[SpongePowered Website](https://www.spongepowered.org/) +## Server Ports + +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. | Port | default | |-------|---------| -| Game | 25565 | \ No newline at end of file +| Game | 25565 | From 3a01a4578f36aeb4ec3ff09b8a939a533645036c Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:42:21 -0500 Subject: [PATCH 0185/1001] fixed heading levels added blank lines as needed --- game_eggs/minecraft/java/technic/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game_eggs/minecraft/java/technic/README.md b/game_eggs/minecraft/java/technic/README.md index b00bfacf..6b1a055e 100644 --- a/game_eggs/minecraft/java/technic/README.md +++ b/game_eggs/minecraft/java/technic/README.md @@ -1,6 +1,7 @@ -## Technic Eggs +# Technic Eggs [Technic](/game_eggs/minecraft/java/technic/) + * [Attack of the B-Team](/game_eggs/minecraft/java/technic/attack-of-the-bteam/) * [Blightfall](/game_eggs/minecraft/java/technic/blightfall/) * [Hexxit](/game_eggs/minecraft/java/technic/hexxit/) From 4321500664f10f6b23f420656fd5d9d68c09266d Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:42:38 -0500 Subject: [PATCH 0186/1001] added github link added blank lines as needed --- game_eggs/minecraft/java/tuinity/README.MD | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/game_eggs/minecraft/java/tuinity/README.MD b/game_eggs/minecraft/java/tuinity/README.MD index 02345900..e57fcef3 100644 --- a/game_eggs/minecraft/java/tuinity/README.MD +++ b/game_eggs/minecraft/java/tuinity/README.MD @@ -2,10 +2,12 @@ Fork of Paper aimed at improving server performance at high playercounts. -## Server Ports -The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. +[Tuinity GitHub](https://github.com/Tuinity/Tuinity) +## Server Ports + +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. | Port | default | |-------|---------| -| Game | 25565 | \ No newline at end of file +| Game | 25565 | From 358f9df65929c83c7f357a0087d233fd8ecfbe5d Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:42:52 -0500 Subject: [PATCH 0187/1001] fixed heading levels added blank lines as needed --- game_eggs/minecraft/java/vanillacord/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/minecraft/java/vanillacord/README.md b/game_eggs/minecraft/java/vanillacord/README.md index 03b4b2c5..e8a6ad46 100644 --- a/game_eggs/minecraft/java/vanillacord/README.md +++ b/game_eggs/minecraft/java/vanillacord/README.md @@ -4,14 +4,14 @@ A patch for vanilla servers to work with BungeeCord's ip_forward setting. This uses [ME1312's fork](https://github.com/ME1312/VanillaCord) of VanillaCord which has been updated for modern Minecraft. -## Note: +## Notes If you've set up Spigot, Paper or some other server with BungeeCord's IP forwarding you might know that you have to set online-mode to false. Due to the way that VanillaCord works this is not necessary with this Egg, you can (and should) leave online-mode as true. ## Server Ports -The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. | Port | default | |-------|---------| -| Game | 25565 | \ No newline at end of file +| Game | 25565 | From 8981babfe11509373a549c4895184359debd0cab Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:43:17 -0500 Subject: [PATCH 0188/1001] fixed list indentation --- game_eggs/minecraft/proxy/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/minecraft/proxy/README.md b/game_eggs/minecraft/proxy/README.md index 10ba31bf..7386363c 100644 --- a/game_eggs/minecraft/proxy/README.md +++ b/game_eggs/minecraft/proxy/README.md @@ -10,5 +10,5 @@ * [Bedrock](/game_eggs/minecraft/proxy/bedrock) * [Waterdog PE](/game_eggs/minecraft/proxy/bedrock/waterdogpe) * [Cross Platform](/game_eggs/minecraft/proxy/cross_platform) - * [GeyserMC](/game_eggs/minecraft/proxy/cross_platform/geyser) - * [Waterdog](/game_eggs/minecraft/proxy/cross_platform/waterdog) + * [GeyserMC](/game_eggs/minecraft/proxy/cross_platform/geyser) + * [Waterdog](/game_eggs/minecraft/proxy/cross_platform/waterdog) From 92ed99909c435f3ed03d50eed299b549137a990e Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:43:30 -0500 Subject: [PATCH 0189/1001] fixed heading levels added blank lines as needed --- game_eggs/minecraft/proxy/bedrock/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game_eggs/minecraft/proxy/bedrock/README.md b/game_eggs/minecraft/proxy/bedrock/README.md index 54e84395..15d8636f 100644 --- a/game_eggs/minecraft/proxy/bedrock/README.md +++ b/game_eggs/minecraft/proxy/bedrock/README.md @@ -1,5 +1,6 @@ # Mineraft Bedrock Proxies -### Waterdog PE +## Waterdog PE + [Waterdog PE](https://github.com/WaterdogPE/WaterdogPE) WaterdogPE is a brand new Minecraft: Bedrock Edition proxy software developed by the developers of the old Waterdog Proxy. From 31eed20f064dbd71e0bf3335ea54556182ac1851 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:43:52 -0500 Subject: [PATCH 0190/1001] added blank lines as needed --- game_eggs/minecraft/proxy/bedrock/waterdog_pe/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/game_eggs/minecraft/proxy/bedrock/waterdog_pe/README.md b/game_eggs/minecraft/proxy/bedrock/waterdog_pe/README.md index 44bc3a27..6ba93d12 100644 --- a/game_eggs/minecraft/proxy/bedrock/waterdog_pe/README.md +++ b/game_eggs/minecraft/proxy/bedrock/waterdog_pe/README.md @@ -1,4 +1,5 @@ # Waterdog PE + Brand new proxy server for Minecraft: Bedrock Edition ## Server Ports From e999a0b081769f331099607a0406a44ad16313fd Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:45:16 -0500 Subject: [PATCH 0191/1001] added header links fixed heading levels added blank lines as needed --- game_eggs/minecraft/proxy/cross_platform/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/minecraft/proxy/cross_platform/README.md b/game_eggs/minecraft/proxy/cross_platform/README.md index 39a88343..14b20f77 100644 --- a/game_eggs/minecraft/proxy/cross_platform/README.md +++ b/game_eggs/minecraft/proxy/cross_platform/README.md @@ -1,13 +1,13 @@ # Mineraft Cross Platform Proxies -### GeyserMC +## [GeyserMC](geyser) + [GeyserMC](https://github.com/GeyserMC) A bridge/proxy allowing you to connect to Minecraft: Java Edition servers with Minecraft: Bedrock edition. +## [Waterdog](waterdog) -### Waterdog [Waterdog](https://github.com/WaterdogPE/Waterdog) Waterdog provides native support for the Minecraft Bedrock protocols along with the existing java protocols. It is capable of using the ProtocolSupport PE encapsulation protocol over TCP, or it can use the native RakNet Bedrock protocol for traditional downstream Bedrock servers such as Nukkit, Pocketmine, Bedrock Alpha Server, MiNET, and others. - From e6660e096fc82d3487c15cc8387fbbacd2966dad Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:45:33 -0500 Subject: [PATCH 0192/1001] fixed heading levels added blank lines as needed --- game_eggs/minecraft/proxy/cross_platform/geyser/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game_eggs/minecraft/proxy/cross_platform/geyser/README.md b/game_eggs/minecraft/proxy/cross_platform/geyser/README.md index 10c01c34..8496e37b 100644 --- a/game_eggs/minecraft/proxy/cross_platform/geyser/README.md +++ b/game_eggs/minecraft/proxy/cross_platform/geyser/README.md @@ -2,5 +2,6 @@ A bridge/proxy allowing you to connect to Minecraft: Java Edition servers with Minecraft: Bedrock edition. -### Eggs +## Eggs + GeyserMC maintains their own eggs on their github: [GeyserMC pterodactyl eggs](https://github.com/GeyserMC/pterodactyl-stuff) From 6eeca4d1ba5a0bda796978fc6eea0484638a1558 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:45:48 -0500 Subject: [PATCH 0193/1001] added blank lines as needed --- game_eggs/minecraft/proxy/cross_platform/waterdog/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/game_eggs/minecraft/proxy/cross_platform/waterdog/README.md b/game_eggs/minecraft/proxy/cross_platform/waterdog/README.md index 736f820f..eab8595f 100644 --- a/game_eggs/minecraft/proxy/cross_platform/waterdog/README.md +++ b/game_eggs/minecraft/proxy/cross_platform/waterdog/README.md @@ -1,11 +1,12 @@ # Waterdog server + Waterdog provides native support for the Minecraft Bedrock protocols along with the existing java protocols. It is capable of using the ProtocolSupport PE encapsulation protocol over TCP, or it can use the native RakNet Bedrock protocol for traditional downstream Bedrock servers such as Nukkit, Pocketmine, Bedrock Alpha Server, MiNET, and others. ## Server Ports -The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. | Port | default | |----------|---------| | Java | 25565 | -| Bedrock | 19132 | \ No newline at end of file +| Bedrock | 19132 | From f33bc79ac86dad754b8d278f08f9562737922230 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:49:23 -0500 Subject: [PATCH 0194/1001] removed trailing spaces added blank lines as needed --- game_eggs/openra/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/openra/README.md b/game_eggs/openra/README.md index b587c97b..a87ceab0 100644 --- a/game_eggs/openra/README.md +++ b/game_eggs/openra/README.md @@ -1,5 +1,5 @@ # OpenRA Servers -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). \ No newline at end of file +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). From 3622a9299749f72faf68ab4d3c2955178ad5652f Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:50:00 -0500 Subject: [PATCH 0195/1001] fixed heading levels added blank lines as needed removed trailing spaces --- game_eggs/openra/openra_dune2000/README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/game_eggs/openra/openra_dune2000/README.md b/game_eggs/openra/openra_dune2000/README.md index a89ee18e..fcf95648 100644 --- a/game_eggs/openra/openra_dune2000/README.md +++ b/game_eggs/openra/openra_dune2000/README.md @@ -1,20 +1,21 @@ # OpenRA Dune2000 -#### The classic command & conquer Server +## The classic command & conquer Server +## from the developers -#### from the developers 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). This means that OpenRA is not restricted by the technical limitations of the original closed-source games: it includes native support for modern operating systems and screen resolutions (including Windows 10, macOS, and most Linux distros) without relying on emulation or binary hacks, and features integrated online multiplayer. Make sure to checkout their [Home Page](https://openra.net). -### Server Ports -OpenRA requires a single port +## Server Ports + +OpenRA requires a single port | Port | default | |---------|---------| | Game | 5500 | -#### Mods/Plugins may require ports to be added to the server. \ No newline at end of file +## Mods/Plugins may require ports to be added to the server From 4a515ccf6c89484cda2fa78bf7b79ff24df0b239 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:50:12 -0500 Subject: [PATCH 0196/1001] fixed heading levels added blank lines as needed removed trailing spaces --- game_eggs/openra/openra_red_alert/README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/game_eggs/openra/openra_red_alert/README.md b/game_eggs/openra/openra_red_alert/README.md index 1ad6002d..c1ea47a1 100644 --- a/game_eggs/openra/openra_red_alert/README.md +++ b/game_eggs/openra/openra_red_alert/README.md @@ -1,20 +1,21 @@ # OpenRA -#### The classic command & conquer Server +## The classic command & conquer Server +## from the developers -#### from the developers 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). This means that OpenRA is not restricted by the technical limitations of the original closed-source games: it includes native support for modern operating systems and screen resolutions (including Windows 10, macOS, and most Linux distros) without relying on emulation or binary hacks, and features integrated online multiplayer. Make sure to checkout their [Home Page](https://openra.net). -### Server Ports -OpenRA requires a single port +## Server Ports + +OpenRA requires a single port | Port | default | |---------|---------| | Game | 5500 | -#### Mods/Plugins may require ports to be added to the server. \ No newline at end of file +### Mods/Plugins may require ports to be added to the server From c3f2b157497aaf6ac75988cf745a4a4d234afbab Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:50:31 -0500 Subject: [PATCH 0197/1001] fixed heading levels added blank lines as needed removed trailing spaces --- game_eggs/openra/openra_tiberian_dawn/README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/game_eggs/openra/openra_tiberian_dawn/README.md b/game_eggs/openra/openra_tiberian_dawn/README.md index 2ad7281c..98db384b 100644 --- a/game_eggs/openra/openra_tiberian_dawn/README.md +++ b/game_eggs/openra/openra_tiberian_dawn/README.md @@ -1,20 +1,21 @@ # OpenRA Tiberian Dawn -#### The classic command & conquer Server +## The classic command & conquer Server +## from the developers -#### from the developers 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). This means that OpenRA is not restricted by the technical limitations of the original closed-source games: it includes native support for modern operating systems and screen resolutions (including Windows 10, macOS, and most Linux distros) without relying on emulation or binary hacks, and features integrated online multiplayer. Make sure to checkout their [Home Page](https://openra.net). -### Server Ports -OpenRA requires a single port +## Server Ports + +OpenRA requires a single port | Port | default | |---------|---------| | Game | 5500 | -#### Mods/Plugins may require ports to be added to the server. \ No newline at end of file +### Mods/Plugins may require ports to be added to the server From 19331d207a280f039e5aba8c85ff2c7cd4685bf5 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:50:50 -0500 Subject: [PATCH 0198/1001] fixed heading levels added blank lines as needed --- game_eggs/rdr/redm/README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/game_eggs/rdr/redm/README.md b/game_eggs/rdr/redm/README.md index 469e3f07..8900e0bd 100644 --- a/game_eggs/rdr/redm/README.md +++ b/game_eggs/rdr/redm/README.md @@ -1,16 +1,19 @@ # Red M -### From the [RedM](https://redm.gg/) Site +## From the [RedM](https://redm.gg/) Site + RedM, for Red Dead Redemption 2 on PC. Launching now, based on the CitizenFX framework and Cfx.re technology. -### Install notes +## Install notes + - Only installs latest version versions are not selectable. -### Server Ports +## Server Ports + Ports required to run the server in a table format. | Port | default | |---------|---------| | Game | 30120 | | ServerListing | 30110 | -| cfx join links | 30130 | \ No newline at end of file +| cfx join links | 30130 | From 7f39abf55817db0dc19c40918914c0697a06cb82 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:51:09 -0500 Subject: [PATCH 0199/1001] removed trailing spaces added blank lines as needed --- game_eggs/rdr/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/rdr/README.md b/game_eggs/rdr/README.md index abade62b..50e47255 100644 --- a/game_eggs/rdr/README.md +++ b/game_eggs/rdr/README.md @@ -1,6 +1,6 @@ -# Read Dead Redemption +# Read Dead Redemption ## RedM -[RedM](https://redm.gg/) -RedM, for Red Dead Redemption 2 on PC. Launching now, based on the CitizenFX framework and Cfx.re technology. \ No newline at end of file +[RedM](https://redm.gg/) +RedM, for Red Dead Redemption 2 on PC. Launching now, based on the CitizenFX framework and Cfx.re technology. From 45747914ec2b091b8f934b364815ed275f899804 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:52:35 -0500 Subject: [PATCH 0200/1001] removed unnecessary single item lists fixed list tab indention added blank lines as needed --- game_eggs/steamcmd_servers/README.md | 51 +++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/game_eggs/steamcmd_servers/README.md b/game_eggs/steamcmd_servers/README.md index f65d36e1..64914fea 100644 --- a/game_eggs/steamcmd_servers/README.md +++ b/game_eggs/steamcmd_servers/README.md @@ -3,134 +3,177 @@ This is a collection of servers that use SteamCMD to install. ## 7 Days To Die + [7 Days To Die](7_days_to_die) ## ARK: Survival Evolved + [ARK: Survival Evolved](ark_survival_evolved) ## Arma - * [Arma 3](arma/arma3) + +[Arma 3](arma/arma3) ## Assetto Corsa + [Assetto Corsa](assetto_corsa) ## Avorion + [Avorion](avorion) ## Barotrauma + [Barotrauma](barotrauma) ## Citadel: Forged with Fire + [citadel](citadel) ## Conan Exiles + [Conan Exiles](conan_exiles) ## CryoFall -* [Cryofall](cryofall) + +[Cryofall](cryofall) ## Don't Starve Together + [Don't Starve Together](dont_starve) ## ECO + [ECO](eco) ## HLDS Server + [HLDS Server](hlds_server) ## Holdfast: Nations At War + [Holdfast: Nations At War](holdfast) ## Hurtworld + [Hurtworld](hurtworld) ## Insurgency: Sandstorm + [Insurgency: Sandstorm](insurgency_sandstorm) ## Killing Floor 2 + [Killing Floor 2](killing_floor_2) ## Modiverse + [Modiverse](modiverse) ## Mordhau + [Mordhau](mordhau) ## Onset + [Onset](onset) ## Pavlov VR + [Pavlov VR](pavlov_vr) ## PixARK + [PixARK](pixark) ## Post Scriptum + [Post Scriptum](post_scriptum) ## Project Zomboid + [Project Zomboid](project_zomboid) ## Quake Live + [Quake Live](quake_live) ## Rising World + [Rising World](rising_world) ## Risk of Rain 2 + [Risk Of Rain 2](risk_of_rain_2) ## Rust + * [Rust](rust) * [Autowipe](rust/rust_autowipe) * [Staging](rust/rust_staging) ## Satisfactory + [Satisfactory](satisfactory) ## SCP: Secret Laboratory + * [SCP: Secret Laboratory](scpsl) * [dedicated](scpsl/dedicated) * [exiled](scpsl/exiled) * [multiadmin](scpsl/multiadmin) ## Soldat + [Soldat](soldat) ## Space Engineers + [Space Engineers](space_engineers) ## Squad + [Squad](squad) ## Starbound + [Starbound](starbound) ## Stationeers + [Stationeers](stationeers) ## Stormworks: Build and Rescue + [Stormworks: Build and Rescue](stormworks) ## Subnautica: Nitrox Mod + [Subnautica: Nitrox Mod](subnautica_nitrox_mod) ## Sven coop + [Sven Co-op](svencoop) ## Team Fortress 2 Classic + [Team Fortress 2 Classic](team_fortress_2_classic) ## The Forest + [The Forest](the_forest) ## Tower Unite + [Tower Unite](tower_unite) ## Unturned + [Unturned](unturned) ## Valheim + [Valheim](valheim) - * [Valheim Vanilla](valheim/valheim_vanilla) - * [Valheim Plus Mod](valheim/valheim_plus) + +* [Valheim Vanilla](valheim/valheim_vanilla) +* [Valheim Plus Mod](valheim/valheim_plus) From a9353fcdc464f868881aeacdda26340bacb0e847 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:52:54 -0500 Subject: [PATCH 0201/1001] fixed heading levels added blank lines as needed removed trailing spaces --- game_eggs/steamcmd_servers/7_days_to_die/README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/7_days_to_die/README.md b/game_eggs/steamcmd_servers/7_days_to_die/README.md index 10d93cf6..890b3d11 100644 --- a/game_eggs/steamcmd_servers/7_days_to_die/README.md +++ b/game_eggs/steamcmd_servers/7_days_to_die/README.md @@ -1,8 +1,10 @@ # 7 Days to Die -Steam Description + +Steam Description Set in a brutally unforgiving post-apocalyptic world overrun by the undead, 7 Days to Die is an open-world game that is a unique combination of first person shooter, survival horror, tower defense, and role-playing games. It presents combat, crafting, looting, mining, exploration, and character growth, in a way that has seen a rapturous response from fans worldwide. Play the definitive zombie survival sandbox RPG that came first. Navezgane awaits! -### Server Ports +## Server Ports + 7 Days to Die requires up to 6 ports | Port | default | From 9986a7cd3ec0a06543f5d860d3d7f1e7e6184289 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:53:08 -0500 Subject: [PATCH 0202/1001] incased url --- game_eggs/steamcmd_servers/ark_survival_evolved/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/ark_survival_evolved/README.md b/game_eggs/steamcmd_servers/ark_survival_evolved/README.md index f21c26fb..3df719db 100644 --- a/game_eggs/steamcmd_servers/ark_survival_evolved/README.md +++ b/game_eggs/steamcmd_servers/ark_survival_evolved/README.md @@ -9,7 +9,7 @@ As a man or woman stranded naked, freezing and starving on the shores of a myste This server requires about 4096M to run with no players on a default map. Although it is recommended to run 6144M by the ARK creators, specific DLC maps will increase this requirement, such as Genesis 2 requiring over 13,440M to start. -See the following - https://ark.gamepedia.com/Dedicated_Server_Setup#Hardware +See the following - ### RCON From eae6a116da71b4e846f90f2a0fc0da07029ccac0 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:53:21 -0500 Subject: [PATCH 0203/1001] added blank lines as needed --- game_eggs/steamcmd_servers/arma/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/game_eggs/steamcmd_servers/arma/README.md b/game_eggs/steamcmd_servers/arma/README.md index ddc7aa90..9e667cb5 100644 --- a/game_eggs/steamcmd_servers/arma/README.md +++ b/game_eggs/steamcmd_servers/arma/README.md @@ -3,4 +3,5 @@ ARMA is a series of first-person tactical military shooters, originally released for Microsoft Windows. It features large elements of realism and simulation; a blend of large-scale military conflict spread across large areas alongside the more close quartered battles. ## Arma Titles + * [Arma 3](arma3) From eb297ff91ad096022ac6c666eb42f7159fb4caa6 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:53:56 -0500 Subject: [PATCH 0204/1001] fixed heading levels added blank lines as needed --- .../steamcmd_servers/arma/arma3/README.md | 33 +++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/arma/arma3/README.md b/game_eggs/steamcmd_servers/arma/arma3/README.md index 73aa486c..c06131db 100644 --- a/game_eggs/steamcmd_servers/arma/arma3/README.md +++ b/game_eggs/steamcmd_servers/arma/arma3/README.md @@ -1,7 +1,10 @@ # Arma 3 + ***Updating your Egg? Please see [How to Update Egg](#how-to-update-egg) to avoid any issues!*** ___ -### Authors / Contributors + +## Authors / Contributors +
@@ -37,11 +40,15 @@ ___ ___ + ### Game Description + From Bohemia Interactive's [Website](https://arma3.com/): > Experience true combat gameplay in a massive military sandbox. Deploying a wide variety of single and multiplayer content, over 20 vehicles and 40 weapons, and limitless opportunities for content creation, this is the PC’s premier military game. Authentic, diverse, open - Arma 3 sends you to war. ___ + ### Egg Capabilities + - Configurable to run 32 or 64-bit versions of the server - Max Players is configurable and able to be host enforced (\*see [Recommended Egg Modifications](#recommended-egg-modifications)) - Able to download server updates on startup @@ -55,12 +62,18 @@ ___ - Additional [Arma 3 startup parameters](https://community.bistudio.com/wiki/Arma_3_Startup_Parameters) can be added to fine-tune performance - Configurable to run up to 5 Headless Clients in parallel with the main server (may require additional performance overhead) - [WHMCS](https://www.whmcs.com/) compatible (\*see [Recommended Egg Modifications](#recommended-egg-modifications)) + ___ + ### Installation Requirements + - A valid, **real** Steam account, with **Steam Guard turned off**, is required to install the server (default "anonymous" login cannot be used). For security reasons it is [recommended by Valve](https://developer.valvesoftware.com/wiki/SteamCMD#With_a_Steam_account) that you create a new Steam account just for your dedicated servers. This account *does not* need to own Arma 3. - For automatic Steam Workshop mod downloading to work, the Steam account *does* need to own Arma 3. However, this is optional functionality, and mods can be manually uploaded to the server if desired. Hosts may feel free to change the "Disable Mod Downloads/Updates" variable to `1` if they would not like to offer it's functionality to clients. + ___ + ### Server Ports + Default server ports are listed below, but the Main port can be any port. There are three more ports after the Main port are relative to the Main port (For example: The BattlEye port is always 4 ports higher than the main port). **All four ports are required for normal server behavior.** It is [recommended](https://community.bistudio.com/wiki/Arma_3:_Dedicated_Server#Port_Forwarding) that each server be 100 ports separate from each other. | Port | Default | @@ -70,25 +83,41 @@ Default server ports are listed below, but the Main port can be any port. There | Steam Port (+2) | 2304 | | BattleEye (+4) | 2306 | -#### Mods/Plugins may require ports to be added to the server. +#### Mods/Plugins may require ports to be added to the server + ___ + ### CPU Usage Information + ARMA 3 is mainly CPU intensive. Contrary to popular belief, the server binary *can* run on multiple cores/threads. However, it's ability to manage asynchronous tasks and hyperthread is *very* limited, meaning additional cores/threads reach diminishing returns very quickly. In addition, it's ability to utilize all of the CPU allotted to it for AI processing seems to be limited as well. Therefore, a Headless Client ***and*** a properly written mission file are highly recommended if large amounts of AI units will be used. + ___ + ### Minimum RAM Requirement + This server requires about 2048 MB of RAM to run properly. If used, every Headless Client uses an additional 2048 MB of RAM as well. ___ + ### Minimum Disk Requirement + This server requires just under 10 GB of disk space to safely run properly with no mods. However, mods can easily increase disk usage to 50 GB or more, depending on how many are downloaded. ___ + ### Recommended Egg Modifications + The following are highly recommended variable modifications you can make to the egg after importing it to your panel. While viewing this egg, simply go to the "Variables" tab of the egg editor to make these changes. + #### Default Steam Username & Password + - To make deploying servers easy (**or if you are using WHMCS**), it is recommended to edit the default values of "Steam Username" and "Steam Password" to your Steam account dedicated for hosting. This will make all newly installed servers use these credentials. **DO NOT** make these fields visible to the end user so that they can use their own Steam accounts; the panel will save their Steam credentials in **plain text**, which is a BIG NO NO for security and privacy. + #### Restrict Max Players + - If you would like to restrict the maximum number of players that can join your client's server, you can change the permissions of the "Max Players" variable so that clients can only view this value (and not edit it). It's default value can also be changed, or the value can be changed on a server-by-server basis as desired. ___ + ### How to Update Egg + If you already have an Arma 3 egg installed on your panel, there are a couple things to consider before updating to this egg: - The Startup Command has changed, but Pterodactyl currently does not update this across all your existing servers. Servers will still boot with their old Startup Command, but the new HTML Modlist feature will not work, and depreciated variables for config files will be used. Servers will have to be manually updated to the new Startup Command via the Startup tab. - Startup Variables have been completely rehauled. While most important existing variables have retained their Environment Variable names, a lot of their titles and order have been adjusted. Simply updating your existing egg with this egg may lead to Startup Variables being terribly out of order and cluttered. Therefore, the following steps are recommended to avoid this: From 2e73bdfe20adb2f6aaeca9009ad60e5e2dda5afc Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:54:20 -0500 Subject: [PATCH 0205/1001] fixed heading levels added blank lines as needed remove trailing spaces --- game_eggs/steamcmd_servers/barotrauma/README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/game_eggs/steamcmd_servers/barotrauma/README.md b/game_eggs/steamcmd_servers/barotrauma/README.md index 0e0f1cfa..68b2f7d1 100644 --- a/game_eggs/steamcmd_servers/barotrauma/README.md +++ b/game_eggs/steamcmd_servers/barotrauma/README.md @@ -1,9 +1,11 @@ # Barotrauma -### From their [Steam Description](https://store.steampowered.com/app/602960/Barotrauma/) + +## From their [Steam Description](https://store.steampowered.com/app/602960/Barotrauma/) + Barotrauma is a 2D co-op survival horror submarine simulator, inspired by games like FTL: Faster Than Light, Rimworld, Dwarf Fortress and Space Station 13. It’s a Sci-Fi game that combines ragdoll physics and alien sea monsters with teamwork and existential fear. +## Server Ports -### Server Ports Ports required to run the server in a table format. | Port | default | @@ -14,7 +16,8 @@ Ports required to run the server in a table format. **WARNING You must edit the port and server settings in serversettings.xml file or your server will not work!** -### No console +## No console + Barotrauma server does not currently have server console, it will just spam random messages. You have to add yourself as admin and type commands in-game. Admin file is located at Data/clientpermissions.xml, example config is below. ``` @@ -22,5 +25,5 @@ Barotrauma server does not currently have server console, it will just spam rand + preset="Admin" /> From aa0e177ae684903f703b3c1485dfc259c61f9754 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:54:36 -0500 Subject: [PATCH 0206/1001] added blank lines as needed --- game_eggs/steamcmd_servers/citadel/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/game_eggs/steamcmd_servers/citadel/README.md b/game_eggs/steamcmd_servers/citadel/README.md index e85ca5c1..63290dc2 100644 --- a/game_eggs/steamcmd_servers/citadel/README.md +++ b/game_eggs/steamcmd_servers/citadel/README.md @@ -1,4 +1,5 @@ # Citadel: Forged with fire + Citadel: Forged With Fire is a massive online sandbox RPG set in the mystical world of Ignus. Featuring magic, spellcasting, building, exploring and crafting as you fight to make a name for yourself and achieve notoriety across the land. ## Server Ports From 9d6a7e85c1ba58df3a62320d7c71df5a21b2e3fc Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:55:06 -0500 Subject: [PATCH 0207/1001] added main heading fixed heading levels added blank lines as needed --- game_eggs/steamcmd_servers/conan_exiles/README.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/game_eggs/steamcmd_servers/conan_exiles/README.md b/game_eggs/steamcmd_servers/conan_exiles/README.md index 4ec44fe6..32017867 100644 --- a/game_eggs/steamcmd_servers/conan_exiles/README.md +++ b/game_eggs/steamcmd_servers/conan_exiles/README.md @@ -1,10 +1,15 @@ -### From their [Site](https://conanexiles.com/) +# Conan Exiles + +## From their [Site](https://conanexiles.com/) + Conan Exiles is online multiplayer survival game set in the lands of Conan the Barbarian -### Minimum RAM warning +## Minimum RAM warning + This server requires about 4096m to run properly. -### Server Ports +## Server Ports + Ports required to run the server in a table format. | Port | default | @@ -12,4 +17,4 @@ Ports required to run the server in a table format. | Game | 7777 | | Steam Query | 27015 | -### More information can be found [here](https://forums.funcom.com/t/conan-exiles-dedicated-server-app-latest-version-1-0-21/21699) \ No newline at end of file +## More information can be found [here](https://forums.funcom.com/t/conan-exiles-dedicated-server-app-latest-version-1-0-21/21699) From f8e9ad2c70ac9acc80509a0bd83c24dd61c40c76 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:55:15 -0500 Subject: [PATCH 0208/1001] fixed heading levels added blank lines as needed --- game_eggs/steamcmd_servers/cryofall/README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/game_eggs/steamcmd_servers/cryofall/README.md b/game_eggs/steamcmd_servers/cryofall/README.md index 88c44a53..6565246e 100644 --- a/game_eggs/steamcmd_servers/cryofall/README.md +++ b/game_eggs/steamcmd_servers/cryofall/README.md @@ -1,13 +1,15 @@ # CryoFall -##Minimum RAM warning +## Minimum RAM warning + You may want to assign a minimum of 1GB of RAM to a server. -##Required Server Ports +## Server Ports + The default is 6000 can be changed in SettingsServer.xml | Port | default | |---------|---------| | Game | 6000 | -#### Plugins may require ports to be added to the server. +### Plugins may require ports to be added to the server From 87077bb0c94b7d0400121faf28ef2ad5101feb57 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:55:33 -0500 Subject: [PATCH 0209/1001] fixed heading levels added blank lines as needed removed trailing spaces --- game_eggs/steamcmd_servers/dont_starve/README.md | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/game_eggs/steamcmd_servers/dont_starve/README.md b/game_eggs/steamcmd_servers/dont_starve/README.md index 7d8d6e36..ac69f9d3 100644 --- a/game_eggs/steamcmd_servers/dont_starve/README.md +++ b/game_eggs/steamcmd_servers/dont_starve/README.md @@ -1,20 +1,23 @@ # Don't Starve Together -### From their [site](https://www.klei.com/games/dont-starve) -Don’t Starve is an uncompromising wilderness survival game full of science and magic. -You play as Wilson, an intrepid Gentleman Scientist who has been trapped by a demon and transported to a mysterious wilderness world. Wilson must learn to exploit his environment and its inhabitants if he ever hopes to escape and find his way back home. +## From their [site](https://www.klei.com/games/dont-starve) + +Don’t Starve is an uncompromising wilderness survival game full of science and magic. + +You play as Wilson, an intrepid Gentleman Scientist who has been trapped by a demon and transported to a mysterious wilderness world. Wilson must learn to exploit his environment and its inhabitants if he ever hopes to escape and find his way back home. Enter a strange and unexplored world full of strange creatures, dangers, and surprises. Gather resources to craft items and structures that match your survival style. Play your way as you unravel the mysteries of this strange land. -### Minimum RAM warning +## Minimum RAM warning + Minimum required memory to run the server is around 512mb for a single user.. +## Server Ports -### Server Ports Don't Starve Together only requires a single port to run. The default is 10999 | Port | default | |---------|---------| | Game | 10998 | -#### Mods/Plugins may require ports to be added to the server. +### Mods/Plugins may require ports to be added to the server From 342510057e4ed757f3a42b0e28cd072b2f2fc535 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:55:54 -0500 Subject: [PATCH 0210/1001] fixed heading levels added blank lines as needed removed trailing spaces --- game_eggs/steamcmd_servers/eco/README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/game_eggs/steamcmd_servers/eco/README.md b/game_eggs/steamcmd_servers/eco/README.md index 147bda91..4ae287a2 100644 --- a/game_eggs/steamcmd_servers/eco/README.md +++ b/game_eggs/steamcmd_servers/eco/README.md @@ -1,15 +1,16 @@ # Eco -Steam Description + +Steam Description Eco is a community-based game; the players develop laws, government, and an economy to determine the success of their world. We need extensive playtesting to get the balance of our core features just right. Early Access is the perfect fit for finding an audience for this while also funding additional development. -### Server Ports +## Server Ports + Eco requires up to 2 ports game port (default 3000) web port (default 3001) - | Port | default | |---------|---------------| | Game | 3000 | -| Web | 3001 | \ No newline at end of file +| Web | 3001 | From f0f9b03474b34a1235a4c67f2466ce1ff637bb04 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:56:02 -0500 Subject: [PATCH 0211/1001] fixed heading levels added blank lines as needed --- game_eggs/steamcmd_servers/fof/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/fof/README.md b/game_eggs/steamcmd_servers/fof/README.md index 58fc0779..96e8256f 100644 --- a/game_eggs/steamcmd_servers/fof/README.md +++ b/game_eggs/steamcmd_servers/fof/README.md @@ -4,7 +4,8 @@ Multiplayer based, first person enabled, action packed and skill demanding shooter set in the Wild West times. A unique combination of non stop action and slow but powerful weaponry. -### Server Ports +## Server Ports + FOF servers require 1 port to be open, the SourceTV port can also be opened for spectators. | Port | default | From 95b84017802cd2a6cf543aea2aa99a188ce45bea Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:56:09 -0500 Subject: [PATCH 0212/1001] fixed heading levels added blank lines as needed --- game_eggs/steamcmd_servers/hlds_server/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/hlds_server/README.md b/game_eggs/steamcmd_servers/hlds_server/README.md index 8f65ef99..71480325 100644 --- a/game_eggs/steamcmd_servers/hlds_server/README.md +++ b/game_eggs/steamcmd_servers/hlds_server/README.md @@ -2,11 +2,12 @@ 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 -### Server Ports +## Server Ports + HLDS servers require up to 6 ports | Port | default | |-----------|---------| | Game/rcon | 27015 | | HLTV | 27020 | -| VAC | 26900 | \ No newline at end of file +| VAC | 26900 | From 29b9cef332352d2a13dec0463096084f4a410b48 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:57:57 -0500 Subject: [PATCH 0213/1001] added server ports table removed old egg import instructions switched image to markdown style removed unnessary spaces fixed heading levels added blank lines as needed --- game_eggs/steamcmd_servers/holdfast/README.md | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/game_eggs/steamcmd_servers/holdfast/README.md b/game_eggs/steamcmd_servers/holdfast/README.md index 73b47c7e..d49246ae 100644 --- a/game_eggs/steamcmd_servers/holdfast/README.md +++ b/game_eggs/steamcmd_servers/holdfast/README.md @@ -1,23 +1,17 @@ -# What is Holdfast: Nations At War ? +# What is Holdfast: Nations At War + Fight on multiple fronts in Holdfast: Nations At War - A competitive multiplayer first and third person shooter set during the great Napoleonic Era. Charge into battle with over 150 players per server! -> [Holdfast: NaW](https://store.steampowered.com/app/589290/Holdfast_Nations_At_War/) +>[Holdfast: NaW](https://store.steampowered.com/app/589290/Holdfast_Nations_At_War/) -logo +![image](https://steamcdn-a.akamaihd.net/steam/apps/589290/capsule_616x353.jpg?t=1600279941) -# How to import an egg in [Pterodactyl](https://pterodactyl.io/) +## Server Ports -1. Download [egg-holdfast-na-w.json](https://github.com/ankit2951/pterodactyl-holdfast/blob/main/egg-holdfast-na-w.json). -> It's easiest to right click the raw button and save as. -2. In your panel go to the Nests section in the admin part of the panel -3. Click the green Import Egg button -4. Browse to the json file you saved earlier -5. Select what nest you want to put the egg in. -> If you want a new nest you need to create it before importing the egg. -6. Restart the daemon on your node before creating a server using the new egg(s). +These are the servers required ports -server_port 20100 -steam_communications_port 8700 -steam_query_port 27000 - -# You must restart your daemon after importing an egg +| Port | default | +|----------------|---------| +| Game | 20100 | +| Query | 27000 | +| Communications | 8700 | From b345f8e1dfdcdcc5127fdf1d14f1c26149ce9426 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:58:08 -0500 Subject: [PATCH 0214/1001] fixed heading levels added blank lines as needed --- game_eggs/steamcmd_servers/hurtworld/README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/game_eggs/steamcmd_servers/hurtworld/README.md b/game_eggs/steamcmd_servers/hurtworld/README.md index eb62c64e..0fbc72a6 100644 --- a/game_eggs/steamcmd_servers/hurtworld/README.md +++ b/game_eggs/steamcmd_servers/hurtworld/README.md @@ -1,10 +1,13 @@ # Hurtworld -### From their [website](http://hurtworld.com/) -### Install notes +## From their [website](http://hurtworld.com/) + +## Install notes + Due to rate limiting the console on the panel cannot keep up with the game console and the build will complete before the panel console may show it. Reloading the console will load it to the latest part of the log. -### Server Ports +## Server Ports + These are the servers required ports | Port | default | @@ -12,4 +15,4 @@ These are the servers required ports | Game | 12871 | | Query | 13871 | -#### Mods/Plugins may require ports to be added to the server. +### Mods/Plugins may require ports to be added to the server From 946a80c90b68559d41a783d43dae2dc0ddaca0e0 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:58:30 -0500 Subject: [PATCH 0215/1001] fixed heading levels added blank lines as needed removed trailing spaces incased url --- .../steamcmd_servers/insurgency_sandstorm/README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/insurgency_sandstorm/README.md b/game_eggs/steamcmd_servers/insurgency_sandstorm/README.md index 61d81823..83fc4d38 100644 --- a/game_eggs/steamcmd_servers/insurgency_sandstorm/README.md +++ b/game_eggs/steamcmd_servers/insurgency_sandstorm/README.md @@ -1,18 +1,24 @@ # Insurgency: Sandstorm -Steam Description + +Steam Description Insurgency: Sandstorm is a team-based, tactical FPS based on lethal close quarters combat and objective-oriented multiplayer gameplay. Experience the intensity of modern combat where skill is rewarded, and teamwork wins the fight. ## GSLT Authentication + In order for your server to be able to authenticate with the stats server, you must authenticate your server through using a Steam GSLT (Game Server Login Token). To start your server with GSLT authentication add -GSLTToken=xxxxxxxxxxxxxxx to the server's command line where "xxxxxxxxxxxxxxx" is the token displayed on the Steam Game Server Account page. -See the following for additional configurations - https://support.newworldinteractive.com/support/solutions/articles/47001115510-server-admin-guide +See the following for additional configurations - ## Recommended server settings + ### Minimum Storage + This server requires about 5632M to install. + ### Minimum RAM + This server requires about 1024M to run with no players. ## Server Ports From 8796bf2f1982469cabdc007663b1faf53e3ea9d0 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:58:38 -0500 Subject: [PATCH 0216/1001] fixed heading levels added blank lines as needed --- game_eggs/steamcmd_servers/killing_floor_2/README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/game_eggs/steamcmd_servers/killing_floor_2/README.md b/game_eggs/steamcmd_servers/killing_floor_2/README.md index 49c02fd1..7e5eedde 100644 --- a/game_eggs/steamcmd_servers/killing_floor_2/README.md +++ b/game_eggs/steamcmd_servers/killing_floor_2/README.md @@ -1,8 +1,11 @@ # Killing Floor 2 -### From their [Site](https://killingfloor2.com/) + +## From their [Site](https://killingfloor2.com/) + In KILLING FLOOR 2, players descend into continental Europe after it has been overrun by horrific, murderous clones called Zeds that were created by the corporation Horzine. The Zed outbreak caused by Horzine Biotech’s failed experiments has quickly spread with unstoppable momentum, paralyzing the European Union. Only a month ago, the first Zed outbreak from the original KILLING FLOOR ripped through London; now the specimen clones are everywhere. -### Server Ports +## Server Ports + Ports required to run the server in a table format. | Port | default | @@ -10,4 +13,4 @@ Ports required to run the server in a table format. | Game Port | 7777 | | Query Port | 27015 | |Extra Ports |---------| -| Web Admin | 8080 | \ No newline at end of file +| Web Admin | 8080 | From 9db434f0911703fd67d06607723a59d2d5c1df9d Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:59:04 -0500 Subject: [PATCH 0217/1001] fixed heading levels added blank lines as needed formatted server ports table --- game_eggs/steamcmd_servers/modiverse/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/steamcmd_servers/modiverse/README.md b/game_eggs/steamcmd_servers/modiverse/README.md index f61dfa0e..30424fb1 100644 --- a/game_eggs/steamcmd_servers/modiverse/README.md +++ b/game_eggs/steamcmd_servers/modiverse/README.md @@ -2,13 +2,13 @@ Modiverse provides a sandbox environment with the ability to create and play mods such as TTT, Deathrun, FortWars, RP, and more! Use the many sandbox tools to build complex worlds with props, lights, thrusters, wheels, and much much more! -### Information +## Information + Default ServerConfiguration.json is provided to start the server, you must modify it with your own mods to customize the server. The game is currently in beta and as such the console is filled with debug spam, developers have noted that this will be removed when the game releases. ## Server Ports - | Port | default | |-------------|---------| | Game | 7777 | -| Query | 27015 | \ No newline at end of file +| Query | 27015 | From da6586e094fb7fe9ff112f6da207c888b2fb2a78 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:59:21 -0500 Subject: [PATCH 0218/1001] fixed heading levels added blank lines as needed removed trailing spaces --- game_eggs/steamcmd_servers/mordhau/README.md | 28 +++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/game_eggs/steamcmd_servers/mordhau/README.md b/game_eggs/steamcmd_servers/mordhau/README.md index d67ed494..692805b0 100644 --- a/game_eggs/steamcmd_servers/mordhau/README.md +++ b/game_eggs/steamcmd_servers/mordhau/README.md @@ -1,23 +1,23 @@ # Mordhau -Steam Description + +Steam Description MORDHAU is a medieval first & third person multiplayer slasher. Enter a hectic battlefield of up to 64 players as a mercenary in a fictional, but realistic world, where you will get to experience the brutal and satisfying melee combat that will have you always coming back for more. -### Versions +## Versions + +### Vanilla -#### Vanilla A standard linux mordhau server -#### Wine -The windows version of the server running in Wine. -This supports some mods that do not work with the linux version of the server. +### Wine + +The windows version of the server running in Wine. +This supports some mods that do not work with the linux version of the server. Uses more resources for the server than the linux version. -### Server Ports -Mordhau requires 3 ports +## Server Ports -game port (default 7777) -query port (default 27015) -Beacon (default 15000) +Mordhau requires 3 ports | Port | default | |---------|---------------| @@ -25,11 +25,13 @@ Beacon (default 15000) | Query | 27015 | | Beacon | 15000 | -### Map Rotation / Change Config +## Map Rotation / Change Config + Lots of good information in this [thread](https://mordhau.com/forum/topic/10348/dedicated-server-hosting-guide-linux/?page=1) You'll need to run the server once before the Mordhau/Saved/Config/LinuxServer folder is available -### Default Map Variable +## Default Map Variable + By default the game always starts the same game map and mode. Change this variable to start the server wth your choice of map and mode. For example , Grad/HRD_Grad OR TaigaMap/FL_Taiga Map Types From b79d0c81973652a3e7992040c0bf7b186cb0269a Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 12:59:38 -0500 Subject: [PATCH 0219/1001] fixed heading levels added blank lines as needed removed trailing spaces --- game_eggs/steamcmd_servers/nmrih/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/steamcmd_servers/nmrih/README.md b/game_eggs/steamcmd_servers/nmrih/README.md index 14a0589c..1d12d382 100644 --- a/game_eggs/steamcmd_servers/nmrih/README.md +++ b/game_eggs/steamcmd_servers/nmrih/README.md @@ -1,10 +1,11 @@ -# No More Room in Hell +# No More Room in Hell ## From their [Website](https://www.nomoreroominhell.com/) No More Room in Hell is the ultimate ruthless and unforgiving co-operative zombie survival experience on the Source Engine, delivering award winning survival horror gameplay with dozens of weapons and multiple game modes. -### Server Ports +## Server Ports + NMRIH servers require 1 port to be open, the SourceTV port can also be opened for spectators. | Port | default | @@ -13,4 +14,3 @@ NMRIH servers require 1 port to be open, the SourceTV port can also be opened fo | SourceTV | 27020 | ## Steam Download [SteamStore](https://store.steampowered.com/app/224260/No_More_Room_in_Hell/) - From 1e07fbf3532d2170ec93e1c7fc3a3cf7ea48bad4 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:00:03 -0500 Subject: [PATCH 0220/1001] fixed heading levels added blank lines as needed removed trailing spaces incased url --- game_eggs/steamcmd_servers/onset/README.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/game_eggs/steamcmd_servers/onset/README.md b/game_eggs/steamcmd_servers/onset/README.md index 274faf9e..bdd740a9 100644 --- a/game_eggs/steamcmd_servers/onset/README.md +++ b/game_eggs/steamcmd_servers/onset/README.md @@ -1,14 +1,18 @@ # Onset -From their [site](https://playonset.com/): -Onset is an open world multiplayer sandbox without predefined goals. Create and host your very own experience in Onset using scripting functions. Whether that is Roleplay, Cops and Robbers or classic Freeroam. Or just enjoy the different gamemodes created by other players. + +From their [site](https://playonset.com/): +Onset is an open world multiplayer sandbox without predefined goals. Create and host your very own experience in Onset using scripting functions. Whether that is Roleplay, Cops and Robbers or classic Freeroam. Or just enjoy the different gamemodes created by other players. ## Recommended server settings + ### RAM + This server requires about 100M to run. -See the following - https://dev.playonset.com/wiki/DedicatedServer#Minimum_requirements_2 +See the following - ### Disk + This server uses about 50M of disk. ## Server Ports @@ -17,4 +21,4 @@ This server uses about 50M of disk. |-------|---------| | Game | 7777 | | Query | 7776 | -| file | 7775 | \ No newline at end of file +| file | 7775 | From 4605dbdefef4a0fe4cbaca7be03c9da8b75dfb43 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:00:24 -0500 Subject: [PATCH 0221/1001] incased url added blank lines as needed --- game_eggs/steamcmd_servers/pavlov_vr/README.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/pavlov_vr/README.md b/game_eggs/steamcmd_servers/pavlov_vr/README.md index 9c475577..b8730b09 100644 --- a/game_eggs/steamcmd_servers/pavlov_vr/README.md +++ b/game_eggs/steamcmd_servers/pavlov_vr/README.md @@ -1,22 +1,29 @@ # Pavlov VR + Pavlov VR is a multiplayer shooter in VR with heavy focus on community features. Realistic reloading features and fast paced combat as part of the core experience. ## Recommended server settings + ### Minimum RAM + This server requires about 2048M to run. A 3.2 GHz core will support approximately 24 players. Since Pavlov VR is single threaded, faster clockspeeds will mean higher performance. ### Tickrate + For stable results, please use a minimum of 50 and a maximum of 120. ### Multiple Servers on the same host -If you are running multiple servers and have set additional ports (see http://wiki.pavlov-vr.com/index.php?title=Dedicated_server#Running_multiple_servers_on_one_host) then you need to allow access to the defined port plus the port 400 higher. So if you use 7000 as your port, then UDP 7000 and 7400 need to be open. -For additional help, please see the following - http://wiki.pavlov-vr.com/index.php?title=Dedicated_server +If you are running multiple servers and have set additional ports (see ) then you need to allow access to the defined port plus the port 400 higher. So if you use 7000 as your port, then UDP 7000 and 7400 need to be open. + +For additional help, please see the following - ### Steam Workshop + When downloading a large map from the steam workshop make sure your node has enough RAM assigned to store the map files in its tmpfs! This requires you to modify your wings configuration to have the tmpfs_size value increased. ## Server Ports + | Port | default | |-------|---------| | Game | 7777 | From aa8171a042852a6cf51881b9620f889482c9b621 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:00:32 -0500 Subject: [PATCH 0222/1001] fixed heading levels added blank lines as needed --- game_eggs/steamcmd_servers/pixark/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/pixark/README.md b/game_eggs/steamcmd_servers/pixark/README.md index 1183417c..7c0999b4 100644 --- a/game_eggs/steamcmd_servers/pixark/README.md +++ b/game_eggs/steamcmd_servers/pixark/README.md @@ -2,7 +2,8 @@ Welcome to PixARK, a vast, wild world filled with vicious dinosaurs, magical creatures and endless adventure! To survive in this mysterious land, you must tame creatures both ferocious and cuddly, craft high tech and magical tools, and build your own base out of cubes. -### Server Ports +## Server Ports + PixARK requires 4 ports | Port | default | @@ -10,4 +11,4 @@ PixARK requires 4 ports | Game | 27015 | | Query | 27016 | | RCON | 27017 | -| cube | 27018 | \ No newline at end of file +| cube | 27018 | From afea0ea8c145f60c5d36c27affdcd705389096aa Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:00:53 -0500 Subject: [PATCH 0223/1001] formatted server ports table --- game_eggs/steamcmd_servers/post_scriptum/README.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/game_eggs/steamcmd_servers/post_scriptum/README.md b/game_eggs/steamcmd_servers/post_scriptum/README.md index 7c963a86..18b93f39 100644 --- a/game_eggs/steamcmd_servers/post_scriptum/README.md +++ b/game_eggs/steamcmd_servers/post_scriptum/README.md @@ -6,9 +6,8 @@ Post Scriptum is a WW2-themed first-person tactical shooter that provides an aut Post Scriptum requires Game and Query port to function, while RCON port is only required if you want to use RCON. - -| Port | default | -|-------------|---------| -| Game | 10027 | -| Query | 10037 | -| RCON (optional) | 21114 | +| Port | default | +|-----------------|---------| +| Game | 10027 | +| Query | 10037 | +| RCON (optional) | 21114 | From c4f5a009d6c6f134ac1554fe3375259d888f44c8 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:01:24 -0500 Subject: [PATCH 0224/1001] added code block tag added blank lines as needed --- game_eggs/steamcmd_servers/project_zomboid/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/project_zomboid/README.md b/game_eggs/steamcmd_servers/project_zomboid/README.md index 9a6c9389..6f6f9c32 100644 --- a/game_eggs/steamcmd_servers/project_zomboid/README.md +++ b/game_eggs/steamcmd_servers/project_zomboid/README.md @@ -7,7 +7,8 @@ Project Zomboid is the ultimate in zombie survival. Alone or in MP: you loot, bu Project Zomboid requires one port for Steam and an additional **one port per player**. Additional ports are allocated as they connect. For example, when configured with a base allocation of 27016: -``` + +```log Zomboid Steam Server started, ports 27016 and 27016 must be open on the router Connected new client kubi ID # 0 and assigned DL port 27017 Connected new client kubi2 ID # 1 and assigned DL port 27018 From 341e537bfab13f0ef2c0737a50dbadfca2c2d01b Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:01:49 -0500 Subject: [PATCH 0225/1001] fixed heading levels added blank lines as needed removed trailing spaces --- game_eggs/steamcmd_servers/quake_live/README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/game_eggs/steamcmd_servers/quake_live/README.md b/game_eggs/steamcmd_servers/quake_live/README.md index dba53fb5..e665d67e 100644 --- a/game_eggs/steamcmd_servers/quake_live/README.md +++ b/game_eggs/steamcmd_servers/quake_live/README.md @@ -1,13 +1,15 @@ # Quake Live -A first-person shooter video game by id Software. It is an updated version of Quake III Arena that was originally designed -as a free-to-play game launched via a web browser plug-in. On September 17, 2014, the game was re-launched as a standalone + +A first-person shooter video game by id Software. It is an updated version of Quake III Arena that was originally designed +as a free-to-play game launched via a web browser plug-in. On September 17, 2014, the game was re-launched as a standalone title on Steam. -Quake Live was previously a free-to-play game, with subscription options offering additional arenas, game types and game -server options. As of October 27, 2015, the game is no longer free and must be purchased, and the subscription options +Quake Live was previously a free-to-play game, with subscription options offering additional arenas, game types and game +server options. As of October 27, 2015, the game is no longer free and must be purchased, and the subscription options were dropped. -### Server Ports +## Server Ports + Ports required to run the server in a table format. | Port | default | From 12aaa37d1f47b08f1b40136851bde2cfcc746422 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:02:33 -0500 Subject: [PATCH 0226/1001] fixed heading levels fixed list indention added blank lines as needed --- game_eggs/steamcmd_servers/rising_world/README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/game_eggs/steamcmd_servers/rising_world/README.md b/game_eggs/steamcmd_servers/rising_world/README.md index c2800974..f30a88ca 100644 --- a/game_eggs/steamcmd_servers/rising_world/README.md +++ b/game_eggs/steamcmd_servers/rising_world/README.md @@ -1,10 +1,13 @@ # Rising World + Rising World is a voxel based open-world sandbox game, featuring a procedurally generated world, playable in single and multi-player. -### Server Ports +## Server Ports + Rising World requires up to 7 ports. - * The RCON port is optional, but is enabled by default. - * Game ports require both TCP and UDP + +* The RCON port is optional, but is enabled by default. +* Game ports require both TCP and UDP | Port | default | |---------|---------------| From eaf51c4415890c3380da4a7be6f62c7b5c413f88 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:03:00 -0500 Subject: [PATCH 0227/1001] added blank lines as needed --- game_eggs/steamcmd_servers/risk_of_rain_2/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/game_eggs/steamcmd_servers/risk_of_rain_2/README.md b/game_eggs/steamcmd_servers/risk_of_rain_2/README.md index b8150b97..f14ec862 100644 --- a/game_eggs/steamcmd_servers/risk_of_rain_2/README.md +++ b/game_eggs/steamcmd_servers/risk_of_rain_2/README.md @@ -3,6 +3,7 @@ Escape a chaotic alien planet by fighting through hordes of frenzied monsters – with your friends, or on your own. ## Minimum Specifications + - At least 1GB RAM - Minimum 4GB hard disk space From dce50104499bc4866ff9728bfb7d445529c3167e Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:03:08 -0500 Subject: [PATCH 0228/1001] fixed heading levels added blank lines as needed --- game_eggs/steamcmd_servers/rust/rust_autowipe/README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/game_eggs/steamcmd_servers/rust/rust_autowipe/README.md b/game_eggs/steamcmd_servers/rust/rust_autowipe/README.md index 292eef0c..d2e8763b 100644 --- a/game_eggs/steamcmd_servers/rust/rust_autowipe/README.md +++ b/game_eggs/steamcmd_servers/rust/rust_autowipe/README.md @@ -1,4 +1,5 @@ -### Rust Autowipe +# Rust Autowipe + The only aim in Rust is to survive. To do this you will need to overcome struggles such as hunger, thirst and cold. Build a fire. Build a shelter. Kill animals for meat. Protect yourself from other players, and kill them for meat. Create alliances with other players and form a town. Do whatever it takes to survive. Adds variables to wipe files based on a list you set. Reinstall to perform the wipe. @@ -7,11 +8,13 @@ The variable `REGEN_SERVER` was added, default 0, set to 1 to generate a random Files listed in the `REMOVE_FILES` variabe, space separated, will be removed. -### Minimum RAM warning +## Minimum RAM warning + The server requires at least 4096MB to run properly. This is mostly needed for the startup only, once it is running (depending on your world size) it should consume less. -### Server Ports +## Server Ports + Ports required to run the server. | Port | default | From 7213c10c55200121e608333ff0ec79e63929ce2d Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:03:17 -0500 Subject: [PATCH 0229/1001] fixed heading levels added blank lines as needed --- .../steamcmd_servers/rust/rust_staging/README.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/game_eggs/steamcmd_servers/rust/rust_staging/README.md b/game_eggs/steamcmd_servers/rust/rust_staging/README.md index 7b577286..f1742a66 100644 --- a/game_eggs/steamcmd_servers/rust/rust_staging/README.md +++ b/game_eggs/steamcmd_servers/rust/rust_staging/README.md @@ -1,18 +1,22 @@ -### Rust Staging Branch +# Rust Staging Branch + The only aim in Rust is to survive. To do this you will need to overcome struggles such as hunger, thirst and cold. Build a fire. Build a shelter. Kill animals for meat. Protect yourself from other players, and kill them for meat. Create alliances with other players and form a town. Do whatever it takes to survive. -### Minimum RAM warning +## Minimum RAM warning + The server requires at least 4096MB to run properly. This is mostly needed for the startup only, once it is running (depending on your world size) it should consume less. -### Modding warning +## Modding warning + Due to Oxide/uMod not supporting the staging branch, you will not be able to Mod this server. Wulf (Community Admin on Oxidemod/uMod): "We only release builds for the release/public branch of Rust, so if you'd like to use it on any other branch, you'd need to manually patch it yourself using our patcher tool founder under the Snapshots repo. To switch a different Rust branch, just use the -beta tag with SteamCMD and the branch name." -### Server Ports +## Server Ports + Ports required to run the server. | Port | default | From 5fba7ef2bb83caba7b7d17f8e2323c5249a28f3c Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:03:56 -0500 Subject: [PATCH 0230/1001] fixed heading levels added blank lines as needed addec code block tags --- .../steamcmd_servers/satisfactory/README.md | 43 ++++++++++++++++--- 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/game_eggs/steamcmd_servers/satisfactory/README.md b/game_eggs/steamcmd_servers/satisfactory/README.md index eb260cd1..79b49fed 100644 --- a/game_eggs/steamcmd_servers/satisfactory/README.md +++ b/game_eggs/steamcmd_servers/satisfactory/README.md @@ -1,7 +1,10 @@ # Satisfactory + ***Updating your Egg?**: Ensure any existing servers have the latest Startup Command, new Startup Variables are set, **and you reinstall server!*** ___ -### Authors / Contributors + +## Authors / Contributors +
@@ -59,19 +62,27 @@ ___ ___ + ### Game Description + From Coffee Stain's [Website](https://www.satisfactorygame.com/): > Satisfactory is a first-person open-world factory building game with a dash of exploration and combat. Play alone or with friends, explore an alien planet, create multi-story factories, and enter conveyor belt heaven! + ___ + ### Egg Capabilities + - Configuration of the Server Query, Beacon, and Game ports. - Configurable to automatically check for server updates on start via SteamCMD. Forcing validation is also configurable. - *[Experimental]* Max player configuration. - Autosave amount and interval configuration. - Disable crash reporting if desired. - ...and other advanced networking and server branch configurable settings. + ___ + ### Server Ports + - Default server ports are listed below, but all three ports can be changed freely. - **Note:** The Primary/Default/Game Port for your server in Pterodactyl will be Satisfactory's `-Port=????` game port, even though clients will **connect with the Query port**. - It is recommended to distance ports of other running Satisfactory servers in Pterodactyl by **increments of 100** (it is currently unknown what the minimum increment is, but an increment of +1 caused cross-server talk in testing). Also, your internal ports **must match** your external ports on your network (ie. you can't have an external port of 7778 forwarded to your 7777 internal port; they must match). @@ -84,6 +95,7 @@ ___ | Server Query | 15777 | ___ + ### Installation/System Requirements | | Bare Minimum | Recommended | @@ -96,40 +108,54 @@ ___ | Game Ownership | Not required to start. | Required to fully "initialize" (see [Server Initialization](#server-initialization) below) | ___ + ### Server Initialization + For a server to be fully "initialized", a client who owns the game must log into the server to "claim" it and create an administrator password. Then, a new session can be created via the "Create Game" tab in-game, or an existing save file can be uploaded (see [Save Files](#save-files) below). Misc. settings listed below can be configured by an admin client via the game's "Server Settings" tab, and are currently **not** set via the Egg: + - Server Password - Admin Password - Auto-Save on Player Disconnect - Pause When No Players Online - ...and possibly more as the client's UI is developed further for more configuration options. + ___ + ### Save Files + An existing save file (including single-player saves) can currently be uploaded to the server via two different methods: - "Manage Saves" tab via a client in-game (Recommended) - Manually via the File Manager or SFTP Save files are located in this directory: -``` + +```md /home/container/.config/Epic/FactoryGame/Saved/SaveGames/server ``` + *Note: A manually uploaded save will only load if it is (a.) loaded manually via the "Manage Saves" tab in-game, (b.) it is the only save file present, or (c.) its existing session name (not its file name) matches the existing save's session name *and* has the most recent time stamp.* ***Warning:*** Stopping the server **does not** currently save your game! Ensure it is saved before stopping the server. If you have forgotten your administrator password or would generally like to reset your server as if it were new, you can delete the following file: -``` + +```md /home/container/.config/Epic/FactoryGame/Saved/SaveGames/ServerSettings. ``` + ___ + ### Console Commands + As of v0.5.1.2, the console tab in the client server manager is the only way to execute commands. Entering commands via Pterodactyl do nothing. [List of known commands can be found via the Wiki.](https://satisfactory.fandom.com/wiki/Dedicated_servers#Console_commands) ___ + ### Errors/Warnings + The following errors or warnings you see in the console can safely be ignored: ```log @@ -137,24 +163,29 @@ steamclient.so: cannot open shared object file: No such file or directory [S_API] SteamAPI_Init(): Loaded '/home/container/.steam/sdk64/steamclient.so' OK. (First tried local 'steamclient.so') LogSteamShared: Warning: Steam Dedicated Server API failed to initialize. ``` -↑ The local file of 'steamclient.so' was attempted to be loaded, but could not because it is not present, causing the warning message. However, the backup `/home/container/.steam/sdk64/steamclient.so` is loaded successfully (this is the correct behavior according to the [Wiki](https://satisfactory.fandom.com/wiki/Dedicated_servers#SteamAPI_Init.28.29:_Sys_LoadModule_filed_to_load:_.2Fpath.2Fto.2F.steam.2Fsdk64.2Fsteamclient.so)). + +The local file of 'steamclient.so' was attempted to be loaded, but could not because it is not present, causing the warning message. However, the backup `/home/container/.steam/sdk64/steamclient.so` is loaded successfully (this is the correct behavior according to the [Wiki](https://satisfactory.fandom.com/wiki/Dedicated_servers#SteamAPI_Init.28.29:_Sys_LoadModule_filed_to_load:_.2Fpath.2Fto.2F.steam.2Fsdk64.2Fsteamclient.so)). ```log Warning: failed to init SDL thread priority manager: SDL not found ``` -↑ This is a common error with Steam related software on Linux, but can safely be ignored. +This is a common error with Steam related software on Linux, but can safely be ignored. ```log ...Error: Couldn't find file for package... ``` + ```log ...Error: Navmesh bounds are too large!... ``` + ```log ...Warning: NiagaraSystem... ``` + ```log LogStreaming: Warning: Failed to read file '../../../FactoryGame/Saved/SaveGames/GameAnalytics.sav' error. ``` -↑ These seem to be common error messages with the current experimental version of the game. + +These seem to be common error messages with the current experimental version of the game. From 8c7bc7031f5993c124a3239dd5fb506e2dfaaddd Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:04:17 -0500 Subject: [PATCH 0231/1001] fixed heading levels added blank lines as needed --- game_eggs/steamcmd_servers/scpsl/README.md | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/game_eggs/steamcmd_servers/scpsl/README.md b/game_eggs/steamcmd_servers/scpsl/README.md index b908d1a2..9c00ef3a 100644 --- a/game_eggs/steamcmd_servers/scpsl/README.md +++ b/game_eggs/steamcmd_servers/scpsl/README.md @@ -1,32 +1,38 @@ -## SCP: Secret Laboratory +# SCP: Secret Laboratory + +## [dedicated](dedicated/) -### [dedicated](dedicated/) SCP: Secret Laboratory Dedicated Linux Server AddID: [996560](https://steamdb.info/app/996560/) This Server is NOT compatible with ServerMod2 or MultiAdmin -### [MultiAdmin](multiadmin) +## [MultiAdmin](multiadmin) + SCP: Secret Laboratory Pterodactyl egg. Works with MP2. Steam AppID: [996560](https://steamdb.info/app/996560/) This server is **NOT** compatible with SMod2 due to it not being updated for MP2. This server is **NOT** compatible with LocalAdmin due to server input causing it to crash. MultiAdmin with a config option is used instead. -### [Exiled Plugin Framework](exiled) -SCP: Secret Laboratory Pterodactyl egg with Exiled Plugin Framework (https://github.com/Exiled-Team/EXILED) +## [Exiled Plugin Framework](exiled) + +SCP: Secret Laboratory Pterodactyl egg with Exiled Plugin Framework + +## Minimum RAM -### Minimum RAM Minimum memory required to run the server: 3096 MB -### Server Port +## Server Port + Default port required to run the server. | Port | Default | |---------|---------| | Game | 7777 | -### Verification +## Verification The server must be verified with the SCP:SL developers in order for it to be visible in the server browser. Instructions are as follows: + * Make sure your server complies with the [Verified Server Rules](https://scpslgame.com/Verified_server_rules.pdf). * Send an email to `server.verification@scpslgame.com` from your configured contact email with the following information: 1. The **public** IPv4 address of your server, with port. e.g. `69.69.69.69:7777` From b96174d362735a1d1f9e9e73038714b4bb13e3cf Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:04:35 -0500 Subject: [PATCH 0232/1001] fixed heading levels added blank lines as needed --- .../steamcmd_servers/scpsl/dedicated/README.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/game_eggs/steamcmd_servers/scpsl/dedicated/README.md b/game_eggs/steamcmd_servers/scpsl/dedicated/README.md index 60411e1b..8441932a 100644 --- a/game_eggs/steamcmd_servers/scpsl/dedicated/README.md +++ b/game_eggs/steamcmd_servers/scpsl/dedicated/README.md @@ -1,31 +1,33 @@ # SCP: Secret Laboratory + SCP: Secret Laboratory Dedicated Linux Server AddID: [996560](https://steamdb.info/app/996560/) This Server is NOT compatible with ServerMod2 or MultiAdmin +## Minimum RAM warning -### Minimum RAM warning Minimum required memory to run the server: 3096 MB +## Server Ports -### Server Ports Ports required to run the server in a table format. | Port | default | |---------|---------| | Game | 7777 | -### Verification +### Mods/Plugins may require additional ports to be added to the server + +## Verification The server must be verified to be visible in the Server Browser. Before requesting verification make sure your server follows the [Verified Server Rules](https://scpslgame.com/Verified_server_rules.pdf). -#### Requesting Verification +### Requesting Verification + Once ready send an email to server.verification@scpslgame.com with the following info: * The server's external IPv4 address * The port used by the server * If the server IP is static or dynamic - -#### Mods/Plugins may require ports to be added to the server. From 8b5073191cf4d2169148f6ac4b4be5cc570e5df3 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:04:51 -0500 Subject: [PATCH 0233/1001] fixed heading levels added blank lines as needed incased url --- game_eggs/steamcmd_servers/scpsl/exiled/README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/game_eggs/steamcmd_servers/scpsl/exiled/README.md b/game_eggs/steamcmd_servers/scpsl/exiled/README.md index 37b488a0..68a47db1 100644 --- a/game_eggs/steamcmd_servers/scpsl/exiled/README.md +++ b/game_eggs/steamcmd_servers/scpsl/exiled/README.md @@ -1,23 +1,25 @@ # SCP: Secret Laboratory Exiled -SCP: Secret Laboratory Pterodactyl egg with Exiled Plugin Framework (https://github.com/Exiled-Team/EXILED) -### Minimum RAM +SCP: Secret Laboratory Pterodactyl egg with Exiled Plugin Framework + +## Minimum RAM + Minimum memory required to run the server: 4096 MB +## Server Port -### Server Port Default port required to run the server. | Port | Default | |---------|---------| | Game | 7777 | - -### Verification +## Verification The server must be verified with the SCP:SL developers in order for it to be visible in the server browser. Instructions are as follows: + * Make sure your server complies with the [Verified Server Rules](https://scpslgame.com/Verified_server_rules.pdf). * Send an email to `server.verification@scpslgame.com` from your configured contact email with the following information: 1. The **public** IPv4 address of your server, with port. e.g. `69.69.69.69:7777` From 647f76e8b9a13c41afb74b4321d5bbbf81eff18f Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:05:00 -0500 Subject: [PATCH 0234/1001] fixed heading levels added blank lines as needed --- game_eggs/steamcmd_servers/scpsl/multiadmin/README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/game_eggs/steamcmd_servers/scpsl/multiadmin/README.md b/game_eggs/steamcmd_servers/scpsl/multiadmin/README.md index 52e05da4..1ecf654b 100644 --- a/game_eggs/steamcmd_servers/scpsl/multiadmin/README.md +++ b/game_eggs/steamcmd_servers/scpsl/multiadmin/README.md @@ -1,28 +1,29 @@ # SCP: Secret Laboratory + SCP: Secret Laboratory Pterodactyl egg. Works with MP2. Steam AppID: [996560](https://steamdb.info/app/996560/) This server is **NOT** compatible with SMod2 due to it not being updated for MP2. This server is **NOT** compatible with LocalAdmin due to server input causing it to crash. MultiAdmin with a config option is used instead. +## Minimum RAM -### Minimum RAM Minimum memory required to run the server: 3096 MB +## Server Port -### Server Port Default port required to run the server. | Port | Default | |---------|---------| | Game | 7777 | - -### Verification +## Verification The server must be verified with the SCP:SL developers in order for it to be visible in the server browser. Instructions are as follows: + * Make sure your server complies with the [Verified Server Rules](https://scpslgame.com/Verified_server_rules.pdf). * Send an email to `server.verification@scpslgame.com` from your configured contact email with the following information: 1. The **public** IPv4 address of your server, with port. e.g. `69.69.69.69:7777` From 052023f75e9c10fd49a8570f6a2ff68f41b1c929 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:05:10 -0500 Subject: [PATCH 0235/1001] added blank lines as needed --- game_eggs/steamcmd_servers/soldat/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/game_eggs/steamcmd_servers/soldat/README.md b/game_eggs/steamcmd_servers/soldat/README.md index d1fc670e..23f2e904 100644 --- a/game_eggs/steamcmd_servers/soldat/README.md +++ b/game_eggs/steamcmd_servers/soldat/README.md @@ -1,4 +1,5 @@ # Soldat + Soldat is a unique 2D (side-view) multiplayer action game. It has been influenced by the best of games such as Liero, Worms, Quake, and Counter-Strike and provides a fast-paced gaming experience with tons of blood and flesh. Soldiers fight against each other in 2D battle arenas using a deadly arsenal of military weapons, across 7 default game modes. It features 18 different weapons and 60 maps to frag away on, with full support for user created content. ## Server Ports From b12876e9d79ac2022e601db0d612a20d8278430d Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:05:23 -0500 Subject: [PATCH 0236/1001] added blank lines as needed --- game_eggs/steamcmd_servers/space_engineers/README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/space_engineers/README.md b/game_eggs/steamcmd_servers/space_engineers/README.md index 61ebb364..6994bec6 100644 --- a/game_eggs/steamcmd_servers/space_engineers/README.md +++ b/game_eggs/steamcmd_servers/space_engineers/README.md @@ -1,5 +1,6 @@ # Space Engineers -Space Engineers is a voxel-based sandbox game set in space and on planets. + +Space Engineers is a voxel-based sandbox game set in space and on planets. Many parts of this egg are based on the work of [mmmaxwwwell](https://github.com/mmmaxwwwell/space-engineers-dedicated-docker-linux). A thank you therefore goes to him. @@ -10,12 +11,15 @@ When installed, the Server loads a base World and config from this repo. New wor Everything which is not defined in a variable could be edited directy in the config file /config/SpaceEngineers-Dedicated.cfg. ## Minumum server settings + ### RAM + This server requires about 6GB. Based on the information provided by the developer: [See here](https://www.spaceengineersgame.com/dedicated-servers/) ### Disk + This server uses about 7GB of diskspace. ## Server Ports From f988786bcdb61828cc9130cabd90e98cb658c8c4 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:05:30 -0500 Subject: [PATCH 0237/1001] fixed heading levels added blank lines as needed --- game_eggs/steamcmd_servers/squad/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/squad/README.md b/game_eggs/steamcmd_servers/squad/README.md index d4db334a..ad310143 100644 --- a/game_eggs/steamcmd_servers/squad/README.md +++ b/game_eggs/steamcmd_servers/squad/README.md @@ -2,7 +2,8 @@ Squad is an online multiplayer first-person shooter that aims to capture combat realism through communication and teamplay. -### Server Ports +## Server Ports + Squad requires 4 ports | Port | default | @@ -10,4 +11,4 @@ Squad requires 4 ports | Game | 7787 | | game +1 | 7788 | | Query | 27165 | -| Query +1 | 27166 | \ No newline at end of file +| Query +1 | 27166 | From bf5964059b46d3eb188a8b4e741e2de5a06990b0 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:05:37 -0500 Subject: [PATCH 0238/1001] fixed heading levels added blank lines as needed --- game_eggs/steamcmd_servers/starbound/README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/game_eggs/steamcmd_servers/starbound/README.md b/game_eggs/steamcmd_servers/starbound/README.md index 4329884b..d47f5969 100644 --- a/game_eggs/steamcmd_servers/starbound/README.md +++ b/game_eggs/steamcmd_servers/starbound/README.md @@ -1,12 +1,12 @@ # Starbound -Their desctiption: + +Their desctiption: In Starbound, you create your own story - there’s no wrong way to play! You may choose to save the universe from the forces that destroyed your home, uncovering greater galactic mysteries in the process, or you may wish to forego a heroic journey entirely in favor of colonizing uncharted planets. -### Server Ports -Starbound requires a single port to be oepened +## Server Ports -game ports (default 21025 ) +Starbound requires a single port to be oepened | Port | default | |---------|---------| -| Game | 21025 | \ No newline at end of file +| Game | 21025 | From 454422450aeb85c461b3f51dfd9c3c035ad236a1 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:06:39 -0500 Subject: [PATCH 0239/1001] fixed heading levels added blank lines as needed formatted servers ports table removed trailing spaces removed 2nd set of server port listing --- .../steamcmd_servers/stationeers/README.md | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/game_eggs/steamcmd_servers/stationeers/README.md b/game_eggs/steamcmd_servers/stationeers/README.md index 63aefa53..a0e9bc73 100644 --- a/game_eggs/steamcmd_servers/stationeers/README.md +++ b/game_eggs/steamcmd_servers/stationeers/README.md @@ -1,15 +1,13 @@ # Stationeers -Steam Description + +Steam Description Construct and manage your own space station either by yourself in singleplayer or with friends online! Fully functioning atmospherics, science, power, engineering, medical, logic, and agricultural systems. Explore to find asteroids and construct elaborate factories to harvest your resources! -### Server Ports +## Server Ports + Stationeers requires up to 2 ports -game port (default 27500) -Steam Query Ports (default 27015) - - -| Port | default | -|---------|---------------| -| Game | 27500 | -| Query | 27015 | \ No newline at end of file +| Port | default | +|-------------|---------| +| Game | 27500 | +| Steam Query | 27015 | From b13a99d85b1fd882184cfd5fcee36240b66d420e Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:07:02 -0500 Subject: [PATCH 0240/1001] fixed heading levels added blank lines as needed removed triling spaces formatted server ports table --- .../steamcmd_servers/stormworks/README.md | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/game_eggs/steamcmd_servers/stormworks/README.md b/game_eggs/steamcmd_servers/stormworks/README.md index 6a0d5354..08ce0833 100644 --- a/game_eggs/steamcmd_servers/stormworks/README.md +++ b/game_eggs/steamcmd_servers/stormworks/README.md @@ -1,19 +1,23 @@ -### Stormworks: Build and Rescue +# Stormworks: Build and Rescue + Join a world where you design, create and pilot your own air sea rescue service. Release your inner hero as you battle fierce storms out at sea to rescue those in need. -### Configuration warning +## Configuration warning + Due to the way the Stormworks configuration file is formatted and the way Pterodactyl handles config file replacement this egg cannot be configured by Pterodactyl. A config file is created in the container home directory (`/home/container/server_config.xml`) and must be manually updated for any changes, **INCLUDING THE PORT NUMBER**. This egg will not work after installation and you **MUST** edit the `server_config.xml` file manually to use anything other than the default settings. For more information about the configuration file issue see the [Github issue](https://github.com/parkervcp/eggs/issues/522#issuecomment-652514654). -### Server Ports +## Server Ports + Stormworks requires 3 consecutive ports in order to run. The default ports are shown below. Using non-default ports is possible however they must remain consecutive. -| Port | default | -|---------|---------| -| Game | 25564 | -| Game | 25565 | -| Game | 25566 | +| Port | default | +|------|---------| +| Game | 25564 | +| Game | 25565 | +| Game | 25566 | + +## Console output -### Console output The Stormworks server will constantly output updates to the server console when run under Wine. Natively this results in text that updates in place, however there is no way to disable or limit the frequency of this output. A [feature request](http://mcro.org/issues/view_issue/21739) was filed with the developer in hopes of improving the Linux support however it was rejected without comment. At this time there is no known solution. From 5e20b63d9a61df4b3d500683ec021286c64ef12f Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:07:47 -0500 Subject: [PATCH 0241/1001] fixed heading levels added blank lines as needed chaged notes from bold to headings formatted server ports table --- .../subnautica_nitrox_mod/README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/game_eggs/steamcmd_servers/subnautica_nitrox_mod/README.md b/game_eggs/steamcmd_servers/subnautica_nitrox_mod/README.md index e780fdf0..83381f39 100644 --- a/game_eggs/steamcmd_servers/subnautica_nitrox_mod/README.md +++ b/game_eggs/steamcmd_servers/subnautica_nitrox_mod/README.md @@ -1,25 +1,25 @@ -## Subnautica: Nitrox Mod +# Subnautica: Nitrox Mod + Subnautica is an open world survival action-adventure video game developed and published by Unknown Worlds Entertainment. In it, players are free to explore the ocean on an alien planet, known as planet 4546B, after their spaceship, the Aurora, crashes on the planet's surface. The multiplayer function is provided by the mod "Nitrox". This mod is still in alpha version and therefore not yet fully stable. - +## NOTE -**NOTE** To download the base game, you will need to authenticate against Steam. Because of the normally active Steamgaurd protection, it is important to enter the Steamgaurd code. Once the initial installation is complete, you will need to enter the Steamguard code that will be emailed to you and then reinstall the server. This will only work if you receive Steamguard codes via mail. The Authenticator app is not supported. -**NOTE** +## NOTE 2 + NitroxMod version >=1.5.0.0 is required for this egg ## Server Ports + The nitrox server requires only the default Server port. - -| Port | default | -|---------|---------| -| Server | any | - +| Port | default | +|--------|---------| +| Server | any | From dcf1cd776481197313e18421e6889f46b12b6df4 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:07:54 -0500 Subject: [PATCH 0242/1001] fixed heading levels added blank lines as needed --- game_eggs/steamcmd_servers/svencoop/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/svencoop/README.md b/game_eggs/steamcmd_servers/svencoop/README.md index af43edf9..f76e91ea 100644 --- a/game_eggs/steamcmd_servers/svencoop/README.md +++ b/game_eggs/steamcmd_servers/svencoop/README.md @@ -1,7 +1,9 @@ # Sven Co-op + Sven Co-op is a co-operative game originally based around Valve Software's Half-Life. In this game players must work together against computer controlled enemies and solve puzzles as a team. -### Server Ports +## Server Ports + Sven co-op requires a single port to be opened game ports (default 27015 ) From ded7e6725badf4b2ba3d2c6f93213c7fd1db07c6 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:08:01 -0500 Subject: [PATCH 0243/1001] fixed heading levels added blank lines as needed --- game_eggs/steamcmd_servers/team_fortress_2_classic/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/team_fortress_2_classic/README.md b/game_eggs/steamcmd_servers/team_fortress_2_classic/README.md index 410bc742..43548100 100644 --- a/game_eggs/steamcmd_servers/team_fortress_2_classic/README.md +++ b/game_eggs/steamcmd_servers/team_fortress_2_classic/README.md @@ -4,7 +4,8 @@ Team Fortress 2 Classic is a re-imagining of the 2008-2009 era of the original Team Fortress 2, of which is what we consider the "Classic Era", featuring old features that were scrapped and worked upon, or new content such as new weapons and gamemodes. -### Server Ports +## Server Ports + TF2C servers require 1 port to be open, the SourceTV port can also be opened for spectators. | Port | default | From 1b87a061eb37b50c9c437d3cf2689b254c2c2052 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:09:14 -0500 Subject: [PATCH 0244/1001] fixed heading levels added blank lines as needed removed trailing spaces incased url formatted server ports table --- .../steamcmd_servers/the_forest/README.md | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/game_eggs/steamcmd_servers/the_forest/README.md b/game_eggs/steamcmd_servers/the_forest/README.md index 5361f9a7..1e3b50d7 100644 --- a/game_eggs/steamcmd_servers/the_forest/README.md +++ b/game_eggs/steamcmd_servers/the_forest/README.md @@ -1,20 +1,19 @@ -## The Forest -As the lone survivor of a passenger jet crash, you find yourself in a mysterious forest battling to stay alive against a society of cannibalistic mutants. +# The Forest + +As the lone survivor of a passenger jet crash, you find yourself in a mysterious forest battling to stay alive against a society of cannibalistic mutants. Build, explore, survive in this terrifying first-person survival horror simulator. - +## NOTE -**NOTE** This server requires a Steam Token -You can generate the token on steam at https://steamcommunity.com/dev/managegameservers +You can generate the token on steam at ## Server Ports + The forest server requires three ports for access Server port (Default), Steam port (8766), Query Port (27016) but some plugins may require extra ports to enabled for the server. - -| Port | default | -|---------|---------| -| Server | any | -| Steam | 8766 | -| Query | 27016 | - +| Port | default | +|--------|---------| +| Server | any | +| Steam | 8766 | +| Query | 27016 | From 259e6fdafb0308a1209203258fee4707c23f0e29 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:09:21 -0500 Subject: [PATCH 0245/1001] fixed heading levels added blank lines as needed --- game_eggs/steamcmd_servers/tower_unite/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/tower_unite/README.md b/game_eggs/steamcmd_servers/tower_unite/README.md index f43f9408..06afcf0e 100644 --- a/game_eggs/steamcmd_servers/tower_unite/README.md +++ b/game_eggs/steamcmd_servers/tower_unite/README.md @@ -1,8 +1,10 @@ # Tower Unite + Their desctiption: Every aspect of Tower Unite allows for online multiplayer interaction. It is a living and evolving online game world, driven by the community. Play games online with your friends, or make new friends from across the globe. -### Server Ports +## Server Ports + Tower Unite requires a single port to be opened | Port | default | From ecb71635939dbcdcc0f8e61f42200da134e7a755 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:09:43 -0500 Subject: [PATCH 0246/1001] fixed heading levels added blank lines as needed removed trailing spaces --- game_eggs/steamcmd_servers/unturned/README.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/game_eggs/steamcmd_servers/unturned/README.md b/game_eggs/steamcmd_servers/unturned/README.md index 32b69f98..3376abb0 100644 --- a/game_eggs/steamcmd_servers/unturned/README.md +++ b/game_eggs/steamcmd_servers/unturned/README.md @@ -1,13 +1,15 @@ # Unturned -Steam Description -You're one of the few not yet turned zombie. Keeping it that way will be a challenge. -- Go in guns blazing and attract the attention of everything, living and dead. -- Take a subtle approach sneaking around and making use of distractions. -- Confront and learn to counter special abilities ranging from invisibility to fire breathing to lightning attacks. +Steam Description +You're one of the few not yet turned zombie. Keeping it that way will be a challenge. -### Server Ports -Rocketmod requires 3 ports to run properly. +- Go in guns blazing and attract the attention of everything, living and dead. +- Take a subtle approach sneaking around and making use of distractions. +- Confront and learn to counter special abilities ranging from invisibility to fire breathing to lightning attacks. + +## Server Ports + +Rocketmod requires 3 ports to run properly. | Port | default | |---------|---------| From 5f1233730a96eb64174f247d69af3576c42608aa Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:10:43 -0500 Subject: [PATCH 0247/1001] added blank lines as needed formatted server ports table --- game_eggs/steamcmd_servers/valheim/valheim_plus/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/valheim/valheim_plus/README.md b/game_eggs/steamcmd_servers/valheim/valheim_plus/README.md index 072e70f7..7a059cb4 100644 --- a/game_eggs/steamcmd_servers/valheim/valheim_plus/README.md +++ b/game_eggs/steamcmd_servers/valheim/valheim_plus/README.md @@ -1,10 +1,12 @@ # Valheim Plus Mod ## Valheim + A brutal exploration and survival game for 1-10 players, set in a procedurally-generated purgatory inspired by viking culture. Battle, build, and conquer your way to a saga worthy of Odin’s patronage! https://store.steampowered.com/app/892970/Valheim/ ## Plus Mod + A HarmonyX Mod aimed at improving the gameplay quality of Valheim. The mod includes several different main features including modifiers to ingame stats of players, buildings and entities and a sophisticated system to build and place objects with high precision and a system to modify already placed objects with high precision. The general goal is to provide V+ as a base modification for your gameplay to increase quality of life, change difficulty or have a better experience in general. The mod also comes with a version and configuration control system for servers and users, allowing servers to make sure that only people with the same configuration are able to join their servers. Support: https://github.com/valheimPlus/ValheimPlus Discord: https://discord.gg/AmH6Va97GT @@ -13,7 +15,6 @@ Discord: https://discord.gg/AmH6Va97GT ***All (Server + Clients) need to have a installed Valheim Plus Mod !!!!*** - ## Server Ports | Port | default | From 91e609dcf6946f05deff917c64c8e0b0fb4ab9f3 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:11:05 -0500 Subject: [PATCH 0248/1001] formatted server ports table --- game_eggs/steamcmd_servers/valheim/valheim_plus/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/valheim/valheim_plus/README.md b/game_eggs/steamcmd_servers/valheim/valheim_plus/README.md index 7a059cb4..feb0c1f7 100644 --- a/game_eggs/steamcmd_servers/valheim/valheim_plus/README.md +++ b/game_eggs/steamcmd_servers/valheim/valheim_plus/README.md @@ -19,5 +19,5 @@ Discord: https://discord.gg/AmH6Va97GT | Port | default | |-------|---------| -| Game | 2456 | -| Query | 2457 | +| Game | 2456 | +| Query | 2457 | From 56c92625cc606024dfcb02bcd28bb64d5a463c46 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:12:11 -0500 Subject: [PATCH 0249/1001] incased url added blank lines as needed formatted server ports table --- .../steamcmd_servers/valheim/valheim_vanilla/README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/game_eggs/steamcmd_servers/valheim/valheim_vanilla/README.md b/game_eggs/steamcmd_servers/valheim/valheim_vanilla/README.md index ef747e15..18839d85 100644 --- a/game_eggs/steamcmd_servers/valheim/valheim_vanilla/README.md +++ b/game_eggs/steamcmd_servers/valheim/valheim_vanilla/README.md @@ -1,11 +1,12 @@ # Valheim + A brutal exploration and survival game for 1-10 players, set in a procedurally-generated purgatory inspired by viking culture. Battle, build, and conquer your way to a saga worthy of Odin’s patronage! -https://store.steampowered.com/app/892970/Valheim/ + ## Server Ports | Port | default | |-------|---------| -| Game | 2456 | -| Query | 2457 | \ No newline at end of file +| Game | 2456 | +| Query | 2457 | From 0c266df7a2ca024ecf03bd1871b653140a14bd70 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:12:19 -0500 Subject: [PATCH 0250/1001] fixed heading levels added blank lines as needed --- game_eggs/teeworlds/README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/game_eggs/teeworlds/README.md b/game_eggs/teeworlds/README.md index 3a18c931..6b416887 100644 --- a/game_eggs/teeworlds/README.md +++ b/game_eggs/teeworlds/README.md @@ -1,8 +1,11 @@ # Teeworlds -### From their [Site](https://www.teeworlds.com/) + +## From their [Site](https://www.teeworlds.com/) + Teeworlds is a free online multiplayer game, available for all major operating systems. Battle with up to 16 players in a variety of game modes, including Team Deathmatch and Capture The Flag. You can even design your own maps -### Server Ports +## Server Ports + Ports required to run the server in a table format. | Port | default | From 7dfe79fa537c885c413f51d0a606c8fdf3974088 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:12:27 -0500 Subject: [PATCH 0251/1001] fixed heading levels added blank lines as needed --- game_eggs/terraria/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/game_eggs/terraria/README.md b/game_eggs/terraria/README.md index 1a8469da..e421959f 100644 --- a/game_eggs/terraria/README.md +++ b/game_eggs/terraria/README.md @@ -1,13 +1,15 @@ # Terraria ## Minimum RAM warning + You may want to assign a minimum of 768 mb of RAM to a server as it will use around 650 mb to generate the world on the first start. ## Required Server Ports + tModloader, like Terraria, only requires a single port to run. The default is 7777 | Port | default | |---------|---------| | Game | 7777 | -#### Plugins may require ports to be added to the server. +### Plugins may require ports to be added to the server From 08645f018bfbaac3840aa73f6dcadcd630446728 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:12:48 -0500 Subject: [PATCH 0252/1001] fixed heading levels added blank lines as needed removed trailing spaces --- game_eggs/terraria/tmodloader/README.md | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/game_eggs/terraria/tmodloader/README.md b/game_eggs/terraria/tmodloader/README.md index 4fa490da..fd75ba46 100644 --- a/game_eggs/terraria/tmodloader/README.md +++ b/game_eggs/terraria/tmodloader/README.md @@ -1,29 +1,33 @@ # tModLoader -### From their [GitHub](https://github.com/tModLoader/tModLoader) + +## From their [GitHub](https://github.com/tModLoader/tModLoader) + tModLoader is essentially a mod that provides a way to load your own mods without having to work directly with Terraria's source code itself. This means you can easily make mods that are compatible with other people's mods, save yourself the trouble of having to decompile and recompile Terraria.exe, and escape from having to understand all of the obscure "intricacies" of Terraria's source code. It is made to work for Terraria 1.3+. -### Install notes +## Install notes + Due to rate limiting the console on the panel cannot keep up with the game console and the build will complete before the panel console may show it. Reloading the console will load it to the latest part of the log. -### Minimum RAM warning +## Minimum RAM warning + You may want to assign a minimum of 768 mb of RAM to a server as it will use around 650 mb to generate the world on the first start. +## Server Ports -### Server Ports tModloader, like Terraria, only requires a single port to run. The default is 7777 | Port | default | |---------|---------| | Game | 7777 | -#### Plugins may require ports to be added to the server. +### Plugins may require ports to be added to the server. -### Extra Information +## Extra Information If you want to download mods in the console, the startup command has to be changed. -New startup: +New startup: `./tModLoaderServer -ip 0.0.0.0 -port ${SERVER_PORT} -maxplayers ${MAX_PLAYERS} -savedirectory ~/ -tmlsavedirectory ~/saves -modpath ~/mods` -This will remove the autocreate function, and will thus allow you to download mods and generate world. +This will remove the autocreate function, and will thus allow you to download mods and generate world. Afterwards, you can change it back with the correct world name to start automatic. Word name is set in the configuration panel. \ No newline at end of file From fe91fb35c6a905c0b68f18489b3085f7f804dd46 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:13:07 -0500 Subject: [PATCH 0253/1001] fixed heading levels added blank lines as needed incased url --- game_eggs/terraria/tshock/README.md | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/game_eggs/terraria/tshock/README.md b/game_eggs/terraria/tshock/README.md index fec56632..16a21fc5 100644 --- a/game_eggs/terraria/tshock/README.md +++ b/game_eggs/terraria/tshock/README.md @@ -1,24 +1,27 @@ # TShock -TShock provides Terraria servers with server-side characters, anti-cheat, and community management tools. https://tshock.co/ +TShock provides Terraria servers with server-side characters, anti-cheat, and community management tools. + +## From their GitHub -### From their GitHub TShock is a toolbox for Terraria servers and communities. That toolbox is jam packed with anti-cheat tools, server-side characters, groups, permissions, item bans, tons of commands, and limitless potential. It's one of a kind. -### Server Ports +## Server Ports + TShock, like Terraria, only requires a single port to run. The default is 7777 | Port | default | |---------|---------| | Game | 7777 | -#### Plugins may require ports to be added to the server. +### Plugins may require ports to be added to the server. + +## Extra Information -### Extra Information If you want to download mods in the console, the startup command has to be changed. -New startup: +New startup: `mono TerrariaServer.exe -ip 0.0.0.0 -port {{SERVER_PORT}} -maxplayers {{MAX_PLAYERS}}` -This will remove the autocreate function, and will thus allow you to download mods and generate world. -Afterwards, you can change it back with the correct world name to start automatic. Word name is set in the configuration panel. \ No newline at end of file +This will remove the autocreate function, and will thus allow you to download mods and generate world. +Afterwards, you can change it back with the correct world name to start automatic. Word name is set in the configuration panel. From ddfc1dfe0f229fadcc75a70f146be81a25b9ebc7 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:13:13 -0500 Subject: [PATCH 0254/1001] fixed heading levels added blank lines as needed --- game_eggs/terraria/vanilla/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/game_eggs/terraria/vanilla/README.md b/game_eggs/terraria/vanilla/README.md index da96e637..a1758dd1 100644 --- a/game_eggs/terraria/vanilla/README.md +++ b/game_eggs/terraria/vanilla/README.md @@ -3,13 +3,15 @@ Vanilla Terraria egg with support for Journey's End. Currently up to 1.4.0.2 is supported, however future patches will require updates to the install script. ## Minimum RAM warning + You may want to assign a minimum of 768 mb of RAM to a server as it will use around 650 mb to generate the world on the first start. ## Required Server Ports + Terraria only requires a single port to run. The default is 7777 | Port | default | |---------|---------| | Game | 7777 | -#### Plugins may require ports to be added to the server. +### Plugins may require ports to be added to the server From 5b74ca8972665ab13146eb5bdc9d3e54b2f3e6ed Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:13:41 -0500 Subject: [PATCH 0255/1001] made heading a link --- game_eggs/tycoon_games/openttd/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/tycoon_games/openttd/README.md b/game_eggs/tycoon_games/openttd/README.md index 90f44417..c00a8280 100644 --- a/game_eggs/tycoon_games/openttd/README.md +++ b/game_eggs/tycoon_games/openttd/README.md @@ -1,4 +1,4 @@ -# OpenTTD (https://www.openttd.org) +# [OpenTTD](https://www.openttd.org) OpenTTD is a business simulation game in which players try to earn money via transporting passengers and freight by road, rail, water and air. It is an open-source remake and expansion of the 1995 Chris Sawyer video game Transport Tycoon Deluxe From a81cad355d6691a1680bd0433a9553e4a5448869 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:13:54 -0500 Subject: [PATCH 0256/1001] fixed heading levels added blank lines as needed --- game_eggs/veloren/README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/game_eggs/veloren/README.md b/game_eggs/veloren/README.md index 18f0040e..df3bdcd6 100644 --- a/game_eggs/veloren/README.md +++ b/game_eggs/veloren/README.md @@ -1,10 +1,13 @@ # Veloren -### From their [Site](https://veloren.net/) + +## From their [Site](https://veloren.net/) + Veloren is a multiplayer voxel RPG written in Rust. It is inspired by games such as Cube World, Legend of Zelda: Breath of the Wild, Dwarf Fortress and Minecraft. Veloren is fully open-source, licensed under GPL 3. It uses original graphics, musics and other assets created by its community. Being contributor-driven, its development community and user community is one and the same: developers, players, artists and musicians come together to develop the game. -### Server Ports +## Server Ports + Ports required to run the server in a table format. | Port | default | @@ -12,4 +15,4 @@ Ports required to run the server in a table format. | Game | 14004 | | Metrics | 14005 | -#### Mods/Plugins may require ports to be added to the server. +### Mods/Plugins may require ports to be added to the server From 53c207b2e071e8de18ffca6a8fc6cc1143b880d6 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:14:10 -0500 Subject: [PATCH 0257/1001] fixed heading levels added blank lines as needed removed trailing spaces --- game_eggs/vintage_story/README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/game_eggs/vintage_story/README.md b/game_eggs/vintage_story/README.md index 4bffe25f..827a8b9c 100644 --- a/game_eggs/vintage_story/README.md +++ b/game_eggs/vintage_story/README.md @@ -1,18 +1,20 @@ # Vintage Story -#### The Vintage Story Server +## The Vintage Story Server + The server supports mods -#### from the developers +### from the developers Vintage Story is an uncompromising wilderness survival sandbox game inspired by lovecraftian horror themes. Find yourself in a ruined world reclaimed by nature and permeated by unnerving temporal disturbances. Relive the advent of human civilization, or take your own path. New to the game? Make sure to checkout their [starter page](https://wiki.vintagestory.at/index.php?title=Main_Page). -### Server Ports -Vintage Story requires a single port +## Server Ports + +Vintage Story requires a single port | Port | default | |---------|---------| -| Game | 42420 | \ No newline at end of file +| Game | 42420 | From 09fbe3791459e6b4a03f3f6046be723c4a242e39 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:14:24 -0500 Subject: [PATCH 0258/1001] fixed heading levels added blank lines as needed removed trailing spaces --- game_eggs/wine/generic/README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/game_eggs/wine/generic/README.md b/game_eggs/wine/generic/README.md index 82294b1d..8164f636 100644 --- a/game_eggs/wine/generic/README.md +++ b/game_eggs/wine/generic/README.md @@ -1,8 +1,10 @@ # Wine Generic -A generic wine image that can be used to install servers that need wine to run. + +A generic wine image that can be used to install servers that need wine to run. Downloads compressed server files and extracts them to a specified folder in `/mnt/server/` I.E. `INSTALL_DIR` = `server/folder` will unpack the server into `/mnt/server//server/folder/` -### Install notes -May require a full custom start command. This is on you to figure out what that is. \ No newline at end of file +## Install notes + +May require a full custom start command. This is on you to figure out what that is. From 8c66fc2595701c383fe66af6bc93c605c9cf03c9 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:14:31 -0500 Subject: [PATCH 0259/1001] fixed heading levels added blank lines as needed --- game_eggs/xonotic/xonotic/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game_eggs/xonotic/xonotic/README.md b/game_eggs/xonotic/xonotic/README.md index 6709ce40..0a17db03 100644 --- a/game_eggs/xonotic/xonotic/README.md +++ b/game_eggs/xonotic/xonotic/README.md @@ -2,7 +2,8 @@ The Free and Fast Arena Shooter -### Server Ports +## Server Ports + Xonotic requires 1 port | Port | default | From 8f68bf5c5d09dc314a9b061b1f59bb7f7b7fbb52 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:14:44 -0500 Subject: [PATCH 0260/1001] fixed heading levels added blank lines as needed --- minecraft/README.md | 4 ++-- minecraft/java/README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/minecraft/README.md b/minecraft/README.md index 52c0ecaa..802a7e10 100644 --- a/minecraft/README.md +++ b/minecraft/README.md @@ -1,3 +1,3 @@ -## All Minecraft eggs have been migrated to a [new game_eggs folder.](https://github.com/parkervcp/eggs/tree/master/game_eggs/minecraft) +# All Minecraft eggs have been migrated to a [new game_eggs folder.](https://github.com/parkervcp/eggs/tree/master/game_eggs/minecraft) -This folder is only kept for backward compatibility for eggs that are downloading server.properties file from here. \ No newline at end of file +This folder is only kept for backward compatibility for eggs that are downloading server.properties file from here. diff --git a/minecraft/java/README.md b/minecraft/java/README.md index 52c0ecaa..802a7e10 100644 --- a/minecraft/java/README.md +++ b/minecraft/java/README.md @@ -1,3 +1,3 @@ -## All Minecraft eggs have been migrated to a [new game_eggs folder.](https://github.com/parkervcp/eggs/tree/master/game_eggs/minecraft) +# All Minecraft eggs have been migrated to a [new game_eggs folder.](https://github.com/parkervcp/eggs/tree/master/game_eggs/minecraft) -This folder is only kept for backward compatibility for eggs that are downloading server.properties file from here. \ No newline at end of file +This folder is only kept for backward compatibility for eggs that are downloading server.properties file from here. From 8be4fbba1d88b452a780c5e4181717f0202f66ec Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:14:52 -0500 Subject: [PATCH 0261/1001] fixed heading levels added blank lines as needed --- monitoring/prometheus/README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/monitoring/prometheus/README.md b/monitoring/prometheus/README.md index 4766566b..b741ab7f 100644 --- a/monitoring/prometheus/README.md +++ b/monitoring/prometheus/README.md @@ -1,14 +1,17 @@ # Prometheus -### From the [Prometheus](https://github.com/prometheus/prometheus) GitHub repository +## From the [Prometheus](https://github.com/prometheus/prometheus) GitHub repository + The Prometheus monitoring system and time series database. -### Resource consumption +## Resource consumption + As Prometheus is a monitoring software that saves data in a timeseries database, it can take up massive amounts of disk space. Due to Prometheus design, a huge memory consumption is also possible. To get started, a minimum of 3GB RAM and >=2.5GB disk space is recommended. Keep in mind that those numbers can grow pretty quick for large monitored environments! -### Server Ports +## Server Ports + Ports required to run the server in a table format. | Port | default | From 5ea05b49e08a944a424428514a2ca3128346ff3e Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:15:05 -0500 Subject: [PATCH 0262/1001] fixed heading levels added blank lines as needed --- software/code-server/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/code-server/README.md b/software/code-server/README.md index f1863224..2665a786 100644 --- a/software/code-server/README.md +++ b/software/code-server/README.md @@ -1,6 +1,6 @@ # Code-Server -### From the [Code-Server](https://github.com/cdr/code-server) GitHub +## From the [Code-Server](https://github.com/cdr/code-server) GitHub Run [VS Code](https://github.com/Microsoft/vscode) on any machine anywhere and access it in the browser. From d28f2bce2b924733a773337b47e3020d59d55857 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:15:22 -0500 Subject: [PATCH 0263/1001] fixed heading levels added blank lines as needed incased url --- software/elasticsearch/README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/software/elasticsearch/README.md b/software/elasticsearch/README.md index 78721fc6..9b140f95 100644 --- a/software/elasticsearch/README.md +++ b/software/elasticsearch/README.md @@ -1,13 +1,14 @@ # Elasticsearch -### From the [Elasticsearch](https://github.com/elastic/elasticsearch) GitHub +## From the [Elasticsearch](https://github.com/elastic/elasticsearch) GitHub Run [Elasticsearch](https://github.com/elastic/elasticsearch) on any machine anywhere and access it in the browser. -### vm.max_map_count requirement -Please follow this for the vm.max_map_count requirement: https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#_set_vm_max_map_count_to_at_least_262144 +## vm.max_map_count requirement -### Server Ports +Please follow this for the vm.max_map_count requirement: + +## Server Ports Ports required to run the server in a table format. From 4fb18e176cff56d62a37646dfa2fa0891721a283 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:15:27 -0500 Subject: [PATCH 0264/1001] fixed heading levels added blank lines as needed --- software/gitea/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/software/gitea/README.md b/software/gitea/README.md index 3431606c..7f555ba8 100644 --- a/software/gitea/README.md +++ b/software/gitea/README.md @@ -1,11 +1,12 @@ # Gitea + [Gitea](https://gitea.io/en-us/) is a community managed lightweight code hosting solution written in Go. It is published under the MIT license. -### Server Ports +## Server Ports Ports required to run the server in a table format. | Port | default | | ---- | ------- | | App | 3000 | -| SSH | 2020 | \ No newline at end of file +| SSH | 2020 | From afdd6cebd84634a53d2012dcce2cb4fb6f13c3ae Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:15:55 -0500 Subject: [PATCH 0265/1001] fixed heading levels added blank lines as needed removed spaces infront of list items --- software/grafana/README.md | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/software/grafana/README.md b/software/grafana/README.md index 31ffddcb..53200083 100644 --- a/software/grafana/README.md +++ b/software/grafana/README.md @@ -1,20 +1,24 @@ # Grafana -### From the [Grafana](https://github.com/grafana/grafana) GitHub +## From the [Grafana](https://github.com/grafana/grafana) GitHub + The open and composable observability and data visualization platform. Visualize metrics, logs, and traces from multiple sources like Prometheus, Loki, Elasticsearch, InfluxDB, Postgres and many more. -### Initial credentials -After the first start of Grafana, you can login using the following credentials: - - Username: admin - - Password: admin +## Initial credentials + +After the first start of Grafana, you can login using the following credentials: + +- Username: admin +- Password: admin + +## Update support -### Update support The egg _should_ keep the data and conf folder when reinstalling. Therefore a reinstallation with "latest" as the selected version can be used to update Grafana. If you want to reset the server completly, remove the `conf` and `data` directories manually before reinstalling. -### Server Ports +## Server Ports Ports required to run the server in a table format. From 67532903564d375907e84c60dbcd7e8177a90565 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:16:02 -0500 Subject: [PATCH 0266/1001] fixed heading levels added blank lines as needed --- software/haste-server/README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/software/haste-server/README.md b/software/haste-server/README.md index 3d2e1881..b337cb5f 100644 --- a/software/haste-server/README.md +++ b/software/haste-server/README.md @@ -1,8 +1,13 @@ # haste-server -### Their [Github](https://github.com/seejohnrun/haste-server) + +## Their [Github](https://github.com/seejohnrun/haste-server) + Host your own [Hastebin](https://hastebin.com). -### Server Ports + +## Server Ports + Ports required to run the server in a table format. + | Port | default | | ---- | ------- | | Game | 7777 | From 268e90adba8831e08d091cfbc7a22a8e71a47a04 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:16:21 -0500 Subject: [PATCH 0267/1001] fixed heading levels added blank lines as needed removed trailing spaces --- software/rabbitmq/README.md | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/software/rabbitmq/README.md b/software/rabbitmq/README.md index 6fddaf19..8679398e 100644 --- a/software/rabbitmq/README.md +++ b/software/rabbitmq/README.md @@ -1,32 +1,36 @@ # RabbitMQ -### From the [RabbitMQ](https://www.rabbitmq.com/) website +## From the [RabbitMQ](https://www.rabbitmq.com/) website + RabbitMQ is the most widely deployed open source message broker. -### Installation +## Installation + Follow the common egg installation guide to install the egg on your Pterodactyl instance. When setting up a server, the latest RabbitMQ version will be used by default. With pretty new and old versions of RabbitMQ, you might have to adjust the used Erlang version. This can be archived by adjusting the version number of the used image (e. g. `ghcr.io/pterodactyl/yolks:erlang_22` instead of `ghcr.io/parkervcp/yolks:erlang_24`). -### Configuration +## Configuration + Configuring RabbitMQ in Pterodactyl is only possible using the config files. This means: - - Configure the server itself as normal using `/home/container/etc/rabbitmq/rabbitmq.conf` - - Enable plugins using the plugin file located at `/home/container/etc/rabbitmq/enabled_plugins` - - Configure users and vhosts through a [definitions.json](https://www.rabbitmq.com/definitions.html) + +- Configure the server itself as normal using `/home/container/etc/rabbitmq/rabbitmq.conf` +- Enable plugins using the plugin file located at `/home/container/etc/rabbitmq/enabled_plugins` +- Configure users and vhosts through a [definitions.json](https://www.rabbitmq.com/definitions.html) You can set the path to the used `definitions.json` using the `load_definitions` option in your config. Note that RabbitMQ versions prior to 3.8.6 will require a properly configured management plugin to do so! -The easiest way to get a working `definitions.json` is to setup a local instance with the -management plugin. You can configure your instance there and load the definitions as stated by uploading them. +The easiest way to get a working `definitions.json` is to setup a local instance with the management plugin. You can configure your instance there and load the definitions as stated by uploading them. -By default, only `listeners.tcp.default` is configured to match your primary allocation. +By default, only `listeners.tcp.default` is configured to match your primary allocation. If you want to expose some other port (e. g. the web management interface) you have to manually configure the port in your `rabbitmq.conf`. -### Update support +## Update support + The egg _should_ keep the `etc` folder when reinstalling, to prevent destroying the configuration by accident. Therefore a reinstallation with "latest" as the selected version can be used to update RabbitMQ. If you want to reset the server completly, remove the `etc` directory manually before reinstalling. From 2a3b206c4dc1c0727e23a9aea1dffabb52fcf8a6 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:16:53 -0500 Subject: [PATCH 0268/1001] added server ports table added blank lines as needed removed trailing spaces --- stock_eggs/minecraft/README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/stock_eggs/minecraft/README.md b/stock_eggs/minecraft/README.md index 89d19035..f4a61dec 100644 --- a/stock_eggs/minecraft/README.md +++ b/stock_eggs/minecraft/README.md @@ -1,6 +1,11 @@ # Minecraft -All the default minecraft things +All the default minecraft things ## Server Ports -The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. \ No newline at end of file + +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. + +| Port | Default | +|------|---------| +| Game | 25565 | From b898095aabbadc34f391a134f95812e526eadb56 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:17:20 -0500 Subject: [PATCH 0269/1001] fixed heading levels added blank lines as needed formatted server ports table --- stock_eggs/rust/README.md | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/stock_eggs/rust/README.md b/stock_eggs/rust/README.md index 22d0e83b..57ad10ea 100644 --- a/stock_eggs/rust/README.md +++ b/stock_eggs/rust/README.md @@ -1,15 +1,18 @@ -### Rust +# Rust + The only aim in Rust is to survive. To do this you will need to overcome struggles such as hunger, thirst and cold. Build a fire. Build a shelter. Kill animals for meat. Protect yourself from other players, and kill them for meat. Create alliances with other players and form a town. Do whatever it takes to survive. -### Minimum RAM warning +## Minimum RAM warning + The server requires at least 4096MB to run properly. This is mostly needed for the startup only, once it is running (depending on your world size) it should consume less. -### Server Ports +## Server Ports + Ports required to run the server. -| Port | default | -|---------|---------| +| Port | default | +|----------------|-----------| | Game and Query | 28015 UDP | -| RCON | 28016 TCP | -| Rust+ App | 28082 TCP | +| RCON | 28016 TCP | +| Rust+ App | 28082 TCP | From ac206efc03fd4fd5c3b21e557975448443ffe023 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:17:43 -0500 Subject: [PATCH 0270/1001] fixed heading levels added blank lines as needed removed trailing spaces --- stock_eggs/source-engine/README.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/stock_eggs/source-engine/README.md b/stock_eggs/source-engine/README.md index 17586b96..40bc2803 100644 --- a/stock_eggs/source-engine/README.md +++ b/stock_eggs/source-engine/README.md @@ -4,13 +4,15 @@ The Source Dedicated Server or SRCDS is a tool that runs the server component of This also covers games that are installed using the steamcmd utility. -### Server Ports +## Server Ports + Many of these servers will require the steam query ports to be open for the server. The default steam query port is 27015 ## ARK Survival Evolved ### Port Requirements + The ARK server requires 4 ports minimum. | Port | default | @@ -24,9 +26,10 @@ Please note the server may not show up on steam game server lists due to this re ## Counter Strike: Global Offensive -Counter-Strike: Global Offensive (CS: GO) expands upon the team-based action gameplay that it pioneered when it was launched 19 years ago. CS: GO features new maps, characters, weapons, and game modes, and delivers updated versions of the classic CS content (de_dust2, etc.). +Counter-Strike: Global Offensive (CS: GO) expands upon the team-based action gameplay that it pioneered when it was launched 19 years ago. CS: GO features new maps, characters, weapons, and game modes, and delivers updated versions of the classic CS content (de_dust2, etc.). ### Port Requirements + | Port | default | |----------|---------| | Game | 27015 | @@ -38,24 +41,27 @@ This is a generic one size fit's all egg that supports srcds game servers. This is not for games like Counter Strike 1.6 which is an HLDS title. See [HLDS server](game_eggs/steamcmd_servers/hlds_server) ### Port Requirements + | Port | default | |----------|---------| | Game | 27015 | ## Garry's Mod -Garry's Mod is a physics sandbox. There aren't any predefined aims or goals. We give you the tools and leave you to play. +Garry's Mod is a physics sandbox. There aren't any predefined aims or goals. We give you the tools and leave you to play. ### Port Requirements + | Port | default | |----------|---------| | Game | 27015 | ## Insurgency -Take to the streets for intense close quarters combat, where a team's survival depends upon securing crucial strongholds and destroying enemy supply in this multiplayer and cooperative Source Engine based experience. +Take to the streets for intense close quarters combat, where a team's survival depends upon securing crucial strongholds and destroying enemy supply in this multiplayer and cooperative Source Engine based experience. ### Port Requirements + | Port | default | |----------|---------| | Game | 27015 | @@ -65,6 +71,7 @@ Take to the streets for intense close quarters combat, where a team's survival d Nine distinct classes provide a broad range of tactical abilities and personalities. Constantly updated with new game modes, maps, equipment and, most importantly, hats! ### Port Requirements + | Port | default | |----------|---------| | Game | 27015 | From a9bdff31c8f4ced12a1668666b672697cba9f764 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:18:03 -0500 Subject: [PATCH 0271/1001] fixed heading levels added blank lines as needed --- stock_eggs/voice-servers/README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/stock_eggs/voice-servers/README.md b/stock_eggs/voice-servers/README.md index 40aed5be..665395ea 100644 --- a/stock_eggs/voice-servers/README.md +++ b/stock_eggs/voice-servers/README.md @@ -4,7 +4,8 @@ Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming. -## Required Server Ports +### Required Server Ports + Mumble only requires a single port to run. The default is 64738 | Port | default | @@ -15,7 +16,8 @@ Mumble only requires a single port to run. The default is 64738 Use crystal clear sound to communicate with your team mates cross-platform with military-grade security, lag-free performance & unparalleled reliability and uptime. -## Required Server Ports +### Required Server Ports + Teamspeak 3 only requires a single port to run. The default is 9987 Other ports for ServerQuery and File Transfers are required for specific things. @@ -26,4 +28,4 @@ Other ports for ServerQuery and File Transfers are required for specific things. | Query | 10011 | | Files | 30033 | -By default pteordactyl sets the query port to the same as the server port. \ No newline at end of file +By default pteordactyl sets the query port to the same as the server port. From 37b981c4178ac879dac0b32dfb6301bd24bce481 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:18:17 -0500 Subject: [PATCH 0272/1001] fixed heading levels added blank lines as needed --- storage/minio/README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/storage/minio/README.md b/storage/minio/README.md index 73fcc597..3d5998e6 100644 --- a/storage/minio/README.md +++ b/storage/minio/README.md @@ -1,24 +1,25 @@ # minio s3 ## Features + Auto generate keys on server creation bypassing default minio keys ## Update + Auto update minio to latest version using "update" startup feature Automatic Key rotation using "rotate" startup feature ## Auto Rotate + It's possible to rotate your keys by changing the startup option to "rotate" - Once this is changed restart your server and it will automatically move your current keys to old and create your new keys - Be sure to change your startup back to "normal" once you have started your server using "rotate". This will ensure that you don't accidentally rotate your keys twice ## Known Issues Double encryption may occur if you manually manipulate files in the keys directory -#### Key rotation is handled automatically, DO NOT manually delete files in keys directory +### Key rotation is handled automatically, DO NOT manually delete files in keys directory From 2ff4f2605e80bf3db75fa9e7e009be5c178b369e Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:18:24 -0500 Subject: [PATCH 0273/1001] fixed heading levels added blank lines as needed --- voice_servers/lavalink/README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/voice_servers/lavalink/README.md b/voice_servers/lavalink/README.md index ad8b7549..68308238 100644 --- a/voice_servers/lavalink/README.md +++ b/voice_servers/lavalink/README.md @@ -1,12 +1,15 @@ # Lavalink Server -### From their [Github](https://github.com/freyacodes/Lavalink) + +## From their [Github](https://github.com/freyacodes/Lavalink) + Standalone audio sending node based on Lavaplayer and JDA-Audio. Allows for sending audio without it ever reaching any of your shards. -### Server Ports +## Server Ports + Ports required to run the server in a table format. | Port | default | |----------|----------| | Lavalink | 2333 | -#### Mods/Plugins may require ports to be added to the server. +### Mods/Plugins may require ports to be added to the server From 111212d007abc3e755904b109f167f8ad8695c62 Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:18:30 -0500 Subject: [PATCH 0274/1001] fixed heading levels added blank lines as needed --- voice_servers/teaspeak/README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/voice_servers/teaspeak/README.md b/voice_servers/teaspeak/README.md index b3a8ee56..010b4142 100644 --- a/voice_servers/teaspeak/README.md +++ b/voice_servers/teaspeak/README.md @@ -1,12 +1,15 @@ # TeaSpeak -### From their [Website](https://teaspeak.de/) -Because a license fee is not my cup of tea! -### Server Ports +## From their [Website](https://teaspeak.de/) + +Because a license fee is not my cup of tea! + +## Server Ports + Ports required to run the server in a table format. | Port | default | |---------|---------| | Voice | 9987 | | Query | 10101 | -| File | 30303 | \ No newline at end of file +| File | 30303 | From 47b25c8112642de8ed3eba5d37791626d22a68ab Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 13:18:40 -0500 Subject: [PATCH 0275/1001] fixed heading levels added blank lines as needed --- voice_servers/ts3_manager/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/voice_servers/ts3_manager/README.md b/voice_servers/ts3_manager/README.md index 8d64dd67..731d290f 100644 --- a/voice_servers/ts3_manager/README.md +++ b/voice_servers/ts3_manager/README.md @@ -1,5 +1,6 @@ # TS3 Manager -### [Website](https://www.ts3.app/) + +## [Website](https://www.ts3.app/) TS3 Manager is a simple and lightwight webbased Teamspeak Webinterface @@ -8,6 +9,7 @@ TS3 Manager is a simple and lightwight webbased Teamspeak Webinterface Connect with your IP from your Pteroserver and the assigned Port. Add your IP to TS Server Withlist ### Server Ports + Ports required to run the server in a table format. | Port | default | From 5c9849a03a72e032c5407f7542d4ddedcb85c48d Mon Sep 17 00:00:00 2001 From: LRMtheBoss Date: Thu, 9 Dec 2021 14:18:29 -0500 Subject: [PATCH 0276/1001] updated message to state Nukkit egg now uses NukkitX --- game_eggs/minecraft/bedrock/nukkit/README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/game_eggs/minecraft/bedrock/nukkit/README.md b/game_eggs/minecraft/bedrock/nukkit/README.md index 87b26676..c38e7b83 100644 --- a/game_eggs/minecraft/bedrock/nukkit/README.md +++ b/game_eggs/minecraft/bedrock/nukkit/README.md @@ -1,8 +1,9 @@ -# Now abandoned. Please use NukkitX by Cloudburst. -[NukkitX](https://github.com/CloudburstMC/Nukkit) # Nukkit -[Nukkit GitHub](https://github.com/Nukkit/Nukkit) +[Old Nukkit GitHub](https://github.com/Nukkit/Nukkit) -Nukkit is a Nuclear-Powered Server Software For Minecraft: Pocket Edition +## Nukkit is Abandoned, uses NukkitX now +[NukkitX](https://github.com/CloudburstMC/Nukkit) + +Nukkit is a Nuclear-Powered Server Software For Minecraft: Pocket Edition From e3d5307eeb2e53799299d38791ef2d963f555cb9 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Sat, 11 Dec 2021 21:00:05 +0200 Subject: [PATCH 0277/1001] fix(pmpp): version fetching Use update.pmmp.io API for latest version fetching allowing users to choose pm3 or pm4. closes #1459 --- .../pocketmine_mp/egg-pocketmine-m-p.json | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json b/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json index 04b5eda6..03831b55 100644 --- a/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json +++ b/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-11-18T21:36:31+00:00", + "exported_at": "2021-12-11T18:55:18+00:00", "name": "PocketmineMP", "author": "info@swisscrafting.ch", "description": "Pocketmine Egg\r\nby onekintaro from swisscrafting.ch\r\nwith the nice help from #eggs Channel on Pterodactyl-Discord :)", @@ -22,29 +22,20 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\n# This is already installed in our Script container image. Leaving it here for future reference | apt install -y curl jq\r\n\r\ncd \/mnt\/server\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\nDOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\n\r\n## this is a simple script to validate a download url actually exists\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\"]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\necho -e \"performing curl -sSL ${DOWNLOAD_LINK}\"\r\ncurl -sSL ${DOWNLOAD_LINK} > PocketMine-MP.phar\r\n\r\necho -e \"\\n downloading latest php build from pocketmine from https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"\\n downloading default server.properties\"\r\n curl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/pocketmine_mp\/server.properties > server.properties\r\nfi\r\n\r\necho -e \"\\n unpacking php binaries\"\r\ntar -xzvf php.binary.tar.gz\r\n\r\necho -e \"\\n removing php packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n configuring PHP extensions library directory\"\r\nEXTENSION_DIR=$(find \"bin\" -name *debug-zts*)\r\ngrep -q '^extension_dir' bin\/php7\/bin\/php.ini && sed -i'bak' \"s{^extension_dir=.*{extension_dir=\\\"$EXTENSION_DIR\\\"{\" bin\/php7\/bin\/php.ini || echo \"extension_dir=\\\"$EXTENSION_DIR\\\"\" >> bin\/php7\/bin\/php.ini\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.txt banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs", + "script": "#!\/bin\/bash\r\n\r\n# This is already installed in our Script container image. Leaving it here for future reference | apt install -y curl jq\r\n\r\ncd \/mnt\/server\r\n\r\n# Restrict versions to latest pm3 and pm4 for now.\r\nif [[ \"${VERSION}\" == \"pm4\" ]] || [[ \"${VERSION}\" == \"\" ]]; then\r\n DOWNLOAD_LINK=$(curl -ssL https:\/\/update.pmmp.io\/api?channel=stable | grep 'download_url' | cut -d '\"' -f 4)\r\n echo -e \"Downloading latest PocketMine 4 from ${DOWNLOAD_LINK}\"\r\n curl -ssL \"${DOWNLOAD_LINK}\" -o PocketMine-MP.phar\r\nelif [[ \"${VERSION}\" == \"pm3\" ]]; then\r\n DOWNLOAD_LINK=$(curl -ssL https:\/\/update.pmmp.io\/api?channel=pm3 | grep 'download_url' | cut -d '\"' -f 4)\r\n echo -e \"Downloading latest PocketMine 4 from ${DOWNLOAD_LINK}\"\r\n curl -ssL \"${DOWNLOAD_LINK}\" -o PocketMine-MP.phar\r\nelse\r\n echo -e \"Unknown version ${VERSION}\"\r\n exit 1\r\nfi\r\n\r\necho -e \"\\n downloading latest php build from PocketMine https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\r\n\r\nif [[ ! -f server.properties ]]; then\r\n echo -e \"\\n downloading default server.properties\"\r\n curl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/pocketmine_mp\/server.properties >server.properties\r\nfi\r\n\r\necho -e \"\\n unpacking php binaries\"\r\ntar -xzvf php.binary.tar.gz\r\n\r\necho -e \"\\n removing php packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n configuring PHP extensions library directory\"\r\nEXTENSION_DIR=$(find \"bin\" -name *debug-zts*)\r\ngrep -q '^extension_dir' bin\/php7\/bin\/php.ini && sed -i'bak' \"s{^extension_dir=.*{extension_dir=\\\"$EXTENSION_DIR\\\"{\" bin\/php7\/bin\/php.ini || echo \"extension_dir=\\\"$EXTENSION_DIR\\\"\" >>bin\/php7\/bin\/php.ini\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.txt banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs\r\n\r\necho -e \"\\n\\nInstall script completed. Enjoy!\"", "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, "variables": [ { - "name": "Github Package", - "description": "", - "env_variable": "GITHUB_PACKAGE", - "default_value": "pmmp\/PocketMine-MP", - "user_viewable": false, - "user_editable": false, - "rules": "required|string|max:20" - }, - { - "name": "Match", - "description": "", - "env_variable": "MATCH", - "default_value": "PocketMine-MP.phar", - "user_viewable": false, - "user_editable": false, - "rules": "required|string|max:20" + "name": "Version to install [pm3 or pm4]", + "description": "Latest PocketMine version to install. Valid options: pm4 and pm3", + "env_variable": "VERSION", + "default_value": "pm4", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:pm3,pm4" } ] } \ No newline at end of file From ecc721a48d0422594e556cdc7d2aaf2df6d243f4 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Sat, 11 Dec 2021 21:53:39 +0200 Subject: [PATCH 0278/1001] chore: correct pm3 install message --- .../minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json b/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json index 03831b55..aebd5da2 100644 --- a/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json +++ b/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-12-11T18:55:18+00:00", + "exported_at": "2021-12-11T19:52:34+00:00", "name": "PocketmineMP", "author": "info@swisscrafting.ch", "description": "Pocketmine Egg\r\nby onekintaro from swisscrafting.ch\r\nwith the nice help from #eggs Channel on Pterodactyl-Discord :)", @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\n# This is already installed in our Script container image. Leaving it here for future reference | apt install -y curl jq\r\n\r\ncd \/mnt\/server\r\n\r\n# Restrict versions to latest pm3 and pm4 for now.\r\nif [[ \"${VERSION}\" == \"pm4\" ]] || [[ \"${VERSION}\" == \"\" ]]; then\r\n DOWNLOAD_LINK=$(curl -ssL https:\/\/update.pmmp.io\/api?channel=stable | grep 'download_url' | cut -d '\"' -f 4)\r\n echo -e \"Downloading latest PocketMine 4 from ${DOWNLOAD_LINK}\"\r\n curl -ssL \"${DOWNLOAD_LINK}\" -o PocketMine-MP.phar\r\nelif [[ \"${VERSION}\" == \"pm3\" ]]; then\r\n DOWNLOAD_LINK=$(curl -ssL https:\/\/update.pmmp.io\/api?channel=pm3 | grep 'download_url' | cut -d '\"' -f 4)\r\n echo -e \"Downloading latest PocketMine 4 from ${DOWNLOAD_LINK}\"\r\n curl -ssL \"${DOWNLOAD_LINK}\" -o PocketMine-MP.phar\r\nelse\r\n echo -e \"Unknown version ${VERSION}\"\r\n exit 1\r\nfi\r\n\r\necho -e \"\\n downloading latest php build from PocketMine https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\r\n\r\nif [[ ! -f server.properties ]]; then\r\n echo -e \"\\n downloading default server.properties\"\r\n curl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/pocketmine_mp\/server.properties >server.properties\r\nfi\r\n\r\necho -e \"\\n unpacking php binaries\"\r\ntar -xzvf php.binary.tar.gz\r\n\r\necho -e \"\\n removing php packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n configuring PHP extensions library directory\"\r\nEXTENSION_DIR=$(find \"bin\" -name *debug-zts*)\r\ngrep -q '^extension_dir' bin\/php7\/bin\/php.ini && sed -i'bak' \"s{^extension_dir=.*{extension_dir=\\\"$EXTENSION_DIR\\\"{\" bin\/php7\/bin\/php.ini || echo \"extension_dir=\\\"$EXTENSION_DIR\\\"\" >>bin\/php7\/bin\/php.ini\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.txt banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs\r\n\r\necho -e \"\\n\\nInstall script completed. Enjoy!\"", + "script": "#!\/bin\/bash\r\n\r\n# This is already installed in our Script container image. Leaving it here for future reference | apt install -y curl jq\r\n\r\ncd \/mnt\/server\r\n\r\n# Restrict versions to latest pm3 and pm4 for now.\r\nif [[ \"${VERSION}\" == \"pm4\" ]] || [[ \"${VERSION}\" == \"\" ]]; then\r\n DOWNLOAD_LINK=$(curl -ssL https:\/\/update.pmmp.io\/api?channel=stable | grep 'download_url' | cut -d '\"' -f 4)\r\n echo -e \"Downloading latest PocketMine 4 from ${DOWNLOAD_LINK}\"\r\n curl -ssL \"${DOWNLOAD_LINK}\" -o PocketMine-MP.phar\r\nelif [[ \"${VERSION}\" == \"pm3\" ]]; then\r\n DOWNLOAD_LINK=$(curl -ssL https:\/\/update.pmmp.io\/api?channel=pm3 | grep 'download_url' | cut -d '\"' -f 4)\r\n echo -e \"Downloading latest PocketMine 3 from ${DOWNLOAD_LINK}\"\r\n curl -ssL \"${DOWNLOAD_LINK}\" -o PocketMine-MP.phar\r\nelse\r\n echo -e \"Unknown version ${VERSION}\"\r\n exit 1\r\nfi\r\n\r\necho -e \"\\n downloading latest php build from PocketMine https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\r\n\r\nif [[ ! -f server.properties ]]; then\r\n echo -e \"\\n downloading default server.properties\"\r\n curl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/pocketmine_mp\/server.properties >server.properties\r\nfi\r\n\r\necho -e \"\\n unpacking php binaries\"\r\ntar -xzvf php.binary.tar.gz\r\n\r\necho -e \"\\n removing php packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n configuring PHP extensions library directory\"\r\nEXTENSION_DIR=$(find \"bin\" -name *debug-zts*)\r\ngrep -q '^extension_dir' bin\/php7\/bin\/php.ini && sed -i'bak' \"s{^extension_dir=.*{extension_dir=\\\"$EXTENSION_DIR\\\"{\" bin\/php7\/bin\/php.ini || echo \"extension_dir=\\\"$EXTENSION_DIR\\\"\" >>bin\/php7\/bin\/php.ini\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.txt banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs\r\n\r\necho -e \"\\n\\nInstall script completed. Enjoy!\"", "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } @@ -30,7 +30,7 @@ "variables": [ { "name": "Version to install [pm3 or pm4]", - "description": "Latest PocketMine version to install. Valid options: pm4 and pm3", + "description": "Latest PocketMine version to install. Valid options: pm3 and pm4", "env_variable": "VERSION", "default_value": "pm4", "user_viewable": true, From b0e58312e34bd11244c6bb10d8e09b12a08348f1 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Sun, 12 Dec 2021 01:07:15 +0200 Subject: [PATCH 0279/1001] forge: clean up and add more debugging clean up the code and add more debugging steps for easier troubleshooting when someone reports issues Easy to view diff: --- .../minecraft/java/forge/forge/egg-forge-enhanced.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json b/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json index 51a5f38e..bcec803e 100644 --- a/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json +++ b/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-12-02T16:23:24+00:00", + "exported_at": "2021-12-11T23:06:46+00:00", "name": "Forge Enhanced", "author": "parker@parkervcp.com", "description": "Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.", @@ -19,7 +19,7 @@ "ghcr.io\/pterodactyl\/yolks:java_8" ], "file_denylist": [], - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true $( [ ! -f unix_args.txt ] && printf %s \"-jar {{SERVER_JARFILE}}\" || printf %s \"@unix_args.txt\" )", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true $( [[ ! -f unix_args.txt ]] && printf %s \"-jar {{SERVER_JARFILE}}\" || printf %s \"@unix_args.txt\" )", "config": { "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \")! For help, type \"\r\n}", @@ -28,7 +28,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n# Remove spaces from the version number to avoid issues with curl\r\nFORGE_VERSION=\"$(echo \"$FORGE_VERSION\" | tr -d ' ')\"\r\nMC_VERSION=\"$(echo \"$MC_VERSION\" | tr -d ' ')\"\r\n\r\nif [ ! -z ${FORGE_VERSION} ]; then\r\n DOWNLOAD_LINK=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/${FORGE_VERSION}\/forge-${FORGE_VERSION}\r\n FORGE_JAR=forge-${FORGE_VERSION}*.jar\r\nelse\r\n JSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\n if [ \"${MC_VERSION}\" == \"latest\" ] || [ \"${MC_VERSION}\" == \"\" ] ; then\r\n echo -e \"getting latest version of forge.\"\r\n MC_VERSION=$(echo -e ${JSON_DATA} | jq -r '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains(\"latest\")) | split(\"-\")[0]' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)\r\n \tBUILD_TYPE=latest\r\n fi\r\n\r\n if [ \"${BUILD_TYPE}\" != \"recommended\" ] && [ \"${BUILD_TYPE}\" != \"latest\" ]; then\r\n BUILD_TYPE=recommended\r\n fi\r\n\r\n echo -e \"minecraft version: ${MC_VERSION}\"\r\n echo -e \"build type: ${BUILD_TYPE}\"\r\n\r\n ## some variables for getting versions and things\r\n\tFILE_SITE=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n ## locating the forge version\r\n if [ \"${VERSION_KEY}\" == \"\" ] && [ \"${BUILD_TYPE}\" == \"recommended\" ]; then\r\n echo -e \"dropping back to latest from recommended due to there not being a recommended version of forge for the mc version requested.\"\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"latest\"))')\r\n fi\r\n\r\n ## Error if the mc version set wasn't valid.\r\n if [ \"${VERSION_KEY}\" == \"\" ] || [ \"${VERSION_KEY}\" == \"null\" ]; then\r\n \techo -e \"The install failed because there is no valid version of forge for the version of minecraft selected.\"\r\n \texit 1\r\n fi\r\n\r\n FORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\n if [ \"${MC_VERSION}\" == \"1.7.10\" ] || [ \"${MC_VERSION}\" == \"1.8.9\" ]; then\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}.jar\r\n if [ \"${MC_VERSION}\" == \"1.7.10\" ]; then\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}-universal.jar\r\n fi\r\n else\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}.jar\r\n fi\r\nfi\r\n\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version ${FORGE_VERSION}\"\r\necho -e \"Download link is ${DOWNLOAD_LINK}\"\r\n\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-installer.jar; then\r\n echo -e \"installer jar download link is valid.\"\r\n else\r\n echo -e \"link is invalid. Exiting now\"\r\n exit 2\r\n fi\r\nelse\r\n echo -e \"no download link provided. Exiting now\"\r\n exit 3\r\nfi\r\n\r\ncurl -s -o installer.jar -sS ${DOWNLOAD_LINK}-installer.jar\r\n\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ]; then\r\n echo \"!!! Error by downloading forge version ${FORGE_VERSION} !!!\"\r\n exit\r\nfi\r\n\r\n# Delete args file to support downgrading to versions below 1.17\r\nif [ -f unix_args.txt ]; then\r\n rm unix_args.txt\r\n exit\r\nfi\r\n\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n\r\nif [[ $MC_VERSION =~ ^1\\.(17|18|19|20|21|22|23) || $MC_VERSION == \"latest\" || $FORGE_VERSION =~ ^1\\.(17|18|19|20|21|22|23) || $FORGE_VERSION == \"latest\" ]]; then\r\n # Create a symlink for 1.17+ Forge args\r\n ln -sf libraries\/net\/minecraftforge\/forge\/*\/unix_args.txt unix_args.txt\r\n else\r\n # For versions below 1.17 that ship with jar delete installer.jar\r\n mv $FORGE_JAR $SERVER_JARFILE\r\n echo -e \"Deleting installer.jar file.\\n\"\r\n rm -rf installer.jar\r\nfi", + "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nif [[ ! -d \/mnt\/server ]]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n# Remove spaces from the version number to avoid issues with curl\r\nFORGE_VERSION=\"$(echo \"$FORGE_VERSION\" | tr -d ' ')\"\r\nMC_VERSION=\"$(echo \"$MC_VERSION\" | tr -d ' ')\"\r\n\r\nif [[ ! -z ${FORGE_VERSION} ]]; then\r\n DOWNLOAD_LINK=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/${FORGE_VERSION}\/forge-${FORGE_VERSION}\r\n FORGE_JAR=forge-${FORGE_VERSION}*.jar\r\nelse\r\n JSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\n if [[ \"${MC_VERSION}\" == \"latest\" ]] || [[ \"${MC_VERSION}\" == \"\" ]]; then\r\n echo -e \"getting latest version of forge.\"\r\n MC_VERSION=$(echo -e ${JSON_DATA} | jq -r '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains(\"latest\")) | split(\"-\")[0]' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)\r\n BUILD_TYPE=latest\r\n fi\r\n\r\n if [[ \"${BUILD_TYPE}\" != \"recommended\" ]] && [[ \"${BUILD_TYPE}\" != \"latest\" ]]; then\r\n BUILD_TYPE=recommended\r\n fi\r\n\r\n echo -e \"minecraft version: ${MC_VERSION}\"\r\n echo -e \"build type: ${BUILD_TYPE}\"\r\n\r\n ## some variables for getting versions and things\r\n FILE_SITE=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n ## locating the forge version\r\n if [[ \"${VERSION_KEY}\" == \"\" ]] && [[ \"${BUILD_TYPE}\" == \"recommended\" ]]; then\r\n echo -e \"dropping back to latest from recommended due to there not being a recommended version of forge for the mc version requested.\"\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"latest\"))')\r\n fi\r\n\r\n ## Error if the mc version set wasn't valid.\r\n if [ \"${VERSION_KEY}\" == \"\" ] || [ \"${VERSION_KEY}\" == \"null\" ]; then\r\n echo -e \"The install failed because there is no valid version of forge for the version of minecraft selected.\"\r\n exit 1\r\n fi\r\n\r\n FORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\n if [[ \"${MC_VERSION}\" == \"1.7.10\" ]] || [[ \"${MC_VERSION}\" == \"1.8.9\" ]]; then\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}.jar\r\n if [[ \"${MC_VERSION}\" == \"1.7.10\" ]]; then\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}-universal.jar\r\n fi\r\n else\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}.jar\r\n fi\r\nfi\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version ${FORGE_VERSION}\"\r\necho -e \"Download link is ${DOWNLOAD_LINK}\"\r\n\r\nif [[ ! -z \"${DOWNLOAD_LINK}\" ]]; then\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-installer.jar; then\r\n echo -e \"installer jar download link is valid.\"\r\n else\r\n echo -e \"link is invalid. Exiting now\"\r\n exit 2\r\n fi\r\nelse\r\n echo -e \"no download link provided. Exiting now\"\r\n exit 3\r\nfi\r\n\r\ncurl -s -o installer.jar -sS ${DOWNLOAD_LINK}-installer.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [[ ! -f .\/installer.jar ]]; then\r\n echo \"!!! Error downloading forge version ${FORGE_VERSION} !!!\"\r\n exit\r\nfi\r\n\r\nfunction unix_args {\r\n echo -e \"Detected Forge 1.17 or newer version. Setting up forge unix args.\"\r\n ln -sf libraries\/net\/minecraftforge\/forge\/*\/unix_args.txt unix_args.txt\r\n}\r\n\r\n# Delete args to support downgrading\/upgrading\r\nrm -rf libraries\/net\/minecraftforge\/forge\r\nrm unix_args.txt\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer || { echo -e \"install failed using Forge version ${FORGE_VERSION} and Minecraft version ${MINECRAFT_VERSION}\"; exit 4; }\r\n\r\n# Check if we need a symlink for 1.17+ Forge JPMS args\r\nif [[ $MC_VERSION =~ ^1\\.(17|18|19|20|21|22|23) || $FORGE_VERSION =~ ^1\\.(17|18|19|20|21|22|23) ]]; then\r\n unix_args\r\n\r\n# Check if someone has set MC to latest but overwrote it with older Forge version, otherwise we would have false positives\r\nelif [[ $MC_VERSION == \"latest\" && $FORGE_VERSION =~ ^1\\.(17|18|19|20|21|22|23) ]]; then\r\n unix_args\r\nelse\r\n # For versions below 1.17 that ship with jar\r\n mv $FORGE_JAR $SERVER_JARFILE\r\nfi\r\n\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar", "container": "openjdk:8-jdk-slim", "entrypoint": "bash" } @@ -68,7 +68,7 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string|max:20" + "rules": "nullable|string|max:25" } ] } \ No newline at end of file From b952823ced4b832a0d7e43962d24d85b10fba0b4 Mon Sep 17 00:00:00 2001 From: Mrxbox98 <29240392+mrxbox98@users.noreply.github.com> Date: Sun, 12 Dec 2021 14:34:08 -0800 Subject: [PATCH 0280/1001] This should be boolean not bool bool is not in https://laravel.com/docs/5.7/validation#available-validation-rules --- bots/discord/discord.js/egg-discord-js-generic.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bots/discord/discord.js/egg-discord-js-generic.json b/bots/discord/discord.js/egg-discord-js-generic.json index 673356ba..3085b663 100644 --- a/bots/discord/discord.js/egg-discord-js-generic.json +++ b/bots/discord/discord.js/egg-discord-js-generic.json @@ -57,7 +57,7 @@ "default_value": "0", "user_viewable": true, "user_editable": true, - "rules": "required|bool" + "rules": "required|boolean" }, { "name": "Auto Update", @@ -114,4 +114,4 @@ "rules": "nullable|string" } ] -} \ No newline at end of file +} From 9251d7532f3a8cffe36cddfb7ae06c7efab7dad5 Mon Sep 17 00:00:00 2001 From: Mrxbox98 <29240392+mrxbox98@users.noreply.github.com> Date: Sun, 12 Dec 2021 15:31:47 -0800 Subject: [PATCH 0281/1001] Changed bool to boolean --- game_eggs/steamcmd_servers/starbound/egg-starbound.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/steamcmd_servers/starbound/egg-starbound.json b/game_eggs/steamcmd_servers/starbound/egg-starbound.json index 3375688e..eb27a8a0 100644 --- a/game_eggs/steamcmd_servers/starbound/egg-starbound.json +++ b/game_eggs/steamcmd_servers/starbound/egg-starbound.json @@ -71,7 +71,7 @@ "default_value": "1", "user_viewable": true, "user_editable": true, - "rules": "required|bool" + "rules": "required|boolean" }, { "name": "Use Workshop content", @@ -80,7 +80,7 @@ "default_value": "0", "user_viewable": true, "user_editable": true, - "rules": "required|bool" + "rules": "required|boolean" } ] -} \ No newline at end of file +} From 4433fad412d590c6edab72d666340dec2b6c90e5 Mon Sep 17 00:00:00 2001 From: Mrxbox98 <29240392+mrxbox98@users.noreply.github.com> Date: Sun, 12 Dec 2021 15:32:34 -0800 Subject: [PATCH 0282/1001] Changed bool to boolean --- bots/discord/lua/luvit/egg-luvit-generic.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bots/discord/lua/luvit/egg-luvit-generic.json b/bots/discord/lua/luvit/egg-luvit-generic.json index ecdb6564..3a6fdd58 100644 --- a/bots/discord/lua/luvit/egg-luvit-generic.json +++ b/bots/discord/lua/luvit/egg-luvit-generic.json @@ -62,7 +62,7 @@ "default_value": "0", "user_viewable": true, "user_editable": false, - "rules": "required|bool" + "rules": "required|boolean" }, { "name": "Git Branch", @@ -92,4 +92,4 @@ "rules": "nullable|string" } ] -} \ No newline at end of file +} From 78973b0c8a36941ef6f250a65b3457030e82266b Mon Sep 17 00:00:00 2001 From: Mrxbox98 <29240392+mrxbox98@users.noreply.github.com> Date: Sun, 12 Dec 2021 15:33:10 -0800 Subject: [PATCH 0283/1001] Changed bool to boolean --- bots/discord/nodemon.js/egg-nodemon.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bots/discord/nodemon.js/egg-nodemon.json b/bots/discord/nodemon.js/egg-nodemon.json index 337f24f2..6a903e3a 100644 --- a/bots/discord/nodemon.js/egg-nodemon.json +++ b/bots/discord/nodemon.js/egg-nodemon.json @@ -55,7 +55,7 @@ "default_value": "0", "user_viewable": true, "user_editable": true, - "rules": "required|bool" + "rules": "required|boolean" }, { "name": "Auto Update", From 245d38467072b66a3af45b3cb7ca07683a186638 Mon Sep 17 00:00:00 2001 From: Mrxbox98 <29240392+mrxbox98@users.noreply.github.com> Date: Sun, 12 Dec 2021 15:34:01 -0800 Subject: [PATCH 0284/1001] Changed bool to boolean --- bots/discord/deno/egg-deno-generic.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bots/discord/deno/egg-deno-generic.json b/bots/discord/deno/egg-deno-generic.json index f42053d8..826be65d 100644 --- a/bots/discord/deno/egg-deno-generic.json +++ b/bots/discord/deno/egg-deno-generic.json @@ -62,7 +62,7 @@ "default_value": "0", "user_viewable": true, "user_editable": true, - "rules": "required|bool" + "rules": "required|boolean" }, { "name": "Git Branch", @@ -83,4 +83,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From 83249b54e7ba7b94d8ce02581f58c3309bbd899a Mon Sep 17 00:00:00 2001 From: Mrxbox98 <29240392+mrxbox98@users.noreply.github.com> Date: Sun, 12 Dec 2021 15:34:31 -0800 Subject: [PATCH 0285/1001] Changed bool to boolean --- game_eggs/gta/fivem/egg-five-m.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/gta/fivem/egg-five-m.json b/game_eggs/gta/fivem/egg-five-m.json index 9f7614c3..70efae68 100644 --- a/game_eggs/gta/fivem/egg-five-m.json +++ b/game_eggs/gta/fivem/egg-five-m.json @@ -98,7 +98,7 @@ "default_value": "0", "user_viewable": true, "user_editable": true, - "rules": "required|bool" + "rules": "required|boolean" } ] } From dc93cedbd885688664db90b443b303ec16d91bb1 Mon Sep 17 00:00:00 2001 From: Sebastian Pietschner <32213671+sebasptsch@users.noreply.github.com> Date: Mon, 13 Dec 2021 11:55:36 +1100 Subject: [PATCH 0286/1001] feat: Dynamica Egg (#1466) --- CONTRIBUTING.md | 18 ++++---- README.md | 1 + bots/discord/dynamica/README.md | 5 +++ bots/discord/dynamica/egg-dynamica.json | 59 +++++++++++++++++++++++++ 4 files changed, 75 insertions(+), 8 deletions(-) create mode 100644 bots/discord/dynamica/README.md create mode 100644 bots/discord/dynamica/egg-dynamica.json diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cc795afc..c28c9d5f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,35 +3,37 @@ ## General rules 1. Keep it simple. - We don't need 8 miles of install script. + We don't need 8 miles of install script. 2. Keep it Small. - Only use what is absolutely needed. + Only use what is absolutely needed. 3. Try to stay in the stock containers. - If you need something in a container, open a PR in [my yolks repo](https://github.com/parkervcp/yolks) where I can review and pull it up to the main repo. In addition, there is a larger quantity of [images here](https://github.com/parkervcp/images) for you to use that have not been migrated to Yolks yet. + If you need something in a container, open a PR in [my yolks repo](https://github.com/parkervcp/yolks) where I can review and pull it up to the main repo. In addition, there is a larger quantity of [images here](https://github.com/parkervcp/images) for you to use that have not been migrated to Yolks yet. 4. Don't be afraid to submit PR's to the egg repo. - I don't bite. I will work with you on the egg and the required things to run it. + I don't bite. I will work with you on the egg and the required things to run it. ## Step 1. + #### Be aware of the pterodactyl install process. The Pterodactyl install process is fairly simple once you know. - + 1. Spin up install container This uses a volume mount on /mnt/server for the server files. This can pull or set up all that is needed to run the server. It is regularly used to just download the files required. Such as server files and configs. - + 2. Stop install container - + 3. Start a new container with the server files in /home/container This is where the server is actually run. Any dependencies installed during the install process are gone. The container that is started should have everything you need. ## Step 2. + #### Testing Make sure your install process is rock solid as I will be testing eggs before they ever hit my repo. @@ -39,8 +41,8 @@ Make sure your install process is rock solid as I will be testing eggs before th I will make suggestions and changes at will. This is to maintain a clean repo that others can pull and be fully aware of what is being done. - ## Step 3. + #### Make a branch and do your work in there. I have been getting messy PR's due to people always PRing from their master branch. Please make a seperate branch and PR from there. diff --git a/README.md b/README.md index f9ac72fe..3747d4a3 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [discord.java](bots/discord/discord.java) Java generic * [discord.js](bots/discord/discord.js) Node JS generic * [discord.py](bots/discord/discord.py) Python generic +* [Dynamica](/bots/discord/dynamica) Node JS * [fragbot](/bots/discord/fragbot) Golang * [JMusicBot](/bots/discord/jmusicbot) Java * [nodemon.js](bots/discord/nodemon.js) Nodemon JS generic diff --git a/bots/discord/dynamica/README.md b/bots/discord/dynamica/README.md new file mode 100644 index 00000000..ef2e45e4 --- /dev/null +++ b/bots/discord/dynamica/README.md @@ -0,0 +1,5 @@ +# Dynamica + +### Their [Github](https://github.com/dynamicabot/dynamica) + +This is a discord bot for dynamically managing voice channels. diff --git a/bots/discord/dynamica/egg-dynamica.json b/bots/discord/dynamica/egg-dynamica.json new file mode 100644 index 00000000..185beb40 --- /dev/null +++ b/bots/discord/dynamica/egg-dynamica.json @@ -0,0 +1,59 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-12-13T10:34:52+11:00", + "name": "Dynamica", + "author": "sebastian.pietschner@gmail.com", + "description": "The dynamica discord bot", + "features": null, + "images": [ + "ghcr.io\/parkervcp\/yolks:nodejs_16" + ], + "file_denylist": [], + "startup": "yarn deploy && yarn prisma migrate deploy && yarn start", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Ready! Logged in as \"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "apt-get update\r\napt-get install openssl git -y -qq\r\ncd \/mnt\/server\r\nif [[ -d .git\/ ]]; then\r\n git pull\r\nelse\r\n git clone https:\/\/github.com\/dynamicabot\/dynamica.git .;\r\nfi;\r\nyarn install --frozen-lockfile", + "container": "node:lts-buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Database Path", + "description": "The path in which to create the sqlite database.", + "env_variable": "DATABASE_URL", + "default_value": "file:\/home\/container\/dynamica\/db.sqlite", + "user_viewable": true, + "user_editable": false, + "rules": "required|string" + }, + { + "name": "Token", + "description": "The token for the discord bot.", + "env_variable": "TOKEN", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "required|string" + }, + { + "name": "Client ID", + "description": "The client ID of your discord bot.", + "env_variable": "CLIENT_ID", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|size:18" + } + ] +} \ No newline at end of file From 29e610ba80b3ba8f9cd53a33b756ca0fb5347cae Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Mon, 13 Dec 2021 05:10:49 +0200 Subject: [PATCH 0287/1001] feat(7d2d): allow specifying telnet password Allows specifying telnet password and using it. Old version would not start if someone specifies password in the config --- .../7_days_to_die/egg-7-days-to-die.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json b/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json index f0e44222..39e8aa55 100644 --- a/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json +++ b/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-12-07T16:16:58+00:00", + "exported_at": "2021-12-13T03:08:36+00:00", "name": "7 Days To Die", "author": "kristoffer.norman@bahnhof.se", "description": "7 days to die server", @@ -13,7 +13,7 @@ "ghcr.io\/parkervcp\/games:source" ], "file_denylist": [], - "startup": ".\/7DaysToDieServer.x86_64 -configfile=serverconfig.xml -quit -batchmode -nographics -dedicated -ServerPort=${SERVER_PORT} -ServerMaxPlayerCount=${MAX_PLAYERS} -GameDifficulty=${GAME_DIFFICULTY} -ControlPanelEnabled=false -TelnetEnabled=true -TelnetPort=8081 -logfile logs\/latest.log & echo -e \"Checking on telnet connection\" && until nc -z -v -w5 127.0.0.1 8081; do echo \"Waiting for telnet connection...\"; sleep 5; done && telnet -E 127.0.0.1 8081", + "startup": ".\/7DaysToDieServer.x86_64 -configfile=serverconfig.xml -quit -batchmode -nographics -dedicated -ServerPort=${SERVER_PORT} -ServerMaxPlayerCount=${MAX_PLAYERS} -GameDifficulty=${GAME_DIFFICULTY} -ControlPanelEnabled=false -TelnetEnabled=true -TelnetPort=8081 -TelnetPassword=${PASSWORD} -logfile logs\/latest.log & echo -e \"Checking on telnet connection\" && until nc -z -v -w5 127.0.0.1 8081; do echo \"Waiting for telnet connection...\"; sleep 5; done && $( [[ -z ${PASSWORD} ]] && printf %s \"telnet -E 127.0.0.1 8081\" || printf %s \"rcon -t telnet -a 127.0.0.1:8081 -p {{PASSWORD}}\" )", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Connected with 7DTD server\"\r\n}", @@ -81,6 +81,15 @@ "user_viewable": true, "user_editable": true, "rules": "nullable|string|max:20" + }, + { + "name": "Telnet Password", + "description": "Telnet listens on a local interface by default without a password. However, you can specify if you wish to expose it.", + "env_variable": "PASSWORD", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|max:30" } ] } \ No newline at end of file From 9f86fb510539479271b213eb109f985b77db7db3 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Mon, 13 Dec 2021 05:14:17 +0200 Subject: [PATCH 0288/1001] chore: more detailed telnet variable description --- game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json b/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json index 39e8aa55..0a9652b8 100644 --- a/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json +++ b/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json @@ -84,7 +84,7 @@ }, { "name": "Telnet Password", - "description": "Telnet listens on a local interface by default without a password. However, you can specify if you wish to expose it.", + "description": "Telnet listens on a local interface by default without a password. However, you can specify a password if you wish to expose telnet.", "env_variable": "PASSWORD", "default_value": "", "user_viewable": true, From def99684aacbfe137f730abbe448911457b184a8 Mon Sep 17 00:00:00 2001 From: Northwave Date: Mon, 13 Dec 2021 23:09:32 +0100 Subject: [PATCH 0289/1001] Update README.md default port correction --- game_eggs/steamcmd_servers/dont_starve/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/dont_starve/README.md b/game_eggs/steamcmd_servers/dont_starve/README.md index 7d8d6e36..00bb2aa1 100644 --- a/game_eggs/steamcmd_servers/dont_starve/README.md +++ b/game_eggs/steamcmd_servers/dont_starve/README.md @@ -15,6 +15,6 @@ Don't Starve Together only requires a single port to run. The default is 10999 | Port | default | |---------|---------| -| Game | 10998 | +| Game | 10999 | #### Mods/Plugins may require ports to be added to the server. From c576673f88a2f2edd28beb10fae1651c0b639041 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Tue, 14 Dec 2021 17:15:45 +0100 Subject: [PATCH 0290/1001] clean sogeBot update process (#1449) Backup database and clean up folders on reinstall to minimize unwanted errors for npm modules --- bots/twitch/sogebot/egg-soge-bot.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bots/twitch/sogebot/egg-soge-bot.json b/bots/twitch/sogebot/egg-soge-bot.json index a80e9212..8a989269 100644 --- a/bots/twitch/sogebot/egg-soge-bot.json +++ b/bots/twitch/sogebot/egg-soge-bot.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-12-07T12:36:17+00:00", + "exported_at": "2021-12-13T15:19:16+01:00", "name": "SogeBot", "author": "info@goover.de", "description": "sogeBot - Free Twitch Bot built on Node.js https:\/\/sogebot.xyz\/", @@ -22,8 +22,8 @@ }, "scripts": { "installation": { - "script": "#\/bin\/bash\r\napt -y update\r\napt install -y curl unzip sqlite jq wget python3 build-essential\r\nexport NODE_OPTIONS=--max-old-space-size=8192\r\nMATCH=sogeBot\r\ncd \/mnt\/server\r\n\r\nrm -fR dest\r\nrm -fR public\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/sogebot\/sogeBot\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/sogebot\/sogeBot\/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\necho -e \"Downloading from $DOWNLOAD_LINK\"\r\nwget -N $DOWNLOAD_LINK\r\nunzip -o $MATCH-*.zip\r\nrm -fR $MATCH-*.zip\r\n\r\necho \"Installing dependencies, this will take some time so sit back and relax...\"\r\n\/usr\/local\/bin\/npm ci 2>&1 | tee npmlog.txt\r\n\r\necho -e \"install completed\"\r\nexit 0", - "container": "node:16-buster-slim", + "script": "#\/bin\/bash\r\n# Installscript for sogeBot | Author: info@goover.de\r\n\r\nexport DEBIAN_FRONTEND=noninteractive\r\n\r\napt -y update\r\napt install -y curl unzip sqlite3 jq wget python3 build-essential ca-certificates\r\n\r\nexport NODE_OPTIONS=--max-old-space-size=8192\r\nchown -R root:root \/mnt\r\nMATCH=sogeBot\r\ncd \/mnt\/server\r\n\r\n#Backup database & config\r\nmkdir -p .backup\r\ncp -f .env \/mnt\/server\/.backup\r\ncp -f sogebot.db \/mnt\/server\/.backup\r\n\r\n#delete old dir's to prevent errors on update\r\nrm -fR dest\r\nrm -fR public\r\nrm -fR node-modules\r\nrm -fR tools\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/sogebot\/sogeBot\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/sogebot\/sogeBot\/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\necho -e \"Downloading from $DOWNLOAD_LINK\"\r\nwget -N $DOWNLOAD_LINK\r\nunzip -o $MATCH-*.zip\r\nrm -fR $MATCH-*.zip\r\n\r\necho \"--------------------------------------------------------------------------\"\r\necho \"Installing dependencies, this will take some time so sit back and relax...\"\r\necho \"IGNORE WARNINGS. THESE ARE NOT ERRORS !!!\"\r\necho \"--------------------------------------------------------------------------\"\r\n\r\nnpm ci 2>&1 | tee npmlog.txt\r\n\r\necho -e \"install completed\"\r\nexit 0", + "container": "node:16-bullseye-slim", "entrypoint": "bash" } }, @@ -38,4 +38,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From 97be6b0f2b0ec124ec0b80f705d82e491443a4e0 Mon Sep 17 00:00:00 2001 From: Lucas Date: Tue, 14 Dec 2021 13:19:37 -0500 Subject: [PATCH 0291/1001] chore: change Java image order to the newest version as default (#1453) --- .../minecraft/java/airplane/egg-airplane.json | 9 ++- .../minecraft/java/fabric/egg-fabric.json | 10 +-- .../minecraft/java/mohist/egg-mohist.json | 74 ------------------- game_eggs/minecraft/java/paper/egg-paper.json | 10 +-- .../minecraft/java/purpur/egg-purpur.json | 8 +- .../minecraft/java/spigot/egg-spigot.json | 8 +- .../spongevanilla/egg-sponge-vanilla.json | 10 +-- .../minecraft/java/tuinity/egg-tuinity.json | 10 +-- .../java/vanillacord/egg-vanilla-cord.json | 12 +-- .../bedrock/waterdog_pe/egg-waterdog-p-e.json | 10 +-- .../cross_platform/waterdog/egg-waterdog.json | 10 +-- .../proxy/java/flamecord/egg-flamecord.json | 10 +-- .../proxy/java/travertine/egg-travertine.json | 10 +-- .../proxy/java/waterfall/egg-waterfall.json | 10 +-- 14 files changed, 64 insertions(+), 137 deletions(-) delete mode 100644 game_eggs/minecraft/java/mohist/egg-mohist.json diff --git a/game_eggs/minecraft/java/airplane/egg-airplane.json b/game_eggs/minecraft/java/airplane/egg-airplane.json index 14b4d2ef..20c90383 100644 --- a/game_eggs/minecraft/java/airplane/egg-airplane.json +++ b/game_eggs/minecraft/java/airplane/egg-airplane.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-07-25T09:45:04+02:00", + "exported_at": "2021-12-09T13:31:17-05:00", "name": "Airplane", "author": "info@ttr3.eu", "description": "A stable, optimized and fast Paper fork.\r\nhttps:\/\/github.com\/TECHNOVE\/Airplane", @@ -13,9 +13,10 @@ "java_version" ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_16", "ghcr.io\/pterodactyl\/yolks:java_17", - "ghcr.io\/pterodactyl\/yolks:java_11" + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_8" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", @@ -61,4 +62,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file diff --git a/game_eggs/minecraft/java/fabric/egg-fabric.json b/game_eggs/minecraft/java/fabric/egg-fabric.json index fe349871..064fd7c0 100644 --- a/game_eggs/minecraft/java/fabric/egg-fabric.json +++ b/game_eggs/minecraft/java/fabric/egg-fabric.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-11-06T19:02:28+00:00", + "exported_at": "2021-12-09T13:31:08-05:00", "name": "Fabric", "author": "accounts@bofanodes.io", "description": "Fabric is a modular modding toolchain targeting Minecraft 1.14 and above, including snapshots.", @@ -13,10 +13,10 @@ "java_version" ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_17", "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_17" + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_8" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", @@ -71,4 +71,4 @@ "rules": "required|string|between:3,15" } ] -} +} \ No newline at end of file diff --git a/game_eggs/minecraft/java/mohist/egg-mohist.json b/game_eggs/minecraft/java/mohist/egg-mohist.json deleted file mode 100644 index d2f5c960..00000000 --- a/game_eggs/minecraft/java/mohist/egg-mohist.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1", - "update_url": null - }, - "exported_at": "2021-06-14T21:28:24+03:00", - "name": "Mohist", - "author": "alex.chang-lam@protonmail.com", - "description": "Spigot fork with performance optimizations.", - "features": [ - "eula", - "java_version" - ], - "images": [ - "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_17" - ], - "file_denylist": [], - "startup": "java -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}} pause", - "config": { - "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \")! For help, type \",\r\n \"userInteraction\": [\r\n \"Go to eula.txt for more info.\"\r\n ]\r\n}", - "logs": "{}", - "stop": "stop" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n# Mohist Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl\r\n\r\n#Go into main direction\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\nif [ ! -z ${BUILD_VERSION} ]; then\r\n DOWNLOAD_LINK=https:\/\/mohistmc.com\/api\/${MC_VERSION}\/${BUILD_VERSION}\/download\r\nelse\r\n DOWNLOAD_LINK=https:\/\/mohistmc.com\/api\/${MC_VERSION}\/${BUILD_TYPE}\/download\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Download link is ${DOWNLOAD_LINK}\"\r\necho -e \"Downloading build version ${BUILD_VERSION}\"\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-server.jar; then\r\n echo -e \"Download link is valid.\"\r\n else\r\n echo -e \"Link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\ncurl -s -o server.jar -sS ${DOWNLOAD_LINK}\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/server.jar ]; then\r\n echo \"!!! Error downloading build version ${BUILD_VERSION} !!!\"\r\n exit\r\nfi", - "container": "debian:buster-slim", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Server Jar File", - "description": "The name of the jarfile to run the server with.", - "env_variable": "SERVER_JARFILE", - "default_value": "server.jar", - "user_viewable": false, - "user_editable": false, - "rules": "required|string|max:20" - }, - { - "name": "Minecraft Version", - "description": "The version of Minecraft to download.", - "env_variable": "MC_VERSION", - "default_value": "1.16.5", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:20" - }, - { - "name": "Build Number", - "description": "Optional: \r\nThe build number for the Mohist release. Overrides Build Type.", - "env_variable": "BUILD_VERSION", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|string|max:20" - }, - { - "name": "Build Type", - "description": "The type of server jar to download from Mohist.\r\n\r\nValid types are \"recommended\" and \"latest\".", - "env_variable": "BUILD_TYPE", - "default_value": "latest", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:20" - } - ] -} diff --git a/game_eggs/minecraft/java/paper/egg-paper.json b/game_eggs/minecraft/java/paper/egg-paper.json index 1ad1196a..b5717965 100644 --- a/game_eggs/minecraft/java/paper/egg-paper.json +++ b/game_eggs/minecraft/java/paper/egg-paper.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-07-02T04:03:08+03:00", + "exported_at": "2021-12-09T13:30:53-05:00", "name": "Paper", "author": "parker@pterodactyl.io", "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", @@ -13,10 +13,10 @@ "java_version" ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_17", "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_17" + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_8" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", @@ -71,4 +71,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file diff --git a/game_eggs/minecraft/java/purpur/egg-purpur.json b/game_eggs/minecraft/java/purpur/egg-purpur.json index 7e0bc1ed..84849ad5 100644 --- a/game_eggs/minecraft/java/purpur/egg-purpur.json +++ b/game_eggs/minecraft/java/purpur/egg-purpur.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-12-07T02:27:26+00:00", + "exported_at": "2021-12-09T13:30:47-05:00", "name": "Purpur", "author": "purpur@birdflop.com", "description": "Fork of Paper and Tuinity providing new configuration options.", @@ -13,10 +13,10 @@ "java_version" ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_17", "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_17" + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_8" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", diff --git a/game_eggs/minecraft/java/spigot/egg-spigot.json b/game_eggs/minecraft/java/spigot/egg-spigot.json index 76ce9ba7..d1e5985a 100644 --- a/game_eggs/minecraft/java/spigot/egg-spigot.json +++ b/game_eggs/minecraft/java/spigot/egg-spigot.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-11-27T05:14:42+00:00", + "exported_at": "2021-12-09T13:30:38-05:00", "name": "Spigot", "author": "support@pterodactyl.io", "description": "Spigot is the most widely-used modded Minecraft server software in the world. It powers many of the top Minecraft server networks around to ensure they can cope with their huge player base and ensure the satisfaction of their players. Spigot works by reducing and eliminating many causes of lag, as well as adding in handy features and settings that help make your job of server administration easier.", @@ -13,10 +13,10 @@ "java_version" ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_17", "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_17" + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_8" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", diff --git a/game_eggs/minecraft/java/spongevanilla/egg-sponge-vanilla.json b/game_eggs/minecraft/java/spongevanilla/egg-sponge-vanilla.json index 8729d985..630e8042 100644 --- a/game_eggs/minecraft/java/spongevanilla/egg-sponge-vanilla.json +++ b/game_eggs/minecraft/java/spongevanilla/egg-sponge-vanilla.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-07-02T04:04:30+03:00", + "exported_at": "2021-12-09T13:30:32-05:00", "name": "SpongeVanilla", "author": "parker@parkervcp.com", "description": "SpongeVanilla is the implementation of the Sponge API on top of Vanilla Minecraft.", @@ -13,10 +13,10 @@ "java_version" ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_17", "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_17" + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_8" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", @@ -53,4 +53,4 @@ "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" } ] -} +} \ No newline at end of file diff --git a/game_eggs/minecraft/java/tuinity/egg-tuinity.json b/game_eggs/minecraft/java/tuinity/egg-tuinity.json index 866f95a6..4434352b 100644 --- a/game_eggs/minecraft/java/tuinity/egg-tuinity.json +++ b/game_eggs/minecraft/java/tuinity/egg-tuinity.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-07-02T04:12:43+03:00", + "exported_at": "2021-12-09T13:30:24-05:00", "name": "Tuinity", "author": "unknown@unknown.com", "description": "Fork of Paper aimed at improving server performance at high playercounts.", @@ -13,10 +13,10 @@ "java_version" ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_17", "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_17" + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_8" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", @@ -44,4 +44,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file diff --git a/game_eggs/minecraft/java/vanillacord/egg-vanilla-cord.json b/game_eggs/minecraft/java/vanillacord/egg-vanilla-cord.json index eb2ce8b1..adc6266f 100644 --- a/game_eggs/minecraft/java/vanillacord/egg-vanilla-cord.json +++ b/game_eggs/minecraft/java/vanillacord/egg-vanilla-cord.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-06-14T21:24:21+03:00", + "exported_at": "2021-12-09T13:30:15-05:00", "name": "VanillaCord", "author": "support@pterodactyl.io", "description": "Minecraft is a game about placing blocks and going on adventures. Explore randomly generated worlds and build amazing things from the simplest of homes to the grandest of castles. Play in Creative Mode with unlimited resources or mine deep in Survival Mode, crafting weapons and armor to fend off dangerous mobs. Do all this alone or with friends.\r\n\r\nVanillaCord adds support for BungeeCord's ip_forward setting.", @@ -13,17 +13,17 @@ "java_version" ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_17", "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_17" + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_8" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"enable-query\": \"true\",\r\n \"server-port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \")! For help, type \",\r\n \"userInteraction\": [\r\n \"Go to eula.txt for more info.\"\r\n ]\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "logs": "{}", "stop": "stop" }, "scripts": { @@ -53,4 +53,4 @@ "rules": "required|string|between:3,15" } ] -} +} \ No newline at end of file diff --git a/game_eggs/minecraft/proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json b/game_eggs/minecraft/proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json index 2825f7db..2fbfcbb7 100644 --- a/game_eggs/minecraft/proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json +++ b/game_eggs/minecraft/proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-09-20T15:28:45+09:00", + "exported_at": "2021-12-09T13:32:23-05:00", "name": "Waterdog PE", "author": "parker@pterodactyl.io", "description": "Brand new proxy server for Minecraft: Bedrock Edition", @@ -13,10 +13,10 @@ "java_version" ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_17", "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_17" + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_8" ], "file_denylist": [], "startup": "java -Dterminal.ansi=true -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", @@ -53,4 +53,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file diff --git a/game_eggs/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json b/game_eggs/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json index 119629cc..1964dda3 100644 --- a/game_eggs/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json +++ b/game_eggs/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-07-02T04:14:07+03:00", + "exported_at": "2021-12-09T13:32:14-05:00", "name": "Waterdog", "author": "parker@pterodactyl.io", "description": "Waterdog is fork of the well-known Waterfall, which is a fork of the well-known BungeeCord, server teleportation suite.", @@ -13,10 +13,10 @@ "java_version" ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_17", "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_17" + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_8" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", @@ -53,4 +53,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file diff --git a/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json b/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json index 8e0e431b..aa279f1c 100644 --- a/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json +++ b/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-06-14T21:31:08+03:00", + "exported_at": "2021-12-09T13:32:08-05:00", "name": "Flamecord", "author": "admin@softwarenoob.com", "description": "FlameCord is a patch for Travertine to fix possible exploits and add useful functionalities. FlameCord aims to fix Netty related exploits to keep your server safe from attacks.", @@ -13,10 +13,10 @@ "java_version" ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_17", "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_17" + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_8" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", @@ -53,4 +53,4 @@ "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" } ] -} +} \ No newline at end of file diff --git a/game_eggs/minecraft/proxy/java/travertine/egg-travertine.json b/game_eggs/minecraft/proxy/java/travertine/egg-travertine.json index e2e7a1f2..5c4042cc 100644 --- a/game_eggs/minecraft/proxy/java/travertine/egg-travertine.json +++ b/game_eggs/minecraft/proxy/java/travertine/egg-travertine.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-06-14T21:31:40+03:00", + "exported_at": "2021-12-09T13:32:03-05:00", "name": "Travertine", "author": "parker@parkervcp.com", "description": "Travertine is a fork of Waterfall with 1.7 protocol support. Waterfall is a fork of the well-known BungeeCord server teleportation suite.", @@ -13,10 +13,10 @@ "java_version" ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_17", "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_17" + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_8" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", @@ -71,4 +71,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file diff --git a/game_eggs/minecraft/proxy/java/waterfall/egg-waterfall.json b/game_eggs/minecraft/proxy/java/waterfall/egg-waterfall.json index 94597a3d..01612883 100644 --- a/game_eggs/minecraft/proxy/java/waterfall/egg-waterfall.json +++ b/game_eggs/minecraft/proxy/java/waterfall/egg-waterfall.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-07-02T04:15:40+03:00", + "exported_at": "2021-12-09T13:31:54-05:00", "name": "Waterfall", "author": "hostmaster@waterfallgaming.net", "description": "Waterfall is a fork of the well-known BungeeCord server teleportation suite.", @@ -13,10 +13,10 @@ "java_version" ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_17", "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_17" + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_8" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", @@ -71,4 +71,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From 8e5ff8fec982abbcfc8a6b281db8fe21d935ca63 Mon Sep 17 00:00:00 2001 From: MrRazamataz <56600481+MrRazamataz@users.noreply.github.com> Date: Wed, 15 Dec 2021 17:54:33 +0000 Subject: [PATCH 0292/1001] fix nukkit download --- game_eggs/minecraft/bedrock/nukkit/egg-nukkit.json | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/game_eggs/minecraft/bedrock/nukkit/egg-nukkit.json b/game_eggs/minecraft/bedrock/nukkit/egg-nukkit.json index aefd6814..fb458c33 100644 --- a/game_eggs/minecraft/bedrock/nukkit/egg-nukkit.json +++ b/game_eggs/minecraft/bedrock/nukkit/egg-nukkit.json @@ -4,25 +4,29 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-07-02T03:55:04+03:00", + "exported_at": "2021-12-15T12:51:36-05:00", "name": "Nukkit", "author": "parker@parkervcp.com", - "description": "Nukkit is a Nuclear-Powered Server Software For Minecraft: Pocket Edition\r\n\r\nhttps:\/\/nukkit.io\/", + "description": "Nukkit is a Nuclear-Powered Server Software For Minecraft: Pocket Edition\r\n\r\nhttps:\/\/cloudburst.org\/", "features": null, "images": [ - "quay.io\/pterodactyl\/core:java-glibc" + "quay.io\/pterodactyl\/core:java-glibc", + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_8", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"enable-query\": \"true\",\r\n \"server-port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \")! For help, type \",\r\n \"userInteraction\": [\r\n \"Go to eula.txt for more info.\"\r\n ]\r\n}", + "startup": "{\r\n \"done\": \")! For help, type \"\r\n}", "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "stop" }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Nukkit Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache curl openssl\r\n\r\ncd \/mnt\/server\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n MODIFIED_DOWNLOAD=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\n wget ${MODIFIED_DOWNLOAD} -O ${SERVER_JARFILE}\r\nelif [ -z \"${NUKKIT_VERSION}\" ] || [ \"${NUKKIT_VERSION}\" == \"latest\" ]; then\r\n wget https:\/\/ci.opencollab.dev\/job\/NukkitX\/job\/Nukkit\/job\/master\/lastSuccessfulBuild\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nelse\r\n wget https:\/\/ci.opencollab.dev\/job\/NukkitX\/job\/Nukkit\/job\/master\/${NUKKIT_VERSION}\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nfi\r\n\r\nif [ ! -f nukkit.yml ]; then\r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/nukkit\/nukkit.yml\r\nfi\r\n\r\nif [ ! -f server.properties ]; then\r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/nukkit\/server.properties\r\nfi", + "script": "#!\/bin\/ash\r\n# Nukkit Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache curl openssl\r\n\r\ncd \/mnt\/server\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n MODIFIED_DOWNLOAD=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\n wget ${MODIFIED_DOWNLOAD} -O ${SERVER_JARFILE}\r\nelif [ -z \"${NUKKIT_VERSION}\" ] || [ \"${NUKKIT_VERSION}\" == \"latest\" ]; then\r\n wget https:\/\/repo.opencollab.dev\/artifactory\/maven-snapshots\/cn\/nukkit\/nukkit\/1.0-SNAPSHOT\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nelse\r\n wget https:\/\/ci.opencollab.dev\/job\/NukkitX\/job\/Nukkit\/job\/master\/${NUKKIT_VERSION}\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nfi\r\n\r\nif [ ! -f nukkit.yml ]; then\r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/nukkit\/nukkit.yml\r\nfi\r\n\r\nif [ ! -f server.properties ]; then\r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/nukkit\/server.properties\r\nfi\r\necho -e \"Install completed!\"", "container": "alpine:3.10", "entrypoint": "ash" } From d78b0167c2a3d50be566818169e19086d9392b71 Mon Sep 17 00:00:00 2001 From: Th3Dilli Date: Wed, 15 Dec 2021 20:18:21 +0100 Subject: [PATCH 0293/1001] use base image --- game_eggs/mohaa/egg-mohaa.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/mohaa/egg-mohaa.json b/game_eggs/mohaa/egg-mohaa.json index 388db113..0fc60052 100644 --- a/game_eggs/mohaa/egg-mohaa.json +++ b/game_eggs/mohaa/egg-mohaa.json @@ -10,7 +10,7 @@ "description": null, "features": null, "images": [ - "ghcr.io\/parkervcp\/games:mohaa" + "ghcr.io\/parkervcp\/yolks:debian" ], "file_denylist": [], "startup": ".\/mohaa_lnxded +set sv_punkbuster 0 +set fs_basepath {{BASE_PATH}} +set fs_outputpath {{LOG_DIR}} +set dedicated 2 +set sv_maxclients {{SERVER_MAXCLIENTS}} +set net_ip 0.0.0.0 +set net_port {{SERVER_PORT}} +exec server.cfg", From 26fbc6ed8309b9c975abf48bb9d8cef9112c1961 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Thu, 16 Dec 2021 15:19:49 +0100 Subject: [PATCH 0294/1001] Update Wine generic to use yolk Images (#1478) --- game_eggs/wine/generic/egg-wine-generic.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/game_eggs/wine/generic/egg-wine-generic.json b/game_eggs/wine/generic/egg-wine-generic.json index d331311e..188fdd45 100644 --- a/game_eggs/wine/generic/egg-wine-generic.json +++ b/game_eggs/wine/generic/egg-wine-generic.json @@ -4,14 +4,13 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-04-28T02:09:55+00:00", + "exported_at": "2021-12-16T15:06:26+01:00", "name": "Wine Generic", "author": "parker@parkervcp.com", "description": "a generic egg to run servers with wine", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:debian_wine-5", - "quay.io\/parkervcp\/pterodactyl-images:debian_wine-4" + "ghcr.io\/parkervcp\/yolks:wine_latest" ], "file_denylist": [], "startup": "wine {{SERVER_EXECUTABLE}}", @@ -24,7 +23,7 @@ "scripts": { "installation": { "script": "#!\/bin\/bash\r\n# The wine generic server installer\r\n# This will just pull a download link and unpack it in directory if specified.\r\n\r\napt update -y\r\napt install -y curl file unzip\r\n\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir -p \/mnt\/server\/\r\nfi\r\n\r\ncd \/mnt\/server\/\r\n\r\n# if an install dir is set then make it and change to it.\r\nif [ ! -z ${INSTALL_DIR} ]; then\r\n mkdir -p ${INSTALL_DIR}\r\n cd ${INSTALL_DIR}\r\nfi\r\n\r\n# validate server link\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\n# unpack servver files\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\n\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"XZ\" ]; then\r\n tar xvf ${DOWNLOAD_LINK##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exiting\"\r\n exit 2 \r\nfi", - "container": "debian:buster-slim", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, From 3bcc7c95132cecbc4b7325f9dc9f18f731888c69 Mon Sep 17 00:00:00 2001 From: MrRazamataz <56600481+MrRazamataz@users.noreply.github.com> Date: Thu, 16 Dec 2021 18:33:34 +0000 Subject: [PATCH 0295/1001] fix the download url and name --- game_eggs/minecraft/bedrock/nukkit/egg-nukkit.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/game_eggs/minecraft/bedrock/nukkit/egg-nukkit.json b/game_eggs/minecraft/bedrock/nukkit/egg-nukkit.json index fb458c33..afb85499 100644 --- a/game_eggs/minecraft/bedrock/nukkit/egg-nukkit.json +++ b/game_eggs/minecraft/bedrock/nukkit/egg-nukkit.json @@ -4,10 +4,10 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-12-15T12:51:36-05:00", + "exported_at": "2021-12-16T13:31:45-05:00", "name": "Nukkit", "author": "parker@parkervcp.com", - "description": "Nukkit is a Nuclear-Powered Server Software For Minecraft: Pocket Edition\r\n\r\nhttps:\/\/cloudburst.org\/", + "description": "Nukkit is a Nuclear-Powered Server Software For Minecraft: Pocket Edition\r\n\r\nhttps:\/\/cloudburstmc.org", "features": null, "images": [ "quay.io\/pterodactyl\/core:java-glibc", @@ -26,7 +26,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Nukkit Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache curl openssl\r\n\r\ncd \/mnt\/server\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n MODIFIED_DOWNLOAD=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\n wget ${MODIFIED_DOWNLOAD} -O ${SERVER_JARFILE}\r\nelif [ -z \"${NUKKIT_VERSION}\" ] || [ \"${NUKKIT_VERSION}\" == \"latest\" ]; then\r\n wget https:\/\/repo.opencollab.dev\/artifactory\/maven-snapshots\/cn\/nukkit\/nukkit\/1.0-SNAPSHOT\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nelse\r\n wget https:\/\/ci.opencollab.dev\/job\/NukkitX\/job\/Nukkit\/job\/master\/${NUKKIT_VERSION}\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nfi\r\n\r\nif [ ! -f nukkit.yml ]; then\r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/nukkit\/nukkit.yml\r\nfi\r\n\r\nif [ ! -f server.properties ]; then\r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/nukkit\/server.properties\r\nfi\r\necho -e \"Install completed!\"", + "script": "#!\/bin\/ash\r\n# Nukkit Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache curl openssl\r\n\r\ncd \/mnt\/server\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n MODIFIED_DOWNLOAD=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\n wget ${MODIFIED_DOWNLOAD} -O ${SERVER_JARFILE}\r\nelif [ -z \"${NUKKIT_VERSION}\" ] || [ \"${NUKKIT_VERSION}\" == \"latest\" ]; then\r\n wget https:\/\/ci.opencollab.dev\/job\/NukkitX\/job\/Nukkit\/job\/master\/lastSuccessfulBuild\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nelse\r\n wget https:\/\/ci.opencollab.dev\/job\/NukkitX\/job\/Nukkit\/job\/master\/${NUKKIT_VERSION}\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nfi\r\n\r\nif [ ! -f nukkit.yml ]; then\r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/nukkit\/nukkit.yml\r\nfi\r\n\r\nif [ ! -f server.properties ]; then\r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/nukkit\/server.properties\r\nfi\r\n\r\necho -s \"Install completed!\"", "container": "alpine:3.10", "entrypoint": "ash" } @@ -43,7 +43,7 @@ }, { "name": "Download Path", - "description": "A URL to use to download Spigot rather than building it on the server. This is not user viewable. Use {{DL_VERSION}}<\/code> in the URL to automatically insert the assigned version into the URL. If you do not enter a URL Spigot will build directly in the container (this will fail on low memory containers).", + "description": "A URL to use to download Nukkit rather than building it on the server. This is not user viewable. Use {{DL_VERSION}}<\/code> in the URL to automatically insert the assigned version into the URL. If you do not enter a URL Spigot will build directly in the container (this will fail on low memory containers).", "env_variable": "DL_PATH", "default_value": "", "user_viewable": false, @@ -60,4 +60,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From a8bf0335b38cf960b00bf5e3a0c1f38338580d27 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Fri, 17 Dec 2021 11:25:22 +0200 Subject: [PATCH 0296/1001] fix: code server download url Fix download url, update Docker images to Yolks and change stop signal. --- software/code-server/egg-code--server.json | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/software/code-server/egg-code--server.json b/software/code-server/egg-code--server.json index 18f9d9f7..2dca08e9 100644 --- a/software/code-server/egg-code--server.json +++ b/software/code-server/egg-code--server.json @@ -4,13 +4,16 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-05-03T21:06:19+03:00", + "exported_at": "2021-12-17T09:23:57+00:00", "name": "Code-Server", "author": "mario.franze@gmail.com", "description": "Run VS Code on any machine anywhere and access it in the browser.", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-14" + "ghcr.io\/parkervcp\/yolks:nodejs_17", + "ghcr.io\/parkervcp\/yolks:nodejs_16", + "ghcr.io\/parkervcp\/yolks:nodejs_14", + "ghcr.io\/parkervcp\/yolks:nodejs_12" ], "file_denylist": [], "startup": "sh .local\/lib\/code-server-{{VERSION}}\/bin\/code-server", @@ -18,11 +21,11 @@ "files": "{\r\n \".config\/code-server\/config.yaml\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"password\": \"password: {{server.build.env.PASSWORD}}\",\r\n \"bind-addr\": \"bind-addr: 0.0.0.0:{{server.build.default.port}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"HTTP server listening on\"\r\n}", "logs": "{}", - "stop": "^C" + "stop": "^^C" }, "scripts": { "installation": { - "script": "apt update\r\napt install -y curl jq\r\nMATCH=linux-amd64\r\n\r\n# Create initial directories\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\n# Create needed directories\r\nmkdir -p \/mnt\/server\/.local\/lib \/mnt\/server\/.local\/bin \/mnt\/server\/.config\/code-server \/mnt\/server\/projects\r\n\r\n# Change permission of projects directory so it can be accessed by code-server\r\nchmod 777 \/mnt\/server\/projects\r\ntouch \"\/mnt\/server\/projects\/PLACE YOUR PROJECTS HERE\"\r\n\r\n# Check for available versions. Defaults to latest if no valid version is found.\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/cdr\/code-server\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/cdr\/code-server\/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 \"v${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n if [ \"v${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"v${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_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\n# Download the given Version and extract it\r\necho \"Downloading $DOWNLOAD_URL\"\r\ncurl -fL $DOWNLOAD_URL | tar -C \/mnt\/server\/.local\/lib -xz\r\nmv \/mnt\/server\/.local\/lib\/code-server-*linux-amd64 \/mnt\/server\/.local\/lib\/code-server-${VERSION}\r\n\r\n\r\nPATH=\"\/mnt\/server\/.local\/bin:$PATH\"\r\necho \"password: changeme\r\nbind-addr: 0.0.0.0\r\nauth: password\r\ncert: false\" > \/mnt\/server\/.config\/code-server\/config.yaml\r\n\r\necho \"Install complete\"", + "script": "apt update\r\napt install -y curl jq\r\nMATCH=linux-amd64\r\n\r\n# Create initial directories\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\n# Create needed directories\r\nmkdir -p \/mnt\/server\/.local\/lib \/mnt\/server\/.local\/bin \/mnt\/server\/.config\/code-server \/mnt\/server\/projects\r\n\r\n# Change permission of projects directory so it can be accessed by code-server\r\nchmod 777 \/mnt\/server\/projects\r\ntouch \"\/mnt\/server\/projects\/PLACE YOUR PROJECTS HERE\"\r\n\r\n# Check for available versions. Defaults to latest if no valid version is found.\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/coder\/code-server\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/coder\/code-server\/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 \"v${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n if [ \"v${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"v${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_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\n# Download the given Version and extract it\r\necho \"Downloading $DOWNLOAD_URL\"\r\ncurl -fL $DOWNLOAD_URL | tar -C \/mnt\/server\/.local\/lib -xz\r\nmv \/mnt\/server\/.local\/lib\/code-server-*linux-amd64 \/mnt\/server\/.local\/lib\/code-server-${VERSION}\r\n\r\n\r\nPATH=\"\/mnt\/server\/.local\/bin:$PATH\"\r\necho \"password: changeme\r\nbind-addr: 0.0.0.0\r\nauth: password\r\ncert: false\" > \/mnt\/server\/.config\/code-server\/config.yaml\r\n\r\necho \"Install complete\"", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -47,4 +50,4 @@ "rules": "string|max:20" } ] -} +} \ No newline at end of file From 6e38e1d9e59ae266e0fc66f9fc16730720c11ea5 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Fri, 17 Dec 2021 13:18:38 +0200 Subject: [PATCH 0297/1001] fix: magma support for newer versions Rewrite the egg to support dev and stable versions, together with newer +1.16 installers. Does not rely on their own API latest fetching, because it picks latest Github release that can include old pre-releases. --- game_eggs/minecraft/java/magma/egg-magma.json | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/game_eggs/minecraft/java/magma/egg-magma.json b/game_eggs/minecraft/java/magma/egg-magma.json index 879f7eec..b39b27fc 100644 --- a/game_eggs/minecraft/java/magma/egg-magma.json +++ b/game_eggs/minecraft/java/magma/egg-magma.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-06-14T21:28:39+03:00", + "exported_at": "2021-12-17T11:15:48+00:00", "name": "Magma", "author": "support@pterodactyl.io", "description": "Magma is most powerful Forge server providing you with Forge mods and Bukkit Plugins using Spigot and Paper for Performance Optimization and Stability.", @@ -15,21 +15,20 @@ "images": [ "ghcr.io\/pterodactyl\/yolks:java_8", "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_16", "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"enable-query\": \"true\",\r\n \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \")! For help, type \",\r\n \"userInteraction\": [\r\n \"Go to eula.txt for more info.\"\r\n ]\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "startup": "{\r\n \"done\": \")! For help, type \"\r\n}", + "logs": "{}", "stop": "stop" }, "scripts": { "installation": { - "script": "apt update\r\napt install -y curl\r\n\r\nif [ ! -d \/mnt\/server\/ ]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\/\r\n\r\nif [ ! -z ${MC_VERSION} ]; then\r\n DOWNLOAD_LINK=https:\/\/api.magmafoundation.org\/api\/resources\/magma\/${MC_VERSION}\/dev\/latest\/download\r\nelse\r\n DOWNLOAD_LINK=https:\/\/api.magmafoundation.org\/api\/resources\/magma\/1.12.2\/dev\/latest\/download\r\nfi\r\n\r\necho -e \"Download URL is ${DOWNLOAD_LINK}\"\r\n\r\n## validate download link\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ] ; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_LINK}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_LINK}\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\n## mv old server files\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n echo -e \"moving old server.jar\"\r\n mv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\n## download files\r\necho -e \"running: curl -sSL -o ${SERVER_JARFILE} ${DOWNLOAD_LINK}\"\r\ncurl -s -o ${SERVER_JARFILE} -sSL ${DOWNLOAD_LINK}\r\n\r\necho -e \"Install Complete\"", - "container": "debian:buster-slim", + "script": "apt update\r\napt install -y curl jq\r\n\r\nif [[ ! -d \/mnt\/server ]]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\/\r\n\r\n# get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/resources\/magma\/1.16.5\/${BRANCH}\/latest\")\r\nOLD_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/resources\/magma\/1.12\/${BRANCH}\/latest\")\r\n\r\nif [[ -z \"${MC_VERSION}\" ]] || [[ \"${MC_VERSION}\" == \"latest\" ]]; then\r\n echo -e \"Version not set. Defaulting to latest\"\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i installer.jar)\r\n\r\nelif [[ $MC_VERSION =~ ^1\\.(16|17|18|19|20|21|22|23) ]]; then\r\n CUSTOM_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/resources\/magma\/${MC_VERSION}\/${BRANCH}\/latest\")\r\n DOWNLOAD_LINK=$(echo ${CUSTOM_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i installer.jar)\r\nelif [[ \"${MC_VERSION}\" == \"1.12\" ]]; then\r\n CUSTOM_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/resources\/magma\/1.12\/${BRANCH}\/latest\")\r\n DOWNLOAD_LINK=$(echo ${OLD_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i server.jar)\r\nelse\r\n # Try to locate version by exact tag name. This will most likely always fail, because the tag names are in a weird format. Leaving it here just in case someone wants to fetch exact tag releases.\r\n VERSION_CHECK=$(echo ${OLD_JSON} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.[] | select(.tag_name==$MC_VERSION) | .tag_name')\r\n if [[ \"${MC_VERSION}\" == \"${VERSION_CHECK}\" ]]; then\r\n DOWNLOAD_LINK=$(echo ${OLD_JSON} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.[] | select(.tag_name==$MC_VERSION) | .assets[].browser_download_url' | grep -i installer.jar)\r\n else\r\n echo -e \"Specified ${MC_VERSION} version not found. Defaulting to latest\"\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\n# validate download link\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then\r\n echo -e \"Validating downlaod link\"\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_LINK}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_LINK}\r\n else\r\n echo -e \"Download URL ${DOWNLOAD_LINK} is invalid. Terminating install.\"\r\n exit 2\r\n fi\r\nfi\r\n\r\nfunction downloadMagma {\r\n echo -e \"running: curl -sSL -o installer.jar ${DOWNLOAD_LINK}\"\r\n curl -sSL -o installer.jar -sSL ${DOWNLOAD_LINK}\r\n}\r\n\r\nif [[ $MC_VERSION =~ ^1\\.(16|17|18|19|20|21|22|23) ]] || [[ -z \"${MC_VERSION}\" ]]; then\r\n downloadMagma\r\n echo -e \"1.16.5 or newer version detected. Running installer\"\r\n java -jar installer.jar --installServer || { echo -e \"install failed\" exit 4; }\r\n mv forge-*.jar $SERVER_JARFILE\r\n echo -e \"Deleting installer.jar file.\\n\"\r\n rm -rf *installer.jar\r\nelse\r\n downloadMagma\r\n echo -e \"Older magma version detected. Skipping installer\"\r\n mv installer.jar $SERVER_JARFILE\r\nfi\r\n\r\necho -e \"Install Complete\"", + "container": "openjdk:8-jdk-slim", "entrypoint": "bash" } }, @@ -39,18 +38,27 @@ "description": "The name of the server jarfile to run the server with.", "env_variable": "SERVER_JARFILE", "default_value": "server.jar", - "user_viewable": false, + "user_viewable": true, "user_editable": false, "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" }, { "name": "Minecraft Version", - "description": "Optional.\r\n\r\nSpecify vanilla version other than default 1.12.2.", + "description": "Optional.\r\n\r\nSpecify the version to install, such as 1.16 or 1.12. Leave empty or set latest to install latest", "env_variable": "MC_VERSION", - "default_value": "", + "default_value": "latest", "user_viewable": true, "user_editable": true, "rules": "nullable|string|max:20" + }, + { + "name": "Branch [dev or stable]", + "description": "Branch to install. Valid options: dev or stable", + "env_variable": "BRANCH", + "default_value": "dev", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:dev,stable" } ] -} +} \ No newline at end of file From 044ff5c44772efa638217704636ed2557cd0d1ca Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Fri, 17 Dec 2021 13:23:28 +0200 Subject: [PATCH 0298/1001] fix: add Mohist egg back Mohist was by mistake removed in #1453 PR --- .../minecraft/java/mohist/egg-mohist.json | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 game_eggs/minecraft/java/mohist/egg-mohist.json diff --git a/game_eggs/minecraft/java/mohist/egg-mohist.json b/game_eggs/minecraft/java/mohist/egg-mohist.json new file mode 100644 index 00000000..d2f5c960 --- /dev/null +++ b/game_eggs/minecraft/java/mohist/egg-mohist.json @@ -0,0 +1,74 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-06-14T21:28:24+03:00", + "name": "Mohist", + "author": "alex.chang-lam@protonmail.com", + "description": "Spigot fork with performance optimizations.", + "features": [ + "eula", + "java_version" + ], + "images": [ + "ghcr.io\/pterodactyl\/yolks:java_8", + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" + ], + "file_denylist": [], + "startup": "java -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}} pause", + "config": { + "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \")! For help, type \",\r\n \"userInteraction\": [\r\n \"Go to eula.txt for more info.\"\r\n ]\r\n}", + "logs": "{}", + "stop": "stop" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# Mohist Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl\r\n\r\n#Go into main direction\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\nif [ ! -z ${BUILD_VERSION} ]; then\r\n DOWNLOAD_LINK=https:\/\/mohistmc.com\/api\/${MC_VERSION}\/${BUILD_VERSION}\/download\r\nelse\r\n DOWNLOAD_LINK=https:\/\/mohistmc.com\/api\/${MC_VERSION}\/${BUILD_TYPE}\/download\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Download link is ${DOWNLOAD_LINK}\"\r\necho -e \"Downloading build version ${BUILD_VERSION}\"\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-server.jar; then\r\n echo -e \"Download link is valid.\"\r\n else\r\n echo -e \"Link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\ncurl -s -o server.jar -sS ${DOWNLOAD_LINK}\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/server.jar ]; then\r\n echo \"!!! Error downloading build version ${BUILD_VERSION} !!!\"\r\n exit\r\nfi", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Server Jar File", + "description": "The name of the jarfile to run the server with.", + "env_variable": "SERVER_JARFILE", + "default_value": "server.jar", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:20" + }, + { + "name": "Minecraft Version", + "description": "The version of Minecraft to download.", + "env_variable": "MC_VERSION", + "default_value": "1.16.5", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + }, + { + "name": "Build Number", + "description": "Optional: \r\nThe build number for the Mohist release. Overrides Build Type.", + "env_variable": "BUILD_VERSION", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|max:20" + }, + { + "name": "Build Type", + "description": "The type of server jar to download from Mohist.\r\n\r\nValid types are \"recommended\" and \"latest\".", + "env_variable": "BUILD_TYPE", + "default_value": "latest", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + } + ] +} From b7eab9d717f95001d4e9ea6cdadac2e25a331d90 Mon Sep 17 00:00:00 2001 From: Guillaume Mazoyer Date: Sat, 18 Dec 2021 17:41:17 +0100 Subject: [PATCH 0299/1001] Add Left 4 Dead and Left 4 Dead 2 --- README.md | 2 + game_eggs/README.md | 2 + game_eggs/steamcmd_servers/README.md | 6 +++ .../steamcmd_servers/left4dead/README.md | 16 ++++++ .../left4dead/egg-left4dead.json | 50 +++++++++++++++++++ .../steamcmd_servers/left4dead_2/README.md | 16 ++++++ .../left4dead_2/egg-left4dead_2.json | 50 +++++++++++++++++++ 7 files changed, 142 insertions(+) create mode 100644 game_eggs/steamcmd_servers/left4dead/README.md create mode 100644 game_eggs/steamcmd_servers/left4dead/egg-left4dead.json create mode 100644 game_eggs/steamcmd_servers/left4dead_2/README.md create mode 100644 game_eggs/steamcmd_servers/left4dead_2/egg-left4dead_2.json diff --git a/README.md b/README.md index 3747d4a3..914202d6 100644 --- a/README.md +++ b/README.md @@ -183,6 +183,8 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Hurtworld](game_eggs/steamcmd_servers/hurtworld) * [Insurgency: Sandstorm](game_eggs/steamcmd_servers/insurgency_sandstorm) * [Killing Floor 2](game_eggs/steamcmd_servers/killing_floor_2) +* [Left 4 Dead](game_eggs/steamcdm_servers/left4dead) +* [Left 4 Dead 2](game_eggs/steamcdm_servers/left4dead_2) * [Modiverse](game_eggs/steamcmd_servers/modiverse) * [Mordhau](game_eggs/steamcmd_servers/mordhau) * [No More Room in Hell](game_eggs/steamcmd_servers/nmrih) diff --git a/game_eggs/README.md b/game_eggs/README.md index 8516677e..f13204fb 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -111,6 +111,8 @@ * [Hurtworld](steamcmd_servers/hurtworld) * [Insurgency: Sandstorm](steamcmd_servers/insurgency_sandstorm) * [Killing Floor 2](steamcmd_servers/killing_floor_2) +* [Left 4 Dead](steamcmd_servers/left4dead) +* [Left 4 Dead 2](steamcmd_servers/left4dead_2) * [Modiverse](steamcmd_servers/modiverse) * [Mordhau](steamcmd_servers/mordhau) * [No More Room in Hell](steamcmd_servers/nmrih) diff --git a/game_eggs/steamcmd_servers/README.md b/game_eggs/steamcmd_servers/README.md index f65d36e1..94cf2db6 100644 --- a/game_eggs/steamcmd_servers/README.md +++ b/game_eggs/steamcmd_servers/README.md @@ -50,6 +50,12 @@ This is a collection of servers that use SteamCMD to install. ## Killing Floor 2 [Killing Floor 2](killing_floor_2) +## Left 4 Dead +[Left 4 Dead](left4dead) + +## Left 4 Dead 2 +[Left 4 Dead](left4dead_2) + ## Modiverse [Modiverse](modiverse) diff --git a/game_eggs/steamcmd_servers/left4dead/README.md b/game_eggs/steamcmd_servers/left4dead/README.md new file mode 100644 index 00000000..b4b7b611 --- /dev/null +++ b/game_eggs/steamcmd_servers/left4dead/README.md @@ -0,0 +1,16 @@ +# Left 4 Dead + +## From their [Website](https://www.l4d.com/) + +Set in the immediate aftermath of the zombie apocalypse, L4D's survival co-op mode lets you blast a path through the infected in four unique “movies,” guiding your survivors across the rooftops of an abandoned metropolis, through rural ghost towns and pitch-black forests in your quest to escape a devastated Ground Zero crawling with infected enemies. Each "movie" is comprised of five large maps, and can be played by one to four human players, with an emphasis on team-based strategy and objectives. + +### Server Ports + +L4D servers require 1 port to be open. The port can be safely changed to any other. + +| Port | default | +|-----------|---------| +| Game/rcon | 27015 | + +## Steam Download [SteamStore](https://store.steampowered.com/app/500/Left_4_Dead/) + diff --git a/game_eggs/steamcmd_servers/left4dead/egg-left4dead.json b/game_eggs/steamcmd_servers/left4dead/egg-left4dead.json new file mode 100644 index 00000000..a538ca27 --- /dev/null +++ b/game_eggs/steamcmd_servers/left4dead/egg-left4dead.json @@ -0,0 +1,50 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-10-13T19:07:48+02:00", + "name": "Left 4 Dead", + "author": "pterodactyl@mazoyer.eu", + "description": "An outbreak of a highly contagious pathogen nicknamed the \"Green Flu\" begins in Pennsylvania. Two weeks after the first infection, four immune survivors, Bill, Zoey, Louis, and Francis make their way out of the city of Fairfield, only to discover that the infection is creating dangerous mutations in some of its hosts.", + "features": null, + "images": [ + "quay.io\/pterodactyl\/core:source" + ], + "file_denylist": [], + "startup": ".\/srcds_run -console -port {{SERVER_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}", + "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "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 lib32gcc-s1 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} +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", + "container": "debian:bullseye", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Game ID", + "description": "The ID corresponding to the game to download and run using SRCDS.", + "env_variable": "SRCDS_APPID", + "default_value": "222840", + "user_viewable": true, + "user_editable": false, + "rules": "required|regex:\/^(222840)$\/" + }, + { + "name": "Default Map", + "description": "Default map used when starting the server.", + "env_variable": "SRCDS_MAP", + "default_value": "l4d_hospital01_apartment", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:40" + } + ] +} \ No newline at end of file diff --git a/game_eggs/steamcmd_servers/left4dead_2/README.md b/game_eggs/steamcmd_servers/left4dead_2/README.md new file mode 100644 index 00000000..affe440f --- /dev/null +++ b/game_eggs/steamcmd_servers/left4dead_2/README.md @@ -0,0 +1,16 @@ +# Left 4 Dead 2 + +## From their [Website](https://www.l4d.com/) + +Set in the zombie apocalypse, Left 4 Dead 2 (L4D2) is the highly anticipated sequel to the award-winning Left 4 Dead, the #1 co-op game of 2008. + +### Server Ports + +L4D 2 servers require 1 port to be open. The port can be safely changed to any other. + +| Port | default | +|-----------|---------| +| Game/rcon | 27015 | + +## Steam Download [SteamStore](https://store.steampowered.com/app/550/Left_4_Dead_2/) + diff --git a/game_eggs/steamcmd_servers/left4dead_2/egg-left4dead_2.json b/game_eggs/steamcmd_servers/left4dead_2/egg-left4dead_2.json new file mode 100644 index 00000000..6cc95d36 --- /dev/null +++ b/game_eggs/steamcmd_servers/left4dead_2/egg-left4dead_2.json @@ -0,0 +1,50 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-10-13T23:28:59+02:00", + "name": "Left 4 Dead 2", + "author": "pterodactyl@mazoyer.eu", + "description": "Left 4 Dead 2 is set in the aftermath of a worldwide pandemic of a disease nicknamed the \"Green Flu\", which rapidly transforms humans into zombie-like creatures and mutated forms that demonstrate extreme aggression towards non-infected beings. A few humans are immune to the disease, while some of those who are infected have no symptoms. The Civil Emergency and Defense Agency (CEDA) and the U.S. military create safe zones to attempt to evacuate as many survivors as possible.", + "features": null, + "images": [ + "quay.io\/pterodactyl\/core:source" + ], + "file_denylist": [], + "startup": ".\/srcds_run -console -port {{SERVER_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}", + "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "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 lib32gcc-s1 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} +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", + "container": "debian:bullseye", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Game ID", + "description": "The ID corresponding to the game to download and run using SRCDS.", + "env_variable": "SRCDS_APPID", + "default_value": "222860", + "user_viewable": true, + "user_editable": false, + "rules": "required|regex:\/^(222860)$\/" + }, + { + "name": "Default Map", + "description": "Default map used when starting the server.", + "env_variable": "SRCDS_MAP", + "default_value": "c1m1_hotel", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:40" + } + ] +} \ No newline at end of file From b90ff3e6e82c7ff11e852b5d68205791d8517267 Mon Sep 17 00:00:00 2001 From: Guillaume Mazoyer Date: Sat, 18 Dec 2021 19:01:28 +0100 Subject: [PATCH 0300/1001] Use proper docker images --- game_eggs/steamcmd_servers/left4dead/egg-left4dead.json | 6 +++--- game_eggs/steamcmd_servers/left4dead_2/egg-left4dead_2.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/game_eggs/steamcmd_servers/left4dead/egg-left4dead.json b/game_eggs/steamcmd_servers/left4dead/egg-left4dead.json index a538ca27..ae16efa9 100644 --- a/game_eggs/steamcmd_servers/left4dead/egg-left4dead.json +++ b/game_eggs/steamcmd_servers/left4dead/egg-left4dead.json @@ -10,7 +10,7 @@ "description": "An outbreak of a highly contagious pathogen nicknamed the \"Green Flu\" begins in Pennsylvania. Two weeks after the first infection, four immune survivors, Bill, Zoey, Louis, and Francis make their way out of the city of Fairfield, only to discover that the infection is creating dangerous mutations in some of its hosts.", "features": null, "images": [ - "quay.io\/pterodactyl\/core:source" + "ghcr.io\/parkervcp\/games:source" ], "file_denylist": [], "startup": ".\/srcds_run -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart", @@ -23,7 +23,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 lib32gcc-s1 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} +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", - "container": "debian:bullseye", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, @@ -47,4 +47,4 @@ "rules": "required|string|max:40" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/left4dead_2/egg-left4dead_2.json b/game_eggs/steamcmd_servers/left4dead_2/egg-left4dead_2.json index 6cc95d36..8c2ef2e3 100644 --- a/game_eggs/steamcmd_servers/left4dead_2/egg-left4dead_2.json +++ b/game_eggs/steamcmd_servers/left4dead_2/egg-left4dead_2.json @@ -10,7 +10,7 @@ "description": "Left 4 Dead 2 is set in the aftermath of a worldwide pandemic of a disease nicknamed the \"Green Flu\", which rapidly transforms humans into zombie-like creatures and mutated forms that demonstrate extreme aggression towards non-infected beings. A few humans are immune to the disease, while some of those who are infected have no symptoms. The Civil Emergency and Defense Agency (CEDA) and the U.S. military create safe zones to attempt to evacuate as many survivors as possible.", "features": null, "images": [ - "quay.io\/pterodactyl\/core:source" + "ghcr.io\/parkervcp\/games:source" ], "file_denylist": [], "startup": ".\/srcds_run -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart", @@ -23,7 +23,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 lib32gcc-s1 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} +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", - "container": "debian:bullseye", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, @@ -47,4 +47,4 @@ "rules": "required|string|max:40" } ] -} \ No newline at end of file +} From 96f963db1be19657d101e90040c2ad060dac3ab5 Mon Sep 17 00:00:00 2001 From: Encode42 Date: Sat, 18 Dec 2021 22:13:56 -0500 Subject: [PATCH 0301/1001] Update Purpur egg description (#1488) --- game_eggs/minecraft/java/purpur/egg-purpur.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/minecraft/java/purpur/egg-purpur.json b/game_eggs/minecraft/java/purpur/egg-purpur.json index 84849ad5..808bdd90 100644 --- a/game_eggs/minecraft/java/purpur/egg-purpur.json +++ b/game_eggs/minecraft/java/purpur/egg-purpur.json @@ -4,10 +4,10 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-12-09T13:30:47-05:00", + "exported_at": "2021-12-18T19:20:26-05:00", "name": "Purpur", "author": "purpur@birdflop.com", - "description": "Fork of Paper and Tuinity providing new configuration options.", + "description": "A drop-in replacement for Paper servers designed for configurability, and new fun and exciting gameplay features.", "features": [ "eula", "java_version" From d45ffa37d3e70847036a91f983c8740aff6d4d95 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Wed, 22 Dec 2021 11:12:44 +0200 Subject: [PATCH 0302/1001] fix: beamng glibc requirements Update Docker images and rewrite beamng to use github release grabber allowing to specify versions. --- game_eggs/beamng/beammp/beammp.json | 16 ++++++++-------- game_eggs/beamng/kissmp/egg-kissmp.json | 14 +++++++++----- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/game_eggs/beamng/beammp/beammp.json b/game_eggs/beamng/beammp/beammp.json index 0837acd6..83c088a5 100644 --- a/game_eggs/beamng/beammp/beammp.json +++ b/game_eggs/beamng/beammp/beammp.json @@ -4,13 +4,13 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-04-17T15:17:54-04:00", + "exported_at": "2021-12-22T09:10:34+00:00", "name": "BeamMP Servers", "author": "noah@noahserver.online", "description": "This is the server for the multiplayer mod BeamMP for the game BeamNG.drive. The server is the point throug which all clients communicate. You can write lua mods for the server, detailed instructions on the BeamMP Wiki.", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:base_debian" + "ghcr.io\/parkervcp\/yolks:debian" ], "file_denylist": [], "startup": ".\/BeamMP-Server", @@ -22,19 +22,19 @@ }, "scripts": { "installation": { - "script": "cd \/mnt\/server\r\n\r\nrm -f BeamMP-Server\r\n\r\napt update -y\r\napt install -y curl\r\ncurl -LJO https:\/\/github.com\/BeamMP\/BeamMP-Server\/releases\/download\/${VERSION}\/BeamMP-Server-linux\r\nmv BeamMP-Server-linux BeamMP-Server\r\nchmod +x BeamMP-Server\r\n\r\necho \"# This is the BeamMP Server Configuration File v0.60\r\nDebug = false # true or false to enable debug console output\r\nPrivate = true # Private?\r\nPort = 30814 # Port to run the server on UDP and TCP\r\nCars = 1 # Max cars for every player\r\nMaxPlayers = 10 # Maximum Amount of Clients\r\nMap = \\\"\/levels\/gridmap\/info.json\\\" # Default Map\r\nName = \\\"BeamMP New Server\\\" # Server Name\r\nDesc = \\\"BeamMP Default Description\\\" # Server Description\r\nuse = \\\"Resources\\\" # Resource file name\r\nAuthKey = \\\"\\\" # Auth Key\" > Server.cfg", - "container": "debian:buster-slim", + "script": "mkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nrm -f BeamMP-Server\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/BeamMP\/BeamMP-Server\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/BeamMP\/BeamMP-Server\/releases\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n echo -e \"Using latest version\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i Server-linux)\r\nelse\r\n echo -e \"Chosen version :${VERSION}. Verifying version from releases\"\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 -i Server-linux)\r\n else\r\n echo -e \"No valid versions found. Defaulting to the latest release\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\necho -e \"Running curl -sSL ${DOWNLOAD_URL} -o BeamMP-Server\"\r\ncurl -L ${DOWNLOAD_URL} -o BeamMP-Server\r\nchmod +x BeamMP-Server\r\n\r\necho \"# This is the BeamMP Server Configuration File v0.60\r\nDebug = false # true or false to enable debug console output\r\nPrivate = true # Private?\r\nPort = 30814 # Port to run the server on UDP and TCP\r\nCars = 1 # Max cars for every player\r\nMaxPlayers = 10 # Maximum Amount of Clients\r\nMap = \\\"\/levels\/gridmap\/info.json\\\" # Default Map\r\nName = \\\"BeamMP New Server\\\" # Server Name\r\nDesc = \\\"BeamMP Default Description\\\" # Server Description\r\nuse = \\\"Resources\\\" # Resource file name\r\nAuthKey = \\\"\\\" # Auth Key\" > Server.cfg", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, "variables": [ { - "name": "Version", - "description": "Github Server Version, to see all versions visit https:\/\/github.com\/BeamMP\/BeamMP-Server\/releases", + "name": "Version to install", + "description": "Latest or invalid versions would default to latest. See all versions visit https:\/\/github.com\/BeamMP\/BeamMP-Server\/releases", "env_variable": "VERSION", - "default_value": "v2.0.3", + "default_value": "latest", "user_viewable": true, - "user_editable": false, + "user_editable": true, "rules": "required|string|max:32" }, { diff --git a/game_eggs/beamng/kissmp/egg-kissmp.json b/game_eggs/beamng/kissmp/egg-kissmp.json index 5fa42529..b1f82bde 100644 --- a/game_eggs/beamng/kissmp/egg-kissmp.json +++ b/game_eggs/beamng/kissmp/egg-kissmp.json @@ -1,18 +1,22 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2021-02-15T20:05:24+00:00", + "exported_at": "2021-12-22T09:08:37+00:00", "name": "KissMP Server", "author": "me@weilbyte.dev", "description": "Server for the KISS Multiplayer BeamNG.drive mod", "features": null, - "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", + "images": [ + "ghcr.io\/parkervcp\/yolks:debian" + ], + "file_denylist": [], "startup": ".\/kissmp-server", "config": { "files": "{\r\n \"config.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Server is running!\",\r\n \"userInteraction\": []\r\n}", + "startup": "{\r\n \"done\": \"Server is running!\"\r\n}", "logs": "{}", "stop": "^C" }, @@ -24,4 +28,4 @@ } }, "variables": [] -} \ No newline at end of file +} From 1005f7e95110b4297083c792852842a24e0db7d5 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Thu, 23 Dec 2021 09:48:34 +0100 Subject: [PATCH 0303/1001] Add telnet variable to 7d2d (#1495) * added Telnet Variable --- .../7_days_to_die/egg-7-days-to-die.json | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json b/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json index 0a9652b8..b1e3a7f6 100644 --- a/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json +++ b/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-12-13T03:08:36+00:00", + "exported_at": "2021-12-22T12:58:29+01:00", "name": "7 Days To Die", "author": "kristoffer.norman@bahnhof.se", "description": "7 days to die server", @@ -13,7 +13,7 @@ "ghcr.io\/parkervcp\/games:source" ], "file_denylist": [], - "startup": ".\/7DaysToDieServer.x86_64 -configfile=serverconfig.xml -quit -batchmode -nographics -dedicated -ServerPort=${SERVER_PORT} -ServerMaxPlayerCount=${MAX_PLAYERS} -GameDifficulty=${GAME_DIFFICULTY} -ControlPanelEnabled=false -TelnetEnabled=true -TelnetPort=8081 -TelnetPassword=${PASSWORD} -logfile logs\/latest.log & echo -e \"Checking on telnet connection\" && until nc -z -v -w5 127.0.0.1 8081; do echo \"Waiting for telnet connection...\"; sleep 5; done && $( [[ -z ${PASSWORD} ]] && printf %s \"telnet -E 127.0.0.1 8081\" || printf %s \"rcon -t telnet -a 127.0.0.1:8081 -p {{PASSWORD}}\" )", + "startup": ".\/7DaysToDieServer.x86_64 -configfile=serverconfig.xml -quit -batchmode -nographics -dedicated -ServerPort=${SERVER_PORT} -ServerMaxPlayerCount=${MAX_PLAYERS} -GameDifficulty=${GAME_DIFFICULTY} -ControlPanelEnabled=false -TelnetEnabled=true -TelnetPort=${TELNET_PORT} -TelnetPassword=${PASSWORD} -logfile logs\/latest.log & echo -e \"Checking on telnet connection\" && until nc -z -v -w5 127.0.0.1 ${TELNET_PORT}; do echo \"Waiting for telnet connection...\"; sleep 5; done && $( [[ -z ${PASSWORD} ]] && printf %s \"telnet -E 127.0.0.1 ${TELNET_PORT}\" || printf %s \"rcon -t telnet -a 127.0.0.1:${TELNET_PORT} -p {{PASSWORD}}\" )", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Connected with 7DTD server\"\r\n}", @@ -90,6 +90,15 @@ "user_viewable": true, "user_editable": true, "rules": "nullable|string|max:30" + }, + { + "name": "Telnet Port", + "description": "", + "env_variable": "TELNET_PORT", + "default_value": "8081", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From 3649847b4563253b1340b7c7a9c949fc62b1887d Mon Sep 17 00:00:00 2001 From: Parker Wahle Date: Thu, 23 Dec 2021 08:41:47 -0500 Subject: [PATCH 0304/1001] Added glowstone --- README.md | 1 + game_eggs/README.md | 1 + game_eggs/minecraft/README.md | 3 +- game_eggs/minecraft/java/README.md | 6 ++- game_eggs/minecraft/java/glowstone/README.md | 9 ++++ .../java/glowstone/egg-glowstone.json | 50 +++++++++++++++++++ 6 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 game_eggs/minecraft/java/glowstone/README.md create mode 100644 game_eggs/minecraft/java/glowstone/egg-glowstone.json diff --git a/README.md b/README.md index 3747d4a3..367d3aba 100644 --- a/README.md +++ b/README.md @@ -128,6 +128,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Feather](game_eggs/minecraft/java/feather) * [Feed The Beast](game_eggs/minecraft/java/ftb) * [Forge](game_eggs/minecraft/java/forge) + * [Glowstone](game_eggs/minecraft/java/glowstone) * [Magma](game_eggs/minecraft/java/magma) * [Mohist](game_eggs/minecraft/java/mohist) * [NanoLimbo](/game_eggs/minecraft/java/nanolimbo) diff --git a/game_eggs/README.md b/game_eggs/README.md index 8516677e..4eff8c4c 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -58,6 +58,7 @@ * [Feather](minecraft/java/feather) * [Feed The Beast](minecraft/java/ftb) * [Forge](minecraft/java/forge) + * [Glowstone](minecraft/java/glowstone) * [Krypton](/minecraft/java/krypton) * [Magma](minecraft/java/magma) * [Mohist](minecraft/java/mohist) diff --git a/game_eggs/minecraft/README.md b/game_eggs/minecraft/README.md index cf9cef67..d2dcefcd 100644 --- a/game_eggs/minecraft/README.md +++ b/game_eggs/minecraft/README.md @@ -17,6 +17,7 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [Feather](/game_eggs/minecraft/java/feather) * [Feed The Beast](/game_eggs/minecraft/java/ftb) * [Forge](/game_eggs/minecraft/java/forge) +* [Glowstone](/minecraft/java/glowstone) * [Krypton](/minecraft/java/krypton) * [Magma](/game_eggs/minecraft/java/magma) * [Mohist](/game_eggs/minecraft/java/mohist) @@ -43,4 +44,4 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [Cross Platform](/game_eggs/minecraft/proxy/cross_platform) * [GeyserMC](/game_eggs/minecraft/proxy/cross_platform/geyser) * [Waterdog](/game_eggs/minecraft/proxy/cross_platform/waterdog) - * DragonProxy abandoned in favour of GeyserMC. + * DragonProxy abandoned in favour of GeyserMC. diff --git a/game_eggs/minecraft/java/README.md b/game_eggs/minecraft/java/README.md index 7c0198b7..c8271bb5 100644 --- a/game_eggs/minecraft/java/README.md +++ b/game_eggs/minecraft/java/README.md @@ -107,4 +107,8 @@ The official Tekkit Classic modpack. Build factories, automate crafting! ## VanillaCord [VanillaCord](https://github.com/ME1312/VanillaCord) -VanillaCord adds support for BungeeCord's ip-forwarding option on vanilla Minecraft servers. \ No newline at end of file +VanillaCord adds support for BungeeCord's ip-forwarding option on vanilla Minecraft servers. + +## Glowstone +[Glowstone](https://glowstone.net/) +Glowstone is an open-source replacement for CraftBukkit, Spigot, and Paper. diff --git a/game_eggs/minecraft/java/glowstone/README.md b/game_eggs/minecraft/java/glowstone/README.md new file mode 100644 index 00000000..feae6c7a --- /dev/null +++ b/game_eggs/minecraft/java/glowstone/README.md @@ -0,0 +1,9 @@ +## Glowstone +Glowstone is an open-source replacement for CraftBukkit, Spigot, and Paper. + +## Ports +Similar to CraftBukkit and it's derivatives, it only requires a single port. Other plugins may require more ports. + +| Port | default | +|-------|---------| +| Game | 25565 | \ No newline at end of file diff --git a/game_eggs/minecraft/java/glowstone/egg-glowstone.json b/game_eggs/minecraft/java/glowstone/egg-glowstone.json new file mode 100644 index 00000000..0a84c60b --- /dev/null +++ b/game_eggs/minecraft/java/glowstone/egg-glowstone.json @@ -0,0 +1,50 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-12-23T08:39:17-05:00", + "name": "Glowstone", + "author": "regulad@regulad.xyz", + "description": "Glowstone is an open-source server implementation for Minecraft: Java Edition 1.12.2 and up.", + "features": null, + "images": [ + "ghcr.io\/pterodactyl\/yolks:java_8" + ], + "file_denylist": [], + "startup": "java -Xms768M -Xmx{{SERVER_MEMORY}}M -XX:+UseG1GC -jar {{SERVER_JARFILE}}", + "config": { + "files": "{\r\n \"config\/glowstone.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"server.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Ready for connections.\"\r\n}", + "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "stop": "stop" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y jq curl wget grep\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ $MAVEN_VERSION == \"latest\" ]\r\nthen\r\n echo -e \"Downloading latest release from GitHub...\"\r\n\r\n curl -s https:\/\/api.github.com\/repos\/GlowstoneMC\/Glowstone\/releases\/latest \\\r\n | grep \"browser_download_url.*jar\" \\\r\n | cut -d : -f 2,3 \\\r\n | tr -d \\\" \\\r\n | wget -O ${SERVER_JARFILE} -qi -\r\nelse \r\n echo -e \"Downloading release ${MAVEN_VERSION} from Maven Repository...\"\r\n \r\n wget -O ${SERVER_JARFILE} \"https:\/\/repo.glowstone.net\/service\/rest\/v1\/search\/assets\/download?group=net.glowstone&name=glowstone&sort=version&repository=snapshots&maven.baseVersion=${MAVEN_VERSION}&direction=desc&maven.classifier=\"\r\nfi\r\n\r\necho -e \"Generating configuration...\"\r\njava -jar ${SERVER_JARFILE} --generate-config\r\n\r\necho -e \"Install Complete\"", + "container": "eclipse-temurin:8-jdk", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Server Jar File", + "description": "The name of the server jarfile to run the server with.", + "env_variable": "SERVER_JARFILE", + "default_value": "server.jar", + "user_viewable": true, + "user_editable": true, + "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" + }, + { + "name": "Maven Version", + "description": "The version to download from the Maven Repository, or latest (downloads from GitHub)", + "env_variable": "MAVEN_VERSION", + "default_value": "latest", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + } + ] +} \ No newline at end of file From fda5868d756510394cef1f62e1990abb8eea9b52 Mon Sep 17 00:00:00 2001 From: Parker Wahle Date: Thu, 23 Dec 2021 08:50:52 -0500 Subject: [PATCH 0305/1001] Add files via upload --- game_eggs/minecraft/java/glowstone/egg-glowstone.json | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/game_eggs/minecraft/java/glowstone/egg-glowstone.json b/game_eggs/minecraft/java/glowstone/egg-glowstone.json index 0a84c60b..66b1e481 100644 --- a/game_eggs/minecraft/java/glowstone/egg-glowstone.json +++ b/game_eggs/minecraft/java/glowstone/egg-glowstone.json @@ -4,18 +4,21 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-12-23T08:39:17-05:00", + "exported_at": "2021-12-23T08:49:44-05:00", "name": "Glowstone", - "author": "regulad@regulad.xyz", + "author": "support@pterodactyl.io", "description": "Glowstone is an open-source server implementation for Minecraft: Java Edition 1.12.2 and up.", "features": null, "images": [ - "ghcr.io\/pterodactyl\/yolks:java_8" + "ghcr.io\/pterodactyl\/yolks:java_8", + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms768M -Xmx{{SERVER_MEMORY}}M -XX:+UseG1GC -jar {{SERVER_JARFILE}}", "config": { - "files": "{\r\n \"config\/glowstone.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"server.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"config\/glowstone.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"server.port\": \"{{server.build.default.port}}\",\r\n \"console.prompt\": \"\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Ready for connections.\"\r\n}", "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "stop" From 2c502d0e3b022cb06fcc68ae046f01043c81af64 Mon Sep 17 00:00:00 2001 From: Parker Wahle Date: Thu, 23 Dec 2021 10:40:21 -0500 Subject: [PATCH 0306/1001] Add files via upload --- .../java/glowstone/egg-glowstone.json | 48 ++++++++++++++++--- 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/game_eggs/minecraft/java/glowstone/egg-glowstone.json b/game_eggs/minecraft/java/glowstone/egg-glowstone.json index 66b1e481..2e96e84c 100644 --- a/game_eggs/minecraft/java/glowstone/egg-glowstone.json +++ b/game_eggs/minecraft/java/glowstone/egg-glowstone.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-12-23T08:49:44-05:00", + "exported_at": "2021-12-23T10:20:23-05:00", "name": "Glowstone", "author": "support@pterodactyl.io", "description": "Glowstone is an open-source server implementation for Minecraft: Java Edition 1.12.2 and up.", @@ -25,7 +25,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y jq curl wget grep\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ $MAVEN_VERSION == \"latest\" ]\r\nthen\r\n echo -e \"Downloading latest release from GitHub...\"\r\n\r\n curl -s https:\/\/api.github.com\/repos\/GlowstoneMC\/Glowstone\/releases\/latest \\\r\n | grep \"browser_download_url.*jar\" \\\r\n | cut -d : -f 2,3 \\\r\n | tr -d \\\" \\\r\n | wget -O ${SERVER_JARFILE} -qi -\r\nelse \r\n echo -e \"Downloading release ${MAVEN_VERSION} from Maven Repository...\"\r\n \r\n wget -O ${SERVER_JARFILE} \"https:\/\/repo.glowstone.net\/service\/rest\/v1\/search\/assets\/download?group=net.glowstone&name=glowstone&sort=version&repository=snapshots&maven.baseVersion=${MAVEN_VERSION}&direction=desc&maven.classifier=\"\r\nfi\r\n\r\necho -e \"Generating configuration...\"\r\njava -jar ${SERVER_JARFILE} --generate-config\r\n\r\necho -e \"Install Complete\"", + "script": "#!\/bin\/bash\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y jq curl\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ $VERSION == *SNAPSHOT ]; then\r\n echo -e \"Using Maven\"\r\n \r\n DOWNLOAD_URL=\"https:\/\/repo.glowstone.net\/service\/rest\/v1\/search\/assets\/download?group=net.glowstone&name=glowstone&sort=version&repository=snapshots&maven.baseVersion=${VERSION}&direction=desc&maven.classifier=\"\r\nelse \r\n echo -e \"Using GitHub.\"\r\n\r\n if [ -z \"${GITHUB_USER}\" ] && [ -z \"${GITHUB_OAUTH_TOKEN}\" ] ; then\r\n echo -e \"using anon api call\"\r\n else\r\n echo -e \"user and oauth token set\"\r\n alias curl='curl -u ${GITHUB_USER}:${GITHUB_OAUTH_TOKEN} '\r\n fi\r\n \r\n ## get release info and download links\r\n LATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\n RELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\n if [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\n else\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 -i ${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\n fi\r\nfi\r\n\r\necho -e \"Downloading...\"\r\ncurl --silent -L -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\necho -e \"Generating configuration...\"\r\njava -jar ${SERVER_JARFILE} --generate-config\r\n\r\necho -e \"Install Complete\"", "container": "eclipse-temurin:8-jdk", "entrypoint": "bash" } @@ -35,19 +35,55 @@ "name": "Server Jar File", "description": "The name of the server jarfile to run the server with.", "env_variable": "SERVER_JARFILE", - "default_value": "server.jar", + "default_value": "glowstone.jar", "user_viewable": true, "user_editable": true, "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" }, { - "name": "Maven Version", - "description": "The version to download from the Maven Repository, or latest (downloads from GitHub)", - "env_variable": "MAVEN_VERSION", + "name": "Glowstone Version", + "description": "The version of Glowstone to download. If it ends in SNAPSHOT, it will attempt to download from the maven repository.", + "env_variable": "VERSION", "default_value": "latest", "user_viewable": true, "user_editable": true, "rules": "required|string|max:20" + }, + { + "name": "GitHub User", + "description": "GitHub user to use for api calls.\r\n\r\nThis only needs to be set if you hit the GitHub API too often across multiple servers.", + "env_variable": "GITHUB_USER", + "default_value": "", + "user_viewable": false, + "user_editable": false, + "rules": "string|nullable" + }, + { + "name": "GitHub OAuth Token", + "description": "This can be either an OAuth or a Personal Access Token.\r\n\r\nThis is required for the install is you set a user.", + "env_variable": "GITHUB_OAUTH_TOKEN", + "default_value": "", + "user_viewable": false, + "user_editable": false, + "rules": "string|nullable" + }, + { + "name": "GitHub Package", + "description": "The repository to download from.", + "env_variable": "GITHUB_PACKAGE", + "default_value": "GlowstoneMC\/Glowstone", + "user_viewable": true, + "user_editable": false, + "rules": "required|string|max:20" + }, + { + "name": "Match", + "description": "", + "env_variable": "MATCH", + "default_value": "glowstone.jar", + "user_viewable": false, + "user_editable": false, + "rules": "required|string" } ] } \ No newline at end of file From 6df3bc32d7beb58b03ba362be7a314b9ff0f4538 Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 29 Dec 2021 09:45:04 -0500 Subject: [PATCH 0307/1001] Update Project Zomboid Egg to support beta versions (#1475) Co-authored-by: softwarenoob --- .../project_zomboid/egg-project-zomboid.json | 66 ++++++++++++++----- 1 file changed, 49 insertions(+), 17 deletions(-) diff --git a/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json b/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json index 92910441..ff70d030 100644 --- a/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json +++ b/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json @@ -1,24 +1,29 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-06-06T11:23:23-07:00", + "exported_at": "2021-12-29T14:38:26+00:00", "name": "Project Zomboid", "author": "iamkubi@gmail.com", "description": "Project Zomboid is an open world survival horror video game in alpha stage development by British and Canadian independent developer, The Indie Stone. The game is set in a post apocalyptic, zombie infested world where the player is challenged to survive for as long as possible before inevitably dying.", - "image": "quay.io\/pterodactyl\/core:source", - "startup": "\/home\/container\/start-server.sh -port {{SERVER_PORT}} -steamport1 {{STEAM_PORT}} -servername \\\"{{SERVER_NAME}}\\\" -adminusername {{ADMIN_USER}} -adminpassword \"{{ADMIN_PASSWORD}}\"", + "features": null, + "images": [ + "ghcr.io\/pterodactyl\/games:source" + ], + "file_denylist": [], + "startup": "\/home\/container\/start-server.sh -port {{SERVER_PORT}} -steamport1 {{STEAM_PORT}} -cachedir=\/home\/container\/.cache -servername \\\"{{SERVER_NAME}}\\\" -adminusername {{ADMIN_USER}} -adminpassword \"{{ADMIN_PASSWORD}}\"", "config": { "files": "{}", - "startup": "{\r\n \"done\": \"SERVER STARTED\",\r\n \"userInteraction\": []\r\n}", + "startup": "{\r\n \"done\": \"SERVER STARTED\"\r\n}", "logs": "{}", "stop": "^C" }, "scripts": { "installation": { - "script": "apt update\r\napt -y --no-install-recommends install curl unzip lib32gcc1 ca-certificates\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\nmkdir -p \/mnt\/server\/steam\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steam\r\ncd \/mnt\/server\/steam\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 380870 +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so", - "container": "debian:buster-slim", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, @@ -28,8 +33,8 @@ "description": "Name of the server", "env_variable": "SERVER_NAME", "default_value": "Project Zomboid Server", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:64" }, { @@ -37,8 +42,8 @@ "description": "Username for the admin account", "env_variable": "ADMIN_USER", "default_value": "admin", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" }, { @@ -46,8 +51,8 @@ "description": "Password for the admin account", "env_variable": "ADMIN_PASSWORD", "default_value": "password", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:32" }, { @@ -55,8 +60,8 @@ "description": "Sets the SteamPort1 option", "env_variable": "STEAM_PORT", "default_value": "8766", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "required|string|max:20" }, { @@ -64,8 +69,35 @@ "description": "Maximum players to allow", "env_variable": "MAX_PLAYERS", "default_value": "10", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, + "rules": "required|string|max:20" + }, + { + "name": "PZ Steam App ID", + "description": "PZ Steam App ID", + "env_variable": "SRCDS_APPID", + "default_value": "380870", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:20" + }, + { + "name": "Steam Beta Branch [requires reinstall]", + "description": "Beta branch to install, such as b41multiplayer. Leave blank to install normal branch", + "env_variable": "SRCDS_BETAID", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|max:64" + }, + { + "name": "Steam Auto Update", + "description": "Enable or disable auto-update on startup. 0 to disable and 1 to enable.", + "env_variable": "AUTO_UPDATE", + "default_value": "0", + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" } ] From f2a4cb7b77f863bb203c2d105be812e815be03bf Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Wed, 29 Dec 2021 17:24:20 +0200 Subject: [PATCH 0308/1001] require install logs for bug reports --- .github/ISSUE_TEMPLATE/bug-report.yml | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 5bb78cc2..66b2f85f 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -72,9 +72,20 @@ body: Step 3 Receive error X or Y validations: required: true - - type: textarea - id: logs + - type: input + id: install-logs attributes: - label: Relevant log output - description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. - render: shell + label: Install logs + description: | + Run the command below on the SSH terminal of your Wings machine and provide the link to logs. + + **If using Pterodactyl 1.x or newer:** + + `tail -n 100 $(ls -Alrt /var/log/pterodactyl/install/*.log | tail -1 | sed 's/ */ /g' | cut -s -d' ' -f9) | nc pteropaste.com 99` + **If using legacy Pterodactyl 0.7:** + + `tail -n 100 $(ls -Alrt /srv/daemon/config/servers/*/install.log | tail -1 | sed 's/ */ /g' | cut -s -d' ' -f9) | nc pteropaste.com 99` + placeholder: | + https://pteropaste.com/exampleLogs + validations: + required: true \ No newline at end of file From b1b6d55ee49d127ca4f534a25fbcdcc496b44150 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Wed, 29 Dec 2021 17:35:40 +0200 Subject: [PATCH 0309/1001] (bug-reports): drop support for 0.7 --- .github/ISSUE_TEMPLATE/bug-report.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 66b2f85f..e17866da 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -79,12 +79,7 @@ body: description: | Run the command below on the SSH terminal of your Wings machine and provide the link to logs. - **If using Pterodactyl 1.x or newer:** - `tail -n 100 $(ls -Alrt /var/log/pterodactyl/install/*.log | tail -1 | sed 's/ */ /g' | cut -s -d' ' -f9) | nc pteropaste.com 99` - **If using legacy Pterodactyl 0.7:** - - `tail -n 100 $(ls -Alrt /srv/daemon/config/servers/*/install.log | tail -1 | sed 's/ */ /g' | cut -s -d' ' -f9) | nc pteropaste.com 99` placeholder: | https://pteropaste.com/exampleLogs validations: From 5e66ccde54630dcd808d27a61c68b569af154980 Mon Sep 17 00:00:00 2001 From: Toasty Date: Sat, 1 Jan 2022 12:58:12 -0600 Subject: [PATCH 0310/1001] Update stop command for Project Zomboid Using ^C forces the server closes and doesn't let it save; quit saves then closes it gracefully --- .../steamcmd_servers/project_zomboid/egg-project-zomboid.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json b/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json index ff70d030..4ecec781 100644 --- a/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json +++ b/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json @@ -18,7 +18,7 @@ "files": "{}", "startup": "{\r\n \"done\": \"SERVER STARTED\"\r\n}", "logs": "{}", - "stop": "^C" + "stop": "quit" }, "scripts": { "installation": { From a62842e25d3125a86fcc2c7bc002959d90263e63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mich=C3=A6l?= <37770229+Michael-xT@users.noreply.github.com> Date: Sat, 1 Jan 2022 22:59:33 +0200 Subject: [PATCH 0311/1001] Updated Stop command Updated Stop command in order to stop it gracefully --- game_eggs/gta/altv/egg-alt--v.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/gta/altv/egg-alt--v.json b/game_eggs/gta/altv/egg-alt--v.json index cd2acfca..5052a307 100644 --- a/game_eggs/gta/altv/egg-alt--v.json +++ b/game_eggs/gta/altv/egg-alt--v.json @@ -18,7 +18,7 @@ "files": "{\r\n \"server.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"host:\": \"host: 0.0.0.0\",\r\n \"port:\": \"port: {{server.build.default.port}}\",\r\n \"password:\": \"password: {{server.build.env.PASSWORD}}\",\r\n \"description:\": \"description: {{server.build.env.SERVER_DESC}}\"\r\n }\r\n },\r\n \"update.cfg\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"branch\": \"{{server.build.env.BUILD}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Server started\"\r\n}", "logs": "{}", - "stop": "^C" + "stop": "quit" }, "scripts": { "installation": { From 966e93372839e7671e26e7feb8e952e9fce54540 Mon Sep 17 00:00:00 2001 From: ICon Date: Sun, 2 Jan 2022 13:20:39 -0700 Subject: [PATCH 0312/1001] Modified Factorio Egg for better start script --- game_eggs/factorio/factorio/egg-factorio.json | 54 ++++++++++--------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/game_eggs/factorio/factorio/egg-factorio.json b/game_eggs/factorio/factorio/egg-factorio.json index a3462ccc..48b933f4 100644 --- a/game_eggs/factorio/factorio/egg-factorio.json +++ b/game_eggs/factorio/factorio/egg-factorio.json @@ -3,21 +3,25 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-06-26T12:55:32-04:00", + "exported_at": "2022-01-02T14:45:19-05:00", "name": "Factorio", "author": "parker@parkervcp.com", "description": "The vanilla Factorio server.\r\n\r\nhttps:\/\/www.factorio.com\/", - "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", - "startup": ".\/bin\/x64\/factorio --port {{SERVER_PORT}} --server-settings data\/server-settings.json --start-server {{SAVE_NAME}}.zip", + "features": null, + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:base_debian" + ], + "file_denylist": [], + "startup": "if [ ! -f \".\/saves\/{{SAVE_NAME}}.zip\" ]; then .\/bin\/x64\/factorio --create .\/saves\/{{SAVE_NAME}}.zip --map-gen-settings data\/map-gen-settings.json --map-settings data\/map-settings.json; fi;\r\n .\/bin\/x64\/factorio --port {{SERVER_PORT}} --server-settings data\/server-settings.json --start-server saves\/{{SAVE_NAME}}.zip", "config": { "files": "{\r\n \"data\/server-settings.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"name\": \"{{server.build.env.SERVER_NAME}}\",\r\n \"description\": \"{{server.build.env.SERVER_DESC}}\",\r\n \"max_players\": \"{{server.build.env.MAX_SLOTS}}\",\r\n \"username\": \"{{server.build.env.SERVER_USERNAME}}\",\r\n \"token\": \"{{server.build.env.SERVER_TOKEN}}\",\r\n \"autosave_interval\": \"{{server.build.env.SAVE_INTERVAL}}\",\r\n \"autosave_slots\": \"{{server.build.env.SAVE_SLOTS}}\",\r\n \"afk_autokick_interval\": \"{{server.build.env.AFK_KICK}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Hosting game at\",\r\n \"userInteraction\": []\r\n}", + "startup": "{\r\n \"done\": \"Hosting game at\"\r\n}", "logs": "{\r\n \"custom\": false,\r\n \"location\": \"factorio-current.log\"\r\n}", "stop": "\/quit" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Factorio Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update \r\napt install -y curl tar xz-utils jq\r\n\r\nVERSION_JSON=$(curl -sSL https:\/\/factorio.com\/api\/latest-releases)\r\n\r\nlatest_stable=$(echo $VERSION_JSON | jq -r '.stable.headless')\r\nlatest_experimental=$(echo $VERSION_JSON | jq -r '.experimental.headless')\r\n\r\nif [ -z \"${FACTORIO_VERSION}\" ] || [ \"${FACTORIO_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=$latest_stable\r\nelif [ \"${FACTORIO_VERSION}\" == \"experimental\" ]; then\r\n DL_VERSION=$latest_experimental\r\nelse\r\n DL_VERSION=${FACTORIO_VERSION}\r\nfi\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\necho -e \"\\n running 'curl -sL https:\/\/www.factorio.com\/get-download\/${DL_VERSION}\/headless\/linux64 -o factorio-${DL_VERSION}' \\n\"\r\n\r\ncurl -sL https:\/\/www.factorio.com\/get-download\/${DL_VERSION}\/headless\/linux64 -o factorio-${DL_VERSION}\r\n\r\ntar -xf factorio-${DL_VERSION} --strip-components=1 -C \/mnt\/server\r\n\r\nrm factorio-${DL_VERSION}\r\n\r\nif [ -e data\/map-gen-settings.json ]; then\r\n echo \"map-gen exists\"\r\nelse\r\n echo \"copying map-gen default settings\"\r\n mv data\/map-gen-settings.example.json data\/map-gen-settings.json\r\nfi\r\n\r\nif [ -e data\/server-settings.json ]; then\r\n echo \"server settings exists\"\r\nelse\r\n echo \"copying server default settings\"\r\n mv data\/server-settings.example.json data\/server-settings.json\r\nfi\r\n\r\nif [ -e map-settings.json ]; then\r\n echo \"map settings exists\"\r\nelse\r\n echo \"copying map default settings\"\r\n mv data\/map-settings.example.json data\/map-settings.json\r\nfi\r\n\r\nif [ -e ${SAVE_NAME}.zip ]; then\r\n echo \"save file exists\"\r\nelse\r\n .\/bin\/x64\/factorio --create ${SAVE_NAME}\r\n chmod o+w ${SAVE_NAME}.zip\r\nfi", + "script": "#!\/bin\/bash\r\n# Factorio Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update \r\napt install -y curl tar xz-utils jq\r\n\r\nVERSION_JSON=$(curl -sSL https:\/\/factorio.com\/api\/latest-releases)\r\n\r\nlatest_stable=$(echo $VERSION_JSON | jq -r '.stable.headless')\r\nlatest_experimental=$(echo $VERSION_JSON | jq -r '.experimental.headless')\r\n\r\nif [ -z \"${FACTORIO_VERSION}\" ] || [ \"${FACTORIO_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=$latest_stable\r\nelif [ \"${FACTORIO_VERSION}\" == \"experimental\" ]; then\r\n DL_VERSION=$latest_experimental\r\nelse\r\n DL_VERSION=${FACTORIO_VERSION}\r\nfi\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\necho -e \"\\n running 'curl -sL https:\/\/www.factorio.com\/get-download\/${DL_VERSION}\/headless\/linux64 -o factorio-${DL_VERSION}' \\n\"\r\n\r\ncurl -sL https:\/\/www.factorio.com\/get-download\/${DL_VERSION}\/headless\/linux64 -o factorio-${DL_VERSION}\r\n\r\ntar -xf factorio-${DL_VERSION} --strip-components=1 -C \/mnt\/server\r\n\r\nrm factorio-${DL_VERSION}\r\n\r\nif [ -e data\/map-gen-settings.json ]; then\r\n echo \"map-gen exists\"\r\nelse\r\n echo \"copying map-gen default settings\"\r\n mv data\/map-gen-settings.example.json data\/map-gen-settings.json\r\nfi\r\n\r\nif [ -e data\/server-settings.json ]; then\r\n echo \"server settings exists\"\r\nelse\r\n echo \"copying server default settings\"\r\n mv data\/server-settings.example.json data\/server-settings.json\r\nfi\r\n\r\nif [ -e map-settings.json ]; then\r\n echo \"map settings exists\"\r\nelse\r\n echo \"copying map default settings\"\r\n mv data\/map-settings.example.json data\/map-settings.json\r\nfi\r\n\r\nif [ -e .\/saves\/${SAVE_NAME}.zip ]; then\r\n echo \"save file exists\"\r\nelse\r\n .\/bin\/x64\/factorio --create .\/saves\/${SAVE_NAME} --map-gen-settings data\/map-gen-settings.json --map-settings data\/map-settings.json\r\n chmod o+w .\/saves\/${SAVE_NAME}.zip\r\nfi", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -28,8 +32,8 @@ "description": "Which version of Factorio to install and use.", "env_variable": "FACTORIO_VERSION", "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|between:3,12" }, { @@ -37,8 +41,8 @@ "description": "Total number of slots to allow on the server.", "env_variable": "MAX_SLOTS", "default_value": "20", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "required|numeric|digits_between:1,3" }, { @@ -46,8 +50,8 @@ "description": "The save name for the server.", "env_variable": "SAVE_NAME", "default_value": "gamesave", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "alpha_dash|between:1,100" }, { @@ -55,8 +59,8 @@ "description": "Your factorio.com token, it is required for your server to be visible in the public server list.", "env_variable": "SERVER_TOKEN", "default_value": "undefined", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "alpha_num|max:100" }, { @@ -64,8 +68,8 @@ "description": "Name of the game as it will appear in the game listing", "env_variable": "SERVER_NAME", "default_value": "Factorio Server", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:100" }, { @@ -73,8 +77,8 @@ "description": "Description of the game that will appear in the listing.", "env_variable": "SERVER_DESC", "default_value": "Description", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:200" }, { @@ -82,8 +86,8 @@ "description": "Username used for the server", "env_variable": "SERVER_USERNAME", "default_value": "unnamed", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:40" }, { @@ -91,8 +95,8 @@ "description": "Time between auto saves specified in minutes", "env_variable": "SAVE_INTERVAL", "default_value": "10", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|numeric|digits_between:1,3" }, { @@ -100,8 +104,8 @@ "description": "The number of auto saves to keep.", "env_variable": "SAVE_SLOTS", "default_value": "5", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|numeric|digits_between:1,3" }, { @@ -109,8 +113,8 @@ "description": "Time specified in minutes to kick AFK players.\r\n0 is off", "env_variable": "AFK_KICK", "default_value": "0", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|numeric|digits_between:1,3" } ] From 9e53660dbca52acc16a78b4b2cb553ac4a8a359f Mon Sep 17 00:00:00 2001 From: ICon Date: Sun, 2 Jan 2022 20:47:25 -0700 Subject: [PATCH 0313/1001] Changed quay repository to ghcr.io --- game_eggs/factorio/factorio/egg-factorio.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/game_eggs/factorio/factorio/egg-factorio.json b/game_eggs/factorio/factorio/egg-factorio.json index 48b933f4..cebe8601 100644 --- a/game_eggs/factorio/factorio/egg-factorio.json +++ b/game_eggs/factorio/factorio/egg-factorio.json @@ -1,15 +1,16 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2022-01-02T14:45:19-05:00", - "name": "Factorio", + "exported_at": "2022-01-02T22:43:37-05:00", + "name": "Factorio Test", "author": "parker@parkervcp.com", "description": "The vanilla Factorio server.\r\n\r\nhttps:\/\/www.factorio.com\/", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:base_debian" + "ghcr.io\/parkervcp\/yolks:debian" ], "file_denylist": [], "startup": "if [ ! -f \".\/saves\/{{SAVE_NAME}}.zip\" ]; then .\/bin\/x64\/factorio --create .\/saves\/{{SAVE_NAME}}.zip --map-gen-settings data\/map-gen-settings.json --map-settings data\/map-settings.json; fi;\r\n .\/bin\/x64\/factorio --port {{SERVER_PORT}} --server-settings data\/server-settings.json --start-server saves\/{{SAVE_NAME}}.zip", @@ -22,7 +23,7 @@ "scripts": { "installation": { "script": "#!\/bin\/bash\r\n# Factorio Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update \r\napt install -y curl tar xz-utils jq\r\n\r\nVERSION_JSON=$(curl -sSL https:\/\/factorio.com\/api\/latest-releases)\r\n\r\nlatest_stable=$(echo $VERSION_JSON | jq -r '.stable.headless')\r\nlatest_experimental=$(echo $VERSION_JSON | jq -r '.experimental.headless')\r\n\r\nif [ -z \"${FACTORIO_VERSION}\" ] || [ \"${FACTORIO_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=$latest_stable\r\nelif [ \"${FACTORIO_VERSION}\" == \"experimental\" ]; then\r\n DL_VERSION=$latest_experimental\r\nelse\r\n DL_VERSION=${FACTORIO_VERSION}\r\nfi\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\necho -e \"\\n running 'curl -sL https:\/\/www.factorio.com\/get-download\/${DL_VERSION}\/headless\/linux64 -o factorio-${DL_VERSION}' \\n\"\r\n\r\ncurl -sL https:\/\/www.factorio.com\/get-download\/${DL_VERSION}\/headless\/linux64 -o factorio-${DL_VERSION}\r\n\r\ntar -xf factorio-${DL_VERSION} --strip-components=1 -C \/mnt\/server\r\n\r\nrm factorio-${DL_VERSION}\r\n\r\nif [ -e data\/map-gen-settings.json ]; then\r\n echo \"map-gen exists\"\r\nelse\r\n echo \"copying map-gen default settings\"\r\n mv data\/map-gen-settings.example.json data\/map-gen-settings.json\r\nfi\r\n\r\nif [ -e data\/server-settings.json ]; then\r\n echo \"server settings exists\"\r\nelse\r\n echo \"copying server default settings\"\r\n mv data\/server-settings.example.json data\/server-settings.json\r\nfi\r\n\r\nif [ -e map-settings.json ]; then\r\n echo \"map settings exists\"\r\nelse\r\n echo \"copying map default settings\"\r\n mv data\/map-settings.example.json data\/map-settings.json\r\nfi\r\n\r\nif [ -e .\/saves\/${SAVE_NAME}.zip ]; then\r\n echo \"save file exists\"\r\nelse\r\n .\/bin\/x64\/factorio --create .\/saves\/${SAVE_NAME} --map-gen-settings data\/map-gen-settings.json --map-settings data\/map-settings.json\r\n chmod o+w .\/saves\/${SAVE_NAME}.zip\r\nfi", - "container": "debian:buster-slim", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, From e40d9f21dbda9270136f5f57e46dbd709fdb717b Mon Sep 17 00:00:00 2001 From: ICon Date: Sun, 2 Jan 2022 20:48:49 -0700 Subject: [PATCH 0314/1001] Fixed Name Mistake --- game_eggs/factorio/factorio/egg-factorio.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/factorio/factorio/egg-factorio.json b/game_eggs/factorio/factorio/egg-factorio.json index cebe8601..7f29aaf2 100644 --- a/game_eggs/factorio/factorio/egg-factorio.json +++ b/game_eggs/factorio/factorio/egg-factorio.json @@ -5,7 +5,7 @@ "update_url": null }, "exported_at": "2022-01-02T22:43:37-05:00", - "name": "Factorio Test", + "name": "Factorio", "author": "parker@parkervcp.com", "description": "The vanilla Factorio server.\r\n\r\nhttps:\/\/www.factorio.com\/", "features": null, From 1a84600dbea57a87ca4030e33688b979bb5c7c81 Mon Sep 17 00:00:00 2001 From: Parker Wahle Date: Fri, 7 Jan 2022 15:16:11 -0500 Subject: [PATCH 0315/1001] Add files via upload --- game_eggs/minecraft/java/glowstone/egg-glowstone.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/minecraft/java/glowstone/egg-glowstone.json b/game_eggs/minecraft/java/glowstone/egg-glowstone.json index 2e96e84c..18b66715 100644 --- a/game_eggs/minecraft/java/glowstone/egg-glowstone.json +++ b/game_eggs/minecraft/java/glowstone/egg-glowstone.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-12-23T10:20:23-05:00", + "exported_at": "2022-01-07T15:15:07-05:00", "name": "Glowstone", "author": "support@pterodactyl.io", "description": "Glowstone is an open-source server implementation for Minecraft: Java Edition 1.12.2 and up.", @@ -74,7 +74,7 @@ "default_value": "GlowstoneMC\/Glowstone", "user_viewable": true, "user_editable": false, - "rules": "required|string|max:20" + "rules": "required|string" }, { "name": "Match", From affd90f9a2a1890bf59b13bc4daf1158d075134d Mon Sep 17 00:00:00 2001 From: rexracer1998 Date: Sun, 9 Jan 2022 23:37:42 +0100 Subject: [PATCH 0316/1001] Changing the stop action of FiveM egg On line 21, I've changed "^C" to "quit" in order to stop the server because SIGINT doesn't work in this case. --- game_eggs/gta/fivem/egg-five-m.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/gta/fivem/egg-five-m.json b/game_eggs/gta/fivem/egg-five-m.json index 70efae68..ad473a26 100644 --- a/game_eggs/gta/fivem/egg-five-m.json +++ b/game_eggs/gta/fivem/egg-five-m.json @@ -18,7 +18,7 @@ "files": "{\r\n \"server.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"endpoint_add_tcp\": \"endpoint_add_tcp \\\"0.0.0.0:{{server.build.default.port}}\\\"\",\r\n \"endpoint_add_udp\": \"endpoint_add_udp \\\"0.0.0.0:{{server.build.default.port}}\\\"\",\r\n \"sv_hostname\": \"sv_hostname \\\"{{server.build.env.SERVER_HOSTNAME}}\\\"\",\r\n \"set sv_licenseKey\": \"set sv_licenseKey {{server.build.env.FIVEM_LICENSE}}\",\r\n \"set steam_webApiKey\": \"set steam_webApiKey {{server.build.env.STEAM_WEBAPIKEY}}\",\r\n \"sv_maxclients\": \"sv_maxclients {{server.build.env.MAX_PLAYERS}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"succeeded. Welcome!\"\r\n}", "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", - "stop": "^C" + "stop": "quit" }, "scripts": { "installation": { From d75d4b1482618ad7b82492859de61ea9f81991cc Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Mon, 10 Jan 2022 18:31:00 +0100 Subject: [PATCH 0317/1001] fix(haste-server): Update Github URL to match the new owner of Hastebin (#1520) --- software/haste-server/egg-haste-server.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/haste-server/egg-haste-server.json b/software/haste-server/egg-haste-server.json index d913ef5c..bcccbe80 100644 --- a/software/haste-server/egg-haste-server.json +++ b/software/haste-server/egg-haste-server.json @@ -21,7 +21,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y git curl\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\ngit clone https:\/\/github.com\/seejohnrun\/haste-server\r\ncd haste-server\r\nmv * \/mnt\/server\r\ncd ..\r\nrm -rf haste-server\r\nnpm install\r\n\r\nexit 0", + "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y git curl\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\ngit clone https:\/\/github.com\/toptal\/haste-server\r\ncd haste-server\r\nmv * \/mnt\/server\r\ncd ..\r\nrm -rf haste-server\r\nnpm install\r\n\r\nexit 0", "container": "node:12-buster-slim", "entrypoint": "bash" } From 398478cedac82064a06b9960c15e1519b693ae78 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Tue, 11 Jan 2022 16:09:26 +0200 Subject: [PATCH 0318/1001] fix(magma): version detection for latest Add check for latest `[[ "${MC_VERSION}" == "latest" ]]`. Previously, it was only checking for exact versions or empty value, and I completely forgot to test latest. Resolves #1516 --- game_eggs/minecraft/java/magma/egg-magma.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/minecraft/java/magma/egg-magma.json b/game_eggs/minecraft/java/magma/egg-magma.json index b39b27fc..527dc9b7 100644 --- a/game_eggs/minecraft/java/magma/egg-magma.json +++ b/game_eggs/minecraft/java/magma/egg-magma.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-12-17T11:15:48+00:00", + "exported_at": "2022-01-11T09:07:47-05:00", "name": "Magma", "author": "support@pterodactyl.io", "description": "Magma is most powerful Forge server providing you with Forge mods and Bukkit Plugins using Spigot and Paper for Performance Optimization and Stability.", @@ -27,7 +27,7 @@ }, "scripts": { "installation": { - "script": "apt update\r\napt install -y curl jq\r\n\r\nif [[ ! -d \/mnt\/server ]]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\/\r\n\r\n# get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/resources\/magma\/1.16.5\/${BRANCH}\/latest\")\r\nOLD_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/resources\/magma\/1.12\/${BRANCH}\/latest\")\r\n\r\nif [[ -z \"${MC_VERSION}\" ]] || [[ \"${MC_VERSION}\" == \"latest\" ]]; then\r\n echo -e \"Version not set. Defaulting to latest\"\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i installer.jar)\r\n\r\nelif [[ $MC_VERSION =~ ^1\\.(16|17|18|19|20|21|22|23) ]]; then\r\n CUSTOM_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/resources\/magma\/${MC_VERSION}\/${BRANCH}\/latest\")\r\n DOWNLOAD_LINK=$(echo ${CUSTOM_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i installer.jar)\r\nelif [[ \"${MC_VERSION}\" == \"1.12\" ]]; then\r\n CUSTOM_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/resources\/magma\/1.12\/${BRANCH}\/latest\")\r\n DOWNLOAD_LINK=$(echo ${OLD_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i server.jar)\r\nelse\r\n # Try to locate version by exact tag name. This will most likely always fail, because the tag names are in a weird format. Leaving it here just in case someone wants to fetch exact tag releases.\r\n VERSION_CHECK=$(echo ${OLD_JSON} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.[] | select(.tag_name==$MC_VERSION) | .tag_name')\r\n if [[ \"${MC_VERSION}\" == \"${VERSION_CHECK}\" ]]; then\r\n DOWNLOAD_LINK=$(echo ${OLD_JSON} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.[] | select(.tag_name==$MC_VERSION) | .assets[].browser_download_url' | grep -i installer.jar)\r\n else\r\n echo -e \"Specified ${MC_VERSION} version not found. Defaulting to latest\"\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\n# validate download link\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then\r\n echo -e \"Validating downlaod link\"\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_LINK}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_LINK}\r\n else\r\n echo -e \"Download URL ${DOWNLOAD_LINK} is invalid. Terminating install.\"\r\n exit 2\r\n fi\r\nfi\r\n\r\nfunction downloadMagma {\r\n echo -e \"running: curl -sSL -o installer.jar ${DOWNLOAD_LINK}\"\r\n curl -sSL -o installer.jar -sSL ${DOWNLOAD_LINK}\r\n}\r\n\r\nif [[ $MC_VERSION =~ ^1\\.(16|17|18|19|20|21|22|23) ]] || [[ -z \"${MC_VERSION}\" ]]; then\r\n downloadMagma\r\n echo -e \"1.16.5 or newer version detected. Running installer\"\r\n java -jar installer.jar --installServer || { echo -e \"install failed\" exit 4; }\r\n mv forge-*.jar $SERVER_JARFILE\r\n echo -e \"Deleting installer.jar file.\\n\"\r\n rm -rf *installer.jar\r\nelse\r\n downloadMagma\r\n echo -e \"Older magma version detected. Skipping installer\"\r\n mv installer.jar $SERVER_JARFILE\r\nfi\r\n\r\necho -e \"Install Complete\"", + "script": "apt update\r\napt install -y curl jq\r\n\r\nif [[ ! -d \/mnt\/server ]]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\/\r\n\r\n# get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/resources\/magma\/1.16.5\/${BRANCH}\/latest\")\r\nOLD_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/resources\/magma\/1.12\/${BRANCH}\/latest\")\r\n\r\nif [[ -z \"${MC_VERSION}\" ]] || [[ \"${MC_VERSION}\" == \"latest\" ]]; then\r\n echo -e \"Version not set. Defaulting to latest\"\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i installer.jar)\r\n\r\nelif [[ $MC_VERSION =~ ^1\\.(16|17|18|19|20|21|22|23) ]]; then\r\n CUSTOM_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/resources\/magma\/${MC_VERSION}\/${BRANCH}\/latest\")\r\n DOWNLOAD_LINK=$(echo ${CUSTOM_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i installer.jar)\r\nelif [[ \"${MC_VERSION}\" == \"1.12\" ]]; then\r\n CUSTOM_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/resources\/magma\/1.12\/${BRANCH}\/latest\")\r\n DOWNLOAD_LINK=$(echo ${OLD_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i server.jar)\r\nelse\r\n # Try to locate version by exact tag name. This will most likely always fail, because the tag names are in a weird format. Leaving it here just in case someone wants to fetch exact tag releases.\r\n VERSION_CHECK=$(echo ${OLD_JSON} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.[] | select(.tag_name==$MC_VERSION) | .tag_name')\r\n if [[ \"${MC_VERSION}\" == \"${VERSION_CHECK}\" ]]; then\r\n DOWNLOAD_LINK=$(echo ${OLD_JSON} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.[] | select(.tag_name==$MC_VERSION) | .assets[].browser_download_url' | grep -i installer.jar)\r\n else\r\n echo -e \"Specified ${MC_VERSION} version not found. Defaulting to latest\"\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\n# validate download link\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then\r\n echo -e \"Validating downlaod link\"\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_LINK}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_LINK}\r\n else\r\n echo -e \"Download URL ${DOWNLOAD_LINK} is invalid. Terminating install.\"\r\n exit 2\r\n fi\r\nfi\r\n\r\nfunction downloadMagma {\r\n echo -e \"running: curl -sSL -o installer.jar ${DOWNLOAD_LINK}\"\r\n curl -sSL -o installer.jar -sSL ${DOWNLOAD_LINK}\r\n}\r\n\r\nif [[ $MC_VERSION =~ ^1\\.(16|17|18|19|20|21|22|23) ]] || [[ -z \"${MC_VERSION}\" ]] || [[ \"${MC_VERSION}\" == \"latest\" ]] ; then\r\n downloadMagma\r\n echo -e \"1.16.5 or newer version detected. Running installer\"\r\n java -jar installer.jar --installServer || { echo -e \"install failed\" exit 4; }\r\n mv forge-*.jar $SERVER_JARFILE\r\n echo -e \"Deleting installer.jar file.\\n\"\r\n rm -rf *installer.jar\r\nelse\r\n downloadMagma\r\n echo -e \"Older magma version detected. Skipping installer\"\r\n mv installer.jar $SERVER_JARFILE\r\nfi\r\n\r\necho -e \"Install Complete\"", "container": "openjdk:8-jdk-slim", "entrypoint": "bash" } From a54784311b4340853457a640e69d28bf1f44e72c Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Tue, 11 Jan 2022 16:28:20 +0200 Subject: [PATCH 0319/1001] fix(redm): version fetching and use changelogs for latest Fixes version fetching due to it trying to match invalid href tag Fixes defaulting to latest if invalid version is provided Change latest recommended build fetching to use their changelogs resolves #1515 --- game_eggs/rdr/redm/egg-red-m.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/rdr/redm/egg-red-m.json b/game_eggs/rdr/redm/egg-red-m.json index 9bfeef23..00ae8338 100644 --- a/game_eggs/rdr/redm/egg-red-m.json +++ b/game_eggs/rdr/redm/egg-red-m.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-07-02T04:16:45+03:00", + "exported_at": "2022-01-11T09:25:22-05:00", "name": "RedM", "author": "parker@parkervcp.com", "description": "A new RedM egg for the latest builds due to recent changes in RedM", @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# CFx Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add openssl tar xz curl wget git file --no-cache\r\n\r\nmkdir -p \/mnt\/server\/resources \/mnt\/server\/logs\/\r\n\r\ncd \/mnt\/server\r\n\r\necho \"updating citizenfx resource files\"\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/tmp\r\ncp -Rf \/tmp\/resources\/* resources\/ \r\n\r\nRELEASE_PAGE=$(curl -sSL https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/)\r\n\r\nif [ \"${CFX_VERSION}\" == \"latest\" ] || [ -z ${CFX_VERSION} ] ; then\r\n LATEST_RECOMMENDED=$(echo -e \"${RELEASE_PAGE}\" | grep \"LATEST RECOMMENDED\" -B1 | grep -Eo 'href=\".*\/*.tar.xz\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | sed 's\/\\.\\\/\/\/1')\r\n DOWNLOAD_LINK=$(echo https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${LATEST_RECOMMENDED})\r\nelse\r\n VERSION_LINK=$(echo -e \"${RELEASE_PAGE}\" | grep -Eo 'href=\".*\/*.tar.xz\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | sed 's\/\\.\\\/\/\/1' | grep ${CFX_VERSION})\r\n if [ \"${VERSION_LINK}\" == \"\" ]; then\r\n echo -e \"defaulting to latest as the version requested was invalid.\"\r\n else\r\n DOWNLOAD_LINK=$(echo https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${VERSION_LINK})\r\n fi\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else\r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\necho -e \"Running curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\"\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho \"Extracting fivem files\"\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"XZ\" ]; then\r\n tar xvf ${DOWNLOAD_LINK##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exeting\"\r\n exit 2 \r\nfi\r\n\r\nrm -rf ${DOWNLOAD_LINK##*\/} run.sh\r\n\r\nif [ -e server.cfg ]; then\r\n echo \"server config file exists\"\r\nelse\r\n echo \"Downloading default fivem config\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/gta\/fivem\/server.cfg >> server.cfg\r\nfi\r\n\r\necho \"install complete\"", + "script": "#!\/bin\/ash\r\n# CFx Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add openssl tar xz curl wget git file --no-cache jq\r\n\r\nmkdir -p \/mnt\/server\/resources \/mnt\/server\/logs\/\r\n\r\ncd \/mnt\/server\r\n\r\necho \"updating citizenfx resource files\"\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/tmp\r\ncp -Rf \/tmp\/resources\/* resources\/ \r\n\r\nRELEASE_PAGE=$(curl -sSL https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/)\r\n\r\nif [[ \"${CFX_VERSION}\" == \"latest\" ]] || [[ -z ${CFX_VERSION} ]] ; then\r\n\tRELEASE_PAGE=$(curl -sSL https:\/\/changelogs-live.fivem.net\/api\/changelog\/versions\/linux\/server)\r\n\tDOWNLOAD_LINK=$(echo $RELEASE_PAGE | jq -r '.latest_download')\r\nelse\r\n VERSION_LINK=$(echo -e \"${RELEASE_PAGE}\" | grep -Eo '\".*\/*.tar.xz\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | sed 's\/\\.\\\/\/\/1' | grep ${CFX_VERSION})\r\n if [[ \"${VERSION_LINK}\" == \"\" ]]; then\r\n echo -e \"defaulting to latest as the version requested was invalid.\"\r\n RELEASE_PAGE=$(curl -sSL https:\/\/changelogs-live.fivem.net\/api\/changelog\/versions\/linux\/server)\r\n\t DOWNLOAD_LINK=$(echo $RELEASE_PAGE | jq -r '.latest_download')\r\n else\r\n DOWNLOAD_LINK=$(echo https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${VERSION_LINK})\r\n fi\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else\r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\necho -e \"Running curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\"\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho \"Extracting fivem files\"\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"XZ\" ]; then\r\n tar xvf ${DOWNLOAD_LINK##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exiting\"\r\n exit 2 \r\nfi\r\n\r\nrm -rf ${DOWNLOAD_LINK##*\/} run.sh\r\n\r\nif [ -e server.cfg ]; then\r\n echo \"server config file exists\"\r\nelse\r\n echo \"Downloading default fivem config\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/gta\/fivem\/server.cfg >> server.cfg\r\nfi\r\n\r\necho \"install complete\"", "container": "alpine:3.10", "entrypoint": "ash" } @@ -66,7 +66,7 @@ }, { "name": "CFX version", - "description": "The CFX Server version that is to be installed.\r\n\r\nan example is `1383-e5ea040353ce1b8bc86e37982bf5d888938e3096`\r\n\r\nYou can the latest version from here - https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/", + "description": "The CFX Server version that is to be installed. Invalid versions will default to latest.\r\n\r\nan example is `1383-e5ea040353ce1b8bc86e37982bf5d888938e3096`\r\n\r\nYou can the latest version from here - https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/", "env_variable": "CFX_VERSION", "default_value": "latest", "user_viewable": true, From a00f7564955aaed8e638ba8cbc08e2d66232d66b Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Tue, 11 Jan 2022 17:02:38 +0200 Subject: [PATCH 0320/1001] chore: cleanup the install script --- game_eggs/rdr/redm/egg-red-m.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/rdr/redm/egg-red-m.json b/game_eggs/rdr/redm/egg-red-m.json index 00ae8338..656ebe77 100644 --- a/game_eggs/rdr/redm/egg-red-m.json +++ b/game_eggs/rdr/redm/egg-red-m.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2022-01-11T09:25:22-05:00", + "exported_at": "2022-01-11T10:01:29-05:00", "name": "RedM", "author": "parker@parkervcp.com", "description": "A new RedM egg for the latest builds due to recent changes in RedM", @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# CFx Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add openssl tar xz curl wget git file --no-cache jq\r\n\r\nmkdir -p \/mnt\/server\/resources \/mnt\/server\/logs\/\r\n\r\ncd \/mnt\/server\r\n\r\necho \"updating citizenfx resource files\"\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/tmp\r\ncp -Rf \/tmp\/resources\/* resources\/ \r\n\r\nRELEASE_PAGE=$(curl -sSL https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/)\r\n\r\nif [[ \"${CFX_VERSION}\" == \"latest\" ]] || [[ -z ${CFX_VERSION} ]] ; then\r\n\tRELEASE_PAGE=$(curl -sSL https:\/\/changelogs-live.fivem.net\/api\/changelog\/versions\/linux\/server)\r\n\tDOWNLOAD_LINK=$(echo $RELEASE_PAGE | jq -r '.latest_download')\r\nelse\r\n VERSION_LINK=$(echo -e \"${RELEASE_PAGE}\" | grep -Eo '\".*\/*.tar.xz\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | sed 's\/\\.\\\/\/\/1' | grep ${CFX_VERSION})\r\n if [[ \"${VERSION_LINK}\" == \"\" ]]; then\r\n echo -e \"defaulting to latest as the version requested was invalid.\"\r\n RELEASE_PAGE=$(curl -sSL https:\/\/changelogs-live.fivem.net\/api\/changelog\/versions\/linux\/server)\r\n\t DOWNLOAD_LINK=$(echo $RELEASE_PAGE | jq -r '.latest_download')\r\n else\r\n DOWNLOAD_LINK=$(echo https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${VERSION_LINK})\r\n fi\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else\r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\necho -e \"Running curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\"\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho \"Extracting fivem files\"\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"XZ\" ]; then\r\n tar xvf ${DOWNLOAD_LINK##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exiting\"\r\n exit 2 \r\nfi\r\n\r\nrm -rf ${DOWNLOAD_LINK##*\/} run.sh\r\n\r\nif [ -e server.cfg ]; then\r\n echo \"server config file exists\"\r\nelse\r\n echo \"Downloading default fivem config\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/gta\/fivem\/server.cfg >> server.cfg\r\nfi\r\n\r\necho \"install complete\"", + "script": "#!\/bin\/ash\r\n# CFx Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add openssl tar xz curl wget git file --no-cache jq\r\n\r\nmkdir -p \/mnt\/server\/resources \/mnt\/server\/logs\/\r\n\r\ncd \/mnt\/server\r\n\r\necho \"updating citizenfx resource files\"\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/tmp\r\ncp -Rf \/tmp\/resources\/* resources\/\r\n\r\nRELEASE_PAGE=$(curl -sSL https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/)\r\nCHANGELOGS_PAGE=$(curl -sSL https:\/\/changelogs-live.fivem.net\/api\/changelog\/versions\/linux\/server)\r\n\r\nif [[ \"${CFX_VERSION}\" == \"latest\" ]] || [[ -z ${CFX_VERSION} ]]; then\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.latest_download')\r\nelse\r\n VERSION_LINK=$(echo -e \"${RELEASE_PAGE}\" | grep -Eo '\".*\/*.tar.xz\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | sed 's\/\\.\\\/\/\/1' | grep ${CFX_VERSION})\r\n if [[ \"${VERSION_LINK}\" == \"\" ]]; then\r\n echo -e \"defaulting to latest as the version requested was invalid.\"\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.latest_download')\r\n else\r\n DOWNLOAD_LINK=$(echo https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${VERSION_LINK})\r\n fi\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else\r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\necho -e \"Running curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\"\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho \"Extracting fivem files\"\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"XZ\" ]; then\r\n tar xvf ${DOWNLOAD_LINK##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exiting\"\r\n exit 2\r\nfi\r\n\r\nrm -rf ${DOWNLOAD_LINK##*\/} run.sh\r\n\r\nif [ -e server.cfg ]; then\r\n echo \"server config file exists\"\r\nelse\r\n echo \"Downloading default fivem config\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/gta\/fivem\/server.cfg >>server.cfg\r\nfi\r\n\r\necho \"install complete\"", "container": "alpine:3.10", "entrypoint": "ash" } From 88426265fa964ec337099f3dd093bc147eec3355 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Tue, 11 Jan 2022 16:15:19 +0100 Subject: [PATCH 0321/1001] add/Craftopia --- README.md | 1 + game_eggs/README.md | 5 +- game_eggs/steamcmd_servers/README.md | 5 +- .../steamcmd_servers/craftopia/README.md | 11 ++++ .../craftopia/egg-craftopia.json | 59 +++++++++++++++++++ 5 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 game_eggs/steamcmd_servers/craftopia/README.md create mode 100644 game_eggs/steamcmd_servers/craftopia/egg-craftopia.json diff --git a/README.md b/README.md index 3747d4a3..14ad9405 100644 --- a/README.md +++ b/README.md @@ -174,6 +174,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Barotrauma](game_eggs/steamcmd_servers/barotrauma) * [Citadel: Forged with Fire](game_eggs/steamcmd_servers/citadel) * [Conan Exiles](game_eggs/steamcmd_servers/conan_exiles) +* [Craftopia](game_eggs/steamcmd_servers/craftopia) * [Cryofall](game_eggs/steamcmd_servers/cryofall) * [Don't Starve Together](game_eggs/steamcmd_servers/dont_starve) * [ECO](game_eggs/steamcmd_servers/eco) diff --git a/game_eggs/README.md b/game_eggs/README.md index 8516677e..34766b4d 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -10,8 +10,6 @@ [ClassiCube](game_eggs/classicube) * [MCGalaxy](game_eggs/classicube/mcgalaxy) -[Cryofall](cryofall/cryofall) - [Call of Duty 4X](cod/cod4x) [ET Legacy](enemy_territory/etlegacy) @@ -103,6 +101,8 @@ * [Barotrauma](steamcmd_servers/barotrauma) * [Citadel: Forged with Fire](steamcmd_servers/citadel) * [Conan Exiles](steamcmd_servers/conan_exiles) +* [Craftopia](steamcmd_servers/craftopia) +* [CryoFall](steamcmd_servers/cryofall) * [Don't Starve Together](steamcmd_servers/dont_starve) * [ECO](steamcmd_servers/eco) * [Fistful of Frags](steamcmd_servers/fof) @@ -128,6 +128,7 @@ * [Satisfactory](steamcmd_servers/satisfactory) * [SCP: Secret Laboratory](steamcmd_servers/scpsl) * [dedicated](steamcmd_servers/scpsl/dedicated) + * [exiled](steamcmd_servers/scpsl/exiled) * [multiadmin](steamcmd_servers/scpsl/multiadmin) * [Soldat](steamcmd_servers/soldat) * [Space Engineers](steamcmd_servers/space_engineers) diff --git a/game_eggs/steamcmd_servers/README.md b/game_eggs/steamcmd_servers/README.md index f65d36e1..da261d9d 100644 --- a/game_eggs/steamcmd_servers/README.md +++ b/game_eggs/steamcmd_servers/README.md @@ -26,8 +26,11 @@ This is a collection of servers that use SteamCMD to install. ## Conan Exiles [Conan Exiles](conan_exiles) +## Craftopia +[Craftopia](craftopia) + ## CryoFall -* [Cryofall](cryofall) +[Cryofall](cryofall) ## Don't Starve Together [Don't Starve Together](dont_starve) diff --git a/game_eggs/steamcmd_servers/craftopia/README.md b/game_eggs/steamcmd_servers/craftopia/README.md new file mode 100644 index 00000000..5bf1200a --- /dev/null +++ b/game_eggs/steamcmd_servers/craftopia/README.md @@ -0,0 +1,11 @@ +# Craftopia + +Craftopia is the brand new crafting game we made by combining excellent features of various existing crafting games. + +## Server Ports + +Craftopia requires 1 port to run. + +| Port | default | +|-------------|---------| +| Game | 27015 | diff --git a/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json b/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json new file mode 100644 index 00000000..f1fd8187 --- /dev/null +++ b/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json @@ -0,0 +1,59 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2022-01-11T16:08:26+01:00", + "name": "Craftopia", + "author": "info@goover.de", + "description": "Craftopia is the brand new multiplayer survival action game made in Japan. We combined many features we find enjoyable, such as hunting, farming, hack-and-slash, building, automation to develop this game.", + "features": null, + "images": [ + "ghcr.io\/parkervcp\/games:source" + ], + "file_denylist": [], + "startup": ".\/Craftopia.x86_64", + "config": { + "files": "{\r\n \"ServerSetting.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"name=\": \"name={{server.build.env.WORLD_NAME}}\",\r\n \"port=\": \"port={{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"World is loaded!\"\r\n}", + "logs": "{}", + "stop": "^^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n#SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n \r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", + "container": "ghcr.io\/parkervcp\/installers:debian", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "SRCDS_APPID", + "description": "", + "env_variable": "SRCDS_APPID", + "default_value": "1670340", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:20" + }, + { + "name": "Auto Update", + "description": "", + "env_variable": "AUTO_UPDATE", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + }, + { + "name": "World Name", + "description": "", + "env_variable": "WORLD_NAME", + "default_value": "Pterodactyl Server", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:50" + } + ] +} \ No newline at end of file From cac4388a34c4e519f818adfccc390ae13d2f25a1 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Tue, 11 Jan 2022 17:18:12 +0200 Subject: [PATCH 0322/1001] feat(fivem): default to latest on invalid versions and use changelogs for latest Change latest recommended build fetching to use their changelogs page and default to latest when invalid version is provided. --- game_eggs/gta/fivem/egg-five-m.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/gta/fivem/egg-five-m.json b/game_eggs/gta/fivem/egg-five-m.json index 70efae68..efed8314 100644 --- a/game_eggs/gta/fivem/egg-five-m.json +++ b/game_eggs/gta/fivem/egg-five-m.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-07-02T03:50:53+03:00", + "exported_at": "2022-01-11T10:14:56-05:00", "name": "FiveM", "author": "parker@parkervcp.com", "description": "A new FiveM egg for the latest builds due to recent changes in FiveM", @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# FiveM Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update -y\r\napt install -y tar xz-utils curl git file\r\n\r\nmkdir -p \/mnt\/server\/resources\r\n\r\ncd \/mnt\/server\r\n\r\necho \"updating citizenfx resource files\"\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/tmp\r\ncp -Rf \/tmp\/resources\/* resources\/ \r\n\r\nRELEASE_PAGE=$(curl -sSL https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/)\r\n\r\nif [ \"${FIVEM_VERSION}\" == \"latest\" ] || [ -z ${FIVEM_VERSION} ] ; then\r\n LATEST_RECOMMENDED=$(echo -e \"${RELEASE_PAGE}\" | grep \"LATEST RECOMMENDED\" -B1 | grep -Eo '\".*\/*.tar.xz\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | sed 's\/\\.\\\/\/\/1' | grep -P '\\d{4}-\\S{40}\\\/fx\\.tar\\.xz')\r\n DOWNLOAD_LINK=$(echo https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${LATEST_RECOMMENDED})\r\nelse\r\n VERSION_LINK=$(echo -e \"${RELEASE_PAGE}\" | grep -Eo 'href=\".*\/*.tar.xz\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | sed 's\/\\.\\\/\/\/1' | grep ${FIVEM_VERSION})\r\n if [ \"${VERSION_LINK}\" == \"\" ]; then\r\n echo -e \"defaulting to latest as the version requested was invalid.\"\r\n else\r\n DOWNLOAD_LINK=$(echo https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${VERSION_LINK})\r\n fi\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else\r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\necho -e \"Running curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\"\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho \"Extracting fivem files\"\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"XZ\" ]; then\r\n tar xvf ${DOWNLOAD_LINK##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exiting\"\r\n exit 2 \r\nfi\r\n\r\nrm -rf ${DOWNLOAD_LINK##*\/} run.sh\r\n\r\nif [ -e server.cfg ]; then\r\n echo \"server config file exists\"\r\nelse\r\n echo \"Downloading default fivem config\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/gta\/fivem\/server.cfg >> server.cfg\r\nfi\r\n\r\nmkdir logs\/\r\n\r\necho \"install complete\"", + "script": "#!\/bin\/ash\r\n# FiveM Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update -y\r\napt install -y tar xz-utils curl git file jq\r\n\r\nmkdir -p \/mnt\/server\/resources\r\n\r\ncd \/mnt\/server\r\n\r\necho \"updating citizenfx resource files\"\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/tmp\r\ncp -Rf \/tmp\/resources\/* resources\/\r\n\r\nRELEASE_PAGE=$(curl -sSL https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/)\r\nCHANGELOGS_PAGE=$(curl -sSL https:\/\/changelogs-live.fivem.net\/api\/changelog\/versions\/linux\/server)\r\n\r\nif [[ \"${FIVEM_VERSION}\" == \"latest\" ]] || [[ -z ${FIVEM_VERSION} ]]; then\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.latest_download')\r\nelse\r\n VERSION_LINK=$(echo -e \"${RELEASE_PAGE}\" | grep -Eo '\".*\/*.tar.xz\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | sed 's\/\\.\\\/\/\/1' | grep ${CFX_VERSION})\r\n if [[ \"${VERSION_LINK}\" == \"\" ]]; then\r\n echo -e \"defaulting to latest as the version requested was invalid.\"\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.latest_download')\r\n else\r\n DOWNLOAD_LINK=$(echo https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${VERSION_LINK})\r\n fi\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else\r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\necho -e \"Running curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\"\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho \"Extracting fivem files\"\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"XZ\" ]; then\r\n tar xvf ${DOWNLOAD_LINK##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exiting\"\r\n exit 2\r\nfi\r\n\r\nrm -rf ${DOWNLOAD_LINK##*\/} run.sh\r\n\r\nif [ -e server.cfg ]; then\r\n echo \"Skipping downloading default server config file as one already exists\"\r\nelse\r\n echo \"Downloading default fivem config\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/gta\/fivem\/server.cfg >>server.cfg\r\nfi\r\n\r\nmkdir -p logs\/\r\n\r\necho \"install complete\"", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -57,7 +57,7 @@ }, { "name": "fivem version", - "description": "The fivem version that is to be installed.\r\n\r\nan example is `1383-e5ea040353ce1b8bc86e37982bf5d888938e3096`\r\n\r\nYou can get the latest version from here - https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/", + "description": "The fivem version that is to be installed. Invalid versions will default to latest.\r\n\r\nAn example is `1383-e5ea040353ce1b8bc86e37982bf5d888938e3096`\r\n\r\nYou can get the latest version from here - https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/", "env_variable": "FIVEM_VERSION", "default_value": "latest", "user_viewable": true, From e7378cb54256ac0d8ec8c89f2a991f37b0f7d1c0 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Tue, 11 Jan 2022 20:52:48 -0800 Subject: [PATCH 0323/1001] Initial commit - Updated README's - Added OpenRCT2 directory and related files. --- README.md | 1 + game_eggs/README.md | 1 + game_eggs/tycoon_games/README.md | 9 + game_eggs/tycoon_games/openrct2/README.md | 87 ++++++++ .../tycoon_games/openrct2/egg-openrct2.json | 194 ++++++++++++++++++ game_eggs/tycoon_games/openrct2/save.sv6 | Bin 0 -> 320751 bytes 6 files changed, 292 insertions(+) create mode 100644 game_eggs/tycoon_games/README.md create mode 100644 game_eggs/tycoon_games/openrct2/README.md create mode 100644 game_eggs/tycoon_games/openrct2/egg-openrct2.json create mode 100644 game_eggs/tycoon_games/openrct2/save.sv6 diff --git a/README.md b/README.md index 914202d6..05a44857 100644 --- a/README.md +++ b/README.md @@ -228,6 +228,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [TShock](game_eggs/terraria/tshock) [Tycoon Games](game_eggs/tycoon_games) +* [OpenRCT2](game_eggs/tycoon_games/openrct2) * [OpenTTD](game_eggs/tycoon_games/openttd) [Veloren](game_eggs/veloren) diff --git a/game_eggs/README.md b/game_eggs/README.md index f13204fb..5d23a69d 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -155,6 +155,7 @@ * [TShock](terraria/tshock) [Tycoon Games](tycoon_games) +* [OpenRCT2](tycoon_games/openrct2) * [OpenTTD](tycoon_games/openttd) [Unreal Engine](unreal_engine) diff --git a/game_eggs/tycoon_games/README.md b/game_eggs/tycoon_games/README.md new file mode 100644 index 00000000..cee33a2c --- /dev/null +++ b/game_eggs/tycoon_games/README.md @@ -0,0 +1,9 @@ +# Tycoon Game Servers + +This is a collection of Tycoon game servers, that are typically open-source re-implementations of classic Tycoon titles. + +## Roller Coaster Tycoon 2 +[OpenRCT2](openrct2) + +## Transport Tycoon Deluxe +[OpenTTD](openttd) diff --git a/game_eggs/tycoon_games/openrct2/README.md b/game_eggs/tycoon_games/openrct2/README.md new file mode 100644 index 00000000..97b75edc --- /dev/null +++ b/game_eggs/tycoon_games/openrct2/README.md @@ -0,0 +1,87 @@ +# OpenRCT2 + +___ +### Authors / Contributors + + +
+ + + + + +
+ +
Red-Thirten + +
+ 💻 + 🔨 + 		+ +
parkervcp + +
+ 💻 + 💡 + 		+ +
janisozaur + +
+ 💻 + 💡 +
+ + + +___ +### Game Description +From OpenRCT2's [Website](https://openrct2.org/): +> OpenRCT2 is an open-source re-implementation of RollerCoaster Tycoon 2 (RCT2), expanding the game with new features, fixing bugs and raising game limits. The gameplay revolves around building and maintaining an amusement park containing attractions, shops and facilities. The player must try to make a profit and maintain a good park reputation whilst keeping the guests happy. OpenRCT2 allows for both scenario and sandbox play. Scenarios require the player to complete a certain objective in a set time limit whilst sandbox allows the player to build a more flexible park with optionally no restrictions or finance. +___ +### Server Ports +| Port | Default (TCP) | +|---------|---------| +| Game | 11753 | + +___ +### Installation/System Requirements + +| | Minimum | +|---------|---------| +| Processor | Recent x86/64 (AMD/Intel) processor. No ARM support. | +| RAM | 4096 MiB | +| Storage | 80 MB | +| RCT2 Files | **Not required** | + +___ +### Save Files +Save files and autosaves are located in this directory: +``` +/home/container/ServerData/save/ +``` +If the "Load Latest Autosave" startup variable is enabled, and the `autosave/` directory exists, the server will load the latest autosave instead of the specified Save File. +___ +### Console Commands +As of OpenRCT2 v0.3.5.1, entering commands via Pterodactyl do nothing. Hopefully this will be resolved in a future OpenRCT2 update. +___ +### Becoming an Admin on the Server +Unfortunately, because console commands currently do not register, becoming the first admin on the server takes some steps, listed below: +1. Ensure the "Log Server Actions" startup variable is set to "true". +2. Start the server and join it with the client you want to make an admin. +3. Open `ServerData/serverlogs//.txt` and copy the SHA1 hash next to your client's username (note the username as well). +4. Then, open `ServerData/users.json`. Paste the hash into the "hash" value, and change the "name" value to your client's username. +5. Reboot the server, re-join it, and you should be an admin! + +After becoming an admin, you can use the in-game users management window to add additional admins (or groups) more easily if you wish. +___ +### Known Issues +The following are known issues that are unique to running OpenRCT2 on Pterodactyl, but likely can only be fixed by further development/updates from OpenRCT2. +- Only building from source from the `develop` branch currently yields a package that is bootable. This will no longer be true for any OpenRCT2 releases after v.0.3.5.1. +- Configuring a password on the server disallows non-admin clients from entering in a password in their client to connect; it just disconnects them. Admin clients can still join normally. +- You may rarely run into the server crashing on start due to a "Floating point exception(core dumped)" error. If this occurs to you, please help with OpenRCT2 development by doing the following: + 1. Add the following to the beginning of your server's startup command: `SEGFAULT_SIGNALS=fpe LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so ` + 2. Start the server. If it boots normally, nothing will print. If it crashes, it will print a stack trace to the console. + 3. If a crash occurs, copy the entire stack trace, and save it to a log sharing website (like [Hastebin](https://www.hastebin.com)). + 4. [Open a new Bug Report Issue with OpenRCT2](https://github.com/OpenRCT2/OpenRCT2/issues/new?assignees=&labels=bug&template=bug_report.yaml) and share your logs with them. diff --git a/game_eggs/tycoon_games/openrct2/egg-openrct2.json b/game_eggs/tycoon_games/openrct2/egg-openrct2.json new file mode 100644 index 00000000..f46484ac --- /dev/null +++ b/game_eggs/tycoon_games/openrct2/egg-openrct2.json @@ -0,0 +1,194 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2022-01-12T02:53:49+00:00", + "name": "OpenRCT2 (In Dev)", + "author": "rehlmgaming@gmail.com", + "description": "OpenRCT2 is an open-source re-implementation of RollerCoaster Tycoon 2 (RCT2), expanding the game with new features, fixing bugs and raising game limits.", + "features": null, + "images": [ + "ghcr.io\/parkervcp\/yolks:debian" + ], + "file_denylist": [], + "startup": ".\/OpenRCT2\/openrct2-cli --version && .\/OpenRCT2\/openrct2-cli host $(if [ {{LOAD_AUTOSAVE}} ] && [ -d ServerData\/save\/autosave\/ ]; then find ServerData\/save\/autosave\/ | sort -r | head -1; else printf {{SAVE_URI}}; fi) --port {{SERVER_PORT}} --user-data-path \/home\/container\/ServerData\/", + "config": { + "files": "{\r\n \"Data\/config.ini\": {\r\n \"parser\": \"ini\",\r\n \"find\": {\r\n \"general.autosave\": \"{{server.build.env.AUTOSAVE_INTERVAL}}\",\r\n \"general.autosave_amount\": \"{{server.build.env.AUTOSAVE_AMOUNT}}\",\r\n \"network.player_name\": \"\\\"{{server.build.env.SERVER_PLAYER_NAME}}\\\"\",\r\n \"network.default_port\": \"{{server.build.default.port}}\",\r\n \"network.default_password\": \"\\\"{{server.build.env.SERVER_PASSWORD}}\\\"\",\r\n \"network.advertise\": \"{{server.build.env.SERVER_ADVERTISE}}\",\r\n \"network.maxplayers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"network.server_name\": \"\\\"{{server.build.env.SERVER_NAME}}\\\"\",\r\n \"network.server_description\": \"\\\"{{server.build.env.SERVER_DESCRIPTION}}\\\"\",\r\n \"network.server_greeting\": \"\\\"{{server.build.env.SERVER_GREETING}}\\\"\",\r\n \"network.provider_name\": \"\\\"{{server.build.env.PROVIDER_NAME}}\\\"\",\r\n \"network.provider_email\": \"\\\"{{server.build.env.PROVIDER_EMAIL}}\\\"\",\r\n \"network.provider_website\": \"\\\"{{server.build.env.PROVIDER_WEBSITE}}\\\"\",\r\n \"network.log_chat\": \"{{server.build.env.LOG_CHAT}}\",\r\n \"network.log_server_actions\": \"{{server.build.env.LOG_SERVER_ACTIONS}}\",\r\n \"network.pause_server_if_no_clients\": \"{{server.build.env.PAUSE_NO_CLIENTS}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Listening for clients on\"\r\n}", + "logs": "{}", + "stop": "^C^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl OpenRCT2 Egg - egg-openrct2.json\r\n## Authors: David Wolfe (Red-Thirten), parkervcp\r\n## Date: 2022\/01\/11\r\n## License: MIT License\r\n\r\nGITHUB_PACKAGE=\"OpenRCT2\/OpenRCT2\"\r\nMATCH=\"linux-bullseye-x86_64\"\r\n#DEFAULT_SAVE=\"https:\/\/github.com\/parkervcp\/eggs\/tree\/master\/game_eggs\/tycoon_games\/openrct2\/save.sv6\"\r\nDEFAULT_SAVE=\"https:\/\/github.com\/parkervcp\/eggs\/tree\/master\/game_eggs\/tycoon_games\/openrct2\/save.sv6\"\r\n\r\n## OpenRCT Install\r\napt -y update\r\n[ ! -d \/mnt\/server ] && mkdir \/mnt\/server\r\n# Remove existing installation if present\r\n[ -d \/mnt\/server\/OpenRCT2 ] && rm -rf \/mnt\/server\/OpenRCT2\r\n\r\n# Determine if installing from source or from release\r\nif [ \"${VERSION}\" == \"develop\" ]; then\r\n echo -e \"\\nInstalling\/Updating OpenRCT2 from source...\\n\"\r\n\t# Get required packages\r\n apt -y install curl git make cmake gcc build-essential libicu-dev pkg-config libcurl4-openssl-dev libcrypto++-dev libpng-dev libssl-dev libzip-dev duktape-dev nlohmann-json3-dev\r\n cd \/tmp\r\n\t# Clone the branch and check if successful\r\n\tgit clone --branch ${VERSION} https:\/\/github.com\/${GITHUB_PACKAGE} && cd OpenRCT2 || { echo -e '\\nFailed to clone \"${VERSION}\" branch from https:\/\/github.com\/${GITHUB_PACKAGE}\\n' && exit 1 }\r\n\tmkdir build && cd build\r\n\t# Prepare CMake files for a lightweight and CLI-only build of OpenRCT2, using the appropriate flags\r\n\tcmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DPORTABLE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_FLAGS=\"-g -gz\" -DDISABLE_TTF=ON -DDISABLE_GOOGLE_BENCHMARK=ON -DDISABLE_DISCORD_RPC=ON -DDISABLE_GUI=ON\r\n\techo -e \"\\nBuilding OpenRCT2 package from source...\\n\\tThis process can take quite some time. Grab a coffee :)\"\r\n\t# Build OpenRCT2\r\n\tDESTDIR=. make install\r\n\t# Check if build was successful\r\n\tcd usr\/local || { echo -e \"\\nFailed to successfully build OpenRCT2!\\n\" && exit 1 }\r\n\t# Make executable-ready package by moving compiled files to the correct locations\r\n\tmkdir -p \/mnt\/server\/OpenRCT2\/data\r\n\tmv bin\/* \/mnt\/server\/OpenRCT2\/\r\n\tmv share\/openrct2\/* share\/openrct2-cli\/* \/mnt\/server\/OpenRCT2\/data\/\r\n\tmv share\/doc \/mnt\/server\/OpenRCT2\/\r\n\tcd \/mnt\/server\r\n\techo -e \"\\nBuild of OpenRCT2 package complete!\"\r\nelse\r\n echo -e '\\nInstalling\/Updating OpenRCT2 from release tag \"${VERSION}\"...\\n'\r\n\t# Get required packages\r\n apt install -y curl jq\r\n cd \/mnt\/server\r\n\t# This is a simple script to use the GitHub API for release versions.\r\n\t# This requires the egg has a variable for GITHUB_PACKAGE, VERSION and MATCH (MATCH is to match the filename in some way).\r\n\t# This supports using oauth\/personal access tokens via GITHUB_USER and GITHUB_OAUTH_TOKEN (both are required).\r\n\t# If you are getting hit with GitHub API limit issues then you need to have the user and token set.\r\n\tif [ -z \"${GITHUB_USER}\" ] && [ -z \"${GITHUB_OAUTH_TOKEN}\" ] ; then\r\n\t\techo -e \"\\nUsing anonymous GitHub API call.\"\r\n\telse\r\n\t\techo -e \"\\nGitHub user and OAuth token set.\"\r\n\t\talias curl='curl -u ${GITHUB_USER}:${GITHUB_OAUTH_TOKEN} '\r\n\tfi\r\n\r\n\t# Get release info and download links\r\n\tLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\n\tRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\n\tif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n\t\tDOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\n\telse\r\n\t\tVERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n\t\tif [ \"${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n\t\t\tDOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH})\r\n\t\telse\r\n\t\t\techo -e \"\\tDefaulting to latest release...\"\r\n\t\t\tDOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n\t\tfi\r\n\tfi\r\n\t# Download and unpackage the release\r\n\tif [ curl -L ${DOWNLOAD_URL} | tar -xzv ]; then\r\n\t\techo -e \"\\nDownload of OpenRCT release successful!\"\r\n\telse\r\n\t\techo -e '\\nFailed to download release tag \"${VERSION}\" from https:\/\/github.com\/${GITHUB_PACKAGE}\\n' && exit 1\r\n\tfi\r\nfi\r\n\r\n## OpenRCT2 Setup\r\n# Setup ServerData\/save directory\r\n[ ! -d ServerData\/save ] && mkdir -p ServerData\/save\r\ncd ServerData\/save\r\n# Download default save.sv6 if missing\r\nif [ ! -f save.sv6 ]; then\r\n\techo -e \"Downloading default save.sv6 file from ${DEFAULT_SAVE}\"\r\n\tcurl -sSL ${DEFAULT_SAVE}\r\nfi\r\n\r\necho -e \"\\nOpenRCT2 Successfully Installed!\"", + "container": "debian:bullseye-slim", + "entrypoint": "\/bin\/bash" + } + }, + "variables": [ + { + "name": "Save File", + "description": "Save file (.sv4 \/ .sv6 \/ .park) to load. Can be a file path or can be a webhosted file URL. An existing save file must be specified; the server cannot generate a new scenario\/save from scratch.", + "env_variable": "SAVE_URI", + "default_value": "ServerData\/save\/save.sv6", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|min:5" + }, + { + "name": "OpenRCT2 Version", + "description": "The release tag (version) of OpenRCT2 to download and install from their official Github (ie. \"v0.3.5.1\"). Use \"latest\" to download the latest release, or \"develop\" to build from the latest source (takes longer to install but is the most up to date).", + "env_variable": "VERSION", + "default_value": "develop", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|min:1" + }, + { + "name": "Server Player Name", + "description": "The server appears as a player in the player list. This is the name it will have.", + "env_variable": "SERVER_PLAYER_NAME", + "default_value": "Server", + "user_viewable": true, + "user_editable": true, + "rules": "string|nullable" + }, + { + "name": "Server Password", + "description": "Password requested by the server for clients to connect. Admins do not have to enter password to join. Leave empty for no password.", + "env_variable": "SERVER_PASSWORD", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "string|nullable" + }, + { + "name": "Advertise Server", + "description": "If set to \"false\", the server will not be advertised in the master server list, and clients must manually connect.", + "env_variable": "SERVER_ADVERTISE", + "default_value": "true", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:true,false" + }, + { + "name": "Max Players", + "description": "Maximum players allowed to connect to the server.", + "env_variable": "MAX_PLAYERS", + "default_value": "16", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|min:0" + }, + { + "name": "Server Name", + "description": "Name of the server that appears in the server list.", + "env_variable": "SERVER_NAME", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "string|nullable" + }, + { + "name": "Server Description", + "description": "Description of the server that appears when hovering over the server in the server list.", + "env_variable": "SERVER_DESCRIPTION", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "string|nullable" + }, + { + "name": "Server Greeting", + "description": "The \"Message of the Day\" that gets sent to all clients who join.", + "env_variable": "SERVER_GREETING", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "string|nullable" + }, + { + "name": "Provider Name", + "description": "Server provider name that appears in server information window.", + "env_variable": "PROVIDER_NAME", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "string|nullable" + }, + { + "name": "Server Provider E-Mail", + "description": "Server provider e-mail that appears in server information window.", + "env_variable": "PROVIDER_EMAIL", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "string|nullable" + }, + { + "name": "Server Provider Website", + "description": "Server provider website that appears in server information window.", + "env_variable": "PROVIDER_WEBSITE", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "string|nullable" + }, + { + "name": "Log Chat", + "description": "Set to \"true\" if you would like in-game chat logged to file in Data\/chatlogs.", + "env_variable": "LOG_CHAT", + "default_value": "false", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:true,false" + }, + { + "name": "Log Server Actions", + "description": "Set to \"true\" if you would like in-game actions logged to file in Data\/serverlogs.", + "env_variable": "LOG_SERVER_ACTIONS", + "default_value": "false", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:true,false" + }, + { + "name": "Pause Server If No Clients", + "description": "Set to \"true\" to have the server pause simulation if no clients are on the server.", + "env_variable": "PAUSE_NO_CLIENTS", + "default_value": "false", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:true,false" + }, + { + "name": "Autosave Interval", + "description": "0 = Every 1 min, 1 = Every 5 min, 2 = Every 15 min, 3 = Every 30 min, 4 = Every hour, 5 = Never", + "env_variable": "AUTOSAVE_INTERVAL", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|between:0,5" + }, + { + "name": "Autosaves To Keep", + "description": "Number of autosaves to keep before rolling over and deleting the oldest one. Set to 0 to disable autosaving.", + "env_variable": "AUTOSAVE_AMOUNT", + "default_value": "10", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|min:0" + }, + { + "name": "Load Latest Autosave", + "description": "Will load the latest autosave (assuming one is present) *instead* of the Save File when the server is started. Useful for loading the latest progress of a park after a reboot. Set to \"0\" to \"lock\" progress of the park, and always load the original Save File on start up.", + "env_variable": "LOAD_AUTOSAVE", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "required|boolean" + } + ] +} \ No newline at end of file diff --git a/game_eggs/tycoon_games/openrct2/save.sv6 b/game_eggs/tycoon_games/openrct2/save.sv6 new file mode 100644 index 0000000000000000000000000000000000000000..42aa2c047f5b4b56ad683e20441942dce84a8096 GIT binary patch literal 320751 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

bhH$cEK*wdd2|-f@zC*v6h4pcV7&ZTq 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%0DT#vyc_wKgO67o6)<(*u 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 ziLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~O zu>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og# z{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>u ziLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~O zu>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og# z{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>u ziLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~O zu>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og# z{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w{w ziLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{>fUcf3jBVpJM%!{?z@ki zp9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r z3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ= z>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@ki zp9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r z3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ= z>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@ki zp9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r z3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ= z>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@ki zp9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r z3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ= z>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@ki zp9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r z3hSQ=>z@kip9<@r3hSRL>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSS) z)%vGvwf-5_KkaY*GuHX{xBl7Mt$!x0eP5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwu zu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_ z{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1; znXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwu zu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_ z{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1; znXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwu zu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_ z{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1; znXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwu zu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_ z{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1; znXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwu zu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nX>+wu>P5_{+Y1;nXvwuu>P5_ z{+Y1;nXvwuu>P5_{+Y1;*;=iCwpQz(WBs%K)<0k6vi{aTU%U0sh4s&c_0NU%&xQ48 zvwnnqWwAfA0qFYvTl;(MzuKkD22@u2g9|?&(0?{y0LOFk{`>mp!usdJ`sc#>=fe8u z!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ z`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#> z=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u z!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ z`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#> z=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u z!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ z`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#> z=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u z!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ z`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#> z=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u z!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ z`sd2}=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sZu4{`p$1e}VPS`&<8F zmCO5E|6=XdzYx~H5Z1pC*1r(epHK0w)%q9xtv|B?==%O!`+M!b+GWfJR95?g2l)Ab z{<8rCIi4Tw|25x2SpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy; z|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;* zLRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMo zSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy; z|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;* zLRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMo zSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy; z|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;* zLRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMo zSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy; z|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;* zLRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMo zSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy; z|3X;*LRkMoSpPy;|3X;*LRkMoSpPy<|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;* zLRkMoSpQweR;p@Vi;X@2x4?YCGuHoy$*M+ZV_y+Lx;OiT{A$)!K z28IuXZvfxW@L})`;X@4{4j&31X81<%VesLGkAM${Z)Et!@QvUj3?B&}0pHm0QSgo7 zBMsjKJ`z64@D}(e_$G#rhHnCIF?>^a3w*TUo54rJH#K~7_@?m94BrC28GLiYw}fvF z-@@>%;9J1AG<*zvOZZlXZw=oHKF08E;A7xh8@?@kYxp*XZwKE7zOCWg!?%TRXZQ~A z?cm!Rz9W2l_zs4Th3^30(eRz%JHp2rzB7C*d?&+qf$s$0+3;QAJHvM|d^h+m@Ldhx z9lk4kH^cXU?*`x9@Nw|n;d>aqCwve1IK%gXkAv@N_}=h6;d>dr4}359-iGfB-y6P< z;rqe&f$wYh{_uU_`x)K}-w(dO;cf8!;jM;`hquDp3~z_G!N(gu0X`nyZumraJA8uS zli(BJ6AkZxPlQi0`~dhQc!%K!!aLvx7=94^0QiB19}GVbevsjZzz>2SZ1|z@gW-o5 zei-}^_@Ra$4nGurnBkM*hrtgw{0R8r@X3ZB37-rhWjc=)mK;|xCmejNOG!%u`C4?n^1li(-7Pc-~w_=)h73_k^a z68vPtPlcZhKgICV;HSV(HGB&ERQPFzPlcZbpJMpw@G0=AhMxhS3P0WOGvTMh&oKNf z_!;ms4W9--6MmNAXT#5ePcwWvd>Z_0!_R@A4WDlKx$x=ma|}NZeh&Ox!_SAG3qQ~B z3*hI$&o}%+`1$Y)48I6|0sKP4FNR+TzsT@Q;1|I!HvCff#qdiEzYKl}{8Ga&hhGZ6 z%-0I@b;tgfHFD3t&z`k@WX^n7#CRiC$;abk z@p1AA_&9vLd?G#`pCF%vPrxV2C*u?GN%AT9Bz&@bDn1#XBAeGx1sSIruDmwtOx=8=oVehtI+1%ID*A@p$1<45sh@)P(m{J8uiejGm`KZT#bPs&f@C-GDAGx#a|wEQf78b2dHho8aE z%Fp9x@pJME_&NN%{33oHzaYPaU%)TQFXI>SOY$rDCH%7dDt;NiBEN=T!LQ1%<5%%( z@*DUy{JQ)mejUFdzlGnxZ_01uH}PBYJNPa9w)`%B8^0sJhu^{P%J1WM@q6+I_&xl- z{2_iHe;|K^KfoW#AL9@4NAf55BmA-aDgGFLB7cTI!Jo>X<4^Ht@)!6s{JH!k{v3ZH ze}%umU&>$OFY#CMH~1_3wfrsq8h;~yhrhw!%HQK}@ptkM_&fZ){3HGz{~-T_f51P= zKjR8ulR5O{D1$?Z~v0=ANWE4 z8~^Yx{0ILk|9AXf@qd&52mWvPzsvs<|9AX9gpfy{puePsQwXw>K_rP{tB#qwr{XEFO)=$m8%BJXRi$$KrAF z1UwFpmnY)!c!E3$Prwu9$#^23Bu|4U;mPu}cru;+f=G@Jx7Sc~(3#o<*Jw&w^)_XUDVR+2lF!YdO}si@LtYE7f!CDR#%toW z*Ok}D>*Dp~4e)w+eR)H?KHfmy2ycKllsCp3;*I1@@J4uJc~iVG-bCIEZ-O_KH^-ae z&EzfcW_WXXOT0PWLf#5*fwz>m##`d8Egy3GaY+ly}BE;+^DO@J@JVc~`tM-bLOG?}B%gcgMTp-Q+#+Zg_WjPrN(c zL*5JTf%la6#(Uzu#ZluyPd;*;c4@JaY& z`BZ!|K1DtapMp=7PsgX?)8sSoY4~*cOnf>%Lp}?ifzOoB#%JQQ9^3-EdPeEC9rKE6P{2w#9NlrP2?;)~=<@J0Ay`BHo_zC^wZUxF`{ zFUObS%j7HYW%zRWN_;uKLcR)Lfv=RW##iF20zD2$b--2(IZ^yUd+vGd&ZTNQi zPJBDQL%s{&f$x;>#&_boehxo_pOv4-&*JCg7w~iVdHF^BJbpob3BQ0}lwZa#;+N!C z@Jsk*`BnTfenox_zk*+tU&pWF*W@?wYxs5fP5e53Lw*atf!~zh#&6=cno z-{SA&AMkhhd-+HFJ^n%d3IBk9lz+xQ;-BPS@K5+>`B(fi{zd)^{ssS<(trF`{UZX^ zKO#{5BLdYwB2fJ!0@XhvQ2iqU)juLo{UZX^KO#{5BLdYwB2fJ!0@XhvQ2iqU)juLs z{UZX^KO#{5BLdYwB2fJ!0@XhvQ2iqU)juLo{UZX^KO#{5BLdYw;=9#9;=9#9lIkDv zyLTpcnR?AwN?rXUzhC_$1Jyq=Q2iqV)ju*&{UZa_KQd7LBLmexGEn^^Q&<0=f8ftK zGWDnZeeJT_I6MZAmB-_; zc$_=|kHh2TiFiDoAWy;*@I-kso`@&O)8I*XvOF!GjHi*O!_(kt<>~RXcsh9oJRP21 zo)J%vXOL&YGvFEJnemKxCV3V-6P{U~70--kk!QoR;92F_@vL|@c@8`qo?V_3&yMGi z=fZQ~Ipw+WoOmvI9y}MGTb>usjpvc)!}H*I<@xcvcs_XnJRhE4UJ%cZ7mydi3*ZIi zh4F%TA$bwJ5MEeb6fcYykr%^@;6>%d@uGM!c?rB2UR+)hFOHXxm%>ZnCFP~@l6Wb3 z8N3u;T3!|}jhB&^!^_}h<>m3RcsY3myc}L$UJ);kSCCi2E8rF7mGO#rC3zLR5?)ze z6|am}kypd3;8o?-@v3+=c@4Z8UR_=jua4J{*TQSyHRZMOns_aF9lRD^TV5Bhjn|Ra z!|UL6<@NEpcs+RoydGX(-Vm>kH;^~N8{iG)jq!$fBY6|N5#Ctd6mN_-kvGGe;7#St z@uqk)c?-N5-dx@iZ;rQ+x58WCE#|Xeo_H^LAG{adTizG%jrWoF!~5WU<^A!#ct807ydU0QJ`nGZ50DSS z2jBzcgYkj*Ao&n{5I$Hw6d#Nakq^U%;6vrZ@uB!I`3QU%K3qN$AC8ZZkHSabBjuy< zk@zV27T?O_&E6ld>lSrJ`o>}PmoW-C*Tw1lkti8B>5D4 z5?;8W$(@u~PU`3!s-K3zT&pN`Lv&%$TmGv%}KnfNUE9DEi&TRs<` zjn9$K!{^|0<@52m_&oUnd>%euz7U^}FOV<77vKx!i}8i{BKZ=05x!Wy6km)lkuSrS z;7jGp@um1O`3ig)zFfW%UyiSkufkX0E9I;4mG~<88hjPLTD}%vjjxff!`I+zy`Cz7b!KZ;)@oH{cuPoAHhKCixb86TVr#72k|+k#EDd;9KR}@vZna`3`&= zzFoc(-;VE)@4|QBJLS9ao%k;K9()(RTfP_Hjqj1~!}s8O<@@oy_&)god>_7Feh}Y} zACMoy58wyohw+2>A^8#f5Pn#G6hDj~ksrg4;78@h@uT=L`3d|Oeq4SMKaQV}pTbYz zC*`N{llUq58T=G}T7DKkjh~U9!_VMn<>&FU_&NCn{2YE>ei1*9UyxtIFW?vDm+_1E zCHWQn5`I~J6~ByMkzd2F;8*3>@vHbX`3?LUeqDYOzmDIK-@q!|&jC<@fQs_&xap{2qQ^{t&;9KafAdAK(w=kMW22Bl#2j5&l^I6n~6A zkw3$q;7{ex@u&DR`3w9R{#^bNe~!P9zrtVOFXgZCm-s9B8~hdiTK*P)jlYqTAHP-q z$Uyav3{?NfK=qFdRR738^^Xix|Hwe~j|^1*$Uyav3{?NfK=qFdRR738^^Xix|Hwe~ zj|^4+$Uyav3{?NfK=qFdRR738^^Xix|Hwe~j|^1*$Uyav3{?NfK=qIOZuO7+ZuO6% z`bYlmoylFMQZtrPSO2K*SO2I$^^Xcv|ENIqj|x=(s6h3P3RM57K=qFbRR5?z^^Zzj z{eS*}Kl7;6pZ5QW?EmX;5o`k@Q_clA`rAGr^)?`e^GuQGl&5)kET^OK7U@$y7G9#4=b;R$%6JQ+{KljLdeBs^K37Ei|0$kX9z@U-&ucv?K2JOiE% zPcP4ir^hqMGvOKVjPlHQMm&=|3!VwjEYFH(#2wn&;EH8=|#*4^{;YIMG^5S?=yqLTMUJNfTFNqh&OUO&%CGe8+(s)U{ zl)MaH3NI}$iNEd&qm?J@B6L-gr;Em%I<&3-2xOi}%L+$ot`a@V@f?cwfAqd;s1L?=K&S_s0jw z2jK(of%3ulKzxvV2tEiOEFX#w#)rs<;Y0AD^5OVUe3*O$J`5i&ABhjgN61IvBk+;( z(fCMwlza?63Lh;Wi;u>~$j9Mh@Uimo_*i_Ld;&fWA1|MXkH;s-C*c$DiSo(#M0}Eb z3O)&+ET4)`#;3@q;ZyLb^6B_ge42a)J`JBPpNUV$XUJ#aGw_-6+4xL+mV6FA3!g2Y zi_gaA$mij6@VWB&_*{IRd;vZWpD$mC&&Li?7Dl$k*X(@U`;w z_*#6Od;`7?UoYQ?ug5pYH{l!bjq=U-MtqZe3%&{8EZ>T6#<$3~;al*n^6mIme4Bg+ zz75|l--&O>cgT0)JMf+I-S|#?mwXSt3*Rl@i|@ww$oJuU@V)Z=_+EUU`~bcW-!DIi z@5c|w58(&!gYv`pLHv;X2!04ZEI*1L#*fI4;YaYJ^5ghX{FwX%ehfb@KZzg5PsmT< zC-9T<)A&jJl>7{S3O_ABi=W2N$j{+t@U!ys_*wj%`~rRsKQF(CpT{rAFX0#Pi}K6( zMf{Td3VsQ{EWe6h#;?e);aBjh^6U6j{F?j*eht4azlmSRZ^&=qH}ISC+xSiVmi!KW z3%@PDi{HlY$nW8I@VoN+_+9*-`~iLszb}7?-^U-wAK?%1hw{hxL;R8a3H}IwEPskW z#-GTa;ZN|V^5^(d{F(d({tSOEe~CZGU&vqKFYuT0*Z52PmHZ9<3V$tsi@(O-$lu{_ z@VD~!_*?v)`~&_De=q-tzsEnwKj9znkMhs>NBoog3;qfJEdPps#=ppa!N1^NQ~HnJ zs()0V`bPz-e^j9QM+K^XRG|7t1*(5kp!!Dzs()0V`bPz-e^j9QM+K^XRG|7t1*(5k zp!!FJs()0V`bPz-e^j9QM+K^XRG|7t1*(5kp!!Dzs()0V`bPz-e^j9QM}4>YM}4>Y zM^pWye)rDgE>oi!OR1}W^!KZObfEf22daN`p!!D#s(*B#`bP(gxaV5B&K@r~b76Ph|gJe~V-r5S4OXz%k$U0jakEv7BeR#H2jU!{ay|gU8C_ z@mM@go`A>U@$y7G9#4=b;R$%6JQ+{KljLdeBs^K37Ei|0$kX9z@U-&ucv?K2JOiE% zPcP4ir^hqMGvOKVjPlHQMm&=|3!VwjEYFH(#2wn&;EH8=|#*4^{;YIMG^5S?=yqLTMUJNfTFNqh&OUO&%CGe8+(s)U{ zl)MaH3NI}$iNEd&qm?J@B6L-gr;Em%I<&3-2xOi}%L+$ot`a@V@f?cwfAqd;s1L?=K&S_s0jw z2jK(of%3ulKzxvV2tEiOEFX#w#)rs<;Y0AD^5OVUe3*O$J`5i&ABhjgN61IvBk+;( z(fCMwlza?63Lh;Wi;u>~$j9Mh@Uimo_*i_Ld;&fWA1|MXkH;s-C*c$DiSo(#M0}Eb z3O)&+ET4)`#;3@q;ZyLb^6B_ge42a)J`JBPpNUV$XUJ#aGw_-6+4xL+mV6FA3!g2Y zi_gaA$mij6@VWB&_*{IRd;vZWpD$mC&&Li?7Dl$k*X(@U`;w z_*#6Od;`7?UoYQ?ug5pYH{l!bjq=U-MtqZe3%&{8EZ>T6#<$3~;al*n^6mIme4Bg+ zz75|l--&O>cgT0)JMf+I-S|#?mwXSt3*Rl@i|@ww$oJuU@V)Z=_+EUU`~bcW-!DIi z@5c|w58(&!gYv`pLHv;X2!04ZEI*1L#*fI4;YaYJ^5ghX{FwX%ehfb@KZzg5PsmT< zC-9T<)A&jJl>7{S3O_ABi=W2N$j{+t@U!ys_*wj%`~rRsKQF(CpT{rAFX0#Pi}K6( zMf{Td3VsQ{EWe6h#;?e);aBjh^6U6j{F?j*eht4azlmSRZ^&=qH}ISC+xSiVmi!KW z3%@PDi{HlY$nW8I@VoN+_+9*-`~iLszb}7?-^U-wAK?%1hw{hxL;R8a3H}IwEPskW z#-GTa;ZN|V^5^(d{F(d({tSOEe~CZGU&vqKFYuT0*Z52PmHZ9<3V$tsi@(O-$lu{_ z@VD~!_*?v)`~&_De=q-tzsEnwKj9znkMhs>NBoog3;qfJEdPps#=ppa!N1^NQ~HnJ zs(*B#`bP(oQuOR1}W%=fE*OrZM51gd{bp!&xIs((zN`o{#Se@vkI#{{Z>OrZM5 z1gd{bp!&z8uKqv&z*vY${b~Q7$o{|n7R5FoI^`UJW54YKQf~v|IM39HO?jG!$8$Os zkCP|had^Bu5s$|cpZ-F<%o6B3`&G8oUR(K1%rMxxX5^p7MgSWz4%iH3u@iy{ycpJQ}ygl9)Zzu17 zx5L}ZJL2u}4)RWT2fU-aGu{#JB=3TE!aK{m;+^p>@@{w+ysNxB-WBgA?}2y2yUTmx z-SHmsUU(0@r@S}b6YnMOgZILF%lqQJ@jmi?cptp4yg%L-?T%g5rQ@iFpo_!xYwd^|oDA19xHkHg2yC*tGr3Gzw!1bm`=GCmQXB%gv$ z!Y9k8;*;?y@@e=Ke5!mpJ{6xPpMg)qr^{#J)A1SdS@;ZmrhGO&6Q3oYgU`Ze%je>= z@j3E&_#Aw$d_F!GpC?~{&%@`-7vl5r1@cAs0(_x-F}@IABwvCr!WYYz;*0Sm@@4oE ze5rgnz7$_3Ux6>fm&;e;%kdTRRrm^grF=EM5?>`>gRjC@%h%$o@ip>w_!@kzd_BGv zUnk#yufx~NH{$E@4f0L+27IG@GrkeuB;SH>!Z*ve;+yd;@@@DQe5-srz7^jl-+^z# zx660p+wmRpUHA@sr+hcQ6W=A@gYUw3%lG2D@jdc=_#S+(d_TSy-zPtS@5A@Y590gr z1M)-o0sNr+Fn$m}BtL>5!Vk-j;)n4g@?-cB{HXjmeiT0@KY<^^kIPTu$MF;LQ}_w| zr2I5~5#ec!avKu;-B#^@?Y>T_}7&FK_xR{xN~-9}}qlF@fqI6R7?%f$ARK_xR{xN~-9}}ql zF`?=o6R7?%f$ARK_xR{xN~-9}}qlF~9xF1^PqE3-t33zx|O5^auRE<$uEe z8~>yHfABxzf0F+%{wMr@Qab-P-22Zv)~v&o4VJ}@;|cO4JONLXC*z5Dk~|HbgeS|> z;>ma#c{)4|o>rb7Pm8CMXTa0p>E#*m^mqn&COiY4QJxvkh-Z>#!875R!h9 z&x_}i7r^u3`Q-)i{CEL*A-n)yP+k}>h!>IFxSHR2R<>eLe z@^}S#CAREL8gGfWlDENI z;jQIu@z!`7c{{uf-d5foZ;Q8+cfi}>?d2Wu_IL+*C%gmRQQjHvhB>{1U^ze8Xt*|l8?bh;iKha@zMAg`8a$GK2|;+AB&HZPr%3F z*X8q_4o$)CVT_FQN9`9h;Nc_!8hTX z3Hd4f1b$L}8b67jlApm(;iu(i@zeMj`8oUyepY@SKZ~D} zU%=1d=j9ji^Y{h%CHw+@QGOY}h+mRl!7t&LV*zZ>VII4f_@7|f*WhydbDRuRa`+oJ03snEOK=qFcRR6d@ z^^Xfw|F}T)j|)`)xIp!f3snEOK=qFcRR6d@^^Xfw|G3oE|K}eVBXOxe?f(!o*qw&r;}&E)8Xmm8S(UZ26-kt1D;Wy8PAAkl4rp);hE)G@yvJ@c{V%?o>iV5 z&x&W0=fJb!+2uL$?061&E<6XGQ=S{oiRY5%!E@oc<$3YkcpiB^JP)2%o*&PP=aUz} z^WpjB1@ZiN0eK<30A5gD7%zwyk{7`X;f3Wz@xpi!c`>{QUQ}KjFNznFm%xkR#pNaO z;&=&pDZB(;QeGM_iI!As$#Ua%#ExZO^Q(had ziPw_X!E52Q<#qAecpZ5?ybfMhULUWE*ONEE>*4j~4e|PT19>C70p3vF7;lI-k~hH{ z;f>`@@y2))c{98T-c;TkZ;CgQx4@g>&E+le=6DNvE4&5XQr;SGiMNus!CT?2V`c{jWZ z-c{Zm?}~Sm_rSa1-Q_*;?syM*FT4ldQ{EfziT9HC!F%Do<$dwqcprH`ybs=2-XHIa z_mdC6`{DiN1M&X&0Qn$%06tJY7$1lak`KWL;e+Kv@xk~I`7nG4K2$y&ABqo?kHClF z!{sCK;rIyoD0~DyQa&0ViI0+x!AIevG%x!EPMt& zQ$8D?iO-VH!Dr#K<#X}b_#F8>d=5TWJ|CZp&yz2}=i&3^3-S5*0{J3*0lrYa7+;7l zk}ts*;fv)<@x}NO`7(S7zEr*(Uy3i2ufUh#%jGNa<@gHuDtraLQob5riLa8c!B^p{ z*-->UO@4&a=+vPj)?f4G)E_?^RQ@$JDiSLr{!FS=i<$Lkn_#XK_d=I`? zz8~L2H2l4&*0r?^P0De$@7(a*~k{`hj;fLi%@x%BL`7!(mepG%OKZ+ld zpTLjd$K@yS*{0x3pejY!IpOas}&*A6g z7xDA>1^FfX0)A0`8NY~Ml3&3u;g{uC@yqxX`8E6sepP-QzlvXz-@vco*X1|y>-Y`% zE&K+4Q+^x2iQkgn!EfQW<#+Mh_#OE@{0@FsejmS!-;+PU@8S355Apl>1NkHT0sc__ z7=MUAl0U&8;g97{@yGZR`7`_p{#5=Pe~Leozrdg2&*d-i=lBcxEBpoiQvMo$iNBJ+ z!C&F8pZ-F<%o6B3`&G8oUR(K1%rMxxX5^p7MgSWz4%iH3u@iy{ycpJQ} zygl9)Zzu17x5L}ZJL2u}4)RWT2fU-aGu{#JB=3TE!aK{m;+^p>@@{w+ysNxB-WBgA z?}2y2yUTmx-SHmsUU(0@r@S}b6YnMOgZILF%lqQJ@jmi?cptp4yg%L-?T%g5rQ@iFpo_!xYwd^|oDA19xHkHg2yC*tGr3Gzw!1bm`= zGCmQXB%gv$!Y9k8;*;?y@@e=Ke5!mpJ{6xPpMg)qr^{#J)A1SdS@;ZmrhGO&6Q3oY zgU`Ze%je>=@j3E&_#Aw$d_F!GpC?~{&%@`-7vl5r1@cAs0(_x-F}@IABwvCr!WYYz z;*0Sm@@4oEe5rgnz7$_3Ux6>fm&;e;%kdTRRrm^grF=EM5?>`>gRjC@%h%$o@ip>w z_!@kzd_BGvUnk#yufx~NH{$E@4f0L+27IG@GrkeuB;SH>!Z*ve;+yd;@@@DQe5-sr zz7^jl-+^z#x660p+wmRpUHA@sr+hcQ6W=A@gYUw3%lG2D@jdc=_#S+(d_TSy-zPtS z@5A@Y590gr1M)-o0sNr+Fn$m}BtL>5!Vk-j;)n4g@?-cB{HXjmeiT0@KY<^^kIPTu z$MF;LQ}_w|r2I5~5#ec!avKu;-B#^@?Y>T z_}7&FK`Ad{_%n8A0Mdx@qy|eAE^HEf$AS0sQ&SR>K`Ad z{_%n8A0Mdx@uBJ;AE^HEf$AS0sQ&SR>K`Ad{_%n8A0Mdx@qy|eAE^HEf$AS0sQ&Ta zt^V=ft^NsA|M=g%Gr7xDVa8JG>Ywoa>Yos({t1EVpAe}234!XL5UBnMf$EYos({t1EVpAe}234!XL5UBnMf$EDPdTUH z#Bck6)Z2h0&NI~#Q=aDG$(&BaljLdeBs^K37Ei|0$kX9z@U-&ucv?K2JOiE%PcP4i zr^hqMGvOKVjPlHQMm&=|3!VwjEYFH(#2wn&;EH8=|#*4^{;YIMG^5S?=yqLTMUJNfTFNqh&OUO&%CGe8+(s)U{l)MaH z3NI}$iNE zd&qm?J@B6L-gr;Em%I<&3-2xOi}%L+$ot`a@V@f?cwfAqd;s1L?=K&S_s0jw2jK(o zf%3ulKzxvV2tEiOEFX#w#)rs<;Y0AD^5OVUe3*O$J`5i&ABhjgN61IvBk+;((fCMw zlza?63Lh;Wi;u>~$j9Mh@Uimo_*i_Ld;&fWA1|MXkH;s-C*c$DiSo(#M0}Eb3O)&+ zET4)`#;3@q;ZyLb^6B_ge42a)J`JBPpNUV$XUJ#aGw_-6+4xL+mV6FA3!g2Yi_gaA z$mij6@VWB&_*{IRd;vZWpD$mC&&Li?7Dl$k*X(@U`;w_*#6O zd;`7?UoYQ?ug5pYH{l!bjq=U-MtqZe3%&{8EZ>T6#<$3~;al*n^6mIme4Bg+z75|l z--&O>cgT0)JMf+I-S|#?mwXSt3*Rl@i|@ww$oJuU@V)Z=_+EUU`~bcW-!DIi@5c|w z58(&!gYv`pLHv;X2!04ZEI*1L#*fI4;YaYJ^5ghX{FwX%ehfb@KZzg5PsmT7{S3O_ABi=W2N$j{+t@U!ys_*wj%`~rRsKQF(CpT{rAFX0#Pi}K6(Mf{Td z3VsQ{EWe6h#;?e);aBjh^6U6j{F?j*eht4azlmSRZ^&=qH}ISC+xSiVmi!KW3%@PD zi{HlY$nW8I@VoN+_+9*-`~iLszb}7?-^U-wAK?%1hw{hxL;R8a3H}IwEPskW#-GTa z;ZN|V^5^(d{F(d({tSOEe~CZGU&vqKFYuT0*Z52PmHZ9<3V$tsi@(O-$lu{_@VD~! z_*?v)`~&_De=q-tzsEnwKj9znkMhs>NBoog3;qfJEdPps#=ppa!N1^NQ~HnJs((VD z`X>ace?p-8Cj_d0LZJF51gd{Rp!z2Ss((VD`X>ace?p-8Cj_d0LZJF51gd{Rp!z3- zs((VD`X>ace?p-8Cj_d0LZJF51gd{Rp!z2Ss((VD`X>ace?p-8Cw#a1Cw#a1CsO?r ze)rDgE>nLQOR1}W;`gh6Vxamb2C9Ezp!z2Us()gj`X>gee`28eCkCp2Vxamb2C9Ez zp!z2Us()gj`X>gee`28eCkCp2V(RMu^AC)p#MGbm|B3AX>u>RF0}@isFF5JjJ|Oir zAer+_yQGw-d3YL5C*jHRw0JU}MxG8&gQu0J$J65JF}8@M3szc}cuDUP4|9FM*eom&QxtrQ~JsQg~^3S-dn}MqUmt zgO`<;$IIg7;pRq#r9WqDP+GG0Yq4X=V%l~>2B z;??9e@M?HkU+R(NZ9Tf8;iM&1r@gSVBp$J^rVUGPqLXL(n=Gu}ns4ex??m3POx;@#vu@NRf_c~87M-b3CC?}7J}_r`nT zz2trHUU+YLU%WToN8S(bgZGv9$NS>_+3?G6Il@G^<;=|-4@L~9H`AB>?K0-bUAAygQkH$yhqvT`oQTS;2SbQ`- zMm`Q7gO8Pu$H(I1-ETzob@M?MdqgU^-E$LHen z+YK@MZXN z`AU2_zCykVUxBZbuf|v6tK@6&RrqT8T6{IWM!pVTgRhmZ$JgTP4c~%qm2bzl;@jjq@NM{Z`A&R0zC*qX-+}Lx z@5XoHyX1TDUHESKUVJycN4^i=gYT8^$M@p<YAC@MHLK`APgZenNftW%*V7GJZvV z4Znh4m0!oN;@9Li@N4*W`Az&fenWl>zk%PB-^Op^x8!&5Tlj7HUHmqFM}7~#gWr|k z$M53zN_WOKk>WOKZ)v}_`7!|cbUq|SV~>} zlfGa5lLFO0DNy~B0@Xh$Q2mnv)jugv{gVRKKPgcClLFO0DNy~B0@Xh$Q2mnv)jugv z{gVRKKPgcClLFO0DRuS#`3J^SQtD6p|3vox^|u7J0f{N+8l3!XACP(*kcRV2!Q_;u zd3ah*C*x`4>F_joT6uarEuK!E0Z)ggmuJM&;~C_c@Cw) zS>)O9EO=IVc04PdO`ZeKhG&=O#Ixf$a|Dfm?RbbKm4O+EvkhEJEz z#HZskXHSL18s>+m)BTKRf>Ext~^0bhr&mv6+^;~V6g@D2Dz`DT10zDd3X z--K_LZ^bv`TjbmDE%;XXc6=+oO}+!)hHsbe#JA%+zl2|wU&SxuSLE05EBICUb^I!RO@0Hv zhF_Q8#INHw*f5kuJU*x~wU+}Lf{l{? z@Y?dacx}9nydGW$uPd*Q*Tw6}8{qZu`tpW&eY}CZ5#9iAC~u56#2d+*;EnLc@}_uW zyotOS-UM$dZ;m&`o5@??&G6>(mUwf#g}fEs0&gjAjkm;G$=l$q@YeFScx$|kydB;K zZ!2$)x5eAZJK*i`_VSK+d%T0Z6W#&uDDRAS#5>8m;GOW!@~(JiyohrAcw1MeyCjrYWR$@}2F@ZR#icyGLqydT~N?O^!~Mn2;{Ny<@c{e`epWmXKZ^&52jKyDp!hjF5DyYR zj|buB#Dnp3_<8XQ_<1~7JOmHMFNlZY7w{1AFgyeg6%WTl@i6fSJPZ#PkHo|A2=R+} z1Rg1V36I1tibvrW@k`>D@k@A=_!T?~zbt+gzl>iIkH)XySH)xSt9Z0{EFO)=h{xeE zc&vCl9*f6`C*W~-ym%rWk0*#aZ>P5cI) zEPe}5#&3$J;5YGG;;Hy8JVpFAo`R=}r{SsiZSgz!Z9Gjp9Z$pWh-ct;@O1G^JRQ#v z&%!hCOz~_y6VDRQ!L#se@mxF`&k?_i=is^G_wZc&uK0cYE`Cq^0e%m^FP?|r#~+A4 z#2?^!;`w+U{!qLCe~9Oc7vlMNfp`&KfES7v+pK<=XgE-OuPYqhCdg7fj`F^#2fJj{DpWE{sM0l zZ^j$(Ch-=$32zo}#hdXK@ix2#ZxwIHTk$sW4!jL-7w^Q|@ec7WyaVqPe~EYEUE;6s zF8rlq?M z58f;O0q@28#6RMF_y_S%_y_!>_-Fhh{z?1`{t5pq{uTd>e-ZzNf5E?sf5*S#-^735 z-|+9^f8*crAHVt^Kdb)$L-ikEsQv>C)qjAY`VTNv{{e>TKfqA^2NOa6x{Rfz;{{TbvA7H5d0}R!FfT8*iFjW5mhU!1SQ2hrOs{a5( z^&eoU{sRovf5306|A60CeNH#>i^gNf0F(G`S<_01`POh55mqr?*aX<0WQq5HJyK*=HaePJL4|mZnz8X zD(;TE;%?#=+zodZx8m-&Mcjs4aI3f-x8gQ&2X4dd;vTpicZd(f9k_@1Alw5VC_We; zhz}AUf)Bz6ix0&I<3q%U;Y0AD;=}Qw_%QJi_%M99_(*&>K0BpM%fBXN%9pXXA6k z=izhkx#IKjx%fQs1^7ICzW73XKE6PF5xxLlD83k9h%XXff-k}si!a3&<4eSs;Y;wP z;>+=+_%iVo_%eLC_)2^^zCwHzz5-t+!Yt zI`IwoI()tOMtnWKL3|Uw0pBRT8Q+L+65oPv!Z(X=#W&+y#JAyF@U7z8@vZna@g4X! ze7pEgd^^5Fd>6h0-zmNu--+)M--GYMcZ=`EcjJ4+_u+f+z2f`vz4$)y1Nc6CzxY9X zKYl>`5PkqZD1I0}h#wL^f*-;Uiyy@g<444g;YaYJ;>Yo$_%ZPl_%Zyr_(}XYenR{d zegZ!!ei}cCpAz@PPvNJp1w2GN3=hFW#l!JXJWMFRq+`7DjqE!i$~)z;&FHk9xEP?$Kr9~33wbHFP@0U;|b!| z@B}2b#IwY6@GLxAJQvT# zbHwlBIe4!4JvL3sj#r3R;uZK)@hbc&UMXIUSK?LTHFyh$P zI=o)|IbM%H6K}wu;m^fi;Lq^}@kYD>e<9w4zrY*CoAE}xNxTJb!kfig@n*b5ybW)` zTgBV)R=iET18>9I#XIqKyhFST@4!37U*es3m-s8Z3x6rzjlaZSiND5Q;oahI@NWFI z_*?un{zm*A{sw<5{vLmezZ37l-{J4Yd-3;pk9Z&6gZGMmze-i(Kf5JbDf5kuJU&O!RU+}Nu-|?^bH}N0%H~hQ!-}ra@$FKg!&+6}FsQyld z>hENz{!WJK?_{X{PKN65WT^g5hU)KRsQyld>hENz{!WJK?_{X{PKN65WT^g5rt0rx zsQyld>hENz{!WJK?_{X{PKN65WT^g5hU)KRsQyld>hENz{!YKG{!YKG{?1f?r~iC2 zd6%iPtfl_d-}(2|-`P<8oekCB*--tR4b|V-Q2m_^)!*4r{hbZf-`P<8oekCB*--tR z4b|V-Q2m_^)!*4r{hbZf-`P<8oekCB*--tR4b|VdfA#e+O_4 zaQbyW!Y)7W0sXH5uFSJdU4EVB;ciU3;I88CxGU}^Zo%DfcX2E3j$6cSxCOV0+i@#y z6L;V?+%E2c+i{2ZK-__Qh!4U&@PXok@qzdt@gevie6aXXd@w#ld>B3iA1Xc^ABqnX zAAt|Uhl`KIhvOr}N8uyzk>aEAk@zU_G59EawD?$jG(JXr96kmgD?T0{i;okZfRDq+ zi%-PI;}gUu;S=zQ;*;@-_$2Wu_#}L?_*8r{K1F;QJ_VmDJ{_NmPZOVkPs68+&%~$W zGsI`%Gw_+>v+VW2cIiGAD@fQ6JLPO!{>`H#OLD+#24WU z@P*=w@rC#z@g?{oe6jdad@;U6d>Ot3Un;&FUy3giUx6>fmy55&m*XqMSK%x0mEx=M zmG~<0HTWugwfI_mHNHlC9li!%E506Ii?0*kfUm>Xi*Ll&;~T^`;T!Oc;+ye}_$Ki! z_$GX__*Q%~zD0Z+z6IYZz8&9+Zxi2vZ^O5X@5Hy`JH&V4JMf+2yYZd)F7ZA1E_}E6 zUVJycM|>Z?2j45cAK#1b6F-3O!}p6H#P{O|#1G*I@Pp!q@q_pw@gw*l{IK{@{4jn* z{1|=&KPrA4KZ+j{KY<^^kBgtgkK-rAPvIxcfxS#kL+zREoARdGV;DO@j z@IX9B{5&3npA!$p&*A6AFW~3#VDS(<7{4GMieJD(#KZ6qJXAa!55>d8Bk(XhTs#sF z$0Niq;t_bH_$53NzbGDsU&JqoU&b%tQQ}wdDEzYcRs1r3MLZh6f?pMn!LQ=c;<0!% z9wQ!y$KbKz@pvpAC!T=E;ql^$cs!mUehp8+6UDFNiTE|~B>WnFUHk@q9ZwQZ#*^?H z;y3Xdc(V8{JQ=?!o`T=RZ;7Ykx9}A4+jt6|DxQX?;5zayT3-@((x zGx2mhLp%%5z%#|O@k~5RJO|Ihv&D1qY&=K&E}nzuir>R?@w?*p@w@mv@dx-l{JwY| zejk4z{t$nF=ZWXzdH6%|0{kJKFJ6e};|1bHcmZB0UW^ywMdBrR5ne1_iWlQ0;$?UV zUMl_wFU8BmALC{CBk?ErBmA*=IsO=bB3^+%!OO*;;^laScqLweKNYXSpW>C`)p#Xd zC0>J9;nm``cr{)lUWeDH#_%rba{2BgS{006TZxC<98}Jw6 zP52AEQM?&%#GAxh@Fu)jycKW8Tg2P&7Q9uw9dE_k#5?ddyj{E#Z^t{tyYLRYQ~V{~ ziFb*=!n^R7;@$X5{FV4?{1x6U{s!;HUyHxRU*m7Y-{EiYx8m>dxA;5p9{e5tUc487 zkN1f8;XQb-_y@cf?-T!s_u(JJKj9znkK&*4kN79?FZd_?v-ns1GyX;V8~z3VD*he+ zihmRTfq%oli~o&($AA3lfBdZe&W7smY^eUuhU)KZsQ%7|>hEl*{?3N#?`)|4&W7sm zY^eUuhU)KZsQ%7|>hEl*{?3N#?`*36&W7smY^eUuhU)KZsQ%7|>hEl*{?3N#?`)|4 z&W7smY^eUuhU)M9+v@N9+v@K^^>_ZyHsRU;SNvU;SMS)!)TX{ap;z-^Eb< zT@2OV#ZdiS4AtMoQ2kvD)!)TX{ap;z-^Ebwm04m;Qh4|0mi1pMRaW1~~t^H(}SG_kjM_05|5@vaY{Q^Kf^j zU2!*Y3+{%yi(7Gb+#+tnEx1+Oj$3h?xC6K0c5x5fjyuE$;tt$Hd=Tz|4-_Aa55xzF z55WiFgT;s9gYhBa!|);aQ1RjTP<)v92z(emTzn)x93LS*3Lk-w6d#R`#7Bvb!AIev z#mC~K@iF4#@GlSrd?G#`pCCR7pMXykpNvn$Cy7tNC*hODr{a_G zDdN-cDfm?J>G)K9n)nQS8a`coCO#dXAwCPAfzK45jnBkqiO<1j;j_i(;Z zQhb^C3Va#9Tzn63SWV*6km<6#8-*0!B^p{#n@HO~a@%8vxe4Y3P zd>y`Cd?UUd-ypsT-+*rv-;8g>H;He-H{qMbx8j@eE#lkoE%;XP?f6!FoA?fV8@^q9 zC%zruA-)UWf$tRGjqk*FiSNO8;k(86;=A!Z;`{JD_+Ih-_+EUU_yK$$zF+(xz8^mz zeh5E+9~3`~AH)xdAHfgdhsBTLhw&rg$M7TgQSsyWQT&+r3H%s-T>K<{96up`3O|9L z6hDoh#7~KP;-~P_;$HY^+*8~e_r$%#eQ+<_Tih4-#(l*7a39=P+#mPF{lw4Uez?E* zS==8#BOZXC!Ow~Z;%D&y@gO_^4-`L#2jW5E=kXx?oOm#P4nHq`0Y8rii-+LB_yzG$ z`~n^#9)^eDq2l3qC>|yrfrsJY;*oeb9wB}akH90vFX55+Me!*7B7RByGJXk<62F2+ z;g`j);+OF&;?ejO{Hk~ieie@vkHw?$81Xnf29Fhw$7At0@dP{$j~7qGK<2mAY z@f$@`}hO#hxh|LPdp#b!yk$l;1BV9@j^TwFAy)n z3-ChmV!RM95--7v@M7^&ycjPLFT+dlQt?N4DPAW27%#&gi9f*~;g7}3@yGZR@e2G2 zUM~I=FUKpyEAa~asdyFs6t5Jo#w+nE@fy4euNJSxtMMA~I=lw26|cu@@jCHmcpY9Z z{v5BzpNTi%&+zBsFYxDhgLos}fWHuL!e8Kx;>~y?-Xz|FH{s3Vt#~uuBHo6#;H~2A zcq`r}-hsE_?c$wyJKiDQg?Hec;xF+|yi5EQ-i5yu@5W!^uf$*Dukdd1H+VPxTKp~k z8h<1H4u6Bc6@QPv#ovkd;P3GF;=TBLyhpqb@4{2TsV{BQg_{^M8w<7f4EF;ssSL-ltt zRDTyk^>;B;e-}gbcQI6d7en=TF;ssSL-lttRDTyk^>;B;e-}gbcQI6d7gP0jF;ssS zL-lttRDTyk^>;B;e-}gbcQI6d7en=TF;ssSL-lttRDYM>R)3e@R)1HjzsrBVnY_!? zR@PGg>hJpd>hEf({;r1V?`o+2u7>LGYN-CMhU)KXsQ#{o>hEf({;r1V?`o+2u7>LG zYN-CMhU)KXsQ#{o>hEf({;r1V?`o+2u7>LGYN-CMhU)Lyzxx06Kh~q`&ma5u&;I}X z>&!L4<=1`s=g(jJyZ-#O|9?Iou=~HR|L_pEU#EGvg=sh3UEGSh;}&rnZo#eMcHD~F z#2vT|w~Kq=cHAL85O?4n;)8Gxe4zMXd>}qZd9l;rIygQTPaar1)rjBtA-f3_c1UEj|_>jgJu@hmXO>ijT*~;^V|8;N$S| z;uG=l_yqAu_yl~S_+)${K1qBEJ_(;JJ{6ygPZ6JnPr;{(PsgX?)5K@s)9~ryGx6#8 z4Dng`41A{eYD*x<@gHmRrm^grTA)m zCB9004ZaFrExs0Cjjs`3hp)lcim%7l;_JjW;Op@9;v4bx_y+M!_y&BV_-1?~zDaxw zz6swfz7^k$ZxP>yZ^5^UZ^yUd+r)R^+wkq;JMr!K4)I<14t%HhZhR-cOMDN$3*Rli z7vGKV5#NXJ!S{;q$M@p<#1G*6@crTk@%{J#@k96l{Gj+@{2+cv{0M#sKP-L}Ka3v{ zKZYN{kBT41kK)I~PvFP!b-r~NvH|`_uhx_2Z;{LcV?k9c*_rv|g&*J|08Sw!841QKT5I>6thzH>Tc%b+> zJP;2OKaU6D=fs2YbNG4j3;20FSUdy|#xID6;ur7`@i06D4;2r`L-8>22s{iA7mvil z@d)vYcmy6PehH7nFN#Ou7x7Etm+?z@l=u}q3coCV6~ByM5s${N;8(?C@T+*Vcq|@` z$B4(_F?g(aJRXb3i6`K3c)WNb9*-x8U&9mdMDgo*B7RLg3BQJ47r%jD$CJd9@g)3) z_)YuCE0co|-T zmx@2aOYt)C$9Nh3Nc;)@2!AYIjz7kqh*#iG@N)5|csX7nUWr%WPsOY7r+B4!HC~BV ziPzv&c(r&fUX9m?*WopIt$00Ni`R)i!|U*R@#lCw{!F|9e}+F7e}O;88^jy&2KZ^fJO7V$Q`1#cB^$6N6>@eaHVZx`>x+wl(ZF1!Qp6n}|# z;$7me@GktNcsKqMe;H=e>X$*cQaIf zH$(MzGgN;!L-ltvRDU-^^>;H=e>X$*cQaIfH$(MzGgN;!L-ltvRDU-^^>;H=e>X$* zcQaIfH$(MzGgN;!L-lv-U;Y33A8XUC|6lw6N%sHeUl*_-ygH_-uTR_&j_LK39A` zJ{O-Sz5t(x&lg{a&&L;tFTxk#3&j`X3-LwbOYlYbV)3Q;Vtk4CGJFZXRD3zU6kjI3 z0$+wN7hj1l$5)82!dKuc#aH7i@m1n$@KyL~@wNDBe2w@zd=0)UcqATgGJaD$1;2^k5>Lf%;VI&`@f18&JPl99 zZ;Ri-Z{um=>3AA`M?3?+gQtsU;^}yXcov?4XNqUznRu3X4xWW)i|69mc#im8JO|Ge zzlZ1Icg64Hckz4T5Ab{Veepc}KK?-bA^rf*6VJ!<@Q30B_(MEjyb#aF3&e}?0=!VX z7%#+poZyjZ*xFUCv6%kUDsRQwTMikFE$#>?aYP?3g4zIy$#q04}yiWWXUWeC@vr!2{EPTE{0sh7{5$>?|0eze|Av1T{~P~~|M=Da_*wnk4AtMwQ2pHu)!)rf z{oM@J-_20{-3-;=%~1W_4AtMwQ2pHu)!)rf{oM@J-_20{-3-;=%~bu}4AtMwQ2pHu z)!)rf{oM@J-_20{-3-;=%~1W_4AtMwQ2pHu)!*&6)!*&6)!&`!@AjW>Chs!!l(p2q z`n&(W`nwydzq_IOyBn&%yP^8K8>+v%q58WUs=vFT`nwydzq_IOyBn&%yP^8K8>+v% zq58WUs=vFT`nwydzq_IOyBn&%yP^8K8>+v%q58WUs=vFT`n&h9{(t?Cb?V;#ul@fd z`~UN=E7t(GU-vI;`FRiMe+{rQ&$hPwI?cmvOj~fPxE;6RHgN}T!|mc8xE*(h55yg~ zhxj1e10N_p7$1la5+8yO!Uu~F#Rua<#E0QS@S)ABm3=AA^s=M~jceN8@9}$Khk}vEt+LvG_Rg3HUgCy!b?XJU&5u5QGX06!>x7(a*~5{1koyKPi41KZ&0b_ry=(r^UVS)3~R&H|~jhiTmJQxVN}3?v4A1`{6#g zued+%i~EV6!ToT5@w2!;envb1KZBnY55&*n0pdY;03IlQ4iChG#LweF_&M=l{2YE> z`~rR+4;Bx>gYgUEq4)(nL_7=+!9&Hv@lZTWJOU5H!^I=2Qo`_!)Pr|R^*Trw(*YPCrWIPGKA$}9TfhUXK!jtiv;wkt| z{FZnsehW_#zm2Ehsp4sPDt=r14t^U?6Hmv}@H^re_#Hf5JQGjHGsLs-3_Mdj8_&eE z#B=a0JX<^$&&G4a@8UUluJ}DX7r!fhAHR#=6Mul;!|#jd;rHCC&UL;x6<#e~i&x_{;&pfp zUMpUY*Wz{J&+t0DUi>*;k3SP{z@OpI#b4mh@doimya9h9-h{uv8^xRPM!ZS91#iNe z#ar=ayhXeXZ^2u|+woSsO}qnd!`sC>@pimJybJHZJH=n(op_h{E4&MTDc+60#9xWO z#$Vyx;&1S7{I&R7{5AeY{2l%Ve=GhTe~Z5p@4?^U@5OuZ_jr$ZAKruaihsa+@jmg7 zcpv^j{1g5G|0w<$|A>DQ|AK$QKZ}3GKjUA-zu{l-uj1eFulP6dANV)?yZGPucl^h% z{>RVi?{296?uP2`Zm9n5hU)KbsQ&JT>hEr-{_ckA?{296?uP2`Zm9n5hU)KbsQ&JT z>hEr-{_dvg?{296?uP2`Zm9n5hU)KbsQ&JT>hEr-{_ckA?{296?uP2`Zm9n5zpei6 zzpefjs=xbxzL~tsR8rPb|LSk~ef75(s=vih{Vj&-Z!uJVi=p~k4AtLasQwm1^|u(R zzr|4fEr#lEF;stxq54}4)!$;M{uV>^w-~Cw#Zdh%hU#xIRDX-1`dbXu-(sl#7DM&7 z7^=UefA#(c|G)PClkES`ziwOu+<)E6u=VFXp#L?%#ynfx`s*|gw=-?UZQ>5x zhTFwGa69f0ABa0}5Ai{`2R=}IFg_3;Bt8Tmgbx-UiVwzzh!4Yu;6ufS<3sUb;v?{3 z_;B%&_;7rL_$Yh?K2m%%J`x`#J_a9!j}{+`kH*J{kHg2{W5vhgWASm~6Yz2Pc=3t& zczlBRBzyusQG7B!5uYSJ1)qdZ7N3ew#;1r+!>8a=#i!#_@oC~S@M-vT@tOE^e1`Ze zdmB8}N1bdhw0;dVGWUCVT_FQG7GL5#J=f1>b~k z7T=0*#I@onNe@NM{Z@tyc~e24fhd3268FKq zaBp#6+#B~1_rrZ~UvYoj7xxoCgZttB;%9Mx{ET=2eg;1)9*CdC1H^;y06b9q93F@V ziJ!-V@N?q9_&NN%_yznt9xNV$2jdsSL-7lEhtHf*Y zD!f{}7O%!@#Ov@HyjHv(uf^-cpW$_Qz4&vy9)Bj@fIq{Zi@(61;|=1Ccmw`Iya|7S zH;Omojd+uI3*Lk`i?`y6_$T}W{!#oh{t^Eq{ssSpe-{6Wf5yLvf5X4vU&X)UU-56^ zKk#q(ck#dR@A!{j{g0p3-(sl#7DM&77^=U;Q2i~2>TfYre~Y2|TMX6TVyONWL-n^9 zs=vih{Vj&-Z!uJVi=p~kOx53FsQwm1^|u(Rzr|4fEr#lEF;stxq54}4)!$;M{uV>^ zw-~Cw<+s(}^4scfrTSa`^UdU4riQYX`d5GJ@2kJnQ2nij>Tfkvf2*PTTMgCUYN-BJ zL-n^Bs=w7x{jG-TZ#7hZtD*W^4b|UjsQy+%^|uVsKuRGTO%dh(yw*9;Z^uGq!nP_-ygH_-uTR_&j_LK39A`J{O-Sz5t(x&lg{a&&L;t zFTxk#3&j`X3-LwbOYlYbV)3Q;Vtk4CGJFZXRD3zU6kjI30$+wN7hj1l$5)82!dKuc z#aH7i@m1n$@KyL~@wNDBe2w@zd=0)U zcqATgGJaD$1;2^k5>Lf%;VI&`@f18&JPl99Z;Ri-Z{um=>3AA`M?3?+ zgQtsU;^}yXcov?4XNqUznRu3X4xWW)i|69mc#im8JO|GezlZ1Icg64Hckz4T5Ab{V zeepc}KK?-bA^rf*6VJ!<@Q30B_(MEjyb#aF3&e}?0=!VX7%#+poZyjZ*xFUCv6 z%kUDsRQwTMikFE$#>?aYP?3g4zIy$#q04}yiWWXUWeC@vr!2{EPTE{0sh7 z{5$>?|0eze|Av1T{~P~~|M=Da_*wm}hU#xMRDY|X`dbav-)gA-Rzvl-8mhn5Q2nij z>Tfkvf2*PTTMgCUYN-BJL-n^Bs=w7#{jG-TZ#7hZtD*W^4b|UjsQy+%^|uTfetf19ED+YHs;W~lx)L-n^As=v)p{cVQoZ!=VXo1yyK4AtLesQxxX^|u+S zzs*qnZHDS^GgN<@q59hl)!$~Q{x(DPxAm|7fBlcOZ0rBm{(qAF|M}O#HNg7o9*6Be z?*aX<0S@Nb`u1O^dAJADcHAL85O?4n;)8Gxe4zMXd>}qZd9l;rIygQTPaar1)rjBtA-f3_c1UEj|_>jgJu@hmXO>ijT*~ z;^V|8;N$S|;uG=l_yqAu_yl~S_+)${K1qBEJ_(;JJ{6ygPZ6JnPr;{(PsgX?)5K@s z)9~ryGx6#84Dng`41A{eYD*x<@gHm zRrm^grTA)mCB9004ZaFrExs0Cjjs`3hp)lcim%7l;_JjW;Op@9;v4bx_y+M!_y&BV z_-1?~zDaxwz6swfz7^k$ZxP>yZ^5^UZ^yUd+r)R^+wkq;JMr!K4)I<14t%HhZhR-c zOMDN$3*Rli7vGKV5#NXJ!S{;q$M@p<#1G*6@crTk@%{J#@k96l{Gj+@{2+cv{0M#s zKP-L}Ka3v{KZYN{kBT41kK)I~PvFP!b-r~NvH|`_uhx_2Z;{LcV?k9c*_rv|g&*J|08Sw!841QKT5I>6t zhzH>Tc%b+>JP;2OKaU6D=fs2YbNG4j3;20FSUdy|#xID6;ur7`@i06D4;2r`L-8>2 z2s{iA7mvil@d)vYcmy6PehH7nFN#Ou7x7Etm+?z@l=u}q3coCV6~ByM5s${N;8(?C z@T+*Vcq|@`$B4(_F?g(aJRXb3i6`K3c)WNb9*-x8U&9mdMDgo*B7RLg3BQJ47r%jD z$CJd9@g)3)_)YuCE0co|-Tmx@2aOYt)C$9Nh3Nc;)@2!AYIjz7kqh*#iG@N)5|csX7nUWr%WPsOY7 zr+B4!HC~BViPzv&c(r&fUX9m?*WopIt$00Ni`R)i!|U*R@#lCw{!F|9e}+F7e}O;8 z8^jy&2KZ^fJO7V$Q`1#cB^$6N6>@eaHVZx`>x+wl(Z zF1!Qp6n}|#;$7me@GktNcsKqMeTfetf19ED+YHs;W~lx)L-n_rs=v)p{cVQoZ!=VXo1yyK4AtLesQxxX z^|u+Szs*qnZHDS^GgN=uZ>zuUx7FWH^|$@!o5{OO-DEBGum1MmSAV;q`r8fF-)^Y> zc0={I8>+wEQ2p(O>Tfqxf4iaj+YQy ziO;~N;nT%u;?waN;_)PKH_)L73_#Au|K3jY)J{zASJ`bOR&lR7K&&B77FTm&F z^Tik9^YI1Zi|_^bLh;4;LVS_<5_}Q9SbQnI7+)g33}1pT6<>}o#g~b%z?b36#aH6X z@fG5$@D=z<@zwZBe3kebd=d z4fsa!&G<%qllT^V6TVq|E4~@uBEAjZf^QYyj&H@ciSNL-;oHS`;@j~Z;=Ax2_)hWN z_)dJ6_#S*0zFT}Rz8l{oz7OAn?-k#V@5T3tAHetF`^699`|$(fhwuaVLGi=*LHv;T z5&RH-So|n{7(XI@3_pS&6+ez2#gB=fz>nd_#ZThL@e|^w@Dun+@zeN8{FJySehNP= z?uDPmJ;l9oPuxq~2lv9g#eH#a+(+CG_rZO|{c&I1Py7t-hx?14#r^R!;sN*>{H%B& zeijc955fcRK=E^UARZ)s9uLCLi3j87@blsq@bh@EcnBVhUl0$)FW@2KVR#50Djtr9 z;$h+uco-fo9*KwJ5#kr|2s~2!5*~?P6pz9$;+MoPo+Ex2&%txW@8P-lUGe+) zUHqQ-1NFU0fl0`Vfe0523T#tZQx@e;fU zFBUJwi}4ciGQ0#Y6@P@6;$`BG@iP38_!ImQ{#d*me~dp7ufU(+<>F8Aa=b#k60g9Y zidW%J@k;S(yb`YxufePEYVlgU8m|$r!)x$b@p`-#uM>ZU*WvZz&+&TvnRo;K41X^E z0)LJ-h&SR5_zUqS`~}`9-i$ZmP2w$h6W%P|iZ|me;%#^f-YVXXx8iN$9e5kwF5Zc^ z;~nB%cn97o{u1xRyTo7NUHD7!Zu}+wO8hnc3hx$wgLmVv#oywu@i*e{@HhBd@%Q*! z{GE6Y{tkaH-iyD-d&K+j9=uol1Kx}GiGRfV@DJjj@DKP$@z3~2{FC?>{1g6J{44$$ z|04bk|AK!N|Bipfzls0Azv17-|Hi-LKYsN;epY|Gq59hm)!%NY{&qw4w;QUz-BA7Q zhU#xORDZjn`r8fF-)^Y>c0={I8>+wEQ2p(O>Tfqyf4iaj+YQyhCaAe}|#^I}Fv|VW|ENL-ltU zs=vcf{T+tt?=Vz-Mmzr#@d9fs=fFjRj>|LXtO|5)RW{(tTN zC)xj>e{Ea??7!}P*n@F<|7*ZN=J`r^{5s9U2Qlq|4-_Aa55xzF55WiFgT;s9gYhBa z!|);aQ1RjTP<)v92z(emTzn)x93LS*3Lk-w6d#R`#7Bvb!AIev#mC~K@iF4#@GlSrd?G#`pCCR7pMXykpNvn$Cy7tNC*hODr{a_GDdN-cDfm?J>G)K9 zn)nQS8a`coCO#dXAwCPAfzK45jnBkqiO<1j;j_i(;ZQhb^C3Va#9Tzn63SWV*6km<6#8-*0!B^p{#n@HO~a@%8vxe4Y3Pd>y`Cd?UUd-ypsT z-+*rv-;8g>H;He-H{qMbx8j@eE#lkoE%;XP?f6!FoA?fV8@^q9C%zruA-)UWf$tRG zjqk*FiSNO8;k(86;=A!Z;`{JD_+Ih-_+EUU_yK$$zF+(xz8^mzeh5E+9~3`~AH)xd zAHfgdhsBTLhw&rg$M7TgQSsyWQT&+r3H%s-T>K<{96up`3O|9L6hDoh#7~KP;-~P_ z;$HY^+*8~e_r$%#eQ+<_Tih4-#(l*7a39=P+#mPF{lw4Uez?E*S==8#BOZXC!Ow~Z z;%D&y@gO_^4-`L#2jW5E=kXx?oOm#P4nHq`0Y8rii-+LB_yzG$`~n^#9)^eDq2l3q zC>|yrfrsJY;*oeb9wB}akH90vFX55+Me!*7B7RByGJXk<62F2+;g`j);+OF&;?ejO z{Hk~ieie@vkHw?$81Xnf29Fhw$7At0@dP{$j~7qGK<2mAY@f$@`}hO#hxh|LPdp#b!yk$l;1BV9@j^TwFAy)n3-ChmV!RM95--7v z@M7^&ycjPLFT+dlQt?N4DPAW27%#&gi9f*~;g7}3@yGZR@e2G2UM~I=FUKpyEAa~a zsdyFs6t5Jo#w+nE@fy4euNJSxtMMA~I=lw26|cu@@jCHmcpY9Z{v5BzpNTi%&+zBs zFYxDhgLos}fWHuL!e8Kx;>~y?-Xz|FH{s3Vt#~uuBHo6#;H~2Acq`r}-hsE_?c$wy zJKiDQg?Hec;xF+|yi5EQ-i5yu@5W!^uf$*Dukdd1H+VPxTKp~k8h<1H4u6Bc6@QPv z#ovkd;P3GF;=TBLyhpqb@4{2TsV{BQg_{^M8w<7f4E7^=U+Q2iZ->hCaAe}|#^I}Fv| zVW|ENL-ltUs=vcf{T+tt?=Vz-Mmzr#@d9fs=fFjRksq53-v z)!$*L{tiR+cNnU_!%+PlhU)M5ZS{Bjw)%Te{T=`LX7VmmD_KkZtG~zZtG|b#`g<6v zzlWjvdl;&}hoSm=7^=UAq569ms=tS!`g<6vzlWjvdl;&}hoSm=7^=UAq569ms=tS! z`g<6vzlWjvdl;&}hoSm=7^=UAq569ms=tS!`g<6vzlWjvdl;&}hoSm=7^=TV|LXtO z|5)!H{r}qkPqP0%|Ju0*IDY*ezyp8Y1NvVB1~JdqW8kmTJbW_-ygH_-uTR_&j_LK39A`J{O-S zz5t(x&lg{a&&L;tFTxk#3&j`X3-LwbOYlYbV)3Q;Vtk4CGJFZXRD3zU6kjI30$+wN z7hj1l$5)82!dKuc#aH7i@m1n$@KyL~@wNDBe2w@zd=0)UcqATgGJaD$1;2^k5>Lf%;VI&`@f18&JPl99Z;Ri- zZ{um=>3AA`M?3?+gQtsU;^}yXcov?4XNqUznRu3X4xWW)i|69mc#im8JO|GezlZ1I zcg64Hckz4T5Ab{Veepc}KK?-bA^rf*6VJ!<@Q30B_(MEjyb#aF3&e}?0=!VX7%#+& z#7poZyjZ*xFUCv6%kUDsRQwTMikFE$#>?aYP?3g4zIy$#q04}yiWWXUWeCF|wL59>n z$dLL68B+fsL+T%7Nd1Ehseh0m^$#+n{y~P+Kgf{!2N_cTAVcaOWJvvkOsRj6A@vV3 zr2avM)IZ3O`Ue?O{~$x^A7n`VgAA#EkRkOCGNk@NhSWc(%G5uo%GBRU>L2vTGn27Q zD#^6;c-Rlf2Se!cN$WEry=!s8d86!A@z3}Qh%o*^>-Rlf2Se! zcN$WEry=!s8d86!A@z3}Qh%o*^>-Rlf2Se!cN$WEry=!s8d86!A@z3}Qh%o*^>-Rl zf2Se!cN$WEry=!s8d87fD|c<3HNJHnIN$d7ZZbL6x5qu*-TM@c7#RH^=i- zaaBH=!h<>5g}ar9;BGuvd3`(>4^iF#55emzZ;02&8z^stH^3VzZ;Us@8!2ysH^Lh$ zZ;Cg@n$xk5`_BkH;q{pNLPuvy@N5v+#+^v+;@eB;`5yBs^RBWIP+s zQ9cFF!6z%9iciL;D4&K;!KW&pj!(s>DW8E)!>22siBHF8D1QT=fzMPv3!jO%ez}Mpi$~WQ#_y*-~;~Vge%HP2^;%_T|7k?XnNBMjBJNUcG-^bs@-&0g)9`3`(L zUZi{{UWD&Zz6;-h?^M1U--+*1z6alh?^gaHz8l}8d@sHS|4?}`{vp0s`96FvUaWjS zUX1TkegNNx?^k{h-;W03@1?8XP7x0V9 zFX0#Q&y|0He~w>Lei^@nf1&&e{sn$nc`1GwzoPsqeg!X8{v}?DUse7Ueii>x`PcZD z_*crW;a}ljEB^-n8o#FeTl^aSjq)=58~j`4*YR)hGUYe$GW@#ooA`D7hVonZ4g99^ z+xSiVmhwCJE&R6fyZCMVj`DK+4t`hpJ^U_SuKYW^9KToDYgwtk(~$Z*4XMA=kor3f zslU^Z`a2D&ztfQVI}NG7(~$Z*4XMA=kor3fslU^Z`a2D&ztfQVJ58y-(~$Z*4XMA= zkor3fslU^Z`a2D&ztfQVI}NG7(~$Z*4XMA=kor5TO#Pizrv5Hcf9E65OvWNc~-g)Zb-D{auFC-(^VsU53=(Wk~&9 zhSc9>Nc~-g)Zb-D{auFC-(^VsU53=(Wk~&9hSc9>Nc~-g)Zb-D{auFC-(^VsU53=( zWk~&9hSc9>Nc~-g)Zg`Z>R-p3$ARndAMIb8*#Ch9@ixF&`S}66t@i2%A8(+%5#9iAsJt=W5O1Ws3El{Ath_1S7;mCH z6mNnzRo)D5iiaw1j)&sSl()c};mwt|#GB(Sl()iL;4PK6##`d8l()fK;jNX2;jQsD z%G=^?@G#}!co^PRc{{u<9m>?~HfC zBa}zt5qM|iQFv!OQh66V5|2{e6_3KZD38Xw;9Zr+;9c=(<*|4)9;3V)9)rg!?~cdf z-IVvhyW!oH_r$y7J(Tytd*D5l_r`nTy_EOCd*Qv6$Kk#4KFa&zeegKt@pv5GS9t>7 z7mrt-h{xjz%KPC7c%t(Dcp~0Uc@o|a@2@-=?~f-bAAl#}$;t=f$@l=}gYW_PK;?t+ zf%qWhL-0ZPVC6&c!T1p6!|);aP~|E3P<)v3RD2koqC5>x!BdqF$5Zh%<>`1DK3w?- zd^n!2d?cQZk5Hb0kHAMN&%{UK8OlfD8F;4h(Re04O8FRk6h2z{SbQ`-M)^2=3_e!* zczi5APWc3U96nxo7Cs)IpnM`e0nbuC3D3eOD$m9z;**r;;FIud<&*JjJV*HyJO`hw zd@4Q}pQ3ykJ_Vnud^$cApQd~UJ`JC)d?r2}pP~E>d0`b0sNrykMV=}N6HW3AK@P>Ka78jA5wk{`68?qqEBF`qW#y&#W&DcrtN0bXRQZ>9DSlP?SNK)@OXXkVU*caWzlMK> zf35r*{A>K0@^A5L_&3VS@Ne*Mm0!od#mki6z{~LK%5UP=@f*r-;WzM`%5UR0@mtF8 z;J5JG%J1U0@jJ@P@jLik<@fNrc)9ZL@N)cKWv^wW{w_o6?=qzRE<@_?GNk@4L+bA` zr2Z~L>hCh7{w_o6?=qzRE<@_?GNk@4L+bA`r2Z~L>hCh8{w_o6?=qzRE<@_?GNk@4 zL+bA`r2Z~L>hCh7{w_o6?=qzRE<@_?sxtL=Rhjy`N&Q`qJTn=~q>M~UkEj0bs#AZr zA@z3~Qh&E0^>-Umf43p^cN-Umf43p^cN-Umf43p^cN-Umf43p^cNhXB-V$%6ybaz8Z>>BGZ;iK6-WG3zhba%o z!|=As+u?2TaOLgsaJ-%J4tP7fz4DHDd%T14PIw2rqw)y6Bi>1QXS@?0p*#|gz&k6C z!aL)U%Ddo^c$D(4cog16c{JVy@2Wfo?}|q&kHw?$80FpY7(7;acRUvFro0E<4ezeJ zC*B?Jp}ZH~1MjK4H{KKPrMwT`3-7Hw4)2ZkQQjBtgU2b4$K&w6$`kOuc)apNJRVO_ z-VaZ}6P5SJ6Y+k^lkk3cf91(|e>_R~06Ym#Rz46<#s?@Lgb%<6Dj$pw#0M!Kf)Bz6 zD<6sv#)l{$h7ZAqDo??O;=`1u;=}M16 zgz^l01U^!ECO#6+P(BLJz%!MP#xwCz%E#cN@X^Z0;-m2~%E#ej@UhCr<74r0$|vCC z@bSvC@bUNrcosfUc{V-~pQJnopM+;CpNwbYIm)NtIrwDdQ}N086y?+K zDfm?7)A6bJH03k!Y4~*IGx6#84CQa&Gw_+pXW=vPH4ZaFrt^6%~HNHmqT6_)umhyG@TliY#>+!YtI^_lUI()tI4fuMzK>0?z0NRlXhHif>b1gm1&QE8l@{$BUHj#EbA9%6H*A@SVzc z<2&(P%J<;A@ZHKk#CPL+l<&p&;2$b4#y`aOD&L3i#fz2i$BXfO$`9cC@cqgU;`{Lf z%0I#n;0Kj|j32~5Qho^k2>)35Vf-AICqzKUIDL{}ey2yaYdvpHO}hKY^DhKZTdzCzYSZPvWPPe}KcoB{eg;3Q{5*aZKd1Zxehxpc{33oHzo7hc`~rSa`6c`!{<-om@Xzr}$}i)W z@Gq2K!N0&SD=)<_<5!el#joI{%D==*@vF+e!mr|AD*qb)68}p1HT*05YvteIU*p%5 ze~VwkzfoR>e}jLk{5t+EUZ(s8UWQ*+eiOfr-%x%Fzk%OWejC4u-%@@DzlGmceiy%u z-%(zU-@)%HzlYz&%awnJm*e*;do3&VcN-Umf43p^ zcN-Umf43?1cN-Um zf43p^cNDcmq}d-_LAo+rV$@6 z@v@23f8cfR>PdOl`ZFK9PaD_--5pYxIbCjVVF%3%)SCp^gtsX;kQWdfhJXL?Jt9Fx~VAjFyXFQ;=hx;+bTrg?2QS|9Q{GiPx1aR$T>ir8iA^K_WNZOO+ah6kQ%6CsUI7Ob|U$eo8K< z70RZ-X|F||Or~uk_zo z*}27C=wX}qNpGtY=$L5PR4%?ga<)(!$_w+QPije^oc5wYXRJ1km%X-f8I~%O%Q=C@ z(rRMr{d0?B{+B&iO2m(#)cbznY00&pTj+CZyEm2_9KEQnO}w9xeDO+p(M~ti@)18y zS-fpOi@gm$DxKf$<-KyO)aWj?ZBjyyekYNw?J44WCPEw!nr{?8Z?0#FEU9sAt3=$F zTz?7OCU(CGO?}0i#hKlk-%Cc_B3|B(tz9@D_O|e;pSy$Re{s)~UH7fpp9hoCGpR!WV zALrTINlkAl6?>_8Q*(*rNq{7IOK6$Yuz5atOUnMiK*?lGjJ6doiML9nnq2GOXY4-S zwXbphUW;SS+I@Uw`ODTxow57ZtnDw$Pt55Q<1If@G97OH!T+<@l`af;j!b2Ux0E4b ze^xrp>140T1zaaT$Vuxk&qz#>XJj_RFWn}?N;!*~_r-Bcyw`}&7^x8@_H??<%a-pa zzSje!w!F5lQ0f#dDUiCQ`{g-lnI_L4pbua5XCS>IG400`U0n6}OCN!064FlU zKQE#3x24it{;i(0kYs-v+ESwSORHJZVX3s1q@~=!vEg)h-FjTomua{}{!(O5d7&Ox zEoeWdP>T=RtTOwG!(V(UvmWK4oye>QKii}`4fJ9( zOT4^to${ZNSNCzQ{LqxC|REe~~(AlK4FDt2o&>tHK@={iT^acSG8W zeZNFKA0U0LCN`9w;Sqig8||udQyL_PuU^7vXy$KoNaLm4lCP%8OYJ0jmUQ*clo+Yq zmfByIZa1WJJ83Gb9koI;g}BM zw(1-#wZf&5^sgtq1Hz@7)DI8*rH4C8?QmwBdj1Y(%D-5LHj(Id8~lW^;&(IR0MALO z{op5u{Kw5mYb-9Xue879C3c%c$s~r?44E#0rDc*WIWks8c*dyMC;P|%Zk)+9DU*Yy z$cQo-CF9SR$)qyLIV|aU`O{?Vv|`DaD8pkVJFmE{G`9WnnNXXIE|auS$FzW~!p?b2 zKvVptg{=Db;(3x97%St-W$c6ck{MSL;U`&nAu@&*|9Tt#WN+goHLTm2_T~P3uSC4g zNLI}ywG54IA_@7@y2<7BNiQz2TmPK5+qj9nJ?EKcf2C&CpKH?k;Rk;C*q`~|B5QtX zE;Xsox*3n!Z8e|%*V8_DIu4%R3s2{Rr!(QxnegdM_;e=xuR0UHT$A8*Hyb}+c0K>c z+FsOU<;}A7CpMARHm~Xx&HgOxQb%Gw+|(;uu1qmRp^v*_MM|-xQsnq!Ul4}CP^*$sj!G`sB)?2d6WP0-?ha|pU^swPS+WUEGsAVJNc(mcaUq{a@$?%it zQ1-#&0jWXRbogUAT%mPk#6dUE-0-2C% z?WKPzlChk~uN@v0LXeQ<7bl4?R22P#y`QJEYge=A?lL*`AdkTK0ng#drlk_;p zlKcostnpi;lRX_>x0+?gr3B`O*d#kv5}*C8?0&vhU;9_H?4-gl|73{{ydaa$=LJZj zNM>Cb7s>$3sHp0n_CYnRs%llUD*8S!U$P&B$?(d(bkXibUQly%^~Ov>N~S}yr-w;; z7*SA8o{ZZkBONlyA<^Y!g_7mSlgx;UGy2g!)N@9Joz)tsNri`tD=Li-3zd<@6*c@| zAL_Y0-qoxj+FyoqUK2wlJyeonQ<5vy@XKB7Q_UJ;3IiqGL0(nS^zZE>JWa1r&4LqR z17-5zinjMDc7(~eOq=B7S5)+ay{|Q_2<57E5fZK0qEhRJcrGomDj{!`v$C4=tDKgj zGV8~m_oLTkdY~i}hB8C{I?4TDpWvC~sMJ?g@cXkTw?InhMTrmdtF=m^Y<{#m=cH%G z?pb2hC23)fGMgj@X4zzXr3rhOx7Aa%t=BYv{+xORFhr;GP>2cphs1Mn0;uxgSq<_` zgLQ1;P*wc?Sw&{$N{&Nf0}gwh2onENm^FXo{B~7-un+Qd8t+i*JaO?+dH1a5lIB}a z7n4RZuLv?jC9C2Ze{Ub+xd^Y=NZ=psrHTd1 zAG$Scyto^~aE+DN5S9Vic@-6Kl|A>~Uu~@8|9l0J*4jd{Y=LnS#XH7IxAs8ZFWBVo zHvYQJpD#X|+kojVj#ny~g$0#*C*CUD$wIMm;ZL?yjIEz334XTxhh6f$eUN8l^7yXK zbQGHzk||wcB_mc60&EP}hqrBtr^oA8ulR0pewh*#csM}DU43Z>!zL$?sp4TB1FeqX z6~^BxcTA;a?jIR7Jt=#DL(+>Q=%7bd(Q%%;skx08mw*1E_6m_1j*1rlyM3tD;ubbZ zRz?2)Y|twrrJJxQPyb~qi+d?$T3qosNeq$HX1@)^f7<(dE^ABcl~FZX?Z}Kvk(h{l z8ClWx@9lA(l3Q7?xgIU~4>g{-D%KHLD}>uVCo`88TXW`Adqwd-+DCf^Olup%|IZa4 z9~=16Chp8Y3jg)t)tSX(h>Q!6w2%R*nGuy9Tmw8yiFP)Lee&9@-AoAmJ6(p4`t?L2 z14<57oXQXOG1gV?WFu#I(lhD9y2MsGk*8K@pr0iAZ}N0gf}=<>{CPm8vuBer4v7l2 zt*WT*M|-m8T$r$5R`or}>>1~18&DEw&CG$7XXXK(nJuzxK5CP5=Fy;n(N-g;D4IgxwhrsyOQ^UkYGIr3MsK)bUSyUp8shS2HSA@MN=o zWXR#-xbF1&(TYNUuqS!?yzhU;aw;K^r$?oy;4fo^?^sl4KJMa`LO;_b2{y;HN)JJ< z=g&;`l{@1JXZmOs`q=@=(wWsWiz>dW@G#q8?d+NC-8SA5SL$wR`2Fjd$l5tMAT&(+ zuw#i`l{ekGnk9}=lEZAxB`yi2lSZZZF=gaNlvG@aAMJfTL+Du>uhbu{@<~R2B4K29 zKt-Y7+xvSi@2fvoqsT6!Sb;yjMjPl^qb1q+`oo`ZE|0^ExUgi23UEkP!NUjR_k8t* z+cm{zeF5Z=z0vP?KZ^o~EsV#;L{`hvE5N#;lC4X??KQr>bx(y9R`kz5e~reTt>)IQ zSE?;V5?vL=es3ROH9w(ROSDAhcV^$%Ku2upqf4no&ov!tj`RM=I;V;}FUb=E`Tu83 z1yP~3k}FRIL;1^**3{^0edX%6!0nHZ?8dAPl335DmvlQn{d}PGvRT*l;RBr5jp68J zO^%hTD0rA~sxAq5JmR!!hzu+)ij8F9S80MICgWQ2y{AWuexk|7Dmx*Mo2b(4IM`Ee q4Qq1r Date: Wed, 12 Jan 2022 01:06:02 -0800 Subject: [PATCH 0324/1001] Bug Fixes & Cleanup - Cleaned up egg file in general - Fixed / cleaned up startup command (autosave bash in particular) - Fixed typo in Configuration Files config - Fixed multiple formatting and runtime bugs in the install script - Updated default save file from .sv6 to the newer .park format --- game_eggs/tycoon_games/openrct2/README.md | 1 + .../tycoon_games/openrct2/egg-openrct2.json | 107 +++++++++--------- game_eggs/tycoon_games/openrct2/save.park | Bin 0 -> 73489 bytes game_eggs/tycoon_games/openrct2/save.sv6 | Bin 320751 -> 0 bytes 4 files changed, 54 insertions(+), 54 deletions(-) create mode 100644 game_eggs/tycoon_games/openrct2/save.park delete mode 100644 game_eggs/tycoon_games/openrct2/save.sv6 diff --git a/game_eggs/tycoon_games/openrct2/README.md b/game_eggs/tycoon_games/openrct2/README.md index 97b75edc..337d0513 100644 --- a/game_eggs/tycoon_games/openrct2/README.md +++ b/game_eggs/tycoon_games/openrct2/README.md @@ -79,6 +79,7 @@ ___ ### Known Issues The following are known issues that are unique to running OpenRCT2 on Pterodactyl, but likely can only be fixed by further development/updates from OpenRCT2. - Only building from source from the `develop` branch currently yields a package that is bootable. This will no longer be true for any OpenRCT2 releases after v.0.3.5.1. + - This also means that clients joining the server must be on the latest develop branch as well. - Configuring a password on the server disallows non-admin clients from entering in a password in their client to connect; it just disconnects them. Admin clients can still join normally. - You may rarely run into the server crashing on start due to a "Floating point exception(core dumped)" error. If this occurs to you, please help with OpenRCT2 development by doing the following: 1. Add the following to the beginning of your server's startup command: `SEGFAULT_SIGNALS=fpe LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so ` diff --git a/game_eggs/tycoon_games/openrct2/egg-openrct2.json b/game_eggs/tycoon_games/openrct2/egg-openrct2.json index f46484ac..fee0e2a4 100644 --- a/game_eggs/tycoon_games/openrct2/egg-openrct2.json +++ b/game_eggs/tycoon_games/openrct2/egg-openrct2.json @@ -1,11 +1,10 @@ { - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "_comment": "Pterodactyl OpenRCT2 Egg ~ Red-Thirten and parkervcp ~ 2022-01-12", "meta": { "version": "PTDL_v1", "update_url": null }, - "exported_at": "2022-01-12T02:53:49+00:00", - "name": "OpenRCT2 (In Dev)", + "name": "OpenRCT2", "author": "rehlmgaming@gmail.com", "description": "OpenRCT2 is an open-source re-implementation of RollerCoaster Tycoon 2 (RCT2), expanding the game with new features, fixing bugs and raising game limits.", "features": null, @@ -13,16 +12,16 @@ "ghcr.io\/parkervcp\/yolks:debian" ], "file_denylist": [], - "startup": ".\/OpenRCT2\/openrct2-cli --version && .\/OpenRCT2\/openrct2-cli host $(if [ {{LOAD_AUTOSAVE}} ] && [ -d ServerData\/save\/autosave\/ ]; then find ServerData\/save\/autosave\/ | sort -r | head -1; else printf {{SAVE_URI}}; fi) --port {{SERVER_PORT}} --user-data-path \/home\/container\/ServerData\/", + "startup": ".\/OpenRCT2\/openrct2-cli --version && .\/OpenRCT2\/openrct2-cli host $(if {{LOAD_AUTOSAVE}} && [ -d ServerData\/save\/autosave\/ ]; then find ServerData\/save\/autosave\/ | sort -r | head -1; else echo \"{{SAVE_URI}}\"; fi) --port {{SERVER_PORT}} --user-data-path \/home\/container\/ServerData\/", "config": { - "files": "{\r\n \"Data\/config.ini\": {\r\n \"parser\": \"ini\",\r\n \"find\": {\r\n \"general.autosave\": \"{{server.build.env.AUTOSAVE_INTERVAL}}\",\r\n \"general.autosave_amount\": \"{{server.build.env.AUTOSAVE_AMOUNT}}\",\r\n \"network.player_name\": \"\\\"{{server.build.env.SERVER_PLAYER_NAME}}\\\"\",\r\n \"network.default_port\": \"{{server.build.default.port}}\",\r\n \"network.default_password\": \"\\\"{{server.build.env.SERVER_PASSWORD}}\\\"\",\r\n \"network.advertise\": \"{{server.build.env.SERVER_ADVERTISE}}\",\r\n \"network.maxplayers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"network.server_name\": \"\\\"{{server.build.env.SERVER_NAME}}\\\"\",\r\n \"network.server_description\": \"\\\"{{server.build.env.SERVER_DESCRIPTION}}\\\"\",\r\n \"network.server_greeting\": \"\\\"{{server.build.env.SERVER_GREETING}}\\\"\",\r\n \"network.provider_name\": \"\\\"{{server.build.env.PROVIDER_NAME}}\\\"\",\r\n \"network.provider_email\": \"\\\"{{server.build.env.PROVIDER_EMAIL}}\\\"\",\r\n \"network.provider_website\": \"\\\"{{server.build.env.PROVIDER_WEBSITE}}\\\"\",\r\n \"network.log_chat\": \"{{server.build.env.LOG_CHAT}}\",\r\n \"network.log_server_actions\": \"{{server.build.env.LOG_SERVER_ACTIONS}}\",\r\n \"network.pause_server_if_no_clients\": \"{{server.build.env.PAUSE_NO_CLIENTS}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"ServerData\/config.ini\": {\r\n \"parser\": \"ini\",\r\n \"find\": {\r\n \"general.autosave\": \"{{server.build.env.AUTOSAVE_INTERVAL}}\",\r\n \"general.autosave_amount\": \"{{server.build.env.AUTOSAVE_AMOUNT}}\",\r\n \"network.player_name\": \"\\\"{{server.build.env.SERVER_PLAYER_NAME}}\\\"\",\r\n \"network.default_port\": \"{{server.build.default.port}}\",\r\n \"network.default_password\": \"\\\"{{server.build.env.SERVER_PASSWORD}}\\\"\",\r\n \"network.advertise\": \"{{server.build.env.SERVER_ADVERTISE}}\",\r\n \"network.maxplayers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"network.server_name\": \"\\\"{{server.build.env.SERVER_NAME}}\\\"\",\r\n \"network.server_description\": \"\\\"{{server.build.env.SERVER_DESCRIPTION}}\\\"\",\r\n \"network.server_greeting\": \"\\\"{{server.build.env.SERVER_GREETING}}\\\"\",\r\n \"network.provider_name\": \"\\\"{{server.build.env.PROVIDER_NAME}}\\\"\",\r\n \"network.provider_email\": \"\\\"{{server.build.env.PROVIDER_EMAIL}}\\\"\",\r\n \"network.provider_website\": \"\\\"{{server.build.env.PROVIDER_WEBSITE}}\\\"\",\r\n \"network.log_chat\": \"{{server.build.env.LOG_CHAT}}\",\r\n \"network.log_server_actions\": \"{{server.build.env.LOG_SERVER_ACTIONS}}\",\r\n \"network.pause_server_if_no_clients\": \"{{server.build.env.PAUSE_NO_CLIENTS}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Listening for clients on\"\r\n}", "logs": "{}", "stop": "^C^C" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl OpenRCT2 Egg - egg-openrct2.json\r\n## Authors: David Wolfe (Red-Thirten), parkervcp\r\n## Date: 2022\/01\/11\r\n## License: MIT License\r\n\r\nGITHUB_PACKAGE=\"OpenRCT2\/OpenRCT2\"\r\nMATCH=\"linux-bullseye-x86_64\"\r\n#DEFAULT_SAVE=\"https:\/\/github.com\/parkervcp\/eggs\/tree\/master\/game_eggs\/tycoon_games\/openrct2\/save.sv6\"\r\nDEFAULT_SAVE=\"https:\/\/github.com\/parkervcp\/eggs\/tree\/master\/game_eggs\/tycoon_games\/openrct2\/save.sv6\"\r\n\r\n## OpenRCT Install\r\napt -y update\r\n[ ! -d \/mnt\/server ] && mkdir \/mnt\/server\r\n# Remove existing installation if present\r\n[ -d \/mnt\/server\/OpenRCT2 ] && rm -rf \/mnt\/server\/OpenRCT2\r\n\r\n# Determine if installing from source or from release\r\nif [ \"${VERSION}\" == \"develop\" ]; then\r\n echo -e \"\\nInstalling\/Updating OpenRCT2 from source...\\n\"\r\n\t# Get required packages\r\n apt -y install curl git make cmake gcc build-essential libicu-dev pkg-config libcurl4-openssl-dev libcrypto++-dev libpng-dev libssl-dev libzip-dev duktape-dev nlohmann-json3-dev\r\n cd \/tmp\r\n\t# Clone the branch and check if successful\r\n\tgit clone --branch ${VERSION} https:\/\/github.com\/${GITHUB_PACKAGE} && cd OpenRCT2 || { echo -e '\\nFailed to clone \"${VERSION}\" branch from https:\/\/github.com\/${GITHUB_PACKAGE}\\n' && exit 1 }\r\n\tmkdir build && cd build\r\n\t# Prepare CMake files for a lightweight and CLI-only build of OpenRCT2, using the appropriate flags\r\n\tcmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DPORTABLE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_FLAGS=\"-g -gz\" -DDISABLE_TTF=ON -DDISABLE_GOOGLE_BENCHMARK=ON -DDISABLE_DISCORD_RPC=ON -DDISABLE_GUI=ON\r\n\techo -e \"\\nBuilding OpenRCT2 package from source...\\n\\tThis process can take quite some time. Grab a coffee :)\"\r\n\t# Build OpenRCT2\r\n\tDESTDIR=. make install\r\n\t# Check if build was successful\r\n\tcd usr\/local || { echo -e \"\\nFailed to successfully build OpenRCT2!\\n\" && exit 1 }\r\n\t# Make executable-ready package by moving compiled files to the correct locations\r\n\tmkdir -p \/mnt\/server\/OpenRCT2\/data\r\n\tmv bin\/* \/mnt\/server\/OpenRCT2\/\r\n\tmv share\/openrct2\/* share\/openrct2-cli\/* \/mnt\/server\/OpenRCT2\/data\/\r\n\tmv share\/doc \/mnt\/server\/OpenRCT2\/\r\n\tcd \/mnt\/server\r\n\techo -e \"\\nBuild of OpenRCT2 package complete!\"\r\nelse\r\n echo -e '\\nInstalling\/Updating OpenRCT2 from release tag \"${VERSION}\"...\\n'\r\n\t# Get required packages\r\n apt install -y curl jq\r\n cd \/mnt\/server\r\n\t# This is a simple script to use the GitHub API for release versions.\r\n\t# This requires the egg has a variable for GITHUB_PACKAGE, VERSION and MATCH (MATCH is to match the filename in some way).\r\n\t# This supports using oauth\/personal access tokens via GITHUB_USER and GITHUB_OAUTH_TOKEN (both are required).\r\n\t# If you are getting hit with GitHub API limit issues then you need to have the user and token set.\r\n\tif [ -z \"${GITHUB_USER}\" ] && [ -z \"${GITHUB_OAUTH_TOKEN}\" ] ; then\r\n\t\techo -e \"\\nUsing anonymous GitHub API call.\"\r\n\telse\r\n\t\techo -e \"\\nGitHub user and OAuth token set.\"\r\n\t\talias curl='curl -u ${GITHUB_USER}:${GITHUB_OAUTH_TOKEN} '\r\n\tfi\r\n\r\n\t# Get release info and download links\r\n\tLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\n\tRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\n\tif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n\t\tDOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\n\telse\r\n\t\tVERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n\t\tif [ \"${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n\t\t\tDOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH})\r\n\t\telse\r\n\t\t\techo -e \"\\tDefaulting to latest release...\"\r\n\t\t\tDOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n\t\tfi\r\n\tfi\r\n\t# Download and unpackage the release\r\n\tif [ curl -L ${DOWNLOAD_URL} | tar -xzv ]; then\r\n\t\techo -e \"\\nDownload of OpenRCT release successful!\"\r\n\telse\r\n\t\techo -e '\\nFailed to download release tag \"${VERSION}\" from https:\/\/github.com\/${GITHUB_PACKAGE}\\n' && exit 1\r\n\tfi\r\nfi\r\n\r\n## OpenRCT2 Setup\r\n# Setup ServerData\/save directory\r\n[ ! -d ServerData\/save ] && mkdir -p ServerData\/save\r\ncd ServerData\/save\r\n# Download default save.sv6 if missing\r\nif [ ! -f save.sv6 ]; then\r\n\techo -e \"Downloading default save.sv6 file from ${DEFAULT_SAVE}\"\r\n\tcurl -sSL ${DEFAULT_SAVE}\r\nfi\r\n\r\necho -e \"\\nOpenRCT2 Successfully Installed!\"", + "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl OpenRCT2 Egg - egg-openrct2.json\r\n## Authors: David Wolfe (Red-Thirten), parkervcp\r\n## Date: 2022\/01\/12\r\n## License: MIT License\r\n\r\nGITHUB_PACKAGE=\"OpenRCT2\/OpenRCT2\"\r\nMATCH=\"linux-bullseye-x86_64.tar.gz\"\r\nDEFAULT_SAVE=\"https:\/\/github.com\/parkervcp\/eggs\/blob\/master\/game_eggs\/tycoon_games\/openrct2\/save.park\"\r\n\r\n## OpenRCT2 Install\r\napt -y update\r\n[ ! -d \/mnt\/server ] && mkdir \/mnt\/server\r\ncd \/mnt\/server\r\n# Remove existing installation if present\r\n[ -d OpenRCT2 ] && rm -rf OpenRCT2\r\n\r\n# Determine if installing from source or from release\r\nif [ \"${VERSION}\" == \"develop\" ]; then\r\n # Get required packages\r\n apt -y install curl git make cmake gcc build-essential libicu-dev pkg-config libcurl4-openssl-dev libcrypto++-dev libpng-dev libssl-dev libzip-dev duktape-dev nlohmann-json3-dev\r\n echo -e \"\\nInstalling\/Updating OpenRCT2 from source...\\n\"\r\n # Setup temp directory for building and move to it\r\n [ -d temp ] && rm -rf temp\r\n mkdir temp && cd temp\r\n # Clone the branch and check if successful\r\n git clone --branch \"${VERSION}\" https:\/\/github.com\/${GITHUB_PACKAGE}\r\n if [ ! -d OpenRCT2 ]; then\r\n echo -e \"\\nFailed to clone \\\"${VERSION}\\\" branch from https:\/\/github.com\/${GITHUB_PACKAGE}\\n\"\r\n exit 1\r\n fi\r\n cd OpenRCT2\r\n mkdir build && cd build\r\n # Prepare CMake files for a lightweight and CLI-only build of OpenRCT2, using the appropriate flags\r\n cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DPORTABLE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_FLAGS=\"-g -gz\" -DDISABLE_TTF=ON -DDISABLE_GOOGLE_BENCHMARK=ON -DDISABLE_DISCORD_RPC=ON -DDISABLE_GUI=ON\r\n echo -e \"\\nBuilding OpenRCT2 package from source...\\n\\tThis process can take quite some time. Grab a coffee :)\\n\"\r\n # Build OpenRCT2\r\n DESTDIR=. make install\r\n # Check if build was successful and move to it\r\n if [ ! -d usr\/local ]; then\r\n echo -e \"\\nFailed to successfully build OpenRCT2!\\n\"\r\n exit 1\r\n fi\r\n cd usr\/local\r\n # Make executable-ready package by moving compiled files to the correct locations\r\n mkdir -p \/mnt\/server\/OpenRCT2\/data\r\n mv bin\/* \/mnt\/server\/OpenRCT2\/\r\n mv share\/openrct2\/* share\/openrct2-cli\/* \/mnt\/server\/OpenRCT2\/data\/\r\n mv share\/doc \/mnt\/server\/OpenRCT2\/\r\n cd \/mnt\/server\r\n rm -rf temp # Clean up temp building directory\r\n echo -e \"\\nBuild of OpenRCT2 package complete!\"\r\nelse\r\n # Get required packages\r\n apt install -y curl jq\r\n echo -e \"\\nInstalling\/Updating OpenRCT2 from release tag \\\"${VERSION}\\\"...\\n\"\r\n # This is a simple script to use the GitHub API for release versions.\r\n # This requires the egg has a variable for GITHUB_PACKAGE, VERSION and MATCH (MATCH is to match the filename in some way).\r\n # Get release info and download links\r\n LATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\n RELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\n if [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\n else\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 -i ${MATCH})\r\n else\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\n fi\r\n # Download and unpackage the release\r\n curl -L ${DOWNLOAD_URL} | tar -xzv\r\n # Check if it was successful\r\n if [ -d OpenRCT2 ]; then\r\n echo -e \"\\nDownload of OpenRCT2 release successful!\"\r\n else\r\n echo -e \"\\nFailed to download\/unpack file: ${DOWNLOAD_URL}\\n\"\r\n exit 1\r\n fi\r\nfi\r\n\r\n## OpenRCT2 Setup\r\n# Setup ServerData\/save directory\r\n[ ! -d ServerData\/save ] && mkdir -p ServerData\/save\r\ncd ServerData\/save\r\n# Download default save.sv6 if missing\r\nif [ ! -f save.sv6 ]; then\r\n echo -e \"Downloading default save.sv6 file from ${DEFAULT_SAVE}\"\r\n curl -sSLO ${DEFAULT_SAVE}\r\nfi\r\n\r\necho -e \"\\nOpenRCT2 Successfully Installed!\"", "container": "debian:bullseye-slim", "entrypoint": "\/bin\/bash" } @@ -32,28 +31,46 @@ "name": "Save File", "description": "Save file (.sv4 \/ .sv6 \/ .park) to load. Can be a file path or can be a webhosted file URL. An existing save file must be specified; the server cannot generate a new scenario\/save from scratch.", "env_variable": "SAVE_URI", - "default_value": "ServerData\/save\/save.sv6", + "default_value": "ServerData\/save\/save.park", "user_viewable": true, "user_editable": true, "rules": "required|string|min:5" }, { - "name": "OpenRCT2 Version", - "description": "The release tag (version) of OpenRCT2 to download and install from their official Github (ie. \"v0.3.5.1\"). Use \"latest\" to download the latest release, or \"develop\" to build from the latest source (takes longer to install but is the most up to date).", - "env_variable": "VERSION", - "default_value": "develop", + "name": "Load Latest Autosave", + "description": "Will load the latest autosave (assuming one is present) *instead* of the Save File when the server is started. Useful for loading the latest progress of a park after a reboot. Set to \"false\" to \"lock\" progress of the park, and always load the original Save File on start up.", + "env_variable": "LOAD_AUTOSAVE", + "default_value": "true", "user_viewable": true, "user_editable": true, - "rules": "required|string|min:1" + "rules": "required|string|in:true,false" }, { - "name": "Server Player Name", - "description": "The server appears as a player in the player list. This is the name it will have.", - "env_variable": "SERVER_PLAYER_NAME", - "default_value": "Server", + "name": "Autosave Interval", + "description": "0 = Every 1 min, 1 = Every 5 min, 2 = Every 15 min, 3 = Every 30 min, 4 = Every hour, 5 = Never", + "env_variable": "AUTOSAVE_INTERVAL", + "default_value": "1", "user_viewable": true, "user_editable": true, - "rules": "string|nullable" + "rules": "required|integer|between:0,5" + }, + { + "name": "Autosaves To Keep", + "description": "Number of autosaves to keep before rolling over and deleting the oldest one. Set to 0 to disable autosaving.", + "env_variable": "AUTOSAVE_AMOUNT", + "default_value": "10", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|min:0" + }, + { + "name": "Max Players", + "description": "Maximum players allowed to connect to the server.", + "env_variable": "MAX_PLAYERS", + "default_value": "16", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|min:0" }, { "name": "Server Password", @@ -74,13 +91,13 @@ "rules": "required|string|in:true,false" }, { - "name": "Max Players", - "description": "Maximum players allowed to connect to the server.", - "env_variable": "MAX_PLAYERS", - "default_value": "16", + "name": "Pause Server If No Clients", + "description": "Set to \"true\" to have the server pause simulation if no clients are on the server.", + "env_variable": "PAUSE_NO_CLIENTS", + "default_value": "false", "user_viewable": true, "user_editable": true, - "rules": "required|integer|min:0" + "rules": "required|string|in:true,false" }, { "name": "Server Name", @@ -100,6 +117,15 @@ "user_editable": true, "rules": "string|nullable" }, + { + "name": "Server Player Name", + "description": "The server appears as a player in the player list. This is the name it will have.", + "env_variable": "SERVER_PLAYER_NAME", + "default_value": "Server", + "user_viewable": true, + "user_editable": true, + "rules": "string|nullable" + }, { "name": "Server Greeting", "description": "The \"Message of the Day\" that gets sent to all clients who join.", @@ -155,40 +181,13 @@ "rules": "required|string|in:true,false" }, { - "name": "Pause Server If No Clients", - "description": "Set to \"true\" to have the server pause simulation if no clients are on the server.", - "env_variable": "PAUSE_NO_CLIENTS", - "default_value": "false", + "name": "OpenRCT2 Version", + "description": "The release tag (version) of OpenRCT2 to download and install from their official Github (ie. \"v0.3.5.1\"). Use \"latest\" to download the latest release, or \"develop\" to build from the latest source (takes longer to install but is the most up to date).", + "env_variable": "VERSION", + "default_value": "develop", "user_viewable": true, "user_editable": true, - "rules": "required|string|in:true,false" - }, - { - "name": "Autosave Interval", - "description": "0 = Every 1 min, 1 = Every 5 min, 2 = Every 15 min, 3 = Every 30 min, 4 = Every hour, 5 = Never", - "env_variable": "AUTOSAVE_INTERVAL", - "default_value": "1", - "user_viewable": true, - "user_editable": true, - "rules": "required|integer|between:0,5" - }, - { - "name": "Autosaves To Keep", - "description": "Number of autosaves to keep before rolling over and deleting the oldest one. Set to 0 to disable autosaving.", - "env_variable": "AUTOSAVE_AMOUNT", - "default_value": "10", - "user_viewable": true, - "user_editable": true, - "rules": "required|integer|min:0" - }, - { - "name": "Load Latest Autosave", - "description": "Will load the latest autosave (assuming one is present) *instead* of the Save File when the server is started. Useful for loading the latest progress of a park after a reboot. Set to \"0\" to \"lock\" progress of the park, and always load the original Save File on start up.", - "env_variable": "LOAD_AUTOSAVE", - "default_value": "1", - "user_viewable": true, - "user_editable": true, - "rules": "required|boolean" + "rules": "required|string|min:1" } ] } \ No newline at end of file diff --git a/game_eggs/tycoon_games/openrct2/save.park b/game_eggs/tycoon_games/openrct2/save.park new file mode 100644 index 0000000000000000000000000000000000000000..a634de47a640f124fdba544e93f1f97972d049d0 GIT binary patch literal 73489 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

    bhH$cEK*wdd2|-f@zC*v6h4pcV7&ZTq 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%0DT#vyc_wKgO67o6)<(*u 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 ziLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~O zu>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og# z{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>u ziLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~O zu>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og# z{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>u ziLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~O zu>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og# z{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{)w{w ziLm~Ou>Og#{)w>uiLm~Ou>Og#{)w>uiLm~Ou>Og#{>fUcf3jBVpJM%!{?z@ki zp9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r z3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ= z>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@ki zp9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r z3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ= z>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@ki zp9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r z3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ= z>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@ki zp9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r z3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ= z>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@ki zp9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r z3hSQ=>z@kip9<@r3hSRL>z@kip9<@r3hSQ=>z@kip9<@r3hSQ=>z@kip9<@r3hSS) z)%vGvwf-5_KkaY*GuHX{xBl7Mt$!x0eP5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwu zu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_ z{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1; znXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwu zu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_ z{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1; znXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwu zu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_ z{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1; znXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwu zu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_ z{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1; znXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwu zu>P5_{+Y1;nXvwuu>P5_{+Y1;nXvwuu>P5_{+Y1;nX>+wu>P5_{+Y1;nXvwuu>P5_ z{+Y1;nXvwuu>P5_{+Y1;*;=iCwpQz(WBs%K)<0k6vi{aTU%U0sh4s&c_0NU%&xQ48 zvwnnqWwAfA0qFYvTl;(MzuKkD22@u2g9|?&(0?{y0LOFk{`>mp!usdJ`sc#>=fe8u z!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ z`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#> z=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u z!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ z`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#> z=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u z!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ z`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#> z=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u z!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ z`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#> z=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u z!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ z`sd2}=fe8u!usdJ`sc#>=fe8u!usdJ`sc#>=fe8u!usdJ`sZu4{`p$1e}VPS`&<8F zmCO5E|6=XdzYx~H5Z1pC*1r(epHK0w)%q9xtv|B?==%O!`+M!b+GWfJR95?g2l)Ab z{<8rCIi4Tw|25x2SpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy; z|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;* zLRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMo zSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy; z|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;* zLRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMo zSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy; z|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;* zLRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMo zSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy; z|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;* zLRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMo zSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;*LRkMoSpPy; z|3X;*LRkMoSpPy;|3X;*LRkMoSpPy<|3X;*LRkMoSpPy;|3X;*LRkMoSpPy;|3X;* zLRkMoSpQweR;p@Vi;X@2x4?YCGuHoy$*M+ZV_y+Lx;OiT{A$)!K z28IuXZvfxW@L})`;X@4{4j&31X81<%VesLGkAM${Z)Et!@QvUj3?B&}0pHm0QSgo7 zBMsjKJ`z64@D}(e_$G#rhHnCIF?>^a3w*TUo54rJH#K~7_@?m94BrC28GLiYw}fvF z-@@>%;9J1AG<*zvOZZlXZw=oHKF08E;A7xh8@?@kYxp*XZwKE7zOCWg!?%TRXZQ~A z?cm!Rz9W2l_zs4Th3^30(eRz%JHp2rzB7C*d?&+qf$s$0+3;QAJHvM|d^h+m@Ldhx z9lk4kH^cXU?*`x9@Nw|n;d>aqCwve1IK%gXkAv@N_}=h6;d>dr4}359-iGfB-y6P< z;rqe&f$wYh{_uU_`x)K}-w(dO;cf8!;jM;`hquDp3~z_G!N(gu0X`nyZumraJA8uS zli(BJ6AkZxPlQi0`~dhQc!%K!!aLvx7=94^0QiB19}GVbevsjZzz>2SZ1|z@gW-o5 zei-}^_@Ra$4nGurnBkM*hrtgw{0R8r@X3ZB37-rhWjc=)mK;|xCmejNOG!%u`C4?n^1li(-7Pc-~w_=)h73_k^a z68vPtPlcZhKgICV;HSV(HGB&ERQPFzPlcZbpJMpw@G0=AhMxhS3P0WOGvTMh&oKNf z_!;ms4W9--6MmNAXT#5ePcwWvd>Z_0!_R@A4WDlKx$x=ma|}NZeh&Ox!_SAG3qQ~B z3*hI$&o}%+`1$Y)48I6|0sKP4FNR+TzsT@Q;1|I!HvCff#qdiEzYKl}{8Ga&hhGZ6 z%-0I@b;tgfHFD3t&z`k@WX^n7#CRiC$;abk z@p1AA_&9vLd?G#`pCF%vPrxV2C*u?GN%AT9Bz&@bDn1#XBAeGx1sSIruDmwtOx=8=oVehtI+1%ID*A@p$1<45sh@)P(m{J8uiejGm`KZT#bPs&f@C-GDAGx#a|wEQf78b2dHho8aE z%Fp9x@pJME_&NN%{33oHzaYPaU%)TQFXI>SOY$rDCH%7dDt;NiBEN=T!LQ1%<5%%( z@*DUy{JQ)mejUFdzlGnxZ_01uH}PBYJNPa9w)`%B8^0sJhu^{P%J1WM@q6+I_&xl- z{2_iHe;|K^KfoW#AL9@4NAf55BmA-aDgGFLB7cTI!Jo>X<4^Ht@)!6s{JH!k{v3ZH ze}%umU&>$OFY#CMH~1_3wfrsq8h;~yhrhw!%HQK}@ptkM_&fZ){3HGz{~-T_f51P= zKjR8ulR5O{D1$?Z~v0=ANWE4 z8~^Yx{0ILk|9AXf@qd&52mWvPzsvs<|9AX9gpfy{puePsQwXw>K_rP{tB#qwr{XEFO)=$m8%BJXRi$$KrAF z1UwFpmnY)!c!E3$Prwu9$#^23Bu|4U;mPu}cru;+f=G@Jx7Sc~(3#o<*Jw&w^)_XUDVR+2lF!YdO}si@LtYE7f!CDR#%toW z*Ok}D>*Dp~4e)w+eR)H?KHfmy2ycKllsCp3;*I1@@J4uJc~iVG-bCIEZ-O_KH^-ae z&EzfcW_WXXOT0PWLf#5*fwz>m##`d8Egy3GaY+ly}BE;+^DO@J@JVc~`tM-bLOG?}B%gcgMTp-Q+#+Zg_WjPrN(c zL*5JTf%la6#(Uzu#ZluyPd;*;c4@JaY& z`BZ!|K1DtapMp=7PsgX?)8sSoY4~*cOnf>%Lp}?ifzOoB#%JQQ9^3-EdPeEC9rKE6P{2w#9NlrP2?;)~=<@J0Ay`BHo_zC^wZUxF`{ zFUObS%j7HYW%zRWN_;uKLcR)Lfv=RW##iF20zD2$b--2(IZ^yUd+vGd&ZTNQi zPJBDQL%s{&f$x;>#&_boehxo_pOv4-&*JCg7w~iVdHF^BJbpob3BQ0}lwZa#;+N!C z@Jsk*`BnTfenox_zk*+tU&pWF*W@?wYxs5fP5e53Lw*atf!~zh#&6=cno z-{SA&AMkhhd-+HFJ^n%d3IBk9lz+xQ;-BPS@K5+>`B(fi{zd)^{ssS<(trF`{UZX^ zKO#{5BLdYwB2fJ!0@XhvQ2iqU)juLo{UZX^KO#{5BLdYwB2fJ!0@XhvQ2iqU)juLs z{UZX^KO#{5BLdYwB2fJ!0@XhvQ2iqU)juLo{UZX^KO#{5BLdYw;=9#9;=9#9lIkDv zyLTpcnR?AwN?rXUzhC_$1Jyq=Q2iqV)ju*&{UZa_KQd7LBLmexGEn^^Q&<0=f8ftK zGWDnZeeJT_I6MZAmB-_; zc$_=|kHh2TiFiDoAWy;*@I-kso`@&O)8I*XvOF!GjHi*O!_(kt<>~RXcsh9oJRP21 zo)J%vXOL&YGvFEJnemKxCV3V-6P{U~70--kk!QoR;92F_@vL|@c@8`qo?V_3&yMGi z=fZQ~Ipw+WoOmvI9y}MGTb>usjpvc)!}H*I<@xcvcs_XnJRhE4UJ%cZ7mydi3*ZIi zh4F%TA$bwJ5MEeb6fcYykr%^@;6>%d@uGM!c?rB2UR+)hFOHXxm%>ZnCFP~@l6Wb3 z8N3u;T3!|}jhB&^!^_}h<>m3RcsY3myc}L$UJ);kSCCi2E8rF7mGO#rC3zLR5?)ze z6|am}kypd3;8o?-@v3+=c@4Z8UR_=jua4J{*TQSyHRZMOns_aF9lRD^TV5Bhjn|Ra z!|UL6<@NEpcs+RoydGX(-Vm>kH;^~N8{iG)jq!$fBY6|N5#Ctd6mN_-kvGGe;7#St z@uqk)c?-N5-dx@iZ;rQ+x58WCE#|Xeo_H^LAG{adTizG%jrWoF!~5WU<^A!#ct807ydU0QJ`nGZ50DSS z2jBzcgYkj*Ao&n{5I$Hw6d#Nakq^U%;6vrZ@uB!I`3QU%K3qN$AC8ZZkHSabBjuy< zk@zV27T?O_&E6ld>lSrJ`o>}PmoW-C*Tw1lkti8B>5D4 z5?;8W$(@u~PU`3!s-K3zT&pN`Lv&%$TmGv%}KnfNUE9DEi&TRs<` zjn9$K!{^|0<@52m_&oUnd>%euz7U^}FOV<77vKx!i}8i{BKZ=05x!Wy6km)lkuSrS z;7jGp@um1O`3ig)zFfW%UyiSkufkX0E9I;4mG~<88hjPLTD}%vjjxff!`I+zy`Cz7b!KZ;)@oH{cuPoAHhKCixb86TVr#72k|+k#EDd;9KR}@vZna`3`&= zzFoc(-;VE)@4|QBJLS9ao%k;K9()(RTfP_Hjqj1~!}s8O<@@oy_&)god>_7Feh}Y} zACMoy58wyohw+2>A^8#f5Pn#G6hDj~ksrg4;78@h@uT=L`3d|Oeq4SMKaQV}pTbYz zC*`N{llUq58T=G}T7DKkjh~U9!_VMn<>&FU_&NCn{2YE>ei1*9UyxtIFW?vDm+_1E zCHWQn5`I~J6~ByMkzd2F;8*3>@vHbX`3?LUeqDYOzmDIK-@q!|&jC<@fQs_&xap{2qQ^{t&;9KafAdAK(w=kMW22Bl#2j5&l^I6n~6A zkw3$q;7{ex@u&DR`3w9R{#^bNe~!P9zrtVOFXgZCm-s9B8~hdiTK*P)jlYqTAHP-q z$Uyav3{?NfK=qFdRR738^^Xix|Hwe~j|^1*$Uyav3{?NfK=qFdRR738^^Xix|Hwe~ zj|^4+$Uyav3{?NfK=qFdRR738^^Xix|Hwe~j|^1*$Uyav3{?NfK=qIOZuO7+ZuO6% z`bYlmoylFMQZtrPSO2K*SO2I$^^Xcv|ENIqj|x=(s6h3P3RM57K=qFbRR5?z^^Zzj z{eS*}Kl7;6pZ5QW?EmX;5o`k@Q_clA`rAGr^)?`e^GuQGl&5)kET^OK7U@$y7G9#4=b;R$%6JQ+{KljLdeBs^K37Ei|0$kX9z@U-&ucv?K2JOiE% zPcP4ir^hqMGvOKVjPlHQMm&=|3!VwjEYFH(#2wn&;EH8=|#*4^{;YIMG^5S?=yqLTMUJNfTFNqh&OUO&%CGe8+(s)U{ zl)MaH3NI}$iNEd&qm?J@B6L-gr;Em%I<&3-2xOi}%L+$ot`a@V@f?cwfAqd;s1L?=K&S_s0jw z2jK(of%3ulKzxvV2tEiOEFX#w#)rs<;Y0AD^5OVUe3*O$J`5i&ABhjgN61IvBk+;( z(fCMwlza?63Lh;Wi;u>~$j9Mh@Uimo_*i_Ld;&fWA1|MXkH;s-C*c$DiSo(#M0}Eb z3O)&+ET4)`#;3@q;ZyLb^6B_ge42a)J`JBPpNUV$XUJ#aGw_-6+4xL+mV6FA3!g2Y zi_gaA$mij6@VWB&_*{IRd;vZWpD$mC&&Li?7Dl$k*X(@U`;w z_*#6Od;`7?UoYQ?ug5pYH{l!bjq=U-MtqZe3%&{8EZ>T6#<$3~;al*n^6mIme4Bg+ zz75|l--&O>cgT0)JMf+I-S|#?mwXSt3*Rl@i|@ww$oJuU@V)Z=_+EUU`~bcW-!DIi z@5c|w58(&!gYv`pLHv;X2!04ZEI*1L#*fI4;YaYJ^5ghX{FwX%ehfb@KZzg5PsmT< zC-9T<)A&jJl>7{S3O_ABi=W2N$j{+t@U!ys_*wj%`~rRsKQF(CpT{rAFX0#Pi}K6( zMf{Td3VsQ{EWe6h#;?e);aBjh^6U6j{F?j*eht4azlmSRZ^&=qH}ISC+xSiVmi!KW z3%@PDi{HlY$nW8I@VoN+_+9*-`~iLszb}7?-^U-wAK?%1hw{hxL;R8a3H}IwEPskW z#-GTa;ZN|V^5^(d{F(d({tSOEe~CZGU&vqKFYuT0*Z52PmHZ9<3V$tsi@(O-$lu{_ z@VD~!_*?v)`~&_De=q-tzsEnwKj9znkMhs>NBoog3;qfJEdPps#=ppa!N1^NQ~HnJ zs()0V`bPz-e^j9QM+K^XRG|7t1*(5kp!!Dzs()0V`bPz-e^j9QM+K^XRG|7t1*(5k zp!!FJs()0V`bPz-e^j9QM+K^XRG|7t1*(5kp!!Dzs()0V`bPz-e^j9QM}4>YM}4>Y zM^pWye)rDgE>oi!OR1}W^!KZObfEf22daN`p!!D#s(*B#`bP(gxaV5B&K@r~b76Ph|gJe~V-r5S4OXz%k$U0jakEv7BeR#H2jU!{ay|gU8C_ z@mM@go`A>U@$y7G9#4=b;R$%6JQ+{KljLdeBs^K37Ei|0$kX9z@U-&ucv?K2JOiE% zPcP4ir^hqMGvOKVjPlHQMm&=|3!VwjEYFH(#2wn&;EH8=|#*4^{;YIMG^5S?=yqLTMUJNfTFNqh&OUO&%CGe8+(s)U{ zl)MaH3NI}$iNEd&qm?J@B6L-gr;Em%I<&3-2xOi}%L+$ot`a@V@f?cwfAqd;s1L?=K&S_s0jw z2jK(of%3ulKzxvV2tEiOEFX#w#)rs<;Y0AD^5OVUe3*O$J`5i&ABhjgN61IvBk+;( z(fCMwlza?63Lh;Wi;u>~$j9Mh@Uimo_*i_Ld;&fWA1|MXkH;s-C*c$DiSo(#M0}Eb z3O)&+ET4)`#;3@q;ZyLb^6B_ge42a)J`JBPpNUV$XUJ#aGw_-6+4xL+mV6FA3!g2Y zi_gaA$mij6@VWB&_*{IRd;vZWpD$mC&&Li?7Dl$k*X(@U`;w z_*#6Od;`7?UoYQ?ug5pYH{l!bjq=U-MtqZe3%&{8EZ>T6#<$3~;al*n^6mIme4Bg+ zz75|l--&O>cgT0)JMf+I-S|#?mwXSt3*Rl@i|@ww$oJuU@V)Z=_+EUU`~bcW-!DIi z@5c|w58(&!gYv`pLHv;X2!04ZEI*1L#*fI4;YaYJ^5ghX{FwX%ehfb@KZzg5PsmT< zC-9T<)A&jJl>7{S3O_ABi=W2N$j{+t@U!ys_*wj%`~rRsKQF(CpT{rAFX0#Pi}K6( zMf{Td3VsQ{EWe6h#;?e);aBjh^6U6j{F?j*eht4azlmSRZ^&=qH}ISC+xSiVmi!KW z3%@PDi{HlY$nW8I@VoN+_+9*-`~iLszb}7?-^U-wAK?%1hw{hxL;R8a3H}IwEPskW z#-GTa;ZN|V^5^(d{F(d({tSOEe~CZGU&vqKFYuT0*Z52PmHZ9<3V$tsi@(O-$lu{_ z@VD~!_*?v)`~&_De=q-tzsEnwKj9znkMhs>NBoog3;qfJEdPps#=ppa!N1^NQ~HnJ zs(*B#`bP(oQuOR1}W%=fE*OrZM51gd{bp!&xIs((zN`o{#Se@vkI#{{Z>OrZM5 z1gd{bp!&z8uKqv&z*vY${b~Q7$o{|n7R5FoI^`UJW54YKQf~v|IM39HO?jG!$8$Os zkCP|had^Bu5s$|cpZ-F<%o6B3`&G8oUR(K1%rMxxX5^p7MgSWz4%iH3u@iy{ycpJQ}ygl9)Zzu17 zx5L}ZJL2u}4)RWT2fU-aGu{#JB=3TE!aK{m;+^p>@@{w+ysNxB-WBgA?}2y2yUTmx z-SHmsUU(0@r@S}b6YnMOgZILF%lqQJ@jmi?cptp4yg%L-?T%g5rQ@iFpo_!xYwd^|oDA19xHkHg2yC*tGr3Gzw!1bm`=GCmQXB%gv$ z!Y9k8;*;?y@@e=Ke5!mpJ{6xPpMg)qr^{#J)A1SdS@;ZmrhGO&6Q3oYgU`Ze%je>= z@j3E&_#Aw$d_F!GpC?~{&%@`-7vl5r1@cAs0(_x-F}@IABwvCr!WYYz;*0Sm@@4oE ze5rgnz7$_3Ux6>fm&;e;%kdTRRrm^grF=EM5?>`>gRjC@%h%$o@ip>w_!@kzd_BGv zUnk#yufx~NH{$E@4f0L+27IG@GrkeuB;SH>!Z*ve;+yd;@@@DQe5-srz7^jl-+^z# zx660p+wmRpUHA@sr+hcQ6W=A@gYUw3%lG2D@jdc=_#S+(d_TSy-zPtS@5A@Y590gr z1M)-o0sNr+Fn$m}BtL>5!Vk-j;)n4g@?-cB{HXjmeiT0@KY<^^kIPTu$MF;LQ}_w| zr2I5~5#ec!avKu;-B#^@?Y>T_}7&FK_xR{xN~-9}}qlF@fqI6R7?%f$ARK_xR{xN~-9}}ql zF`?=o6R7?%f$ARK_xR{xN~-9}}qlF~9xF1^PqE3-t33zx|O5^auRE<$uEe z8~>yHfABxzf0F+%{wMr@Qab-P-22Zv)~v&o4VJ}@;|cO4JONLXC*z5Dk~|HbgeS|> z;>ma#c{)4|o>rb7Pm8CMXTa0p>E#*m^mqn&COiY4QJxvkh-Z>#!875R!h9 z&x_}i7r^u3`Q-)i{CEL*A-n)yP+k}>h!>IFxSHR2R<>eLe z@^}S#CAREL8gGfWlDENI z;jQIu@z!`7c{{uf-d5foZ;Q8+cfi}>?d2Wu_IL+*C%gmRQQjHvhB>{1U^ze8Xt*|l8?bh;iKha@zMAg`8a$GK2|;+AB&HZPr%3F z*X8q_4o$)CVT_FQN9`9h;Nc_!8hTX z3Hd4f1b$L}8b67jlApm(;iu(i@zeMj`8oUyepY@SKZ~D} zU%=1d=j9ji^Y{h%CHw+@QGOY}h+mRl!7t&LV*zZ>VII4f_@7|f*WhydbDRuRa`+oJ03snEOK=qFcRR6d@ z^^Xfw|F}T)j|)`)xIp!f3snEOK=qFcRR6d@^^Xfw|G3oE|K}eVBXOxe?f(!o*qw&r;}&E)8Xmm8S(UZ26-kt1D;Wy8PAAkl4rp);hE)G@yvJ@c{V%?o>iV5 z&x&W0=fJb!+2uL$?061&E<6XGQ=S{oiRY5%!E@oc<$3YkcpiB^JP)2%o*&PP=aUz} z^WpjB1@ZiN0eK<30A5gD7%zwyk{7`X;f3Wz@xpi!c`>{QUQ}KjFNznFm%xkR#pNaO z;&=&pDZB(;QeGM_iI!As$#Ua%#ExZO^Q(had ziPw_X!E52Q<#qAecpZ5?ybfMhULUWE*ONEE>*4j~4e|PT19>C70p3vF7;lI-k~hH{ z;f>`@@y2))c{98T-c;TkZ;CgQx4@g>&E+le=6DNvE4&5XQr;SGiMNus!CT?2V`c{jWZ z-c{Zm?}~Sm_rSa1-Q_*;?syM*FT4ldQ{EfziT9HC!F%Do<$dwqcprH`ybs=2-XHIa z_mdC6`{DiN1M&X&0Qn$%06tJY7$1lak`KWL;e+Kv@xk~I`7nG4K2$y&ABqo?kHClF z!{sCK;rIyoD0~DyQa&0ViI0+x!AIevG%x!EPMt& zQ$8D?iO-VH!Dr#K<#X}b_#F8>d=5TWJ|CZp&yz2}=i&3^3-S5*0{J3*0lrYa7+;7l zk}ts*;fv)<@x}NO`7(S7zEr*(Uy3i2ufUh#%jGNa<@gHuDtraLQob5riLa8c!B^p{ z*-->UO@4&a=+vPj)?f4G)E_?^RQ@$JDiSLr{!FS=i<$Lkn_#XK_d=I`? zz8~L2H2l4&*0r?^P0De$@7(a*~k{`hj;fLi%@x%BL`7!(mepG%OKZ+ld zpTLjd$K@yS*{0x3pejY!IpOas}&*A6g z7xDA>1^FfX0)A0`8NY~Ml3&3u;g{uC@yqxX`8E6sepP-QzlvXz-@vco*X1|y>-Y`% zE&K+4Q+^x2iQkgn!EfQW<#+Mh_#OE@{0@FsejmS!-;+PU@8S355Apl>1NkHT0sc__ z7=MUAl0U&8;g97{@yGZR`7`_p{#5=Pe~Leozrdg2&*d-i=lBcxEBpoiQvMo$iNBJ+ z!C&F8pZ-F<%o6B3`&G8oUR(K1%rMxxX5^p7MgSWz4%iH3u@iy{ycpJQ} zygl9)Zzu17x5L}ZJL2u}4)RWT2fU-aGu{#JB=3TE!aK{m;+^p>@@{w+ysNxB-WBgA z?}2y2yUTmx-SHmsUU(0@r@S}b6YnMOgZILF%lqQJ@jmi?cptp4yg%L-?T%g5rQ@iFpo_!xYwd^|oDA19xHkHg2yC*tGr3Gzw!1bm`= zGCmQXB%gv$!Y9k8;*;?y@@e=Ke5!mpJ{6xPpMg)qr^{#J)A1SdS@;ZmrhGO&6Q3oY zgU`Ze%je>=@j3E&_#Aw$d_F!GpC?~{&%@`-7vl5r1@cAs0(_x-F}@IABwvCr!WYYz z;*0Sm@@4oEe5rgnz7$_3Ux6>fm&;e;%kdTRRrm^grF=EM5?>`>gRjC@%h%$o@ip>w z_!@kzd_BGvUnk#yufx~NH{$E@4f0L+27IG@GrkeuB;SH>!Z*ve;+yd;@@@DQe5-sr zz7^jl-+^z#x660p+wmRpUHA@sr+hcQ6W=A@gYUw3%lG2D@jdc=_#S+(d_TSy-zPtS z@5A@Y590gr1M)-o0sNr+Fn$m}BtL>5!Vk-j;)n4g@?-cB{HXjmeiT0@KY<^^kIPTu z$MF;LQ}_w|r2I5~5#ec!avKu;-B#^@?Y>T z_}7&FK`Ad{_%n8A0Mdx@qy|eAE^HEf$AS0sQ&SR>K`Ad z{_%n8A0Mdx@uBJ;AE^HEf$AS0sQ&SR>K`Ad{_%n8A0Mdx@qy|eAE^HEf$AS0sQ&Ta zt^V=ft^NsA|M=g%Gr7xDVa8JG>Ywoa>Yos({t1EVpAe}234!XL5UBnMf$EYos({t1EVpAe}234!XL5UBnMf$EDPdTUH z#Bck6)Z2h0&NI~#Q=aDG$(&BaljLdeBs^K37Ei|0$kX9z@U-&ucv?K2JOiE%PcP4i zr^hqMGvOKVjPlHQMm&=|3!VwjEYFH(#2wn&;EH8=|#*4^{;YIMG^5S?=yqLTMUJNfTFNqh&OUO&%CGe8+(s)U{l)MaH z3NI}$iNE zd&qm?J@B6L-gr;Em%I<&3-2xOi}%L+$ot`a@V@f?cwfAqd;s1L?=K&S_s0jw2jK(o zf%3ulKzxvV2tEiOEFX#w#)rs<;Y0AD^5OVUe3*O$J`5i&ABhjgN61IvBk+;((fCMw zlza?63Lh;Wi;u>~$j9Mh@Uimo_*i_Ld;&fWA1|MXkH;s-C*c$DiSo(#M0}Eb3O)&+ zET4)`#;3@q;ZyLb^6B_ge42a)J`JBPpNUV$XUJ#aGw_-6+4xL+mV6FA3!g2Yi_gaA z$mij6@VWB&_*{IRd;vZWpD$mC&&Li?7Dl$k*X(@U`;w_*#6O zd;`7?UoYQ?ug5pYH{l!bjq=U-MtqZe3%&{8EZ>T6#<$3~;al*n^6mIme4Bg+z75|l z--&O>cgT0)JMf+I-S|#?mwXSt3*Rl@i|@ww$oJuU@V)Z=_+EUU`~bcW-!DIi@5c|w z58(&!gYv`pLHv;X2!04ZEI*1L#*fI4;YaYJ^5ghX{FwX%ehfb@KZzg5PsmT7{S3O_ABi=W2N$j{+t@U!ys_*wj%`~rRsKQF(CpT{rAFX0#Pi}K6(Mf{Td z3VsQ{EWe6h#;?e);aBjh^6U6j{F?j*eht4azlmSRZ^&=qH}ISC+xSiVmi!KW3%@PD zi{HlY$nW8I@VoN+_+9*-`~iLszb}7?-^U-wAK?%1hw{hxL;R8a3H}IwEPskW#-GTa z;ZN|V^5^(d{F(d({tSOEe~CZGU&vqKFYuT0*Z52PmHZ9<3V$tsi@(O-$lu{_@VD~! z_*?v)`~&_De=q-tzsEnwKj9znkMhs>NBoog3;qfJEdPps#=ppa!N1^NQ~HnJs((VD z`X>ace?p-8Cj_d0LZJF51gd{Rp!z2Ss((VD`X>ace?p-8Cj_d0LZJF51gd{Rp!z3- zs((VD`X>ace?p-8Cj_d0LZJF51gd{Rp!z2Ss((VD`X>ace?p-8Cw#a1Cw#a1CsO?r ze)rDgE>nLQOR1}W;`gh6Vxamb2C9Ezp!z2Us()gj`X>gee`28eCkCp2Vxamb2C9Ez zp!z2Us()gj`X>gee`28eCkCp2V(RMu^AC)p#MGbm|B3AX>u>RF0}@isFF5JjJ|Oir zAer+_yQGw-d3YL5C*jHRw0JU}MxG8&gQu0J$J65JF}8@M3szc}cuDUP4|9FM*eom&QxtrQ~JsQg~^3S-dn}MqUmt zgO`<;$IIg7;pRq#r9WqDP+GG0Yq4X=V%l~>2B z;??9e@M?HkU+R(NZ9Tf8;iM&1r@gSVBp$J^rVUGPqLXL(n=Gu}ns4ex??m3POx;@#vu@NRf_c~87M-b3CC?}7J}_r`nT zz2trHUU+YLU%WToN8S(bgZGv9$NS>_+3?G6Il@G^<;=|-4@L~9H`AB>?K0-bUAAygQkH$yhqvT`oQTS;2SbQ`- zMm`Q7gO8Pu$H(I1-ETzob@M?MdqgU^-E$LHen z+YK@MZXN z`AU2_zCykVUxBZbuf|v6tK@6&RrqT8T6{IWM!pVTgRhmZ$JgTP4c~%qm2bzl;@jjq@NM{Z`A&R0zC*qX-+}Lx z@5XoHyX1TDUHESKUVJycN4^i=gYT8^$M@p<YAC@MHLK`APgZenNftW%*V7GJZvV z4Znh4m0!oN;@9Li@N4*W`Az&fenWl>zk%PB-^Op^x8!&5Tlj7HUHmqFM}7~#gWr|k z$M53zN_WOKk>WOKZ)v}_`7!|cbUq|SV~>} zlfGa5lLFO0DNy~B0@Xh$Q2mnv)jugv{gVRKKPgcClLFO0DNy~B0@Xh$Q2mnv)jugv z{gVRKKPgcClLFO0DRuS#`3J^SQtD6p|3vox^|u7J0f{N+8l3!XACP(*kcRV2!Q_;u zd3ah*C*x`4>F_joT6uarEuK!E0Z)ggmuJM&;~C_c@Cw) zS>)O9EO=IVc04PdO`ZeKhG&=O#Ixf$a|Dfm?RbbKm4O+EvkhEJEz z#HZskXHSL18s>+m)BTKRf>Ext~^0bhr&mv6+^;~V6g@D2Dz`DT10zDd3X z--K_LZ^bv`TjbmDE%;XXc6=+oO}+!)hHsbe#JA%+zl2|wU&SxuSLE05EBICUb^I!RO@0Hv zhF_Q8#INHw*f5kuJU*x~wU+}Lf{l{? z@Y?dacx}9nydGW$uPd*Q*Tw6}8{qZu`tpW&eY}CZ5#9iAC~u56#2d+*;EnLc@}_uW zyotOS-UM$dZ;m&`o5@??&G6>(mUwf#g}fEs0&gjAjkm;G$=l$q@YeFScx$|kydB;K zZ!2$)x5eAZJK*i`_VSK+d%T0Z6W#&uDDRAS#5>8m;GOW!@~(JiyohrAcw1MeyCjrYWR$@}2F@ZR#icyGLqydT~N?O^!~Mn2;{Ny<@c{e`epWmXKZ^&52jKyDp!hjF5DyYR zj|buB#Dnp3_<8XQ_<1~7JOmHMFNlZY7w{1AFgyeg6%WTl@i6fSJPZ#PkHo|A2=R+} z1Rg1V36I1tibvrW@k`>D@k@A=_!T?~zbt+gzl>iIkH)XySH)xSt9Z0{EFO)=h{xeE zc&vCl9*f6`C*W~-ym%rWk0*#aZ>P5cI) zEPe}5#&3$J;5YGG;;Hy8JVpFAo`R=}r{SsiZSgz!Z9Gjp9Z$pWh-ct;@O1G^JRQ#v z&%!hCOz~_y6VDRQ!L#se@mxF`&k?_i=is^G_wZc&uK0cYE`Cq^0e%m^FP?|r#~+A4 z#2?^!;`w+U{!qLCe~9Oc7vlMNfp`&KfES7v+pK<=XgE-OuPYqhCdg7fj`F^#2fJj{DpWE{sM0l zZ^j$(Ch-=$32zo}#hdXK@ix2#ZxwIHTk$sW4!jL-7w^Q|@ec7WyaVqPe~EYEUE;6s zF8rlq?M z58f;O0q@28#6RMF_y_S%_y_!>_-Fhh{z?1`{t5pq{uTd>e-ZzNf5E?sf5*S#-^735 z-|+9^f8*crAHVt^Kdb)$L-ikEsQv>C)qjAY`VTNv{{e>TKfqA^2NOa6x{Rfz;{{TbvA7H5d0}R!FfT8*iFjW5mhU!1SQ2hrOs{a5( z^&eoU{sRovf5306|A60CeNH#>i^gNf0F(G`S<_01`POh55mqr?*aX<0WQq5HJyK*=HaePJL4|mZnz8X zD(;TE;%?#=+zodZx8m-&Mcjs4aI3f-x8gQ&2X4dd;vTpicZd(f9k_@1Alw5VC_We; zhz}AUf)Bz6ix0&I<3q%U;Y0AD;=}Qw_%QJi_%M99_(*&>K0BpM%fBXN%9pXXA6k z=izhkx#IKjx%fQs1^7ICzW73XKE6PF5xxLlD83k9h%XXff-k}si!a3&<4eSs;Y;wP z;>+=+_%iVo_%eLC_)2^^zCwHzz5-t+!Yt zI`IwoI()tOMtnWKL3|Uw0pBRT8Q+L+65oPv!Z(X=#W&+y#JAyF@U7z8@vZna@g4X! ze7pEgd^^5Fd>6h0-zmNu--+)M--GYMcZ=`EcjJ4+_u+f+z2f`vz4$)y1Nc6CzxY9X zKYl>`5PkqZD1I0}h#wL^f*-;Uiyy@g<444g;YaYJ;>Yo$_%ZPl_%Zyr_(}XYenR{d zegZ!!ei}cCpAz@PPvNJp1w2GN3=hFW#l!JXJWMFRq+`7DjqE!i$~)z;&FHk9xEP?$Kr9~33wbHFP@0U;|b!| z@B}2b#IwY6@GLxAJQvT# zbHwlBIe4!4JvL3sj#r3R;uZK)@hbc&UMXIUSK?LTHFyh$P zI=o)|IbM%H6K}wu;m^fi;Lq^}@kYD>e<9w4zrY*CoAE}xNxTJb!kfig@n*b5ybW)` zTgBV)R=iET18>9I#XIqKyhFST@4!37U*es3m-s8Z3x6rzjlaZSiND5Q;oahI@NWFI z_*?un{zm*A{sw<5{vLmezZ37l-{J4Yd-3;pk9Z&6gZGMmze-i(Kf5JbDf5kuJU&O!RU+}Nu-|?^bH}N0%H~hQ!-}ra@$FKg!&+6}FsQyld z>hENz{!WJK?_{X{PKN65WT^g5hU)KRsQyld>hENz{!WJK?_{X{PKN65WT^g5rt0rx zsQyld>hENz{!WJK?_{X{PKN65WT^g5hU)KRsQyld>hENz{!YKG{!YKG{?1f?r~iC2 zd6%iPtfl_d-}(2|-`P<8oekCB*--tR4b|V-Q2m_^)!*4r{hbZf-`P<8oekCB*--tR z4b|V-Q2m_^)!*4r{hbZf-`P<8oekCB*--tR4b|VdfA#e+O_4 zaQbyW!Y)7W0sXH5uFSJdU4EVB;ciU3;I88CxGU}^Zo%DfcX2E3j$6cSxCOV0+i@#y z6L;V?+%E2c+i{2ZK-__Qh!4U&@PXok@qzdt@gevie6aXXd@w#ld>B3iA1Xc^ABqnX zAAt|Uhl`KIhvOr}N8uyzk>aEAk@zU_G59EawD?$jG(JXr96kmgD?T0{i;okZfRDq+ zi%-PI;}gUu;S=zQ;*;@-_$2Wu_#}L?_*8r{K1F;QJ_VmDJ{_NmPZOVkPs68+&%~$W zGsI`%Gw_+>v+VW2cIiGAD@fQ6JLPO!{>`H#OLD+#24WU z@P*=w@rC#z@g?{oe6jdad@;U6d>Ot3Un;&FUy3giUx6>fmy55&m*XqMSK%x0mEx=M zmG~<0HTWugwfI_mHNHlC9li!%E506Ii?0*kfUm>Xi*Ll&;~T^`;T!Oc;+ye}_$Ki! z_$GX__*Q%~zD0Z+z6IYZz8&9+Zxi2vZ^O5X@5Hy`JH&V4JMf+2yYZd)F7ZA1E_}E6 zUVJycM|>Z?2j45cAK#1b6F-3O!}p6H#P{O|#1G*I@Pp!q@q_pw@gw*l{IK{@{4jn* z{1|=&KPrA4KZ+j{KY<^^kBgtgkK-rAPvIxcfxS#kL+zREoARdGV;DO@j z@IX9B{5&3npA!$p&*A6AFW~3#VDS(<7{4GMieJD(#KZ6qJXAa!55>d8Bk(XhTs#sF z$0Niq;t_bH_$53NzbGDsU&JqoU&b%tQQ}wdDEzYcRs1r3MLZh6f?pMn!LQ=c;<0!% z9wQ!y$KbKz@pvpAC!T=E;ql^$cs!mUehp8+6UDFNiTE|~B>WnFUHk@q9ZwQZ#*^?H z;y3Xdc(V8{JQ=?!o`T=RZ;7Ykx9}A4+jt6|DxQX?;5zayT3-@((x zGx2mhLp%%5z%#|O@k~5RJO|Ihv&D1qY&=K&E}nzuir>R?@w?*p@w@mv@dx-l{JwY| zejk4z{t$nF=ZWXzdH6%|0{kJKFJ6e};|1bHcmZB0UW^ywMdBrR5ne1_iWlQ0;$?UV zUMl_wFU8BmALC{CBk?ErBmA*=IsO=bB3^+%!OO*;;^laScqLweKNYXSpW>C`)p#Xd zC0>J9;nm``cr{)lUWeDH#_%rba{2BgS{006TZxC<98}Jw6 zP52AEQM?&%#GAxh@Fu)jycKW8Tg2P&7Q9uw9dE_k#5?ddyj{E#Z^t{tyYLRYQ~V{~ ziFb*=!n^R7;@$X5{FV4?{1x6U{s!;HUyHxRU*m7Y-{EiYx8m>dxA;5p9{e5tUc487 zkN1f8;XQb-_y@cf?-T!s_u(JJKj9znkK&*4kN79?FZd_?v-ns1GyX;V8~z3VD*he+ zihmRTfq%oli~o&($AA3lfBdZe&W7smY^eUuhU)KZsQ%7|>hEl*{?3N#?`)|4&W7sm zY^eUuhU)KZsQ%7|>hEl*{?3N#?`*36&W7smY^eUuhU)KZsQ%7|>hEl*{?3N#?`)|4 z&W7smY^eUuhU)M9+v@N9+v@K^^>_ZyHsRU;SNvU;SMS)!)TX{ap;z-^Eb< zT@2OV#ZdiS4AtMoQ2kvD)!)TX{ap;z-^Ebwm04m;Qh4|0mi1pMRaW1~~t^H(}SG_kjM_05|5@vaY{Q^Kf^j zU2!*Y3+{%yi(7Gb+#+tnEx1+Oj$3h?xC6K0c5x5fjyuE$;tt$Hd=Tz|4-_Aa55xzF z55WiFgT;s9gYhBa!|);aQ1RjTP<)v92z(emTzn)x93LS*3Lk-w6d#R`#7Bvb!AIev z#mC~K@iF4#@GlSrd?G#`pCCR7pMXykpNvn$Cy7tNC*hODr{a_G zDdN-cDfm?J>G)K9n)nQS8a`coCO#dXAwCPAfzK45jnBkqiO<1j;j_i(;Z zQhb^C3Va#9Tzn63SWV*6km<6#8-*0!B^p{#n@HO~a@%8vxe4Y3P zd>y`Cd?UUd-ypsT-+*rv-;8g>H;He-H{qMbx8j@eE#lkoE%;XP?f6!FoA?fV8@^q9 zC%zruA-)UWf$tRGjqk*FiSNO8;k(86;=A!Z;`{JD_+Ih-_+EUU_yK$$zF+(xz8^mz zeh5E+9~3`~AH)xdAHfgdhsBTLhw&rg$M7TgQSsyWQT&+r3H%s-T>K<{96up`3O|9L z6hDoh#7~KP;-~P_;$HY^+*8~e_r$%#eQ+<_Tih4-#(l*7a39=P+#mPF{lw4Uez?E* zS==8#BOZXC!Ow~Z;%D&y@gO_^4-`L#2jW5E=kXx?oOm#P4nHq`0Y8rii-+LB_yzG$ z`~n^#9)^eDq2l3qC>|yrfrsJY;*oeb9wB}akH90vFX55+Me!*7B7RByGJXk<62F2+ z;g`j);+OF&;?ejO{Hk~ieie@vkHw?$81Xnf29Fhw$7At0@dP{$j~7qGK<2mAY z@f$@`}hO#hxh|LPdp#b!yk$l;1BV9@j^TwFAy)n z3-ChmV!RM95--7v@M7^&ycjPLFT+dlQt?N4DPAW27%#&gi9f*~;g7}3@yGZR@e2G2 zUM~I=FUKpyEAa~asdyFs6t5Jo#w+nE@fy4euNJSxtMMA~I=lw26|cu@@jCHmcpY9Z z{v5BzpNTi%&+zBsFYxDhgLos}fWHuL!e8Kx;>~y?-Xz|FH{s3Vt#~uuBHo6#;H~2A zcq`r}-hsE_?c$wyJKiDQg?Hec;xF+|yi5EQ-i5yu@5W!^uf$*Dukdd1H+VPxTKp~k z8h<1H4u6Bc6@QPv#ovkd;P3GF;=TBLyhpqb@4{2TsV{BQg_{^M8w<7f4EF;ssSL-ltt zRDTyk^>;B;e-}gbcQI6d7en=TF;ssSL-lttRDTyk^>;B;e-}gbcQI6d7gP0jF;ssS zL-lttRDTyk^>;B;e-}gbcQI6d7en=TF;ssSL-lttRDYM>R)3e@R)1HjzsrBVnY_!? zR@PGg>hJpd>hEf({;r1V?`o+2u7>LGYN-CMhU)KXsQ#{o>hEf({;r1V?`o+2u7>LG zYN-CMhU)KXsQ#{o>hEf({;r1V?`o+2u7>LGYN-CMhU)Lyzxx06Kh~q`&ma5u&;I}X z>&!L4<=1`s=g(jJyZ-#O|9?Iou=~HR|L_pEU#EGvg=sh3UEGSh;}&rnZo#eMcHD~F z#2vT|w~Kq=cHAL85O?4n;)8Gxe4zMXd>}qZd9l;rIygQTPaar1)rjBtA-f3_c1UEj|_>jgJu@hmXO>ijT*~;^V|8;N$S| z;uG=l_yqAu_yl~S_+)${K1qBEJ_(;JJ{6ygPZ6JnPr;{(PsgX?)5K@s)9~ryGx6#8 z4Dng`41A{eYD*x<@gHmRrm^grTA)m zCB9004ZaFrExs0Cjjs`3hp)lcim%7l;_JjW;Op@9;v4bx_y+M!_y&BV_-1?~zDaxw zz6swfz7^k$ZxP>yZ^5^UZ^yUd+r)R^+wkq;JMr!K4)I<14t%HhZhR-cOMDN$3*Rli z7vGKV5#NXJ!S{;q$M@p<#1G*6@crTk@%{J#@k96l{Gj+@{2+cv{0M#sKP-L}Ka3v{ zKZYN{kBT41kK)I~PvFP!b-r~NvH|`_uhx_2Z;{LcV?k9c*_rv|g&*J|08Sw!841QKT5I>6thzH>Tc%b+> zJP;2OKaU6D=fs2YbNG4j3;20FSUdy|#xID6;ur7`@i06D4;2r`L-8>22s{iA7mvil z@d)vYcmy6PehH7nFN#Ou7x7Etm+?z@l=u}q3coCV6~ByM5s${N;8(?C@T+*Vcq|@` z$B4(_F?g(aJRXb3i6`K3c)WNb9*-x8U&9mdMDgo*B7RLg3BQJ47r%jD$CJd9@g)3) z_)YuCE0co|-T zmx@2aOYt)C$9Nh3Nc;)@2!AYIjz7kqh*#iG@N)5|csX7nUWr%WPsOY7r+B4!HC~BV ziPzv&c(r&fUX9m?*WopIt$00Ni`R)i!|U*R@#lCw{!F|9e}+F7e}O;88^jy&2KZ^fJO7V$Q`1#cB^$6N6>@eaHVZx`>x+wl(ZF1!Qp6n}|# z;$7me@GktNcsKqMe;H=e>X$*cQaIf zH$(MzGgN;!L-ltvRDU-^^>;H=e>X$*cQaIfH$(MzGgN;!L-ltvRDU-^^>;H=e>X$* zcQaIfH$(MzGgN;!L-lv-U;Y33A8XUC|6lw6N%sHeUl*_-ygH_-uTR_&j_LK39A` zJ{O-Sz5t(x&lg{a&&L;tFTxk#3&j`X3-LwbOYlYbV)3Q;Vtk4CGJFZXRD3zU6kjI3 z0$+wN7hj1l$5)82!dKuc#aH7i@m1n$@KyL~@wNDBe2w@zd=0)UcqATgGJaD$1;2^k5>Lf%;VI&`@f18&JPl99 zZ;Ri-Z{um=>3AA`M?3?+gQtsU;^}yXcov?4XNqUznRu3X4xWW)i|69mc#im8JO|Ge zzlZ1Icg64Hckz4T5Ab{Veepc}KK?-bA^rf*6VJ!<@Q30B_(MEjyb#aF3&e}?0=!VX z7%#+poZyjZ*xFUCv6%kUDsRQwTMikFE$#>?aYP?3g4zIy$#q04}yiWWXUWeC@vr!2{EPTE{0sh7{5$>?|0eze|Av1T{~P~~|M=Da_*wnk4AtMwQ2pHu)!)rf z{oM@J-_20{-3-;=%~1W_4AtMwQ2pHu)!)rf{oM@J-_20{-3-;=%~bu}4AtMwQ2pHu z)!)rf{oM@J-_20{-3-;=%~1W_4AtMwQ2pHu)!*&6)!*&6)!&`!@AjW>Chs!!l(p2q z`n&(W`nwydzq_IOyBn&%yP^8K8>+v%q58WUs=vFT`nwydzq_IOyBn&%yP^8K8>+v% zq58WUs=vFT`nwydzq_IOyBn&%yP^8K8>+v%q58WUs=vFT`n&h9{(t?Cb?V;#ul@fd z`~UN=E7t(GU-vI;`FRiMe+{rQ&$hPwI?cmvOj~fPxE;6RHgN}T!|mc8xE*(h55yg~ zhxj1e10N_p7$1la5+8yO!Uu~F#Rua<#E0QS@S)ABm3=AA^s=M~jceN8@9}$Khk}vEt+LvG_Rg3HUgCy!b?XJU&5u5QGX06!>x7(a*~5{1koyKPi41KZ&0b_ry=(r^UVS)3~R&H|~jhiTmJQxVN}3?v4A1`{6#g zued+%i~EV6!ToT5@w2!;envb1KZBnY55&*n0pdY;03IlQ4iChG#LweF_&M=l{2YE> z`~rR+4;Bx>gYgUEq4)(nL_7=+!9&Hv@lZTWJOU5H!^I=2Qo`_!)Pr|R^*Trw(*YPCrWIPGKA$}9TfhUXK!jtiv;wkt| z{FZnsehW_#zm2Ehsp4sPDt=r14t^U?6Hmv}@H^re_#Hf5JQGjHGsLs-3_Mdj8_&eE z#B=a0JX<^$&&G4a@8UUluJ}DX7r!fhAHR#=6Mul;!|#jd;rHCC&UL;x6<#e~i&x_{;&pfp zUMpUY*Wz{J&+t0DUi>*;k3SP{z@OpI#b4mh@doimya9h9-h{uv8^xRPM!ZS91#iNe z#ar=ayhXeXZ^2u|+woSsO}qnd!`sC>@pimJybJHZJH=n(op_h{E4&MTDc+60#9xWO z#$Vyx;&1S7{I&R7{5AeY{2l%Ve=GhTe~Z5p@4?^U@5OuZ_jr$ZAKruaihsa+@jmg7 zcpv^j{1g5G|0w<$|A>DQ|AK$QKZ}3GKjUA-zu{l-uj1eFulP6dANV)?yZGPucl^h% z{>RVi?{296?uP2`Zm9n5hU)KbsQ&JT>hEr-{_ckA?{296?uP2`Zm9n5hU)KbsQ&JT z>hEr-{_dvg?{296?uP2`Zm9n5hU)KbsQ&JT>hEr-{_ckA?{296?uP2`Zm9n5zpei6 zzpefjs=xbxzL~tsR8rPb|LSk~ef75(s=vih{Vj&-Z!uJVi=p~k4AtLasQwm1^|u(R zzr|4fEr#lEF;stxq54}4)!$;M{uV>^w-~Cw#Zdh%hU#xIRDX-1`dbXu-(sl#7DM&7 z7^=UefA#(c|G)PClkES`ziwOu+<)E6u=VFXp#L?%#ynfx`s*|gw=-?UZQ>5x zhTFwGa69f0ABa0}5Ai{`2R=}IFg_3;Bt8Tmgbx-UiVwzzh!4Yu;6ufS<3sUb;v?{3 z_;B%&_;7rL_$Yh?K2m%%J`x`#J_a9!j}{+`kH*J{kHg2{W5vhgWASm~6Yz2Pc=3t& zczlBRBzyusQG7B!5uYSJ1)qdZ7N3ew#;1r+!>8a=#i!#_@oC~S@M-vT@tOE^e1`Ze zdmB8}N1bdhw0;dVGWUCVT_FQG7GL5#J=f1>b~k z7T=0*#I@onNe@NM{Z@tyc~e24fhd3268FKq zaBp#6+#B~1_rrZ~UvYoj7xxoCgZttB;%9Mx{ET=2eg;1)9*CdC1H^;y06b9q93F@V ziJ!-V@N?q9_&NN%_yznt9xNV$2jdsSL-7lEhtHf*Y zD!f{}7O%!@#Ov@HyjHv(uf^-cpW$_Qz4&vy9)Bj@fIq{Zi@(61;|=1Ccmw`Iya|7S zH;Omojd+uI3*Lk`i?`y6_$T}W{!#oh{t^Eq{ssSpe-{6Wf5yLvf5X4vU&X)UU-56^ zKk#q(ck#dR@A!{j{g0p3-(sl#7DM&77^=U;Q2i~2>TfYre~Y2|TMX6TVyONWL-n^9 zs=vih{Vj&-Z!uJVi=p~kOx53FsQwm1^|u(Rzr|4fEr#lEF;stxq54}4)!$;M{uV>^ zw-~Cw<+s(}^4scfrTSa`^UdU4riQYX`d5GJ@2kJnQ2nij>Tfkvf2*PTTMgCUYN-BJ zL-n^Bs=w7x{jG-TZ#7hZtD*W^4b|UjsQy+%^|uVsKuRGTO%dh(yw*9;Z^uGq!nP_-ygH_-uTR_&j_LK39A`J{O-Sz5t(x&lg{a&&L;t zFTxk#3&j`X3-LwbOYlYbV)3Q;Vtk4CGJFZXRD3zU6kjI30$+wN7hj1l$5)82!dKuc z#aH7i@m1n$@KyL~@wNDBe2w@zd=0)U zcqATgGJaD$1;2^k5>Lf%;VI&`@f18&JPl99Z;Ri-Z{um=>3AA`M?3?+ zgQtsU;^}yXcov?4XNqUznRu3X4xWW)i|69mc#im8JO|GezlZ1Icg64Hckz4T5Ab{V zeepc}KK?-bA^rf*6VJ!<@Q30B_(MEjyb#aF3&e}?0=!VX7%#+poZyjZ*xFUCv6 z%kUDsRQwTMikFE$#>?aYP?3g4zIy$#q04}yiWWXUWeC@vr!2{EPTE{0sh7 z{5$>?|0eze|Av1T{~P~~|M=Da_*wm}hU#xMRDY|X`dbav-)gA-Rzvl-8mhn5Q2nij z>Tfkvf2*PTTMgCUYN-BJL-n^Bs=w7#{jG-TZ#7hZtD*W^4b|UjsQy+%^|uTfetf19ED+YHs;W~lx)L-n^As=v)p{cVQoZ!=VXo1yyK4AtLesQxxX^|u+S zzs*qnZHDS^GgN<@q59hl)!$~Q{x(DPxAm|7fBlcOZ0rBm{(qAF|M}O#HNg7o9*6Be z?*aX<0S@Nb`u1O^dAJADcHAL85O?4n;)8Gxe4zMXd>}qZd9l;rIygQTPaar1)rjBtA-f3_c1UEj|_>jgJu@hmXO>ijT*~ z;^V|8;N$S|;uG=l_yqAu_yl~S_+)${K1qBEJ_(;JJ{6ygPZ6JnPr;{(PsgX?)5K@s z)9~ryGx6#84Dng`41A{eYD*x<@gHm zRrm^grTA)mCB9004ZaFrExs0Cjjs`3hp)lcim%7l;_JjW;Op@9;v4bx_y+M!_y&BV z_-1?~zDaxwz6swfz7^k$ZxP>yZ^5^UZ^yUd+r)R^+wkq;JMr!K4)I<14t%HhZhR-c zOMDN$3*Rli7vGKV5#NXJ!S{;q$M@p<#1G*6@crTk@%{J#@k96l{Gj+@{2+cv{0M#s zKP-L}Ka3v{KZYN{kBT41kK)I~PvFP!b-r~NvH|`_uhx_2Z;{LcV?k9c*_rv|g&*J|08Sw!841QKT5I>6t zhzH>Tc%b+>JP;2OKaU6D=fs2YbNG4j3;20FSUdy|#xID6;ur7`@i06D4;2r`L-8>2 z2s{iA7mvil@d)vYcmy6PehH7nFN#Ou7x7Etm+?z@l=u}q3coCV6~ByM5s${N;8(?C z@T+*Vcq|@`$B4(_F?g(aJRXb3i6`K3c)WNb9*-x8U&9mdMDgo*B7RLg3BQJ47r%jD z$CJd9@g)3)_)YuCE0co|-Tmx@2aOYt)C$9Nh3Nc;)@2!AYIjz7kqh*#iG@N)5|csX7nUWr%WPsOY7 zr+B4!HC~BViPzv&c(r&fUX9m?*WopIt$00Ni`R)i!|U*R@#lCw{!F|9e}+F7e}O;8 z8^jy&2KZ^fJO7V$Q`1#cB^$6N6>@eaHVZx`>x+wl(Z zF1!Qp6n}|#;$7me@GktNcsKqMeTfetf19ED+YHs;W~lx)L-n_rs=v)p{cVQoZ!=VXo1yyK4AtLesQxxX z^|u+Szs*qnZHDS^GgN=uZ>zuUx7FWH^|$@!o5{OO-DEBGum1MmSAV;q`r8fF-)^Y> zc0={I8>+wEQ2p(O>Tfqxf4iaj+YQy ziO;~N;nT%u;?waN;_)PKH_)L73_#Au|K3jY)J{zASJ`bOR&lR7K&&B77FTm&F z^Tik9^YI1Zi|_^bLh;4;LVS_<5_}Q9SbQnI7+)g33}1pT6<>}o#g~b%z?b36#aH6X z@fG5$@D=z<@zwZBe3kebd=d z4fsa!&G<%qllT^V6TVq|E4~@uBEAjZf^QYyj&H@ciSNL-;oHS`;@j~Z;=Ax2_)hWN z_)dJ6_#S*0zFT}Rz8l{oz7OAn?-k#V@5T3tAHetF`^699`|$(fhwuaVLGi=*LHv;T z5&RH-So|n{7(XI@3_pS&6+ez2#gB=fz>nd_#ZThL@e|^w@Dun+@zeN8{FJySehNP= z?uDPmJ;l9oPuxq~2lv9g#eH#a+(+CG_rZO|{c&I1Py7t-hx?14#r^R!;sN*>{H%B& zeijc955fcRK=E^UARZ)s9uLCLi3j87@blsq@bh@EcnBVhUl0$)FW@2KVR#50Djtr9 z;$h+uco-fo9*KwJ5#kr|2s~2!5*~?P6pz9$;+MoPo+Ex2&%txW@8P-lUGe+) zUHqQ-1NFU0fl0`Vfe0523T#tZQx@e;fU zFBUJwi}4ciGQ0#Y6@P@6;$`BG@iP38_!ImQ{#d*me~dp7ufU(+<>F8Aa=b#k60g9Y zidW%J@k;S(yb`YxufePEYVlgU8m|$r!)x$b@p`-#uM>ZU*WvZz&+&TvnRo;K41X^E z0)LJ-h&SR5_zUqS`~}`9-i$ZmP2w$h6W%P|iZ|me;%#^f-YVXXx8iN$9e5kwF5Zc^ z;~nB%cn97o{u1xRyTo7NUHD7!Zu}+wO8hnc3hx$wgLmVv#oywu@i*e{@HhBd@%Q*! z{GE6Y{tkaH-iyD-d&K+j9=uol1Kx}GiGRfV@DJjj@DKP$@z3~2{FC?>{1g6J{44$$ z|04bk|AK!N|Bipfzls0Azv17-|Hi-LKYsN;epY|Gq59hm)!%NY{&qw4w;QUz-BA7Q zhU#xORDZjn`r8fF-)^Y>c0={I8>+wEQ2p(O>Tfqyf4iaj+YQyhCaAe}|#^I}Fv|VW|ENL-ltU zs=vcf{T+tt?=Vz-Mmzr#@d9fs=fFjRj>|LXtO|5)RW{(tTN zC)xj>e{Ea??7!}P*n@F<|7*ZN=J`r^{5s9U2Qlq|4-_Aa55xzF55WiFgT;s9gYhBa z!|);aQ1RjTP<)v92z(emTzn)x93LS*3Lk-w6d#R`#7Bvb!AIev#mC~K@iF4#@GlSrd?G#`pCCR7pMXykpNvn$Cy7tNC*hODr{a_GDdN-cDfm?J>G)K9 zn)nQS8a`coCO#dXAwCPAfzK45jnBkqiO<1j;j_i(;ZQhb^C3Va#9Tzn63SWV*6km<6#8-*0!B^p{#n@HO~a@%8vxe4Y3Pd>y`Cd?UUd-ypsT z-+*rv-;8g>H;He-H{qMbx8j@eE#lkoE%;XP?f6!FoA?fV8@^q9C%zruA-)UWf$tRG zjqk*FiSNO8;k(86;=A!Z;`{JD_+Ih-_+EUU_yK$$zF+(xz8^mzeh5E+9~3`~AH)xd zAHfgdhsBTLhw&rg$M7TgQSsyWQT&+r3H%s-T>K<{96up`3O|9L6hDoh#7~KP;-~P_ z;$HY^+*8~e_r$%#eQ+<_Tih4-#(l*7a39=P+#mPF{lw4Uez?E*S==8#BOZXC!Ow~Z z;%D&y@gO_^4-`L#2jW5E=kXx?oOm#P4nHq`0Y8rii-+LB_yzG$`~n^#9)^eDq2l3q zC>|yrfrsJY;*oeb9wB}akH90vFX55+Me!*7B7RByGJXk<62F2+;g`j);+OF&;?ejO z{Hk~ieie@vkHw?$81Xnf29Fhw$7At0@dP{$j~7qGK<2mAY@f$@`}hO#hxh|LPdp#b!yk$l;1BV9@j^TwFAy)n3-ChmV!RM95--7v z@M7^&ycjPLFT+dlQt?N4DPAW27%#&gi9f*~;g7}3@yGZR@e2G2UM~I=FUKpyEAa~a zsdyFs6t5Jo#w+nE@fy4euNJSxtMMA~I=lw26|cu@@jCHmcpY9Z{v5BzpNTi%&+zBs zFYxDhgLos}fWHuL!e8Kx;>~y?-Xz|FH{s3Vt#~uuBHo6#;H~2Acq`r}-hsE_?c$wy zJKiDQg?Hec;xF+|yi5EQ-i5yu@5W!^uf$*Dukdd1H+VPxTKp~k8h<1H4u6Bc6@QPv z#ovkd;P3GF;=TBLyhpqb@4{2TsV{BQg_{^M8w<7f4E7^=U+Q2iZ->hCaAe}|#^I}Fv| zVW|ENL-ltUs=vcf{T+tt?=Vz-Mmzr#@d9fs=fFjRksq53-v z)!$*L{tiR+cNnU_!%+PlhU)M5ZS{Bjw)%Te{T=`LX7VmmD_KkZtG~zZtG|b#`g<6v zzlWjvdl;&}hoSm=7^=UAq569ms=tS!`g<6vzlWjvdl;&}hoSm=7^=UAq569ms=tS! z`g<6vzlWjvdl;&}hoSm=7^=UAq569ms=tS!`g<6vzlWjvdl;&}hoSm=7^=TV|LXtO z|5)!H{r}qkPqP0%|Ju0*IDY*ezyp8Y1NvVB1~JdqW8kmTJbW_-ygH_-uTR_&j_LK39A`J{O-S zz5t(x&lg{a&&L;tFTxk#3&j`X3-LwbOYlYbV)3Q;Vtk4CGJFZXRD3zU6kjI30$+wN z7hj1l$5)82!dKuc#aH7i@m1n$@KyL~@wNDBe2w@zd=0)UcqATgGJaD$1;2^k5>Lf%;VI&`@f18&JPl99Z;Ri- zZ{um=>3AA`M?3?+gQtsU;^}yXcov?4XNqUznRu3X4xWW)i|69mc#im8JO|GezlZ1I zcg64Hckz4T5Ab{Veepc}KK?-bA^rf*6VJ!<@Q30B_(MEjyb#aF3&e}?0=!VX7%#+& z#7poZyjZ*xFUCv6%kUDsRQwTMikFE$#>?aYP?3g4zIy$#q04}yiWWXUWeCF|wL59>n z$dLL68B+fsL+T%7Nd1Ehseh0m^$#+n{y~P+Kgf{!2N_cTAVcaOWJvvkOsRj6A@vV3 zr2avM)IZ3O`Ue?O{~$x^A7n`VgAA#EkRkOCGNk@NhSWc(%G5uo%GBRU>L2vTGn27Q zD#^6;c-Rlf2Se!cN$WEry=!s8d86!A@z3}Qh%o*^>-Rlf2Se! zcN$WEry=!s8d86!A@z3}Qh%o*^>-Rlf2Se!cN$WEry=!s8d86!A@z3}Qh%o*^>-Rl zf2Se!cN$WEry=!s8d87fD|c<3HNJHnIN$d7ZZbL6x5qu*-TM@c7#RH^=i- zaaBH=!h<>5g}ar9;BGuvd3`(>4^iF#55emzZ;02&8z^stH^3VzZ;Us@8!2ysH^Lh$ zZ;Cg@n$xk5`_BkH;q{pNLPuvy@N5v+#+^v+;@eB;`5yBs^RBWIP+s zQ9cFF!6z%9iciL;D4&K;!KW&pj!(s>DW8E)!>22siBHF8D1QT=fzMPv3!jO%ez}Mpi$~WQ#_y*-~;~Vge%HP2^;%_T|7k?XnNBMjBJNUcG-^bs@-&0g)9`3`(L zUZi{{UWD&Zz6;-h?^M1U--+*1z6alh?^gaHz8l}8d@sHS|4?}`{vp0s`96FvUaWjS zUX1TkegNNx?^k{h-;W03@1?8XP7x0V9 zFX0#Q&y|0He~w>Lei^@nf1&&e{sn$nc`1GwzoPsqeg!X8{v}?DUse7Ueii>x`PcZD z_*crW;a}ljEB^-n8o#FeTl^aSjq)=58~j`4*YR)hGUYe$GW@#ooA`D7hVonZ4g99^ z+xSiVmhwCJE&R6fyZCMVj`DK+4t`hpJ^U_SuKYW^9KToDYgwtk(~$Z*4XMA=kor3f zslU^Z`a2D&ztfQVI}NG7(~$Z*4XMA=kor3fslU^Z`a2D&ztfQVJ58y-(~$Z*4XMA= zkor3fslU^Z`a2D&ztfQVI}NG7(~$Z*4XMA=kor5TO#Pizrv5Hcf9E65OvWNc~-g)Zb-D{auFC-(^VsU53=(Wk~&9 zhSc9>Nc~-g)Zb-D{auFC-(^VsU53=(Wk~&9hSc9>Nc~-g)Zb-D{auFC-(^VsU53=( zWk~&9hSc9>Nc~-g)Zg`Z>R-p3$ARndAMIb8*#Ch9@ixF&`S}66t@i2%A8(+%5#9iAsJt=W5O1Ws3El{Ath_1S7;mCH z6mNnzRo)D5iiaw1j)&sSl()c};mwt|#GB(Sl()iL;4PK6##`d8l()fK;jNX2;jQsD z%G=^?@G#}!co^PRc{{u<9m>?~HfC zBa}zt5qM|iQFv!OQh66V5|2{e6_3KZD38Xw;9Zr+;9c=(<*|4)9;3V)9)rg!?~cdf z-IVvhyW!oH_r$y7J(Tytd*D5l_r`nTy_EOCd*Qv6$Kk#4KFa&zeegKt@pv5GS9t>7 z7mrt-h{xjz%KPC7c%t(Dcp~0Uc@o|a@2@-=?~f-bAAl#}$;t=f$@l=}gYW_PK;?t+ zf%qWhL-0ZPVC6&c!T1p6!|);aP~|E3P<)v3RD2koqC5>x!BdqF$5Zh%<>`1DK3w?- zd^n!2d?cQZk5Hb0kHAMN&%{UK8OlfD8F;4h(Re04O8FRk6h2z{SbQ`-M)^2=3_e!* zczi5APWc3U96nxo7Cs)IpnM`e0nbuC3D3eOD$m9z;**r;;FIud<&*JjJV*HyJO`hw zd@4Q}pQ3ykJ_Vnud^$cApQd~UJ`JC)d?r2}pP~E>d0`b0sNrykMV=}N6HW3AK@P>Ka78jA5wk{`68?qqEBF`qW#y&#W&DcrtN0bXRQZ>9DSlP?SNK)@OXXkVU*caWzlMK> zf35r*{A>K0@^A5L_&3VS@Ne*Mm0!od#mki6z{~LK%5UP=@f*r-;WzM`%5UR0@mtF8 z;J5JG%J1U0@jJ@P@jLik<@fNrc)9ZL@N)cKWv^wW{w_o6?=qzRE<@_?GNk@4L+bA` zr2Z~L>hCh7{w_o6?=qzRE<@_?GNk@4L+bA`r2Z~L>hCh8{w_o6?=qzRE<@_?GNk@4 zL+bA`r2Z~L>hCh7{w_o6?=qzRE<@_?sxtL=Rhjy`N&Q`qJTn=~q>M~UkEj0bs#AZr zA@z3~Qh&E0^>-Umf43p^cN-Umf43p^cN-Umf43p^cN-Umf43p^cNhXB-V$%6ybaz8Z>>BGZ;iK6-WG3zhba%o z!|=As+u?2TaOLgsaJ-%J4tP7fz4DHDd%T14PIw2rqw)y6Bi>1QXS@?0p*#|gz&k6C z!aL)U%Ddo^c$D(4cog16c{JVy@2Wfo?}|q&kHw?$80FpY7(7;acRUvFro0E<4ezeJ zC*B?Jp}ZH~1MjK4H{KKPrMwT`3-7Hw4)2ZkQQjBtgU2b4$K&w6$`kOuc)apNJRVO_ z-VaZ}6P5SJ6Y+k^lkk3cf91(|e>_R~06Ym#Rz46<#s?@Lgb%<6Dj$pw#0M!Kf)Bz6 zD<6sv#)l{$h7ZAqDo??O;=`1u;=}M16 zgz^l01U^!ECO#6+P(BLJz%!MP#xwCz%E#cN@X^Z0;-m2~%E#ej@UhCr<74r0$|vCC z@bSvC@bUNrcosfUc{V-~pQJnopM+;CpNwbYIm)NtIrwDdQ}N086y?+K zDfm?7)A6bJH03k!Y4~*IGx6#84CQa&Gw_+pXW=vPH4ZaFrt^6%~HNHmqT6_)umhyG@TliY#>+!YtI^_lUI()tI4fuMzK>0?z0NRlXhHif>b1gm1&QE8l@{$BUHj#EbA9%6H*A@SVzc z<2&(P%J<;A@ZHKk#CPL+l<&p&;2$b4#y`aOD&L3i#fz2i$BXfO$`9cC@cqgU;`{Lf z%0I#n;0Kj|j32~5Qho^k2>)35Vf-AICqzKUIDL{}ey2yaYdvpHO}hKY^DhKZTdzCzYSZPvWPPe}KcoB{eg;3Q{5*aZKd1Zxehxpc{33oHzo7hc`~rSa`6c`!{<-om@Xzr}$}i)W z@Gq2K!N0&SD=)<_<5!el#joI{%D==*@vF+e!mr|AD*qb)68}p1HT*05YvteIU*p%5 ze~VwkzfoR>e}jLk{5t+EUZ(s8UWQ*+eiOfr-%x%Fzk%OWejC4u-%@@DzlGmceiy%u z-%(zU-@)%HzlYz&%awnJm*e*;do3&VcN-Umf43p^ zcN-Umf43?1cN-Um zf43p^cNDcmq}d-_LAo+rV$@6 z@v@23f8cfR>PdOl`ZFK9PaD_--5pYxIbCjVVF%3%)SCp^gtsX;kQWdfhJXL?Jt9Fx~VAjFyXFQ;=hx;+bTrg?2QS|9Q{GiPx1aR$T>ir8iA^K_WNZOO+ah6kQ%6CsUI7Ob|U$eo8K< z70RZ-X|F||Or~uk_zo z*}27C=wX}qNpGtY=$L5PR4%?ga<)(!$_w+QPije^oc5wYXRJ1km%X-f8I~%O%Q=C@ z(rRMr{d0?B{+B&iO2m(#)cbznY00&pTj+CZyEm2_9KEQnO}w9xeDO+p(M~ti@)18y zS-fpOi@gm$DxKf$<-KyO)aWj?ZBjyyekYNw?J44WCPEw!nr{?8Z?0#FEU9sAt3=$F zTz?7OCU(CGO?}0i#hKlk-%Cc_B3|B(tz9@D_O|e;pSy$Re{s)~UH7fpp9hoCGpR!WV zALrTINlkAl6?>_8Q*(*rNq{7IOK6$Yuz5atOUnMiK*?lGjJ6doiML9nnq2GOXY4-S zwXbphUW;SS+I@Uw`ODTxow57ZtnDw$Pt55Q<1If@G97OH!T+<@l`af;j!b2Ux0E4b ze^xrp>140T1zaaT$Vuxk&qz#>XJj_RFWn}?N;!*~_r-Bcyw`}&7^x8@_H??<%a-pa zzSje!w!F5lQ0f#dDUiCQ`{g-lnI_L4pbua5XCS>IG400`U0n6}OCN!064FlU zKQE#3x24it{;i(0kYs-v+ESwSORHJZVX3s1q@~=!vEg)h-FjTomua{}{!(O5d7&Ox zEoeWdP>T=RtTOwG!(V(UvmWK4oye>QKii}`4fJ9( zOT4^to${ZNSNCzQ{LqxC|REe~~(AlK4FDt2o&>tHK@={iT^acSG8W zeZNFKA0U0LCN`9w;Sqig8||udQyL_PuU^7vXy$KoNaLm4lCP%8OYJ0jmUQ*clo+Yq zmfByIZa1WJJ83Gb9koI;g}BM zw(1-#wZf&5^sgtq1Hz@7)DI8*rH4C8?QmwBdj1Y(%D-5LHj(Id8~lW^;&(IR0MALO z{op5u{Kw5mYb-9Xue879C3c%c$s~r?44E#0rDc*WIWks8c*dyMC;P|%Zk)+9DU*Yy z$cQo-CF9SR$)qyLIV|aU`O{?Vv|`DaD8pkVJFmE{G`9WnnNXXIE|auS$FzW~!p?b2 zKvVptg{=Db;(3x97%St-W$c6ck{MSL;U`&nAu@&*|9Tt#WN+goHLTm2_T~P3uSC4g zNLI}ywG54IA_@7@y2<7BNiQz2TmPK5+qj9nJ?EKcf2C&CpKH?k;Rk;C*q`~|B5QtX zE;Xsox*3n!Z8e|%*V8_DIu4%R3s2{Rr!(QxnegdM_;e=xuR0UHT$A8*Hyb}+c0K>c z+FsOU<;}A7CpMARHm~Xx&HgOxQb%Gw+|(;uu1qmRp^v*_MM|-xQsnq!Ul4}CP^*$sj!G`sB)?2d6WP0-?ha|pU^swPS+WUEGsAVJNc(mcaUq{a@$?%it zQ1-#&0jWXRbogUAT%mPk#6dUE-0-2C% z?WKPzlChk~uN@v0LXeQ<7bl4?R22P#y`QJEYge=A?lL*`AdkTK0ng#drlk_;p zlKcostnpi;lRX_>x0+?gr3B`O*d#kv5}*C8?0&vhU;9_H?4-gl|73{{ydaa$=LJZj zNM>Cb7s>$3sHp0n_CYnRs%llUD*8S!U$P&B$?(d(bkXibUQly%^~Ov>N~S}yr-w;; z7*SA8o{ZZkBONlyA<^Y!g_7mSlgx;UGy2g!)N@9Joz)tsNri`tD=Li-3zd<@6*c@| zAL_Y0-qoxj+FyoqUK2wlJyeonQ<5vy@XKB7Q_UJ;3IiqGL0(nS^zZE>JWa1r&4LqR z17-5zinjMDc7(~eOq=B7S5)+ay{|Q_2<57E5fZK0qEhRJcrGomDj{!`v$C4=tDKgj zGV8~m_oLTkdY~i}hB8C{I?4TDpWvC~sMJ?g@cXkTw?InhMTrmdtF=m^Y<{#m=cH%G z?pb2hC23)fGMgj@X4zzXr3rhOx7Aa%t=BYv{+xORFhr;GP>2cphs1Mn0;uxgSq<_` zgLQ1;P*wc?Sw&{$N{&Nf0}gwh2onENm^FXo{B~7-un+Qd8t+i*JaO?+dH1a5lIB}a z7n4RZuLv?jC9C2Ze{Ub+xd^Y=NZ=psrHTd1 zAG$Scyto^~aE+DN5S9Vic@-6Kl|A>~Uu~@8|9l0J*4jd{Y=LnS#XH7IxAs8ZFWBVo zHvYQJpD#X|+kojVj#ny~g$0#*C*CUD$wIMm;ZL?yjIEz334XTxhh6f$eUN8l^7yXK zbQGHzk||wcB_mc60&EP}hqrBtr^oA8ulR0pewh*#csM}DU43Z>!zL$?sp4TB1FeqX z6~^BxcTA;a?jIR7Jt=#DL(+>Q=%7bd(Q%%;skx08mw*1E_6m_1j*1rlyM3tD;ubbZ zRz?2)Y|twrrJJxQPyb~qi+d?$T3qosNeq$HX1@)^f7<(dE^ABcl~FZX?Z}Kvk(h{l z8ClWx@9lA(l3Q7?xgIU~4>g{-D%KHLD}>uVCo`88TXW`Adqwd-+DCf^Olup%|IZa4 z9~=16Chp8Y3jg)t)tSX(h>Q!6w2%R*nGuy9Tmw8yiFP)Lee&9@-AoAmJ6(p4`t?L2 z14<57oXQXOG1gV?WFu#I(lhD9y2MsGk*8K@pr0iAZ}N0gf}=<>{CPm8vuBer4v7l2 zt*WT*M|-m8T$r$5R`or}>>1~18&DEw&CG$7XXXK(nJuzxK5CP5=Fy;n(N-g;D4IgxwhrsyOQ^UkYGIr3MsK)bUSyUp8shS2HSA@MN=o zWXR#-xbF1&(TYNUuqS!?yzhU;aw;K^r$?oy;4fo^?^sl4KJMa`LO;_b2{y;HN)JJ< z=g&;`l{@1JXZmOs`q=@=(wWsWiz>dW@G#q8?d+NC-8SA5SL$wR`2Fjd$l5tMAT&(+ zuw#i`l{ekGnk9}=lEZAxB`yi2lSZZZF=gaNlvG@aAMJfTL+Du>uhbu{@<~R2B4K29 zKt-Y7+xvSi@2fvoqsT6!Sb;yjMjPl^qb1q+`oo`ZE|0^ExUgi23UEkP!NUjR_k8t* z+cm{zeF5Z=z0vP?KZ^o~EsV#;L{`hvE5N#;lC4X??KQr>bx(y9R`kz5e~reTt>)IQ zSE?;V5?vL=es3ROH9w(ROSDAhcV^$%Ku2upqf4no&ov!tj`RM=I;V;}FUb=E`Tu83 z1yP~3k}FRIL;1^**3{^0edX%6!0nHZ?8dAPl335DmvlQn{d}PGvRT*l;RBr5jp68J zO^%hTD0rA~sxAq5JmR!!hzu+)ij8F9S80MICgWQ2y{AWuexk|7Dmx*Mo2b(4IM`Ee q4Qq1r Date: Wed, 12 Jan 2022 01:21:53 -0800 Subject: [PATCH 0325/1001] Update README.md --- game_eggs/tycoon_games/openrct2/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/tycoon_games/openrct2/README.md b/game_eggs/tycoon_games/openrct2/README.md index 337d0513..9137ebf8 100644 --- a/game_eggs/tycoon_games/openrct2/README.md +++ b/game_eggs/tycoon_games/openrct2/README.md @@ -1,5 +1,5 @@ # OpenRCT2 - +***Note:** OpenRCT2 only recently (Jan. 2022) updated to support non-interactive Docker environments, and development is ongoing to improve it. Please understand future updates may be unstable, or this Egg may update in the future to accommodate changes.* ___ ### Authors / Contributors From 3d4b512abc47291eb6fa377263e3a5680692049d Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Wed, 12 Jan 2022 15:07:53 -0800 Subject: [PATCH 0326/1001] Fix minor README errors --- game_eggs/tycoon_games/openrct2/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/game_eggs/tycoon_games/openrct2/README.md b/game_eggs/tycoon_games/openrct2/README.md index 9137ebf8..1c6d5b57 100644 --- a/game_eggs/tycoon_games/openrct2/README.md +++ b/game_eggs/tycoon_games/openrct2/README.md @@ -51,7 +51,7 @@ ___ | | Minimum | |---------|---------| | Processor | Recent x86/64 (AMD/Intel) processor. No ARM support. | -| RAM | 4096 MiB | +| RAM | 256-512 MiB (depends on # of clients & park size) | | Storage | 80 MB | | RCT2 Files | **Not required** | @@ -70,7 +70,7 @@ ___ Unfortunately, because console commands currently do not register, becoming the first admin on the server takes some steps, listed below: 1. Ensure the "Log Server Actions" startup variable is set to "true". 2. Start the server and join it with the client you want to make an admin. -3. Open `ServerData/serverlogs//.txt` and copy the SHA1 hash next to your client's username (note the username as well). +3. Open `ServerData/serverlogs//.txt` and copy the SHA1 hash next to your client's username (note the username as well). 4. Then, open `ServerData/users.json`. Paste the hash into the "hash" value, and change the "name" value to your client's username. 5. Reboot the server, re-join it, and you should be an admin! @@ -79,10 +79,10 @@ ___ ### Known Issues The following are known issues that are unique to running OpenRCT2 on Pterodactyl, but likely can only be fixed by further development/updates from OpenRCT2. - Only building from source from the `develop` branch currently yields a package that is bootable. This will no longer be true for any OpenRCT2 releases after v.0.3.5.1. - - This also means that clients joining the server must be on the latest develop branch as well. + - This also means that clients joining the server must be on the latest `develop` branch as well. - Configuring a password on the server disallows non-admin clients from entering in a password in their client to connect; it just disconnects them. Admin clients can still join normally. - You may rarely run into the server crashing on start due to a "Floating point exception(core dumped)" error. If this occurs to you, please help with OpenRCT2 development by doing the following: 1. Add the following to the beginning of your server's startup command: `SEGFAULT_SIGNALS=fpe LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so ` - 2. Start the server. If it boots normally, nothing will print. If it crashes, it will print a stack trace to the console. + 2. Start the server. If it boots normally, nothing extra will print. If it crashes, it will print a stack trace to the console. 3. If a crash occurs, copy the entire stack trace, and save it to a log sharing website (like [Hastebin](https://www.hastebin.com)). 4. [Open a new Bug Report Issue with OpenRCT2](https://github.com/OpenRCT2/OpenRCT2/issues/new?assignees=&labels=bug&template=bug_report.yaml) and share your logs with them. From 003c1ae215690a550c4c6a4ff103fca5b4908152 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Wed, 12 Jan 2022 15:33:53 -0800 Subject: [PATCH 0327/1001] Fix minor startup script bug regarding default save - Default save file was referenced as the old `.sv6` file in some places, when it should be `.park`. --- game_eggs/tycoon_games/openrct2/egg-openrct2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/tycoon_games/openrct2/egg-openrct2.json b/game_eggs/tycoon_games/openrct2/egg-openrct2.json index fee0e2a4..32201ecb 100644 --- a/game_eggs/tycoon_games/openrct2/egg-openrct2.json +++ b/game_eggs/tycoon_games/openrct2/egg-openrct2.json @@ -21,7 +21,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl OpenRCT2 Egg - egg-openrct2.json\r\n## Authors: David Wolfe (Red-Thirten), parkervcp\r\n## Date: 2022\/01\/12\r\n## License: MIT License\r\n\r\nGITHUB_PACKAGE=\"OpenRCT2\/OpenRCT2\"\r\nMATCH=\"linux-bullseye-x86_64.tar.gz\"\r\nDEFAULT_SAVE=\"https:\/\/github.com\/parkervcp\/eggs\/blob\/master\/game_eggs\/tycoon_games\/openrct2\/save.park\"\r\n\r\n## OpenRCT2 Install\r\napt -y update\r\n[ ! -d \/mnt\/server ] && mkdir \/mnt\/server\r\ncd \/mnt\/server\r\n# Remove existing installation if present\r\n[ -d OpenRCT2 ] && rm -rf OpenRCT2\r\n\r\n# Determine if installing from source or from release\r\nif [ \"${VERSION}\" == \"develop\" ]; then\r\n # Get required packages\r\n apt -y install curl git make cmake gcc build-essential libicu-dev pkg-config libcurl4-openssl-dev libcrypto++-dev libpng-dev libssl-dev libzip-dev duktape-dev nlohmann-json3-dev\r\n echo -e \"\\nInstalling\/Updating OpenRCT2 from source...\\n\"\r\n # Setup temp directory for building and move to it\r\n [ -d temp ] && rm -rf temp\r\n mkdir temp && cd temp\r\n # Clone the branch and check if successful\r\n git clone --branch \"${VERSION}\" https:\/\/github.com\/${GITHUB_PACKAGE}\r\n if [ ! -d OpenRCT2 ]; then\r\n echo -e \"\\nFailed to clone \\\"${VERSION}\\\" branch from https:\/\/github.com\/${GITHUB_PACKAGE}\\n\"\r\n exit 1\r\n fi\r\n cd OpenRCT2\r\n mkdir build && cd build\r\n # Prepare CMake files for a lightweight and CLI-only build of OpenRCT2, using the appropriate flags\r\n cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DPORTABLE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_FLAGS=\"-g -gz\" -DDISABLE_TTF=ON -DDISABLE_GOOGLE_BENCHMARK=ON -DDISABLE_DISCORD_RPC=ON -DDISABLE_GUI=ON\r\n echo -e \"\\nBuilding OpenRCT2 package from source...\\n\\tThis process can take quite some time. Grab a coffee :)\\n\"\r\n # Build OpenRCT2\r\n DESTDIR=. make install\r\n # Check if build was successful and move to it\r\n if [ ! -d usr\/local ]; then\r\n echo -e \"\\nFailed to successfully build OpenRCT2!\\n\"\r\n exit 1\r\n fi\r\n cd usr\/local\r\n # Make executable-ready package by moving compiled files to the correct locations\r\n mkdir -p \/mnt\/server\/OpenRCT2\/data\r\n mv bin\/* \/mnt\/server\/OpenRCT2\/\r\n mv share\/openrct2\/* share\/openrct2-cli\/* \/mnt\/server\/OpenRCT2\/data\/\r\n mv share\/doc \/mnt\/server\/OpenRCT2\/\r\n cd \/mnt\/server\r\n rm -rf temp # Clean up temp building directory\r\n echo -e \"\\nBuild of OpenRCT2 package complete!\"\r\nelse\r\n # Get required packages\r\n apt install -y curl jq\r\n echo -e \"\\nInstalling\/Updating OpenRCT2 from release tag \\\"${VERSION}\\\"...\\n\"\r\n # This is a simple script to use the GitHub API for release versions.\r\n # This requires the egg has a variable for GITHUB_PACKAGE, VERSION and MATCH (MATCH is to match the filename in some way).\r\n # Get release info and download links\r\n LATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\n RELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\n if [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\n else\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 -i ${MATCH})\r\n else\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\n fi\r\n # Download and unpackage the release\r\n curl -L ${DOWNLOAD_URL} | tar -xzv\r\n # Check if it was successful\r\n if [ -d OpenRCT2 ]; then\r\n echo -e \"\\nDownload of OpenRCT2 release successful!\"\r\n else\r\n echo -e \"\\nFailed to download\/unpack file: ${DOWNLOAD_URL}\\n\"\r\n exit 1\r\n fi\r\nfi\r\n\r\n## OpenRCT2 Setup\r\n# Setup ServerData\/save directory\r\n[ ! -d ServerData\/save ] && mkdir -p ServerData\/save\r\ncd ServerData\/save\r\n# Download default save.sv6 if missing\r\nif [ ! -f save.sv6 ]; then\r\n echo -e \"Downloading default save.sv6 file from ${DEFAULT_SAVE}\"\r\n curl -sSLO ${DEFAULT_SAVE}\r\nfi\r\n\r\necho -e \"\\nOpenRCT2 Successfully Installed!\"", + "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl OpenRCT2 Egg - egg-openrct2.json\r\n## Authors: David Wolfe (Red-Thirten), parkervcp\r\n## Date: 2022\/01\/12\r\n## License: MIT License\r\n\r\nGITHUB_PACKAGE=\"OpenRCT2\/OpenRCT2\"\r\nMATCH=\"linux-bullseye-x86_64.tar.gz\"\r\nDEFAULT_SAVE=\"https:\/\/github.com\/parkervcp\/eggs\/blob\/master\/game_eggs\/tycoon_games\/openrct2\/save.park\"\r\n\r\n## OpenRCT2 Install\r\napt -y update\r\n[ ! -d \/mnt\/server ] && mkdir \/mnt\/server\r\ncd \/mnt\/server\r\n# Remove existing installation if present\r\n[ -d OpenRCT2 ] && rm -rf OpenRCT2\r\n\r\n# Determine if installing from source or from release\r\nif [ \"${VERSION}\" == \"develop\" ]; then\r\n # Get required packages\r\n apt -y install curl git make cmake gcc build-essential libicu-dev pkg-config libcurl4-openssl-dev libcrypto++-dev libpng-dev libssl-dev libzip-dev duktape-dev nlohmann-json3-dev\r\n echo -e \"\\nInstalling\/Updating OpenRCT2 from source...\\n\"\r\n # Setup temp directory for building and move to it\r\n [ -d temp ] && rm -rf temp\r\n mkdir temp && cd temp\r\n # Clone the branch and check if successful\r\n git clone --branch \"${VERSION}\" https:\/\/github.com\/${GITHUB_PACKAGE}\r\n if [ ! -d OpenRCT2 ]; then\r\n echo -e \"\\nFailed to clone \\\"${VERSION}\\\" branch from https:\/\/github.com\/${GITHUB_PACKAGE}\\n\"\r\n exit 1\r\n fi\r\n cd OpenRCT2\r\n mkdir build && cd build\r\n # Prepare CMake files for a lightweight and CLI-only build of OpenRCT2, using the appropriate flags\r\n cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DPORTABLE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_FLAGS=\"-g -gz\" -DDISABLE_TTF=ON -DDISABLE_GOOGLE_BENCHMARK=ON -DDISABLE_DISCORD_RPC=ON -DDISABLE_GUI=ON\r\n echo -e \"\\nBuilding OpenRCT2 package from source...\\n\\tThis process can take quite some time. Grab a coffee :)\\n\"\r\n # Build OpenRCT2\r\n DESTDIR=. make install\r\n # Check if build was successful and move to it\r\n if [ ! -d usr\/local ]; then\r\n echo -e \"\\nFailed to successfully build OpenRCT2!\\n\"\r\n exit 1\r\n fi\r\n cd usr\/local\r\n # Make executable-ready package by moving compiled files to the correct locations\r\n mkdir -p \/mnt\/server\/OpenRCT2\/data\r\n mv bin\/* \/mnt\/server\/OpenRCT2\/\r\n mv share\/openrct2\/* share\/openrct2-cli\/* \/mnt\/server\/OpenRCT2\/data\/\r\n mv share\/doc \/mnt\/server\/OpenRCT2\/\r\n cd \/mnt\/server\r\n rm -rf temp # Clean up temp building directory\r\n echo -e \"\\nBuild of OpenRCT2 package complete!\"\r\nelse\r\n # Get required packages\r\n apt install -y curl jq\r\n echo -e \"\\nInstalling\/Updating OpenRCT2 from release tag \\\"${VERSION}\\\"...\\n\"\r\n # This is a simple script to use the GitHub API for release versions.\r\n # This requires the egg has a variable for GITHUB_PACKAGE, VERSION and MATCH (MATCH is to match the filename in some way).\r\n # Get release info and download links\r\n LATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\n RELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\n if [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\n else\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 -i ${MATCH})\r\n else\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\n fi\r\n # Download and unpackage the release\r\n curl -L ${DOWNLOAD_URL} | tar -xzv\r\n # Check if it was successful\r\n if [ -d OpenRCT2 ]; then\r\n echo -e \"\\nDownload of OpenRCT2 release successful!\"\r\n else\r\n echo -e \"\\nFailed to download\/unpack file: ${DOWNLOAD_URL}\\n\"\r\n exit 1\r\n fi\r\nfi\r\n\r\n## OpenRCT2 Setup\r\n# Setup ServerData\/save directory\r\n[ ! -d ServerData\/save ] && mkdir -p ServerData\/save\r\ncd ServerData\/save\r\n# Download default save.park if missing\r\nif [ ! -f save.park ]; then\r\n echo -e \"Downloading default save.park file from ${DEFAULT_SAVE}\"\r\n curl -sSLO ${DEFAULT_SAVE}\r\nfi\r\n\r\necho -e \"\\nOpenRCT2 Successfully Installed!\"", "container": "debian:bullseye-slim", "entrypoint": "\/bin\/bash" } From 08c55cfaed0bd762830741325201b48cc64ee8ad Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Wed, 12 Jan 2022 16:26:01 -0800 Subject: [PATCH 0328/1001] Fix broken default save URL in installation script --- game_eggs/tycoon_games/openrct2/egg-openrct2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/tycoon_games/openrct2/egg-openrct2.json b/game_eggs/tycoon_games/openrct2/egg-openrct2.json index 32201ecb..76bcdd18 100644 --- a/game_eggs/tycoon_games/openrct2/egg-openrct2.json +++ b/game_eggs/tycoon_games/openrct2/egg-openrct2.json @@ -21,7 +21,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl OpenRCT2 Egg - egg-openrct2.json\r\n## Authors: David Wolfe (Red-Thirten), parkervcp\r\n## Date: 2022\/01\/12\r\n## License: MIT License\r\n\r\nGITHUB_PACKAGE=\"OpenRCT2\/OpenRCT2\"\r\nMATCH=\"linux-bullseye-x86_64.tar.gz\"\r\nDEFAULT_SAVE=\"https:\/\/github.com\/parkervcp\/eggs\/blob\/master\/game_eggs\/tycoon_games\/openrct2\/save.park\"\r\n\r\n## OpenRCT2 Install\r\napt -y update\r\n[ ! -d \/mnt\/server ] && mkdir \/mnt\/server\r\ncd \/mnt\/server\r\n# Remove existing installation if present\r\n[ -d OpenRCT2 ] && rm -rf OpenRCT2\r\n\r\n# Determine if installing from source or from release\r\nif [ \"${VERSION}\" == \"develop\" ]; then\r\n # Get required packages\r\n apt -y install curl git make cmake gcc build-essential libicu-dev pkg-config libcurl4-openssl-dev libcrypto++-dev libpng-dev libssl-dev libzip-dev duktape-dev nlohmann-json3-dev\r\n echo -e \"\\nInstalling\/Updating OpenRCT2 from source...\\n\"\r\n # Setup temp directory for building and move to it\r\n [ -d temp ] && rm -rf temp\r\n mkdir temp && cd temp\r\n # Clone the branch and check if successful\r\n git clone --branch \"${VERSION}\" https:\/\/github.com\/${GITHUB_PACKAGE}\r\n if [ ! -d OpenRCT2 ]; then\r\n echo -e \"\\nFailed to clone \\\"${VERSION}\\\" branch from https:\/\/github.com\/${GITHUB_PACKAGE}\\n\"\r\n exit 1\r\n fi\r\n cd OpenRCT2\r\n mkdir build && cd build\r\n # Prepare CMake files for a lightweight and CLI-only build of OpenRCT2, using the appropriate flags\r\n cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DPORTABLE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_FLAGS=\"-g -gz\" -DDISABLE_TTF=ON -DDISABLE_GOOGLE_BENCHMARK=ON -DDISABLE_DISCORD_RPC=ON -DDISABLE_GUI=ON\r\n echo -e \"\\nBuilding OpenRCT2 package from source...\\n\\tThis process can take quite some time. Grab a coffee :)\\n\"\r\n # Build OpenRCT2\r\n DESTDIR=. make install\r\n # Check if build was successful and move to it\r\n if [ ! -d usr\/local ]; then\r\n echo -e \"\\nFailed to successfully build OpenRCT2!\\n\"\r\n exit 1\r\n fi\r\n cd usr\/local\r\n # Make executable-ready package by moving compiled files to the correct locations\r\n mkdir -p \/mnt\/server\/OpenRCT2\/data\r\n mv bin\/* \/mnt\/server\/OpenRCT2\/\r\n mv share\/openrct2\/* share\/openrct2-cli\/* \/mnt\/server\/OpenRCT2\/data\/\r\n mv share\/doc \/mnt\/server\/OpenRCT2\/\r\n cd \/mnt\/server\r\n rm -rf temp # Clean up temp building directory\r\n echo -e \"\\nBuild of OpenRCT2 package complete!\"\r\nelse\r\n # Get required packages\r\n apt install -y curl jq\r\n echo -e \"\\nInstalling\/Updating OpenRCT2 from release tag \\\"${VERSION}\\\"...\\n\"\r\n # This is a simple script to use the GitHub API for release versions.\r\n # This requires the egg has a variable for GITHUB_PACKAGE, VERSION and MATCH (MATCH is to match the filename in some way).\r\n # Get release info and download links\r\n LATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\n RELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\n if [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\n else\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 -i ${MATCH})\r\n else\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\n fi\r\n # Download and unpackage the release\r\n curl -L ${DOWNLOAD_URL} | tar -xzv\r\n # Check if it was successful\r\n if [ -d OpenRCT2 ]; then\r\n echo -e \"\\nDownload of OpenRCT2 release successful!\"\r\n else\r\n echo -e \"\\nFailed to download\/unpack file: ${DOWNLOAD_URL}\\n\"\r\n exit 1\r\n fi\r\nfi\r\n\r\n## OpenRCT2 Setup\r\n# Setup ServerData\/save directory\r\n[ ! -d ServerData\/save ] && mkdir -p ServerData\/save\r\ncd ServerData\/save\r\n# Download default save.park if missing\r\nif [ ! -f save.park ]; then\r\n echo -e \"Downloading default save.park file from ${DEFAULT_SAVE}\"\r\n curl -sSLO ${DEFAULT_SAVE}\r\nfi\r\n\r\necho -e \"\\nOpenRCT2 Successfully Installed!\"", + "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl OpenRCT2 Egg - egg-openrct2.json\r\n## Authors: David Wolfe (Red-Thirten), parkervcp\r\n## Date: 2022\/01\/12\r\n## License: MIT License\r\n\r\nGITHUB_PACKAGE=\"OpenRCT2\/OpenRCT2\"\r\nMATCH=\"linux-bullseye-x86_64.tar.gz\"\r\nDEFAULT_SAVE=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/tycoon_games\/openrct2\/save.park\"\r\n\r\n## OpenRCT2 Install\r\napt -y update\r\n[ ! -d \/mnt\/server ] && mkdir \/mnt\/server\r\ncd \/mnt\/server\r\n# Remove existing installation if present\r\n[ -d OpenRCT2 ] && rm -rf OpenRCT2\r\n\r\n# Determine if installing from source or from release\r\nif [ \"${VERSION}\" == \"develop\" ]; then\r\n # Get required packages\r\n apt -y install curl git make cmake gcc build-essential libicu-dev pkg-config libcurl4-openssl-dev libcrypto++-dev libpng-dev libssl-dev libzip-dev duktape-dev nlohmann-json3-dev\r\n echo -e \"\\nInstalling\/Updating OpenRCT2 from source...\\n\"\r\n # Setup temp directory for building and move to it\r\n [ -d temp ] && rm -rf temp\r\n mkdir temp && cd temp\r\n # Clone the branch and check if successful\r\n git clone --branch \"${VERSION}\" https:\/\/github.com\/${GITHUB_PACKAGE}\r\n if [ ! -d OpenRCT2 ]; then\r\n echo -e \"\\nFailed to clone \\\"${VERSION}\\\" branch from https:\/\/github.com\/${GITHUB_PACKAGE}\\n\"\r\n exit 1\r\n fi\r\n cd OpenRCT2\r\n mkdir build && cd build\r\n # Prepare CMake files for a lightweight and CLI-only build of OpenRCT2, using the appropriate flags\r\n cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DPORTABLE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_FLAGS=\"-g -gz\" -DDISABLE_TTF=ON -DDISABLE_GOOGLE_BENCHMARK=ON -DDISABLE_DISCORD_RPC=ON -DDISABLE_GUI=ON\r\n echo -e \"\\nBuilding OpenRCT2 package from source...\\n\\tThis process can take quite some time. Grab a coffee :)\\n\"\r\n # Build OpenRCT2\r\n DESTDIR=. make install\r\n # Check if build was successful and move to it\r\n if [ ! -d usr\/local ]; then\r\n echo -e \"\\nFailed to successfully build OpenRCT2!\\n\"\r\n exit 1\r\n fi\r\n cd usr\/local\r\n # Make executable-ready package by moving compiled files to the correct locations\r\n mkdir -p \/mnt\/server\/OpenRCT2\/data\r\n mv bin\/* \/mnt\/server\/OpenRCT2\/\r\n mv share\/openrct2\/* share\/openrct2-cli\/* \/mnt\/server\/OpenRCT2\/data\/\r\n mv share\/doc \/mnt\/server\/OpenRCT2\/\r\n cd \/mnt\/server\r\n rm -rf temp # Clean up temp building directory\r\n echo -e \"\\nBuild of OpenRCT2 package complete!\"\r\nelse\r\n # Get required packages\r\n apt install -y curl jq\r\n echo -e \"\\nInstalling\/Updating OpenRCT2 from release tag \\\"${VERSION}\\\"...\\n\"\r\n # This is a simple script to use the GitHub API for release versions.\r\n # This requires the egg has a variable for GITHUB_PACKAGE, VERSION and MATCH (MATCH is to match the filename in some way).\r\n # Get release info and download links\r\n LATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\n RELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\n if [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\n else\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 -i ${MATCH})\r\n else\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\n fi\r\n # Download and unpackage the release\r\n curl -L ${DOWNLOAD_URL} | tar -xzv\r\n # Check if it was successful\r\n if [ -d OpenRCT2 ]; then\r\n echo -e \"\\nDownload of OpenRCT2 release successful!\"\r\n else\r\n echo -e \"\\nFailed to download\/unpack file: ${DOWNLOAD_URL}\\n\"\r\n exit 1\r\n fi\r\nfi\r\n\r\n## OpenRCT2 Setup\r\n# Setup ServerData\/save directory\r\n[ ! -d ServerData\/save ] && mkdir -p ServerData\/save\r\ncd ServerData\/save\r\n# Download default save.park if missing\r\nif [ ! -f save.park ]; then\r\n echo -e \"Downloading default save.park file from ${DEFAULT_SAVE}\"\r\n curl -sSLO ${DEFAULT_SAVE}\r\nfi\r\n\r\necho -e \"\\nOpenRCT2 Successfully Installed!\"", "container": "debian:bullseye-slim", "entrypoint": "\/bin\/bash" } From 45da38ccaaf815cf2de9e7d5daf35ac627d2f3a0 Mon Sep 17 00:00:00 2001 From: Boy132 Date: Fri, 14 Jan 2022 12:01:38 +0100 Subject: [PATCH 0329/1001] Fix mohist download url & make jar file viewable (#1530) --- game_eggs/minecraft/java/mohist/egg-mohist.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/minecraft/java/mohist/egg-mohist.json b/game_eggs/minecraft/java/mohist/egg-mohist.json index d2f5c960..2502a66f 100644 --- a/game_eggs/minecraft/java/mohist/egg-mohist.json +++ b/game_eggs/minecraft/java/mohist/egg-mohist.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-06-14T21:28:24+03:00", + "exported_at": "2022-01-14T09:54:36+01:00", "name": "Mohist", "author": "alex.chang-lam@protonmail.com", "description": "Spigot fork with performance optimizations.", @@ -28,7 +28,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Mohist Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl\r\n\r\n#Go into main direction\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\nif [ ! -z ${BUILD_VERSION} ]; then\r\n DOWNLOAD_LINK=https:\/\/mohistmc.com\/api\/${MC_VERSION}\/${BUILD_VERSION}\/download\r\nelse\r\n DOWNLOAD_LINK=https:\/\/mohistmc.com\/api\/${MC_VERSION}\/${BUILD_TYPE}\/download\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Download link is ${DOWNLOAD_LINK}\"\r\necho -e \"Downloading build version ${BUILD_VERSION}\"\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-server.jar; then\r\n echo -e \"Download link is valid.\"\r\n else\r\n echo -e \"Link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\ncurl -s -o server.jar -sS ${DOWNLOAD_LINK}\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/server.jar ]; then\r\n echo \"!!! Error downloading build version ${BUILD_VERSION} !!!\"\r\n exit\r\nfi", + "script": "#!\/bin\/bash\r\n# Mohist Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl\r\n\r\n#Go into main direction\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\nif [ ! -z ${BUILD_VERSION} ]; then\r\n DOWNLOAD_LINK=https:\/\/mohistmc.com\/api\/${MC_VERSION}\/${BUILD_VERSION}\/download\r\nelse\r\n DOWNLOAD_LINK=https:\/\/mohistmc.com\/api\/${MC_VERSION}\/${BUILD_TYPE}\/download\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Download link is ${DOWNLOAD_LINK}\"\r\necho -e \"Downloading build version ${BUILD_VERSION}\"\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n if curl --output \/dev\/null --silent --fail ${DOWNLOAD_LINK}; then\r\n echo -e \"Download link is valid.\"\r\n else\r\n echo -e \"Link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\ncurl -s -o server.jar -sS ${DOWNLOAD_LINK}\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/server.jar ]; then\r\n echo \"!!! Error downloading build version ${BUILD_VERSION} !!!\"\r\n exit\r\nfi", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -39,7 +39,7 @@ "description": "The name of the jarfile to run the server with.", "env_variable": "SERVER_JARFILE", "default_value": "server.jar", - "user_viewable": false, + "user_viewable": true, "user_editable": false, "rules": "required|string|max:20" }, From 68327020b21469138b7fd58335445ac5276ca426 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Fri, 14 Jan 2022 16:44:52 +0100 Subject: [PATCH 0330/1001] Avorion - Fixed SRCDS_APPID --- game_eggs/steamcmd_servers/avorion/egg-avorion.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/avorion/egg-avorion.json b/game_eggs/steamcmd_servers/avorion/egg-avorion.json index fff7445e..6f5b28b6 100644 --- a/game_eggs/steamcmd_servers/avorion/egg-avorion.json +++ b/game_eggs/steamcmd_servers/avorion/egg-avorion.json @@ -130,7 +130,7 @@ { "name": "Steam App ID", "description": "", - "env_variable": "APP_ID", + "env_variable": "SRCDS_APPID", "default_value": "565060", "user_viewable": false, "user_editable": false, @@ -182,4 +182,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From ba28ba11288603b927a853a34a052351089d5822 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Mon, 17 Jan 2022 15:03:38 -0800 Subject: [PATCH 0331/1001] Update "Save File" variable to support .sv4/.sv6 save files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Michał Janiszewski --- game_eggs/tycoon_games/openrct2/egg-openrct2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/tycoon_games/openrct2/egg-openrct2.json b/game_eggs/tycoon_games/openrct2/egg-openrct2.json index 76bcdd18..ed070f1a 100644 --- a/game_eggs/tycoon_games/openrct2/egg-openrct2.json +++ b/game_eggs/tycoon_games/openrct2/egg-openrct2.json @@ -34,7 +34,7 @@ "default_value": "ServerData\/save\/save.park", "user_viewable": true, "user_editable": true, - "rules": "required|string|min:5" + "rules": "required|string|min:4" }, { "name": "Load Latest Autosave", From 7dcbd35e5a0517cb45746464733822d15e43ed67 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Mon, 17 Jan 2022 15:36:50 -0800 Subject: [PATCH 0332/1001] README corrections - Fixed OpenRCT2 project's website to be correct. - Added note to minimum disk space requirement that building from source *may* require a tad more memory than the base game server needs to run. - Clarified that console commands currently do not work due to a Pterodactyl issue and not a OpenRCT2 one. - Added GitHub issue reference to password known issue. --- game_eggs/tycoon_games/openrct2/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/game_eggs/tycoon_games/openrct2/README.md b/game_eggs/tycoon_games/openrct2/README.md index 1c6d5b57..722216ae 100644 --- a/game_eggs/tycoon_games/openrct2/README.md +++ b/game_eggs/tycoon_games/openrct2/README.md @@ -37,7 +37,7 @@ ___ ___ ### Game Description -From OpenRCT2's [Website](https://openrct2.org/): +From OpenRCT2's [Website](https://openrct2.io/): > OpenRCT2 is an open-source re-implementation of RollerCoaster Tycoon 2 (RCT2), expanding the game with new features, fixing bugs and raising game limits. The gameplay revolves around building and maintaining an amusement park containing attractions, shops and facilities. The player must try to make a profit and maintain a good park reputation whilst keeping the guests happy. OpenRCT2 allows for both scenario and sandbox play. Scenarios require the player to complete a certain objective in a set time limit whilst sandbox allows the player to build a more flexible park with optionally no restrictions or finance. ___ ### Server Ports @@ -52,7 +52,7 @@ ___ |---------|---------| | Processor | Recent x86/64 (AMD/Intel) processor. No ARM support. | | RAM | 256-512 MiB (depends on # of clients & park size) | -| Storage | 80 MB | +| Storage | 80 MB (*may require more if building from source*) | | RCT2 Files | **Not required** | ___ @@ -64,7 +64,7 @@ Save files and autosaves are located in this directory: If the "Load Latest Autosave" startup variable is enabled, and the `autosave/` directory exists, the server will load the latest autosave instead of the specified Save File. ___ ### Console Commands -As of OpenRCT2 v0.3.5.1, entering commands via Pterodactyl do nothing. Hopefully this will be resolved in a future OpenRCT2 update. +Until support for console commands to interactive programs gets added to Pterodactyl, entering commands via the panel's console do nothing (reference issue pterodactyl/panel#3712). ___ ### Becoming an Admin on the Server Unfortunately, because console commands currently do not register, becoming the first admin on the server takes some steps, listed below: @@ -80,7 +80,7 @@ ___ The following are known issues that are unique to running OpenRCT2 on Pterodactyl, but likely can only be fixed by further development/updates from OpenRCT2. - Only building from source from the `develop` branch currently yields a package that is bootable. This will no longer be true for any OpenRCT2 releases after v.0.3.5.1. - This also means that clients joining the server must be on the latest `develop` branch as well. -- Configuring a password on the server disallows non-admin clients from entering in a password in their client to connect; it just disconnects them. Admin clients can still join normally. +- Configuring a password on the server disallows non-admin clients from entering in a password in their client to connect; it just disconnects them. Admin clients can still join normally. (OpenRCT2/OpenRCT2#16396) - You may rarely run into the server crashing on start due to a "Floating point exception(core dumped)" error. If this occurs to you, please help with OpenRCT2 development by doing the following: 1. Add the following to the beginning of your server's startup command: `SEGFAULT_SIGNALS=fpe LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so ` 2. Start the server. If it boots normally, nothing extra will print. If it crashes, it will print a stack trace to the console. From 45e100270c8a91c5cd1ce715ab667c154dd9ff1e Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Mon, 17 Jan 2022 15:48:23 -0800 Subject: [PATCH 0333/1001] Fix issue reference links in README Didn't know GitHub wouldn't parse the issue links in the README like it does in discussions... --- game_eggs/tycoon_games/openrct2/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/tycoon_games/openrct2/README.md b/game_eggs/tycoon_games/openrct2/README.md index 722216ae..2a270b4b 100644 --- a/game_eggs/tycoon_games/openrct2/README.md +++ b/game_eggs/tycoon_games/openrct2/README.md @@ -64,7 +64,7 @@ Save files and autosaves are located in this directory: If the "Load Latest Autosave" startup variable is enabled, and the `autosave/` directory exists, the server will load the latest autosave instead of the specified Save File. ___ ### Console Commands -Until support for console commands to interactive programs gets added to Pterodactyl, entering commands via the panel's console do nothing (reference issue pterodactyl/panel#3712). +Until support for console commands to interactive programs gets added to Pterodactyl, entering commands via the panel's console do nothing (reference issue [pterodactyl/panel#3712](https://github.com/pterodactyl/panel/issues/3712)). ___ ### Becoming an Admin on the Server Unfortunately, because console commands currently do not register, becoming the first admin on the server takes some steps, listed below: @@ -80,7 +80,7 @@ ___ The following are known issues that are unique to running OpenRCT2 on Pterodactyl, but likely can only be fixed by further development/updates from OpenRCT2. - Only building from source from the `develop` branch currently yields a package that is bootable. This will no longer be true for any OpenRCT2 releases after v.0.3.5.1. - This also means that clients joining the server must be on the latest `develop` branch as well. -- Configuring a password on the server disallows non-admin clients from entering in a password in their client to connect; it just disconnects them. Admin clients can still join normally. (OpenRCT2/OpenRCT2#16396) +- Configuring a password on the server disallows non-admin clients from entering in a password in their client to connect; it just disconnects them. Admin clients can still join normally. (reference issue [OpenRCT2/OpenRCT2#16396](https://github.com/OpenRCT2/OpenRCT2/issues/16396)) - You may rarely run into the server crashing on start due to a "Floating point exception(core dumped)" error. If this occurs to you, please help with OpenRCT2 development by doing the following: 1. Add the following to the beginning of your server's startup command: `SEGFAULT_SIGNALS=fpe LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so ` 2. Start the server. If it boots normally, nothing extra will print. If it crashes, it will print a stack trace to the console. From aa1340350313530d317bb996d93d4e0200c44583 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Thu, 20 Jan 2022 19:43:40 +0200 Subject: [PATCH 0334/1001] feat: pid_limit egg feature to MC eggs Other eggs might benefit from this as well, but for now will stick with MC that are known to spawn a lot of processes when modded. --- .../minecraft/bedrock/bedrock/egg-vanilla-bedrock.json | 6 ++++-- game_eggs/minecraft/java/airplane/egg-airplane.json | 5 +++-- game_eggs/minecraft/java/fabric/egg-fabric.json | 5 +++-- .../forge/curseforge-generic/egg-curseforge-generic.json | 3 ++- .../minecraft/java/forge/forge/egg-forge-enhanced.json | 5 +++-- .../minecraft/java/ftb/egg-ftb-modpacksch-server.json | 3 ++- game_eggs/minecraft/java/krypton/egg-krypton.json | 3 ++- game_eggs/minecraft/java/magma/egg-magma.json | 5 +++-- game_eggs/minecraft/java/mohist/egg-mohist.json | 3 ++- game_eggs/minecraft/java/nanolimbo/egg-nano-limbo.json | 8 ++++++-- game_eggs/minecraft/java/paper/egg-paper.json | 5 +++-- game_eggs/minecraft/java/purpur/egg-purpur.json | 5 +++-- game_eggs/minecraft/java/spigot/egg-spigot.json | 5 +++-- .../minecraft/java/spongeforge/egg-sponge-forge.json | 3 ++- .../minecraft/java/spongevanilla/egg-sponge-vanilla.json | 5 +++-- game_eggs/minecraft/java/tuinity/egg-tuinity.json | 5 +++-- .../minecraft/java/vanillacord/egg-vanilla-cord.json | 5 +++-- .../proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json | 5 +++-- .../proxy/cross_platform/waterdog/egg-waterdog.json | 5 +++-- .../minecraft/proxy/java/flamecord/egg-flamecord.json | 5 +++-- .../minecraft/proxy/java/travertine/egg-travertine.json | 5 +++-- .../proxy/java/typhoonlimbo/egg-typhoon-limbo.json | 4 +++- game_eggs/minecraft/proxy/java/velocity/egg-velocity.json | 3 ++- game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json | 3 ++- .../minecraft/proxy/java/waterfall/egg-waterfall.json | 5 +++-- 25 files changed, 72 insertions(+), 42 deletions(-) diff --git a/game_eggs/minecraft/bedrock/bedrock/egg-vanilla-bedrock.json b/game_eggs/minecraft/bedrock/bedrock/egg-vanilla-bedrock.json index 31507ac9..30d6d85e 100644 --- a/game_eggs/minecraft/bedrock/bedrock/egg-vanilla-bedrock.json +++ b/game_eggs/minecraft/bedrock/bedrock/egg-vanilla-bedrock.json @@ -8,7 +8,9 @@ "name": "Vanilla Bedrock", "author": "parker@parkervcp.com", "description": "Bedrock Edition (also known as the Bedrock Version, Bedrock Codebase, Bedrock Engine or just Bedrock) refers to the multi-platform family of editions of Minecraft developed by Mojang AB, Microsoft Studios, 4J Studios, and SkyBox Labs. Prior to this term, as the engine originated with Pocket Edition, this entire product family was referred to as \"Pocket Edition\", \"MCPE\", or \"Pocket\/Windows 10 Edition\".", - "features": null, + "features": [ + "pid_limit" + ], "images": [ "quay.io\/parkervcp\/pterodactyl-images:base_debian" ], @@ -83,4 +85,4 @@ "rules": "required|string|in:true,false" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/airplane/egg-airplane.json b/game_eggs/minecraft/java/airplane/egg-airplane.json index 20c90383..764a8679 100644 --- a/game_eggs/minecraft/java/airplane/egg-airplane.json +++ b/game_eggs/minecraft/java/airplane/egg-airplane.json @@ -10,7 +10,8 @@ "description": "A stable, optimized and fast Paper fork.\r\nhttps:\/\/github.com\/TECHNOVE\/Airplane", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_17", @@ -62,4 +63,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/fabric/egg-fabric.json b/game_eggs/minecraft/java/fabric/egg-fabric.json index 064fd7c0..8aaa9342 100644 --- a/game_eggs/minecraft/java/fabric/egg-fabric.json +++ b/game_eggs/minecraft/java/fabric/egg-fabric.json @@ -10,7 +10,8 @@ "description": "Fabric is a modular modding toolchain targeting Minecraft 1.14 and above, including snapshots.", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_17", @@ -71,4 +72,4 @@ "rules": "required|string|between:3,15" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json b/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json index 50a67d53..61f2c92c 100644 --- a/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json +++ b/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json @@ -10,7 +10,8 @@ "description": "A generic egg for a forge modpack", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_8", diff --git a/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json b/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json index bcec803e..5038cae9 100644 --- a/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json +++ b/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json @@ -10,7 +10,8 @@ "description": "Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_17", @@ -71,4 +72,4 @@ "rules": "nullable|string|max:25" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/ftb/egg-ftb-modpacksch-server.json b/game_eggs/minecraft/java/ftb/egg-ftb-modpacksch-server.json index 20d983be..ad59555a 100644 --- a/game_eggs/minecraft/java/ftb/egg-ftb-modpacksch-server.json +++ b/game_eggs/minecraft/java/ftb/egg-ftb-modpacksch-server.json @@ -10,7 +10,8 @@ "description": "Since the release of the FTB APP, FTB modpacks are now distributed through modpacks.ch. This egg was developed for support for modpacks that are distributed through this.", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_8", diff --git a/game_eggs/minecraft/java/krypton/egg-krypton.json b/game_eggs/minecraft/java/krypton/egg-krypton.json index 258262fd..eed82973 100644 --- a/game_eggs/minecraft/java/krypton/egg-krypton.json +++ b/game_eggs/minecraft/java/krypton/egg-krypton.json @@ -10,7 +10,8 @@ "description": "A fast, lightweight Minecraft server written in Kotlin", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_8", diff --git a/game_eggs/minecraft/java/magma/egg-magma.json b/game_eggs/minecraft/java/magma/egg-magma.json index 527dc9b7..49e63930 100644 --- a/game_eggs/minecraft/java/magma/egg-magma.json +++ b/game_eggs/minecraft/java/magma/egg-magma.json @@ -10,7 +10,8 @@ "description": "Magma is most powerful Forge server providing you with Forge mods and Bukkit Plugins using Spigot and Paper for Performance Optimization and Stability.", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_8", @@ -61,4 +62,4 @@ "rules": "required|string|in:dev,stable" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/mohist/egg-mohist.json b/game_eggs/minecraft/java/mohist/egg-mohist.json index 2502a66f..1dd2339b 100644 --- a/game_eggs/minecraft/java/mohist/egg-mohist.json +++ b/game_eggs/minecraft/java/mohist/egg-mohist.json @@ -10,7 +10,8 @@ "description": "Spigot fork with performance optimizations.", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_8", diff --git a/game_eggs/minecraft/java/nanolimbo/egg-nano-limbo.json b/game_eggs/minecraft/java/nanolimbo/egg-nano-limbo.json index d851618f..92fa577f 100644 --- a/game_eggs/minecraft/java/nanolimbo/egg-nano-limbo.json +++ b/game_eggs/minecraft/java/nanolimbo/egg-nano-limbo.json @@ -8,7 +8,11 @@ "name": "NanoLimbo", "author": "mail@wuffy.eu", "description": "This is lightweight minecraft limbo server, written on Java with Netty. The main goal of the project is maximum simplicity with a minimum number of sent and processed packets. This limbo is empty, there are no ability to set schematic building since this is not necessary. You can send useful information in chat or BossBar.\r\n\r\nNo plugins, no logs. The server is fully clear. It only able keep a lot of players while the main server is down.", - "features": null, + "features": [ + "eula", + "java_version", + "pid_limit" + ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_8" ], @@ -56,4 +60,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/paper/egg-paper.json b/game_eggs/minecraft/java/paper/egg-paper.json index b5717965..bbb9de1b 100644 --- a/game_eggs/minecraft/java/paper/egg-paper.json +++ b/game_eggs/minecraft/java/paper/egg-paper.json @@ -10,7 +10,8 @@ "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_17", @@ -71,4 +72,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/purpur/egg-purpur.json b/game_eggs/minecraft/java/purpur/egg-purpur.json index 808bdd90..579bda6d 100644 --- a/game_eggs/minecraft/java/purpur/egg-purpur.json +++ b/game_eggs/minecraft/java/purpur/egg-purpur.json @@ -10,7 +10,8 @@ "description": "A drop-in replacement for Paper servers designed for configurability, and new fun and exciting gameplay features.", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_17", @@ -62,4 +63,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/spigot/egg-spigot.json b/game_eggs/minecraft/java/spigot/egg-spigot.json index d1e5985a..ac81e7a3 100644 --- a/game_eggs/minecraft/java/spigot/egg-spigot.json +++ b/game_eggs/minecraft/java/spigot/egg-spigot.json @@ -10,7 +10,8 @@ "description": "Spigot is the most widely-used modded Minecraft server software in the world. It powers many of the top Minecraft server networks around to ensure they can cope with their huge player base and ensure the satisfaction of their players. Spigot works by reducing and eliminating many causes of lag, as well as adding in handy features and settings that help make your job of server administration easier.", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_17", @@ -62,4 +63,4 @@ "rules": "required|string|between:3,10" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/spongeforge/egg-sponge-forge.json b/game_eggs/minecraft/java/spongeforge/egg-sponge-forge.json index 8924dba4..a6fae67b 100644 --- a/game_eggs/minecraft/java/spongeforge/egg-sponge-forge.json +++ b/game_eggs/minecraft/java/spongeforge/egg-sponge-forge.json @@ -10,7 +10,8 @@ "description": "A community-driven open source Minecraft: Java Edition modding platform.", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_8", diff --git a/game_eggs/minecraft/java/spongevanilla/egg-sponge-vanilla.json b/game_eggs/minecraft/java/spongevanilla/egg-sponge-vanilla.json index 630e8042..c6d9449b 100644 --- a/game_eggs/minecraft/java/spongevanilla/egg-sponge-vanilla.json +++ b/game_eggs/minecraft/java/spongevanilla/egg-sponge-vanilla.json @@ -10,7 +10,8 @@ "description": "SpongeVanilla is the implementation of the Sponge API on top of Vanilla Minecraft.", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_17", @@ -53,4 +54,4 @@ "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/tuinity/egg-tuinity.json b/game_eggs/minecraft/java/tuinity/egg-tuinity.json index 4434352b..e8af6c52 100644 --- a/game_eggs/minecraft/java/tuinity/egg-tuinity.json +++ b/game_eggs/minecraft/java/tuinity/egg-tuinity.json @@ -10,7 +10,8 @@ "description": "Fork of Paper aimed at improving server performance at high playercounts.", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_17", @@ -44,4 +45,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/java/vanillacord/egg-vanilla-cord.json b/game_eggs/minecraft/java/vanillacord/egg-vanilla-cord.json index adc6266f..8cd9f85c 100644 --- a/game_eggs/minecraft/java/vanillacord/egg-vanilla-cord.json +++ b/game_eggs/minecraft/java/vanillacord/egg-vanilla-cord.json @@ -10,7 +10,8 @@ "description": "Minecraft is a game about placing blocks and going on adventures. Explore randomly generated worlds and build amazing things from the simplest of homes to the grandest of castles. Play in Creative Mode with unlimited resources or mine deep in Survival Mode, crafting weapons and armor to fend off dangerous mobs. Do all this alone or with friends.\r\n\r\nVanillaCord adds support for BungeeCord's ip_forward setting.", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_17", @@ -53,4 +54,4 @@ "rules": "required|string|between:3,15" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json b/game_eggs/minecraft/proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json index 2fbfcbb7..834cdc6c 100644 --- a/game_eggs/minecraft/proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json +++ b/game_eggs/minecraft/proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json @@ -10,7 +10,8 @@ "description": "Brand new proxy server for Minecraft: Bedrock Edition", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_17", @@ -53,4 +54,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json b/game_eggs/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json index 1964dda3..154d2e09 100644 --- a/game_eggs/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json +++ b/game_eggs/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json @@ -10,7 +10,8 @@ "description": "Waterdog is fork of the well-known Waterfall, which is a fork of the well-known BungeeCord, server teleportation suite.", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_17", @@ -53,4 +54,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json b/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json index aa279f1c..e80e7b72 100644 --- a/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json +++ b/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json @@ -10,7 +10,8 @@ "description": "FlameCord is a patch for Travertine to fix possible exploits and add useful functionalities. FlameCord aims to fix Netty related exploits to keep your server safe from attacks.", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_17", @@ -53,4 +54,4 @@ "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/proxy/java/travertine/egg-travertine.json b/game_eggs/minecraft/proxy/java/travertine/egg-travertine.json index 5c4042cc..9e25d5ea 100644 --- a/game_eggs/minecraft/proxy/java/travertine/egg-travertine.json +++ b/game_eggs/minecraft/proxy/java/travertine/egg-travertine.json @@ -10,7 +10,8 @@ "description": "Travertine is a fork of Waterfall with 1.7 protocol support. Waterfall is a fork of the well-known BungeeCord server teleportation suite.", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_17", @@ -71,4 +72,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json b/game_eggs/minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json index 5695c710..e1c7fb1d 100644 --- a/game_eggs/minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json +++ b/game_eggs/minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json @@ -8,7 +8,9 @@ "name": "TyphoonLimbo", "author": "parker@parkervcp.com", "description": "Lightweight minecraft limbo server", - "features": null, + "features": [ + "pid_limit" + ], "images": [ "ghcr.io\/parkervcp\/yolks:debian" ], diff --git a/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json b/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json index b9643632..6d818780 100644 --- a/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json +++ b/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json @@ -10,7 +10,8 @@ "description": "Velocity is a Minecraft server proxy with unparalleled server support, scalability, and flexibility.", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_17", diff --git a/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json b/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json index 976deac7..7530a027 100644 --- a/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json +++ b/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json @@ -10,7 +10,8 @@ "description": "VIAaaS - ViaVersion as a Service - Standalone ViaVersion proxy", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_17", diff --git a/game_eggs/minecraft/proxy/java/waterfall/egg-waterfall.json b/game_eggs/minecraft/proxy/java/waterfall/egg-waterfall.json index 01612883..4d7fc579 100644 --- a/game_eggs/minecraft/proxy/java/waterfall/egg-waterfall.json +++ b/game_eggs/minecraft/proxy/java/waterfall/egg-waterfall.json @@ -10,7 +10,8 @@ "description": "Waterfall is a fork of the well-known BungeeCord server teleportation suite.", "features": [ "eula", - "java_version" + "java_version", + "pid_limit" ], "images": [ "ghcr.io\/pterodactyl\/yolks:java_17", @@ -71,4 +72,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From 777174781c554faa5ddb8a849669025dfd491f12 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Thu, 20 Jan 2022 20:09:13 +0200 Subject: [PATCH 0335/1001] feat: add steam_disk_space egg feature to SteamCMD eggs A new egg feature modal was introduced in Panel v1.7.0 triggering when server has run out of disk space to provide more user-friendly instructions to both admins and normal users. This is unique to SteamCMD specific errors. --- .../7_days_to_die/egg-7-days-to-die.json | 4 +- .../egg-ark--survival-evolved.json | 6 +- .../arma/arma3/egg-arma3.json | 6 +- .../assetto_corsa/egg-assetto-corsa.json | 6 +- .../steamcmd_servers/avorion/egg-avorion.json | 4 +- .../barotrauma/egg-barotrauma.json | 6 +- .../citadel/egg-citadel-forged-with-fire.json | 6 +- .../conan_exiles/egg-conan-exiles.json | 17 +++-- .../craftopia/egg-craftopia.json | 6 +- .../cryofall/egg-cryo-fall.json | 6 +- .../egg-don-t-starve-together.json | 6 +- game_eggs/steamcmd_servers/eco/egg-eco.json | 6 +- game_eggs/steamcmd_servers/fof/egg-fof.json | 4 +- .../egg-custom-h-l-d-s-engine-game.json | 35 ++++++----- .../holdfast/egg-holdfast-na-w.json | 19 ++++-- .../hurtworld/egg-hurtworld.json | 35 ++++++----- .../egg-insurgency--sandstorm.json | 6 +- .../killing_floor_2/egg-killing-floor2.json | 4 +- .../left4dead/egg-left4dead.json | 4 +- .../left4dead_2/egg-left4dead_2.json | 4 +- .../modiverse/egg-modiverse.json | 4 +- .../mordhau/egg-mordhau-wine.json | 6 +- .../steamcmd_servers/mordhau/egg-mordhau.json | 4 +- .../steamcmd_servers/nmrih/egg-nmrih.json | 4 +- .../steamcmd_servers/onset/egg-onset.json | 29 +++++---- .../pavlov_vr/egg-pavlov-v-r.json | 6 +- .../pixark/egg-pix-a-r-k.json | 6 +- .../post_scriptum/egg-post-scriptum.json | 4 +- .../project_zomboid/egg-project-zomboid.json | 6 +- .../quake_live/egg-quake-live.json | 6 +- .../rising_world/egg-rising-world.json | 6 +- .../risk_of_rain_2/egg-risk-of-rain2.json | 6 +- .../rust/rust_autowipe/egg-rust-autowipe.json | 4 +- .../rust/rust_staging/egg-rust-staging.json | 4 +- .../satisfactory/egg-satisfactory.json | 4 +- .../scpsl/dedicated/egg-scpsl.json | 4 +- .../scpsl/exiled/egg-s-c-p--s-l--exiled.json | 4 +- ...s-c-p--secret-laboratory--multi-admin.json | 6 +- .../steamcmd_servers/soldat/egg-soldat.json | 19 ++++-- .../space_engineers/egg-space-engineers.json | 6 +- .../steamcmd_servers/squad/egg-squad.json | 63 ++++++++++--------- .../starbound/egg-starbound.json | 4 +- .../stationeers/egg-stationeers.json | 47 ++++++++------ .../egg-stormworks--build-and-rescue.json | 15 +++-- .../subnautica_nitrox_mod/egg-subnautica.json | 6 +- .../svencoop/egg-sven-co-op.json | 43 +++++++------ .../egg-team-fortress-2-classic.json | 17 +++-- .../the_forest/egg-the-forest.json | 6 +- .../tower_unite/egg-tower-unite.json | 35 ++++++----- .../unturned/egg-unturned.json | 33 ++++++---- .../valheim_plus/egg-valheim-plus-mod.json | 6 +- .../valheim/valheim_vanilla/egg-valheim.json | 6 +- 52 files changed, 389 insertions(+), 220 deletions(-) diff --git a/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json b/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json index b1e3a7f6..81309ccc 100644 --- a/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json +++ b/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json @@ -8,7 +8,9 @@ "name": "7 Days To Die", "author": "kristoffer.norman@bahnhof.se", "description": "7 days to die server", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "ghcr.io\/parkervcp\/games:source" ], diff --git a/game_eggs/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json b/game_eggs/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json index eb40fa9d..51c0c553 100644 --- a/game_eggs/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json +++ b/game_eggs/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json @@ -8,7 +8,9 @@ "name": "Ark: Survival Evolved", "author": "dev@shepper.fr", "description": "As a man or woman stranded, naked, freezing, and starving on the unforgiving shores of a mysterious island called ARK, use your skill and cunning to kill or tame and ride the plethora of leviathan dinosaurs and other primeval creatures roaming the land. Hunt, harvest resources, craft items, grow crops, research technologies, and build shelters to withstand the elements and store valuables, all while teaming up with (or preying upon) hundreds of other players to survive, dominate... and escape! \u2014 Gamepedia: ARK", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "ghcr.io\/parkervcp\/games:source" ], @@ -119,4 +121,4 @@ "rules": "nullable|string" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/arma/arma3/egg-arma3.json b/game_eggs/steamcmd_servers/arma/arma3/egg-arma3.json index 80c66e54..9c72ea16 100644 --- a/game_eggs/steamcmd_servers/arma/arma3/egg-arma3.json +++ b/game_eggs/steamcmd_servers/arma/arma3/egg-arma3.json @@ -8,7 +8,9 @@ "name": "Arma 3", "author": "rehlmgaming@gmail.com", "description": "Experience true combat gameplay in a massive military sandbox. Deploying a wide variety of single- and multiplayer content, over 20 vehicles and 40 weapons, and limitless opportunities for content creation, this is the PC's premier military game. Authentic, diverse, open - Arma 3 sends you to war.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "ghcr.io\/parkervcp\/games:arma3" ], @@ -236,4 +238,4 @@ "rules": "required|string" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/assetto_corsa/egg-assetto-corsa.json b/game_eggs/steamcmd_servers/assetto_corsa/egg-assetto-corsa.json index 5046c263..905a4c08 100644 --- a/game_eggs/steamcmd_servers/assetto_corsa/egg-assetto-corsa.json +++ b/game_eggs/steamcmd_servers/assetto_corsa/egg-assetto-corsa.json @@ -8,7 +8,9 @@ "name": "Assetto Corsa", "author": "admin@softwarenoob.com", "description": "Assetto Corsa (Italian for \"Race Setup\") is a sim racing video game developed by the Italian video game developer Kunos Simulazioni. It is designed with an emphasis on a realistic racing experience with support for extensive customization and moddability", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "ghcr.io\/parkervcp\/games:source" ], @@ -119,4 +121,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/avorion/egg-avorion.json b/game_eggs/steamcmd_servers/avorion/egg-avorion.json index 6f5b28b6..4c0206bb 100644 --- a/game_eggs/steamcmd_servers/avorion/egg-avorion.json +++ b/game_eggs/steamcmd_servers/avorion/egg-avorion.json @@ -8,7 +8,9 @@ "name": "Avorion", "author": "iamkubi@gmail.com", "description": "A procedural co-op space sandbox where players can build their own space ships out of dynamically scalable blocks. Fight epic space battles, explore, mine, trade, wage wars and build your own empire to save your galaxy from being torn apart by an unknown enemy.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "ghcr.io\/parkervcp\/games:source" ], diff --git a/game_eggs/steamcmd_servers/barotrauma/egg-barotrauma.json b/game_eggs/steamcmd_servers/barotrauma/egg-barotrauma.json index c72a2666..4cc6a1f7 100644 --- a/game_eggs/steamcmd_servers/barotrauma/egg-barotrauma.json +++ b/game_eggs/steamcmd_servers/barotrauma/egg-barotrauma.json @@ -8,7 +8,9 @@ "name": "Barotrauma", "author": "admin@softwarenoob.com", "description": "Barotrauma is a 2D co-op survival horror submarine simulator, inspired by games like FTL: Faster Than Light, Rimworld, Dwarf Fortress and Space Station 13. It\u2019s a Sci-Fi game that combines ragdoll physics and alien sea monsters with teamwork and existential fear.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "ghcr.io\/parkervcp\/games:source" ], @@ -47,4 +49,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/citadel/egg-citadel-forged-with-fire.json b/game_eggs/steamcmd_servers/citadel/egg-citadel-forged-with-fire.json index d2b94ae1..1c294c12 100644 --- a/game_eggs/steamcmd_servers/citadel/egg-citadel-forged-with-fire.json +++ b/game_eggs/steamcmd_servers/citadel/egg-citadel-forged-with-fire.json @@ -8,7 +8,9 @@ "name": "Citadel: Forged with Fire", "author": "info@goover.de", "description": "Citadel: Forged With Fire is a massive online sandbox RPG set in the mystical world of Ignus. Featuring magic, spellcasting, building, exploring and crafting as you fight to make a name for yourself and achieve notoriety across the land.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "ghcr.io\/parkervcp\/games:source" ], @@ -65,4 +67,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json b/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json index f7fc3df2..4618f5ba 100644 --- a/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json +++ b/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json @@ -1,13 +1,20 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-10-24T11:25:01+00:00", + "exported_at": "2022-01-20T12:47:23-05:00", "name": "Conan Exiles", "author": "brycea@terrahost.cloud", "description": "Conan Exiles is an open-world survival game set in the brutal lands of Conan the Barbarian. Survive in a savage world, build your kingdom, and dominate your enemies in brutal combat and epic warfare.", - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_wine-5", + "features": [ + "steam_disk_space" + ], + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:debian_wine-5" + ], + "file_denylist": [], "startup": "xvfb-run --auto-servernum wine \/home\/container\/ConanSandboxServer.exe -console -log -Port={{SERVER_PORT}} -QueryPort={{QUERY_PORT}}", "config": { "files": "{}", @@ -17,7 +24,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +@sSteamCmdForcePlatformType windows +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +@sSteamCmdForcePlatformType windows +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -69,4 +76,4 @@ "rules": "required|numeric|max:65535" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json b/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json index f1fd8187..5a24cf53 100644 --- a/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json +++ b/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json @@ -8,7 +8,9 @@ "name": "Craftopia", "author": "info@goover.de", "description": "Craftopia is the brand new multiplayer survival action game made in Japan. We combined many features we find enjoyable, such as hunting, farming, hack-and-slash, building, automation to develop this game.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "ghcr.io\/parkervcp\/games:source" ], @@ -56,4 +58,4 @@ "rules": "required|string|max:50" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/cryofall/egg-cryo-fall.json b/game_eggs/steamcmd_servers/cryofall/egg-cryo-fall.json index a780101a..9d7ea870 100644 --- a/game_eggs/steamcmd_servers/cryofall/egg-cryo-fall.json +++ b/game_eggs/steamcmd_servers/cryofall/egg-cryo-fall.json @@ -8,7 +8,9 @@ "name": "CryoFall", "author": "contact@zennodes.dk", "description": "NOTE: For now you have to change SettingsServer.xml under CryoFall_Server_v(Version)_NetCore\/Data\/SettingsServer.xml\r\n\r\nCryoFall is a sci-fi multiplayer colony simulation survival game set on a forgotten planet in a distant future.\r\n\r\nJoin the vast world of CryoFall together with other survivors to rebuild your civilization from scratch. Start with primitive technology and simple tools and use them to progress towards modern industrial might and even beyond, eventually reaching space-age technology only seen in science fiction.\r\n\r\nCryoFall can be played either as a relaxed PvE experience with no competition or as a brutal and unforgiving PvP. Make your choice and join one of many available servers with different game modes or host your own and invite your friends to join you!\r\n\r\nBuild your house or a large base together with other players. Dig wells and create farms to sustain basic needs. Build vehicles to explore the world faster. Establish basics of science, all the way from medicine and chemistry to fuel creation and even lithium extraction to create electronic devices. Cook food or prepare drinks to sell them from vending machines in your store.\r\n\r\nBuild factories to produce on an industrial scale: Weapons and defense systems, bionic implants to augment yourself, even large war machines and artillery guns to use against the biggest of opponents", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "ghcr.io\/parkervcp\/yolks:dotnet_5" ], @@ -38,4 +40,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/dont_starve/egg-don-t-starve-together.json b/game_eggs/steamcmd_servers/dont_starve/egg-don-t-starve-together.json index fac6f1a4..7ac34fcf 100644 --- a/game_eggs/steamcmd_servers/dont_starve/egg-don-t-starve-together.json +++ b/game_eggs/steamcmd_servers/dont_starve/egg-don-t-starve-together.json @@ -8,7 +8,9 @@ "name": "Don't Starve Together", "author": "parker@parkervcp.com", "description": "Don\u2019t Starve Together is an uncompromising wilderness survival game full of science and magic.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "quay.io\/parkervcp\/pterodactyl-images:debian_source" ], @@ -110,4 +112,4 @@ "rules": "nullable|string" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/eco/egg-eco.json b/game_eggs/steamcmd_servers/eco/egg-eco.json index 85ffcfbf..2427f1c6 100644 --- a/game_eggs/steamcmd_servers/eco/egg-eco.json +++ b/game_eggs/steamcmd_servers/eco/egg-eco.json @@ -8,7 +8,9 @@ "name": "Eco", "author": "info@goover.de", "description": "Eco is an online world from Strange Loop Games where players must build civilization using resources from an ecosystem that can be damaged and destroyed. The world of Eco is an incredibly reactive one, and whatever any player does in the world affects the underlying ecosystem.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "quay.io\/parkervcp\/pterodactyl-images:debian_dotnet-5" ], @@ -92,4 +94,4 @@ "rules": "required|string|max:50" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/fof/egg-fof.json b/game_eggs/steamcmd_servers/fof/egg-fof.json index 1ad65cd8..f6a74f04 100644 --- a/game_eggs/steamcmd_servers/fof/egg-fof.json +++ b/game_eggs/steamcmd_servers/fof/egg-fof.json @@ -8,7 +8,9 @@ "name": "Fof", "author": "avalongamecs@gmail.com", "description": "Fistful of Frags", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "quay.io\/pterodactyl\/core:source" ], 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/egg-custom-h-l-d-s-engine-game.json index 173dc848..3d6c6251 100644 --- a/game_eggs/steamcmd_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json +++ b/game_eggs/steamcmd_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json @@ -1,23 +1,30 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2019-06-28T20:41:35-04:00", + "exported_at": "2022-01-20T12:52:11-05:00", "name": "Custom HLDS Engine Game", "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", + "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 \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "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\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", + "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 +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", "container": "ubuntu:18.04", "entrypoint": "bash" } @@ -28,8 +35,8 @@ "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": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "required|numeric|digits_between:1,6" }, { @@ -37,8 +44,8 @@ "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": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "required|alpha_dash|between:1,100" }, { @@ -46,8 +53,8 @@ "description": "The default map for the server.", "env_variable": "SRCDS_MAP", "default_value": "de_dust2", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|alpha_dash" }, { @@ -55,8 +62,8 @@ "description": "Specifies the VAC port the server should use. Default is 26900.", "env_variable": "VAC_PORT", "default_value": "26900", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "required|numeric|digits_between:1,5" } ] diff --git a/game_eggs/steamcmd_servers/holdfast/egg-holdfast-na-w.json b/game_eggs/steamcmd_servers/holdfast/egg-holdfast-na-w.json index f04c4fcd..a774cddc 100644 --- a/game_eggs/steamcmd_servers/holdfast/egg-holdfast-na-w.json +++ b/game_eggs/steamcmd_servers/holdfast/egg-holdfast-na-w.json @@ -1,18 +1,25 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-10-18T19:13:53-04:00", + "exported_at": "2022-01-20T12:53:50-05:00", "name": "Holdfast NaW", "author": "ankit@bmghosting.com", "description": "Holdfast: Nations at War", - "image": "bmghosting\/pterodactyl-holdfast", + "features": [ + "steam_disk_space" + ], + "images": [ + "bmghosting\/pterodactyl-holdfast" + ], + "file_denylist": [], "startup": "\".\/holdfastnaw-dedicated\/Holdfast NaW\" -startserver -batchmode -nographics -screen-width 320 -screen-height 240 -screen-quality Fastest -framerate {{FPSMAX}} --serverheadless -serverConfigFilePath holdfastnaw-dedicated\/configs\/{{SERVER_CONFIG_PATH}} -logFile holdfastnaw-dedicated\/logs_output\/output_{{SERVER_CONFIG_PATH}} -logArchivesDirectory holdfastnaw-dedicated\/{{SERVER_LOG_ARCHIVE_PATH}}\/ -adminCommandsLogFilePath holdfastnaw-dedicated\/logs_adminactions\/admin_{{SERVER_CONFIG_PATH}} -playersLogFilePath holdfastnaw-dedicated\/logs_playerlogin\/players_{{SERVER_CONFIG_PATH}} -scoreboardLogFilePath holdfastnaw-dedicated\/logs_score\/scorelog_{{SERVER_CONFIG_PATH}} -chatLogFilePath holdfastnaw-dedicated\/logs_chat\/chatlog_{{SERVER_CONFIG_PATH}} -workshopDataPath holdfastnaw-dedicated\/workshop -micSpammersPlayersFilePath holdfastnaw-dedicated\/micspammers.txt -mutedVoipPlayersFilePath holdfastnaw-dedicated\/mutedplayersvoip.txt -mutedChatPlayersFilePath holdfastnaw-dedicated\/mutedplayerschat.txt -bannedPlayersFilePath holdfastnaw-dedicated\/bannedplayers.txt -p {{SERVER_PORT}} -l \"94.130.66.231\" -o 7101", "config": { "files": "{}", - "startup": "{\r\n \"done\": \"STEAMAPPS_INTERFACE_VERSION008\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "startup": "{\r\n \"done\": \"STEAMAPPS_INTERFACE_VERSION008\"\r\n}", + "logs": "{}", "stop": "^C" }, "scripts": { @@ -141,4 +148,4 @@ "rules": "nullable|string|max:100" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/hurtworld/egg-hurtworld.json b/game_eggs/steamcmd_servers/hurtworld/egg-hurtworld.json index 135369c1..37d3c695 100644 --- a/game_eggs/steamcmd_servers/hurtworld/egg-hurtworld.json +++ b/game_eggs/steamcmd_servers/hurtworld/egg-hurtworld.json @@ -1,23 +1,30 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-04-16T20:41:27-04:00", + "exported_at": "2022-01-20T12:55:06-05:00", "name": "Hurtworld", "author": "brycea@terrahost.cloud", "description": "Hurtworld is a hardcore multiplayer survival FPS with a focus on deep survival progression that doesn't become trivial once you establish some basic needs. Built for hardcore gamers, Hurtworld aims to punish.", - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_source", + "features": [ + "steam_disk_space" + ], + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:debian_source" + ], + "file_denylist": [], "startup": ".\/Hurtworld.x86_64 -batchmode -nographics -exec \"host {{SERVER_PORT}};queryport {{QUERY_PORT}};maxplayers {{MAX_PLAYERS}};servername {{HOSTNAME}};creativemode ${CREATIVE_MODE};${ADMINS}\" -logfile $1", "config": { "files": "{}", "startup": "{\r\n \"done\": \"orphaned items\"\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "logs": "{}", "stop": "^C" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -28,8 +35,8 @@ "description": "The ID corresponding to the game to download and run using SRCDS.", "env_variable": "SRCDS_APPID", "default_value": "405100", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "required|regex:\/^(405100)$\/" }, { @@ -37,8 +44,8 @@ "description": "Server Query Default Port", "env_variable": "QUERY_PORT", "default_value": "13871", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "required|string" }, { @@ -46,8 +53,8 @@ "description": "Max players allowed on the server at one time.", "env_variable": "MAX_PLAYERS", "default_value": "60", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:60" }, { @@ -55,9 +62,9 @@ "description": "The name of your server in the public server list.", "env_variable": "HOSTNAME", "default_value": "A Hurtworld Server", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:50" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/insurgency_sandstorm/egg-insurgency--sandstorm.json b/game_eggs/steamcmd_servers/insurgency_sandstorm/egg-insurgency--sandstorm.json index 966e11fb..724c0989 100644 --- a/game_eggs/steamcmd_servers/insurgency_sandstorm/egg-insurgency--sandstorm.json +++ b/game_eggs/steamcmd_servers/insurgency_sandstorm/egg-insurgency--sandstorm.json @@ -8,7 +8,9 @@ "name": "Insurgency: Sandstorm", "author": "brycea@terrahost.cloud", "description": "Insurgency: Sandstorm is a team-based, tactical FPS based on lethal close quarters combat and objective-oriented multiplayer gameplay. Experience the intensity of modern combat where skill is rewarded, and teamwork wins the fight.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "ghcr.io\/parkervcp\/games:source" ], @@ -92,4 +94,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/killing_floor_2/egg-killing-floor2.json b/game_eggs/steamcmd_servers/killing_floor_2/egg-killing-floor2.json index e7072f68..bdc08e4d 100644 --- a/game_eggs/steamcmd_servers/killing_floor_2/egg-killing-floor2.json +++ b/game_eggs/steamcmd_servers/killing_floor_2/egg-killing-floor2.json @@ -8,7 +8,9 @@ "name": "Killing Floor 2", "author": "parker@parkervcp.com", "description": "In KILLING FLOOR 2, players descend into continental Europe after it has been overrun by horrific, murderous clones called Zeds that were created by the corporation Horzine. The Zed outbreak caused by Horzine Biotech\u2019s failed experiments has quickly spread with unstoppable momentum, paralyzing the European Union. Only a month ago, the first Zed outbreak from the original KILLING FLOOR ripped through London; now the specimen clones are everywhere.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "quay.io\/parkervcp\/pterodactyl-images:debian_source" ], diff --git a/game_eggs/steamcmd_servers/left4dead/egg-left4dead.json b/game_eggs/steamcmd_servers/left4dead/egg-left4dead.json index ae16efa9..c465949f 100644 --- a/game_eggs/steamcmd_servers/left4dead/egg-left4dead.json +++ b/game_eggs/steamcmd_servers/left4dead/egg-left4dead.json @@ -8,7 +8,9 @@ "name": "Left 4 Dead", "author": "pterodactyl@mazoyer.eu", "description": "An outbreak of a highly contagious pathogen nicknamed the \"Green Flu\" begins in Pennsylvania. Two weeks after the first infection, four immune survivors, Bill, Zoey, Louis, and Francis make their way out of the city of Fairfield, only to discover that the infection is creating dangerous mutations in some of its hosts.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "ghcr.io\/parkervcp\/games:source" ], diff --git a/game_eggs/steamcmd_servers/left4dead_2/egg-left4dead_2.json b/game_eggs/steamcmd_servers/left4dead_2/egg-left4dead_2.json index 8c2ef2e3..4034580b 100644 --- a/game_eggs/steamcmd_servers/left4dead_2/egg-left4dead_2.json +++ b/game_eggs/steamcmd_servers/left4dead_2/egg-left4dead_2.json @@ -8,7 +8,9 @@ "name": "Left 4 Dead 2", "author": "pterodactyl@mazoyer.eu", "description": "Left 4 Dead 2 is set in the aftermath of a worldwide pandemic of a disease nicknamed the \"Green Flu\", which rapidly transforms humans into zombie-like creatures and mutated forms that demonstrate extreme aggression towards non-infected beings. A few humans are immune to the disease, while some of those who are infected have no symptoms. The Civil Emergency and Defense Agency (CEDA) and the U.S. military create safe zones to attempt to evacuate as many survivors as possible.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "ghcr.io\/parkervcp\/games:source" ], diff --git a/game_eggs/steamcmd_servers/modiverse/egg-modiverse.json b/game_eggs/steamcmd_servers/modiverse/egg-modiverse.json index 2c74f9cc..d141ee19 100644 --- a/game_eggs/steamcmd_servers/modiverse/egg-modiverse.json +++ b/game_eggs/steamcmd_servers/modiverse/egg-modiverse.json @@ -8,7 +8,9 @@ "name": "Modiverse", "author": "admin@softwarenoob.com", "description": "Modiverse provides a sandbox environment with the ability to create and play mods such as TTT, Deathrun, FortWars, RP, and more! Use the many sandbox tools to build complex worlds with props, lights, thrusters, wheels, and much much more!", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source" ], diff --git a/game_eggs/steamcmd_servers/mordhau/egg-mordhau-wine.json b/game_eggs/steamcmd_servers/mordhau/egg-mordhau-wine.json index 5cdc11fb..184da24f 100644 --- a/game_eggs/steamcmd_servers/mordhau/egg-mordhau-wine.json +++ b/game_eggs/steamcmd_servers/mordhau/egg-mordhau-wine.json @@ -8,7 +8,9 @@ "name": "Mordhau Wine", "author": "parker@parkervcp.com", "description": "Mordhau is a multiplayer medieval hack 'n slash video game, developed by Slovenian independent studio Triternion, with a prominent aspect of skill-based competitive play and customization.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "quay.io\/parkervcp\/pterodactyl-images:debian_wine" ], @@ -128,4 +130,4 @@ "rules": "nullable|string" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/mordhau/egg-mordhau.json b/game_eggs/steamcmd_servers/mordhau/egg-mordhau.json index 2af72a7a..521870db 100644 --- a/game_eggs/steamcmd_servers/mordhau/egg-mordhau.json +++ b/game_eggs/steamcmd_servers/mordhau/egg-mordhau.json @@ -8,7 +8,9 @@ "name": "Mordhau", "author": "trey@chazx.cc", "description": "Mordhau is a multiplayer medieval hack 'n slash video game, developed by Slovenian independent studio Triternion, with a prominent aspect of skill-based competitive play and customization.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "quay.io\/parkervcp\/pterodactyl-images:game_mordhau" ], diff --git a/game_eggs/steamcmd_servers/nmrih/egg-nmrih.json b/game_eggs/steamcmd_servers/nmrih/egg-nmrih.json index 2da69396..8a53664b 100644 --- a/game_eggs/steamcmd_servers/nmrih/egg-nmrih.json +++ b/game_eggs/steamcmd_servers/nmrih/egg-nmrih.json @@ -8,7 +8,9 @@ "name": "nmrih", "author": "avalongamecs@gmail.com", "description": "No More Room In Hell", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "quay.io\/pterodactyl\/core:source" ], diff --git a/game_eggs/steamcmd_servers/onset/egg-onset.json b/game_eggs/steamcmd_servers/onset/egg-onset.json index 5bdd099a..8fea938e 100644 --- a/game_eggs/steamcmd_servers/onset/egg-onset.json +++ b/game_eggs/steamcmd_servers/onset/egg-onset.json @@ -1,17 +1,24 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2019-12-12T18:56:28-05:00", + "exported_at": "2022-01-20T12:56:32-05:00", "name": "Onset", "author": "parker@parkervcp.com", "description": "Onset is an open world multiplayer sandbox without predefined goals. Create and host your very own experience in Onset using scripting functions. Whether that is Roleplay, Cops and Robbers or classic Freeroam. Or just enjoy the different gamemodes created by other players.", - "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", + "features": [ + "steam_disk_space" + ], + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source" + ], + "file_denylist": [], "startup": ".\/OnsetServer --noinput", "config": { - "files": "{\r\n \"server_config.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"ipaddress\": \"0.0.0.0\",\r\n \"port\": \"{{server.build.default.port}}\",\r\n \"servername\": \"{{server.build.env.SERVER_NAME}}\",\r\n \"password\":\"{{server.build.env.SERVER_PASSWORD}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Entering simulation\",\r\n \"userInteraction\": []\r\n}", + "files": "{\r\n \"server_config.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"ipaddress\": \"0.0.0.0\",\r\n \"port\": \"{{server.build.default.port}}\",\r\n \"servername\": \"{{server.build.env.SERVER_NAME}}\",\r\n \"password\": \"{{server.build.env.SERVER_PASSWORD}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Entering simulation\"\r\n}", "logs": "{}", "stop": "^C" }, @@ -28,8 +35,8 @@ "description": "ARK steam app id for auto updates. Leave blank to avoid auto update.", "env_variable": "SRCDS_APPID", "default_value": "1204170", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "required|string|max:20" }, { @@ -37,8 +44,8 @@ "description": "required to load server libraries.", "env_variable": "LD_LIBRARY_PATH", "default_value": ".", - "user_viewable": 0, - "user_editable": 0, + "user_viewable": false, + "user_editable": false, "rules": "required|string|max:20" }, { @@ -46,8 +53,8 @@ "description": "This flag will auto update the server on restart. (default is 1) \r\n\r\nSet to 1 to update\r\nSet to 0 to no update", "env_variable": "AUTO_UPDATE", "default_value": "1", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" } ] diff --git a/game_eggs/steamcmd_servers/pavlov_vr/egg-pavlov-v-r.json b/game_eggs/steamcmd_servers/pavlov_vr/egg-pavlov-v-r.json index 73f96dc7..8a51b857 100644 --- a/game_eggs/steamcmd_servers/pavlov_vr/egg-pavlov-v-r.json +++ b/game_eggs/steamcmd_servers/pavlov_vr/egg-pavlov-v-r.json @@ -8,7 +8,9 @@ "name": "Pavlov VR", "author": "admin@devil.wtf", "description": "Pavlov VR is a multiplayer shooter in VR with heavy focus on community features. Realistic reloading features and fast paced combat as part of the core experience. Play the #1 most popular VR shooter on PC today.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "quay.io\/parkervcp\/pterodactyl-images:debian_source" ], @@ -74,4 +76,4 @@ "rules": "required|boolean" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/pixark/egg-pix-a-r-k.json b/game_eggs/steamcmd_servers/pixark/egg-pix-a-r-k.json index d6aa04e8..9c93cc3d 100644 --- a/game_eggs/steamcmd_servers/pixark/egg-pix-a-r-k.json +++ b/game_eggs/steamcmd_servers/pixark/egg-pix-a-r-k.json @@ -8,7 +8,9 @@ "name": "PixARK", "author": "hello@venatus.digital", "description": "A simple Docker container with Wine to run PixARK using Pterodactyl Panel", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "quay.io\/parkervcp\/pterodactyl-images:ubuntu_wine-source" ], @@ -109,4 +111,4 @@ "rules": "required|string|max:30" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/post_scriptum/egg-post-scriptum.json b/game_eggs/steamcmd_servers/post_scriptum/egg-post-scriptum.json index c31662aa..df3b95df 100644 --- a/game_eggs/steamcmd_servers/post_scriptum/egg-post-scriptum.json +++ b/game_eggs/steamcmd_servers/post_scriptum/egg-post-scriptum.json @@ -8,7 +8,9 @@ "name": "Post Scriptum", "author": "admin@softwarenoob.com", "description": "Post Scriptum is a WW2-themed first-person tactical shooter that provides an authentic WWII combat experience. Focusing on historical accuracy, large-scale battles, and a challenging battlefield demands an intense need for cohesion, communication, and teamwork.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "quay.io\/pterodactyl\/core:source" ], diff --git a/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json b/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json index 4ecec781..946d9747 100644 --- a/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json +++ b/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json @@ -8,7 +8,9 @@ "name": "Project Zomboid", "author": "iamkubi@gmail.com", "description": "Project Zomboid is an open world survival horror video game in alpha stage development by British and Canadian independent developer, The Indie Stone. The game is set in a post apocalyptic, zombie infested world where the player is challenged to survive for as long as possible before inevitably dying.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "ghcr.io\/pterodactyl\/games:source" ], @@ -101,4 +103,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/quake_live/egg-quake-live.json b/game_eggs/steamcmd_servers/quake_live/egg-quake-live.json index 07e4dc75..a74a28d0 100644 --- a/game_eggs/steamcmd_servers/quake_live/egg-quake-live.json +++ b/game_eggs/steamcmd_servers/quake_live/egg-quake-live.json @@ -7,7 +7,9 @@ "name": "Quake Live", "author": "patz.michael@gmail.com", "description": "Quake Live is a first-person shooter video game by id Software. It is an updated version of Quake III Arena that was originally designed as a free-to-play game launched via a web browser plug-in. On September 17, 2014, the game was re-launched as a standalone title on Steam.", - "features": null, + "features": [ + "steam_disk_space" + ], "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", "startup": ".\/qzeroded.x64 +set net_port \"{{SERVER_PORT}}\" +set sv_hostname \"{{SERVER_NAME}}\" +set sv_serverType \"{{SERVER_TYPE}}\" +set g_password \"{{PASSWORD}}\" +sv_fps \"{{FPS}}\"", "config": { @@ -70,4 +72,4 @@ "rules": "required|numeric" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/rising_world/egg-rising-world.json b/game_eggs/steamcmd_servers/rising_world/egg-rising-world.json index a347d7fe..c0943eb7 100644 --- a/game_eggs/steamcmd_servers/rising_world/egg-rising-world.json +++ b/game_eggs/steamcmd_servers/rising_world/egg-rising-world.json @@ -8,7 +8,9 @@ "name": "Rising World", "author": "info@goover.de", "description": "Rising World is a voxel based open-world sandbox game, featuring a procedurally generated world, playable in single and multi-player.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "quay.io\/pterodactyl\/core:java" ], @@ -92,4 +94,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/risk_of_rain_2/egg-risk-of-rain2.json b/game_eggs/steamcmd_servers/risk_of_rain_2/egg-risk-of-rain2.json index 664e617e..cc578645 100644 --- a/game_eggs/steamcmd_servers/risk_of_rain_2/egg-risk-of-rain2.json +++ b/game_eggs/steamcmd_servers/risk_of_rain_2/egg-risk-of-rain2.json @@ -8,7 +8,9 @@ "name": "Risk of Rain 2", "author": "alex.chang-lam@protonmail.com", "description": "Risk of Rain 2 dedicated server.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "quay.io\/parkervcp\/pterodactyl-images:debian_wine-5" ], @@ -83,4 +85,4 @@ "rules": "required|numeric" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json b/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json index 0e2e2f9d..20c9d92d 100644 --- a/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json +++ b/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json @@ -8,7 +8,9 @@ "name": "Rust Autowipe", "author": "support@pterodactyl.io", "description": "The only aim in Rust is to survive. To do this you will need to overcome struggles such as hunger, thirst and cold. Build a fire. Build a shelter. Kill animals for meat. Protect yourself from other players, and kill them for meat. Create alliances with other players and form a town. Do whatever it takes to survive.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "quay.io\/pterodactyl\/core:rust" ], diff --git a/game_eggs/steamcmd_servers/rust/rust_staging/egg-rust-staging.json b/game_eggs/steamcmd_servers/rust/rust_staging/egg-rust-staging.json index fb2a13c7..5f1b6642 100644 --- a/game_eggs/steamcmd_servers/rust/rust_staging/egg-rust-staging.json +++ b/game_eggs/steamcmd_servers/rust/rust_staging/egg-rust-staging.json @@ -8,7 +8,9 @@ "name": "Rust Staging", "author": "root@smc.li", "description": "The only aim in Rust is to survive. To do this you will need to overcome struggles such as hunger, thirst and cold. Build a fire. Build a shelter. Kill animals for meat. Protect yourself from other players, and kill them for meat. Create alliances with other players and form a town. Do whatever it takes to survive.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "quay.io\/pterodactyl\/core:rust" ], diff --git a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json index a8d64c18..3d8f7889 100644 --- a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json +++ b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json @@ -7,7 +7,9 @@ "name": "Satisfactory", "author": "rehlmgaming@gmail.com", "description": "Satisfactory is a first-person open-world factory building game with a dash of exploration and combat. Play alone or with friends, explore an alien planet, create multi-story factories, and enter conveyor belt heaven!", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "ghcr.io\/parkervcp\/games:source" ], diff --git a/game_eggs/steamcmd_servers/scpsl/dedicated/egg-scpsl.json b/game_eggs/steamcmd_servers/scpsl/dedicated/egg-scpsl.json index 08d6502c..d6f12f63 100644 --- a/game_eggs/steamcmd_servers/scpsl/dedicated/egg-scpsl.json +++ b/game_eggs/steamcmd_servers/scpsl/dedicated/egg-scpsl.json @@ -8,7 +8,9 @@ "name": "SCP:SL", "author": "info@goover.de", "description": "Egg for SCP: Secret Laboratory Dedicated Linux Server", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "ghcr.io\/parkervcp\/yolks:mono_latest" ], diff --git a/game_eggs/steamcmd_servers/scpsl/exiled/egg-s-c-p--s-l--exiled.json b/game_eggs/steamcmd_servers/scpsl/exiled/egg-s-c-p--s-l--exiled.json index 75433fac..efe895ce 100644 --- a/game_eggs/steamcmd_servers/scpsl/exiled/egg-s-c-p--s-l--exiled.json +++ b/game_eggs/steamcmd_servers/scpsl/exiled/egg-s-c-p--s-l--exiled.json @@ -8,7 +8,9 @@ "name": "SCP:SL - Exiled", "author": "info@goover.de", "description": "Egg for SCP: Secret Laboratory Dedicated Linux Server with Exiled Plugin Framework", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "ghcr.io\/parkervcp\/yolks:mono_latest" ], diff --git a/game_eggs/steamcmd_servers/scpsl/multiadmin/egg-s-c-p--secret-laboratory--multi-admin.json b/game_eggs/steamcmd_servers/scpsl/multiadmin/egg-s-c-p--secret-laboratory--multi-admin.json index 75239ecb..e422fd4b 100644 --- a/game_eggs/steamcmd_servers/scpsl/multiadmin/egg-s-c-p--secret-laboratory--multi-admin.json +++ b/game_eggs/steamcmd_servers/scpsl/multiadmin/egg-s-c-p--secret-laboratory--multi-admin.json @@ -8,7 +8,9 @@ "name": "SCP: Secret Laboratory - MultiAdmin", "author": "info@goover.de", "description": "The latest vanilla version of SCP:SL running through MultiAdmin for compatibility. LocalAdmin does not work. No SMod2.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "ghcr.io\/parkervcp\/yolks:mono_latest" ], @@ -47,4 +49,4 @@ "rules": "required|integer" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/soldat/egg-soldat.json b/game_eggs/steamcmd_servers/soldat/egg-soldat.json index 2da42877..235aaa83 100644 --- a/game_eggs/steamcmd_servers/soldat/egg-soldat.json +++ b/game_eggs/steamcmd_servers/soldat/egg-soldat.json @@ -1,18 +1,25 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-10-06T16:59:53+02:00", + "exported_at": "2022-01-20T12:58:19-05:00", "name": "Soldat", "author": "info@goover.de", "description": "Soldat is a unique 2D (side-view) multiplayer action game. It has been influenced by the best of games such as Liero, Worms, Quake, and Counter-Strike and provides a fast-paced gaming experience with tons of blood and flesh. Soldiers fight against each other in 2D battle arenas using a deadly arsenal of military weapons, across 7 default game modes. It features 18 different weapons and 60 maps to frag away on, with full support for user created content.\r\n\r\nSteam: https:\/\/store.steampowered.com\/app\/638490\/Soldat\/", - "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", + "features": [ + "steam_disk_space" + ], + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:base_debian" + ], + "file_denylist": [], "startup": ".\/soldatserver", "config": { "files": "{\r\n \"soldat.ini\": {\r\n \"parser\": \"ini\",\r\n \"find\": {\r\n \"NETWORK.Port\": \"{{server.build.default.port}}\",\r\n \"NETWORK.Max_Players\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"NETWORK.Game_Password\": \"{{server.build.env.SRV_PWD}}\",\r\n \"NETWORK.Admin_Password\": \"{{server.build.env.ADMIN_PASSWD}}\",\r\n \"NETWORK.Server_Name\": \"{{server.build.env.SRV_NAME}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Done\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "startup": "{\r\n \"done\": \"Done\"\r\n}", + "logs": "{}", "stop": "^C" }, "scripts": { @@ -69,4 +76,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json b/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json index 40697ed3..c0cac4fa 100644 --- a/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json +++ b/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json @@ -8,7 +8,9 @@ "name": "Space Engineers", "author": "tueye@tuworld.de", "description": "Space Engineers is a voxel-based sandbox game set in space and on planets.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "quay.io\/parkervcp\/pterodactyl-images:debian_wine-5" ], @@ -164,4 +166,4 @@ "rules": "required|string|in:1" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/squad/egg-squad.json b/game_eggs/steamcmd_servers/squad/egg-squad.json index 51a36b6b..51264aac 100644 --- a/game_eggs/steamcmd_servers/squad/egg-squad.json +++ b/game_eggs/steamcmd_servers/squad/egg-squad.json @@ -1,18 +1,25 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2019-10-08T08:47:08-04:00", + "exported_at": "2022-01-20T12:59:49-05:00", "name": "Squad", "author": "brycea@terrahost.cloud", "description": "Squad is a 50 vs 50 multiplayer first-person shooter that aims to capture combat realism through communication and teamplay. Major features include vehicle-based combined arms gameplay, large scale environments, base building, and integrated positional VoIP for proximity talking & radio.", - "image": "quay.io\/pterodactyl\/core:source", + "features": [ + "steam_disk_space" + ], + "images": [ + "quay.io\/pterodactyl\/core:source" + ], + "file_denylist": [], "startup": "\/home\/container\/SquadGame\/Binaries\/Linux\/SquadGameServer SquadGame Port={{SERVER_PORT}} QueryPort={{QUERY_PORT}}", "config": { "files": "{\r\n \"SquadGame\/ServerConfig\/Server.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"ServerName\": \"ServerName=\\\"{{server.build.env.servername}}\\\"\",\r\n \"MaxPlayers\": \"MaxPlayers={{server.build.env.maxplayers}}\",\r\n \"AllowTeamChanges\": \"AllowTeamChanges={{server.build.env.allowteamchange}}\",\r\n \"ShouldAdvertise\": \"ShouldAdvertise={{server.build.env.advertise}}\",\r\n \"NumReservedSlots\": \"NumReservedSlots={{server.build.env.reservedslots}}\",\r\n \"PreventTeamChangeIfUnbalanced\": \"PreventTeamChangeIfUnbalanced={{server.build.env.ptciu}}\",\r\n \"EnforceTeamBalance\": \"EnforceTeamBalance={{server.build.env.teambal}}\",\r\n \"RecordDemos\": \"RecordDemos={{server.build.env.recorddemos}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Engine Initialization\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"latest.log\"\r\n}", + "startup": "{\r\n \"done\": \"Engine Initialization\"\r\n}", + "logs": "{}", "stop": "^C" }, "scripts": { @@ -28,8 +35,8 @@ "description": "Query port for your Squad server.", "env_variable": "QUERY_PORT", "default_value": "27165", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|numeric" }, { @@ -37,8 +44,8 @@ "description": "this is needed for some reason", "env_variable": "LD_LIBRARY_PATH", "default_value": "\/home\/container\/linux64\/", - "user_viewable": 0, - "user_editable": 0, + "user_viewable": false, + "user_editable": false, "rules": "required|string" }, { @@ -46,8 +53,8 @@ "description": "The ID corresponding to the game to download and run using SRCDS.", "env_variable": "SRCDS_APPID", "default_value": "403240", - "user_viewable": 0, - "user_editable": 0, + "user_viewable": false, + "user_editable": false, "rules": "required|string|max:20" }, { @@ -55,8 +62,8 @@ "description": "The name for the server in the server list", "env_variable": "servername", "default_value": "Squad Server", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:30" }, { @@ -64,8 +71,8 @@ "description": "Sets the maximum number of players.", "env_variable": "maxplayers", "default_value": "80", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required" }, { @@ -73,8 +80,8 @@ "description": "Allow players to change teams ( true \/ false )", "env_variable": "allowteamchange", "default_value": "true", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string" }, { @@ -82,8 +89,8 @@ "description": "Have the server report to the public server list ( true \/ false )", "env_variable": "advertise", "default_value": "true", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string" }, { @@ -91,8 +98,8 @@ "description": "The number of reserved slots for admins \/ mods", "env_variable": "reservedslots", "default_value": "0", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string" }, { @@ -100,8 +107,8 @@ "description": "This will prevent players from changing teams if they're already unbalanced ( true \/ false )", "env_variable": "ptciu", "default_value": "true", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string" }, { @@ -109,8 +116,8 @@ "description": "This will FORCE team balance if the teams are too uneven ( true \/ false )", "env_variable": "teambal", "default_value": "true", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string" }, { @@ -118,9 +125,9 @@ "description": "This will record demos of the players ( true \/ false )", "env_variable": "recorddemos", "default_value": "true", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/starbound/egg-starbound.json b/game_eggs/steamcmd_servers/starbound/egg-starbound.json index eb27a8a0..6a890b4d 100644 --- a/game_eggs/steamcmd_servers/starbound/egg-starbound.json +++ b/game_eggs/steamcmd_servers/starbound/egg-starbound.json @@ -8,7 +8,9 @@ "name": "Starbound", "author": "parker@parkervcp.com", "description": "Starbound takes place in a two-dimensional, procedurally generated universe which the player is able to explore in order to obtain new weapons, armor, and items, and to visit towns and villages inhabited by various intelligent lifeforms.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source" ], diff --git a/game_eggs/steamcmd_servers/stationeers/egg-stationeers.json b/game_eggs/steamcmd_servers/stationeers/egg-stationeers.json index 3d498438..321ca2a6 100644 --- a/game_eggs/steamcmd_servers/stationeers/egg-stationeers.json +++ b/game_eggs/steamcmd_servers/stationeers/egg-stationeers.json @@ -1,18 +1,25 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-08-04T20:01:04-07:00", + "exported_at": "2022-01-20T13:00:48-05:00", "name": "Stationeers", "author": "sysadmin@whiteshield.ch", "description": "Stationeers Server\r\n\r\ndefault.ini will be created once you start game. Command parameters override default.ini parameters\r\nDon't forget to change the RCON Password !!\r\n\r\nRemote Administrator:\r\nYou can send commands on web browser.\r\nLink : http:\/\/[dedicated server address]:[GamePort]\r\n\r\nDedicated Server Wiki ==> https:\/\/stationeers-wiki.com\/Dedicated_Server_Guide\r\n\r\nStopping the server don't save the game, for manual save use the Remote Administrator.", - "image": "quay.io\/pterodactyl\/core:source", + "features": [ + "steam_disk_space" + ], + "images": [ + "quay.io\/pterodactyl\/core:source" + ], + "file_denylist": [], "startup": ".\/rocketstation_DedicatedServer.x86_64 -batchmode -nographics -autostart -autosaveinterval={{SAVE_INTERVAL}} -clearallinterval={{CLEAR_INTERVAL}} -worldtype={{SERVER_MAP}} -worldname={{SAVE_NAME}} -loadworld={{SAVE_NAME}} -basedirectory=\/home\/container -updateport={{UPDATE_PORT}} -gameport={{GAME_PORT}}", "config": { "files": "{}", - "startup": "{\r\n \"done\": \"Dedicated Server Started\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "startup": "{\r\n \"done\": \"Dedicated Server Started\"\r\n}", + "logs": "{}", "stop": "^C" }, "scripts": { @@ -28,8 +35,8 @@ "description": "Available Maps: Moon, Mars, Europa, Vulcan, Space, Mimas, Loulan", "env_variable": "SERVER_MAP", "default_value": "Moon", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" }, { @@ -37,8 +44,8 @@ "description": "Sets the server\u2019s auto-save interval in seconds.", "env_variable": "SAVE_INTERVAL", "default_value": "300", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|integer" }, { @@ -46,8 +53,8 @@ "description": "Clear disconnected player interval in seconds", "env_variable": "CLEAR_INTERVAL", "default_value": "86400", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|integer" }, { @@ -55,8 +62,8 @@ "description": "Name of the save of your world.\r\nAuto save & auto load worlds on server startup.", "env_variable": "SAVE_NAME", "default_value": "stationeers_1", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" }, { @@ -64,8 +71,8 @@ "description": "UDP port for game. Avoid to set 27015-27020. It's steam's local server query ports.", "env_variable": "GAME_PORT", "default_value": "27500", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|integer" }, { @@ -73,8 +80,8 @@ "description": "UDP port for steam query must be between 27015-27020.", "env_variable": "UPDATE_PORT", "default_value": "27015", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|integer" }, { @@ -82,9 +89,9 @@ "description": "Required for automatic updates.", "env_variable": "SRCDS_APPID", "default_value": "600760", - "user_viewable": 0, - "user_editable": 0, + "user_viewable": false, + "user_editable": false, "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json b/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json index 8bba45e2..9cb54ceb 100644 --- a/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json +++ b/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json @@ -1,13 +1,20 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-10-27T03:09:48+00:00", + "exported_at": "2022-01-20T13:01:27-05:00", "name": "Stormworks: Build and Rescue", "author": "iamkubi@gmail.com", "description": "Join a world where you design, create and pilot your own air sea rescue service. Release your inner hero as you battle fierce storms out at sea to rescue those in need.", - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_wine-5", + "features": [ + "steam_disk_space" + ], + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:debian_wine-5" + ], + "file_denylist": [], "startup": "xvfb-run wine server.exe +server_dir \/home\/container", "config": { "files": "{}", @@ -33,4 +40,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/subnautica_nitrox_mod/egg-subnautica.json b/game_eggs/steamcmd_servers/subnautica_nitrox_mod/egg-subnautica.json index 77c00477..446b9485 100644 --- a/game_eggs/steamcmd_servers/subnautica_nitrox_mod/egg-subnautica.json +++ b/game_eggs/steamcmd_servers/subnautica_nitrox_mod/egg-subnautica.json @@ -8,7 +8,9 @@ "name": "Subnautica", "author": "tueye@tuworld.de", "description": "Subnautica is an open world survival action-adventure video game developed and published by Unknown Worlds Entertainment. In it, players are free to explore the ocean on an alien planet, known as planet 4546B, after their spaceship, the Aurora, crashes on the planet's surface.\r\n\r\nNote: NitroxMod version >=1.5.0.0 is required", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "quay.io\/pterodactyl\/core:mono" ], @@ -146,4 +148,4 @@ "rules": "required|string|in:PROTOBUF,JSON" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/svencoop/egg-sven-co-op.json b/game_eggs/steamcmd_servers/svencoop/egg-sven-co-op.json index c341b5a7..07374e03 100644 --- a/game_eggs/steamcmd_servers/svencoop/egg-sven-co-op.json +++ b/game_eggs/steamcmd_servers/svencoop/egg-sven-co-op.json @@ -1,18 +1,25 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2019-11-14T21:43:14+01:00", + "exported_at": "2022-01-20T13:02:23-05:00", "name": "Sven Co-op", "author": "pteroducktyl@yildri.nl", "description": "Sven Co-op is a co-operative game originally based around Valve Software's Half-Life. In this game players must work together against computer controlled enemies and solve puzzles as a team.", - "image": "quay.io\/pterodactyl\/core:source", + "features": [ + "steam_disk_space" + ], + "images": [ + "quay.io\/pterodactyl\/core:source" + ], + "file_denylist": [], "startup": ".\/svends_run -console -port {{SERVER_PORT}} +maxplayers {{SC_PLAYERS}} +map {{SC_MAP}} +ip 0.0.0.0 -strictportbind -norestart", "config": { "files": "{\r\n \"svencoop\/server.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"hostname\": \"hostname \\\"{{env.SC_NAME}}\\\"\",\r\n \"sv_password\": \"sv_password \\\"{{env.SC_PASSWORD}}\\\"\",\r\n \"\/\/sv_password\": \"sv_password \\\"{{env.SC_PASSWORD}}\\\"\",\r\n \"sv_region\": \"sv_region {{env.SC_REGION}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Connection to Steam servers successful.\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "startup": "{\r\n \"done\": \"Connection to Steam servers successful.\"\r\n}", + "logs": "{}", "stop": "quit" }, "scripts": { @@ -28,8 +35,8 @@ "description": "The default map for the server.", "env_variable": "SC_MAP", "default_value": "svencoop1", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string" }, { @@ -37,8 +44,8 @@ "description": "The maximum amount of players that can play on the server at once.", "env_variable": "SC_PLAYERS", "default_value": "12", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|numeric|between:2,32" }, { @@ -46,8 +53,8 @@ "description": "The name your server will appear as on the in Sven Co-op in-game server list.", "env_variable": "SC_NAME", "default_value": "Sven Co-op server", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:40" }, { @@ -55,8 +62,8 @@ "description": "Password required to join the server. Leave blank to disable.", "env_variable": "SC_PASSWORD", "default_value": "", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "nullable|string|max:20" }, { @@ -64,8 +71,8 @@ "description": "The region your server is in. This is used in Steam's server browser, so players can look for servers near by. This does not restrict players from connecting to your server.\r\n\r\n-1: Do not list server in the server browser.\r\n0: USA east coast.\r\n1: USA west coast.\r\n2: South America (continent)\r\n3: Europe.\r\n4: Asia.\r\n5: Australia (continent, aka Oceania)\r\n6: Middle East.\r\n7: Africa.\r\n255: International.", "env_variable": "SC_REGION", "default_value": "255", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|numeric|between:-1,255" }, { @@ -73,9 +80,9 @@ "description": "Required for game to update on server restart. Do not modify this.", "env_variable": "SRCDS_APPID", "default_value": "276060", - "user_viewable": 0, - "user_editable": 0, + "user_viewable": false, + "user_editable": false, "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/team_fortress_2_classic/egg-team-fortress-2-classic.json b/game_eggs/steamcmd_servers/team_fortress_2_classic/egg-team-fortress-2-classic.json index 3679525f..73df31e8 100644 --- a/game_eggs/steamcmd_servers/team_fortress_2_classic/egg-team-fortress-2-classic.json +++ b/game_eggs/steamcmd_servers/team_fortress_2_classic/egg-team-fortress-2-classic.json @@ -1,18 +1,25 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-10-13T15:32:28+01:00", + "exported_at": "2022-01-20T13:03:12-05:00", "name": "Team Fortress 2 Classic", "author": "eggs@scattergun.io", "description": "Team Fortress 2 Classic is a free mod of the 2007 game Team Fortress 2, developed by Eminoma and utilizing the Source engine.", - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_base", + "features": [ + "steam_disk_space" + ], + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:debian_base" + ], + "file_denylist": [], "startup": ".\/srcds_run -game {{SRCDS_GAME}} -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} +ip {{SERVER_IP}} -strictportbind -norestart -debug +maxplayers {{MAXPLAYERS}}", "config": { "files": "{}", - "startup": "{\r\n \"done\": \"gameserver Steam ID\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "startup": "{\r\n \"done\": \"gameserver Steam ID\"\r\n}", + "logs": "{}", "stop": "quit" }, "scripts": { diff --git a/game_eggs/steamcmd_servers/the_forest/egg-the-forest.json b/game_eggs/steamcmd_servers/the_forest/egg-the-forest.json index 1fff9c86..23b736c0 100644 --- a/game_eggs/steamcmd_servers/the_forest/egg-the-forest.json +++ b/game_eggs/steamcmd_servers/the_forest/egg-the-forest.json @@ -8,7 +8,9 @@ "name": "The Forest", "author": "admin@softwarenoob.com", "description": "As the lone survivor of a passenger jet crash, you find yourself in a mysterious forest battling to stay alive against a society of cannibalistic mutants. Build, explore, survive in this terrifying first-person survival horror simulator.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "ghcr.io\/parkervcp\/yolks:wine_latest" ], @@ -137,4 +139,4 @@ "rules": "required|boolean" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/tower_unite/egg-tower-unite.json b/game_eggs/steamcmd_servers/tower_unite/egg-tower-unite.json index 43f7687b..733cba6c 100644 --- a/game_eggs/steamcmd_servers/tower_unite/egg-tower-unite.json +++ b/game_eggs/steamcmd_servers/tower_unite/egg-tower-unite.json @@ -1,18 +1,25 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2019-02-08T01:46:57+01:00", + "exported_at": "2022-01-20T13:03:59-05:00", "name": "Tower Unite", "author": "teamwuffy@gmail.com", "description": "Tower Unite\r\n\r\nDefault Port: 7778\r\nDefault Query Port: 27016\r\n\r\nConfig Path: Tower\/Saved\/Config\/TowerServer.ini", - "image": "quay.io\/pterodactyl\/core:source", + "features": [ + "steam_disk_space" + ], + "images": [ + "quay.io\/pterodactyl\/core:source" + ], + "file_denylist": [], "startup": ".\/Tower\/Binaries\/Linux\/TowerServer-Linux-Shipping -log -Port={{SERVER_PORT}} -MULTIHOME=0.0.0.0 -TowerServerINI=..\/..\/Saved\/Config\/TowerServer.ini", "config": { "files": "{\r\n \"Tower\/Saved\/Config\/TowerServer.ini\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"MaxPlayers\": \"{{server.build.env.SERVER_MAX_PLAYER}}\",\r\n \"ServerTitle\": \"{{server.build.env.SERVER_TITLE}}\",\r\n \"SteamLoginToken\": \"{{server.build.env.STEAM_LOGIN_TOKEN}}\",\r\n \"AdminSteamID\": \"{{server.build.env.STEAM_ADMIN_ID}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Match State Changed from EnteringMap to WaitingToStart\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "startup": "{\r\n \"done\": \"Match State Changed from EnteringMap to WaitingToStart\"\r\n}", + "logs": "{}", "stop": "^C" }, "scripts": { @@ -28,8 +35,8 @@ "description": "Login and generate a token for the app-id: 394690\r\nhttps:\/\/steamcommunity.com\/dev\/managegameservers", "env_variable": "STEAM_LOGIN_TOKEN", "default_value": "", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:100" }, { @@ -37,8 +44,8 @@ "description": "Note that your admin id is only a number!", "env_variable": "STEAM_ADMIN_ID", "default_value": "", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|integer|max:76561202255233023" }, { @@ -46,8 +53,8 @@ "description": "", "env_variable": "SERVER_TITLE", "default_value": "Tower Unite Server", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:512" }, { @@ -55,9 +62,9 @@ "description": "", "env_variable": "SERVER_MAX_PLAYER", "default_value": "40", - "user_viewable": 0, - "user_editable": 0, + "user_viewable": false, + "user_editable": false, "rules": "required|integer|max:512" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/unturned/egg-unturned.json b/game_eggs/steamcmd_servers/unturned/egg-unturned.json index aa20570f..8f4ad1b2 100644 --- a/game_eggs/steamcmd_servers/unturned/egg-unturned.json +++ b/game_eggs/steamcmd_servers/unturned/egg-unturned.json @@ -1,18 +1,25 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-07-12T22:04:47-04:00", + "exported_at": "2022-01-20T13:04:52-05:00", "name": "Unturned", "author": "parker@parkervcp.com", "description": "Vanilla Unturned with the included RockerMod.", - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_source", + "features": [ + "steam_disk_space" + ], + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:debian_source" + ], + "file_denylist": [], "startup": ".\/Unturned_Headless.x86_64 -batchmode -nographics -bind 0.0.0.0 -port {{SERVER_PORT}}", "config": { "files": "{}", - "startup": "{\r\n \"done\": \"Loading level: 100%\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"latest.log\"\r\n}", + "startup": "{\r\n \"done\": \"Loading level: 100%\"\r\n}", + "logs": "{}", "stop": "shutdown" }, "scripts": { @@ -28,8 +35,8 @@ "description": "Steam App ID require for install and startup update", "env_variable": "SRCDS_APPID", "default_value": "1110390", - "user_viewable": 0, - "user_editable": 0, + "user_viewable": false, + "user_editable": false, "rules": "required|string|max:20" }, { @@ -37,8 +44,8 @@ "description": "This is needed to load specific libraries", "env_variable": "LD_LIBRARY_PATH", "default_value": ".\/Unturned_Headless_Data\/Plugins\/x86_64\/", - "user_viewable": 0, - "user_editable": 0, + "user_viewable": false, + "user_editable": false, "rules": "required|string" }, { @@ -46,8 +53,8 @@ "description": "Should be left blank for anon user", "env_variable": "STEAM_USER", "default_value": "", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "nullable|string" }, { @@ -55,8 +62,8 @@ "description": "", "env_variable": "STEAM_PASS", "default_value": "", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "nullable|string" } ] diff --git a/game_eggs/steamcmd_servers/valheim/valheim_plus/egg-valheim-plus-mod.json b/game_eggs/steamcmd_servers/valheim/valheim_plus/egg-valheim-plus-mod.json index dd2290b5..cd0f888e 100644 --- a/game_eggs/steamcmd_servers/valheim/valheim_plus/egg-valheim-plus-mod.json +++ b/game_eggs/steamcmd_servers/valheim/valheim_plus/egg-valheim-plus-mod.json @@ -8,7 +8,9 @@ "name": "Valheim Plus Mod", "author": "info@goover.de", "description": "A brutal exploration and survival game for 1-10 players, set in a procedurally-generated purgatory inspired by viking culture.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "quay.io\/parkervcp\/pterodactyl-images:debian_source" ], @@ -137,4 +139,4 @@ "rules": "required|string" } ] -} \ No newline at end of file +} diff --git a/game_eggs/steamcmd_servers/valheim/valheim_vanilla/egg-valheim.json b/game_eggs/steamcmd_servers/valheim/valheim_vanilla/egg-valheim.json index d6162120..e3754ee9 100644 --- a/game_eggs/steamcmd_servers/valheim/valheim_vanilla/egg-valheim.json +++ b/game_eggs/steamcmd_servers/valheim/valheim_vanilla/egg-valheim.json @@ -8,7 +8,9 @@ "name": "Valheim", "author": "magi1053@outlook.com", "description": "A brutal exploration and survival game for 1-10 players, set in a procedurally-generated purgatory inspired by viking culture.", - "features": null, + "features": [ + "steam_disk_space" + ], "images": [ "quay.io\/parkervcp\/pterodactyl-images:debian_source" ], @@ -100,4 +102,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From 28c587a918dea245713369f0a47980aace856052 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Sat, 22 Jan 2022 12:48:15 +0200 Subject: [PATCH 0336/1001] feat: use Yolks base image for multiarch support Changes to Yolks base image for multiarch support of AMD64 and ARM64. --- bots/discord/deno/egg-deno-generic.json | 4 ++-- bots/discord/lua/luvit/egg-luvit-generic.json | 4 ++-- .../factorio-modupdate/egg-factorio-modupdate.json | 11 ++++++----- .../bedrock/bedrock/egg-vanilla-bedrock.json | 6 +++--- game_eggs/rdr/redm/egg-red-m.json | 6 +++--- game_eggs/teeworlds/egg-teeworlds.json | 6 +++--- game_eggs/terraria/vanilla/egg-terraria-vanilla.json | 6 +++--- monitoring/prometheus/egg-prometheus.json | 4 ++-- software/grafana/egg-grafana.json | 4 ++-- 9 files changed, 26 insertions(+), 25 deletions(-) diff --git a/bots/discord/deno/egg-deno-generic.json b/bots/discord/deno/egg-deno-generic.json index 826be65d..be652454 100644 --- a/bots/discord/deno/egg-deno-generic.json +++ b/bots/discord/deno/egg-deno-generic.json @@ -4,13 +4,13 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-03-30T00:48:40+00:00", + "exported_at": "2022-01-22T05:40:17-05:00", "name": "Deno Generic", "author": "parker@parkervcp.com", "description": "A generic egg to run deno code.", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:base_debian" + "ghcr.io\/parkervcp\/yolks:debian" ], "file_denylist": [], "startup": ".\/deno run {{JS_FILE}}", diff --git a/bots/discord/lua/luvit/egg-luvit-generic.json b/bots/discord/lua/luvit/egg-luvit-generic.json index 3a6fdd58..99a651dd 100644 --- a/bots/discord/lua/luvit/egg-luvit-generic.json +++ b/bots/discord/lua/luvit/egg-luvit-generic.json @@ -4,13 +4,13 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-03-30T02:11:23+00:00", + "exported_at": "2022-01-22T05:40:57-05:00", "name": "luvit generic", "author": "parker@parkervcp.com", "description": "A generic luvit egg This will clone a git repo for a bot. It defaults to master if no branch is specified.\r\n\r\nSupports the discordia lua framework.", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:base_debian" + "ghcr.io\/parkervcp\/yolks:debian" ], "file_denylist": [], "startup": ".\/luvit {{LUA_FILE}}", diff --git a/game_eggs/factorio/factorio-modupdate/egg-factorio-modupdate.json b/game_eggs/factorio/factorio-modupdate/egg-factorio-modupdate.json index ea6f7d1a..12d63f3e 100644 --- a/game_eggs/factorio/factorio-modupdate/egg-factorio-modupdate.json +++ b/game_eggs/factorio/factorio-modupdate/egg-factorio-modupdate.json @@ -4,19 +4,20 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-01-15T16:32:57+01:00", + "exported_at": "2022-01-22T05:41:57-05:00", "name": "Factorio-ModUpdate", "author": "tueye@tuworld.de", "description": "The vanilla Factorio server. With automatic Mod Updates after ReInstall.\r\n\r\nhttps:\/\/www.factorio.com\/", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:base_debian" + "ghcr.io\/parkervcp\/yolks:debian" ], + "file_denylist": [], "startup": ".\/bin\/x64\/factorio --port {{SERVER_PORT}} --server-settings data\/server-settings.json --start-server {{SAVE_NAME}}.zip", "config": { "files": "{\r\n \"data\/server-settings.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"name\": \"{{server.build.env.SERVER_NAME}}\",\r\n \"description\": \"{{server.build.env.SERVER_DESC}}\",\r\n \"max_players\": \"{{server.build.env.MAX_SLOTS}}\",\r\n \"username\": \"{{server.build.env.SERVER_USERNAME}}\",\r\n \"token\": \"{{server.build.env.SERVER_TOKEN}}\",\r\n \"autosave_interval\": \"{{server.build.env.SAVE_INTERVAL}}\",\r\n \"autosave_slots\": \"{{server.build.env.SAVE_SLOTS}}\",\r\n \"afk_autokick_interval\": \"{{server.build.env.AFK_KICK}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Hosting game at\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"factorio-current.log\"\r\n}", + "startup": "{\r\n \"done\": \"Hosting game at\"\r\n}", + "logs": "{}", "stop": "\/quit" }, "scripts": { @@ -118,4 +119,4 @@ "rules": "required|numeric|digits_between:1,3" } ] -} \ No newline at end of file +} diff --git a/game_eggs/minecraft/bedrock/bedrock/egg-vanilla-bedrock.json b/game_eggs/minecraft/bedrock/bedrock/egg-vanilla-bedrock.json index 31507ac9..b16a0f1e 100644 --- a/game_eggs/minecraft/bedrock/bedrock/egg-vanilla-bedrock.json +++ b/game_eggs/minecraft/bedrock/bedrock/egg-vanilla-bedrock.json @@ -4,13 +4,13 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-07-04T00:38:57+03:00", + "exported_at": "2022-01-22T05:42:40-05:00", "name": "Vanilla Bedrock", "author": "parker@parkervcp.com", "description": "Bedrock Edition (also known as the Bedrock Version, Bedrock Codebase, Bedrock Engine or just Bedrock) refers to the multi-platform family of editions of Minecraft developed by Mojang AB, Microsoft Studios, 4J Studios, and SkyBox Labs. Prior to this term, as the engine originated with Pocket Edition, this entire product family was referred to as \"Pocket Edition\", \"MCPE\", or \"Pocket\/Windows 10 Edition\".", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:base_debian" + "ghcr.io\/parkervcp\/yolks:debian" ], "file_denylist": [], "startup": ".\/bedrock_server", @@ -83,4 +83,4 @@ "rules": "required|string|in:true,false" } ] -} \ No newline at end of file +} diff --git a/game_eggs/rdr/redm/egg-red-m.json b/game_eggs/rdr/redm/egg-red-m.json index 656ebe77..95a784b3 100644 --- a/game_eggs/rdr/redm/egg-red-m.json +++ b/game_eggs/rdr/redm/egg-red-m.json @@ -4,13 +4,13 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2022-01-11T10:01:29-05:00", + "exported_at": "2022-01-22T05:43:25-05:00", "name": "RedM", "author": "parker@parkervcp.com", "description": "A new RedM egg for the latest builds due to recent changes in RedM", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:base_debian" + "ghcr.io\/parkervcp\/yolks:debian" ], "file_denylist": [], "startup": "$(pwd)\/alpine\/opt\/cfx-server\/ld-musl-x86_64.so.1 --library-path \"$(pwd)\/alpine\/usr\/lib\/v8\/:$(pwd)\/alpine\/lib\/:$(pwd)\/alpine\/usr\/lib\/\" -- $(pwd)\/alpine\/opt\/cfx-server\/FXServer +set citizen_dir $(pwd)\/alpine\/opt\/cfx-server\/citizen\/ +set sv_licenseKey {{CFX_LICENSE}} +set steam_webApiKey {{STEAM_WEBAPIKEY}} +set sv_maxplayers {{MAX_PLAYERS}} +exec server.cfg +set gamename rdr3", @@ -83,4 +83,4 @@ "rules": "string|nullable" } ] -} \ No newline at end of file +} diff --git a/game_eggs/teeworlds/egg-teeworlds.json b/game_eggs/teeworlds/egg-teeworlds.json index d90bfae1..e7239504 100644 --- a/game_eggs/teeworlds/egg-teeworlds.json +++ b/game_eggs/teeworlds/egg-teeworlds.json @@ -4,13 +4,13 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-07-02T03:45:27+03:00", + "exported_at": "2022-01-22T05:44:04-05:00", "name": "Teeworlds", "author": "parker@parkervcp.com", "description": "Teeworlds is a free online multiplayer game, available for all major operating systems. Battle with up to 16 players in a variety of game modes, including Team Deathmatch and Capture The Flag. You can even design your own maps!", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:base_debian" + "ghcr.io\/parkervcp\/yolks:debian" ], "file_denylist": [], "startup": ".\/teeworlds_srv", @@ -47,4 +47,4 @@ "rules": "nullable|string" } ] -} \ No newline at end of file +} diff --git a/game_eggs/terraria/vanilla/egg-terraria-vanilla.json b/game_eggs/terraria/vanilla/egg-terraria-vanilla.json index ebeb0706..fd32d73a 100644 --- a/game_eggs/terraria/vanilla/egg-terraria-vanilla.json +++ b/game_eggs/terraria/vanilla/egg-terraria-vanilla.json @@ -4,19 +4,19 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-11-29T09:48:58+01:00", + "exported_at": "2022-01-22T05:44:42-05:00", "name": "Terraria Vanilla", "author": "iamkubi@gmail.com", "description": "Dig, fight, explore, build! Nothing is impossible in this action-packed adventure game.", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:base_debian" + "ghcr.io\/parkervcp\/yolks:debian" ], "file_denylist": [], "startup": ".\/TerrariaServer.bin.x86_64 -config serverconfig.txt", "config": { "files": "{\r\n \"serverconfig.txt\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"worldpath\": \"\/home\/container\/saves\/Worlds\",\r\n \"worldname\": \"{{server.build.env.WORLD_NAME}}\",\r\n \"world\": \"\/home\/container\/saves\/Worlds\/{{server.build.env.WORLD_NAME}}.wld\",\r\n \"difficulty\": \"{{server.build.env.WORLD_DIFFICULTY}}\",\r\n \"autocreate\": \"{{server.build.env.WORLD_SIZE}}\",\r\n \"port\": \"{{server.build.default.port}}\",\r\n \"maxplayers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"motd\": \"{{server.build.env.SERVER_MOTD}}\"\r\n }\r\n }\r\n}", - "startup": "{\"done\": \"Type 'help' for a list of commands\"}", + "startup": "{\r\n \"done\": \"Type 'help' for a list of commands\"\r\n}", "logs": "{}", "stop": "exit" }, diff --git a/monitoring/prometheus/egg-prometheus.json b/monitoring/prometheus/egg-prometheus.json index af98fd18..3376353b 100644 --- a/monitoring/prometheus/egg-prometheus.json +++ b/monitoring/prometheus/egg-prometheus.json @@ -4,13 +4,13 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-07-07T19:53:13+02:00", + "exported_at": "2022-01-22T05:45:16-05:00", "name": "Prometheus", "author": "p.zarrad@outlook.de", "description": "The Prometheus monitoring system and time series database.", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:base_debian" + "ghcr.io\/parkervcp\/yolks:debian" ], "file_denylist": [], "startup": ".\/prometheus --web.listen-address=0.0.0.0:{{SERVER_PORT}} --config.file=\/home\/container\/prometheus.yml --storage.tsdb.path=\/home\/container\/data --web.console.templates=\/home\/container\/consoles --web.console.libraries=\/home\/container\/console_libraries --web.config.file=\/home\/container\/prometheus.web.yml", diff --git a/software/grafana/egg-grafana.json b/software/grafana/egg-grafana.json index 6b2312d4..d60ddf7f 100644 --- a/software/grafana/egg-grafana.json +++ b/software/grafana/egg-grafana.json @@ -4,13 +4,13 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-07-06T23:52:45+02:00", + "exported_at": "2022-01-22T05:46:01-05:00", "name": "Grafana", "author": "p.zarrad@outlook.de", "description": "The open and composable observability and data visualization platform.\r\nVisualize metrics, logs, and traces from multiple sources like Prometheus, Loki, Elasticsearch, InfluxDB, Postgres and many more.", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:base_debian" + "ghcr.io\/parkervcp\/yolks:debian" ], "file_denylist": [], "startup": ".\/bin\/grafana-server web", From 3835c3d3f64e4a0aded0cb1e9264b0d63285aaff Mon Sep 17 00:00:00 2001 From: Aestas <86505839+AestasLonewolf@users.noreply.github.com> Date: Mon, 24 Jan 2022 03:23:39 +0100 Subject: [PATCH 0337/1001] [curseforge-generic] Fix curl not accepting URLs with brackets (#1541) Co-authored-by: Aaron --- .../forge/curseforge-generic/egg-curseforge-generic.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json b/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json index 50a67d53..94b55207 100644 --- a/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json +++ b/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-06-14T21:29:22+03:00", + "exported_at": "2022-01-24T02:52:47+01:00", "name": "Curseforge Generic", "author": "parker@parkervcp.com", "description": "A generic egg for a forge modpack", @@ -28,7 +28,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir -p \/mnt\/server\r\nfi\r\n\r\nfunction install_required {\r\n apt update\r\n apt install -y curl jq unzip dos2unix\r\n}\r\n\r\nfunction get_download {\r\n # get json data to work with\r\n echo -e \"Curling the json for the modpack\"\r\n echo -e \"running: curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID}\"\r\n JSON_DATA=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID})\r\n\r\n # if no modpack version is set or is set to latest\r\n if [ -z ${MODPACK_VERSION} ] || [ \"${MODPACK_VERSION}\" = \"latest\" ]; then\r\n echo -e \"Getting latest download url\"\r\n # parse data to get the download url\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r .defaultFileId)\r\n echo -e \"File ID is: ${FILE_ID}\"\r\n if [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".latestFiles[] | select(.id==$FILE_ID) | .isServerPack\")\" == \"false\" ] && [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\" != \"null\" ]; then\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\r\n DOWNLOAD_URL=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID}\/file\/${FILE_ID}\/download-url)\r\n else\r\n DOWNLOAD_URL=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID}\/file\/${FILE_ID}\/download-url)\r\n fi\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n else\r\n echo -e \"Looking for download url for version ${MODPACK_VERSION}\"\r\n # parse files for version match\r\n FILES_JSON_DATA=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID}\/files)\r\n # get element number to get the exact location in the json\r\n FILES_JSON_ELEMENT=$(echo -e ${FILES_JSON_DATA} | jq --arg VERSION \"${MODPACK_VERSION}\" '.[] | select(.displayName) | .displayName | contains($VERSION)' | grep -n true | cut -f1 -d: | tail -1)\r\n # if there wasn't a match default to latest\r\n if [ ! -z ${FILES_JSON_ELEMENT} ]; then\r\n echo -e \"No matching version found\"\r\n echo -e \"defaulting to latest\"\r\n DOWNLOAD_URL=$(echo -e ${FILES_JSON_DATA} | jq --arg ELEMENT \"${FILES_JSON_ELEMENT}\" '.[$ELEMENT|tonumber-1] | .downloadUrl')\r\n else\r\n echo -e \"Version match found\"\r\n DOWNLOAD_URL=$(echo -e ${JSON_DATA} | jq -r .latestFiles[0].downloadUrl)\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n fi\r\n fi\r\n ## download modpack files\r\n cd \/mnt\/server\r\n echo \"Executing curl -L ${DOWNLOAD_URL} -o server.zip\"\r\n curl -L \"${DOWNLOAD_URL}\" -o server.zip\r\n unzip -o server.zip\r\n rm -rf server.zip\r\n}\r\n\r\nfunction forge_install {\r\n echo -e \"\\nInstalling forge server using the installer jar file.\\n\"\r\n if [ -f \/mnt\/server\/*installer.jar ]; then\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n else\r\n echo \"No forge installer found moving on.\"\r\n fi\r\n mv FTBServer.jar server.jar\r\n}\r\n\r\nfunction forge_cleanup {\r\n echo -e \"\\nDeleting installer jar file and cleaning up.\\n\"\r\n rm -rf *installer.jar\r\n if [ ! -f \/mnt\/server\/*universal.jar ]; then\r\n mv -v \/mnt\/server\/*\/* \/mnt\/server\/\r\n if [ ! -f \/mnt\/server\/*universal.jar ]; then\r\n mv forge*.jar server.jar\r\n else\r\n mv *universal.jar server.jar \r\n fi\r\n else\r\n mv *universal.jar server.jar\r\n fi\r\n}\r\n\r\nfunction json_download_prework {\r\n mkdir -p \/mnt\/server\/mods\r\n cd \/mnt\/server\/mods\r\n}\r\n\r\nfunction json_download_mods {\r\n MANIFEST=\/mnt\/server\/manifest.json\r\n for mod in $(jq -c '.files[]' ${MANIFEST} ); do\r\n projID=$(echo $mod | jq -r \".projectID\")\r\n fileID=$(echo $mod | jq -r \".fileID\")\r\n URL=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${projID}\/file\/${fileID}\/download-url)\r\n # this is saving everything as \/mnt\/server\/mods\/download\r\n echo \"Mod direct url: ${URL}\"\r\n curl -JLO \"${URL}\"\r\n done\r\n}\r\n\r\nfunction json_download_forge {\r\n cd \/mnt\/server\r\n FORGE=$(jq -r '.minecraft.modLoaders[0].id' \/mnt\/server\/manifest.json | cut -d '-' -f2)\r\n MCVER=$(jq -r '.minecraft.version' \/mnt\/server\/manifest.json)\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\"\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction json_download_overrides {\r\n if [ -d \/mnt\/server\/overrides ]; then\r\n mv \/mnt\/server\/overrides\/mods\/* \/mnt\/server\/mods\/\r\n rmdir \/mnt\/server\/overrides\/mods\r\n mv \/mnt\/server\/overrides\/* \/mnt\/server\r\n rmdir \/mnt\/server\/overrides\r\n fi\r\n}\r\n\r\nfunction cfg_download_forge {\r\n dos2unix settings.cfg # In case the pack was distributed with Windows-style line endings in the cfg file\r\n MCVER=`grep 'MCVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n FORGE=`grep 'FORGEVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n \r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n echo -e ${FORGE_VERSION}\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\"\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction ftb_install {\r\n chmod +x \/mnt\/server\/settings.sh \r\n . \/mnt\/server\/settings.sh \r\n curl https:\/\/s3.amazonaws.com\/Minecraft.Download\/versions\/${MCVER}\/minecraft_server.${MCVER}.jar -o ${JARFILE} \r\n curl https:\/\/libraries.minecraft.net\/${LAUNCHWRAPPER} -o \/mnt\/server\/libraries\/${LAUNCHWRAPPER}\r\n}\r\n\r\ninstall_required\r\nget_download\r\n\r\nif [ -f \/mnt\/server\/manifest.json ]; then\r\n json_download_prework\r\n json_download_mods\r\n json_download_overrides\r\n json_download_forge\r\nelif [ -f \/mnt\/server\/settings.cfg ]; then\r\n cfg_download_forge\r\nelif [ -f \/mnt\/server\/version.json ]; then\r\n if [ \"$(cat \/mnt\/server\/version.json | jq -r '.packID | contains(\"FTB\")')\" == \"true\" ]; then\r\n ftb_install\r\n fi\r\nelse\r\n forge_install\r\n forge_cleanup\r\nfi\r\necho -e \"\\n\\nInstall completed succesfully, enjoy!\"", + "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir -p \/mnt\/server\r\nfi\r\n\r\nfunction install_required {\r\n apt update\r\n apt install -y curl jq unzip dos2unix\r\n}\r\n\r\nfunction get_download {\r\n # get json data to work with\r\n echo -e \"Curling the json for the modpack\"\r\n echo -e \"running: curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID}\"\r\n JSON_DATA=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID})\r\n\r\n # if no modpack version is set or is set to latest\r\n if [ -z ${MODPACK_VERSION} ] || [ \"${MODPACK_VERSION}\" = \"latest\" ]; then\r\n echo -e \"Getting latest download url\"\r\n # parse data to get the download url\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r .defaultFileId)\r\n echo -e \"File ID is: ${FILE_ID}\"\r\n if [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".latestFiles[] | select(.id==$FILE_ID) | .isServerPack\")\" == \"false\" ] && [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\" != \"null\" ]; then\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\r\n DOWNLOAD_URL=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID}\/file\/${FILE_ID}\/download-url)\r\n else\r\n DOWNLOAD_URL=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID}\/file\/${FILE_ID}\/download-url)\r\n fi\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n else\r\n echo -e \"Looking for download url for version ${MODPACK_VERSION}\"\r\n # parse files for version match\r\n FILES_JSON_DATA=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID}\/files)\r\n # get element number to get the exact location in the json\r\n FILES_JSON_ELEMENT=$(echo -e ${FILES_JSON_DATA} | jq --arg VERSION \"${MODPACK_VERSION}\" '.[] | select(.displayName) | .displayName | contains($VERSION)' | grep -n true | cut -f1 -d: | tail -1)\r\n # if there wasn't a match default to latest\r\n if [ ! -z ${FILES_JSON_ELEMENT} ]; then\r\n echo -e \"No matching version found\"\r\n echo -e \"defaulting to latest\"\r\n DOWNLOAD_URL=$(echo -e ${FILES_JSON_DATA} | jq --arg ELEMENT \"${FILES_JSON_ELEMENT}\" '.[$ELEMENT|tonumber-1] | .downloadUrl')\r\n else\r\n echo -e \"Version match found\"\r\n DOWNLOAD_URL=$(echo -e ${JSON_DATA} | jq -r .latestFiles[0].downloadUrl)\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n fi\r\n fi\r\n ## download modpack files\r\n cd \/mnt\/server\r\n echo \"Executing curl -L ${DOWNLOAD_URL} -o server.zip\"\r\n curl -L -g \"${DOWNLOAD_URL}\" -o server.zip\r\n unzip -o server.zip\r\n rm -rf server.zip\r\n}\r\n\r\nfunction forge_install {\r\n echo -e \"\\nInstalling forge server using the installer jar file.\\n\"\r\n if [ -f \/mnt\/server\/*installer.jar ]; then\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n else\r\n echo \"No forge installer found moving on.\"\r\n fi\r\n mv FTBServer.jar server.jar\r\n}\r\n\r\nfunction forge_cleanup {\r\n echo -e \"\\nDeleting installer jar file and cleaning up.\\n\"\r\n rm -rf *installer.jar\r\n if [ ! -f \/mnt\/server\/*universal.jar ]; then\r\n mv -v \/mnt\/server\/*\/* \/mnt\/server\/\r\n if [ ! -f \/mnt\/server\/*universal.jar ]; then\r\n mv forge*.jar server.jar\r\n else\r\n mv *universal.jar server.jar \r\n fi\r\n else\r\n mv *universal.jar server.jar\r\n fi\r\n}\r\n\r\nfunction json_download_prework {\r\n mkdir -p \/mnt\/server\/mods\r\n cd \/mnt\/server\/mods\r\n}\r\n\r\nfunction json_download_mods {\r\n MANIFEST=\/mnt\/server\/manifest.json\r\n for mod in $(jq -c '.files[]' ${MANIFEST} ); do\r\n projID=$(echo $mod | jq -r \".projectID\")\r\n fileID=$(echo $mod | jq -r \".fileID\")\r\n URL=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${projID}\/file\/${fileID}\/download-url)\r\n # this is saving everything as \/mnt\/server\/mods\/download\r\n echo \"Mod direct url: ${URL}\"\r\n curl -JLO \"${URL}\"\r\n done\r\n}\r\n\r\nfunction json_download_forge {\r\n cd \/mnt\/server\r\n FORGE=$(jq -r '.minecraft.modLoaders[0].id' \/mnt\/server\/manifest.json | cut -d '-' -f2)\r\n MCVER=$(jq -r '.minecraft.version' \/mnt\/server\/manifest.json)\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\"\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction json_download_overrides {\r\n if [ -d \/mnt\/server\/overrides ]; then\r\n mv \/mnt\/server\/overrides\/mods\/* \/mnt\/server\/mods\/\r\n rmdir \/mnt\/server\/overrides\/mods\r\n mv \/mnt\/server\/overrides\/* \/mnt\/server\r\n rmdir \/mnt\/server\/overrides\r\n fi\r\n}\r\n\r\nfunction cfg_download_forge {\r\n dos2unix settings.cfg # In case the pack was distributed with Windows-style line endings in the cfg file\r\n MCVER=`grep 'MCVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n FORGE=`grep 'FORGEVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n \r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n echo -e ${FORGE_VERSION}\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\"\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction ftb_install {\r\n chmod +x \/mnt\/server\/settings.sh \r\n . \/mnt\/server\/settings.sh \r\n curl https:\/\/s3.amazonaws.com\/Minecraft.Download\/versions\/${MCVER}\/minecraft_server.${MCVER}.jar -o ${JARFILE} \r\n curl https:\/\/libraries.minecraft.net\/${LAUNCHWRAPPER} -o \/mnt\/server\/libraries\/${LAUNCHWRAPPER}\r\n}\r\n\r\ninstall_required\r\nget_download\r\n\r\nif [ -f \/mnt\/server\/manifest.json ]; then\r\n json_download_prework\r\n json_download_mods\r\n json_download_overrides\r\n json_download_forge\r\nelif [ -f \/mnt\/server\/settings.cfg ]; then\r\n cfg_download_forge\r\nelif [ -f \/mnt\/server\/version.json ]; then\r\n if [ \"$(cat \/mnt\/server\/version.json | jq -r '.packID | contains(\"FTB\")')\" == \"true\" ]; then\r\n ftb_install\r\n fi\r\nelse\r\n forge_install\r\n forge_cleanup\r\nfi\r\necho -e \"\\n\\nInstall completed succesfully, enjoy!\"", "container": "openjdk:8-jdk-slim", "entrypoint": "bash" } @@ -53,4 +53,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From f0e1eaa6a31d06cb8064a310135c1d4f12383eee Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Mon, 24 Jan 2022 13:38:22 -0800 Subject: [PATCH 0338/1001] Update processor support in README Updated minimum processor requirement to mention that multiarch is now supported on the updated image. --- game_eggs/tycoon_games/openrct2/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/tycoon_games/openrct2/README.md b/game_eggs/tycoon_games/openrct2/README.md index 2a270b4b..b0dbaf98 100644 --- a/game_eggs/tycoon_games/openrct2/README.md +++ b/game_eggs/tycoon_games/openrct2/README.md @@ -50,7 +50,7 @@ ___ | | Minimum | |---------|---------| -| Processor | Recent x86/64 (AMD/Intel) processor. No ARM support. | +| Processor | Multiarch is supported for most modern processors | | RAM | 256-512 MiB (depends on # of clients & park size) | | Storage | 80 MB (*may require more if building from source*) | | RCT2 Files | **Not required** | From 7e95ab25ab56fce1d9fa2e212137d03af74b9f88 Mon Sep 17 00:00:00 2001 From: Crispy <34707863+JackCrispy@users.noreply.github.com> Date: Thu, 3 Feb 2022 21:40:10 +1100 Subject: [PATCH 0339/1001] Ts3: Fix a typo (#1546) scalabilty -> scalability --- stock_eggs/voice-servers/egg-teamspeak3-server.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock_eggs/voice-servers/egg-teamspeak3-server.json b/stock_eggs/voice-servers/egg-teamspeak3-server.json index cb88e0e3..6dfb4184 100644 --- a/stock_eggs/voice-servers/egg-teamspeak3-server.json +++ b/stock_eggs/voice-servers/egg-teamspeak3-server.json @@ -7,7 +7,7 @@ "exported_at": "2021-04-27T20:49:27+01:00", "name": "Teamspeak3 Server", "author": "support@pterodactyl.io", - "description": "VoIP software designed with security in mind, featuring crystal clear voice quality, endless customization options, and scalabilty up to thousands of simultaneous users.", + "description": "VoIP software designed with security in mind, featuring crystal clear voice quality, endless customization options, and scalability up to thousands of simultaneous users.", "features": null, "images": [ "quay.io\/parkervcp\/pterodactyl-images:base_debian" From 9717c6ab575bb15d862db4f6f86f95d7e733b5b0 Mon Sep 17 00:00:00 2001 From: Hardix Date: Sun, 6 Feb 2022 02:45:48 +0200 Subject: [PATCH 0340/1001] replace youtube-dl with youtube-dl youtube-dlp is a fork of youtube-dl https://github.com/yt-dlp/yt-dlp --- bots/discord/sinusbot/egg-sinusbot.json | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/bots/discord/sinusbot/egg-sinusbot.json b/bots/discord/sinusbot/egg-sinusbot.json index fa050d60..c57601cc 100644 --- a/bots/discord/sinusbot/egg-sinusbot.json +++ b/bots/discord/sinusbot/egg-sinusbot.json @@ -1,13 +1,18 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2019-07-25T10:48:45-04:00", + "exported_at": "2022-02-06T02:44:05+02:00", "name": "Sinusbot", "author": "support@pterodactyl.io", "description": "Musicbot for Discord and Teamspeak.", - "image": "quay.io\/parkervcp\/pterodactyl-images:bot_sinusbot", + "features": null, + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:bot_sinusbot" + ], + "file_denylist": [], "startup": ".\/sinusbot --override-password=\"${OVERRIDE_PASSWORD}\"", "config": { "files": "{\r\n \"config.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"ListenPort\": \"ListenPort = {{server.build.default.port}}\",\r\n \"ListenHost\": \"ListenHost = \\\"0.0.0.0\\\"\"\r\n }\r\n }\r\n}", @@ -17,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Sinusbot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install ca-certificates bzip2 wget tar curl jq\r\napt -q clean all\r\n\r\n#Create needed directories\r\nmkdir -p \/mnt\/server\/TeamSpeak3-Client-linux_amd64\/plugins\r\nmkdir \/mnt\/server\/youtube-dl\r\n\r\ncd \/mnt\/server\r\n\r\n#Download Sinusbot\r\nwget -qO - https:\/\/www.sinusbot.com\/dl\/sinusbot.current.tar.bz2 | tar xj\r\n\r\n#Download Latest TeamSpeak Client\r\nTS_VERSION=$(curl https:\/\/teamspeak.com\/versions\/client.json | jq -r '.linux.x86_64.version')\r\nTS_DL_LINK=$(curl https:\/\/teamspeak.com\/versions\/client.json | jq -r '.linux.x86_64.mirrors.\"teamspeak.com\"')\r\n\r\necho -e \"downloading teamspeak version ${TS_VERSION}\"\r\necho -e \"running 'wget ${TS_DL_LINK}'\"\r\n\r\nwget ${TS_DL_LINK}\r\n\r\n# Install TeamSpeak Client\r\nchmod 0755 TeamSpeak3-Client-linux_amd64*.run\r\n.\/TeamSpeak3-Client-linux_amd64*.run --tar xfv -C TeamSpeak3-Client-linux_amd64\r\n\r\n## Cleaning up \r\n\r\nrm TeamSpeak3-Client-linux_amd64*.run\r\n# Remove glx-integration lib\r\nrm TeamSpeak3-Client-linux_amd64\/xcbglintegrations\/libqxcb-glx-integration.so\r\n\r\n#Install Sinusbot\r\nchmod +x sinusbot\r\ncp config.ini.dist config.ini\r\nsed -i \"s|^TS3Path.*|TS3Path = \\\"\/home\/container\/TeamSpeak3-Client-linux_amd64\/ts3client_linux_amd64\\\"|g\" config.ini\r\necho 'YoutubeDLPath = \"\/home\/container\/youtube-dl\/youtube-dl\"' >> config.ini\r\n\r\n#Install Sinusbot plugin\r\ncp plugin\/libsoundbot_plugin.so TeamSpeak3-Client-linux_amd64\/plugins\r\n\r\n#Download youtube-dl\r\ncd \/mnt\/server\/youtube-dl\r\nwget -q https:\/\/yt-dl.org\/downloads\/latest\/youtube-dl\r\nchmod a+rx youtube-dl", + "script": "#!\/bin\/bash\r\n# Sinusbot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install ca-certificates bzip2 wget tar curl jq\r\napt -q clean all\r\n\r\n#Create needed directories\r\nmkdir -p \/mnt\/server\/TeamSpeak3-Client-linux_amd64\/plugins\r\nmkdir \/mnt\/server\/youtube-dlp\r\n\r\ncd \/mnt\/server\r\n\r\n#Download Sinusbot\r\nwget -qO - https:\/\/www.sinusbot.com\/dl\/sinusbot.current.tar.bz2 | tar xj\r\n\r\n#Download Latest TeamSpeak Client\r\nTS_VERSION=$(curl https:\/\/teamspeak.com\/versions\/client.json | jq -r '.linux.x86_64.version')\r\nTS_DL_LINK=$(curl https:\/\/teamspeak.com\/versions\/client.json | jq -r '.linux.x86_64.mirrors.\"teamspeak.com\"')\r\n\r\necho -e \"downloading teamspeak version ${TS_VERSION}\"\r\necho -e \"running 'wget ${TS_DL_LINK}'\"\r\n\r\nwget ${TS_DL_LINK}\r\n\r\n# Install TeamSpeak Client\r\nchmod 0755 TeamSpeak3-Client-linux_amd64*.run\r\n.\/TeamSpeak3-Client-linux_amd64*.run --tar xfv -C TeamSpeak3-Client-linux_amd64\r\n\r\n## Cleaning up \r\n\r\nrm TeamSpeak3-Client-linux_amd64*.run\r\n# Remove glx-integration lib\r\nrm TeamSpeak3-Client-linux_amd64\/xcbglintegrations\/libqxcb-glx-integration.so\r\n\r\n#Install Sinusbot\r\nchmod +x sinusbot\r\ncp config.ini.dist config.ini\r\nsed -i \"s|^TS3Path.*|TS3Path = \\\"\/home\/container\/TeamSpeak3-Client-linux_amd64\/ts3client_linux_amd64\\\"|g\" config.ini\r\necho 'YoutubeDLPath = \"\/home\/container\/youtube-dlp\/youtube-dlp\"' >> config.ini\r\n\r\n#Install Sinusbot plugin\r\ncp plugin\/libsoundbot_plugin.so TeamSpeak3-Client-linux_amd64\/plugins\r\n\r\n#Download youtube-dlp\r\ncd \/mnt\/server\/youtube-dlp\r\nwget https:\/\/github.com\/yt-dlp\/yt-dlp\/releases\/latest\/download\/yt-dlp -O youtube-dlp\r\nchmod a+rx youtube-dlp", "container": "ubuntu:18.04", "entrypoint": "bash" } @@ -28,8 +33,8 @@ "description": "Password for admin account.", "env_variable": "OVERRIDE_PASSWORD", "default_value": "CHANGEME", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" } ] From 0389eacd43c2d32013edb0587f6a00e3d6098cb3 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 6 Feb 2022 18:25:17 +0100 Subject: [PATCH 0341/1001] update install image to ghcr --- software/code-server/egg-code--server.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/software/code-server/egg-code--server.json b/software/code-server/egg-code--server.json index 2dca08e9..8820b7eb 100644 --- a/software/code-server/egg-code--server.json +++ b/software/code-server/egg-code--server.json @@ -26,7 +26,7 @@ "scripts": { "installation": { "script": "apt update\r\napt install -y curl jq\r\nMATCH=linux-amd64\r\n\r\n# Create initial directories\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\n# Create needed directories\r\nmkdir -p \/mnt\/server\/.local\/lib \/mnt\/server\/.local\/bin \/mnt\/server\/.config\/code-server \/mnt\/server\/projects\r\n\r\n# Change permission of projects directory so it can be accessed by code-server\r\nchmod 777 \/mnt\/server\/projects\r\ntouch \"\/mnt\/server\/projects\/PLACE YOUR PROJECTS HERE\"\r\n\r\n# Check for available versions. Defaults to latest if no valid version is found.\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/coder\/code-server\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/coder\/code-server\/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 \"v${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n if [ \"v${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"v${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_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\n# Download the given Version and extract it\r\necho \"Downloading $DOWNLOAD_URL\"\r\ncurl -fL $DOWNLOAD_URL | tar -C \/mnt\/server\/.local\/lib -xz\r\nmv \/mnt\/server\/.local\/lib\/code-server-*linux-amd64 \/mnt\/server\/.local\/lib\/code-server-${VERSION}\r\n\r\n\r\nPATH=\"\/mnt\/server\/.local\/bin:$PATH\"\r\necho \"password: changeme\r\nbind-addr: 0.0.0.0\r\nauth: password\r\ncert: false\" > \/mnt\/server\/.config\/code-server\/config.yaml\r\n\r\necho \"Install complete\"", - "container": "debian:buster-slim", + "container": "ghcr.io/parkervcp/installers:debian", "entrypoint": "bash" } }, @@ -50,4 +50,4 @@ "rules": "string|max:20" } ] -} \ No newline at end of file +} From f296c182a5f64f00ec6e7ebcbb04709cbf7d9b25 Mon Sep 17 00:00:00 2001 From: NgLoader Date: Wed, 16 Feb 2022 22:04:41 +0100 Subject: [PATCH 0342/1001] fix: fixed mongodb config not applied --- database/nosql/mongodb/egg-mongo-d-b.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/nosql/mongodb/egg-mongo-d-b.json b/database/nosql/mongodb/egg-mongo-d-b.json index bf1ede28..85c6dd61 100644 --- a/database/nosql/mongodb/egg-mongo-d-b.json +++ b/database/nosql/mongodb/egg-mongo-d-b.json @@ -8,7 +8,7 @@ "author": "parker@parkervcp.com", "description": "MongoDB is a general purpose, document-based, distributed database built for modern application developers and for my butt era.", "image": "quay.io\/parkervcp\/pterodactyl-images:db_mongo-4", - "startup": "mongod --fork --dbpath \/home\/container\/mongodb\/ --port ${SERVER_PORT} --bind_ip 0.0.0.0 --logpath \/home\/container\/logs\/mongo.log; until nc -z -v -w5 127.0.0.1 ${SERVER_PORT}; do echo 'Waiting for mongodb connection...'; sleep 5; done && mongo 127.0.0.1:${SERVER_PORT} && mongo --eval \"db.getSiblingDB('admin').shutdownServer()\" 127.0.0.1:${SERVER_PORT}", + "startup": "mongod --fork --dbpath /home/container/mongodb/ --port ${SERVER_PORT} --bind_ip 0.0.0.0 --logpath /home/container/logs/mongo.log -f /home/container/mongod.conf; until nc -z -v -w5 127.0.0.1 ${SERVER_PORT}; do echo 'Waiting for mongodb connection...'; sleep 5; done && mongo --username ${MONGO_USER} --password ${MONGO_USER_PASS} --host 127.0.0.1:${SERVER_PORT} && mongo --eval \"db.getSiblingDB('admin').shutdownServer()\" 127.0.0.1:${SERVER_PORT}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"child process started successfully\"\r\n}", From 9018302a4eff5ed63f9af87916bccbe01f4b442c Mon Sep 17 00:00:00 2001 From: NgLoader Date: Wed, 16 Feb 2022 22:05:54 +0100 Subject: [PATCH 0343/1001] fix: fixed false config format --- database/nosql/mongodb/egg-mongo-d-b.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/nosql/mongodb/egg-mongo-d-b.json b/database/nosql/mongodb/egg-mongo-d-b.json index 85c6dd61..81029ee5 100644 --- a/database/nosql/mongodb/egg-mongo-d-b.json +++ b/database/nosql/mongodb/egg-mongo-d-b.json @@ -8,7 +8,7 @@ "author": "parker@parkervcp.com", "description": "MongoDB is a general purpose, document-based, distributed database built for modern application developers and for my butt era.", "image": "quay.io\/parkervcp\/pterodactyl-images:db_mongo-4", - "startup": "mongod --fork --dbpath /home/container/mongodb/ --port ${SERVER_PORT} --bind_ip 0.0.0.0 --logpath /home/container/logs/mongo.log -f /home/container/mongod.conf; until nc -z -v -w5 127.0.0.1 ${SERVER_PORT}; do echo 'Waiting for mongodb connection...'; sleep 5; done && mongo --username ${MONGO_USER} --password ${MONGO_USER_PASS} --host 127.0.0.1:${SERVER_PORT} && mongo --eval \"db.getSiblingDB('admin').shutdownServer()\" 127.0.0.1:${SERVER_PORT}", + "startup": "mongod --fork --dbpath \/home\/container\/mongodb\/ --port ${SERVER_PORT} --bind_ip 0.0.0.0 --logpath \/home\/container\/logs\/mongo.log -f \/home\/container\/mongod.conf; until nc -z -v -w5 127.0.0.1 ${SERVER_PORT}; do echo 'Waiting for mongodb connection...'; sleep 5; done && mongo --username ${MONGO_USER} --password ${MONGO_USER_PASS} --host 127.0.0.1:${SERVER_PORT} && mongo --eval \"db.getSiblingDB('admin').shutdownServer()\" 127.0.0.1:${SERVER_PORT}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"child process started successfully\"\r\n}", From b05664a541e454e29eb32aaf81051d79fab6f9fa Mon Sep 17 00:00:00 2001 From: NgLoader Date: Wed, 16 Feb 2022 22:19:46 +0100 Subject: [PATCH 0344/1001] fix: fixed two spaces --- database/nosql/mongodb/egg-mongo-d-b.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/database/nosql/mongodb/egg-mongo-d-b.json b/database/nosql/mongodb/egg-mongo-d-b.json index 81029ee5..311f157b 100644 --- a/database/nosql/mongodb/egg-mongo-d-b.json +++ b/database/nosql/mongodb/egg-mongo-d-b.json @@ -8,7 +8,7 @@ "author": "parker@parkervcp.com", "description": "MongoDB is a general purpose, document-based, distributed database built for modern application developers and for my butt era.", "image": "quay.io\/parkervcp\/pterodactyl-images:db_mongo-4", - "startup": "mongod --fork --dbpath \/home\/container\/mongodb\/ --port ${SERVER_PORT} --bind_ip 0.0.0.0 --logpath \/home\/container\/logs\/mongo.log -f \/home\/container\/mongod.conf; until nc -z -v -w5 127.0.0.1 ${SERVER_PORT}; do echo 'Waiting for mongodb connection...'; sleep 5; done && mongo --username ${MONGO_USER} --password ${MONGO_USER_PASS} --host 127.0.0.1:${SERVER_PORT} && mongo --eval \"db.getSiblingDB('admin').shutdownServer()\" 127.0.0.1:${SERVER_PORT}", + "startup": "mongod --fork --dbpath \/home\/container\/mongodb\/ --port ${SERVER_PORT} --bind_ip 0.0.0.0 --logpath \/home\/container\/logs\/mongo.log -f \/home\/container\/mongod.conf; until nc -z -v -w5 127.0.0.1 ${SERVER_PORT}; do echo 'Waiting for mongodb connection...'; sleep 5; done && mongo --username ${MONGO_USER} --password ${MONGO_USER_PASS} --host 127.0.0.1:${SERVER_PORT} && mongo --eval \"db.getSiblingDB('admin').shutdownServer()\" 127.0.0.1:${SERVER_PORT}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"child process started successfully\"\r\n}", @@ -42,4 +42,4 @@ "rules": "required|string" } ] -} \ No newline at end of file +} From 09234ee19672565ce4d816621d1c3cc74483176f Mon Sep 17 00:00:00 2001 From: gOOvER Date: Fri, 18 Feb 2022 11:34:27 +0100 Subject: [PATCH 0345/1001] update/valheim - add betabranch --- .../valheim/valheim_vanilla/egg-valheim.json | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/game_eggs/steamcmd_servers/valheim/valheim_vanilla/egg-valheim.json b/game_eggs/steamcmd_servers/valheim/valheim_vanilla/egg-valheim.json index e3754ee9..6bd507aa 100644 --- a/game_eggs/steamcmd_servers/valheim/valheim_vanilla/egg-valheim.json +++ b/game_eggs/steamcmd_servers/valheim/valheim_vanilla/egg-valheim.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-02-17T16:43:58+01:00", + "exported_at": "2022-02-18T11:17:53+01:00", "name": "Valheim", "author": "magi1053@outlook.com", "description": "A brutal exploration and survival game for 1-10 players, set in a procedurally-generated purgatory inspired by viking culture.", @@ -12,8 +12,9 @@ "steam_disk_space" ], "images": [ - "quay.io\/parkervcp\/pterodactyl-images:debian_source" + "ghcr.io\/parkervcp\/games:source" ], + "file_denylist": [], "startup": ".\/valheim_server.x86_64 -nographics -batchmode -name \"{{SERVER_NAME}}\" -port {{SERVER_PORT}} -world \"{{WORLD}}\" -password \"{{PASSWORD}}\" > >(sed -uE \"{{FILTER}}\") & trap \"{{STOP}}\" 15; wait $!", "config": { "files": "{}", @@ -23,8 +24,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Valheim Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends --no-install-suggests install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", - "container": "debian:buster-slim", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n ##\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, @@ -99,7 +100,25 @@ "default_value": "1", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "boolean" + }, + { + "name": "Beta Branch", + "description": "", + "env_variable": "SRCDS_BETAID", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "max:30" + }, + { + "name": "Betapassword", + "description": "", + "env_variable": "SRCDS_BETAPASS", + "default_value": "", + "user_viewable": false, + "user_editable": false, + "rules": "max:30" } ] -} +} \ No newline at end of file From 27fa7b41159284c981fe6a31162cb091ae734aba Mon Sep 17 00:00:00 2001 From: gOOvER Date: Fri, 18 Feb 2022 11:40:15 +0100 Subject: [PATCH 0346/1001] small fix --- .../steamcmd_servers/valheim/valheim_vanilla/egg-valheim.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/valheim/valheim_vanilla/egg-valheim.json b/game_eggs/steamcmd_servers/valheim/valheim_vanilla/egg-valheim.json index 6bd507aa..32bbf258 100644 --- a/game_eggs/steamcmd_servers/valheim/valheim_vanilla/egg-valheim.json +++ b/game_eggs/steamcmd_servers/valheim/valheim_vanilla/egg-valheim.json @@ -116,8 +116,8 @@ "description": "", "env_variable": "SRCDS_BETAPASS", "default_value": "", - "user_viewable": false, - "user_editable": false, + "user_viewable": true, + "user_editable": true, "rules": "max:30" } ] From ffdba65340b4a9aa367110fae69146db6363f8b6 Mon Sep 17 00:00:00 2001 From: SebiAi Date: Fri, 18 Feb 2022 15:18:34 +0100 Subject: [PATCH 0347/1001] Changed docker image to use java 16 --- bots/discord/jmusicbot/egg-j-music-bot.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bots/discord/jmusicbot/egg-j-music-bot.json b/bots/discord/jmusicbot/egg-j-music-bot.json index 84d3ee81..96da03ca 100644 --- a/bots/discord/jmusicbot/egg-j-music-bot.json +++ b/bots/discord/jmusicbot/egg-j-music-bot.json @@ -9,7 +9,7 @@ "description": "A Discord music bot that's easy to set up and run yourself!", "features": null, "images": [ - "ghcr.io\/parkervcp\/yolks:java_8" + "ghcr.io\/pterodactyl\/yolks:java_16" ], "file_denylist": [], "startup": "java -Dnogui=true -jar JMusicBot.jar", From 4b9827e8b6376325fbe44e374db57edb3e9bb16d Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 19 Feb 2022 13:18:52 +0100 Subject: [PATCH 0348/1001] update/veloren - removed -b flag, because it's not part of startup --- game_eggs/veloren/egg-veloren.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/veloren/egg-veloren.json b/game_eggs/veloren/egg-veloren.json index 689fb7be..d4bda0d7 100644 --- a/game_eggs/veloren/egg-veloren.json +++ b/game_eggs/veloren/egg-veloren.json @@ -13,7 +13,7 @@ "quay.io\/parkervcp\/pterodactyl-images:base_debian" ], "file_denylist": [], - "startup": ".\/veloren-server-cli -b", + "startup": ".\/veloren-server-cli", "config": { "files": "{\r\n \"userdata\/server\/server_config\/settings.ron\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \" gameserver_address\": \" gameserver_address: \\\"0.0.0.0:{{server.build.default.port}}\\\",\",\r\n\t \" server_name\": \" server_name: \\\"{{server.build.env.SERVER_NAME}}\\\",\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Server is ready to accept connections\"\r\n}", @@ -28,4 +28,4 @@ } }, "variables": [] -} \ No newline at end of file +} From d907c6aab312d9f0cbed97ba46eaabe3dd37911f Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 19 Feb 2022 13:57:35 +0100 Subject: [PATCH 0349/1001] update/haste-server - switch to ghcr --- software/haste-server/egg-haste-server.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/software/haste-server/egg-haste-server.json b/software/haste-server/egg-haste-server.json index bcccbe80..bc805f14 100644 --- a/software/haste-server/egg-haste-server.json +++ b/software/haste-server/egg-haste-server.json @@ -10,7 +10,7 @@ "description": "Haste is an open-source pastebin software written in node.js, which is easily installable in any network. It can be backed by either redis or filesystem, and has a very easy adapter interface for other stores. A publicly available version can be found at hastebin.com", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-12" + "ghcr.io/parkervcp/yolks:nodejs_12" ], "startup": "npm start", "config": { @@ -22,7 +22,7 @@ "scripts": { "installation": { "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y git curl\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\ngit clone https:\/\/github.com\/toptal\/haste-server\r\ncd haste-server\r\nmv * \/mnt\/server\r\ncd ..\r\nrm -rf haste-server\r\nnpm install\r\n\r\nexit 0", - "container": "node:12-buster-slim", + "container": "node:12-bullseye-slim", "entrypoint": "bash" } }, From 4c509adb89d109b62c9bd0886213575826558998 Mon Sep 17 00:00:00 2001 From: "Andrey (MiTask)" <61359286+MrMasrozYTLIVE@users.noreply.github.com> Date: Sat, 19 Feb 2022 17:54:36 +0300 Subject: [PATCH 0350/1001] Update egg-mindustry.json --- game_eggs/mindustry/egg-mindustry.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/mindustry/egg-mindustry.json b/game_eggs/mindustry/egg-mindustry.json index 1b7393d1..00e44bea 100644 --- a/game_eggs/mindustry/egg-mindustry.json +++ b/game_eggs/mindustry/egg-mindustry.json @@ -7,7 +7,7 @@ "name": "Mindustry", "author": "unknown@unknown.com", "description": "Mindustry is a hybrid tower-defense sandbox factory game. Create elaborate supply chains of conveyor belts to feed ammo into your turrets, produce materials to use for building, and defend your structures from waves of enemies.", - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11", + "image": "ghcr.io\/pterodactyl\/yolks:java_11", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar server-release.jar config port {{SERVER_PORT}},config name {{SERVER_NAME}},host {{MAPNAME}}", "config": { "files": "{}", From 1c77790a86998459748e515f1fc8ceed4eda89a7 Mon Sep 17 00:00:00 2001 From: maximilianovermeyer <69120862+maximilianovermeyer@users.noreply.github.com> Date: Tue, 1 Mar 2022 21:55:12 +0100 Subject: [PATCH 0351/1001] fix(insurgency) "Max Players" env variable typo (#1572) "Max Players" var was defined as MAXPLAYERS, but referred as MAX_PLAYERS. Changed the definition instead of the startup command to keep it consistent with other steam games. --- .../insurgency_sandstorm/egg-insurgency--sandstorm.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/insurgency_sandstorm/egg-insurgency--sandstorm.json b/game_eggs/steamcmd_servers/insurgency_sandstorm/egg-insurgency--sandstorm.json index 724c0989..562e9f4c 100644 --- a/game_eggs/steamcmd_servers/insurgency_sandstorm/egg-insurgency--sandstorm.json +++ b/game_eggs/steamcmd_servers/insurgency_sandstorm/egg-insurgency--sandstorm.json @@ -60,7 +60,7 @@ { "name": "Max Players", "description": "Sets the maximum number of players.", - "env_variable": "MAXPLAYERS", + "env_variable": "MAX_PLAYERS", "default_value": "28", "user_viewable": true, "user_editable": true, From 70d6cebce57adac34cf119f7bf8fdb31d5017136 Mon Sep 17 00:00:00 2001 From: Marko Date: Sat, 12 Mar 2022 18:40:18 +0100 Subject: [PATCH 0352/1001] Update Egg for CryoFall to use Dotnet6 Image (#1575) --- game_eggs/steamcmd_servers/cryofall/egg-cryo-fall.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/cryofall/egg-cryo-fall.json b/game_eggs/steamcmd_servers/cryofall/egg-cryo-fall.json index 9d7ea870..cec181d5 100644 --- a/game_eggs/steamcmd_servers/cryofall/egg-cryo-fall.json +++ b/game_eggs/steamcmd_servers/cryofall/egg-cryo-fall.json @@ -12,7 +12,7 @@ "steam_disk_space" ], "images": [ - "ghcr.io\/parkervcp\/yolks:dotnet_5" + "ghcr.io\/parkervcp\/yolks:dotnet_6" ], "file_denylist": [], "startup": "dotnet Binaries\/Server\/CryoFall_Server.dll loadOrNew", From 18c59cd8fc3d147b2a887422bb5c8e55426294da Mon Sep 17 00:00:00 2001 From: NgLoader Date: Sat, 12 Mar 2022 18:45:29 +0100 Subject: [PATCH 0353/1001] fix: fixed nanolimbo now pulling latest config (#1574) --- .../java/nanolimbo/egg-nano-limbo.json | 6 +- .../minecraft/java/nanolimbo/settings.yml | 115 ++++++++++++++++++ 2 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 game_eggs/minecraft/java/nanolimbo/settings.yml diff --git a/game_eggs/minecraft/java/nanolimbo/egg-nano-limbo.json b/game_eggs/minecraft/java/nanolimbo/egg-nano-limbo.json index 92fa577f..fd99f086 100644 --- a/game_eggs/minecraft/java/nanolimbo/egg-nano-limbo.json +++ b/game_eggs/minecraft/java/nanolimbo/egg-nano-limbo.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-11-28T04:47:00+01:00", + "exported_at": "2022-03-02T18:33:43+01:00", "name": "NanoLimbo", "author": "mail@wuffy.eu", "description": "This is lightweight minecraft limbo server, written on Java with Netty. The main goal of the project is maximum simplicity with a minimum number of sent and processed packets. This limbo is empty, there are no ability to set schematic building since this is not necessary. You can send useful information in chat or BossBar.\r\n\r\nNo plugins, no logs. The server is fully clear. It only able keep a lot of players while the main server is down.", @@ -26,7 +26,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# NanoLimbo Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt update\r\napt install -y curl jq git openssl bash bc apt-transport-https gnupg software-properties-common\r\n\r\nif [ -z \"${DOWNLOAD_URL}\" ]; then\r\n GITHUB_PACKAGE=\"Nan1t\/NanoLimbo\"\r\n MATCH=\"NanoLimbo-\"\r\n\r\n ## get release info and download links\r\n LATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\n RELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n \r\n if [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\n else\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 -i ${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\n fi\r\nelse\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}.jar; then\r\n echo -e \"Provided download link is valid. Proceeding to download\"\r\n else\r\n echo -e \"Provided download link is invalid. Exiting now\"\r\n exit 2\r\n fi\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading server file...\"\r\necho -e \"performing curl -sSL ${DOWNLOAD_URL}\"\r\ncurl -sSL -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f \"settings.yml\" ]; then\r\necho \"Creating settings file...\"\r\n cat < settings.yml\r\nbind:\r\n ip: 0.0.0.0\r\n port: 25000\r\nbossBar:\r\n color: PINK\r\n division: SOLID\r\n enable: true\r\n health: 1\r\n text: '{\"text\": \"Welcome to the Limbo!\"}'\r\ndebugLevel: 3\r\ndimension: THE_END\r\ngameMode: 3\r\ninfoForwarding:\r\n secret: \r\n tokens:\r\n - \r\n type: NONE\r\njoinMessage:\r\n enable: true\r\n text: '{\"text\": \"&eWelcome to the Limbo!\"}'\r\nmaxPlayers: 100\r\nnetty:\r\n threads:\r\n bossGroup: 1\r\n workerGroup: 4\r\n useEpoll: true\r\nping:\r\n description: '{\"text\": \"&9NanoLimbo\"}'\r\n version: NanoLimbo\r\nreadTimeout: 30000\r\nspawnPosition:\r\n pitch: 0\r\n \"true\": 64\r\n x: 0\r\n yaw: 0\r\n z: 0\r\ntitle:\r\n enable: true\r\n fadeIn: 10\r\n fadeOut: 10\r\n stay: 100\r\n subtitle: '{\"text\": \"&6NanoLimbo\"}'\r\n title: '{\"text\": \"&9&lWelcome!\"}'\r\nEOT\r\nfi", + "script": "#!\/bin\/bash\r\n# NanoLimbo Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt update\r\napt install -y curl jq git openssl bash bc apt-transport-https gnupg software-properties-common\r\n\r\nif [ -z \"${DOWNLOAD_URL}\" ]; then\r\n GITHUB_PACKAGE=\"Nan1t\/NanoLimbo\"\r\n MATCH=\"NanoLimbo-\"\r\n\r\n ## get release info and download links\r\n LATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\n RELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n \r\n if [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\n else\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 -i ${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\n fi\r\nelse\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}.jar; then\r\n echo -e \"Provided download link is valid. Proceeding to download\"\r\n else\r\n echo -e \"Provided download link is invalid. Exiting now\"\r\n exit 2\r\n fi\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading server file...\"\r\necho -e \"performing curl -sSL ${DOWNLOAD_URL}\"\r\ncurl -sSL -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f \"settings.yml\" ]; then\r\necho \"Creating settings file...\"\r\ncurl -sSL -o settings.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/java\/nanolimbo\/settings.yml\r\nfi", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -60,4 +60,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file diff --git a/game_eggs/minecraft/java/nanolimbo/settings.yml b/game_eggs/minecraft/java/nanolimbo/settings.yml new file mode 100644 index 00000000..dc997c7a --- /dev/null +++ b/game_eggs/minecraft/java/nanolimbo/settings.yml @@ -0,0 +1,115 @@ +# +# NanoLimbo configuration +# + +# Server's host address and port. Set ip empty to use public address +bind: + ip: 'localhost' + port: 65535 + +# Max amount of players can join to server +# Set -1 to make it infinite +maxPlayers: 100 + +# Server's data in servers list +ping: + description: '{"text": "&9NanoLimbo"}' + version: 'NanoLimbo' + +# Available dimensions: OVERWORLD, NETHER, THE_END +dimension: THE_END + +# Whether to display the player in the player list +# For 1.16.5 clients player list will be sent even if disabled, to avoid crash +playerList: + enable: false + username: 'NanoLimbo' + +# Whether to display header and footer in player list +headerAndFooter: + enable: false + header: '{"text": "&eWelcome!"}' + footer: '{"text": "&9NanoLimbo"}' + +# Spawn position in the world +spawnPosition: + x: 0.0 + y: 64.0 + z: 0.0 + yaw: 0.0 + pitch: 0.0 + +# Setup player's game mode +# 0 - Survival +# 1 - Creative (hide HP and food bar) +# 2 - Adventure +# 3 - Spectator (hide all UI bars) +gameMode: 3 + +# Server name which is shown under F3 +brandName: + enable: true + content: 'NanoLimbo' + +# Message sends when player join to server +joinMessage: + enable: true + text: '{"text": "&eWelcome to the Limbo!"}' + +# BossBar displays when player join to server +# Works on 1.9+ clients only +bossBar: + enable: true + text: '{"text": "Welcome to the Limbo!"}' + health: 1.0 + # Available colors: PINK, BLUE, RED, GREEN, YELLOW, PURPLE, WHITE + color: PINK + # Available divisions: SOLID, DASHES_6, DASHES_10, DASHES_12, DASHES_20 + division: SOLID + +# Display title and subtitle +title: + enable: true + # Set title text value empty, if you need only subtitle + title: '{"text": "&9&lWelcome!"}' + # Set subtitle text value empty, if you need only title + subtitle: '{"text": "&6NanoLimbo"}' + # Fade in time in ticks (1 sec = 20 ticks) + fadeIn: 10 + # Stay time in ticks + stay: 100 + # Fade out time in ticks + fadeOut: 10 + +# Player info forwarding support. +# Available types: +# - NONE +# - LEGACY +# - MODERN +# - BUNGEE_GUARD +# Don't use secret if you not use MODERN type +infoForwarding: + type: NONE + secret: '' + tokens: + - '' + +# Read timeout for connections in milliseconds +readTimeout: 30000 + +# Define log level. For production, I'd recommend to use level 2 +# Log levels: +# 0 - Display only errors +# 1 - Display errors, warnings +# 2 - Display errors, warnings, info +# 3 - Display errors, warnings, info, debug +debugLevel: 2 + +# Warning! Do not touch params of this block, if you not completely sure what is this! +netty: + # Use Linux native transport type, if it possible + useEpoll: true + # EventLoopGroup threads count + threads: + bossGroup: 1 + workerGroup: 4 \ No newline at end of file From 02dab51d2ec8a9772761ee3feb0da249800d1b04 Mon Sep 17 00:00:00 2001 From: Th3Dilli Date: Sun, 13 Mar 2022 11:42:55 +0100 Subject: [PATCH 0354/1001] add image and correct server.cfg --- game_eggs/mohaa/egg-mohaa.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/mohaa/egg-mohaa.json b/game_eggs/mohaa/egg-mohaa.json index 0fc60052..832621d3 100644 --- a/game_eggs/mohaa/egg-mohaa.json +++ b/game_eggs/mohaa/egg-mohaa.json @@ -10,7 +10,7 @@ "description": null, "features": null, "images": [ - "ghcr.io\/parkervcp\/yolks:debian" + "ghcr.io\/parkervcp\/games:mohaa" ], "file_denylist": [], "startup": ".\/mohaa_lnxded +set sv_punkbuster 0 +set fs_basepath {{BASE_PATH}} +set fs_outputpath {{LOG_DIR}} +set dedicated 2 +set sv_maxclients {{SERVER_MAXCLIENTS}} +set net_ip 0.0.0.0 +set net_port {{SERVER_PORT}} +exec server.cfg", @@ -41,7 +41,7 @@ "name": "CONFIG_URL", "description": "URL from where to get the initial server.cfg", "env_variable": "CONFIG_URL", - "default_value": "https:\/\/raw.githubusercontent.com\/Th3Dilli\/eggs\/mohaa\/game_eggs\/mohaa\/server.cfg", + "default_value": "https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/mohaa\/game_eggs\/mohaa\/server.cfg", "user_viewable": true, "user_editable": true, "rules": "required|string" From c29b91071a33c0531c9d9b2ffeb890836bf0a6be Mon Sep 17 00:00:00 2001 From: Th3Dilli Date: Sun, 13 Mar 2022 12:05:13 +0100 Subject: [PATCH 0355/1001] remove duplicated mindustry entry --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index c83d1472..212efeb8 100644 --- a/README.md +++ b/README.md @@ -120,10 +120,6 @@ If you are reading this it looks like you are looking to add an egg to your serv * GTA * [GTAC](game_eggs/gta/gtac) -[Mindustry](game_eggs/mindustry) - -* [Mindustry](game_eggs/mindustry/mindustry) - [League Sandbox](game_eggs/leaguesandbox) * [League Sandbox](game_eggs/leaguesandbox/leaguesandbox) From f6d9e302c70f62dffc71c8202b9a4a4d25b239af Mon Sep 17 00:00:00 2001 From: Jack Bailey Date: Wed, 16 Mar 2022 10:42:55 +0000 Subject: [PATCH 0356/1001] Enable authentication in startup As it starts with a password protected admin user on startup anyway, the majority of usecases would benefit from having authentication enabled by default --- database/nosql/mongodb/egg-mongo-d-b.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/nosql/mongodb/egg-mongo-d-b.json b/database/nosql/mongodb/egg-mongo-d-b.json index 311f157b..45257138 100644 --- a/database/nosql/mongodb/egg-mongo-d-b.json +++ b/database/nosql/mongodb/egg-mongo-d-b.json @@ -8,7 +8,7 @@ "author": "parker@parkervcp.com", "description": "MongoDB is a general purpose, document-based, distributed database built for modern application developers and for my butt era.", "image": "quay.io\/parkervcp\/pterodactyl-images:db_mongo-4", - "startup": "mongod --fork --dbpath \/home\/container\/mongodb\/ --port ${SERVER_PORT} --bind_ip 0.0.0.0 --logpath \/home\/container\/logs\/mongo.log -f \/home\/container\/mongod.conf; until nc -z -v -w5 127.0.0.1 ${SERVER_PORT}; do echo 'Waiting for mongodb connection...'; sleep 5; done && mongo --username ${MONGO_USER} --password ${MONGO_USER_PASS} --host 127.0.0.1:${SERVER_PORT} && mongo --eval \"db.getSiblingDB('admin').shutdownServer()\" 127.0.0.1:${SERVER_PORT}", + "startup": "mongod --fork --dbpath \/home\/container\/mongodb\/ --port ${SERVER_PORT} --bind_ip 0.0.0.0 --logpath \/home\/container\/logs\/mongo.log -f \/home\/container\/mongod.conf; until nc -z -v -w5 127.0.0.1 ${SERVER_PORT}; do echo 'Waiting for mongodb connection...'; sleep 5; done && mongo --username ${MONGO_USER} --auth --password ${MONGO_USER_PASS} --host 127.0.0.1:${SERVER_PORT} && mongo --eval \"db.getSiblingDB('admin').shutdownServer()\" 127.0.0.1:${SERVER_PORT}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"child process started successfully\"\r\n}", From 24e1e0cca4fb32433e1581203ba8f450af95546c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matou=C5=A1=20Ku=C4=8Dera?= <34477304+zlataovce@users.noreply.github.com> Date: Fri, 18 Mar 2022 18:04:07 +0100 Subject: [PATCH 0357/1001] add Reposilite egg --- README.md | 4 +++ software/reposilite/README.md | 11 +++++++ software/reposilite/egg-reposilite.json | 44 +++++++++++++++++++++++++ 3 files changed, 59 insertions(+) create mode 100644 software/reposilite/README.md create mode 100644 software/reposilite/egg-reposilite.json diff --git a/README.md b/README.md index bbed6550..17e8d3ce 100644 --- a/README.md +++ b/README.md @@ -303,3 +303,7 @@ If you are reading this it looks like you are looking to add an egg to your serv ### RabbitMQ * [rabbitmq](/software/rabbitmq) + +### Reposilite + +* [Reposilite](/software/reposilite) diff --git a/software/reposilite/README.md b/software/reposilite/README.md new file mode 100644 index 00000000..0bc6505a --- /dev/null +++ b/software/reposilite/README.md @@ -0,0 +1,11 @@ +# [Reposilite](https://github.com/dzikoysk/reposilite) + +Lightweight and easy-to-use repository management software dedicated for Maven based artifacts in the JVM ecosystem. + +## Server Ports + +Ports required to run the server in a table format. + +| Port | default | +| ---- | ------- | +| App | 80 | diff --git a/software/reposilite/egg-reposilite.json b/software/reposilite/egg-reposilite.json new file mode 100644 index 00000000..fc66811a --- /dev/null +++ b/software/reposilite/egg-reposilite.json @@ -0,0 +1,44 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2022-03-18T18:01:24+01:00", + "name": "Reposilite", + "author": "mk@kcra.me", + "description": "Lightweight and easy-to-use repository management software dedicated for Maven based artifacts in the JVM ecosystem.", + "features": null, + "images": [ + "ghcr.io\/pterodactyl\/yolks:java_8", + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" + ], + "file_denylist": [], + "startup": "java -Xmx{{SERVER_MEMORY}}M -Dreposilite.port={{SERVER_PORT}} -jar reposilite.jar --port {{SERVER_PORT}}", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Done (\"\r\n}", + "logs": "{}", + "stop": "stop" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/sh\r\n# Switch to mounted directory\r\ncd \/mnt\/server\r\n# Update installation system and install curl\r\napt-get update\r\napt-get install -y curl\r\n# Remove old Reposilite JAR\r\nrm -f reposilite.jar\r\n# Find latest Reposilite version, if needed\r\nif [ \"$REPOSILITE_VERSION\" == \"latest\" ]; then\r\n REPOSILITE_VERSION=$(grep -oPm1 \"(?<=)[^<]+\" <<< \"$(curl -s https:\/\/repo.panda-lang.org\/releases\/org\/panda-lang\/reposilite\/maven-metadata.xml)\")\r\nfi\r\n# Check if -all suffixed jar is available\r\nstatus_code=$(curl --write-out '%{http_code}' -X HEAD -s -o \/dev\/null https:\/\/repo.panda-lang.org\/releases\/org\/panda-lang\/reposilite\/${REPOSILITE_VERSION}\/reposilite-${REPOSILITE_VERSION}-all.jar)\r\n# Download new Reposilite\r\nif [ \"$status_code\" == 200 ]; then\r\n curl -o reposilite.jar https:\/\/repo.panda-lang.org\/releases\/org\/panda-lang\/reposilite\/${REPOSILITE_VERSION}\/reposilite-${REPOSILITE_VERSION}-all.jar\r\nelse\r\n curl -o reposilite.jar https:\/\/repo.panda-lang.org\/releases\/org\/panda-lang\/reposilite\/${REPOSILITE_VERSION}\/reposilite-${REPOSILITE_VERSION}.jar\r\nfi", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Reposilite version", + "description": "The version of Reposilite.", + "env_variable": "REPOSILITE_VERSION", + "default_value": "latest", + "user_viewable": false, + "user_editable": true, + "rules": "required|string" + } + ] +} \ No newline at end of file From 8f6b91dbc94427c6bfca2e32dc7899adefdc949d Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat, 19 Mar 2022 15:21:34 +0100 Subject: [PATCH 0358/1001] docs(magma): fix wrong website URL in readme (#1587) --- game_eggs/minecraft/java/magma/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/minecraft/java/magma/README.md b/game_eggs/minecraft/java/magma/README.md index 009ea1ca..f786b921 100644 --- a/game_eggs/minecraft/java/magma/README.md +++ b/game_eggs/minecraft/java/magma/README.md @@ -2,7 +2,7 @@ Magma is most powerful Forge server providing you with Forge mods and Bukkit Plugins using Spigot and Paper for Performance Optimization and Stability. -[Magma Website](https://magmefoundation.org/) +[Magma Website](https://magmafoundation.org/) ## Server Ports From 019536f669e4eec9b856ce23915a34147d87eac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matou=C5=A1=20Ku=C4=8Dera?= <34477304+zlataovce@users.noreply.github.com> Date: Sat, 19 Mar 2022 21:17:40 +0100 Subject: [PATCH 0359/1001] fix: apply suggestions --- software/reposilite/README.md | 6 +----- software/reposilite/egg-reposilite.json | 8 ++++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/software/reposilite/README.md b/software/reposilite/README.md index 0bc6505a..739545bb 100644 --- a/software/reposilite/README.md +++ b/software/reposilite/README.md @@ -4,8 +4,4 @@ Lightweight and easy-to-use repository management software dedicated for Maven b ## Server Ports -Ports required to run the server in a table format. - -| Port | default | -| ---- | ------- | -| App | 80 | +One port needs to be allocated to run Reposilite. diff --git a/software/reposilite/egg-reposilite.json b/software/reposilite/egg-reposilite.json index fc66811a..c2c2a577 100644 --- a/software/reposilite/egg-reposilite.json +++ b/software/reposilite/egg-reposilite.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2022-03-18T18:01:24+01:00", + "exported_at": "2022-03-19T18:47:13+01:00", "name": "Reposilite", "author": "mk@kcra.me", "description": "Lightweight and easy-to-use repository management software dedicated for Maven based artifacts in the JVM ecosystem.", @@ -25,8 +25,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/sh\r\n# Switch to mounted directory\r\ncd \/mnt\/server\r\n# Update installation system and install curl\r\napt-get update\r\napt-get install -y curl\r\n# Remove old Reposilite JAR\r\nrm -f reposilite.jar\r\n# Find latest Reposilite version, if needed\r\nif [ \"$REPOSILITE_VERSION\" == \"latest\" ]; then\r\n REPOSILITE_VERSION=$(grep -oPm1 \"(?<=)[^<]+\" <<< \"$(curl -s https:\/\/repo.panda-lang.org\/releases\/org\/panda-lang\/reposilite\/maven-metadata.xml)\")\r\nfi\r\n# Check if -all suffixed jar is available\r\nstatus_code=$(curl --write-out '%{http_code}' -X HEAD -s -o \/dev\/null https:\/\/repo.panda-lang.org\/releases\/org\/panda-lang\/reposilite\/${REPOSILITE_VERSION}\/reposilite-${REPOSILITE_VERSION}-all.jar)\r\n# Download new Reposilite\r\nif [ \"$status_code\" == 200 ]; then\r\n curl -o reposilite.jar https:\/\/repo.panda-lang.org\/releases\/org\/panda-lang\/reposilite\/${REPOSILITE_VERSION}\/reposilite-${REPOSILITE_VERSION}-all.jar\r\nelse\r\n curl -o reposilite.jar https:\/\/repo.panda-lang.org\/releases\/org\/panda-lang\/reposilite\/${REPOSILITE_VERSION}\/reposilite-${REPOSILITE_VERSION}.jar\r\nfi", - "container": "debian:buster-slim", + "script": "#!\/bin\/sh\r\n# Switch to mounted directory\r\ncd \/mnt\/server\r\n# Find latest Reposilite version, if needed\r\nif [ \"$REPOSILITE_VERSION\" == \"latest\" ]; then\r\n REPOSILITE_VERSION=$(grep -oPm1 \"(?<=)[^<]+\" <<< \"$(curl -s https:\/\/repo.panda-lang.org\/releases\/org\/panda-lang\/reposilite\/maven-metadata.xml)\")\r\nfi\r\n# Check if -all suffixed jar is available\r\nstatus_code=$(curl --write-out '%{http_code}' -X HEAD -s -o \/dev\/null https:\/\/repo.panda-lang.org\/releases\/org\/panda-lang\/reposilite\/${REPOSILITE_VERSION}\/reposilite-${REPOSILITE_VERSION}-all.jar)\r\n# Download new Reposilite\r\nif [ \"$status_code\" == 200 ]; then\r\n curl -o reposilite.jar https:\/\/repo.panda-lang.org\/releases\/org\/panda-lang\/reposilite\/${REPOSILITE_VERSION}\/reposilite-${REPOSILITE_VERSION}-all.jar\r\nelse\r\n curl -o reposilite.jar https:\/\/repo.panda-lang.org\/releases\/org\/panda-lang\/reposilite\/${REPOSILITE_VERSION}\/reposilite-${REPOSILITE_VERSION}.jar\r\nfi", + "container": "ghcr.io\/pterodactyl\/installers:debian", "entrypoint": "bash" } }, @@ -36,7 +36,7 @@ "description": "The version of Reposilite.", "env_variable": "REPOSILITE_VERSION", "default_value": "latest", - "user_viewable": false, + "user_viewable": true, "user_editable": true, "rules": "required|string" } From 3eb8cd083425ea8d84d090a09b4c3a2cf34991a5 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Wed, 23 Mar 2022 19:49:09 -0700 Subject: [PATCH 0360/1001] Create egg-sftp-storage-share.json --- .../egg-sftp-storage-share.json | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 storage/sftp_storage_share/egg-sftp-storage-share.json diff --git a/storage/sftp_storage_share/egg-sftp-storage-share.json b/storage/sftp_storage_share/egg-sftp-storage-share.json new file mode 100644 index 00000000..34b67947 --- /dev/null +++ b/storage/sftp_storage_share/egg-sftp-storage-share.json @@ -0,0 +1,30 @@ +{ + "_comment": "Pterodactyl SFTP Storage Share Egg ~ David Wolfe (Red-Thirten) ~ 2022-03-14", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "name": "SFTP Storage Share", + "author": "rehlmgaming@gmail.com", + "description": "A simple \"empty\" egg that acts as a private SFTP storage share by utilizing Pterodactyl's built in SFTP system for servers. Sub-users can be added to the server by the owner to allow additional people to access the share. \"Starting\" the server performs no actions and it should be left off.", + "features": null, + "images": [ + "ghcr.io\/parkervcp\/yolks:alpine" + ], + "file_denylist": [], + "startup": "echo -e \"\\n\\n\\033[0;31mThere is no need to start this server. The SFTP service is always running. Feel free to stop the server now.\\n\\t\\033[0;36m(Sub-users can be added via the Users tab to add\/remove access to the share in real time)\\n\\n\"", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": null, + "container": "alpine:3.4", + "entrypoint": "ash" + } + }, + "variables": [] +} \ No newline at end of file From 1f8567cb7e896b9d60b9c3137b02a4ea964e7759 Mon Sep 17 00:00:00 2001 From: PsychoZander <62998704+PsychoZander@users.noreply.github.com> Date: Thu, 31 Mar 2022 08:32:41 +0100 Subject: [PATCH 0361/1001] Create egg-owncast-online.json egg Add an egg for https://owncast.online. Could do with an addition to the install script to scrape and find latest version instead of set version. --- software/owncast/egg-owncast-online.json | 59 ++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 software/owncast/egg-owncast-online.json diff --git a/software/owncast/egg-owncast-online.json b/software/owncast/egg-owncast-online.json new file mode 100644 index 00000000..30cff998 --- /dev/null +++ b/software/owncast/egg-owncast-online.json @@ -0,0 +1,59 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2022-03-31T08:25:53+01:00", + "name": "owncast.online", + "author": "psychoalex@thevcbc.com", + "description": "Owncast is a self-hosted live video and web chat server for use with existing popular broadcasting software.", + "features": null, + "images": [ + "ghcr.io\/pterodactyl\/yolks:debian" + ], + "file_denylist": [], + "startup": ".\/owncast -webserverport {{SERVER_PORT}} -rtmpport {{RTMP_PORT}} -streamkey {{STREAM_KEY}}", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"The web admin interface is available at \/admin.\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n\r\n#Make Server Dir\r\nif [ ! -d \/mnt\/server\/ ]; then\r\n mkdir \/mnt\/server\/\r\nfi\r\ncd \/mnt\/server\/\r\n\r\n#Get Dependencies\r\napt-get -y update\r\napt-get -y install curl unzip tar\r\n\r\n#Get Owncast Install Files\r\ncurl -L https:\/\/github.com\/owncast\/owncast\/releases\/download\/v${OWNCAST_VERSION}\/owncast-${OWNCAST_VERSION}-linux-64bit.zip --output .\/owncast_installer.zip\r\n\r\n#Unzip Install Files\r\nunzip -o -q .\/owncast_installer.zip\r\nrm .\/owncast_installer.zip", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "RTMP Port", + "description": "The port that is used to receive the stream data.", + "env_variable": "RTMP_PORT", + "default_value": "1935", + "user_viewable": true, + "user_editable": false, + "rules": "required|integer" + }, + { + "name": "Stream\/Admin Key", + "description": "This is used to authenticate to the web admin interface, as well as to authenticate your stream.", + "env_variable": "STREAM_KEY", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|min:32|max:128" + }, + { + "name": "Owncast Version", + "description": "The version of Owncast that you would like to install, from https:\/\/github.com\/owncast\/owncast\/releases", + "env_variable": "OWNCAST_VERSION", + "default_value": "0.0.11", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + } + ] +} From fbf314b180ee0b16d454cc919e31f3014bedb12f Mon Sep 17 00:00:00 2001 From: PsychoZander <62998704+PsychoZander@users.noreply.github.com> Date: Thu, 31 Mar 2022 08:37:00 +0100 Subject: [PATCH 0362/1001] Update README.md to include Owncast --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index bbed6550..2dd312ec 100644 --- a/README.md +++ b/README.md @@ -303,3 +303,7 @@ If you are reading this it looks like you are looking to add an egg to your serv ### RabbitMQ * [rabbitmq](/software/rabbitmq) + +### Owncast + +* [owncast](/software/owncast) From b94c6f4f8a7bcf98891306dec5d96ca2885b279c Mon Sep 17 00:00:00 2001 From: PsychoZander <62998704+PsychoZander@users.noreply.github.com> Date: Thu, 31 Mar 2022 08:45:36 +0100 Subject: [PATCH 0363/1001] Create Owncast README.md --- software/owncast/README.md | 51 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 software/owncast/README.md diff --git a/software/owncast/README.md b/software/owncast/README.md new file mode 100644 index 00000000..6d2ea6f6 --- /dev/null +++ b/software/owncast/README.md @@ -0,0 +1,51 @@ +# Owncast + +## From the [Owncast](https://owncast.online) website + +Owncast is a self-hosted live video and web chat server for use with existing popular broadcasting software. + +## Installation + +Follow the common egg installation guide to install the egg on your Pterodactyl instance. +When setting up a server, the version set in the varaible will be used, default is 0.0.11. + +## Configuration + +Configuring Owncast in Pterodactyl can be done by using the command line switches: +* -backupdir string + * Directory where backups will be written to +* -database string + * Path to the database file. +* -enableDebugFeatures + * Enable additional debugging options. +* -enableVerboseLogging + * Enable additional logging. +* -logdir string + * Directory where logs will be written to +* -restoreDatabase string + * Restore an Owncast database backup +* -rtmpport int + * Set listen port for the RTMP server +* -streamkey string + * Set your stream key/admin password +* -webserverip string + * Force web server to listen on this IP address +* -webserverport string + * Force the web server to listen on a specific port + + + +## Update support + +The egg _should_ keep the `data` folder when reinstalling, to prevent destroying the configuration by accident. + +If you want to reset the server completly, remove the `data` directory manually before reinstalling. + +### Server Ports + +Ports required to run the server in a table format. + +| Port | default | +| --------------- | ------- | +| Webserver | 8080 | +| RTMP | 1935 | From 33c34e76475dd76b07547d07e003c3fed22bb3b7 Mon Sep 17 00:00:00 2001 From: PsychoZander <62998704+PsychoZander@users.noreply.github.com> Date: Thu, 31 Mar 2022 10:05:13 +0100 Subject: [PATCH 0364/1001] Update README.md --- software/owncast/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/software/owncast/README.md b/software/owncast/README.md index 6d2ea6f6..a1262166 100644 --- a/software/owncast/README.md +++ b/software/owncast/README.md @@ -47,5 +47,5 @@ Ports required to run the server in a table format. | Port | default | | --------------- | ------- | -| Webserver | 8080 | -| RTMP | 1935 | +| Webserver | 8090 | +| RTMP | 8091 | From 1200e4aeb182ff7074032ba2d84ada7b7ab05bbd Mon Sep 17 00:00:00 2001 From: PsychoZander <62998704+PsychoZander@users.noreply.github.com> Date: Thu, 31 Mar 2022 10:06:04 +0100 Subject: [PATCH 0365/1001] Update default port --- software/owncast/egg-owncast-online.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/owncast/egg-owncast-online.json b/software/owncast/egg-owncast-online.json index 30cff998..59f0025f 100644 --- a/software/owncast/egg-owncast-online.json +++ b/software/owncast/egg-owncast-online.json @@ -32,7 +32,7 @@ "name": "RTMP Port", "description": "The port that is used to receive the stream data.", "env_variable": "RTMP_PORT", - "default_value": "1935", + "default_value": "8091", "user_viewable": true, "user_editable": false, "rules": "required|integer" From 424d230c7c746f50886651a1f33803d63b171127 Mon Sep 17 00:00:00 2001 From: PsychoZander <62998704+PsychoZander@users.noreply.github.com> Date: Thu, 31 Mar 2022 11:33:10 +0100 Subject: [PATCH 0366/1001] Updated to add git release script --- software/owncast/egg-owncast-online.json | 46 +++++++++++++++++++++--- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/software/owncast/egg-owncast-online.json b/software/owncast/egg-owncast-online.json index 59f0025f..f134c898 100644 --- a/software/owncast/egg-owncast-online.json +++ b/software/owncast/egg-owncast-online.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2022-03-31T08:25:53+01:00", + "exported_at": "2022-03-31T11:32:42+01:00", "name": "owncast.online", "author": "psychoalex@thevcbc.com", "description": "Owncast is a self-hosted live video and web chat server for use with existing popular broadcasting software.", @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\n#Make Server Dir\r\nif [ ! -d \/mnt\/server\/ ]; then\r\n mkdir \/mnt\/server\/\r\nfi\r\ncd \/mnt\/server\/\r\n\r\n#Get Dependencies\r\napt-get -y update\r\napt-get -y install curl unzip tar\r\n\r\n#Get Owncast Install Files\r\ncurl -L https:\/\/github.com\/owncast\/owncast\/releases\/download\/v${OWNCAST_VERSION}\/owncast-${OWNCAST_VERSION}-linux-64bit.zip --output .\/owncast_installer.zip\r\n\r\n#Unzip Install Files\r\nunzip -o -q .\/owncast_installer.zip\r\nrm .\/owncast_installer.zip", + "script": "#!\/bin\/bash\r\n\r\n#Make Server Dir\r\nif [ ! -d \/mnt\/server\/ ]; then\r\n mkdir \/mnt\/server\/\r\nfi\r\ncd \/mnt\/server\/\r\n\r\n#Get Dependencies\r\napt-get -y update\r\napt-get -y install curl unzip tar jq\r\n\r\n#Get Owncast Install Files\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_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 -i ${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\necho Download URL is: ${DOWNLOAD_URL}\r\n\r\ncurl -L ${DOWNLOAD_URL} --output .\/owncast_installer.zip\r\n\r\n#curl -L https:\/\/github.com\/owncast\/owncast\/releases\/download\/v${OWNCAST_VERSION}\/owncast-${OWNCAST_VERSION}-linux-64bit.zip --output .\/owncast_installer.zip\r\n\r\n#Unzip Install Files\r\nunzip -o -q .\/owncast_installer.zip\r\nrm .\/owncast_installer.zip", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -48,12 +48,48 @@ }, { "name": "Owncast Version", - "description": "The version of Owncast that you would like to install, from https:\/\/github.com\/owncast\/owncast\/releases", - "env_variable": "OWNCAST_VERSION", - "default_value": "0.0.11", + "description": "The version of Owncast that you would like to install, from https:\/\/github.com\/owncast\/owncast\/releases\r\nAs an Example - \"v0.0.11\" for a specific version or \"latest\" for the most up to date version.", + "env_variable": "VERSION", + "default_value": "latest", "user_viewable": true, "user_editable": true, "rules": "required|string|max:20" + }, + { + "name": "Github Repository", + "description": "Used to identify the github repository to pull the release from.", + "env_variable": "GITHUB_PACKAGE", + "default_value": "owncast\/owncast", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:120" + }, + { + "name": "Github File Match", + "description": "Used to identify the specific asset under a release for download.", + "env_variable": "MATCH", + "default_value": "linux-64bit", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:20" + }, + { + "name": "Github User", + "description": "Required if you are doing more calls than the github anonymous API user allows.", + "env_variable": "GITHUB_USER", + "default_value": "", + "user_viewable": false, + "user_editable": false, + "rules": "nullable|string|max:20" + }, + { + "name": "Github Oauth Token", + "description": "Required if you are doing more calls than the github anonymous API user allows.", + "env_variable": "GITHUB_OAUTH_TOKEN", + "default_value": "", + "user_viewable": false, + "user_editable": false, + "rules": "nullable|string|max:128" } ] } From 716cebb6106190c6db592b3df573031a80fef0d8 Mon Sep 17 00:00:00 2001 From: permanently <7469056+Permanently@users.noreply.github.com> Date: Sat, 2 Apr 2022 20:08:31 +0100 Subject: [PATCH 0367/1001] Removed 'auth' flag Running with the auth flag would give this error: https://paste.md-5.net/imekiqocih.nginx That is all I have to add. Enjoy :p --- database/nosql/mongodb/egg-mongo-d-b.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/nosql/mongodb/egg-mongo-d-b.json b/database/nosql/mongodb/egg-mongo-d-b.json index 45257138..311f157b 100644 --- a/database/nosql/mongodb/egg-mongo-d-b.json +++ b/database/nosql/mongodb/egg-mongo-d-b.json @@ -8,7 +8,7 @@ "author": "parker@parkervcp.com", "description": "MongoDB is a general purpose, document-based, distributed database built for modern application developers and for my butt era.", "image": "quay.io\/parkervcp\/pterodactyl-images:db_mongo-4", - "startup": "mongod --fork --dbpath \/home\/container\/mongodb\/ --port ${SERVER_PORT} --bind_ip 0.0.0.0 --logpath \/home\/container\/logs\/mongo.log -f \/home\/container\/mongod.conf; until nc -z -v -w5 127.0.0.1 ${SERVER_PORT}; do echo 'Waiting for mongodb connection...'; sleep 5; done && mongo --username ${MONGO_USER} --auth --password ${MONGO_USER_PASS} --host 127.0.0.1:${SERVER_PORT} && mongo --eval \"db.getSiblingDB('admin').shutdownServer()\" 127.0.0.1:${SERVER_PORT}", + "startup": "mongod --fork --dbpath \/home\/container\/mongodb\/ --port ${SERVER_PORT} --bind_ip 0.0.0.0 --logpath \/home\/container\/logs\/mongo.log -f \/home\/container\/mongod.conf; until nc -z -v -w5 127.0.0.1 ${SERVER_PORT}; do echo 'Waiting for mongodb connection...'; sleep 5; done && mongo --username ${MONGO_USER} --password ${MONGO_USER_PASS} --host 127.0.0.1:${SERVER_PORT} && mongo --eval \"db.getSiblingDB('admin').shutdownServer()\" 127.0.0.1:${SERVER_PORT}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"child process started successfully\"\r\n}", From b8b0eb0c3df181a8b7acf5ad6a145477a4570f91 Mon Sep 17 00:00:00 2001 From: 1euro7cent Date: Wed, 6 Apr 2022 15:59:34 +0200 Subject: [PATCH 0368/1001] languagetool stuff --- software/languagetool/README.md | 6 +++++- software/languagetool/egg-languagetool.json | 10 +++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/software/languagetool/README.md b/software/languagetool/README.md index 8f6a1145..7c5a6602 100644 --- a/software/languagetool/README.md +++ b/software/languagetool/README.md @@ -1,5 +1,9 @@ # LanguageTool -LanguageTool is an Open Source proofreading software for English, French, German, Polish, Russian, [and more than 20 other languages](https://languagetool.org/languages/). It finds many errors that a simple spell checker cannot detect. +LanguageTool is an Open Source proofreading software for English, French, German, Polish, Russian, [and more than 20 other languages](https://languagetool.org/languages/). It finds many errors that a simple spell checker cannot find. View https://languagetool.org for more information. + +Requires one prt for comunication. + +Try `addr:port/v2/check?language=en-US&text=this+is+a+test` to test diff --git a/software/languagetool/egg-languagetool.json b/software/languagetool/egg-languagetool.json index 2c302986..ee0ec9a9 100644 --- a/software/languagetool/egg-languagetool.json +++ b/software/languagetool/egg-languagetool.json @@ -4,10 +4,10 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-09-20T17:08:06+02:00", - "name": "Languagetool", + "exported_at": "2022-04-06T15:54:35+02:00", + "name": "LanguageTool", "author": "thomasruhl@live.de", - "description": "This egg installs a LanguageTool server\r\n\r\nLanguageTool is an Open Source proofreading software for English, French, German, Polish, Russian, and more than 20 other languages. It finds many errors that a simple spell checker cannot detect.\r\n\r\nView https:\/\/languagetool.org for more information.", + "description": "This egg installs a LanguageTool server\r\n\r\nLanguageTool is an Open Source proofreading software for English, French, German, Polish, Russian, and more than 20 other languages. It finds many errors that a simple spell checker cannot find.\r\n\r\nView https:\/\/languagetool.org for more information.", "features": null, "images": [ "ghcr.io\/pterodactyl\/yolks:java_8" @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\napk add --no-cache unzip # to make shure the unzipper is working properly\r\nmkdir -p \/mnt\/server\r\nmkdir -p \/mnt\/server\/models\r\ncd \/mnt\/server\r\ntouch config.properties\r\nMODEL_URL=\"https:\/\/languagetool.org\/download\/ngram-data\"\r\n\r\necho downloading models\r\n\r\ncd models\/\r\nfor i in $TRAIN_MODELS; do\r\n DOWNLOAD_LINK=\"$MODEL_URL\/ngrams-$i.zip\"\r\n echo \"downloading $DOWNLOAD_LINK\"\r\n echo \"this could take some while\"\r\n curl $DOWNLOAD_LINK --output $i.zip\r\n echo \"unziping $i.zip\"\r\n unzip $i.zip\r\n rm $i.zip\r\ndone\r\ncd \/mnt\/server\r\n\r\ncurl https:\/\/languagetool.org\/download\/LanguageTool-stable.zip --output download.zip\r\necho unziping\r\nunzip download.zip\r\necho moving files\r\n\r\ncp -r LanguageTool-*\/* .\r\n\r\nrm -rf LanguageTool-*\r\nrm download.zip -rf\r\necho Finished install", + "script": "#!\/bin\/ash\r\napk add --no-cache unzip # to make shure the unzipper is working properly\r\nmkdir -p \/mnt\/server\r\nmkdir -p \/mnt\/server\/models\r\ntouch config.properties\r\n\r\n# if TRAIN_MODELS has content install them\r\nif [ -n TRAIN_MODELS ]; then\r\n\r\n content=$(curl -L https:\/\/languagetool.org\/download\/ngram-data\/)\r\n\r\n links=$(echo \"$content\" | grep -o '' | sed 's\/\/\/')\r\n echo $links\r\n\r\n cd \/mnt\/server\/models\r\n for model in $TRAIN_MODELS; do\r\n echo \"$model\"\r\n for link in $links; do\r\n # echo \" $link\"\r\n if [[ $link == *\"-$model-\"* ]]; then\r\n fullLink=\"https:\/\/languagetool.org\/download\/ngram-data\/$link\"\r\n echo \"Downloading $fullLink\"\r\n echo \"this could take some while\"\r\n curl $fullLink --output $model.zip\r\n echo \"unziping $model.zip\"\r\n unzip $model.zip\r\n rm $model.zip\r\n fi\r\n done\r\n done\r\nfi\r\n\r\n# main languagetool install\r\ncd \/mnt\/server\r\n\r\necho \"downloading languagetool\"\r\ncurl https:\/\/languagetool.org\/download\/LanguageTool-stable.zip --output download.zip\r\necho unziping\r\nunzip download.zip\r\necho moving files\r\n\r\ncp -r LanguageTool-*\/* .\r\n\r\nrm -rf LanguageTool-*\r\nrm download.zip -rf\r\n\r\necho Finished install", "container": "ghcr.io\/pterodactyl\/installers:alpine", "entrypoint": "ash" } @@ -30,7 +30,7 @@ "variables": [ { "name": "Include traindata", - "description": "This takes up a lot of disk space.\r\n\r\nSeparate each value with spaces. For example, \"de-20150819 en-20150817\"\r\n\r\nView all available models at https:\/\/languagetool.org\/download\/ngram-data\/", + "description": "This takes up a lot of disk space. I'm talking about multiple gigabytes. \r\n\r\nSeparate each value with spaces. For example, \"de en\". \r\n\r\nView all available models at https:\/\/languagetool.org\/download\/ngram-data\/", "env_variable": "TRAIN_MODELS", "default_value": "", "user_viewable": true, From 53818f35a041bfa72668917096b2efc434cd36c5 Mon Sep 17 00:00:00 2001 From: 1euro7cent Date: Wed, 6 Apr 2022 17:27:48 +0200 Subject: [PATCH 0369/1001] updated requested change --- software/languagetool/egg-languagetool.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/software/languagetool/egg-languagetool.json b/software/languagetool/egg-languagetool.json index ee0ec9a9..026432e4 100644 --- a/software/languagetool/egg-languagetool.json +++ b/software/languagetool/egg-languagetool.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2022-04-06T15:54:35+02:00", + "exported_at": "2022-04-06T17:26:12+02:00", "name": "LanguageTool", "author": "thomasruhl@live.de", "description": "This egg installs a LanguageTool server\r\n\r\nLanguageTool is an Open Source proofreading software for English, French, German, Polish, Russian, and more than 20 other languages. It finds many errors that a simple spell checker cannot find.\r\n\r\nView https:\/\/languagetool.org for more information.", @@ -30,7 +30,7 @@ "variables": [ { "name": "Include traindata", - "description": "This takes up a lot of disk space. I'm talking about multiple gigabytes. \r\n\r\nSeparate each value with spaces. For example, \"de en\". \r\n\r\nView all available models at https:\/\/languagetool.org\/download\/ngram-data\/", + "description": "This uses many gigabytes of disk space. \r\n\r\nSeparate each value with spaces. For example, \"de en\". \r\n\r\nView all available models at https:\/\/languagetool.org\/download\/ngram-data\/", "env_variable": "TRAIN_MODELS", "default_value": "", "user_viewable": true, From 2c738f899243fe5f1833744c60cd3fda082f4ef1 Mon Sep 17 00:00:00 2001 From: CDE <73063460+CDE90@users.noreply.github.com> Date: Sun, 17 Apr 2022 16:58:05 +0100 Subject: [PATCH 0370/1001] Create README.md --- bots/discord/rust/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 bots/discord/rust/README.md diff --git a/bots/discord/rust/README.md b/bots/discord/rust/README.md new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/bots/discord/rust/README.md @@ -0,0 +1 @@ + From 68a37908f4d23e20e86e117a283bcf95a6aeaef5 Mon Sep 17 00:00:00 2001 From: CDE <73063460+CDE90@users.noreply.github.com> Date: Sun, 17 Apr 2022 16:58:14 +0100 Subject: [PATCH 0371/1001] Add files via upload --- bots/discord/rust/egg-serenity.json | 89 +++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 bots/discord/rust/egg-serenity.json diff --git a/bots/discord/rust/egg-serenity.json b/bots/discord/rust/egg-serenity.json new file mode 100644 index 00000000..b872cead --- /dev/null +++ b/bots/discord/rust/egg-serenity.json @@ -0,0 +1,89 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2022-04-17T16:56:51+01:00", + "name": "Serenity", + "author": "unknown@unknown.com", + "description": "Creates a container that runs rust.", + "features": null, + "images": [ + "ghcr.io\/parkervcp\/yolks:rust_1.31", + "ghcr.io\/parkervcp\/yolks:rust_1.56", + "ghcr.io\/parkervcp\/yolks:rust_1.60", + "ghcr.io\/parkervcp\/yolks:rust_latest" + ], + "file_denylist": [], + "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; cargo run --release", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": [\r\n \"Finished\"\r\n ]\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# Rust Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\n## add git ending if it's not on the address\r\nif [[ ${GIT_ADDRESS} != *.git ]]; then\r\n GIT_ADDRESS=${GIT_ADDRESS}.git\r\nfi\r\n\r\nif [ -z \"${USERNAME}\" ] && [ -z \"${ACCESS_TOKEN}\" ]; then\r\n echo -e \"using anon api call\"\r\nelse\r\n GIT_ADDRESS=\"https:\/\/${USERNAME}:${ACCESS_TOKEN}@$(echo -e ${GIT_ADDRESS} | cut -d\/ -f3-)\"\r\nfi\r\n\r\n## pull git js bot repo\r\nif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n echo -e \"\/mnt\/server directory is not empty.\"\r\n if [ -d .git ]; then\r\n echo -e \".git directory exists\"\r\n if [ -f .git\/config ]; then\r\n echo -e \"loading info from git config\"\r\n ORIGIN=$(git config --get remote.origin.url)\r\n else\r\n echo -e \"files found with no git config\"\r\n echo -e \"closing out without touching things to not break anything\"\r\n exit 10\r\n fi\r\n fi\r\n\r\n if [ \"${ORIGIN}\" == \"${GIT_ADDRESS}\" ]; then\r\n echo \"pulling latest from github\"\r\n git pull\r\n fi\r\nelse\r\n echo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n if [ -z ${BRANCH} ]; then\r\n echo -e \"cloning default branch\"\r\n git clone ${GIT_ADDRESS} .\r\n else\r\n echo -e \"cloning ${BRANCH}'\"\r\n git clone --single-branch --branch ${BRANCH} ${GIT_ADDRESS} .\r\n fi\r\n\r\nfi\r\n\r\nexport HOME=\/mnt\/server\r\n\r\necho -e \"install complete\"\r\nexit 0", + "container": "rust:1.60.0-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Git Repo Address", + "description": "Git repo to clone\r\n\r\nI.E. https:\/\/github.com\/parkervcp\/repo_name", + "env_variable": "GIT_ADDRESS", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Git Branch", + "description": "What branch to pull from github.\r\n\r\nDefault is blank to pull the repo default branch", + "env_variable": "BRANCH", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Auto Update", + "description": "Pull the latest files on startup when using a GitHub repo.", + "env_variable": "AUTO_UPDATE", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "required|boolean" + }, + { + "name": "Git Username", + "description": "Username to auth with git.", + "env_variable": "USERNAME", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Git Access Token", + "description": "Password to use with git.\r\n\r\nIt's best practice to use a Personal Access Token.\r\nhttps:\/\/github.com\/settings\/tokens\r\nhttps:\/\/gitlab.com\/-\/profile\/personal_access_tokens", + "env_variable": "ACCESS_TOKEN", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Bot Token", + "description": "The discord token used to run your bot. Sets to the environment variable `DISCORD_TOKEN`\r\n\r\nAlternatively, you can use a .env file", + "env_variable": "DISCORD_TOKEN", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + } + ] +} \ No newline at end of file From 774240d75c499fb24a29383bf8a6f59a46e37574 Mon Sep 17 00:00:00 2001 From: CDE <73063460+CDE90@users.noreply.github.com> Date: Sun, 17 Apr 2022 17:00:25 +0100 Subject: [PATCH 0372/1001] Update README.md --- bots/discord/rust/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bots/discord/rust/README.md b/bots/discord/rust/README.md index 8b137891..ea822c9c 100644 --- a/bots/discord/rust/README.md +++ b/bots/discord/rust/README.md @@ -1 +1,3 @@ +# serenity generic +This egg is designed to run any generic Rust application, allowing users to pull their own Rust discord bot from a GitHub repository. From 274ab72e20a35215f83692d9bd15b4c2813a7d60 Mon Sep 17 00:00:00 2001 From: CDE90 Date: Sun, 17 Apr 2022 17:01:41 +0100 Subject: [PATCH 0373/1001] Change directory name --- bots/discord/{rust => serenity}/README.md | 0 bots/discord/{rust => serenity}/egg-serenity.json | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename bots/discord/{rust => serenity}/README.md (100%) rename bots/discord/{rust => serenity}/egg-serenity.json (100%) diff --git a/bots/discord/rust/README.md b/bots/discord/serenity/README.md similarity index 100% rename from bots/discord/rust/README.md rename to bots/discord/serenity/README.md diff --git a/bots/discord/rust/egg-serenity.json b/bots/discord/serenity/egg-serenity.json similarity index 100% rename from bots/discord/rust/egg-serenity.json rename to bots/discord/serenity/egg-serenity.json From 4305e63bd2d13551a610f72e33445b28149a580a Mon Sep 17 00:00:00 2001 From: CDE <73063460+CDE90@users.noreply.github.com> Date: Sun, 17 Apr 2022 17:02:37 +0100 Subject: [PATCH 0374/1001] Update egg-serenity.json --- bots/discord/serenity/egg-serenity.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bots/discord/serenity/egg-serenity.json b/bots/discord/serenity/egg-serenity.json index b872cead..dd3ffc2d 100644 --- a/bots/discord/serenity/egg-serenity.json +++ b/bots/discord/serenity/egg-serenity.json @@ -6,7 +6,7 @@ }, "exported_at": "2022-04-17T16:56:51+01:00", "name": "Serenity", - "author": "unknown@unknown.com", + "author": "ethan.coward@icloud.com", "description": "Creates a container that runs rust.", "features": null, "images": [ @@ -86,4 +86,4 @@ "rules": "nullable|string" } ] -} \ No newline at end of file +} From eda031989bb5328d3a62258ec3ea14da093c9dbf Mon Sep 17 00:00:00 2001 From: CDE90 Date: Sun, 17 Apr 2022 17:05:39 +0100 Subject: [PATCH 0375/1001] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index bbed6550..60db1621 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [parkertron](/bots/discord/parkertron) Golang * [pixel-bot](/bots/discord/pixelbot) Python * [Redbot](/bots/discord/redbot) Python +* [serenity](/bots/discord/serenity) Rust * [SinusBot](/bots/discord/sinusbot) [Other](/bots/other) From e6ee11076c1bdcb7c4a06392aa85ee1b183a67b5 Mon Sep 17 00:00:00 2001 From: CDE90 Date: Sun, 17 Apr 2022 20:37:32 +0100 Subject: [PATCH 0376/1001] Rename egg to discord.rs --- README.md | 2 +- bots/discord/discord.rs/README.md | 3 +++ .../egg-discord-rs-generic.json} | 4 ++-- bots/discord/serenity/README.md | 3 --- 4 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 bots/discord/discord.rs/README.md rename bots/discord/{serenity/egg-serenity.json => discord.rs/egg-discord-rs-generic.json} (97%) delete mode 100644 bots/discord/serenity/README.md diff --git a/README.md b/README.md index 60db1621..97fc6a17 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [discord.java](bots/discord/discord.java) Java generic * [discord.js](bots/discord/discord.js) Node JS generic * [discord.py](bots/discord/discord.py) Python generic +* [discord.rs](bots/discord/discord.rs) Rust generic * [Dynamica](/bots/discord/dynamica) Node JS * [fragbot](/bots/discord/fragbot) Golang * [JMusicBot](/bots/discord/jmusicbot) Java @@ -40,7 +41,6 @@ If you are reading this it looks like you are looking to add an egg to your serv * [parkertron](/bots/discord/parkertron) Golang * [pixel-bot](/bots/discord/pixelbot) Python * [Redbot](/bots/discord/redbot) Python -* [serenity](/bots/discord/serenity) Rust * [SinusBot](/bots/discord/sinusbot) [Other](/bots/other) diff --git a/bots/discord/discord.rs/README.md b/bots/discord/discord.rs/README.md new file mode 100644 index 00000000..5e9499f7 --- /dev/null +++ b/bots/discord/discord.rs/README.md @@ -0,0 +1,3 @@ +# discord.rs generic + +This egg is designed to run any generic Rust application with cargo, allowing users to pull their own Rust discord bot from a GitHub repository. diff --git a/bots/discord/serenity/egg-serenity.json b/bots/discord/discord.rs/egg-discord-rs-generic.json similarity index 97% rename from bots/discord/serenity/egg-serenity.json rename to bots/discord/discord.rs/egg-discord-rs-generic.json index dd3ffc2d..c16f8195 100644 --- a/bots/discord/serenity/egg-serenity.json +++ b/bots/discord/discord.rs/egg-discord-rs-generic.json @@ -5,9 +5,9 @@ "update_url": null }, "exported_at": "2022-04-17T16:56:51+01:00", - "name": "Serenity", + "name": "discord.rs generic", "author": "ethan.coward@icloud.com", - "description": "Creates a container that runs rust.", + "description": "Creates a container that runs rust with cargo.", "features": null, "images": [ "ghcr.io\/parkervcp\/yolks:rust_1.31", diff --git a/bots/discord/serenity/README.md b/bots/discord/serenity/README.md deleted file mode 100644 index ea822c9c..00000000 --- a/bots/discord/serenity/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# serenity generic - -This egg is designed to run any generic Rust application, allowing users to pull their own Rust discord bot from a GitHub repository. From 0e7afcddd5c528156ebeca5bf539d5ee0c86c72c Mon Sep 17 00:00:00 2001 From: Grant <99215336+runbgp@users.noreply.github.com> Date: Sun, 17 Apr 2022 17:19:42 -0400 Subject: [PATCH 0377/1001] refactor(BeamMP): Use new config file and add variables --- game_eggs/beamng/beammp/beammp.json | 68 ++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 16 deletions(-) diff --git a/game_eggs/beamng/beammp/beammp.json b/game_eggs/beamng/beammp/beammp.json index 83c088a5..18388a3c 100644 --- a/game_eggs/beamng/beammp/beammp.json +++ b/game_eggs/beamng/beammp/beammp.json @@ -4,10 +4,10 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-12-22T09:10:34+00:00", - "name": "BeamMP Servers", - "author": "noah@noahserver.online", - "description": "This is the server for the multiplayer mod BeamMP for the game BeamNG.drive. The server is the point throug which all clients communicate. You can write lua mods for the server, detailed instructions on the BeamMP Wiki.", + "exported_at": "2022-04-17T16:09:38-05:00", + "name": "BeamMP", + "author": "me@grnt.dev", + "description": "Servers are an integral part of BeamMP; players are connected to each other through the server. They run natively on Windows and Linux. This Pterodactyl Egg makes it easier than ever to get a server up and running.\r\n\r\nYou can make private servers, which only people you invite can join, or public servers, which will show in our official server list.\r\n\r\nYou can read more about BeamMP Servers here https:\/\/wiki.beammp.com\/en\/home\/Server_Mod", "features": null, "images": [ "ghcr.io\/parkervcp\/yolks:debian" @@ -15,45 +15,81 @@ "file_denylist": [], "startup": ".\/BeamMP-Server", "config": { - "files": "{\r\n \"Server.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"MaxPlayers\": \"MaxPlayers = {{server.build.env.MAX_PLAYER}}\",\r\n \"Port\": \"Port = {{server.build.default.port}}\",\r\n \"AuthKey =\": \"AuthKey = \\\"{{env.AUTH}}\\\"\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"ServerConfig.toml\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"Name =\": \"Name = \\\"{{env.NAME}}\\\"\",\r\n \"Port =\": \"Port = {{server.build.default.port}}\",\r\n \"AuthKey =\": \"AuthKey = \\\"{{env.AUTHKEY}}\\\"\",\r\n \"Private =\": \"Private = {{env.PRIVATE}}\",\r\n \"MaxPlayers =\": \"MaxPlayers = {{server.build.env.MAX_PLAYERS}}\",\r\n \"Description =\": \"Description = \\\"{{env.NAME}}\\\"\",\r\n \"MaxCars =\": \"MaxCars = {{env.MAX_CARS}}\",\r\n \"Map =\": \"Map = \\\"{{env.MAP}}\\\"\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"[INFO] Vehicle data network online\"\r\n}", "logs": "{}", "stop": "^C" }, "scripts": { "installation": { - "script": "mkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nrm -f BeamMP-Server\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/BeamMP\/BeamMP-Server\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/BeamMP\/BeamMP-Server\/releases\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n echo -e \"Using latest version\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i Server-linux)\r\nelse\r\n echo -e \"Chosen version :${VERSION}. Verifying version from releases\"\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 -i Server-linux)\r\n else\r\n echo -e \"No valid versions found. Defaulting to the latest release\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\necho -e \"Running curl -sSL ${DOWNLOAD_URL} -o BeamMP-Server\"\r\ncurl -L ${DOWNLOAD_URL} -o BeamMP-Server\r\nchmod +x BeamMP-Server\r\n\r\necho \"# This is the BeamMP Server Configuration File v0.60\r\nDebug = false # true or false to enable debug console output\r\nPrivate = true # Private?\r\nPort = 30814 # Port to run the server on UDP and TCP\r\nCars = 1 # Max cars for every player\r\nMaxPlayers = 10 # Maximum Amount of Clients\r\nMap = \\\"\/levels\/gridmap\/info.json\\\" # Default Map\r\nName = \\\"BeamMP New Server\\\" # Server Name\r\nDesc = \\\"BeamMP Default Description\\\" # Server Description\r\nuse = \\\"Resources\\\" # Resource file name\r\nAuthKey = \\\"\\\" # Auth Key\" > Server.cfg", + "script": "#Create the server directory\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\n#Remove any old versions\r\nrm -f BeamMP-Server\r\n\r\n#Check for latest release & download URLs\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/BeamMP\/BeamMP-Server\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/BeamMP\/BeamMP-Server\/releases\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n echo -e \"Using latest BeamMP server version\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i Server-linux)\r\nelse\r\n echo -e \"Chosen version :${VERSION}. Verifying version from releases\"\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 -i Server-linux)\r\n else\r\n echo -e \"No valid versions found. Defaulting to the latest release\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\n#Download the BeamMP server binary\r\necho -e \"Running curl -sSL ${DOWNLOAD_URL} -o BeamMP-Server\"\r\ncurl -L ${DOWNLOAD_URL} -o BeamMP-Server\r\nchmod +x BeamMP-Server\r\n\r\n#Create a default configuration file\r\necho \"[HTTP]\r\n# Recommended to keep enabled. With SSL the server will serve https and requires valid key and cert files\r\nUseSSL = true\r\n# Enables the internal HTTP server\r\nHTTPServerEnabled = false\r\nSSLKeyPath = \\\".\/.ssl\/HttpServer\/key.pem\\\"\r\nHTTPServerPort = 8080\r\nSSLCertPath = \\\".\/.ssl\/HttpServer\/cert.pem\\\"\r\n\r\n[General]\r\n# If SendErrors is `true`, the server will send helpful info about crashes and other issues back to the BeamMP developers. This info may include your config, who is on your server at the time of the error, and similar general information. This kind of data is vital in helping us diagnose and fix issues faster. This has no impact on server performance. You can opt-out of this system by setting this to `false`\r\nSendErrorsShowMessage = true\r\nName = \\\"BeamMP Server\\\"\r\nPort = 30814\r\nResourceFolder = \\\"Resources\\\"\r\n# AuthKey has to be filled out in order to run the server\r\nAuthKey = \\\"\\\"\r\nPrivate = true\r\nMaxPlayers = 10\r\nDebug = false\r\nDescription = \\\"BeamMP Default Description\\\"\r\nMaxCars = 1\r\nMap = \\\"\/levels\/gridmap_v2\/info.json\\\"\r\n# You can turn on\/off the SendErrors message you get on startup here\r\nSendErrors = true\" > ServerConfig.toml", "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, "variables": [ { - "name": "Version to install", - "description": "Latest or invalid versions would default to latest. See all versions visit https:\/\/github.com\/BeamMP\/BeamMP-Server\/releases", + "name": "Server Name", + "description": "The name of your server. This is what appears on the server list.", + "env_variable": "NAME", + "default_value": "BeamMP Server", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:64" + }, + { + "name": "BeamMP Server Version", + "description": "The BeamMP server version to be installed. Latest or invalid versions will default to latest. See all available versions at https:\/\/github.com\/BeamMP\/BeamMP-Server\/releases", "env_variable": "VERSION", "default_value": "latest", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:32" + "rules": "required|string|max:8" }, { "name": "Authentication Key", - "description": "BeamMP Server Key (https:\/\/beamng-mp.com\/k\/keys)", - "env_variable": "AUTH", + "description": "The authentication key for your server. A key can be obtained from the BeamMP keymaster at https:\/\/beamng-mp.com\/k\/dashboard", + "env_variable": "AUTHKEY", "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:50" + "rules": "required|string|max:64" }, { "name": "Max Players", - "description": "The maximum number of allowed players", - "env_variable": "MAX_PLAYER", + "description": "The maximum number of players allowed on the server.", + "env_variable": "MAX_PLAYERS", "default_value": "6", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:32" + "rules": "required|integer|max:100" + }, + { + "name": "Private", + "description": "Should the server be private?", + "env_variable": "PRIVATE", + "default_value": "false", + "user_viewable": true, + "user_editable": true, + "rules": "required|string" + }, + { + "name": "Max Cars", + "description": "The maximum number of cars allowed to be spawned per player.", + "env_variable": "MAX_CARS", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|max:4" + }, + { + "name": "Map", + "description": "The map for your server. Stock maps are listed below.\r\n\r\n\/levels\/gridmap_v2\/info.json\r\n\/levels\/automation_test_track\/info.json\r\n\/levels\/east_coast_usa\/info.json\r\n\/levels\/hirochi_raceway\/info.json\r\n\/levels\/italy\/info.json\r\n\/levels\/jungle_rock_island\/info.json\r\n\/levels\/industrial\/info.json\r\n\/levels\/small_island\/info.json\r\n\/levels\/smallgrid\/info.json\r\n\/levels\/utah\/info.json\r\n\/levels\/west_coast_usa\/info.json\r\n\/levels\/driver_training\/info.json\r\n\/levels\/derby\/info.json", + "env_variable": "MAP", + "default_value": "\/levels\/gridmap_v2\/info.json", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:64" } ] -} +} \ No newline at end of file From effed6d573260e133a970e5cef6d054b4a5a9515 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Mon, 18 Apr 2022 15:37:14 +0200 Subject: [PATCH 0378/1001] Fix Image for ARM64 --- voice_servers/lavalink/egg-lavalink.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/voice_servers/lavalink/egg-lavalink.json b/voice_servers/lavalink/egg-lavalink.json index 29b3a673..77b2effa 100644 --- a/voice_servers/lavalink/egg-lavalink.json +++ b/voice_servers/lavalink/egg-lavalink.json @@ -10,7 +10,7 @@ "description": "Standalone audio sending node based on Lavaplayer and JDA-Audio. Allows for sending audio without it ever reaching any of your shards.\r\nDescription taken from https:\/\/github.com\/Frederikam\/Lavalink", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-13" + "ghcr.io/parkervcp/yolks:java_11" ], "file_denylist": [], "startup": "java -jar Lavalink.jar", @@ -28,4 +28,4 @@ } }, "variables": [] -} \ No newline at end of file +} From c69183d5b0ab92f7fb01183d12e203fe4809a7dc Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Mon, 18 Apr 2022 15:43:50 +0200 Subject: [PATCH 0379/1001] Update egg-lavalink.json --- voice_servers/lavalink/egg-lavalink.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/voice_servers/lavalink/egg-lavalink.json b/voice_servers/lavalink/egg-lavalink.json index 77b2effa..5fee7eba 100644 --- a/voice_servers/lavalink/egg-lavalink.json +++ b/voice_servers/lavalink/egg-lavalink.json @@ -23,7 +23,7 @@ "scripts": { "installation": { "script": "#!\/bin\/bash\r\n# NodeJS Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git curl\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\ncurl -L -o Lavalink.jar https:\/\/github.com\/freyacodes\/Lavalink\/releases\/latest\/download\/Lavalink.jar\r\n\r\ncurl -L -o application.yml https:\/\/raw.githubusercontent.com\/freyacodes\/Lavalink\/master\/LavalinkServer\/application.yml.example\r\n\r\necho -e \"install complete\"\r\nexit 0", - "container": "debian:buster-slim", + "container": "debian:bullseye-slim", "entrypoint": "bash" } }, From a58975246d8f781dfc4644f883d5c4b6d2b39775 Mon Sep 17 00:00:00 2001 From: CDE <73063460+CDE90@users.noreply.github.com> Date: Tue, 19 Apr 2022 13:33:12 +0000 Subject: [PATCH 0380/1001] Update installation script container --- bots/discord/discord.rs/egg-discord-rs-generic.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bots/discord/discord.rs/egg-discord-rs-generic.json b/bots/discord/discord.rs/egg-discord-rs-generic.json index c16f8195..2457cfa5 100644 --- a/bots/discord/discord.rs/egg-discord-rs-generic.json +++ b/bots/discord/discord.rs/egg-discord-rs-generic.json @@ -26,7 +26,7 @@ "scripts": { "installation": { "script": "#!\/bin\/bash\r\n# Rust Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\n## add git ending if it's not on the address\r\nif [[ ${GIT_ADDRESS} != *.git ]]; then\r\n GIT_ADDRESS=${GIT_ADDRESS}.git\r\nfi\r\n\r\nif [ -z \"${USERNAME}\" ] && [ -z \"${ACCESS_TOKEN}\" ]; then\r\n echo -e \"using anon api call\"\r\nelse\r\n GIT_ADDRESS=\"https:\/\/${USERNAME}:${ACCESS_TOKEN}@$(echo -e ${GIT_ADDRESS} | cut -d\/ -f3-)\"\r\nfi\r\n\r\n## pull git js bot repo\r\nif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n echo -e \"\/mnt\/server directory is not empty.\"\r\n if [ -d .git ]; then\r\n echo -e \".git directory exists\"\r\n if [ -f .git\/config ]; then\r\n echo -e \"loading info from git config\"\r\n ORIGIN=$(git config --get remote.origin.url)\r\n else\r\n echo -e \"files found with no git config\"\r\n echo -e \"closing out without touching things to not break anything\"\r\n exit 10\r\n fi\r\n fi\r\n\r\n if [ \"${ORIGIN}\" == \"${GIT_ADDRESS}\" ]; then\r\n echo \"pulling latest from github\"\r\n git pull\r\n fi\r\nelse\r\n echo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n if [ -z ${BRANCH} ]; then\r\n echo -e \"cloning default branch\"\r\n git clone ${GIT_ADDRESS} .\r\n else\r\n echo -e \"cloning ${BRANCH}'\"\r\n git clone --single-branch --branch ${BRANCH} ${GIT_ADDRESS} .\r\n fi\r\n\r\nfi\r\n\r\nexport HOME=\/mnt\/server\r\n\r\necho -e \"install complete\"\r\nexit 0", - "container": "rust:1.60.0-slim", + "container": "debian:buster-slim", "entrypoint": "bash" } }, From d412e4fb79c8b64259eb60db3495a2fbe3b60a33 Mon Sep 17 00:00:00 2001 From: Charles Morgan Date: Thu, 21 Apr 2022 00:25:47 -0700 Subject: [PATCH 0381/1001] Update README.md (#1618) Update minecraft links --- game_eggs/minecraft/README.md | 66 +++++++++++++++++------------------ 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/game_eggs/minecraft/README.md b/game_eggs/minecraft/README.md index e10d63b2..3e8fca16 100644 --- a/game_eggs/minecraft/README.md +++ b/game_eggs/minecraft/README.md @@ -13,39 +13,39 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, ## [Java](java) Servers for Java Minecraft -* [Airplane](minecraft/java/airplane) -* [Cuberite](minecraft/java/cuberite) -* [Fabric](minecraft/java/fabric) -* [Feather](minecraft/java/feather) -* [Forge](minecraft/java/forge) - * [Forge](minecraft/java/forge/forge) - * [CusreForge Generic](minecraft/java/forge/curseforge-generic) -* [Feed The Beast](minecraft/java/ftb) -* [Glowstone](/minecraft/java/glowstone) -* [Krypton](/minecraft/java/krypton) -* [Magma](minecraft/java/magma) -* [Mohist](minecraft/java/mohist) -* [NanoLimbo](/minecraft/java/nanolimbo) -* [Paper](minecraft/java/paper) -* [Purpur](minecraft/java/purpur) -* [Spigot](minecraft/java/spigot) -* [SpongeForge](minecraft/java/spongeforge) -* [SpongeVanilla](minecraft/java/spongevanilla) -* [Technic](minecraft/java/technic) -* [Tuinity](minecraft/java/tuinity) -* [VanillaCord](minecraft/java/vanillacord) +* [Airplane](java/airplane) +* [Cuberite](java/cuberite) +* [Fabric](java/fabric) +* [Feather](java/feather) +* [Forge](java/forge) + * [Forge](java/forge/forge) + * [CusreForge Generic](java/forge/curseforge-generic) +* [Feed The Beast](java/ftb) +* [Glowstone](java/glowstone) +* [Krypton](java/krypton) +* [Magma](java/magma) +* [Mohist](java/mohist) +* [NanoLimbo](java/nanolimbo) +* [Paper](java/paper) +* [Purpur](java/purpur) +* [Spigot](java/spigot) +* [SpongeForge](java/spongeforge) +* [SpongeVanilla](/java/spongevanilla) +* [Technic](java/technic) +* [Tuinity](java/tuinity) +* [VanillaCord](java/vanillacord) ## [Proxies](proxy) Minecraft Server Proxies -* [Bedrock](minecraft/proxy/bedrock) - * [Waterdog PE](minecraft/proxy/bedrock/waterdog_pe) -* [Cross Platform](minecraft/proxy/cross_platform) - * [GeyserMC](minecraft/proxy/cross_platform/geyser) - * [Waterdog](minecraft/proxy/cross_platform/waterdog) -* [Java](minecraft/proxy/java) - * [FlameCord](minecraft/proxy/java/flamecord) - * [Travertine](minecraft/proxy/java/travertine) - * [TyphoonLimbo](minecraft/proxy/java/typhoonlimbo) - * [Velocity](minecraft/proxy/java/velocity) - * [VIAaas](minecraft/proxy/java/viaaas) - * [Waterfall](minecraft/proxy/java/waterfall) \ No newline at end of file +* [Bedrock](proxy/bedrock) + * [Waterdog PE](proxy/bedrock/waterdog_pe) +* [Cross Platform](proxy/cross_platform) + * [GeyserMC](proxy/cross_platform/geyser) + * [Waterdog](proxy/cross_platform/waterdog) +* [Java](proxy/java) + * [FlameCord](proxy/java/flamecord) + * [Travertine](proxy/java/travertine) + * [TyphoonLimbo](proxy/java/typhoonlimbo) + * [Velocity](proxy/java/velocity) + * [VIAaas](proxy/java/viaaas) + * [Waterfall](proxy/java/waterfall) From 9ac7d4860dea989e1cf6247459ffc2b679e6f96d Mon Sep 17 00:00:00 2001 From: TuEye Date: Sat, 23 Apr 2022 15:26:04 +0200 Subject: [PATCH 0382/1001] * Made egg compatible to Nitrox 1.6.0.0 * Using parkers script to determine Nitrox Downnload-URL * Moved to yolks * Made Admin Password longer and required --- .../subnautica_nitrox_mod/egg-subnautica.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/game_eggs/steamcmd_servers/subnautica_nitrox_mod/egg-subnautica.json b/game_eggs/steamcmd_servers/subnautica_nitrox_mod/egg-subnautica.json index 446b9485..6ff877ef 100644 --- a/game_eggs/steamcmd_servers/subnautica_nitrox_mod/egg-subnautica.json +++ b/game_eggs/steamcmd_servers/subnautica_nitrox_mod/egg-subnautica.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-08-18T21:29:22+02:00", + "exported_at": "2022-04-23T15:20:19+02:00", "name": "Subnautica", "author": "tueye@tuworld.de", "description": "Subnautica is an open world survival action-adventure video game developed and published by Unknown Worlds Entertainment. In it, players are free to explore the ocean on an alien planet, known as planet 4546B, after their spaceship, the Aurora, crashes on the planet's surface.\r\n\r\nNote: NitroxMod version >=1.5.0.0 is required", @@ -12,7 +12,7 @@ "steam_disk_space" ], "images": [ - "quay.io\/pterodactyl\/core:mono" + "ghcr.io\/parkervcp\/yolks:mono_latest" ], "file_denylist": [], "startup": "mono .\/nitrox\/NitroxServer-Subnautica.exe", @@ -24,8 +24,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n# Install dependencies\r\ndpkg --add-architecture i386\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates libsdl2-2.0-0:i386\r\n\r\n## Get latest Nitrox-Mod build\r\nlatest_NitroxMod=$(curl --silent \"https:\/\/api.github.com\/repos\/SubnauticaNitrox\/Nitrox\/releases\/latest\" | grep '\"tag_name\":' | sed -E 's\/.*\"([^\"]+)\".*\/\\1\/')\r\n\r\nif [ -z \"${NITROX_VERSION}\" ] || [ \"${NITROX_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=$latest_NitroxMod\r\nelse\r\n DL_VERSION=${NITROX_VERSION}\r\nfi\r\n\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n\r\n## Install game using steamcmd\r\nGUARDCODE=\"${STEAM_GUARDCODE}\"\r\nif [ -z $GUARDCODE ]\r\nthen\r\n echo \"\"\r\n echo \"### You did not specify a Steam Guardcode\"\r\n echo \"### A new one should be send to you shortly\"\r\n echo \"### Enter it in the startup-config after this installation is finished and reinstall the Server\"\r\n sleep 10\r\n timeout 60 .\/steamcmd.sh +login ${STEAM_USERNAME} ${STEAM_PASSWORD} +quit\r\n exit 1\r\nfi\r\n\r\n[ ! -d \"$HOME\/subnautica\" ] && mkdir $HOME\/subnautica\r\n.\/steamcmd.sh +set_steam_guard_code ${STEAM_GUARDCODE} +login ${STEAM_USERNAME} ${STEAM_PASSWORD} +@sSteamCmdForcePlatformType windows +force_install_dir $HOME\/subnautica +app_update ${APPID} ${EXTRA_FLAGS} validate +quit\r\nstatus=$?\r\n\r\nif [ $status -ne 0 ]\r\nthen\r\n echo \"\"\r\n echo \"### The Download was not successful\"\r\n echo \"### Probably the entered Guardcode was wrong\"\r\n echo \"### A new one should be send to you shortly\"\r\n echo \"### Enter it in the startup-config after this installation is finished and reinstall the Server\"\r\n sleep 10\r\n sleep 10\r\n timeout 30 .\/steamcmd.sh +login ${STEAM_USERNAME} ${STEAM_PASSWORD} +quit\r\n exit 1\r\nfi\r\n\r\n\r\n## set up 32 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n\r\n## Download and extract Nitrox\r\n[ -d \"$HOME\/nitrox\" ] && rm -r $HOME\/nitrox\r\nmkdir $HOME\/nitrox\r\ncd $HOME\/nitrox\r\ncurl -sL https:\/\/github.com\/SubnauticaNitrox\/Nitrox\/releases\/download\/${DL_VERSION}\/Nitrox.${DL_VERSION}.zip -o Nitrox.${DL_VERSION}.zip\r\nunzip $HOME\/nitrox\/Nitrox.${DL_VERSION}.zip\r\n\r\n\r\n## Create path files to Subnautica Install-Dir\r\necho \"\/home\/container\/subnautica\" > $HOME\/path.txt\r\n\r\n\r\n## Create config\r\nif [ -e $HOME\/server.cfg ]; then\r\n echo \"server settings exists\"\r\nelse\r\n echo \"writing server default settings\"\r\n cat < $HOME\/server.cfg\r\n # Server settings can be changed here\r\n # Leave blank for a random spawn position\r\n Seed=\r\n ServerPort=11000\r\n # Measured in milliseconds\r\n SaveInterval=120000\r\n # Command to run following a successful world save (e.g. .exe, .bat, or PowerShell script). \r\n PostSaveCommandPath=\r\n MaxConnections=100\r\n DisableConsole=False\r\n DisableAutoSave=False\r\n SaveName=world\r\n ServerPassword=\r\n AdminPassword=PleaseChangeMe\r\n # Possible values: SURVIVAL, FREEDOM, HARDCORE, CREATIVE\r\n GameMode=SURVIVAL\r\n # Possible values: PROTOBUF, JSON\r\n SerializerMode=JSON\r\n # Possible values: NONE, PLAYER, MODERATOR, ADMIN, CONSOLE\r\n DefaultPlayerPerm=PLAYER\r\n #\r\n # Default player stats below here\r\n DefaultOxygenValue=45\r\n DefaultMaxOxygenValue=45\r\n DefaultHealthValue=80\r\n DefaultHungerValue=50.5\r\n DefaultThirstValue=90.5\r\n # Recommended to keep at 0.1f which is the default starting value. If set to 0 then new players are cured by default.\r\n DefaultInfectionValue=0.1\r\n # If set to true, the server will try to open port on your router via UPnP\r\n AutoPortForward=False\r\nEOT\r\nfi", - "container": "debian:buster-slim", + "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n# Install dependencies\r\ndpkg --add-architecture i386\r\napt update\r\napt -y --no-install-recommends install curl jq unzip libstdc++6 ca-certificates libsdl2-2.0-0:i386\r\n\r\n## Get latest Nitrox-Mod build\r\n#latest_NitroxMod=$(curl --silent \"https:\/\/api.github.com\/repos\/SubnauticaNitrox\/Nitrox\/releases\/latest\" | grep '\"tag_name\":' | sed -E 's\/.*\"([^\"]+)\".*\/\\1\/')\r\n\r\n#if [ -z \"${NITROX_VERSION}\" ] || [ \"${NITROX_VERSION}\" == \"latest\" ]; then\r\n# DL_VERSION=$latest_NitroxMod\r\n#else\r\n# DL_VERSION=${NITROX_VERSION}\r\n#fi\r\n\r\n## get release info and download links\r\nGITHUB_PACKAGE=\"SubnauticaNitrox\/Nitrox\"\r\nVERSION=${NITROX_VERSION}\r\nMATCH=\"Nitrox\"\r\n\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 -i ${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\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n\r\n## Install game using steamcmd\r\nGUARDCODE=\"${STEAM_GUARDCODE}\"\r\nif [ -z $GUARDCODE ]\r\nthen\r\n echo \"\"\r\n echo \"### You did not specify a Steam Guardcode\"\r\n echo \"### A new one should be send to you shortly\"\r\n echo \"### Enter it in the startup-config after this installation is finished and reinstall the Server\"\r\n sleep 10\r\n timeout 60 .\/steamcmd.sh +login ${STEAM_USERNAME} ${STEAM_PASSWORD} +quit\r\n exit 1\r\nfi\r\n\r\n[ ! -d \"$HOME\/subnautica\" ] && mkdir $HOME\/subnautica\r\n.\/steamcmd.sh +set_steam_guard_code ${STEAM_GUARDCODE} +login ${STEAM_USERNAME} ${STEAM_PASSWORD} +@sSteamCmdForcePlatformType windows +force_install_dir $HOME\/subnautica +app_update ${APPID} ${EXTRA_FLAGS} validate +quit\r\nstatus=$?\r\n\r\nif [ $status -ne 0 ]\r\nthen\r\n echo \"\"\r\n echo \"### The Download was not successful\"\r\n echo \"### Probably the entered Guardcode was wrong\"\r\n echo \"### A new one should be send to you shortly\"\r\n echo \"### Enter it in the startup-config after this installation is finished and reinstall the Server\"\r\n sleep 10\r\n sleep 10\r\n timeout 30 .\/steamcmd.sh +login ${STEAM_USERNAME} ${STEAM_PASSWORD} +quit\r\n exit 1\r\nfi\r\n\r\n\r\n## set up 32 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## Download and extract Nitrox\r\n[ -d \"$HOME\/nitrox\" ] && rm -r $HOME\/nitrox\r\nmkdir $HOME\/nitrox\r\ncd $HOME\/nitrox\r\ncurl -sL $DOWNLOAD_URL -o Nitrox.zip\r\nunzip $HOME\/nitrox\/Nitrox.zip\r\n\r\n\r\n## Create path files to Subnautica Install-Dir. Needed for versions pre 1.6.0\r\necho \"\/home\/container\/subnautica\" > $HOME\/path.txt\r\n\r\n## Create mono registry entry for Subnautica Install-Dir. Needed for versions since 1.6.0\r\nmkdir -p $HOME\/.mono\/registry\/CurrentUser\r\n cat < $HOME\/.mono\/registry\/CurrentUser\/values.xml\r\n \r\n \/home\/container\/subnautica<\/value>\r\n <\/values>\r\nEOT\r\n\r\n\r\n## Create config\r\nif [ -e $HOME\/server.cfg ]; then\r\n echo \"server settings exists\"\r\nelse\r\n echo \"writing server default settings\"\r\n cat < $HOME\/server.cfg\r\n # Server settings can be changed here\r\n # Set to true to Cache entities for the whole map on next run. \r\n # WARNING! Will make server load take longer on the cache run but players will gain a performance boost when entering new areas.\r\n CreateFullEntityCache=False\r\n # Leave blank for a random spawn position\r\n Seed=\r\n ServerPort=11000\r\n # Measured in milliseconds\r\n SaveInterval=120000\r\n # Command to run following a successful world save (e.g. .exe, .bat, or PowerShell script). \r\n PostSaveCommandPath=\r\n MaxConnections=100\r\n InitialSyncTimeout=300000\r\n DisableConsole=False\r\n DisableAutoSave=False\r\n SaveName=world\r\n ServerPassword=\r\n AdminPassword=PleaseChangeMe\r\n # Possible values: SURVIVAL, FREEDOM, HARDCORE, CREATIVE\r\n GameMode=SURVIVAL\r\n # Possible values: PROTOBUF, JSON\r\n SerializerMode=JSON\r\n # Possible values: NONE, PLAYER, MODERATOR, ADMIN, CONSOLE\r\n DefaultPlayerPerm=PLAYER\r\n #\r\n # Default player stats below here\r\n DefaultOxygenValue=45\r\n DefaultMaxOxygenValue=45\r\n DefaultHealthValue=80\r\n DefaultHungerValue=50.5\r\n DefaultThirstValue=90.5\r\n # Recommended to keep at 0.1f which is the default starting value. If set to 0 then new players are cured by default.\r\n DefaultInfectionValue=0.1\r\n # If set to true, the server will try to open port on your router via UPnP\r\n AutoPortForward=False\r\nEOT\r\nfi", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, @@ -118,7 +118,7 @@ "default_value": "PleaseChangeMe", "user_viewable": true, "user_editable": true, - "rules": "nullable|string|between:3,12" + "rules": "required|string|between:3,16" }, { "name": "Game Mode", @@ -148,4 +148,4 @@ "rules": "required|string|in:PROTOBUF,JSON" } ] -} +} \ No newline at end of file From 280547b07a9569c6ddf1164331e639774afd550a Mon Sep 17 00:00:00 2001 From: Stephen White Date: Sun, 24 Apr 2022 12:15:44 -0300 Subject: [PATCH 0383/1001] feat(arma 3): Variable for specifying optional mods (#1592) --- game_eggs/steamcmd_servers/arma/arma3/egg-arma3.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/game_eggs/steamcmd_servers/arma/arma3/egg-arma3.json b/game_eggs/steamcmd_servers/arma/arma3/egg-arma3.json index 9c72ea16..c4bc36b3 100644 --- a/game_eggs/steamcmd_servers/arma/arma3/egg-arma3.json +++ b/game_eggs/steamcmd_servers/arma/arma3/egg-arma3.json @@ -165,6 +165,15 @@ "user_editable": true, "rules": "nullable|string" }, + { + "name": "[Advanced] Optional Client-Side Mods", + "description": "A semicolon-separated list of optional mods to load into the keys folder, but not include in server's mod parameter. Useful for allowing clients to connect to the server with or without the mod loaded. Mods in this list must be in \"@workshopID\" form (ex. @123456789;@987654321;). These will also be included in Automatic Updates (if enabled).", + "env_variable": "OPTIONALMODS", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, { "name": "[Advanced] Extra Flags for SteamCMD", "description": "[This will override \"Download Creator DLCs\" if used] Only used when checking for server updates, and typically used for grabbing beta builds. Example: -beta profiling -betapassword CautionSpecialProfilingAndTestingBranchArma3", From 05be24d2b0df27770b6d68673bc6766846c2ec5b Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Tue, 26 Apr 2022 12:20:00 -0700 Subject: [PATCH 0384/1001] Added "Disable Seasonal Events" Option Added "Disable Seasonal Events" startup variable and updated the startup command to add the new flag `-DisableSeasonalEvents` if the variable is "true". This new flag was added to Satisfactory in 0.5.1.4 (https://satisfactory.fandom.com/wiki/Patch_0.5.1.4). --- .../satisfactory/egg-satisfactory.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json index 3d8f7889..cc82ea88 100644 --- a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json +++ b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json @@ -1,5 +1,5 @@ { - "_comment": "Pterodactyl Satisfactory Egg ~ Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord ~ 2021-11-29", + "_comment": "Pterodactyl Satisfactory Egg ~ Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord ~ 2022-02-07", "meta": { "version": "PTDL_v1", "update_url": null @@ -14,7 +14,7 @@ "ghcr.io\/parkervcp\/games:source" ], "file_denylist": [], - "startup": ".\/Engine\/Binaries\/Linux\/UE4Server-Linux-Shipping FactoryGame ?listen -Port={{SERVER_PORT}} -ServerQueryPort={{QUERY_PORT}} -BeaconPort={{BEACON_PORT}} -multihome=0.0.0.0", + "startup": ".\/Engine\/Binaries\/Linux\/UE4Server-Linux-Shipping FactoryGame ?listen -Port={{SERVER_PORT}} -ServerQueryPort={{QUERY_PORT}} -BeaconPort={{BEACON_PORT}} -multihome=0.0.0.0 $(if {{DISABLE_SEASONAL}}; then echo \"-DisableSeasonalEvents\"; fi)", "config": { "files": "{\r\n \"FactoryGame\/Saved\/Config\/LinuxServer\/Game.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"MaxPlayers\": \"MaxPlayers={{server.build.env.MAX_PLAYERS}}\"\r\n }\r\n },\r\n \"FactoryGame\/Saved\/Config\/LinuxServer\/Engine.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"mNumRotatingAutosaves\": \"mNumRotatingAutosaves={{server.build.env.NUM_AUTOSAVES}}\",\r\n \"bImplicitSend\": \"bImplicitSend={{server.build.env.UPLOAD_CRASH_REPORT}}\",\r\n \"InitialConnectTimeout\": \"InitialConnectTimeout={{server.build.env.INIT_CONNECT_TIMEOUT}}\",\r\n \"ConnectionTimeout\": \"ConnectionTimeout={{server.build.env.CONNECT_TIMEOUT}}\"\r\n }\r\n },\r\n \"FactoryGame\/Saved\/Config\/LinuxServer\/GameUserSettings.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"mFloatValues\": \"mFloatValues=((\\\"FG.AutosaveInterval\\\", {{server.build.env.AUTOSAVE_INTERVAL}}))\",\r\n \"mIntValues\": \"mIntValues=((\\\"FG.NetworkQuality\\\", {{server.build.env.NETWORK_QUALITY}}))\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Engine Initialization\"\r\n}", @@ -92,6 +92,15 @@ "user_editable": true, "rules": "required|string|in:true,false" }, + { + "name": "Disable Seasonal Events", + "description": "Accepted values are \"true\" or \"false\". Setting to \"true\" will disable any currently active seasonal events.", + "env_variable": "DISABLE_SEASONAL", + "default_value": "false", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:true,false" + }, { "name": "[Experimental] Max Players", "description": "[Requires server re-install to change default value!] The server and client are currently not optimized to support more than 4 players. However, you can override this value here at your own risk of poor performance.", From c1f57dfd7497e1e4c043874be00bb349664985a2 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Tue, 26 Apr 2022 12:31:18 -0700 Subject: [PATCH 0385/1001] General README Improvements Updated some info and cleaned up verbiage in some places. --- .../steamcmd_servers/satisfactory/README.md | 53 +++++-------------- 1 file changed, 12 insertions(+), 41 deletions(-) diff --git a/game_eggs/steamcmd_servers/satisfactory/README.md b/game_eggs/steamcmd_servers/satisfactory/README.md index 79b49fed..a0d643ab 100644 --- a/game_eggs/steamcmd_servers/satisfactory/README.md +++ b/game_eggs/steamcmd_servers/satisfactory/README.md @@ -1,10 +1,7 @@ # Satisfactory - ***Updating your Egg?**: Ensure any existing servers have the latest Startup Command, new Startup Variables are set, **and you reinstall server!*** ___ - -## Authors / Contributors - +### Authors / Contributors @@ -62,40 +59,33 @@ ___ ___ - ### Game Description - From Coffee Stain's [Website](https://www.satisfactorygame.com/): > Satisfactory is a first-person open-world factory building game with a dash of exploration and combat. Play alone or with friends, explore an alien planet, create multi-story factories, and enter conveyor belt heaven! - ___ - ### Egg Capabilities - - Configuration of the Server Query, Beacon, and Game ports. - Configurable to automatically check for server updates on start via SteamCMD. Forcing validation is also configurable. - *[Experimental]* Max player configuration. - Autosave amount and interval configuration. - Disable crash reporting if desired. +- Disable seasonal events if desired. - ...and other advanced networking and server branch configurable settings. - ___ - ### Server Ports - -- Default server ports are listed below, but all three ports can be changed freely. +- Default server ports are listed below, but all three ports can be changed freely (\*some exceptions apply below). + - All three ports must be unique; they cannot currently be shared on one port (this may change in the future). + - It is recommended to distance ports of other running Satisfactory servers in Pterodactyl by **increments of 100** (it is currently unknown what the minimum increment is, but an increment of +1 caused cross-server talk in testing). Also, your internal ports **must match** your external ports on your network (ie. you can't have an external port of 7778 forwarded to your 7777 internal port; they must match). - **Note:** The Primary/Default/Game Port for your server in Pterodactyl will be Satisfactory's `-Port=????` game port, even though clients will **connect with the Query port**. -- It is recommended to distance ports of other running Satisfactory servers in Pterodactyl by **increments of 100** (it is currently unknown what the minimum increment is, but an increment of +1 caused cross-server talk in testing). Also, your internal ports **must match** your external ports on your network (ie. you can't have an external port of 7778 forwarded to your 7777 internal port; they must match). - ***All three ports are required to be open/allocated for normal server behavior!*** | Port | Default (UDP) | |---------|---------| | **Game (Primary Port in Pterodactyl)** | 7777 | | Beacon | 15000 | -| Server Query | 15777 | +| Server Query (Port clients connect with) | 15777 | ___ - ### Installation/System Requirements | | Bare Minimum | Recommended | @@ -108,54 +98,40 @@ ___ | Game Ownership | Not required to start. | Required to fully "initialize" (see [Server Initialization](#server-initialization) below) | ___ - ### Server Initialization - For a server to be fully "initialized", a client who owns the game must log into the server to "claim" it and create an administrator password. Then, a new session can be created via the "Create Game" tab in-game, or an existing save file can be uploaded (see [Save Files](#save-files) below). Misc. settings listed below can be configured by an admin client via the game's "Server Settings" tab, and are currently **not** set via the Egg: - - Server Password - Admin Password - Auto-Save on Player Disconnect - Pause When No Players Online - ...and possibly more as the client's UI is developed further for more configuration options. - ___ - ### Save Files - An existing save file (including single-player saves) can currently be uploaded to the server via two different methods: -- "Manage Saves" tab via a client in-game (Recommended) +- "Manage Saves" tab via an admin client in-game (Recommended) - Manually via the File Manager or SFTP Save files are located in this directory: - ```md /home/container/.config/Epic/FactoryGame/Saved/SaveGames/server ``` - *Note: A manually uploaded save will only load if it is (a.) loaded manually via the "Manage Saves" tab in-game, (b.) it is the only save file present, or (c.) its existing session name (not its file name) matches the existing save's session name *and* has the most recent time stamp.* ***Warning:*** Stopping the server **does not** currently save your game! Ensure it is saved before stopping the server. If you have forgotten your administrator password or would generally like to reset your server as if it were new, you can delete the following file: - ```md /home/container/.config/Epic/FactoryGame/Saved/SaveGames/ServerSettings. ``` - ___ - ### Console Commands - -As of v0.5.1.2, the console tab in the client server manager is the only way to execute commands. Entering commands via Pterodactyl do nothing. +As of v0.5.1.10, the console tab in the client server manager is the only way to execute commands. Entering commands via Pterodactyl do nothing. [List of known commands can be found via the Wiki.](https://satisfactory.fandom.com/wiki/Dedicated_servers#Console_commands) ___ - -### Errors/Warnings - +### Known Errors/Warnings The following errors or warnings you see in the console can safely be ignored: ```log @@ -163,29 +139,24 @@ steamclient.so: cannot open shared object file: No such file or directory [S_API] SteamAPI_Init(): Loaded '/home/container/.steam/sdk64/steamclient.so' OK. (First tried local 'steamclient.so') LogSteamShared: Warning: Steam Dedicated Server API failed to initialize. ``` - -The local file of 'steamclient.so' was attempted to be loaded, but could not because it is not present, causing the warning message. However, the backup `/home/container/.steam/sdk64/steamclient.so` is loaded successfully (this is the correct behavior according to the [Wiki](https://satisfactory.fandom.com/wiki/Dedicated_servers#SteamAPI_Init.28.29:_Sys_LoadModule_filed_to_load:_.2Fpath.2Fto.2F.steam.2Fsdk64.2Fsteamclient.so)). +↑ The local file of 'steamclient.so' was attempted to be loaded, but could not because it is not present, causing the warning message. However, the backup `/home/container/.steam/sdk64/steamclient.so` is loaded successfully (this is the correct behavior according to the [Wiki](https://satisfactory.fandom.com/wiki/Dedicated_servers#SteamAPI_Init.28.29:_Sys_LoadModule_filed_to_load:_.2Fpath.2Fto.2F.steam.2Fsdk64.2Fsteamclient.so)). ```log Warning: failed to init SDL thread priority manager: SDL not found ``` -This is a common error with Steam related software on Linux, but can safely be ignored. +↑ This is a common error with Steam related software on Linux, but can safely be ignored. ```log ...Error: Couldn't find file for package... ``` - ```log ...Error: Navmesh bounds are too large!... ``` - ```log ...Warning: NiagaraSystem... ``` - ```log LogStreaming: Warning: Failed to read file '../../../FactoryGame/Saved/SaveGames/GameAnalytics.sav' error. ``` - -These seem to be common error messages with the current experimental version of the game. +↑ These seem to be common error messages with the current experimental version of the game. From dcdb4fdfb167070f4d7b278e7ce472aed1505978 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Tue, 26 Apr 2022 12:46:43 -0700 Subject: [PATCH 0386/1001] Fix whitespace issues in README.md Fixed a regression with newline spacing. --- .../steamcmd_servers/satisfactory/README.md | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/game_eggs/steamcmd_servers/satisfactory/README.md b/game_eggs/steamcmd_servers/satisfactory/README.md index a0d643ab..ccd22a4f 100644 --- a/game_eggs/steamcmd_servers/satisfactory/README.md +++ b/game_eggs/steamcmd_servers/satisfactory/README.md @@ -1,7 +1,10 @@ # Satisfactory + ***Updating your Egg?**: Ensure any existing servers have the latest Startup Command, new Startup Variables are set, **and you reinstall server!*** ___ + ### Authors / Contributors +
      @@ -59,11 +62,16 @@ ___ ___ + ### Game Description + From Coffee Stain's [Website](https://www.satisfactorygame.com/): > Satisfactory is a first-person open-world factory building game with a dash of exploration and combat. Play alone or with friends, explore an alien planet, create multi-story factories, and enter conveyor belt heaven! + ___ + ### Egg Capabilities + - Configuration of the Server Query, Beacon, and Game ports. - Configurable to automatically check for server updates on start via SteamCMD. Forcing validation is also configurable. - *[Experimental]* Max player configuration. @@ -71,8 +79,11 @@ ___ - Disable crash reporting if desired. - Disable seasonal events if desired. - ...and other advanced networking and server branch configurable settings. + ___ + ### Server Ports + - Default server ports are listed below, but all three ports can be changed freely (\*some exceptions apply below). - All three ports must be unique; they cannot currently be shared on one port (this may change in the future). - It is recommended to distance ports of other running Satisfactory servers in Pterodactyl by **increments of 100** (it is currently unknown what the minimum increment is, but an increment of +1 caused cross-server talk in testing). Also, your internal ports **must match** your external ports on your network (ie. you can't have an external port of 7778 forwarded to your 7777 internal port; they must match). @@ -86,6 +97,7 @@ ___ | Server Query (Port clients connect with) | 15777 | ___ + ### Installation/System Requirements | | Bare Minimum | Recommended | @@ -98,40 +110,56 @@ ___ | Game Ownership | Not required to start. | Required to fully "initialize" (see [Server Initialization](#server-initialization) below) | ___ + ### Server Initialization + For a server to be fully "initialized", a client who owns the game must log into the server to "claim" it and create an administrator password. Then, a new session can be created via the "Create Game" tab in-game, or an existing save file can be uploaded (see [Save Files](#save-files) below). Misc. settings listed below can be configured by an admin client via the game's "Server Settings" tab, and are currently **not** set via the Egg: + - Server Password - Admin Password - Auto-Save on Player Disconnect - Pause When No Players Online - ...and possibly more as the client's UI is developed further for more configuration options. + ___ + ### Save Files + An existing save file (including single-player saves) can currently be uploaded to the server via two different methods: + - "Manage Saves" tab via an admin client in-game (Recommended) - Manually via the File Manager or SFTP Save files are located in this directory: + ```md /home/container/.config/Epic/FactoryGame/Saved/SaveGames/server ``` + *Note: A manually uploaded save will only load if it is (a.) loaded manually via the "Manage Saves" tab in-game, (b.) it is the only save file present, or (c.) its existing session name (not its file name) matches the existing save's session name *and* has the most recent time stamp.* ***Warning:*** Stopping the server **does not** currently save your game! Ensure it is saved before stopping the server. If you have forgotten your administrator password or would generally like to reset your server as if it were new, you can delete the following file: + ```md /home/container/.config/Epic/FactoryGame/Saved/SaveGames/ServerSettings. ``` + ___ + ### Console Commands + As of v0.5.1.10, the console tab in the client server manager is the only way to execute commands. Entering commands via Pterodactyl do nothing. [List of known commands can be found via the Wiki.](https://satisfactory.fandom.com/wiki/Dedicated_servers#Console_commands) + ___ + ### Known Errors/Warnings + The following errors or warnings you see in the console can safely be ignored: ```log @@ -139,6 +167,7 @@ steamclient.so: cannot open shared object file: No such file or directory [S_API] SteamAPI_Init(): Loaded '/home/container/.steam/sdk64/steamclient.so' OK. (First tried local 'steamclient.so') LogSteamShared: Warning: Steam Dedicated Server API failed to initialize. ``` + ↑ The local file of 'steamclient.so' was attempted to be loaded, but could not because it is not present, causing the warning message. However, the backup `/home/container/.steam/sdk64/steamclient.so` is loaded successfully (this is the correct behavior according to the [Wiki](https://satisfactory.fandom.com/wiki/Dedicated_servers#SteamAPI_Init.28.29:_Sys_LoadModule_filed_to_load:_.2Fpath.2Fto.2F.steam.2Fsdk64.2Fsteamclient.so)). ```log @@ -150,13 +179,17 @@ Warning: failed to init SDL thread priority manager: SDL not found ```log ...Error: Couldn't find file for package... ``` + ```log ...Error: Navmesh bounds are too large!... ``` + ```log ...Warning: NiagaraSystem... ``` + ```log LogStreaming: Warning: Failed to read file '../../../FactoryGame/Saved/SaveGames/GameAnalytics.sav' error. ``` + ↑ These seem to be common error messages with the current experimental version of the game. From 5daf1dba0748b8f540ff6ed76ebfb4a62264fa91 Mon Sep 17 00:00:00 2001 From: JstnLT Date: Wed, 27 Apr 2022 12:44:31 +0700 Subject: [PATCH 0387/1001] add Los Angeles Crimes --- game_eggs/losangelescrimes/README.md | 33 +++++++++++++++ .../egg-l-a-c--online-public-server.json | 41 +++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 game_eggs/losangelescrimes/README.md create mode 100644 game_eggs/losangelescrimes/egg-l-a-c--online-public-server.json diff --git a/game_eggs/losangelescrimes/README.md b/game_eggs/losangelescrimes/README.md new file mode 100644 index 00000000..5829770b --- /dev/null +++ b/game_eggs/losangelescrimes/README.md @@ -0,0 +1,33 @@ +# Los Angeles Crimes +This egg makes it easy for you to create a public server in the game [Los Angeles Crimes](https://play.google.com/store/apps/details?id=com.MA.LAC&hl=in&gl=US). + +I made it because I was confused about how to create a server manually which requires using a vpn and so on... But here such a method is not needed. This egg uses a Linux Server that has been provided by the Game Developer. + +## Game Description +Los Angeles Crimes lets you play, create, and discover a variety of immersive worlds created by a global community! + +Features: +- Free roam, team death-match, zombie survival, car race & soccer +- Third-person & first-person view +- Active-ragdoll and realistic physics +- LAN support +- PS4 controller support (Bluetooth) + +Website: https://lacrimesonline.com/ + +## Minimum Requirement +1024MB Ram and 1024MB Disk is enough to run the server. Better to add ram & disk as this is a public server and dozens of people can join. + +## Server Port + +> **The LAC server can only run on port 7777. So the server port in the pterodactyl panel that you will use must be 7777.** + +| Port | Default | +|---|---| +| Public Server | 7777 | + +## To Do +- [ ] Can change version. + +# Contributors +- [JastinXyz](https://github.com/JastinXyz) diff --git a/game_eggs/losangelescrimes/egg-l-a-c--online-public-server.json b/game_eggs/losangelescrimes/egg-l-a-c--online-public-server.json new file mode 100644 index 00000000..0505673d --- /dev/null +++ b/game_eggs/losangelescrimes/egg-l-a-c--online-public-server.json @@ -0,0 +1,41 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2022-04-27T11:33:59+07:00", + "name": "LAC-Online Public Server", + "author": "jastinlt16@gmail.com", + "description": "To make the Los Angeles Crimes public server. Los Angeles Crimes lets you play, create, and discover a variety of immersive worlds created by a global community!", + "features": null, + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source" + ], + "file_denylist": [], + "startup": ".\/LAC_Linux_v{{VER}}.x86_64", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Done!\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\ncd \/mnt\/server &&\r\n\r\n# installing dependencies\r\napt-get update -y &&\r\napt-get install -y wget screen unzip libc6-i386 lib32stdc++6 &&\r\n\r\n# delete the previous file (if it is in the file manager)\r\nrm -f LAC_Linux_v${VER}.x86_64 && rm -rf LAC_Linux_v${VER}_Data &&\r\n\r\n# Using another version still under development!\r\n#echo \"checking the given version file and download it... v${VER}.\"\r\n#wget https:\/\/dl.lacrimesonline.com\/builds\/LAC_v${VER}\/LAC_Linux_Server_v${VER}.zip -O LAC_Linux_Server_v${VER}.zip || echo \"VERSION v${VER} IS NOT FOUND! Use v1.6 instead...\" && exit 1\r\n\r\nwget https:\/\/dl.lacrimesonline.com\/builds\/LAC_v${VER}\/LAC_Linux_Server_v${VER}.zip -O LAC_Linux_Server_v${VER}.zip &&\r\necho \"successfully downloaded v${VER} files.!\" &&\r\n\r\n# Extracting & remove the zip file\r\nunzip .\/LAC_Linux_Server_v${VER}.zip &&\r\nrm -f .\/LAC_Linux_Server_v${VER}.zip &&\r\n\r\n# Make the main file executable....\r\nchmod +x LAC_Linux_v${VER}.x86_64 &&\r\n\r\necho \"INSTALATION COMPLETE!\"", + "container": "ubuntu:18.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Version", + "description": "The build version is available at https:\/\/dl.lacrimesonline.com\/builds\/. Just write a numeric version like 1.6, don't use any other characters than numbers and periods. If the entered version is incorrect\/non-existent it will use version 1.6 (for now). After replacing it, then reinstall this server. [ THIS FEATURE IS STILL IN DEVELOPMENT ]", + "env_variable": "VER", + "default_value": "1.6", + "user_viewable": true, + "user_editable": false, + "rules": "required|string|max:20" + } + ] +} \ No newline at end of file From 21ec2d2a4696768fefa73d09b8f1e372efadcab8 Mon Sep 17 00:00:00 2001 From: JstnLT Date: Wed, 27 Apr 2022 12:45:10 +0700 Subject: [PATCH 0388/1001] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index bbed6550..8790bb1d 100644 --- a/README.md +++ b/README.md @@ -120,6 +120,8 @@ If you are reading this it looks like you are looking to add an egg to your serv * GTA * [GTAC](game_eggs/gta/gtac) +[Los Angeles Crimes](game_eggs/losangelescrimes) + [Mindustry](game_eggs/mindustry) * [Mindustry](game_eggs/mindustry/mindustry) From dc9f730acc65d52d27afda6d8b2cd6d344bb08d4 Mon Sep 17 00:00:00 2001 From: JstnLT Date: Wed, 27 Apr 2022 12:46:01 +0700 Subject: [PATCH 0389/1001] Update README.md --- game_eggs/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/game_eggs/README.md b/game_eggs/README.md index 5458c143..2e4fa6c7 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -39,6 +39,8 @@ * GTA * [GTAC](gta/gtac) +[Los Angeles Crimes](losangelescrimes) + [League Sandbox](leaguesandbox) [Mindustry](mindustry) From 46e5666e0eaf8815864813ddb8ad75770de8981b Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Wed, 4 May 2022 14:43:58 +0200 Subject: [PATCH 0390/1001] update egg-s-a--m-p.json to new image --- game_eggs/gta/samp/egg-s-a--m-p.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/gta/samp/egg-s-a--m-p.json b/game_eggs/gta/samp/egg-s-a--m-p.json index 1f117213..0ef670ff 100644 --- a/game_eggs/gta/samp/egg-s-a--m-p.json +++ b/game_eggs/gta/samp/egg-s-a--m-p.json @@ -7,7 +7,7 @@ "name": "SA-MP", "author": "bl4ckspr4y@protonmail.com", "description": "SA-MP is a free Massively Multiplayer Online game mod for the PC version of Rockstar Games Grand Theft Auto: San Andreas (tm).", - "image": "quay.io\/parkervcp\/pterodactyl-images:game_samp", + "image": "ghcr.io\/parkervcp\/games:samp", "startup": ".\/samp03svr", "config": { "files": "{\r\n \"server.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"port\": \"port {{server.build.default.port}}\"\r\n }\r\n }\r\n}", @@ -23,4 +23,4 @@ } }, "variables": [] -} \ No newline at end of file +} From c67703caa627e897c6550d15a1515d27c04ce750 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Thu, 5 May 2022 20:05:22 +0200 Subject: [PATCH 0391/1001] Update egg-code--server.json --- software/code-server/egg-code--server.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/software/code-server/egg-code--server.json b/software/code-server/egg-code--server.json index 8820b7eb..30cdae39 100644 --- a/software/code-server/egg-code--server.json +++ b/software/code-server/egg-code--server.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-12-17T09:23:57+00:00", + "exported_at": "2022-05-05T19:37:05+02:00", "name": "Code-Server", "author": "mario.franze@gmail.com", "description": "Run VS Code on any machine anywhere and access it in the browser.", @@ -25,8 +25,8 @@ }, "scripts": { "installation": { - "script": "apt update\r\napt install -y curl jq\r\nMATCH=linux-amd64\r\n\r\n# Create initial directories\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\n# Create needed directories\r\nmkdir -p \/mnt\/server\/.local\/lib \/mnt\/server\/.local\/bin \/mnt\/server\/.config\/code-server \/mnt\/server\/projects\r\n\r\n# Change permission of projects directory so it can be accessed by code-server\r\nchmod 777 \/mnt\/server\/projects\r\ntouch \"\/mnt\/server\/projects\/PLACE YOUR PROJECTS HERE\"\r\n\r\n# Check for available versions. Defaults to latest if no valid version is found.\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/coder\/code-server\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/coder\/code-server\/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 \"v${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n if [ \"v${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"v${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_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\n# Download the given Version and extract it\r\necho \"Downloading $DOWNLOAD_URL\"\r\ncurl -fL $DOWNLOAD_URL | tar -C \/mnt\/server\/.local\/lib -xz\r\nmv \/mnt\/server\/.local\/lib\/code-server-*linux-amd64 \/mnt\/server\/.local\/lib\/code-server-${VERSION}\r\n\r\n\r\nPATH=\"\/mnt\/server\/.local\/bin:$PATH\"\r\necho \"password: changeme\r\nbind-addr: 0.0.0.0\r\nauth: password\r\ncert: false\" > \/mnt\/server\/.config\/code-server\/config.yaml\r\n\r\necho \"Install complete\"", - "container": "ghcr.io/parkervcp/installers:debian", + "script": "apt update\r\napt install -y curl jq\r\n\r\n\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"amd64\" || echo \"arm64\")\r\nMATCH=linux-${ARCH}\r\n# Create initial directories\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\necho ${ARCH}\r\necho ${MATCH}\r\n# Create needed directories\r\nmkdir -p \/mnt\/server\/.local\/lib \/mnt\/server\/.local\/bin \/mnt\/server\/.config\/code-server \/mnt\/server\/projects\r\n\r\n# Change permission of projects directory so it can be accessed by code-server\r\nchmod 777 \/mnt\/server\/projects\r\ntouch \"\/mnt\/server\/projects\/PLACE YOUR PROJECTS HERE\"\r\n\r\n# Check for available versions. Defaults to latest if no valid version is found.\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/coder\/code-server\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/coder\/code-server\/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 \"v${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n if [ \"v${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"v${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_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\n# Download the given Version and extract it\r\necho \"Downloading $DOWNLOAD_URL\"\r\ncurl -fL $DOWNLOAD_URL | tar -C \/mnt\/server\/.local\/lib -xz\r\nmv \/mnt\/server\/.local\/lib\/code-server-*linux-${ARCH} \/mnt\/server\/.local\/lib\/code-server-${VERSION}\r\n\r\n\r\nPATH=\"\/mnt\/server\/.local\/bin:$PATH\"\r\necho \"password: changeme\r\nbind-addr: 0.0.0.0\r\nauth: password\r\ncert: false\" > \/mnt\/server\/.config\/code-server\/config.yaml\r\n\r\necho \"Install complete\"", + "container": "debian:bullseye-slim", "entrypoint": "bash" } }, From 56829c88cd49d83a941e91c778bcc81d61a7932d Mon Sep 17 00:00:00 2001 From: Boy132 Date: Fri, 6 May 2022 10:21:09 +0200 Subject: [PATCH 0392/1001] Fix download link for Flamecord --- .../minecraft/proxy/java/flamecord/egg-flamecord.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json b/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json index e80e7b72..626cd935 100644 --- a/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json +++ b/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-12-09T13:32:08-05:00", + "exported_at": "2022-05-06T10:20:32+02:00", "name": "Flamecord", "author": "admin@softwarenoob.com", "description": "FlameCord is a patch for Travertine to fix possible exploits and add useful functionalities. FlameCord aims to fix Netty related exploits to keep your server safe from attacks.", @@ -23,13 +23,13 @@ "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"config.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"listeners[0].host\": \"0.0.0.0:{{server.build.default.port}}\",\r\n \"servers.*.address\": {\r\n \"127.0.0.1\": \"{{config.docker.interface}}\",\r\n \"localhost\": \"{{config.docker.interface}}\"\r\n }\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Listening on \",\r\n \"userInteraction\": [\r\n \"Listening on \/0.0.0.0:\"\r\n ]\r\n}", + "startup": "{\r\n \"done\": \"Listening on \"\r\n}", "logs": "{}", "stop": "end" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Travertine Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nMATCH=Flamecord.jar\r\napt update\r\napt install -y curl jq\r\n\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/2lstudios-mc\/FlameCord\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/2lstudios-mc\/FlameCord\/releases\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n echo \"Downloading latest version\"\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 -i ${MATCH})\r\n echo \"Download version ${VERSION}\"\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 \/mnt\/server\r\n\r\necho -e \"curl -L ${DOWNLOAD_URL} -o ${SERVER_JARFILE}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -L ${DOWNLOAD_URL} -o ${SERVER_JARFILE}\r\necho \"Install complete\"", + "script": "#!\/bin\/bash\r\n# FlameCord Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl\r\n\r\n# Get download link\r\nif [ -z \"${FLAMECORD_VERSION}\" ] || [ \"${FLAMECORD_VERSION}\" == \"latest\" ]; then\r\n echo -e \"Downloading latest FlameCord build\"\r\n DOWNLOAD_URL=https:\/\/ci.2lstudios.dev\/job\/FlameCord\/lastSuccessfulBuild\/artifact\/FlameCord-Proxy\/bootstrap\/target\/FlameCord.jar\r\nelse \r\n echo -e \"Downloading FlameCord build ${FLAMECORD_VERSION}\"\r\n DOWNLOAD_URL=https:\/\/ci.2lstudios.dev\/job\/FlameCord\/${FLAMECORD_VERSION}\/artifact\/FlameCord-Proxy\/bootstrap\/target\/FlameCord.jar\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"curl -L ${DOWNLOAD_URL} -o ${SERVER_JARFILE}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -L ${DOWNLOAD_URL} -o ${SERVER_JARFILE}\r\necho \"Install complete\"", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -37,7 +37,7 @@ "variables": [ { "name": "Flamecord Version", - "description": "The Github release version of Flamecord to install such as 48d53ee, all releases at https:\/\/github.com\/2lstudios-mc\/FlameCord\/releases", + "description": "The build to pull and install. (Ex. 97), or set to latest.\r\n\r\nYou can find all builds on https:\/\/ci.2lstudios.dev\/job\/FlameCord\/", "env_variable": "FLAMECORD_VERSION", "default_value": "latest", "user_viewable": true, From 158ba055dc131ca6494ee5eee5ed1676421e92e3 Mon Sep 17 00:00:00 2001 From: Boy132 Date: Fri, 6 May 2022 10:53:01 +0200 Subject: [PATCH 0393/1001] Update server name variable for project zomboid --- .../project_zomboid/egg-project-zomboid.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json b/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json index 946d9747..a13be003 100644 --- a/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json +++ b/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-12-29T14:38:26+00:00", + "exported_at": "2022-05-06T10:50:50+02:00", "name": "Project Zomboid", "author": "iamkubi@gmail.com", "description": "Project Zomboid is an open world survival horror video game in alpha stage development by British and Canadian independent developer, The Indie Stone. The game is set in a post apocalyptic, zombie infested world where the player is challenged to survive for as long as possible before inevitably dying.", @@ -15,7 +15,7 @@ "ghcr.io\/pterodactyl\/games:source" ], "file_denylist": [], - "startup": "\/home\/container\/start-server.sh -port {{SERVER_PORT}} -steamport1 {{STEAM_PORT}} -cachedir=\/home\/container\/.cache -servername \\\"{{SERVER_NAME}}\\\" -adminusername {{ADMIN_USER}} -adminpassword \"{{ADMIN_PASSWORD}}\"", + "startup": "\/home\/container\/start-server.sh -port {{SERVER_PORT}} -steamport1 {{STEAM_PORT}} -cachedir=\/home\/container\/.cache -servername \"{{SERVER_NAME}}\" -adminusername {{ADMIN_USER}} -adminpassword \"{{ADMIN_PASSWORD}}\"", "config": { "files": "{}", "startup": "{\r\n \"done\": \"SERVER STARTED\"\r\n}", @@ -32,12 +32,12 @@ "variables": [ { "name": "Server Name", - "description": "Name of the server", + "description": "The internal server name used for save\/ config files.", "env_variable": "SERVER_NAME", - "default_value": "Project Zomboid Server", + "default_value": "Pterodactyl", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:64" + "rules": "required|alpha_num|max:64" }, { "name": "Admin Username", From 12273e55b32c4723e68746fc3315a774d427db1f Mon Sep 17 00:00:00 2001 From: DaFray31 Date: Thu, 12 May 2022 15:16:04 +0200 Subject: [PATCH 0394/1001] Update egg-j-music-bot.json Token from discord have length equal to 70 not 64 --- bots/discord/jmusicbot/egg-j-music-bot.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bots/discord/jmusicbot/egg-j-music-bot.json b/bots/discord/jmusicbot/egg-j-music-bot.json index 96da03ca..5804cde5 100644 --- a/bots/discord/jmusicbot/egg-j-music-bot.json +++ b/bots/discord/jmusicbot/egg-j-music-bot.json @@ -34,7 +34,7 @@ "default_value": "You need to get a token", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:64" + "rules": "required|string|max:70" }, { "name": "[REQUIRED] Bot Owner ID", @@ -127,4 +127,4 @@ "rules": "required|integer" } ] -} \ No newline at end of file +} From 7a5f16730ac6304cb03f4e7d6d250bc0502e5c12 Mon Sep 17 00:00:00 2001 From: Faye Date: Sat, 14 May 2022 09:55:19 +0200 Subject: [PATCH 0395/1001] Fixed install script --- .../terraria/tmodloader/egg-t-modloader.json | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/game_eggs/terraria/tmodloader/egg-t-modloader.json b/game_eggs/terraria/tmodloader/egg-t-modloader.json index 6d8cc605..22376c34 100755 --- a/game_eggs/terraria/tmodloader/egg-t-modloader.json +++ b/game_eggs/terraria/tmodloader/egg-t-modloader.json @@ -1,14 +1,18 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2021-08-02T22:44:50-04:00", + "exported_at": "2022-05-14T02:54:50-05:00", "name": "tModloader", "author": "parker@parkervcp.com", "description": "tModLoader is essentially a mod that provides a way to load your own mods without having to work directly with Terraria's source code itself. This means you can easily make mods that are compatible with other people's mods, save yourself the trouble of having to decompile and recompile Terraria.exe, and escape from having to understand all of the obscure \"intricacies\" of Terraria's source code. It is made to work for Terraria 1.3+.", "features": null, - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_mono-5", + "images": [ + "quay.io\/parkervcp\/pterodactyl-images:debian_mono-5" + ], + "file_denylist": [], "startup": ".\/tModLoaderServer -ip 0.0.0.0 -port ${SERVER_PORT} -maxplayers ${MAX_PLAYERS} -difficulty ${DIFFICULTY} -password \"${SERVER_PASSWORD}\" -motd \"${MOTD}\" -lang ${LANGUAGE} -world ~\/saves\/Worlds\/${WORLD_NAME}.wld -worldname ${WORLD_NAME} -autocreate ${WORLD_SIZE} -savedirectory ~\/ -tmlsavedirectory ~\/saves -modpath ~\/mods", "config": { "files": "{}", @@ -18,12 +22,21 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Vanilla tModloader 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 jq file unzip\r\n\r\nGITHUB_PACKAGE=tModLoader\/tModLoader\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 echo -e \"defaulting to latest release\"\r\n DOWNLOAD_LINK=$(echo $LATEST_JSON | jq .assets | jq -r .[].browser_download_url | grep -i linux | grep -i zip)\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 linux)\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 | grep -i linux | grep -i zip)\r\n fi\r\nfi\r\n\r\n## mkdir and cd to \/mnt\/server\/\r\nmkdir -p \/mnt\/server\r\n\r\ncd \/mnt\/server\r\n\r\n## download release\r\necho -e \"running: curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\"\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip -o ${DOWNLOAD_LINK##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exiting\"\r\n exit 2 \r\nfi\r\n\r\nchmod +x tModLoaderServer.bin.x86_64\r\nchmod +x tModLoaderServer\r\n\r\necho -e \"Cleaning up extra files.\"\r\nrm -rf terraria-server-${CLEAN_VERSION}.zip rm ${DOWNLOAD_LINK##*\/}", + "script": "#!\/bin\/bash\r\n# Vanilla tModloader 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 jq file unzip\r\n\r\nGITHUB_PACKAGE=tModLoader\/tModLoader\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\/tmodloader\/tmodloader\/releases\" | jq -c '.[] | select(.name | contains(\"v0\"))' | head -1)\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/$GITHUB_PACKAGE\/releases\" | jq '.[] | select(.name | contains(\"v0\"))')\r\n\r\n\r\nif [ -z \"$VERSION\" ] || [ \"$VERSION\" == \"latest\" ]; then\r\n echo -e \"defaulting to latest release\"\r\n DOWNLOAD_LINK=$(echo $LATEST_JSON | jq .assets | jq -r .[].browser_download_url | grep -i linux | grep -i zip)\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 linux)\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 | grep -i linux | grep -i zip)\r\n fi\r\nfi\r\n\r\n## mkdir and cd to \/mnt\/server\/\r\nmkdir -p \/mnt\/server\r\n\r\ncd \/mnt\/server\r\n\r\n## download release\r\necho -e \"running: curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\"\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip -o ${DOWNLOAD_LINK##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exiting\"\r\n exit 2 \r\nfi\r\n\r\nchmod +x tModLoaderServer.bin.x86_64\r\nchmod +x tModLoaderServer\r\n\r\necho -e \"Cleaning up extra files.\"\r\nrm -rf terraria-server-${CLEAN_VERSION}.zip rm ${DOWNLOAD_LINK##*\/}", "container": "debian:buster-slim", "entrypoint": "bash" } }, "variables": [ + { + "name": "tModloader Version", + "description": "The version of tModloader that is to be used.", + "env_variable": "VERSION", + "default_value": "latest", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + }, { "name": "World Name", "description": "The name for the world file.", @@ -51,15 +64,6 @@ "user_editable": true, "rules": "required|numeric|digits_between:1,3" }, - { - "name": "tModloader Version", - "description": "The version of tModloader that is to be used.", - "env_variable": "VERSION", - "default_value": "latest", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:20" - }, { "name": "GitHub User", "description": "GitHub user to use for api calls.\r\n\r\nThis only needs to be set if you hit the GitHub API too often across multiple servers.", @@ -115,4 +119,4 @@ "rules": "required|numeric|digits_between:1,5" } ] -} \ No newline at end of file +} From 40e207d17d294329bbd7993b172a8a3ed733cbb3 Mon Sep 17 00:00:00 2001 From: Bad <87938689+yesBad@users.noreply.github.com> Date: Sun, 15 May 2022 00:38:52 +0300 Subject: [PATCH 0396/1001] Fix Rust Staging mistake Quary -> Query --- game_eggs/steamcmd_servers/rust/rust_staging/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/rust/rust_staging/README.md b/game_eggs/steamcmd_servers/rust/rust_staging/README.md index f1742a66..c8dcdcde 100644 --- a/game_eggs/steamcmd_servers/rust/rust_staging/README.md +++ b/game_eggs/steamcmd_servers/rust/rust_staging/README.md @@ -21,7 +21,7 @@ Ports required to run the server. | Port | default | |---------|---------| -| Game and Quary | 28015 UDP | +| Game and Query | 28015 UDP | | RCON | 28016 TCP | ### Information about server updates can be found [here](https://steamdb.info/app/258550/depots/?branch=staging) From 6db9034c0a80e547edf2e0b15662f033ad1ffed0 Mon Sep 17 00:00:00 2001 From: gOOvER Date: Sun, 15 May 2022 11:17:13 +0200 Subject: [PATCH 0397/1001] fix startup, to show console; update images to ghcr --- .../valheim/valheim_plus/egg-valheim-plus-mod.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/game_eggs/steamcmd_servers/valheim/valheim_plus/egg-valheim-plus-mod.json b/game_eggs/steamcmd_servers/valheim/valheim_plus/egg-valheim-plus-mod.json index cd0f888e..c6168247 100644 --- a/game_eggs/steamcmd_servers/valheim/valheim_plus/egg-valheim-plus-mod.json +++ b/game_eggs/steamcmd_servers/valheim/valheim_plus/egg-valheim-plus-mod.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-03-08T17:51:46+01:00", + "exported_at": "2022-05-15T11:15:06+02:00", "name": "Valheim Plus Mod", "author": "info@goover.de", "description": "A brutal exploration and survival game for 1-10 players, set in a procedurally-generated purgatory inspired by viking culture.", @@ -12,10 +12,10 @@ "steam_disk_space" ], "images": [ - "quay.io\/parkervcp\/pterodactyl-images:debian_source" + "ghcr.io\/parkervcp\/games:source" ], "file_denylist": [], - "startup": "export templdpath=$LD_LIBRARY_PATH; export DOORSTOP_ENABLE=TRUE; export DOORSTOP_INVOKE_DLL_PATH=.\/BepInEx\/core\/BepInEx.Preloader.dll; export DOORSTOP_CORLIB_OVERRIDE_PATH=.\/unstripped_corlib; export LD_LIBRARY_PATH=.\/doorstop_libs:$LD_LIBRARY_PATH; export LD_PRELOAD=libdoorstop_x64.so:$LD_PRELOAD; export LD_LIBRARY_PATH=.\/linux64:$LD_LIBRARY_PATH; export SteamAppId=892970; .\/valheim_server.x86_64 -nographics -batchmode -name \"{{SERVER_NAME}}\" -port {{SERVER_PORT}} -world \"{{WORLD}}\" -password \"{{PASSWORD}}\" -public ${PUBLIC} > >(sed -uE \"{{FILTER}}\") & trap \"{{STOP}}\" 15; wait $!", + "startup": "export DOORSTOP_ENABLE=TRUE; export DOORSTOP_INVOKE_DLL_PATH=.\/BepInEx\/core\/BepInEx.Preloader.dll; export DOORSTOP_CORLIB_OVERRIDE_PATH=.\/unstripped_corlib; export LD_LIBRARY_PATH=\".\/doorstop_libs:$LD_LIBRARY_PATH\"; export LD_PRELOAD=\"libdoorstop_x64.so:$LD_PRELOAD\"; export templdpath=$LD_LIBRARY_PATH; export LD_LIBRARY_PATH=\".\/linux64:$LD_LIBRARY_PATH\"; export SteamAppId=892970; export LD_LIBRARY_PATH=$templdpath; .\/valheim_server.x86_64 -nographics -batchmode -name \"{{SERVER_NAME}}\" -port {{SERVER_PORT}} -world \"{{WORLD}}\" -password \"{{PASSWORD}}\" -public ${PUBLIC} > >(sed -uE \"{{FILTER}}\") & trap \"{{STOP}}\" 15; wait $!", "config": { "files": "{}", "startup": "{\r\n \"done\": \"DungeonDB Start\"\r\n}", @@ -24,8 +24,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Valheim Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends --no-install-suggests install curl lib32gcc1 ca-certificates unzip jq wget\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\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\ncd \/mnt\/server\r\nwget -N $DOWNLOAD_LINK\r\nunzip -o $MATCH\r\nrm -fR $MATCH\r\n\r\nchmod u+x start_server_bepinex.sh", - "container": "debian:buster-slim", + "script": "#!\/bin\/bash\r\n# Valheim Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends --no-install-suggests install curl lib32gcc-s1 ca-certificates unzip jq wget\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\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\ncd \/mnt\/server\r\nwget -N $DOWNLOAD_LINK\r\nunzip -o $MATCH\r\nrm -fR $MATCH\r\n\r\nchmod u+x start_server_bepinex.sh", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, @@ -139,4 +139,4 @@ "rules": "required|string" } ] -} +} \ No newline at end of file From 2ef442053c75f86ee9b5345f7ade4988a7dc7a44 Mon Sep 17 00:00:00 2001 From: Bad <87938689+yesBad@users.noreply.github.com> Date: Sun, 15 May 2022 17:21:32 +0300 Subject: [PATCH 0398/1001] Fix L4D & L4D2 links in readme.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 19c8bea8..14ab3907 100644 --- a/README.md +++ b/README.md @@ -208,8 +208,8 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Hurtworld](game_eggs/steamcmd_servers/hurtworld) * [Insurgency: Sandstorm](game_eggs/steamcmd_servers/insurgency_sandstorm) * [Killing Floor 2](game_eggs/steamcmd_servers/killing_floor_2) -* [Left 4 Dead](game_eggs/steamcdm_servers/left4dead) -* [Left 4 Dead 2](game_eggs/steamcdm_servers/left4dead_2) +* [Left 4 Dead](game_eggs/steamcmd_servers/left4dead) +* [Left 4 Dead 2](game_eggs/steamcmd_servers/left4dead_2) * [Modiverse](game_eggs/steamcmd_servers/modiverse) * [Mordhau](game_eggs/steamcmd_servers/mordhau) * [No More Room in Hell](game_eggs/steamcmd_servers/nmrih) From 8d0fa47a8311bd478bd36bfb27cf330d1041de29 Mon Sep 17 00:00:00 2001 From: DaFray31 Date: Mon, 16 May 2022 15:33:15 +0200 Subject: [PATCH 0399/1001] Update egg-j-music-bot.json --- bots/discord/jmusicbot/egg-j-music-bot.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bots/discord/jmusicbot/egg-j-music-bot.json b/bots/discord/jmusicbot/egg-j-music-bot.json index 5804cde5..31f440c7 100644 --- a/bots/discord/jmusicbot/egg-j-music-bot.json +++ b/bots/discord/jmusicbot/egg-j-music-bot.json @@ -34,7 +34,7 @@ "default_value": "You need to get a token", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:70" + "rules": "required|string" }, { "name": "[REQUIRED] Bot Owner ID", From 62df08d68ad2c254a2aa1595a18d8b60e70077c4 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Mon, 16 May 2022 16:53:52 +0200 Subject: [PATCH 0400/1001] Update egg-gitea.json --- software/gitea/egg-gitea.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/software/gitea/egg-gitea.json b/software/gitea/egg-gitea.json index bb51ced3..f402222a 100644 --- a/software/gitea/egg-gitea.json +++ b/software/gitea/egg-gitea.json @@ -4,13 +4,13 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-07-07T21:58:54+02:00", + "exported_at": "2022-05-16T16:53:24+02:00", "name": "Gitea", "author": "mario.franze@gmail.com", "description": "Gitea is a community managed lightweight code hosting solution written in Go. It is published under the MIT license.", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:base_debian" + "ghcr.io\/parkervcp\/yolks:debian" ], "file_denylist": [], "startup": ".\/gitea web -p {{SERVER_PORT}} -c .\/app.ini", @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "apt update\r\napt install -y wget\r\n\r\ncd \/mnt\/server\r\n\r\nwget -O gitea https:\/\/dl.gitea.io\/gitea\/main\/gitea-main-linux-amd64\r\nchmod +x gitea\r\n\r\nmkdir custom\r\n\r\necho \"[server]\r\nLOCAL_ROOT_URL = http:\/\/localhost:${SERVER_PORT}\/\r\nDOMAIN = ${SERVER_IP}\r\nHTTP_PORT = ${SERVER_PORT}\r\nDISABLE_SSH = ${DISABLE_SSH}\r\nSSH_PORT = ${SSH_PORT}\" > \/mnt\/server\/custom\/app.ini\r\n\r\necho \"Install complete\"", + "script": "apt update\r\napt install -y wget\r\n\r\ncd \/mnt\/server\r\n\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"amd64\" || echo \"arm64\")\r\n\r\n\r\nwget -O gitea https:\/\/dl.gitea.io\/gitea\/main\/gitea-main-linux-${ARCH}\r\nchmod +x gitea\r\n\r\nmkdir custom\r\n\r\necho \"[server]\r\nLOCAL_ROOT_URL = http:\/\/localhost:${SERVER_PORT}\/\r\nDOMAIN = ${SERVER_IP}\r\nHTTP_PORT = ${SERVER_PORT}\r\nDISABLE_SSH = ${DISABLE_SSH}\r\nSSH_PORT = ${SSH_PORT}\" > \/mnt\/server\/custom\/app.ini\r\n\r\necho \"Install complete\"", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -47,4 +47,4 @@ "rules": "required|integer|between:1024,65535" } ] -} \ No newline at end of file +} From 284313d9077be76d2cb620515379bfdebc030b1c Mon Sep 17 00:00:00 2001 From: Enozi <54645039+enozii@users.noreply.github.com> Date: Mon, 16 May 2022 23:52:36 +0200 Subject: [PATCH 0401/1001] Create README.md --- game_eggs/steamcmd_servers/the_isle/README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 game_eggs/steamcmd_servers/the_isle/README.md diff --git a/game_eggs/steamcmd_servers/the_isle/README.md b/game_eggs/steamcmd_servers/the_isle/README.md new file mode 100644 index 00000000..3d30b42f --- /dev/null +++ b/game_eggs/steamcmd_servers/the_isle/README.md @@ -0,0 +1,13 @@ +# The Isle + +The Isle is an open beta with an open-world survival game where players choose from three factions in an attempt to survive a fierce island. Hunt. Prey. Survive. + +### Server Ports +The Isle requires 4 ports + +| Port | default | +|-------|---------| +| Game | 7777 | +| Query | 7778 | +| Rcon | 9999 | +| Queue | 10000 | From 198b887ccb08312877c05c293757e0e2281ef48f Mon Sep 17 00:00:00 2001 From: Enozi <54645039+enozii@users.noreply.github.com> Date: Mon, 16 May 2022 23:57:13 +0200 Subject: [PATCH 0402/1001] Added new egg --- .../the_isle/egg-the-isle.json | 104 ++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 game_eggs/steamcmd_servers/the_isle/egg-the-isle.json diff --git a/game_eggs/steamcmd_servers/the_isle/egg-the-isle.json b/game_eggs/steamcmd_servers/the_isle/egg-the-isle.json new file mode 100644 index 00000000..a7ecb4b1 --- /dev/null +++ b/game_eggs/steamcmd_servers/the_isle/egg-the-isle.json @@ -0,0 +1,104 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2022-05-16T23:56:39+02:00", + "name": "The Isle", + "author": "fredrik.johansenfuun@gmail.com", + "description": "The Isle is an open beta with an open-world survival game where players choose from three factions in an attempt to survive a fierce island. Hunt. Prey. Survive.", + "features": null, + "images": [ + "ghcr.io\/parkervcp\/games:source" + ], + "file_denylist": [], + "startup": "\/home\/container\/steamcmd\/steamcmd.sh +force_install_dir \/home\/container +login Anonymous +app_update 412680 -beta evrima +quit && \/home\/container\/TheIsle\/Binaries\/Linux\/TheIsleServer-Linux-Shipping -Port=$SERVER_PORT -QueryPort=$QUERY_PORT", + "config": { + "files": "{\r\n \"\/TheIsle\/Saved\/Config\/LinuxServer\/Game.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"ServerName\": \"ServerName={{server.build.env.SERVER_NAME}}\",\r\n \"MaxPlayerCount\": \"MaxPlayerCount={{server.build.env.PLAYER_COUNT}}\",\r\n \"MaxPlayers\": \"MaxPlayers={{server.build.env.PLAYER_COUNT}}\",\r\n \"RconEnabled\": \"RconEnabled={{server.build.env.RCON}}\",\r\n \"RconPort\": \"RconPort={{server.build.env.RCON_PORT}}\",\r\n \"RconPassword\": \"RconPassword={{server.build.env.RCON_PASSWORD}}\",\r\n\"QueuePort\": \"QueuePort={{server.build.env.QUEUE_PORT}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Anti cheat Session start result\"\r\n}", + "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id ffound here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# EXTRA_FLAGS - when a server has extra glas for things like beta installs or updates.\r\n#\r\n##\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\necho -e \"steam user is not set.\\n\"\r\necho -e \"Using anonymous user.\\n\"\r\nSTEAM_USER=anonymous\r\nSTEAM_PASS=\"\"\r\nSTEAM_AUTH=\"\"\r\nelse\r\necho -e \"user set to ${STEAM_USER}\"\r\nfi\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\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\nexport HOME=\/mnt\/server\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login Anonymous +app_update 412680 -beta evrima validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n# The Isle\r\nmkdir -p \/mnt\/server\/TheIsle\/Saved\/Config\/LinuxServer\r\ncat > \/mnt\/server\/TheIsle\/Saved\/Config\/LinuxServer\/Game.ini << ENDOFFILE\r\n[\/Script\/Engine.Game]\r\nRconEnabled=${RCON}\r\nRconPort=${RCON_PORT}\r\nRconPassword=${RCON_PASSWORD}\r\n-\r\n[\/Script\/TheIsle.TIGameSession]\r\nServerName=${SERVER_NAME}\r\nMaxPlayerCount=${PLAYER_COUNT}\r\nbEnableGlobalChat=true\r\nbGlobalIsSpeciesOnly=false\r\nbLocalIsSpeciesOnly=true\r\nLocalChatRange=20000.f\r\nQueuePort=${QUEUE_PORT}\r\n-\r\n[\/Script\/Engine.GameSession]\r\nMaxPlayers=${PLAYER_COUNT}\r\n-\r\n[\/Script\/TheIsle.TIGameStateBase]\r\nAdminsSteamIDs=${ADMINSTEAMID}\r\nENDOFFILE\r\nchmod -R 777 \/mnt\/server\/TheIsle\/Saved\/Config\/LinuxServer", + "container": "ghcr.io\/parkervcp\/installers:debian", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Server Name", + "description": "Sets the name for the server", + "env_variable": "SERVER_NAME", + "default_value": "A Pterodactyl server!", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:40" + }, + { + "name": "Player Count", + "description": "", + "env_variable": "PLAYER_COUNT", + "default_value": "100", + "user_viewable": true, + "user_editable": true, + "rules": "required|numeric|digits_between:1,100" + }, + { + "name": "Query Port", + "description": "", + "env_variable": "QUERY_PORT", + "default_value": "7778", + "user_viewable": false, + "user_editable": false, + "rules": "required" + }, + { + "name": "Server admin", + "description": "", + "env_variable": "ADMINSTEAMID", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable" + }, + { + "name": "RCON", + "description": "", + "env_variable": "RCON", + "default_value": "false", + "user_viewable": true, + "user_editable": true, + "rules": "required|in:true,false" + }, + { + "name": "Rcon Port", + "description": "", + "env_variable": "RCON_PORT", + "default_value": "9999", + "user_viewable": true, + "user_editable": true, + "rules": "required|numeric" + }, + { + "name": "RCON Password", + "description": "", + "env_variable": "RCON_PASSWORD", + "default_value": "RCON_password_is_a_must", + "user_viewable": true, + "user_editable": true, + "rules": "required|string" + }, + { + "name": "Queue Port", + "description": "", + "env_variable": "QUEUE_PORT", + "default_value": "10000", + "user_viewable": true, + "user_editable": true, + "rules": "required|numeric" + } + ] +} \ No newline at end of file From d0e4d3bb18f6b1fe495250f6236d55e7a77f4c2f Mon Sep 17 00:00:00 2001 From: Enozi <54645039+enozii@users.noreply.github.com> Date: Mon, 16 May 2022 23:59:01 +0200 Subject: [PATCH 0403/1001] Update README.md Added The Isle --- game_eggs/steamcmd_servers/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/game_eggs/steamcmd_servers/README.md b/game_eggs/steamcmd_servers/README.md index 448c6b72..d3e292c6 100644 --- a/game_eggs/steamcmd_servers/README.md +++ b/game_eggs/steamcmd_servers/README.md @@ -172,6 +172,10 @@ This is a collection of servers that use SteamCMD to install. [The Forest](the_forest) +## The Isle + +[The Isle](the_isle) + ## Tower Unite [Tower Unite](tower_unite) From de0bafcf370e0fddfa7b071d394d9ecbe47f1590 Mon Sep 17 00:00:00 2001 From: Enozi <54645039+enozii@users.noreply.github.com> Date: Tue, 17 May 2022 00:00:12 +0200 Subject: [PATCH 0404/1001] Update README.md Added The isle --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 14ab3907..1d751908 100644 --- a/README.md +++ b/README.md @@ -237,6 +237,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Subnautica: Nitrox Mod](game_eggs/steamcmd_servers/subnautica_nitrox_mod) * [Sven Co-op](game_eggs/steamcmd_servers/svencoop) * [The Forest](game_eggs/steamcmd_servers/the_forest) +* [The Isle](game_eggs/steamcmd_servers/the_isle) * [Team Fortress 2 Classic](game_eggs/steamcmd_servers/team_fortress_2_classic) * [Tower Unite](game_eggs/steamcmd_servers/tower_unite) * [Unturned](game_eggs/steamcmd_servers/unturned) From bbf66326fe4a5e8835feaf7b1ecc19d2cd8ab063 Mon Sep 17 00:00:00 2001 From: Enozi <54645039+enozii@users.noreply.github.com> Date: Tue, 17 May 2022 00:02:21 +0200 Subject: [PATCH 0405/1001] Update README.md Added The Isle --- game_eggs/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/game_eggs/README.md b/game_eggs/README.md index 5458c143..cdc941cd 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -154,6 +154,7 @@ * [Sven Co-op](steamcmd_servers/svencoop) * [Team Fortress 2 Classic](steamcmd_servers/team_fortress_2_classic) * [The Forest](steamcmd_servers/the_forest) +* [The Isle](steamcmd_servers/the_isle) * [Tower Unite](steamcmd_servers/tower_unite) * [Unturned](steamcmd_servers/unturned) * [Valheim](steamcmd_servers/valheim) From 1816b94835336e8b84ff3e88f8bd3a49578996d4 Mon Sep 17 00:00:00 2001 From: Enozi <54645039+enozii@users.noreply.github.com> Date: Tue, 17 May 2022 00:12:56 +0200 Subject: [PATCH 0406/1001] Feat: The Isle egg --- .../steamcmd_servers/the_isle/egg-the-isle.json | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/game_eggs/steamcmd_servers/the_isle/egg-the-isle.json b/game_eggs/steamcmd_servers/the_isle/egg-the-isle.json index a7ecb4b1..3459b86b 100644 --- a/game_eggs/steamcmd_servers/the_isle/egg-the-isle.json +++ b/game_eggs/steamcmd_servers/the_isle/egg-the-isle.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2022-05-16T23:56:39+02:00", + "exported_at": "2022-05-17T00:10:05+02:00", "name": "The Isle", "author": "fredrik.johansenfuun@gmail.com", "description": "The Isle is an open beta with an open-world survival game where players choose from three factions in an attempt to survive a fierce island. Hunt. Prey. Survive.", @@ -55,15 +55,6 @@ "user_editable": false, "rules": "required" }, - { - "name": "Server admin", - "description": "", - "env_variable": "ADMINSTEAMID", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "nullable" - }, { "name": "RCON", "description": "", @@ -101,4 +92,4 @@ "rules": "required|numeric" } ] -} \ No newline at end of file +} From 82fb0bcf7d085680f058c4347e1176ee9d7ea24a Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Fri, 20 May 2022 13:51:22 -0700 Subject: [PATCH 0407/1001] Initial Upload of Arma Reforger Egg - Added new egg - Added README for egg - Updated all directory READMEs (including fixing some style issues with `game_eggs\steamcmd_servers\README.md`) --- README.md | 1 + game_eggs/README.md | 1 + game_eggs/steamcmd_servers/README.md | 14 +- game_eggs/steamcmd_servers/arma/README.md | 1 + .../arma/arma_reforger/README.md | 90 ++++++++++ .../arma/arma_reforger/egg-arma-reforger.json | 168 ++++++++++++++++++ 6 files changed, 270 insertions(+), 5 deletions(-) create mode 100644 game_eggs/steamcmd_servers/arma/arma_reforger/README.md create mode 100644 game_eggs/steamcmd_servers/arma/arma_reforger/egg-arma-reforger.json diff --git a/README.md b/README.md index 14ab3907..4710d74d 100644 --- a/README.md +++ b/README.md @@ -193,6 +193,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [ARK: Survival Evolved](game_eggs/steamcmd_servers/ark_survival_evolved) * [Arma](game_eggs/steamcmd_servers/arma) * [Arma 3](game_eggs/steamcmd_servers/arma/arma3) + * [Arma Reforger](game_eggs/steamcmd_servers/arma/arma_reforger) * [Assetto Corsa](game_eggs/steamcmd_servers/assetto_corsa) * [Avorion](game_eggs/steamcmd_servers/avorion) * [Barotrauma](game_eggs/steamcmd_servers/barotrauma) diff --git a/game_eggs/README.md b/game_eggs/README.md index 5458c143..0e21e6cd 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -109,6 +109,7 @@ * [ARK: Survival Evolved](steamcmd_servers/ark_survival_evolved) * [Arma](steamcmd_servers/arma) * [Arma 3](steamcmd_servers/arma/arma3) + * [Arma Reforger](steamcmd_servers/arma/arma_reforger) * [Assetto Corsa](steamcmd_servers/assetto_corsa) * [Avorion](steamcmd_servers/avorion) * [Barotrauma](steamcmd_servers/barotrauma) diff --git a/game_eggs/steamcmd_servers/README.md b/game_eggs/steamcmd_servers/README.md index 448c6b72..4201e3f9 100644 --- a/game_eggs/steamcmd_servers/README.md +++ b/game_eggs/steamcmd_servers/README.md @@ -12,7 +12,9 @@ This is a collection of servers that use SteamCMD to install. ## Arma -[Arma 3](arma/arma3) +* [Arma](arma) + * [Arma 3](arma/arma3) + * [Arma Reforger](arma/arma_reforger) ## Assetto Corsa @@ -35,6 +37,7 @@ This is a collection of servers that use SteamCMD to install. [Conan Exiles](conan_exiles) ## Craftopia + [Craftopia](craftopia) ## CryoFall @@ -70,9 +73,11 @@ This is a collection of servers that use SteamCMD to install. [Killing Floor 2](killing_floor_2) ## Left 4 Dead + [Left 4 Dead](left4dead) ## Left 4 Dead 2 + [Left 4 Dead](left4dead_2) ## Modiverse @@ -182,7 +187,6 @@ This is a collection of servers that use SteamCMD to install. ## Valheim -[Valheim](valheim) - -* [Valheim Vanilla](valheim/valheim_vanilla) -* [Valheim Plus Mod](valheim/valheim_plus) +* [Valheim](valheim) + * [Valheim Vanilla](valheim/valheim_vanilla) + * [Valheim Plus Mod](valheim/valheim_plus) diff --git a/game_eggs/steamcmd_servers/arma/README.md b/game_eggs/steamcmd_servers/arma/README.md index 9e667cb5..e86d12e7 100644 --- a/game_eggs/steamcmd_servers/arma/README.md +++ b/game_eggs/steamcmd_servers/arma/README.md @@ -5,3 +5,4 @@ ARMA is a series of first-person tactical military shooters, originally released ## Arma Titles * [Arma 3](arma3) +* [Arma Reforger](arma_reforger) diff --git a/game_eggs/steamcmd_servers/arma/arma_reforger/README.md b/game_eggs/steamcmd_servers/arma/arma_reforger/README.md new file mode 100644 index 00000000..7a4c9c4a --- /dev/null +++ b/game_eggs/steamcmd_servers/arma/arma_reforger/README.md @@ -0,0 +1,90 @@ +# Arma Reforger + +***Server version currently marked as early access by the Arma developers! Check back often for egg updates as more features are added to the server software.*** +___ + +## Authors / Contributors + + + +
      + + + +
      + +
      Red-Thirten +       +
      + 💻 + 🔨 +
      + + + +___ + +### Game Description + +From Bohemia Interactive's [Website](https://reforger.armaplatform.com/): +> Experience authentic Cold War combat and join friends in the struggle for a sprawling, 51 km² mid-Atlantic island — or take on the role of Game Master and create your very own scenarios for others to enjoy. +___ + +### Egg Capabilities + +- Configurable to automatically check for server updates on start via SteamCMD. Forcing validation is also configurable. +- Able to download and load Arma Reforger Workshop mods on startup (requires manual editing of the `config.json` file). +- Configuration of multiple common settings in the `config.json` file via Startup Parameters: + - Server Name, Passwords, Scenario ID, Disable Third Person, Max FPS, and more... +- Max Players is configurable and able to be host enforced (\*see [Recommended Egg Modifications](#restrict-max-players)). +- [WHMCS](https://www.whmcs.com/) compatible. + +___ + +### Server Ports + +| Port | Default (UDP) | Notes | +|---------|---------|---------| +| **Game** | 2001 | **Required** / Primary port in Pterodactyl | +| Steam communication | 50000..65000 | Documented, but not seemingly needed | +| Steam Query | 17777 | Used to provide Steam with server status (but does not seemingly need to be forwarded) | + +___ + +### Installation/System Requirements + +| | Bare Minimum | Recommended | +|---------|---------|---------| +| Processor | Recent x86/64 (AMD/Intel) processor. No ARM support. | Can use up to 300-600% CPU under load with uncapped FPS (set Max FPS to prevent). | +| RAM | 3328 MiB | 6144-8192 MiB | +| Storage | 5 GB | 7-10 GB (or more, depending on number of mods downloaded) | +| Network | If node is behind a NAT, will require Egg Modification (\*see [Define Host Registered Bind Address](#define-host-registered-bind-address) | Pterodactyl Node is not behind a NAT | +| Game Ownership | Not required to start or download mods. | ---- | + +___ + +### How to Add Mods + +**TODO** + +___ + +### Recommended Egg Modifications + +The following are highly recommended variable modifications you can make to the egg after importing it to your panel. + +#### Define Host Registered Bind Address + +Due to a current behavior of Pterodactyl, `SERVER_IP` will not return the node's public IP address if it is behind a NAT; it will return its private IP address. Unfortunately at this time, Arma Reforger **requires** the server's public IP address to be strictly defined within `config.json`. If you know your node is behind a NAT (or you are finding your node's private IP address being added to `config.json`), you will need to edit this egg after importing it by following these steps: + +1. As a panel admin, find and open the egg within your Nests tab. +2. On the first tab, "Configuration", find the "Configuration Files" box under the "Process Management" section. +3. Carefully (as to not touch anything else), find `{{server.build.default.ip}}` and replace it with your node's public IP address. If done correctly, the line should now look something like this: + +```json +" \"gameHostRegisterBindAddress\"": " \"gameHostRegisterBindAddress\": \"123.4.56.789\",", +``` + +#### Restrict Max Players + +If you would like to restrict the maximum number of players that can join your client's server, you can change the permissions of the "Max Players" variable so that clients can only view this value (and not edit it). It's default value can also be changed, or the value can be changed on a server-by-server basis as desired. diff --git a/game_eggs/steamcmd_servers/arma/arma_reforger/egg-arma-reforger.json b/game_eggs/steamcmd_servers/arma/arma_reforger/egg-arma-reforger.json new file mode 100644 index 00000000..90e9004b --- /dev/null +++ b/game_eggs/steamcmd_servers/arma/arma_reforger/egg-arma-reforger.json @@ -0,0 +1,168 @@ +{ + "_comment": "Pterodactyl Satisfactory Egg ~ Red-Thirten ~ 2022-05-19", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "name": "Arma Reforger", + "author": "rehlmgaming@gmail.com", + "description": "Experience authentic Cold War combat and join friends in the struggle for a sprawling, 51 km\u00b2 mid-Atlantic island \u2014 or take on the role of Game Master and create your very own scenarios for others to enjoy.", + "features": [ + "steam_disk_space" + ], + "images": [ + "ghcr.io\/parkervcp\/games:source" + ], + "file_denylist": [], + "startup": ".\/ArmaReforgerServer -gproj .\/addons\/data\/ArmaReforger.gproj -config .\/config.json -profile .\/profile -backendlog -nothrow -listScenarios -logStats $(({{LOG_INTERVAL}}*1000)) -maxFPS {{MAX_FPS}}", + "config": { + "files": "{\r\n \"config.json\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \" \\\"region\\\"\": \" \\\"region\\\": \\\"{{server.build.env.REGION}}\\\",\",\r\n \" \\\"gameHostBindAddress\\\"\": \" \\\"gameHostBindAddress\\\": \\\"0.0.0.0\\\",\",\r\n \" \\\"gameHostBindPort\\\"\": \" \\\"gameHostBindPort\\\": {{server.build.default.port}},\",\r\n \" \\\"gameHostRegisterBindAddress\\\"\": \" \\\"gameHostRegisterBindAddress\\\": \\\"{{server.build.default.ip}}\\\",\",\r\n \" \\\"gameHostRegisterPort\\\"\": \" \\\"gameHostRegisterPort\\\": {{server.build.default.port}},\",\r\n \" \\\"adminPassword\\\"\": \" \\\"adminPassword\\\": \\\"{{server.build.env.ADMIN_PASS}}\\\",\",\r\n \" \\\"name\\\"\": \" \\\"name\\\": \\\"{{server.build.env.SERVER_NAME}}\\\",\",\r\n \" \\\"password\\\"\": \" \\\"password\\\": \\\"{{server.build.env.SERVER_PASS}}\\\",\",\r\n \" \\\"scenarioId\\\"\": \" \\\"scenarioId\\\": \\\"{{server.build.env.SCENARIO_ID}}\\\",\",\r\n \" \\\"playerCountLimit\\\"\": \" \\\"playerCountLimit\\\": {{server.build.env.MAX_PLAYERS}},\",\r\n\t\t\t\" \\\"autoJoinable\\\"\": \" \\\"autoJoinable\\\": {{server.build.env.AUTO_JOINABLE}},\",\r\n\t\t\t\" \\\"visible\\\"\": \" \\\"visible\\\": {{server.build.env.VISIBLE}},\",\r\n\t\t\t\" \\\"disableThirdPerson\\\"\": \" \\\"disableThirdPerson\\\": {{server.build.env.DISABLE_THIRD}},\",\r\n\t\t\t\" \\\"battlEye\\\"\": \" \\\"battlEye\\\": {{server.build.env.BATTLEYE}},\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Starting RPL server\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl Arma Reforger Egg - egg-arma-reforger.json\r\n## Author: David Wolfe (Red-Thirten)\r\n## Date: 2022\/05\/20\r\n## License: MIT License\r\n## Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n# Install packages. Default packages below are skipped if using image noted above, thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n# Download and install SteamCMD\r\nexport HOME=\/mnt\/server\r\ncd \/tmp\r\nmkdir -p $HOME\/steamcmd $HOME\/steamapps\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C $HOME\/steamcmd\r\ncd $HOME\/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\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +force_install_dir $HOME +login anonymous +app_update ${SRCDS_APPID} validate +quit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so $HOME\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so $HOME\/.steam\/sdk64\/steamclient.so\r\n\r\n## Arma Reforger setup\r\n# Check for successful installation\r\nif [[ ! -f $HOME\/ArmaReforgerServer ]]; then\r\n echo -e \"\\n\\nSteamCMD failed to install the Arma Reforger Dedicated Server!\"\r\n echo -e \"\\tTry reinstalling the server again.\\n\"\r\n exit 1\r\nfi\r\n\r\nmkdir -p $HOME\/profile\r\n\r\necho -e 'Creating default \"config.json\" configuration file...'\r\ncat > $HOME\/config.json << EOF\r\n{\r\n\t\"dedicatedServerId\": \"\",\r\n\t\"region\": \"${REGION}\",\r\n\t\"gameHostBindAddress\": \"0.0.0.0\",\r\n\t\"gameHostBindPort\": ${SERVER_PORT},\r\n\t\"gameHostRegisterBindAddress\": \"${SERVER_IP}\",\r\n\t\"gameHostRegisterPort\": ${SERVER_PORT},\r\n\t\"adminPassword\": \"${ADMIN_PASS}\",\r\n\t\"game\": {\r\n\t\t\"name\": \"${SERVER_NAME}\",\r\n\t\t\"password\": \"${SERVER_PASS}\",\r\n\t\t\"scenarioId\": \"${SCENARIO_ID}\",\r\n\t\t\"playerCountLimit\": ${MAX_PLAYERS},\r\n\t\t\"autoJoinable\": ${AUTO_JOINABLE},\r\n\t\t\"visible\": ${VISIBLE},\r\n\t\t\"gameProperties\": {\r\n\t\t\t\"serverMaxViewDistance\": 2500,\r\n\t\t\t\"serverMinGrassDistance\": 50,\r\n\t\t\t\"networkViewDistance\": 1000,\r\n\t\t\t\"disableThirdPerson\": ${DISABLE_THIRD},\r\n\t\t\t\"fastValidation\": true,\r\n\t\t\t\"battlEye\": ${BATTLEYE},\r\n\t\t\t\"missionHeader\": {}\r\n\t\t},\r\n\t\t\"mods\": []\r\n\t}\r\n}\r\nEOF\r\n\r\necho -e \"\\nArma Reforger Dedicated Server successfully installed!\\n\"", + "container": "ghcr.io\/parkervcp\/installers:debian", + "entrypoint": "\/bin\/bash" + } + }, + "variables": [ + { + "name": "Automatic Updates", + "description": "Quickly checks for any server or mod updates on startup, and updates if necessary.", + "env_variable": "AUTO_UPDATE", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "boolean" + }, + { + "name": "Server Region", + "description": "Region listed in the server browser. ISO 3166-1 alpha-2 codes can be used in this field.", + "env_variable": "REGION", + "default_value": "US", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:AD,AE,AF,AG,AI,AL,AM,AO,AQ,AR,AS,AT,AU,AW,AX,AZ,BA,BB,BD,BE,BF,BG,BH,BI,BJ,BL,BM,BN,BO,BQ,BR,BS,BT,BV,BW,BY,BZ,CA,CC,CD,CF,CG,CH,CI,CK,CL,CM,CN,CO,CR,CU,CV,CW,CX,CY,CZ,DE,DJ,DK,DM,DO,DZ,EC,EE,EG,EH,ER,ES,ET,EU,FI,FJ,FK,FM,FO,FR,GA,GB,GD,GE,GF,GG,GH,GI,GL,GM,GN,GP,GQ,GR,GS,GT,GU,GW,GY,HK,HM,HN,HR,HT,HU,ID,IE,IL,IM,IN,IO,IQ,IR,IS,IT,JE,JM,JO,JP,KE,KG,KH,KI,KM,KN,KP,KR,KW,KY,KZ,LA,LB,LC,LI,LK,LR,LS,LT,LU,LV,LY,MA,MC,MD,ME,MF,MG,MH,MK,ML,MM,MN,MO,MP,MQ,MR,MS,MT,MU,MV,MW,MX,MY,MZ,NA,NC,NE,NF,NG,NI,NL,NO,NP,NR,NU,NZ,OM,PA,PE,PF,PG,PH,PK,PL,PM,PN,PR,PS,PT,PW,PY,QA,RE,RO,RS,RU,RW,SA,SB,SC,SD,SE,SG,SH,SI,SJ,SK,SL,SM,SN,SO,SR,SS,ST,SV,SX,SY,SZ,TC,TD,TF,TG,TH,TJ,TK,TL,TM,TN,TO,TR,TT,TV,TW,TZ,UA,UG,UM,US,UY,UZ,VA,VC,VE,VG,VI,VN,VU,WF,WS,YE,YT,ZA,ZM,ZW" + }, + { + "name": "Server Name", + "description": "Name displayed in the server browser.", + "env_variable": "SERVER_NAME", + "default_value": "Arma Reforger Server", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:255" + }, + { + "name": "Max Players", + "description": "Maximum number of players allowed to join the server.", + "env_variable": "MAX_PLAYERS", + "default_value": "32", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|between:1,64" + }, + { + "name": "Server Password", + "description": "Password required for clients to enter before they can join the server. Leave empty to have no password.", + "env_variable": "SERVER_PASS", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|max:32" + }, + { + "name": "Admin Password", + "description": "", + "env_variable": "ADMIN_PASS", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|max:32" + }, + { + "name": "Scenario ID", + "description": "ID of scenario to run\/play. Valid IDs can be viewed in the console upon startup of the server.", + "env_variable": "SCENARIO_ID", + "default_value": "{ECC61978EDCC2B5A}Missions\/23_Campaign.conf", + "user_viewable": true, + "user_editable": true, + "rules": "required|string" + }, + { + "name": "Auto Joinable", + "description": "Set if the session can be selected through the auto join feature.", + "env_variable": "AUTO_JOINABLE", + "default_value": "true", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:true,false" + }, + { + "name": "Visible in Server Browser", + "description": "Set the visibility of the server in the Server Browser.", + "env_variable": "VISIBLE", + "default_value": "true", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:true,false" + }, + { + "name": "Enable BattlEye", + "description": "Enables the anti-cheat engine on the server and requires all clients to be running it.", + "env_variable": "BATTLEYE", + "default_value": "true", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:true,false" + }, + { + "name": "Disable Third Person", + "description": "", + "env_variable": "DISABLE_THIRD", + "default_value": "false", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:true,false" + }, + { + "name": "[Advanced] Max FPS", + "description": "Sets a maximum FPS limit for the server, saving performance in some cases. Leave empty for no limit.", + "env_variable": "MAX_FPS", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|integer|gt:0" + }, + { + "name": "[Advanced] Log FPS Interval", + "description": "How often (in seconds) to log the FPS and other debug stats to the console. Set to 0 to disable.", + "env_variable": "LOG_INTERVAL", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|min:0" + }, + { + "name": "[Repair] Validate Server Files", + "description": "\"true\" to enable; empty to disable. Validates all server files when Automatic Updates is enabled. Note: This will significantly increase server startup times, so it is recommended to only enable this when needed.", + "env_variable": "VALIDATE", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "[Advanced] Arma Reforger Dedicated Server App ID", + "description": "Used for installation and updates. Rarely needs to be changed.", + "env_variable": "SRCDS_APPID", + "default_value": "1874900", + "user_viewable": false, + "user_editable": false, + "rules": "required|integer" + } + ] +} \ No newline at end of file From 1db3cab7382ccd568fea6753c869853a8f3a91d1 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Fri, 20 May 2022 15:14:56 -0700 Subject: [PATCH 0408/1001] Updated README & Small Fix - Added "How to Add Mods" section to egg's README. - Fixed copy/paste mistake on `_comment` line of egg. --- .../arma/arma_reforger/README.md | 39 ++++++++++++++++++- .../arma/arma_reforger/egg-arma-reforger.json | 2 +- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/game_eggs/steamcmd_servers/arma/arma_reforger/README.md b/game_eggs/steamcmd_servers/arma/arma_reforger/README.md index 7a4c9c4a..ad985660 100644 --- a/game_eggs/steamcmd_servers/arma/arma_reforger/README.md +++ b/game_eggs/steamcmd_servers/arma/arma_reforger/README.md @@ -17,6 +17,13 @@ ___       💻 🔨 + + +
      Soljian +       +
      + 💡 + @@ -65,7 +72,35 @@ ___ ### How to Add Mods -**TODO** +Currently, adding mods to your server is tricky because there is very little documentation and it is difficult to find mod IDs. Hopefully this will change in the future, but following these steps will get it to work: + +1. Open up a client copy of Arma Reforger and subscribe/download any mods you want to add to the server (at this time, I do not know of a way to find mod IDs without requiring use of the game). +2. Once done, close the game and navigate to this folder on your computer: `My Documents\My Games\ArmaReforger\addons\` +3. Aimlessly open each folder to find which mods you want to add and open each of their `ServerData.json` files in a text editor. +4. Then, on your server panel, open the `config.json` file for editing. +5. Find `"mods": []` and replace it with the following: + +```json +"mods": [ + { + "modId": "591AF5BDA9F7CE8B", + "name": "Capture & Hold", + "version": "1.0.0" + }, + { + "modId": "9A51598BACFBFDE7", + "name": "Explosive Goats Beta", + "version": "0.5.42" + } +] +``` + +6. Change `modId` to equal the `id` value found at the top of the `ServerData.json` file you found. +7. Change `name` to equal the `name` value found at the **top** of the `ServerData.json` file you found. +8. Change `version` to equal the `version` value found at the top of the `ServerData.json` file you found. +9. Repeat for each mod you want to add by copy/pasting the `{}` sections like shown above. Make sure each `{}` section has a `,` after it, **except** for the last item. + +The server will automatically download and run the mods you specify on startup. For mods that add scenarios, you can find the Scenario IDs listed as `gameId` in the `ServerData.json` file. Lastly, if a mod updates, you will likely have to change the `version` value to match it's new version. You may also have to delete the mod folder in the `addons/` directory to have it re-download (reports on this have been mixed). ___ @@ -78,7 +113,7 @@ The following are highly recommended variable modifications you can make to the Due to a current behavior of Pterodactyl, `SERVER_IP` will not return the node's public IP address if it is behind a NAT; it will return its private IP address. Unfortunately at this time, Arma Reforger **requires** the server's public IP address to be strictly defined within `config.json`. If you know your node is behind a NAT (or you are finding your node's private IP address being added to `config.json`), you will need to edit this egg after importing it by following these steps: 1. As a panel admin, find and open the egg within your Nests tab. -2. On the first tab, "Configuration", find the "Configuration Files" box under the "Process Management" section. +2. On the first tab "Configuration", find the "Configuration Files" box under the "Process Management" section. 3. Carefully (as to not touch anything else), find `{{server.build.default.ip}}` and replace it with your node's public IP address. If done correctly, the line should now look something like this: ```json diff --git a/game_eggs/steamcmd_servers/arma/arma_reforger/egg-arma-reforger.json b/game_eggs/steamcmd_servers/arma/arma_reforger/egg-arma-reforger.json index 90e9004b..de4ff725 100644 --- a/game_eggs/steamcmd_servers/arma/arma_reforger/egg-arma-reforger.json +++ b/game_eggs/steamcmd_servers/arma/arma_reforger/egg-arma-reforger.json @@ -1,5 +1,5 @@ { - "_comment": "Pterodactyl Satisfactory Egg ~ Red-Thirten ~ 2022-05-19", + "_comment": "Pterodactyl Arma Reforger Egg ~ Red-Thirten ~ 2022-05-20", "meta": { "version": "PTDL_v1", "update_url": null From 65d5978e8c1d3e60637f37c7fa47380be23dbfc6 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Sat, 21 May 2022 18:31:51 +0300 Subject: [PATCH 0409/1001] fix: update Paper API Paper api endpoints have been updated to api.papermc.io/v2 from the old papermc.io/api/v2 This is a copy of default Paper egg from the Panel, but without PTDL_V2 changes, which requires Panel 1.8+ that has not been released yet. --- game_eggs/minecraft/java/paper/egg-paper.json | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/game_eggs/minecraft/java/paper/egg-paper.json b/game_eggs/minecraft/java/paper/egg-paper.json index bbb9de1b..98d3195e 100644 --- a/game_eggs/minecraft/java/paper/egg-paper.json +++ b/game_eggs/minecraft/java/paper/egg-paper.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-12-09T13:30:53-05:00", + "exported_at": "2022-05-21T10:48:18-04:00", "name": "Paper", "author": "parker@pterodactyl.io", "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", @@ -14,24 +14,24 @@ "pid_limit" ], "images": [ - "ghcr.io\/pterodactyl\/yolks:java_17", - "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_8", "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_8" + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17" ], "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { - "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \")! For help, type \",\r\n \"userInteraction\": [\r\n \"Go to eula.txt for more info.\"\r\n ]\r\n}", + "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \")! For help, type \"\r\n}", "logs": "{}", "stop": "stop" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=paper\r\n\r\napt update\r\napt install -y curl jq\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} version\"\r\n\t\tMINECRAFT_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\t\r\n\tBUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | tostring | contains($BUILD)' | grep true`\r\n\tLATEST_BUILD=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION} | jq -r '.builds' | jq -r '.[-1]'`\r\n\t\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\t\tBUILD_NUMBER=${LATEST_BUILD}\r\n\tfi\r\n\t\r\n\tJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n\techo \"Version being downloaded\"\r\n\techo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n\techo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\tDOWNLOAD_URL=https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION}\/builds\/${BUILD_NUMBER}\/downloads\/${JAR_NAME}\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"Downloading MC server.properties\"\r\n curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/java\/server.properties\r\nfi", - "container": "debian:buster-slim", - "entrypoint": "bash" + "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=paper\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/api.papermc.io\/v2\/projects\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep -m1 true`\r\n\tLATEST_VERSION=`curl -s https:\/\/api.papermc.io\/v2\/projects\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n\telse\r\n\t\techo -e \"Specified version not found. Defaulting to the latest ${PROJECT} version\"\r\n\t\tMINECRAFT_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\r\n\tBUILD_EXISTS=`curl -s https:\/\/api.papermc.io\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | tostring | contains($BUILD)' | grep -m1 true`\r\n\tLATEST_BUILD=`curl -s https:\/\/api.papermc.io\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION} | jq -r '.builds' | jq -r '.[-1]'`\r\n\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\t\tBUILD_NUMBER=${LATEST_BUILD}\r\n\tfi\r\n\r\n\tJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\r\n\techo \"Version being downloaded\"\r\n\techo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n\techo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\tDOWNLOAD_URL=https:\/\/api.papermc.io\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION}\/builds\/${BUILD_NUMBER}\/downloads\/${JAR_NAME}\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"Downloading MC server.properties\"\r\n curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", + "container": "ghcr.io\/pterodactyl\/installers:alpine", + "entrypoint": "ash" } }, "variables": [ @@ -41,7 +41,7 @@ "env_variable": "MINECRAFT_VERSION", "default_value": "latest", "user_viewable": true, - "user_editable": false, + "user_editable": true, "rules": "nullable|string|max:20" }, { @@ -51,7 +51,7 @@ "default_value": "server.jar", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" }, { "name": "Download Path", @@ -68,7 +68,7 @@ "env_variable": "BUILD_NUMBER", "default_value": "latest", "user_viewable": true, - "user_editable": false, + "user_editable": true, "rules": "required|string|max:20" } ] From d0d92996a3340c9526abc895df23f957fc7a70b2 Mon Sep 17 00:00:00 2001 From: Doc Date: Sun, 22 May 2022 00:21:59 -0400 Subject: [PATCH 0410/1001] Update download API for Magma --- game_eggs/minecraft/java/magma/egg-magma.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/game_eggs/minecraft/java/magma/egg-magma.json b/game_eggs/minecraft/java/magma/egg-magma.json index 49e63930..9be55697 100644 --- a/game_eggs/minecraft/java/magma/egg-magma.json +++ b/game_eggs/minecraft/java/magma/egg-magma.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2022-01-11T09:07:47-05:00", + "exported_at": "2022-05-22T00:20:47-04:00", "name": "Magma", "author": "support@pterodactyl.io", "description": "Magma is most powerful Forge server providing you with Forge mods and Bukkit Plugins using Spigot and Paper for Performance Optimization and Stability.", @@ -28,7 +28,7 @@ }, "scripts": { "installation": { - "script": "apt update\r\napt install -y curl jq\r\n\r\nif [[ ! -d \/mnt\/server ]]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\/\r\n\r\n# get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/resources\/magma\/1.16.5\/${BRANCH}\/latest\")\r\nOLD_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/resources\/magma\/1.12\/${BRANCH}\/latest\")\r\n\r\nif [[ -z \"${MC_VERSION}\" ]] || [[ \"${MC_VERSION}\" == \"latest\" ]]; then\r\n echo -e \"Version not set. Defaulting to latest\"\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i installer.jar)\r\n\r\nelif [[ $MC_VERSION =~ ^1\\.(16|17|18|19|20|21|22|23) ]]; then\r\n CUSTOM_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/resources\/magma\/${MC_VERSION}\/${BRANCH}\/latest\")\r\n DOWNLOAD_LINK=$(echo ${CUSTOM_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i installer.jar)\r\nelif [[ \"${MC_VERSION}\" == \"1.12\" ]]; then\r\n CUSTOM_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/resources\/magma\/1.12\/${BRANCH}\/latest\")\r\n DOWNLOAD_LINK=$(echo ${OLD_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i server.jar)\r\nelse\r\n # Try to locate version by exact tag name. This will most likely always fail, because the tag names are in a weird format. Leaving it here just in case someone wants to fetch exact tag releases.\r\n VERSION_CHECK=$(echo ${OLD_JSON} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.[] | select(.tag_name==$MC_VERSION) | .tag_name')\r\n if [[ \"${MC_VERSION}\" == \"${VERSION_CHECK}\" ]]; then\r\n DOWNLOAD_LINK=$(echo ${OLD_JSON} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.[] | select(.tag_name==$MC_VERSION) | .assets[].browser_download_url' | grep -i installer.jar)\r\n else\r\n echo -e \"Specified ${MC_VERSION} version not found. Defaulting to latest\"\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\n# validate download link\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then\r\n echo -e \"Validating downlaod link\"\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_LINK}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_LINK}\r\n else\r\n echo -e \"Download URL ${DOWNLOAD_LINK} is invalid. Terminating install.\"\r\n exit 2\r\n fi\r\nfi\r\n\r\nfunction downloadMagma {\r\n echo -e \"running: curl -sSL -o installer.jar ${DOWNLOAD_LINK}\"\r\n curl -sSL -o installer.jar -sSL ${DOWNLOAD_LINK}\r\n}\r\n\r\nif [[ $MC_VERSION =~ ^1\\.(16|17|18|19|20|21|22|23) ]] || [[ -z \"${MC_VERSION}\" ]] || [[ \"${MC_VERSION}\" == \"latest\" ]] ; then\r\n downloadMagma\r\n echo -e \"1.16.5 or newer version detected. Running installer\"\r\n java -jar installer.jar --installServer || { echo -e \"install failed\" exit 4; }\r\n mv forge-*.jar $SERVER_JARFILE\r\n echo -e \"Deleting installer.jar file.\\n\"\r\n rm -rf *installer.jar\r\nelse\r\n downloadMagma\r\n echo -e \"Older magma version detected. Skipping installer\"\r\n mv installer.jar $SERVER_JARFILE\r\nfi\r\n\r\necho -e \"Install Complete\"", + "script": "apt update\r\napt install -y curl jq\r\n\r\nif [[ ! -d \/mnt\/server ]]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\/\r\n\r\n# get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/v2\/1.16.5\/latest\")\r\n\r\nif [[ -z \"${TAG_VERSION}\" ]]; then\r\n TAG_VERSION = \"latest\"\r\nfi\r\n\r\nif [[ -z \"${MC_VERSION}\" ]] || [[ \"${MC_VERSION}\" == \"latest\" ]]; then\r\n echo -e \"Version not set. Defaulting to latest\"\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq -r .link | grep -i installer.jar)\r\nelif [[ $MC_VERSION =~ ^1\\.(16|17|18|19|20|21|22|23) ]]; then\r\n CUSTOM_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/v2\/${MC_VERSION}\/${TAG_VERSION}\")\r\n DOWNLOAD_LINK=$(echo ${CUSTOM_JSON} | jq -r .link | grep -i installer.jar)\r\nelif [[ \"${MC_VERSION}\" == \"1.12\" ]]; then\r\n CUSTOM_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/v2\/1.12\/${TAG_VERSION}\")\r\n DOWNLOAD_LINK=$(echo ${CUSTOM_JSON} | jq -r .link | grep -i server.jar)\r\nelse\r\n echo -e \"Specified ${MC_VERSION} version not found. Defaulting to latest\"\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .link)\r\nfi\r\n\r\n# validate download link\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then\r\n echo -e \"Validating download link\"\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_LINK}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_LINK}\r\n else\r\n echo -e \"Download URL ${DOWNLOAD_LINK} is invalid. Terminating install.\"\r\n exit 2\r\n fi\r\nfi\r\n\r\nfunction downloadMagma {\r\n echo -e \"running: curl -sSL -o installer.jar ${DOWNLOAD_LINK}\"\r\n curl -sSL -o installer.jar -sSL ${DOWNLOAD_LINK}\r\n}\r\n\r\nif [[ $MC_VERSION =~ ^1\\.(16|17|18|19|20|21|22|23) ]] || [[ -z \"${MC_VERSION}\" ]] || [[ \"${MC_VERSION}\" == \"latest\" ]] ; then\r\n downloadMagma\r\n echo -e \"1.16.5 or newer version detected. Running installer\"\r\n java -jar installer.jar --installServer || { echo -e \"install failed\" exit 4; }\r\n mv forge-*.jar $SERVER_JARFILE\r\n echo -e \"Deleting installer.jar file.\\n\"\r\n rm -rf *installer.jar\r\nelse\r\n downloadMagma\r\n echo -e \"Older magma version detected. Skipping installer\"\r\n mv installer.jar $SERVER_JARFILE\r\nfi\r\n\r\necho -e \"Install Complete\"", "container": "openjdk:8-jdk-slim", "entrypoint": "bash" } @@ -53,13 +53,13 @@ "rules": "nullable|string|max:20" }, { - "name": "Branch [dev or stable]", - "description": "Branch to install. Valid options: dev or stable", - "env_variable": "BRANCH", - "default_value": "dev", + "name": "Tag Version", + "description": "Optional.\r\n\r\nSpecify the tag version to install. Leave empty or set latest to install latest", + "env_variable": "TAG_VERSION", + "default_value": "latest", "user_viewable": true, "user_editable": true, - "rules": "required|string|in:dev,stable" + "rules": "nullable|string|max:20" } ] -} +} \ No newline at end of file From 0f48b962183053f3eb3a0b705285b07a1c9aa332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Dobo=C5=A1?= Date: Wed, 20 Apr 2022 01:29:38 +0200 Subject: [PATCH 0411/1001] Remove unmaintaned Tuinity As it poses a security risk both with present log4j vuln & the CI is dismantled, it no longer works. --- README.md | 1 - game_eggs/README.md | 1 - game_eggs/minecraft/README.md | 1 - game_eggs/minecraft/java/README.md | 5 -- game_eggs/minecraft/java/tuinity/README.MD | 13 ----- .../minecraft/java/tuinity/egg-tuinity.json | 48 ------------------- 6 files changed, 69 deletions(-) delete mode 100644 game_eggs/minecraft/java/tuinity/README.MD delete mode 100644 game_eggs/minecraft/java/tuinity/egg-tuinity.json diff --git a/README.md b/README.md index bbed6550..5939a1ca 100644 --- a/README.md +++ b/README.md @@ -157,7 +157,6 @@ If you are reading this it looks like you are looking to add an egg to your serv * [SpongeForge](game_eggs/minecraft/java/spongeforge) * [SpongeVanilla](game_eggs/minecraft/java/spongevanilla) * [Technic](game_eggs/minecraft/java/technic) - * [Tuinity](game_eggs/minecraft/java/tuinity) * [VanillaCord](game_eggs/minecraft/java/vanillacord) * [Proxies](game_eggs/minecraft/proxy) Minecraft Server Proxies diff --git a/game_eggs/README.md b/game_eggs/README.md index 5458c143..0d71380f 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -70,7 +70,6 @@ * [SpongeForge](minecraft/java/spongeforge) * [SpongeVanilla](minecraft/java/spongevanilla) * [Technic](minecraft/java/technic) - * [Tuinity](minecraft/java/tuinity) * [VanillaCord](minecraft/java/vanillacord) * [Proxies](minecraft/proxy) Minecraft Server Proxies diff --git a/game_eggs/minecraft/README.md b/game_eggs/minecraft/README.md index e10d63b2..e29d0c8c 100644 --- a/game_eggs/minecraft/README.md +++ b/game_eggs/minecraft/README.md @@ -32,7 +32,6 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [SpongeForge](minecraft/java/spongeforge) * [SpongeVanilla](minecraft/java/spongevanilla) * [Technic](minecraft/java/technic) -* [Tuinity](minecraft/java/tuinity) * [VanillaCord](minecraft/java/vanillacord) ## [Proxies](proxy) Minecraft Server Proxies diff --git a/game_eggs/minecraft/java/README.md b/game_eggs/minecraft/java/README.md index af6d5ae3..fdd1b58a 100644 --- a/game_eggs/minecraft/java/README.md +++ b/game_eggs/minecraft/java/README.md @@ -115,11 +115,6 @@ This is a direct fork of the default spigot service with the added benefit of be [Airplane Github](https://github.com/TECHNOVE/Airplane) A stable, optimized and well supported Paper fork. -### [Tuinity](tuinity) - -[Tuinity GitHub](https://github.com/Spottedleaf/Tuinity) -Fork of Paper aimed at improving server performance at high playercounts. - ## Sponge Powered ### [SpongeForge](spongeforge) diff --git a/game_eggs/minecraft/java/tuinity/README.MD b/game_eggs/minecraft/java/tuinity/README.MD deleted file mode 100644 index e57fcef3..00000000 --- a/game_eggs/minecraft/java/tuinity/README.MD +++ /dev/null @@ -1,13 +0,0 @@ -# Tuinity - -Fork of Paper aimed at improving server performance at high playercounts. - -[Tuinity GitHub](https://github.com/Tuinity/Tuinity) - -## Server Ports - -The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. - -| Port | default | -|-------|---------| -| Game | 25565 | diff --git a/game_eggs/minecraft/java/tuinity/egg-tuinity.json b/game_eggs/minecraft/java/tuinity/egg-tuinity.json deleted file mode 100644 index e8af6c52..00000000 --- a/game_eggs/minecraft/java/tuinity/egg-tuinity.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1", - "update_url": null - }, - "exported_at": "2021-12-09T13:30:24-05:00", - "name": "Tuinity", - "author": "unknown@unknown.com", - "description": "Fork of Paper aimed at improving server performance at high playercounts.", - "features": [ - "eula", - "java_version", - "pid_limit" - ], - "images": [ - "ghcr.io\/pterodactyl\/yolks:java_17", - "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_8" - ], - "file_denylist": [], - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", - "config": { - "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \")! For help, type \"\r\n}", - "logs": "{}", - "stop": "stop" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n# Tuinity Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt update\r\napt -y install curl\r\ncd \/mnt\/server\r\n\r\nif [ ! -f server.properties ]; then\r\ncurl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/java\/server.properties\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/ci.codemc.io\/job\/Spottedleaf\/job\/Tuinity\/lastStableBuild\/artifact\/tuinity-paperclip.jar", - "container": "debian:buster-slim", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Server Jar File", - "description": "The name of the server jarfile to run the server with.", - "env_variable": "SERVER_JARFILE", - "default_value": "server.jar", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:20" - } - ] -} From a485c6c97478f815e7292a2f10e054bfca1353e6 Mon Sep 17 00:00:00 2001 From: Gorian <1012176+Gorian@users.noreply.github.com> Date: Sun, 22 May 2022 13:38:08 -0700 Subject: [PATCH 0412/1001] added link to foundry website --- game_eggs/FoundryVTT/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/FoundryVTT/README.md b/game_eggs/FoundryVTT/README.md index 1e4fdacf..eb85dd3c 100644 --- a/game_eggs/FoundryVTT/README.md +++ b/game_eggs/FoundryVTT/README.md @@ -1,5 +1,5 @@ # Foundry VTT -Foundry VTT is a standalone application built for experiencing multiplayer tabletop RPGs using a feature-rich and modern self-hosted application where your players connect directly through the browser. +[Foundry VTT](https://foundryvtt.com/) is a standalone application built for experiencing multiplayer tabletop RPGs using a feature-rich and modern self-hosted application where your players connect directly through the browser. # Installation Foundry requires a license. In order to use this egg, you will need to purchase a foundry license, select the linux platform from your profile on the website, and then paste the "Timed URL" into the variable when seting up the server. From bd8ac8d6dfbe7c18d85deb5401419d2624f18ae2 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Sun, 22 May 2022 16:28:29 -0700 Subject: [PATCH 0413/1001] Fix root README invalid link League Sandbox had an invalid sub-list item with a link that lead to a 404. --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 4710d74d..b00240da 100644 --- a/README.md +++ b/README.md @@ -126,8 +126,6 @@ If you are reading this it looks like you are looking to add an egg to your serv [League Sandbox](game_eggs/leaguesandbox) -* [League Sandbox](game_eggs/leaguesandbox/leaguesandbox) - [Minetest](game_eggs/minetest) (including MTG) * [Minetest](game_eggs/minetest/minetest) From da7bfab43dafb0f2cb19126756fadad2fdd33c4a Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Sun, 22 May 2022 18:17:59 -0700 Subject: [PATCH 0414/1001] General Egg Cleanup - Fixed typo in description - Fixed BattlEye path in startup command - Wrapped extra startup parameters in quotations to prevent a malicious client from executing arbitrary bash commands on the container via a (potentially forced) Arma server application crash. - Stop command no longer requires extra "C" and was fixed. - Updated install script to check for valid Steam credentials (required for Arma 3) and removed an un-needed directory creation. Also made the Script Entrypoint Command more specific. - Removed long gone depreciated startup variables (not even used in startup or entrypoint anymore). --- .../arma/arma3/egg-arma3.json | 33 ++++--------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/game_eggs/steamcmd_servers/arma/arma3/egg-arma3.json b/game_eggs/steamcmd_servers/arma/arma3/egg-arma3.json index c4bc36b3..fc781d8f 100644 --- a/game_eggs/steamcmd_servers/arma/arma3/egg-arma3.json +++ b/game_eggs/steamcmd_servers/arma/arma3/egg-arma3.json @@ -1,13 +1,12 @@ { - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "_comment": "Pterodactyl Arma 3 Egg ~ David Wolfe (Red-Thirten) ~ 2022-05-22", "meta": { "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-11-26T13:51:11+01:00", "name": "Arma 3", "author": "rehlmgaming@gmail.com", - "description": "Experience true combat gameplay in a massive military sandbox. Deploying a wide variety of single- and multiplayer content, over 20 vehicles and 40 weapons, and limitless opportunities for content creation, this is the PC's premier military game. Authentic, diverse, open - Arma 3 sends you to war.", + "description": "Experience true combat gameplay in a massive military sandbox. Deploying a wide variety of single and multiplayer content, over 20 vehicles and 40 weapons, and limitless opportunities for content creation, this is the PC's premier military game. Authentic, diverse, open - Arma 3 sends you to war.", "features": [ "steam_disk_space" ], @@ -15,18 +14,18 @@ "ghcr.io\/parkervcp\/games:arma3" ], "file_denylist": [], - "startup": ".\/{{SERVER_BINARY}} -ip=0.0.0.0 -port={{SERVER_PORT}} -profiles=.\/serverprofile -bepath=.\/battleye -cfg=basic.cfg -config=server.cfg -mod=\\\"{{CLIENT_MODS}}\\\" -serverMod=\\\"{{SERVERMODS}}\\\" {{STARTUP_PARAMS}}", + "startup": ".\/{{SERVER_BINARY}} -ip=0.0.0.0 -port={{SERVER_PORT}} -profiles=.\/serverprofile -bepath=.\/ -cfg=basic.cfg -config=server.cfg -mod=\\\"{{CLIENT_MODS}}\\\" -serverMod=\\\"{{SERVERMODS}}\\\" \\\"{{STARTUP_PARAMS}}\\\"", "config": { "files": "{\r\n \"server.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"password=\": \"password = \\\"{{env.SERVER_PASSWORD}}\\\";\",\r\n \"\/\/password=\": \"password = \\\"{{env.SERVER_PASSWORD}}\\\";\",\r\n \"password =\": \"password = \\\"{{env.SERVER_PASSWORD}}\\\";\",\r\n \"\/\/password =\": \"password = \\\"{{env.SERVER_PASSWORD}}\\\";\",\r\n \"maxPlayers\": \"maxPlayers = {{env.MAX_PLAYERS}};\",\r\n \"headlessClients\": \"headlessClients[] = { \\\"127.0.0.1\\\" };\",\r\n \"localClient\": \"localClient[] = { \\\"127.0.0.1\\\" };\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Host identity created.\"\r\n}", "logs": "{}", - "stop": "^CC" + "stop": "^C" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl Arma 3 Egg - egg-arma3.json\r\n## Author: David Wolfe (Red-Thirten)\r\n## Date: 2021\/07\/11\r\n## License: MIT License\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n# Download and install SteamCMD\r\ncd \/tmp\r\nmkdir -p \"\/mnt\/server\/steamcmd\" \"\/mnt\/server\/steamapps\"\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server \"+login \\\"${STEAM_USER}\\\" \\\"${STEAM_PASS}\\\"\" +app_update ${STEAMCMD_APPID} ${STEAMCMD_EXTRA_FLAGS} validate +quit\r\n\r\n# Set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n# Set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n# Arma 3 setup\r\ncd \/mnt\/server\/\r\n\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\n\r\n[[ -f basic.cfg ]] || curl -sSLO ${BASIC_URL}\r\n[[ -f server.cfg ]] || curl -sSLO ${BASIC_URL%\/*}\/server.cfg\r\nchmod 755 basic.cfg server.cfg", + "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl Arma 3 Egg - egg-arma3.json\r\n## Author: David Wolfe (Red-Thirten)\r\n## Date: 2022\/05\/22\r\n## License: MIT License\r\n## Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n# Install packages. Default packages below are skipped if using image noted above, thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n# Check for valid Steam credentials to download Arma 3 with (requires valid Steam account)\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_USER}\" == \"anonymous\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"INSTALLATION ERROR: A valid REAL Steam account is required to download the Arma 3 Dedicated Server.\"\r\n echo -e \"\\t(\\\"anonymous\\\" account cannot be used. Game ownership is not required.)\"\r\n exit 1\r\nfi\r\n\r\n# Download and install SteamCMD\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd \/mnt\/server\/steamapps\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server \"+login \\\"${STEAM_USER}\\\" \\\"${STEAM_PASS}\\\"\" +app_update ${STEAMCMD_APPID} ${STEAMCMD_EXTRA_FLAGS} validate +quit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so\r\n\r\n# Arma 3 setup\r\ncd \/mnt\/server\/\r\n[[ -f basic.cfg ]] || curl -sSLO ${BASIC_URL}\r\n[[ -f server.cfg ]] || curl -sSLO ${BASIC_URL%\/*}\/server.cfg\r\nchmod 644 basic.cfg server.cfg", "container": "ghcr.io\/parkervcp\/installers:debian", - "entrypoint": "bash" + "entrypoint": "\/bin\/bash" } }, "variables": [ @@ -227,24 +226,6 @@ "user_viewable": false, "user_editable": false, "rules": "required|url" - }, - { - "name": "[Depreciated] Server Configuration File", - "description": "This is a depreciated variable that is only included for servers running on an older Startup Command.", - "env_variable": "CONFIG", - "default_value": "server.cfg", - "user_viewable": false, - "user_editable": false, - "rules": "string|nullable" - }, - { - "name": "[Depreciated] Basic Configuration File", - "description": "This is a depreciated variable that is only included for servers running on an older Startup Command.", - "env_variable": "BASIC", - "default_value": "basic.cfg", - "user_viewable": false, - "user_editable": false, - "rules": "required|string" } ] -} +} \ No newline at end of file From c109097ee4af0094ff66402d45f55627a01c9a4e Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Sun, 22 May 2022 20:36:57 -0700 Subject: [PATCH 0415/1001] Cleaned up README - Added IAmSilK as a code contributor - Condensed System Requirements/Recommendations to a nice table --- .../steamcmd_servers/arma/arma3/README.md | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/game_eggs/steamcmd_servers/arma/arma3/README.md b/game_eggs/steamcmd_servers/arma/arma3/README.md index c06131db..b5570650 100644 --- a/game_eggs/steamcmd_servers/arma/arma3/README.md +++ b/game_eggs/steamcmd_servers/arma/arma3/README.md @@ -25,6 +25,14 @@ ___ 💻 💡 + + +
      IAmSilK +       +
      + 💻 + 💡 +
      Daave @@ -76,33 +84,27 @@ ___ Default server ports are listed below, but the Main port can be any port. There are three more ports after the Main port are relative to the Main port (For example: The BattlEye port is always 4 ports higher than the main port). **All four ports are required for normal server behavior.** It is [recommended](https://community.bistudio.com/wiki/Arma_3:_Dedicated_Server#Port_Forwarding) that each server be 100 ports separate from each other. -| Port | Default | +| Port | Default (UDP) | |---------|---------| | **Arma 3 Game & VON (Main)** | 2302 | | Steam Query (+1) | 2303 | | Steam Port (+2) | 2304 | | BattleEye (+4) | 2306 | -#### Mods/Plugins may require ports to be added to the server - ___ -### CPU Usage Information +### Installation/System Requirements -ARMA 3 is mainly CPU intensive. Contrary to popular belief, the server binary *can* run on multiple cores/threads. However, it's ability to manage asynchronous tasks and hyperthread is *very* limited, meaning additional cores/threads reach diminishing returns very quickly. In addition, it's ability to utilize all of the CPU allotted to it for AI processing seems to be limited as well. Therefore, a Headless Client ***and*** a properly written mission file are highly recommended if large amounts of AI units will be used. +| | Bare Minimum | Recommended | +|---------|---------|---------| +| Processor | Recent x86/64 (AMD/Intel) processor. No ARM support. | ARMA 3 is mainly CPU intensive. Contrary to popular belief, the server binary *can* run on multiple cores/threads. However, it's ability to manage asynchronous tasks and hyperthread is *very* limited, meaning additional cores/threads reach diminishing returns very quickly. In addition, it's ability to utilize all of the CPU allotted to it for AI processing seems to be limited as well. Therefore, a Headless Client ***and*** a properly written mission file are highly recommended if large amounts of AI units will be used. | +| RAM | 2048 MiB | 3072 MiB (If used, every Headless Client uses an additional 2048 MB of RAM as well) | +| Storage | 10 GB | 50+ GB (depends on how many mods are installed) | +| Network | 0.512 Mbit/s/player | 1-5 Mbit/s/player | +| Host OS | Most stable Linux OS branches should work | Using the latest kernel version for your installed OS can prevent some edge-case installation/boot issues. | ___ -### Minimum RAM Requirement - -This server requires about 2048 MB of RAM to run properly. If used, every Headless Client uses an additional 2048 MB of RAM as well. -___ - -### Minimum Disk Requirement - -This server requires just under 10 GB of disk space to safely run properly with no mods. However, mods can easily increase disk usage to 50 GB or more, depending on how many are downloaded. -___ - ### Recommended Egg Modifications The following are highly recommended variable modifications you can make to the egg after importing it to your panel. While viewing this egg, simply go to the "Variables" tab of the egg editor to make these changes. From 54054579ef47991b9778005dbe23340fe1bb7da5 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Mon, 23 May 2022 19:40:24 -0700 Subject: [PATCH 0416/1001] Initial Upload --- README.md | 1 + game_eggs/README.md | 1 + game_eggs/steamcmd_servers/README.md | 4 + .../dayz-experimental/README.md | 83 ++++++ .../egg-dayz-experimental.json | 276 ++++++++++++++++++ 5 files changed, 365 insertions(+) create mode 100644 game_eggs/steamcmd_servers/dayz-experimental/README.md create mode 100644 game_eggs/steamcmd_servers/dayz-experimental/egg-dayz-experimental.json diff --git a/README.md b/README.md index 14ab3907..91223105 100644 --- a/README.md +++ b/README.md @@ -200,6 +200,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Conan Exiles](game_eggs/steamcmd_servers/conan_exiles) * [Craftopia](game_eggs/steamcmd_servers/craftopia) * [Cryofall](game_eggs/steamcmd_servers/cryofall) +* [DayZ (Experimental)](game_eggs/steamcmd_servers/dayz-experimental) * [Don't Starve Together](game_eggs/steamcmd_servers/dont_starve) * [ECO](game_eggs/steamcmd_servers/eco) * [Fistful of Frags](game_eggs/steamcmd_servers/fof) diff --git a/game_eggs/README.md b/game_eggs/README.md index 5458c143..305fbe51 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -115,6 +115,7 @@ * [Citadel: Forged with Fire](steamcmd_servers/citadel) * [Conan Exiles](steamcmd_servers/conan_exiles) * [CryoFall](steamcmd_servers/cryofall) +* [DayZ (Experimental)](steamcmd_servers/dayz-experimental) * [Don't Starve Together](steamcmd_servers/dont_starve) * [ECO](steamcmd_servers/eco) * [Fistful of Frags](steamcmd_servers/fof) diff --git a/game_eggs/steamcmd_servers/README.md b/game_eggs/steamcmd_servers/README.md index 448c6b72..47164451 100644 --- a/game_eggs/steamcmd_servers/README.md +++ b/game_eggs/steamcmd_servers/README.md @@ -41,6 +41,10 @@ This is a collection of servers that use SteamCMD to install. [Cryofall](cryofall) +## DayZ (Experimental) + +[DayZ (Experimental)](dayz-experimental) + ## Don't Starve Together [Don't Starve Together](dont_starve) diff --git a/game_eggs/steamcmd_servers/dayz-experimental/README.md b/game_eggs/steamcmd_servers/dayz-experimental/README.md new file mode 100644 index 00000000..9e6f0f78 --- /dev/null +++ b/game_eggs/steamcmd_servers/dayz-experimental/README.md @@ -0,0 +1,83 @@ +# DayZ (Experimental) + +**Author's Notice:** This egg ***only*** works with the experimental branch of DayZ (Standalone), and it will ***only*** accept players who are running the experimental client! At time of writing (May 2022), there is ***no*** Stable branch native Linux server binary, and compatibility with Wine is poor. + +___ + +## Authors / Contributors + + + + + + + +
      + +
      Red-Thirten +       +
      + 💻 + 🔨 +
      + + + +___ + +### Game Description + +From Bohemia Interactive's [Website](https://dayz.com/): +> How long can you survive a post-apocalyptic world? A land overrun with an infected "zombie" population, where you compete with other survivors for limited resources. Will you team up with strangers and stay strong together? Or play as a lone wolf to avoid betrayal? This is DayZ – this is your story. +___ + +### Egg Capabilities + +- Able to download server updates on startup +- Able to download, update, and load Steam Workshop mods on startup (\*see [Installation/System Requirements](#installationsystem-requirements)) + - Also accepts server-side only mods. + - Checks for mod updates against their Steam Workshop page's last update for quick and efficient update checks. + - Automatically moves mod `.bikey`'s to the `/keys/` directory. +- Multiple basic settings found within the `serverDZ.cfg` file can be easily set from the server's Startup tab + - Server name, passwords, disable third person, persistant time, and more... +- Max Players is configurable and able to be host enforced (\*see [Recommended Egg Modifications](#recommended-egg-modifications)) +- Additional [DayZ startup parameters](https://community.bistudio.com/wiki/DayZ:Server_Configuration#Launch_Parameters) can be added to fine-tune performance +- [WHMCS](https://www.whmcs.com/) compatible (\*see [Recommended Egg Modifications](#recommended-egg-modifications)) + +___ + +### Server Ports + +Default server ports are listed below, but the Main port can be any port. + +| Port | Default (UDP) | +|---------|---------| +| **DayZ Game (Main)** | 2302 | +| Steam Query (Optional?) | 27016 | + +___ + +### Installation/System Requirements + +| | Bare Minimum | Recommended | +|---------|---------|---------| +| Processor | Recent x86/64 (AMD/Intel) processor. No 32-bit or ARM support. | ---- | +| RAM | 4096 MiB | 8192 MiB | +| Storage | 3 GB | 7+ GB (depends on how many mods are installed) | +| Network | 0.512 Mbit/s/player | 1-5 Mbit/s/player | +| Host OS | Most stable Linux OS branches should work | Using the latest kernel version for your installed OS can prevent some edge-case installation/boot issues. | +| Game Ownership | Not required to start. | Required for automatic Steam Workshop mod downloading to work. However, this is optional functionality, and mods can be manually uploaded to the server if desired. Hosts may feel free to change the "Disable Mod Downloads/Updates" variable to `1` if they would not like to offer it's functionality to clients. | + +___ + +### Recommended Egg Modifications + +The following are highly recommended variable modifications you can make to the egg after importing it to your panel. While viewing this egg, simply go to the "Variables" tab of the egg editor to make these changes. + +#### Default Steam Username & Password + +- To make deploying servers easy (**or if you are using WHMCS**), it is recommended to edit the default values of "Steam Username" and "Steam Password" to your Steam account dedicated for hosting. This will make all newly installed servers use these credentials. **DO NOT** make these fields visible to the end user so that they can use their own Steam accounts; the panel will save their Steam credentials in **plain text**, which is a BIG NO NO for security and privacy. + +#### Restrict Max Players + +- If you would like to restrict the maximum number of players that can join your client's server, you can change the permissions of the "Max Players" variable so that clients can only view this value (and not edit it). It's default value can also be changed, or the value can be changed on a server-by-server basis as desired. diff --git a/game_eggs/steamcmd_servers/dayz-experimental/egg-dayz-experimental.json b/game_eggs/steamcmd_servers/dayz-experimental/egg-dayz-experimental.json new file mode 100644 index 00000000..4b9fcf80 --- /dev/null +++ b/game_eggs/steamcmd_servers/dayz-experimental/egg-dayz-experimental.json @@ -0,0 +1,276 @@ +{ + "_comment": "Pterodactyl DayZ (Experimental) Egg ~ David Wolfe (Red-Thirten) ~ 2022-05-22", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "name": "DayZ (Experimental)", + "author": "rehlmgaming@gmail.com", + "description": "How long can you survive a post-apocalyptic world? A land overrun with an infected \"zombie\" population, where you compete with other survivors for limited resources. Will you team up with strangers and stay strong together? Or play as a lone wolf to avoid betrayal? This is DayZ \u2013 this is your story.", + "features": [ + "steam_disk_space" + ], + "images": [ + "ghcr.io\/parkervcp\/games:dayz" + ], + "file_denylist": [], + "startup": ".\/{{SERVER_BINARY}} -ip=0.0.0.0 -port={{SERVER_PORT}} -profiles=.\/serverprofile -BEpath=.\/ -config=serverDZ.cfg -mod=\\\"{{CLIENT_MODS}}\\\" -serverMod=\\\"{{SERVERMODS}}\\\" \\\"{{STARTUP_PARAMS}}\\\"", + "config": { + "files": "{\r\n \"serverDZ.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"hostname =\": \"hostname = \\\"{{env.SERVER_HOSTNAME}}\\\";\",\r\n \"password =\": \"password = \\\"{{env.SERVER_PASSWORD}}\\\";\",\r\n \"passwordAdmin =\": \"passwordAdmin = \\\"{{env.ADMIN_PASSWORD}}\\\";\",\r\n \"maxPlayers\": \"maxPlayers = {{env.MAX_PLAYERS}};\",\r\n \"verifySignatures\": \"verifySignatures = {{env.VERIFY_SIGNATURES}};\",\r\n \"forceSameBuild\": \"forceSameBuild = {{env.ENFORCE_BUILD}};\",\r\n \"disableVoN\": \"disableVoN = {{env.DISABLE_VON}};\",\r\n \"vonCodecQuality\": \"vonCodecQuality = {{env.VON_QUALITY}};\",\r\n \"disable3rdPerson\": \"disable3rdPerson = {{env.DISABLE_THIRD}};\",\r\n \"disableCrosshair\": \"disableCrosshair = {{env.DISABLE_CROSSHAIR}};\",\r\n \"disablePersonalLight\": \"disablePersonalLight = {{env.DISABLE_PERSONAL_LIGHT}};\",\r\n \"lightingConfig\": \"lightingConfig = {{env.LIGHTING_CONFIG}};\",\r\n \"serverTimeAcceleration\": \"serverTimeAcceleration = {{env.TIME_MULT}};\",\r\n \"serverNightTimeAcceleration\": \"serverNightTimeAcceleration = {{env.NIGHT_MULT}};\",\r\n \"serverTimePersistent\": \"serverTimePersistent = {{env.PERSISTENT_TIME}};\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Mission read.\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl DayZ (Experimental) Egg - egg-dayz-experimental.json\r\n## Author: David Wolfe (Red-Thirten)\r\n## Date: 2022\/05\/22\r\n## License: MIT License\r\n## Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n# Install packages. Default packages below are skipped if using image noted above, thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n# Download and install SteamCMD\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd \/mnt\/server\/steamapps\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server \"+login \\\"${STEAM_USER}\\\" \\\"${STEAM_PASS}\\\"\" +app_update ${STEAMCMD_APPID} ${STEAMCMD_EXTRA_FLAGS} validate +quit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so", + "container": "ghcr.io\/parkervcp\/installers:debian", + "entrypoint": "\/bin\/bash" + } + }, + "variables": [ + { + "name": "Steam Username", + "description": "Used for installation and updates. \"anonymous\" username can be used for server download, but a real account that owns DayZ is required for mod downloads. For security reasons it is recommended that you create a new Steam account just for your dedicated servers. *This info is not visible to the server owner.*", + "env_variable": "STEAM_USER", + "default_value": "anonymous", + "user_viewable": false, + "user_editable": false, + "rules": "required|string" + }, + { + "name": "Steam Password", + "description": "Used for installation and updates. Steam Guard MUST be completely TURNED OFF for mod downloads to work. *This info is not visible to the server owner, BUT IS stored in PLAIN TEXT. It is NOT advised to use a personal account; best to use a dummy account.*", + "env_variable": "STEAM_PASS", + "default_value": "", + "user_viewable": false, + "user_editable": false, + "rules": "nullable|string" + }, + { + "name": "Disable Mod Downloads\/Updates", + "description": "If the Steam account does not own the base DayZ game, Steam Workshop mod downloads\/updates will not work. If so, this setting allows disabling of this feature to avoid errors. (1 ON | 0 OFF)", + "env_variable": "DISABLE_MOD_UPDATES", + "default_value": "0", + "user_viewable": false, + "user_editable": false, + "rules": "boolean" + }, + { + "name": "Number of SteamCMD Retry Attempts", + "description": "How many times SteamCMD should retry downloading a server or mod after a recoverable error. (ie. A particularly large mod like CUP or RHS download times out)", + "env_variable": "STEAMCMD_ATTEMPTS", + "default_value": "3", + "user_viewable": false, + "user_editable": false, + "rules": "required|integer" + }, + { + "name": "Server Name", + "description": "Name of the server that will appear in the server list.", + "env_variable": "SERVER_HOSTNAME", + "default_value": "DayZ Server", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Max Players", + "description": "Maximum number of players allowed to join the server.", + "env_variable": "MAX_PLAYERS", + "default_value": "60", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|gt:0" + }, + { + "name": "Server Password", + "description": "Password required to join the server. Leave blank to have no password.", + "env_variable": "SERVER_PASSWORD", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Admin Password", + "description": "Password to log in as an admin on the server.", + "env_variable": "ADMIN_PASSWORD", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Automatic Updates", + "description": "Quickly checks for any server or mod updates on startup, and updates if necessary. (1 ON | 0 OFF)", + "env_variable": "UPDATE_SERVER", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "boolean" + }, + { + "name": "Client Mods", + "description": "A semicolon-separated list of mod folders to load. Any mods in this list that are in \"@workshopID\" form will also be included in Automatic Updates (if enabled). NO capital letters, spaces, or folders starting with a number! (ex. myMod;@123456789;@987654321;etc;)", + "env_variable": "MODIFICATIONS", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Enforce Game Version", + "description": "When ON, the server will allow the connection only to clients with same the .exe revision as the server. (1 ON | 0 OFF)", + "env_variable": "ENFORCE_BUILD", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "boolean" + }, + { + "name": "Verify Signatures", + "description": "Ensures all clients have exactly the same version of mods or addons that the server is running. Otherwise, they will be kicked upon connection. (2 ON | 0 OFF)", + "env_variable": "VERIFY_SIGNATURES", + "default_value": "2", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:0,2" + }, + { + "name": "Disable VoN", + "description": "When ON, will disable Voice over Network (voice chat) in the server. (1 ON | 0 OFF)", + "env_variable": "DISABLE_VON", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "boolean" + }, + { + "name": "VoN Quality", + "description": "Voice over Network codec quality; the higher the better. (Values 0-30)", + "env_variable": "VON_QUALITY", + "default_value": "20", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|between:0,30" + }, + { + "name": "Disable Third Person", + "description": "When ON, will disable third person view while on the server. (1 ON | 0 OFF)", + "env_variable": "DISABLE_THIRD", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "boolean" + }, + { + "name": "Disable Crosshair", + "description": "When ON, will disable the crosshair from being visible while on the server. (1 ON | 0 OFF)", + "env_variable": "DISABLE_CROSSHAIR", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "boolean" + }, + { + "name": "Disable Personal Light", + "description": "When ON, will disable a personal light positioned above all clients during the night time while on the server. (1 ON | 0 OFF)", + "env_variable": "DISABLE_PERSONAL_LIGHT", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "boolean" + }, + { + "name": "Darker Nights", + "description": "When ON, will make nights darker (more accurate nights, but hard to see without a light). (1 ON | 0 OFF)", + "env_variable": "LIGHTING_CONFIG", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "boolean" + }, + { + "name": "Persistent Time", + "description": "The actual server time is saved to storage, so when ON, the next server start will use the saved time value. (1 ON | 0 OFF)", + "env_variable": "PERSISTENT_TIME", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "boolean" + }, + { + "name": "Time Multiplier", + "description": "This is a time multiplier for in-game time (ie. 12 would move a full 24-hour day in-game 12 times faster, making it last 2 hours \"in real life\"). (Values: 0-24)", + "env_variable": "TIME_MULT", + "default_value": "12", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|between:0,24" + }, + { + "name": "Night Multiplier", + "description": "This is an additional multiplier to either speed up or slow down nights in-game. It is multiplied with the \"Time Multiplier\" variable to get it's final multiplier for night time speed. (Values: 0.1-64.0)", + "env_variable": "NIGHT_MULT", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "required|numeric|between:0.1,64" + }, + { + "name": "[Repair] Make Mod Files Lowercase", + "description": "Every mod that is set to be loaded will have its folder and files changed to lowercase (to prevent errors). It is recommended to enable this for one server boot after copying a mod from a Windows machine to the server, or if mods seem to not be loading. (1 ON | 0 OFF)", + "env_variable": "MODS_LOWERCASE", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "boolean" + }, + { + "name": "[Repair] Validate Server Files", + "description": "Validates all server files when Automatic Updates is ON. Note: This will significantly increase server startup times, so it is recommended to only enable this when needed. (1 ON | 0 OFF)", + "env_variable": "VALIDATE_SERVER", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "boolean" + }, + { + "name": "[Advanced] Server-Side Only Mods", + "description": "Mod folders to be used with the \"-serverMods\" startup option. They only run server-side and are not required by clients if \"Verify Signatures\" is ON. Any mods in this list that are in \"@workshopID\" form will also be included in Automatic Updates (if enabled). NO capital letters, spaces, or folders starting with a number! Each folder must be followed with a semicolon (ex. @123456789;@987654321;etc;)", + "env_variable": "SERVERMODS", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "[Advanced] Extra Startup Parameters", + "description": "See https:\/\/community.bistudio.com\/wiki\/DayZ:Server_Configuration#Launch_Parameters for more info on valid flags for this field.", + "env_variable": "STARTUP_PARAMS", + "default_value": "-doLogs", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "[Advanced] Server Binary", + "description": "Cannot currently be changed. Left in case other branches with different executable names are introduced at a later date.", + "env_variable": "SERVER_BINARY", + "default_value": "DayZServer", + "user_viewable": true, + "user_editable": false, + "rules": "required|string|in:DayZServer" + }, + { + "name": "[Advanced] DayZ SA Dedicated Server App ID", + "description": "Used for installation and updates. Rarely needs to be changed. Only the Experimental app ID currently works.", + "env_variable": "STEAMCMD_APPID", + "default_value": "1042420", + "user_viewable": true, + "user_editable": false, + "rules": "required|integer" + } + ] +} \ No newline at end of file From c748b5a7e8d902a0a92e45a7b44b0b7a5cb2307e Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Tue, 24 May 2022 10:12:10 -0700 Subject: [PATCH 0417/1001] Fix "Max Players" Startup parameter range Increased to maximum of 256 players, which aligns with BI documentation. --- .../steamcmd_servers/arma/arma_reforger/egg-arma-reforger.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/arma/arma_reforger/egg-arma-reforger.json b/game_eggs/steamcmd_servers/arma/arma_reforger/egg-arma-reforger.json index de4ff725..97519c04 100644 --- a/game_eggs/steamcmd_servers/arma/arma_reforger/egg-arma-reforger.json +++ b/game_eggs/steamcmd_servers/arma/arma_reforger/egg-arma-reforger.json @@ -63,7 +63,7 @@ "default_value": "32", "user_viewable": true, "user_editable": true, - "rules": "required|integer|between:1,64" + "rules": "required|integer|between:1,256" }, { "name": "Server Password", From ebc02d607f8ac6a1988e0ddc9b56603a73247716 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Tue, 24 May 2022 10:17:42 -0700 Subject: [PATCH 0418/1001] Set default "Max FPS" value Set default "Max FPS" Startup Parameter value to 120, as recommended by BI documentation. --- .../steamcmd_servers/arma/arma_reforger/egg-arma-reforger.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/arma/arma_reforger/egg-arma-reforger.json b/game_eggs/steamcmd_servers/arma/arma_reforger/egg-arma-reforger.json index 97519c04..569471da 100644 --- a/game_eggs/steamcmd_servers/arma/arma_reforger/egg-arma-reforger.json +++ b/game_eggs/steamcmd_servers/arma/arma_reforger/egg-arma-reforger.json @@ -132,7 +132,7 @@ "name": "[Advanced] Max FPS", "description": "Sets a maximum FPS limit for the server, saving performance in some cases. Leave empty for no limit.", "env_variable": "MAX_FPS", - "default_value": "", + "default_value": "120", "user_viewable": true, "user_editable": true, "rules": "nullable|integer|gt:0" From f10379b2282b6050488aa03061988a06bee91894 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Tue, 24 May 2022 10:22:19 -0700 Subject: [PATCH 0419/1001] Update default "[Advanced] Extra Startup Parameters" value Added `-limitFPS=120` flag to the default value to prevent runaway FPS and crashing for vanilla servers. --- .../dayz-experimental/egg-dayz-experimental.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/dayz-experimental/egg-dayz-experimental.json b/game_eggs/steamcmd_servers/dayz-experimental/egg-dayz-experimental.json index 4b9fcf80..12e102ca 100644 --- a/game_eggs/steamcmd_servers/dayz-experimental/egg-dayz-experimental.json +++ b/game_eggs/steamcmd_servers/dayz-experimental/egg-dayz-experimental.json @@ -249,7 +249,7 @@ "name": "[Advanced] Extra Startup Parameters", "description": "See https:\/\/community.bistudio.com\/wiki\/DayZ:Server_Configuration#Launch_Parameters for more info on valid flags for this field.", "env_variable": "STARTUP_PARAMS", - "default_value": "-doLogs", + "default_value": "-doLogs -limitFPS=120", "user_viewable": true, "user_editable": true, "rules": "nullable|string" From db4fc77381a65a7064abd52fa5dd8f2392df7d8c Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Thu, 26 May 2022 16:19:03 -0700 Subject: [PATCH 0420/1001] Add Mod List functionality & descriptions clean up --- .../dayz-experimental/README.md | 3 +- .../egg-dayz-experimental.json | 53 +++++++++++-------- 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/game_eggs/steamcmd_servers/dayz-experimental/README.md b/game_eggs/steamcmd_servers/dayz-experimental/README.md index 9e6f0f78..57b69c35 100644 --- a/game_eggs/steamcmd_servers/dayz-experimental/README.md +++ b/game_eggs/steamcmd_servers/dayz-experimental/README.md @@ -1,6 +1,6 @@ # DayZ (Experimental) -**Author's Notice:** This egg ***only*** works with the experimental branch of DayZ (Standalone), and it will ***only*** accept players who are running the experimental client! At time of writing (May 2022), there is ***no*** Stable branch native Linux server binary, and compatibility with Wine is poor. +**Author's Notice:** This egg ***only*** works with the experimental branch of DayZ (Standalone), and it will ***only*** accept players who are running the experimental client! At time of writing (May 2022), there is ***no*** native Linux server binary for the Stable branch, and compatibility with Wine is poor for the Windows binary. ___ @@ -38,6 +38,7 @@ ___ - Also accepts server-side only mods. - Checks for mod updates against their Steam Workshop page's last update for quick and efficient update checks. - Automatically moves mod `.bikey`'s to the `/keys/` directory. + - Note: These features only work with mods in the `@workshopID#` format. Manually uploaded mods are not automatically updated. - Multiple basic settings found within the `serverDZ.cfg` file can be easily set from the server's Startup tab - Server name, passwords, disable third person, persistant time, and more... - Max Players is configurable and able to be host enforced (\*see [Recommended Egg Modifications](#recommended-egg-modifications)) diff --git a/game_eggs/steamcmd_servers/dayz-experimental/egg-dayz-experimental.json b/game_eggs/steamcmd_servers/dayz-experimental/egg-dayz-experimental.json index 12e102ca..4dda878c 100644 --- a/game_eggs/steamcmd_servers/dayz-experimental/egg-dayz-experimental.json +++ b/game_eggs/steamcmd_servers/dayz-experimental/egg-dayz-experimental.json @@ -1,5 +1,5 @@ { - "_comment": "Pterodactyl DayZ (Experimental) Egg ~ David Wolfe (Red-Thirten) ~ 2022-05-22", + "_comment": "Pterodactyl DayZ (Experimental) Egg ~ David Wolfe (Red-Thirten) ~ 2022-05-26", "meta": { "version": "PTDL_v1", "update_url": null @@ -23,7 +23,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl DayZ (Experimental) Egg - egg-dayz-experimental.json\r\n## Author: David Wolfe (Red-Thirten)\r\n## Date: 2022\/05\/22\r\n## License: MIT License\r\n## Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n# Install packages. Default packages below are skipped if using image noted above, thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n# Download and install SteamCMD\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd \/mnt\/server\/steamapps\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server \"+login \\\"${STEAM_USER}\\\" \\\"${STEAM_PASS}\\\"\" +app_update ${STEAMCMD_APPID} ${STEAMCMD_EXTRA_FLAGS} validate +quit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so", + "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl DayZ (Experimental) Egg - egg-dayz-experimental.json\r\n## Author: David Wolfe (Red-Thirten)\r\n## Date: 2022\/05\/26\r\n## License: MIT License\r\n## Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n# Install packages. Default packages below are skipped if using image noted above, thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n# Download and install SteamCMD\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd \/mnt\/server\/steamapps\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server \"+login \\\"${STEAM_USER}\\\" \\\"${STEAM_PASS}\\\"\" +app_update ${STEAMCMD_APPID} ${STEAMCMD_EXTRA_FLAGS} validate +quit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so", "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "\/bin\/bash" } @@ -58,7 +58,7 @@ }, { "name": "Number of SteamCMD Retry Attempts", - "description": "How many times SteamCMD should retry downloading a server or mod after a recoverable error. (ie. A particularly large mod like CUP or RHS download times out)", + "description": "How many times SteamCMD should retry downloading a server or mod after a recoverable error. (ie. A particularly large mod download times out)", "env_variable": "STEAMCMD_ATTEMPTS", "default_value": "3", "user_viewable": false, @@ -78,7 +78,7 @@ "name": "Max Players", "description": "Maximum number of players allowed to join the server.", "env_variable": "MAX_PLAYERS", - "default_value": "60", + "default_value": "64", "user_viewable": true, "user_editable": true, "rules": "required|integer|gt:0" @@ -103,7 +103,7 @@ }, { "name": "Automatic Updates", - "description": "Quickly checks for any server or mod updates on startup, and updates if necessary. (1 ON | 0 OFF)", + "description": "Quickly checks for any server or mod updates on startup, and updates if necessary.", "env_variable": "UPDATE_SERVER", "default_value": "1", "user_viewable": true, @@ -111,22 +111,22 @@ "rules": "boolean" }, { - "name": "Client Mods", - "description": "A semicolon-separated list of mod folders to load. Any mods in this list that are in \"@workshopID\" form will also be included in Automatic Updates (if enabled). NO capital letters, spaces, or folders starting with a number! (ex. myMod;@123456789;@987654321;etc;)", - "env_variable": "MODIFICATIONS", - "default_value": "", + "name": "Modlist File (Exported from DayZ Launcher)", + "description": "Filename for an exported modlist. This file will be parsed for mod installation and loading. Upload your HTML file to the root directory (eg. \/home\/container\/modlist.html). Leave blank to disable loading mods from a modlist.", + "env_variable": "MOD_FILE", + "default_value": "modlist.html", "user_viewable": true, "user_editable": true, "rules": "nullable|string" }, { - "name": "Enforce Game Version", - "description": "When ON, the server will allow the connection only to clients with same the .exe revision as the server. (1 ON | 0 OFF)", - "env_variable": "ENFORCE_BUILD", - "default_value": "1", + "name": "Additional Mods", + "description": "A semicolon-separated list of mod folders to load from the root directory. Useful for loading manually uploaded mods. Any mods in this list that are in \"@workshopID\" form will also be included in Automatic Updates (if enabled). NO capital letters, spaces, or folders starting with a number! (ex. myMod;@123456789;@987654321;etc;)", + "env_variable": "MODIFICATIONS", + "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "boolean" + "rules": "nullable|string" }, { "name": "Verify Signatures", @@ -137,9 +137,18 @@ "user_editable": true, "rules": "required|string|in:0,2" }, + { + "name": "Enforce Game Version", + "description": "When ON, the server will allow the connection only to clients with same the version as the server.", + "env_variable": "ENFORCE_BUILD", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "boolean" + }, { "name": "Disable VoN", - "description": "When ON, will disable Voice over Network (voice chat) in the server. (1 ON | 0 OFF)", + "description": "When ON, will disable Voice over Network (voice chat) in the server.", "env_variable": "DISABLE_VON", "default_value": "0", "user_viewable": true, @@ -157,7 +166,7 @@ }, { "name": "Disable Third Person", - "description": "When ON, will disable third person view while on the server. (1 ON | 0 OFF)", + "description": "When ON, will disable third person view while on the server.", "env_variable": "DISABLE_THIRD", "default_value": "0", "user_viewable": true, @@ -166,7 +175,7 @@ }, { "name": "Disable Crosshair", - "description": "When ON, will disable the crosshair from being visible while on the server. (1 ON | 0 OFF)", + "description": "When ON, will disable the crosshair from being visible while on the server.", "env_variable": "DISABLE_CROSSHAIR", "default_value": "0", "user_viewable": true, @@ -175,7 +184,7 @@ }, { "name": "Disable Personal Light", - "description": "When ON, will disable a personal light positioned above all clients during the night time while on the server. (1 ON | 0 OFF)", + "description": "When ON, will disable a personal light positioned above all clients during the night time while on the server.", "env_variable": "DISABLE_PERSONAL_LIGHT", "default_value": "1", "user_viewable": true, @@ -184,7 +193,7 @@ }, { "name": "Darker Nights", - "description": "When ON, will make nights darker (more accurate nights, but hard to see without a light). (1 ON | 0 OFF)", + "description": "When ON, will make nights darker (more accurate nights, but hard to see without a light).", "env_variable": "LIGHTING_CONFIG", "default_value": "0", "user_viewable": true, @@ -193,7 +202,7 @@ }, { "name": "Persistent Time", - "description": "The actual server time is saved to storage, so when ON, the next server start will use the saved time value. (1 ON | 0 OFF)", + "description": "The actual server time is saved to storage, so when ON, the next server start will use the saved time value.", "env_variable": "PERSISTENT_TIME", "default_value": "0", "user_viewable": true, @@ -220,7 +229,7 @@ }, { "name": "[Repair] Make Mod Files Lowercase", - "description": "Every mod that is set to be loaded will have its folder and files changed to lowercase (to prevent errors). It is recommended to enable this for one server boot after copying a mod from a Windows machine to the server, or if mods seem to not be loading. (1 ON | 0 OFF)", + "description": "Every mod that is set to be loaded will have its folder and files changed to lowercase (to prevent errors). It is recommended to enable this for one server boot after copying a mod from a Windows machine to the server, or if mods seem to not be loading.", "env_variable": "MODS_LOWERCASE", "default_value": "0", "user_viewable": true, @@ -229,7 +238,7 @@ }, { "name": "[Repair] Validate Server Files", - "description": "Validates all server files when Automatic Updates is ON. Note: This will significantly increase server startup times, so it is recommended to only enable this when needed. (1 ON | 0 OFF)", + "description": "Validates all server files when Automatic Updates is ON. Note: This will significantly increase server startup times, so it is recommended to only enable this when needed.", "env_variable": "VALIDATE_SERVER", "default_value": "0", "user_viewable": true, From 3452e05f8d909ad808cde2ec2dd6abacd1a6484f Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Fri, 27 May 2022 23:53:53 -0700 Subject: [PATCH 0421/1001] Initial Upload --- README.md | 1 + game_eggs/README.md | 1 + game_eggs/steamcmd_servers/README.md | 4 + game_eggs/steamcmd_servers/v_rising/README.md | 102 ++++++++ .../v_rising/egg-v-rising.json | 231 ++++++++++++++++++ 5 files changed, 339 insertions(+) create mode 100644 game_eggs/steamcmd_servers/v_rising/README.md create mode 100644 game_eggs/steamcmd_servers/v_rising/egg-v-rising.json diff --git a/README.md b/README.md index 14ab3907..3e15b853 100644 --- a/README.md +++ b/README.md @@ -243,6 +243,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Valheim](game_eggs/steamcmd_servers/valheim) * [Valheim Vanilla](game_eggs/steamcmd_servers/valheim/valheim_vanilla) * [Valheim Plus Mod](game_eggs/steamcmd_servers/valheim/valheim_plus) +* [V Rising](game_eggs/steamcmd_servers/v_rising) [Teeworlds](game_eggs/teeworlds) diff --git a/game_eggs/README.md b/game_eggs/README.md index 5458c143..a4c28f03 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -159,6 +159,7 @@ * [Valheim](steamcmd_servers/valheim) * [Valheim Plus Mod](steamcmd_servers/valheim/valheim_plus) * [Valheim Vanilla](steamcmd_servers/valheim/valheim_vanilla) +* [V Rising](steamcmd_servers/v_rising) [Teeworlds](teeworlds) diff --git a/game_eggs/steamcmd_servers/README.md b/game_eggs/steamcmd_servers/README.md index 448c6b72..12f49acd 100644 --- a/game_eggs/steamcmd_servers/README.md +++ b/game_eggs/steamcmd_servers/README.md @@ -186,3 +186,7 @@ This is a collection of servers that use SteamCMD to install. * [Valheim Vanilla](valheim/valheim_vanilla) * [Valheim Plus Mod](valheim/valheim_plus) + +## V Rising + +[V Rising](v_rising) diff --git a/game_eggs/steamcmd_servers/v_rising/README.md b/game_eggs/steamcmd_servers/v_rising/README.md new file mode 100644 index 00000000..a489dc80 --- /dev/null +++ b/game_eggs/steamcmd_servers/v_rising/README.md @@ -0,0 +1,102 @@ +# V Rising + +***NOTE: Server version currently marked as Early Access by the V Rising developers. Your mileage may vary as updates are released.*** +___ + +### Authors / Contributors + + + + + + + + +
      + +
      Red-Thirten +       +
      + 💻 + 🔨 +       		+ +
      Kapatheus +       +
      + 💻 + 💡 +
      + + + +___ + +### Game Description + +From Stunlock Studios's [Website](https://playvrising.com/): +> Awaken as a vampire. Hunt for blood in nearby settlements to regain your strength and evade the scorching sun to survive. Raise your castle and thrive in an ever-changing open world full of mystery. Gain allies online and conquer the land of the living. + +___ + +### Egg Capabilities + +- Currently runs the Windows build of the server via Wine. This egg will be updated when a proper, native Linux server binary is released. +- Configurable to automatically check for server updates on start via SteamCMD. Forcing validation is also configurable. +- All `ServerHostSettings.json` settings can be automatically configured via Startup variables. + - This includes: Server name, game settings preset, password, max players, auto save settings, and more... +- RCON ready (\*requires extra port – see [Server Ports](#server-ports)). See the RCON section under [Manual Configuration Topics](#manual-configuration-topics) for more info. + +___ + +### Server Ports + +- Default server ports are listed below, but all three ports can be changed freely. +- The only *required* port is the Game port, but the Query port is needed for the server to appear in the server list (Direct connect is still possible without the Query port). There have also been reports that servers only appear in the server list if they are popular, so consider this when troubleshooting. +- Clients connect via the Game port. +- The RCON port is optional and only required if the server owner enables/uses RCON. + +| Port | Default | Protocol | +|---------|---------| +| **Game (Primary Port in Pterodactyl)** | 9876 | UDP | +| Query | 9877 | UDP | +| RCON | 25575 | TCP | + +___ + +### Installation/System Requirements + +| | Bare Minimum | Recommended | +|---------|---------|---------| +| Processor | Recent x86/64 (AMD/Intel) processor. No 32 bit or ARM support. | Unsubstantiated reports say that RCON uses significantly more CPU when enabled, but I have not been able to replicate myself. | +| RAM | 3072 MiB | 4096-6144 MiB | +| Storage | 3.5 GB | 5-10 GB (or more, depending on save size or frequency) | +| Game Ownership | Not required at all. | ---- | + +___ + +### Manual Configuration Topics + +The following are various topics covering manual configuration procedures the egg does not handle automatically that may be useful to server owners: + +#### Save File and Custom Settings Location + +You can find the game settings and saves in the `~/save-data/` directory. + +#### Server Game Settings + +Standardized game settings can be applied via the "Game Mode" startup parameter. If you would like a more custom array of settings to adjust, you can copy the `ServerGameSettings.json` file located in `~/VRisingServer_Data/StreamingAssets/Settings/` to `~/save-data/Settings` and adjust as needed. Also, ensure "Game Mode" is set to empty/null. A list of settings, with a description of what each setting does and the min/max values where applicable, [can be found here](https://cdn.stunlock.com/blog/2022/05/25083113/Game-Server-Settings.pdf). + +#### Becoming an Administrator + +To become an administrator in the game you will first need to modify the `adminlist.txt` file under `~/save-data/Settings` with your SteamID (one SteamID per line). This can be done without restarting your server. To become an administrator in the game you need to enable the console in the options menu, bring it down with `~` and authenticate using the `adminauth` console command. Once an administrator you can use a number of administrative commands like `banuser`, `bancharacter`, `banned`, `unban` and `kick`. + +If you ban users through the in-game console the server will automatically modify the `banlist.txt` file, but you can also modify this manually (one SteamID per line). + +#### Transfer Local/Client Save to the Server + +[Follow these instructions by the developer very carefully](https://github.com/StunlockStudios/vrising-dedicated-server-instructions#transfer-localclient-save-to-a-dedicated-server). Note: The `-saveName ` command line parameter and `GameSettingsPreset` setting are handled automatically by the Egg's "Save Name" and "Game Mode" startup parameters, respectively. Also, if a custom `ServerGameSettings.json` file exists for any reason in the `~/save-data/Settings` directory, delete it. + +#### RCON + +RCON can allow general and restart announcements to be made to the server remotely (functions which are not currently supported by the console command line). You can enable RCON by properly configuring the relevant variables under the Startup tab of your Pterodactyl server. The RCON port must be allocated to the server. [Click here for list of valid commands and recommended RCON client](https://github.com/StunlockStudios/vrising-dedicated-server-instructions#rcon). diff --git a/game_eggs/steamcmd_servers/v_rising/egg-v-rising.json b/game_eggs/steamcmd_servers/v_rising/egg-v-rising.json new file mode 100644 index 00000000..77346dae --- /dev/null +++ b/game_eggs/steamcmd_servers/v_rising/egg-v-rising.json @@ -0,0 +1,231 @@ +{ + "_comment": "Pterodactyl V Rising Egg ~ David Wolfe (Red-Thirten) and Kapatheus ~ 2022-05-26", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "name": "V Rising", + "author": "rehlmgaming@gmail.com", + "description": "Awaken as a vampire. Hunt for blood in nearby settlements to regain your strength and evade the scorching sun to survive. Raise your castle and thrive in an ever-changing open world full of mystery. Gain allies online and conquer the land of the living.", + "features": [ + "steam_disk_space" + ], + "images": [ + "ghcr.io\/parkervcp\/yolks:wine_latest" + ], + "file_denylist": [], + "startup": "wine64 .\/VRisingServer.exe -persistentDataPath save-data -address 0.0.0.0", + "config": { + "files": "{\r\n\t\"save-data\/Settings\/ServerHostSettings.json\": {\r\n\t\t\"parser\": \"json\",\r\n\t\t\"find\": {\r\n\t\t\t\"Name\": \"{{server.build.env.SERVER_NAME}}\",\r\n\t\t\t\"Description\": \"{{server.build.env.DESCRIPTION}}\",\r\n\t\t\t\"Port\": \"{{server.build.default.port}}\",\r\n\t\t\t\"QueryPort\": \"{{server.build.env.QUERY_PORT}}\",\r\n\t\t\t\"MaxConnectedUsers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n\t\t\t\"MaxConnectedAdmins\": \"{{server.build.env.MAX_ADMINS}}\",\r\n\t\t\t\"ServerFps\": \"{{server.build.env.FPS}}\",\r\n\t\t\t\"SaveName\": \"{{server.build.env.SAVE_NAME}}\",\r\n\t\t\t\"Password\": \"{{server.build.env.SERVER_PASSWORD}}\",\r\n\t\t\t\"Secure\": \"{{server.build.env.SERVER_SECURE}}\",\r\n\t\t\t\"ListOnMasterServer\": \"{{server.build.env.SERVER_LIST}}\",\r\n\t\t\t\"AutoSaveCount\": \"{{server.build.env.SAVE_COUNT}}\",\r\n\t\t\t\"AutoSaveInterval\": \"{{server.build.env.SAVE_INTERVAL}}\",\r\n\t\t\t\"GameSettingsPreset\": \"{{server.build.env.GAME_SETTINGS_PRESET}}\",\r\n\t\t\t\"AdminOnlyDebugEvents\": \"{{server.build.env.ADMIN_ONLY_DEBUG_EVENTS}}\",\r\n\t\t\t\"DisableDebugEvents\": \"{{server.build.env.DEBUG_EVENTS}}\",\r\n\t\t\t\"Rcon.Enabled\": \"{{server.build.env.RCON}}\",\r\n\t\t\t\"Rcon.Password\": \"{{server.build.env.RCON_PASS}}\",\r\n\t\t\t\"Rcon.Port\": \"{{server.build.env.RCON_PORT}}\"\r\n\t\t}\r\n\t}\r\n}", + "startup": "{\r\n \"done\": \"Loaded ServerGameSettings\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl V Rising Egg - egg-v-rising.json\r\n## Authors: David Wolfe (Red-Thirten), Kapatheus\r\n## Date: 2022\/05\/26\r\n## License: MIT License\r\n## Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n# Install packages. Default packages below are skipped if using image noted above, thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n# Download and install SteamCMD\r\nexport HOME=\/mnt\/server\r\ncd \/tmp\r\nmkdir -p $HOME\/steamcmd $HOME\/steamapps\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C $HOME\/steamcmd\r\ncd $HOME\/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\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +force_install_dir $HOME +login anonymous $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} validate +quit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so $HOME\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so $HOME\/.steam\/sdk64\/steamclient.so\r\n\r\n## V Rising Setup\r\nmkdir -p $HOME\/save-data\/Settings && cd \"$_\"\r\ntouch adminlist.txt banlist.txt\r\ncat > ServerHostSettings.json << EOF\r\n{\r\n \"Name\": \"${SERVER_NAME}\",\r\n \"Description\": \"${DESCRIPTION}\",\r\n \"Port\": ${SERVER_PORT},\r\n \"QueryPort\": ${QUERY_PORT},\r\n \"MaxConnectedUsers\": ${MAX_PLAYERS},\r\n \"MaxConnectedAdmins\": ${MAX_ADMINS},\r\n \"ServerFps\": ${FPS},\r\n \"SaveName\": \"${SAVE_NAME}\",\r\n \"Password\": \"${SERVER_PASSWORD}\",\r\n \"Secure\": ${SERVER_SECURE},\r\n \"ListOnMasterServer\": ${SERVER_LIST},\r\n \"AutoSaveCount\": ${SAVE_COUNT},\r\n \"AutoSaveInterval\": ${SAVE_INTERVAL},\r\n \"GameSettingsPreset\": \"${GAME_SETTINGS_PRESET}\",\r\n \"AdminOnlyDebugEvents\": ${ADMIN_ONLY_DEBUG_EVENTS},\r\n \"DisableDebugEvents\": ${DEBUG_EVENTS},\r\n \"Rcon\": {\r\n \"Enabled\": ${RCON},\r\n \"Password\": \"${RCON_PASS}\",\r\n \"Port\": ${RCON_PORT}\r\n }\r\n}\r\nEOF", + "container": "ghcr.io\/pterodactyl\/installers:debian", + "entrypoint": "\/bin\/bash" + } + }, + "variables": [ + { + "name": "[REQUIRED] Server Query Port", + "description": "UDP port for Steam server list features.", + "env_variable": "QUERY_PORT", + "default_value": "9877", + "user_viewable": false, + "user_editable": false, + "rules": "required|integer|between:1024,65536" + }, + { + "name": "Automatic Updates", + "description": "Quickly checks for any server updates on startup, and updates if necessary.", + "env_variable": "AUTO_UPDATE", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "boolean" + }, + { + "name": "Game Mode", + "description": "What preset of game settings the server should run. Some settings may not apply after the save file is first created. Leave empty\/null if you are using a single-player uploaded save or a custom ServerGameSettings.json file.", + "env_variable": "GAME_SETTINGS_PRESET", + "default_value": "StandardPvP", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|in:,DuoPvP,HardcorePvP,Level30PvE,Level30PvP,Level50PvE,Level50PvP,Level70PvE,Level70PvP,SoloPvP,StandardPvE_Easy,StandardPvE_Hard,StandardPvE,StandardPvP_Easy,StandardPvP_Hard,StandardPVP" + }, + { + "name": "Server Name", + "description": "Name of the server that will appear in the server list.", + "env_variable": "SERVER_NAME", + "default_value": "V Rising Dedicated Server", + "user_viewable": true, + "user_editable": true, + "rules": "required|string" + }, + { + "name": "Server Description", + "description": "Short description of server purpose, rules, and the message of the day.", + "env_variable": "DESCRIPTION", + "default_value": "Welcome to the server!", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Max Connected Users", + "description": "Max number of concurrent players on the server.", + "env_variable": "MAX_PLAYERS", + "default_value": "40", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|min:1" + }, + { + "name": "Max Connected Admins", + "description": "Max number of admins to allow connection even when the server is full.", + "env_variable": "MAX_ADMINS", + "default_value": "4", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|min:0" + }, + { + "name": "Server Password", + "description": "Password required to join the server. Leave blank to have no password.", + "env_variable": "SERVER_PASSWORD", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Save Name", + "description": "Name of save file \/ directory.", + "env_variable": "SAVE_NAME", + "default_value": "world1", + "user_viewable": true, + "user_editable": true, + "rules": "required|string" + }, + { + "name": "Auto Save Count", + "description": "Number of autosaves to keep.", + "env_variable": "SAVE_COUNT", + "default_value": "50", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|min:0" + }, + { + "name": "Auto Save Interval", + "description": "Interval in seconds between each autosave.", + "env_variable": "SAVE_INTERVAL", + "default_value": "600", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|min:1" + }, + { + "name": "List On Master Server", + "description": "Set to true to list on the server list, else set to false.", + "env_variable": "SERVER_LIST", + "default_value": "true", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:true,false" + }, + { + "name": "[Repair] Validate Server Files", + "description": "Leave empty (no value) for OFF or type \"true\" or \"1\" for ON. Validates all server files when Automatic Updates is enabled. Note: This will significantly increase server startup times, so it is recommended to only enable this when needed.", + "env_variable": "VALIDATE", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "string|nullable" + }, + { + "name": "[Advanced] Server FPS", + "description": "How often the server refreshes. (Default: 30)", + "env_variable": "FPS", + "default_value": "30", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|min:1" + }, + { + "name": "[Advanced] Enable RCON", + "description": "See the following link for info on how to connect and use RCON: https:\/\/github.com\/StunlockStudios\/vrising-dedicated-server-instructions#rcon", + "env_variable": "RCON", + "default_value": "false", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:true,false" + }, + { + "name": "[Advanced] RCON Password", + "description": "Password required to connect to RCON if it is enabled.", + "env_variable": "RCON_PASS", + "default_value": "somepassword", + "user_viewable": true, + "user_editable": true, + "rules": "required|string" + }, + { + "name": "[Advanced] RCON Port", + "description": "Port used to connect to RCON. Must be allocated to the server for RCON to work.", + "env_variable": "RCON_PORT", + "default_value": "25575", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|between:1024,65536" + }, + { + "name": "[Advanced] Secure Server", + "description": "(true or false)", + "env_variable": "SERVER_SECURE", + "default_value": "true", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:true,false" + }, + { + "name": "[Advanced] Admin Only Debug Events", + "description": "(true or false)", + "env_variable": "ADMIN_ONLY_DEBUG_EVENTS", + "default_value": "true", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:true,false" + }, + { + "name": "[Advanced] Disable Debug Events", + "description": "(true or false)", + "env_variable": "DEBUG_EVENTS", + "default_value": "false", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:true,false" + }, + { + "name": "[Advanced] V Rising Dedicated Server App ID", + "description": "Used for installation and updates. Rarely needs to be changed.", + "env_variable": "SRCDS_APPID", + "default_value": "1829350", + "user_viewable": false, + "user_editable": false, + "rules": "required|integer" + }, + { + "name": "[Advanced] Use Windows Branch", + "description": "Tells the installer\/updater to only download the Windows branch of the server (the only branch currently available) so that it can run on Wine. Cannot be changed.", + "env_variable": "WINDOWS_INSTALL", + "default_value": "1", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|in:1" + } + ] +} \ No newline at end of file From 2a00bb04add8ee60013a07e19ecb5afdc3fc9b37 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Fri, 27 May 2022 23:56:32 -0700 Subject: [PATCH 0422/1001] Fix typo in README Fixes table formatting in Server Ports section --- game_eggs/steamcmd_servers/v_rising/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/v_rising/README.md b/game_eggs/steamcmd_servers/v_rising/README.md index a489dc80..a648066a 100644 --- a/game_eggs/steamcmd_servers/v_rising/README.md +++ b/game_eggs/steamcmd_servers/v_rising/README.md @@ -57,7 +57,7 @@ ___ - The RCON port is optional and only required if the server owner enables/uses RCON. | Port | Default | Protocol | -|---------|---------| +|---------|---------|---------| | **Game (Primary Port in Pterodactyl)** | 9876 | UDP | | Query | 9877 | UDP | | RCON | 25575 | TCP | From bd77d26939a8b18887771d0d52fb0d4164996c93 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Sat, 28 May 2022 13:21:01 -0700 Subject: [PATCH 0423/1001] Verbiage Fixes & Bug Accommodations - `adminlist.txt` and `banlist.txt` are not currently recognized from within the persistent data path, so they were removed from the installation script, and the README was updated to point users to the currently working file location. - "Game Mode" startup parameter was renamed to "Game Settings Preset" to avoid confusion, and it's default value set to null to match documentation. - V Rising was in the wrong alphabetical spot for all the directory READMEs and was fixed. --- README.md | 2 +- game_eggs/README.md | 2 +- game_eggs/steamcmd_servers/README.md | 8 ++++---- game_eggs/steamcmd_servers/v_rising/README.md | 8 ++++---- .../steamcmd_servers/v_rising/egg-v-rising.json | 12 ++++++------ 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 3e15b853..846cf4b8 100644 --- a/README.md +++ b/README.md @@ -240,10 +240,10 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Team Fortress 2 Classic](game_eggs/steamcmd_servers/team_fortress_2_classic) * [Tower Unite](game_eggs/steamcmd_servers/tower_unite) * [Unturned](game_eggs/steamcmd_servers/unturned) +* [V Rising](game_eggs/steamcmd_servers/v_rising) * [Valheim](game_eggs/steamcmd_servers/valheim) * [Valheim Vanilla](game_eggs/steamcmd_servers/valheim/valheim_vanilla) * [Valheim Plus Mod](game_eggs/steamcmd_servers/valheim/valheim_plus) -* [V Rising](game_eggs/steamcmd_servers/v_rising) [Teeworlds](game_eggs/teeworlds) diff --git a/game_eggs/README.md b/game_eggs/README.md index a4c28f03..942e303e 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -156,10 +156,10 @@ * [The Forest](steamcmd_servers/the_forest) * [Tower Unite](steamcmd_servers/tower_unite) * [Unturned](steamcmd_servers/unturned) +* [V Rising](steamcmd_servers/v_rising) * [Valheim](steamcmd_servers/valheim) * [Valheim Plus Mod](steamcmd_servers/valheim/valheim_plus) * [Valheim Vanilla](steamcmd_servers/valheim/valheim_vanilla) -* [V Rising](steamcmd_servers/v_rising) [Teeworlds](teeworlds) diff --git a/game_eggs/steamcmd_servers/README.md b/game_eggs/steamcmd_servers/README.md index 12f49acd..3d2f1ea3 100644 --- a/game_eggs/steamcmd_servers/README.md +++ b/game_eggs/steamcmd_servers/README.md @@ -180,13 +180,13 @@ This is a collection of servers that use SteamCMD to install. [Unturned](unturned) +## V Rising + +[V Rising](v_rising) + ## Valheim [Valheim](valheim) * [Valheim Vanilla](valheim/valheim_vanilla) * [Valheim Plus Mod](valheim/valheim_plus) - -## V Rising - -[V Rising](v_rising) diff --git a/game_eggs/steamcmd_servers/v_rising/README.md b/game_eggs/steamcmd_servers/v_rising/README.md index a648066a..5045e67e 100644 --- a/game_eggs/steamcmd_servers/v_rising/README.md +++ b/game_eggs/steamcmd_servers/v_rising/README.md @@ -85,17 +85,17 @@ You can find the game settings and saves in the `~/save-data/` directory. #### Server Game Settings -Standardized game settings can be applied via the "Game Mode" startup parameter. If you would like a more custom array of settings to adjust, you can copy the `ServerGameSettings.json` file located in `~/VRisingServer_Data/StreamingAssets/Settings/` to `~/save-data/Settings` and adjust as needed. Also, ensure "Game Mode" is set to empty/null. A list of settings, with a description of what each setting does and the min/max values where applicable, [can be found here](https://cdn.stunlock.com/blog/2022/05/25083113/Game-Server-Settings.pdf). +Standardized game settings can be applied via the "Game Settings Preset" startup parameter. If you would like a more custom array of settings to adjust, you can copy the `ServerGameSettings.json` file located in `~/VRisingServer_Data/StreamingAssets/Settings/` to `~/save-data/Settings/` and adjust as needed. Also, ensure "Game Settings Preset" is set to empty/null. A list of settings, with a description of what each setting does and the min/max values where applicable, [can be found here](https://cdn.stunlock.com/blog/2022/05/25083113/Game-Server-Settings.pdf). #### Becoming an Administrator -To become an administrator in the game you will first need to modify the `adminlist.txt` file under `~/save-data/Settings` with your SteamID (one SteamID per line). This can be done without restarting your server. To become an administrator in the game you need to enable the console in the options menu, bring it down with `~` and authenticate using the `adminauth` console command. Once an administrator you can use a number of administrative commands like `banuser`, `bancharacter`, `banned`, `unban` and `kick`. +To become an administrator in the game you will first need to open the `adminlist.txt` file under `~/VRisingServer_Data/StreamingAssets/Settings/` and add your [steamID64](https://steamid.io/) (one steamID64 per line). This can be done without restarting your server. To become an administrator in the game you need to enable the console in the options menu, bring it down with `~` and authenticate using the `adminauth` console command. Once an administrator you can use a number of administrative commands like `banuser`, `bancharacter`, `banned`, `unban` and `kick`. -If you ban users through the in-game console the server will automatically modify the `banlist.txt` file, but you can also modify this manually (one SteamID per line). +If you ban users through the in-game console the server will automatically modify the `banlist.txt` file, but you can also modify this manually (one steamID64 per line). #### Transfer Local/Client Save to the Server -[Follow these instructions by the developer very carefully](https://github.com/StunlockStudios/vrising-dedicated-server-instructions#transfer-localclient-save-to-a-dedicated-server). Note: The `-saveName ` command line parameter and `GameSettingsPreset` setting are handled automatically by the Egg's "Save Name" and "Game Mode" startup parameters, respectively. Also, if a custom `ServerGameSettings.json` file exists for any reason in the `~/save-data/Settings` directory, delete it. +[Follow these instructions by the developer very carefully](https://github.com/StunlockStudios/vrising-dedicated-server-instructions#transfer-localclient-save-to-a-dedicated-server). Note: The `-saveName ` command line parameter and `GameSettingsPreset` setting are handled automatically by the Egg's "Save Name" and "Game Settings Preset" startup parameters, respectively. Also, if a custom `ServerGameSettings.json` file exists for any reason in the `~/save-data/Settings` directory, delete it. #### RCON diff --git a/game_eggs/steamcmd_servers/v_rising/egg-v-rising.json b/game_eggs/steamcmd_servers/v_rising/egg-v-rising.json index 77346dae..5b7a68b8 100644 --- a/game_eggs/steamcmd_servers/v_rising/egg-v-rising.json +++ b/game_eggs/steamcmd_servers/v_rising/egg-v-rising.json @@ -1,5 +1,5 @@ { - "_comment": "Pterodactyl V Rising Egg ~ David Wolfe (Red-Thirten) and Kapatheus ~ 2022-05-26", + "_comment": "Pterodactyl V Rising Egg ~ David Wolfe (Red-Thirten) and Kapatheus ~ 2022-05-28", "meta": { "version": "PTDL_v1", "update_url": null @@ -16,14 +16,14 @@ "file_denylist": [], "startup": "wine64 .\/VRisingServer.exe -persistentDataPath save-data -address 0.0.0.0", "config": { - "files": "{\r\n\t\"save-data\/Settings\/ServerHostSettings.json\": {\r\n\t\t\"parser\": \"json\",\r\n\t\t\"find\": {\r\n\t\t\t\"Name\": \"{{server.build.env.SERVER_NAME}}\",\r\n\t\t\t\"Description\": \"{{server.build.env.DESCRIPTION}}\",\r\n\t\t\t\"Port\": \"{{server.build.default.port}}\",\r\n\t\t\t\"QueryPort\": \"{{server.build.env.QUERY_PORT}}\",\r\n\t\t\t\"MaxConnectedUsers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n\t\t\t\"MaxConnectedAdmins\": \"{{server.build.env.MAX_ADMINS}}\",\r\n\t\t\t\"ServerFps\": \"{{server.build.env.FPS}}\",\r\n\t\t\t\"SaveName\": \"{{server.build.env.SAVE_NAME}}\",\r\n\t\t\t\"Password\": \"{{server.build.env.SERVER_PASSWORD}}\",\r\n\t\t\t\"Secure\": \"{{server.build.env.SERVER_SECURE}}\",\r\n\t\t\t\"ListOnMasterServer\": \"{{server.build.env.SERVER_LIST}}\",\r\n\t\t\t\"AutoSaveCount\": \"{{server.build.env.SAVE_COUNT}}\",\r\n\t\t\t\"AutoSaveInterval\": \"{{server.build.env.SAVE_INTERVAL}}\",\r\n\t\t\t\"GameSettingsPreset\": \"{{server.build.env.GAME_SETTINGS_PRESET}}\",\r\n\t\t\t\"AdminOnlyDebugEvents\": \"{{server.build.env.ADMIN_ONLY_DEBUG_EVENTS}}\",\r\n\t\t\t\"DisableDebugEvents\": \"{{server.build.env.DEBUG_EVENTS}}\",\r\n\t\t\t\"Rcon.Enabled\": \"{{server.build.env.RCON}}\",\r\n\t\t\t\"Rcon.Password\": \"{{server.build.env.RCON_PASS}}\",\r\n\t\t\t\"Rcon.Port\": \"{{server.build.env.RCON_PORT}}\"\r\n\t\t}\r\n\t}\r\n}", + "files": "{\r\n \"save-data\/Settings\/ServerHostSettings.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"Name\": \"{{server.build.env.SERVER_NAME}}\",\r\n \"Description\": \"{{server.build.env.DESCRIPTION}}\",\r\n \"Port\": \"{{server.build.default.port}}\",\r\n \"QueryPort\": \"{{server.build.env.QUERY_PORT}}\",\r\n \"MaxConnectedUsers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"MaxConnectedAdmins\": \"{{server.build.env.MAX_ADMINS}}\",\r\n \"ServerFps\": \"{{server.build.env.FPS}}\",\r\n \"SaveName\": \"{{server.build.env.SAVE_NAME}}\",\r\n \"Password\": \"{{server.build.env.SERVER_PASSWORD}}\",\r\n \"Secure\": \"{{server.build.env.SERVER_SECURE}}\",\r\n \"ListOnMasterServer\": \"{{server.build.env.SERVER_LIST}}\",\r\n \"AutoSaveCount\": \"{{server.build.env.SAVE_COUNT}}\",\r\n \"AutoSaveInterval\": \"{{server.build.env.SAVE_INTERVAL}}\",\r\n \"GameSettingsPreset\": \"{{server.build.env.GAME_SETTINGS_PRESET}}\",\r\n \"AdminOnlyDebugEvents\": \"{{server.build.env.ADMIN_ONLY_DEBUG_EVENTS}}\",\r\n \"DisableDebugEvents\": \"{{server.build.env.DEBUG_EVENTS}}\",\r\n \"Rcon.Enabled\": \"{{server.build.env.RCON}}\",\r\n \"Rcon.Password\": \"{{server.build.env.RCON_PASS}}\",\r\n \"Rcon.Port\": \"{{server.build.env.RCON_PORT}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Loaded ServerGameSettings\"\r\n}", "logs": "{}", "stop": "^C" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl V Rising Egg - egg-v-rising.json\r\n## Authors: David Wolfe (Red-Thirten), Kapatheus\r\n## Date: 2022\/05\/26\r\n## License: MIT License\r\n## Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n# Install packages. Default packages below are skipped if using image noted above, thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n# Download and install SteamCMD\r\nexport HOME=\/mnt\/server\r\ncd \/tmp\r\nmkdir -p $HOME\/steamcmd $HOME\/steamapps\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C $HOME\/steamcmd\r\ncd $HOME\/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\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +force_install_dir $HOME +login anonymous $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} validate +quit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so $HOME\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so $HOME\/.steam\/sdk64\/steamclient.so\r\n\r\n## V Rising Setup\r\nmkdir -p $HOME\/save-data\/Settings && cd \"$_\"\r\ntouch adminlist.txt banlist.txt\r\ncat > ServerHostSettings.json << EOF\r\n{\r\n \"Name\": \"${SERVER_NAME}\",\r\n \"Description\": \"${DESCRIPTION}\",\r\n \"Port\": ${SERVER_PORT},\r\n \"QueryPort\": ${QUERY_PORT},\r\n \"MaxConnectedUsers\": ${MAX_PLAYERS},\r\n \"MaxConnectedAdmins\": ${MAX_ADMINS},\r\n \"ServerFps\": ${FPS},\r\n \"SaveName\": \"${SAVE_NAME}\",\r\n \"Password\": \"${SERVER_PASSWORD}\",\r\n \"Secure\": ${SERVER_SECURE},\r\n \"ListOnMasterServer\": ${SERVER_LIST},\r\n \"AutoSaveCount\": ${SAVE_COUNT},\r\n \"AutoSaveInterval\": ${SAVE_INTERVAL},\r\n \"GameSettingsPreset\": \"${GAME_SETTINGS_PRESET}\",\r\n \"AdminOnlyDebugEvents\": ${ADMIN_ONLY_DEBUG_EVENTS},\r\n \"DisableDebugEvents\": ${DEBUG_EVENTS},\r\n \"Rcon\": {\r\n \"Enabled\": ${RCON},\r\n \"Password\": \"${RCON_PASS}\",\r\n \"Port\": ${RCON_PORT}\r\n }\r\n}\r\nEOF", + "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl V Rising Egg - egg-v-rising.json\r\n## Authors: David Wolfe (Red-Thirten), Kapatheus\r\n## Date: 2022\/05\/28\r\n## License: MIT License\r\n## Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n# Install packages. Default packages below are skipped if using image noted above, thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n# Download and install SteamCMD\r\nexport HOME=\/mnt\/server\r\ncd \/tmp\r\nmkdir -p $HOME\/steamcmd $HOME\/steamapps\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C $HOME\/steamcmd\r\ncd $HOME\/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\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +force_install_dir $HOME +login anonymous $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} validate +quit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so $HOME\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so $HOME\/.steam\/sdk64\/steamclient.so\r\n\r\n## V Rising Setup\r\nmkdir -p $HOME\/save-data\/Settings && cd \"$_\"\r\ncat > ServerHostSettings.json << EOF\r\n{\r\n \"Name\": \"${SERVER_NAME}\",\r\n \"Description\": \"${DESCRIPTION}\",\r\n \"Port\": ${SERVER_PORT},\r\n \"QueryPort\": ${QUERY_PORT},\r\n \"MaxConnectedUsers\": ${MAX_PLAYERS},\r\n \"MaxConnectedAdmins\": ${MAX_ADMINS},\r\n \"ServerFps\": ${FPS},\r\n \"SaveName\": \"${SAVE_NAME}\",\r\n \"Password\": \"${SERVER_PASSWORD}\",\r\n \"Secure\": ${SERVER_SECURE},\r\n \"ListOnMasterServer\": ${SERVER_LIST},\r\n \"AutoSaveCount\": ${SAVE_COUNT},\r\n \"AutoSaveInterval\": ${SAVE_INTERVAL},\r\n \"GameSettingsPreset\": \"${GAME_SETTINGS_PRESET}\",\r\n \"AdminOnlyDebugEvents\": ${ADMIN_ONLY_DEBUG_EVENTS},\r\n \"DisableDebugEvents\": ${DEBUG_EVENTS},\r\n \"Rcon\": {\r\n \"Enabled\": ${RCON},\r\n \"Password\": \"${RCON_PASS}\",\r\n \"Port\": ${RCON_PORT}\r\n }\r\n}\r\nEOF", "container": "ghcr.io\/pterodactyl\/installers:debian", "entrypoint": "\/bin\/bash" } @@ -48,10 +48,10 @@ "rules": "boolean" }, { - "name": "Game Mode", - "description": "What preset of game settings the server should run. Some settings may not apply after the save file is first created. Leave empty\/null if you are using a single-player uploaded save or a custom ServerGameSettings.json file.", + "name": "Game Settings Preset", + "description": "What preset of game settings the server should run. Some settings may not apply after the save file is first created. Leave empty\/null if you are using a single-player uploaded save or a custom ServerGameSettings.json file in the `~\/save-data\/Settings\/` directory.", "env_variable": "GAME_SETTINGS_PRESET", - "default_value": "StandardPvP", + "default_value": "", "user_viewable": true, "user_editable": true, "rules": "nullable|string|in:,DuoPvP,HardcorePvP,Level30PvE,Level30PvP,Level50PvE,Level50PvP,Level70PvE,Level70PvP,SoloPvP,StandardPvE_Easy,StandardPvE_Hard,StandardPvE,StandardPvP_Easy,StandardPvP_Hard,StandardPVP" From 873d27ec4e9fec4df009ccf2a45e11368a1003e2 Mon Sep 17 00:00:00 2001 From: gOOvER Date: Sun, 29 May 2022 05:38:19 +0200 Subject: [PATCH 0424/1001] update/Stormworks --- .../egg-stormworks--build-and-rescue.json | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json b/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json index 9cb54ceb..e2ad6f90 100644 --- a/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json +++ b/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2022-01-20T13:01:27-05:00", + "exported_at": "2022-05-29T05:37:19+02:00", "name": "Stormworks: Build and Rescue", "author": "iamkubi@gmail.com", "description": "Join a world where you design, create and pilot your own air sea rescue service. Release your inner hero as you battle fierce storms out at sea to rescue those in need.", @@ -12,7 +12,7 @@ "steam_disk_space" ], "images": [ - "quay.io\/parkervcp\/pterodactyl-images:debian_wine-5" + "ghcr.io\/parkervcp\/yolks:wine_latest" ], "file_denylist": [], "startup": "xvfb-run wine server.exe +server_dir \/home\/container", @@ -24,20 +24,29 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates xvfb screen\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\nmkdir -p \/mnt\/server\/steam\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steam\r\ncd \/mnt\/server\/steam\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +@sSteamCmdForcePlatformType windows +force_install_dir \/mnt\/server +app_update ${APPID} validate +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so", - "container": "debian:buster-slim", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n ##\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, "variables": [ { - "name": "App ID", + "name": "SRCDS_APPID", "description": "Steam App ID", - "env_variable": "APPID", + "env_variable": "SRCDS_APPID", "default_value": "1247090", "user_viewable": false, "user_editable": false, "rules": "required|string|max:20" + }, + { + "name": "WINDOWS_INSTALL", + "description": "", + "env_variable": "WINDOWS_INSTALL", + "default_value": "1", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From 28cf456a38b6634f195142ca2bf715b49c0c2e92 Mon Sep 17 00:00:00 2001 From: gOOvER Date: Sun, 29 May 2022 05:41:24 +0200 Subject: [PATCH 0425/1001] fix --- .../stormworks/egg-stormworks--build-and-rescue.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json b/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json index e2ad6f90..e8907e4d 100644 --- a/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json +++ b/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json @@ -15,7 +15,7 @@ "ghcr.io\/parkervcp\/yolks:wine_latest" ], "file_denylist": [], - "startup": "xvfb-run wine server.exe +server_dir \/home\/container", + "startup": "xvfb-run wine server64.exe +server_dir \/home\/container", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Server: ready to spawn for peer\"\r\n}", From c317755b44804a64a53c53bae57f5158f69f4905 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Mon, 30 May 2022 20:10:55 +0200 Subject: [PATCH 0426/1001] fix: multitheftauto archive type(#1669) --- game_eggs/gta/mtasa/egg-multi-theft-auto.json | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/game_eggs/gta/mtasa/egg-multi-theft-auto.json b/game_eggs/gta/mtasa/egg-multi-theft-auto.json index b06f9323..d2cfbc2a 100644 --- a/game_eggs/gta/mtasa/egg-multi-theft-auto.json +++ b/game_eggs/gta/mtasa/egg-multi-theft-auto.json @@ -1,13 +1,18 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-10-17T02:19:36+00:00", + "exported_at": "2022-05-25T15:27:15+02:00", "name": "Multi Theft Auto", "author": "info@six-gaming.com", "description": "What more could you want? Multi Theft Auto provides the best online Grand Theft Auto experience there is. Read on to find out more.", - "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", + "features": null, + "images": [ + "ghcr.io\/parkervcp\/yolks:ubuntu" + ], + "file_denylist": [], "startup": ".\/mta-server64 --port {{SERVER_PORT}} --httpport {{SERVER_WEBPORT}} -n", "config": { "files": "{}", @@ -17,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\napt -y update\r\napt -y --no-install-recommends install curl unzip lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -L -o multitheftauto_linux_x64.tar.gz https:\/\/linux.mtasa.com\/dl\/multitheftauto_linux_x64.tar.gz\r\ncurl -L -o mta-baseconfig.tar.gz https:\/\/linux.mtasa.com\/dl\/baseconfig.tar.gz\r\ncurl -L -o mtasa-resources-latest.zip http:\/\/mirror.mtasa.com\/mtasa\/resources\/mtasa-resources-latest.zip\r\n\r\nmkdir -p \/mnt\/server\r\ntar -xzvf multitheftauto_linux_x64.tar.gz\r\ncp -rf multitheftauto_linux_x64\/* \/mnt\/server\r\n\r\nif [ ! -f \/mnt\/server\/x64\/libmysqlclient.so.16 ]; then\r\n curl -L http:\/\/nightly.mtasa.com\/files\/libmysqlclient.so.16 -o \/mnt\/server\/x64\/libmysqlclient.so.16\r\nfi\r\n\r\nmkdir -p \/mnt\/server\/mods\/deathmatch\/resources\r\nunzip -o -d \/mnt\/server\/mods\/deathmatch\/resources mtasa-resources-latest.zip\r\n\r\nmkdir -p \/mnt\/server-conf\r\ntar -xzvf mta-baseconfig.tar.gz\r\ncp -rf baseconfig\/* \/mnt\/server\/mods\/deathmatch\r\n\r\nchown -R root:root \/mnt\r\n\r\nexport HOME=\/mnt\/server", + "script": "#!\/bin\/bash\r\napt -y update\r\napt -y --no-install-recommends install curl unzip lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -L -o multitheftauto_linux_x64.tar.gz https:\/\/linux.mtasa.com\/dl\/multitheftauto_linux_x64.tar.gz\r\ncurl -L -o mta-baseconfig.tar.gz https:\/\/linux.mtasa.com\/dl\/baseconfig.tar.gz\r\ncurl -L -o mtasa-resources-latest.zip http:\/\/mirror.mtasa.com\/mtasa\/resources\/mtasa-resources-latest.zip\r\n\r\nmkdir -p \/mnt\/server\r\ntar -xvf multitheftauto_linux_x64.tar.gz\r\ncp -rf multitheftauto_linux_x64\/* \/mnt\/server\r\n\r\nif [ ! -f \/mnt\/server\/x64\/libmysqlclient.so.16 ]; then\r\n curl -L http:\/\/nightly.mtasa.com\/files\/libmysqlclient.so.16 -o \/mnt\/server\/x64\/libmysqlclient.so.16\r\nfi\r\n\r\nmkdir -p \/mnt\/server\/mods\/deathmatch\/resources\r\nunzip -o -d \/mnt\/server\/mods\/deathmatch\/resources mtasa-resources-latest.zip\r\n\r\nmkdir -p \/mnt\/server-conf\r\ntar -xvf mta-baseconfig.tar.gz\r\ncp -rf baseconfig\/* \/mnt\/server\/mods\/deathmatch\r\n\r\nchown -R root:root \/mnt\r\n\r\nexport HOME=\/mnt\/server\r\necho \"done\"", "container": "ubuntu:18.04", "entrypoint": "bash" } @@ -33,4 +38,4 @@ "rules": "required|numeric" } ] -} \ No newline at end of file +} From a29ea8b1d1cccd7c6c8afa734b4928d65e2e7ef3 Mon Sep 17 00:00:00 2001 From: Elite Espeon Date: Wed, 1 Jun 2022 10:44:40 -0400 Subject: [PATCH 0427/1001] Fix outdated docker image and URL for tf2c content. --- .../egg-team-fortress-2-classic.json | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/game_eggs/steamcmd_servers/team_fortress_2_classic/egg-team-fortress-2-classic.json b/game_eggs/steamcmd_servers/team_fortress_2_classic/egg-team-fortress-2-classic.json index 73df31e8..3fb85ff6 100644 --- a/game_eggs/steamcmd_servers/team_fortress_2_classic/egg-team-fortress-2-classic.json +++ b/game_eggs/steamcmd_servers/team_fortress_2_classic/egg-team-fortress-2-classic.json @@ -1,21 +1,21 @@ { "_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-01-20T13:03:12-05:00", + "exported_at": "2022-06-01T09:25:22-04:00", "name": "Team Fortress 2 Classic", "author": "eggs@scattergun.io", "description": "Team Fortress 2 Classic is a free mod of the 2007 game Team Fortress 2, developed by Eminoma and utilizing the Source engine.", "features": [ "steam_disk_space" ], - "images": [ - "quay.io\/parkervcp\/pterodactyl-images:debian_base" - ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:games_source": "ghcr.io\/parkervcp\/yolks:games_source" + }, "file_denylist": [], - "startup": ".\/srcds_run -game {{SRCDS_GAME}} -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} +ip {{SERVER_IP}} -strictportbind -norestart -debug +maxplayers {{MAXPLAYERS}}", + "startup": ".\/srcds_run -game {{SRCDS_GAME}} -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart -debug +maxplayers {{MAXPLAYERS}}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"gameserver Steam ID\"\r\n}", @@ -24,7 +24,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates p7zip-full wget \r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## download TF2C from website\r\ncd \/mnt\/server\r\nwget -v https:\/\/chapo.services\/tf2c\/tf2classic-${GAMEVERSION}.7z -O tf2classic.7z\r\n7z x tf2classic.7z -y\r\n\r\n## fix issue \/w symlink\r\ncd \/mnt\/server\/bin\r\nln -s vphysics_srv.so vphysics.so\r\nln -s studiorender_srv.so studiorender.so\r\nln -s soundemittersystem_srv.so soundemittersystem.so\r\nln -s shaderapiempty_srv.so shaderapiempty.so\r\nln -s scenefilecache_srv.so scenefilecache.so\r\nln -s replay_srv.so replay.so\r\nln -s materialsystem_srv.so materialsystem.so", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates p7zip-full wget\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\nSTEAM_USER=anonymous\r\nSTEAM_PASS=\"\"\r\nSTEAM_AUTH=\"\"\r\nfi\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\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\nexport HOME=\/mnt\/server\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n## download TF2C from website\r\ncd \/mnt\/server\r\nwget -v https:\/\/wiki.tf2classic.com\/tf2classic-${GAMEVERSION}.zip -O tf2classic.zip\r\n7z x tf2classic.zip -y\r\nrm -rf tf2classic.zip\r\n## fix issue \/w symlink\r\ncd \/mnt\/server\/bin\r\nln -s vphysics_srv.so vphysics.so\r\nln -s studiorender_srv.so studiorender.so\r\nln -s soundemittersystem_srv.so soundemittersystem.so\r\nln -s shaderapiempty_srv.so shaderapiempty.so\r\nln -s scenefilecache_srv.so scenefilecache.so\r\nln -s replay_srv.so replay.so\r\nln -s materialsystem_srv.so materialsystem.so", "container": "ubuntu:18.04", "entrypoint": "bash" } @@ -37,7 +37,8 @@ "default_value": "244310", "user_viewable": true, "user_editable": false, - "rules": "required|regex:\/^(244310)$\/" + "rules": "required|regex:\/^(244310)$\/", + "field_type": "text" }, { "name": "Game Name", @@ -46,7 +47,8 @@ "default_value": "tf2classic", "user_viewable": true, "user_editable": false, - "rules": "required|regex:\/^(tf2classic)$\/" + "rules": "required|regex:\/^(tf2classic)$\/", + "field_type": "text" }, { "name": "Default Map", @@ -55,16 +57,18 @@ "default_value": "ctf_2fort", "user_viewable": true, "user_editable": true, - "rules": "required|regex:\/^(\\w{1,20})$\/" + "rules": "required|regex:\/^(\\w{1,20})$\/", + "field_type": "text" }, { "name": "Game Version", "description": "Version of TF2C to download.", "env_variable": "GAMEVERSION", - "default_value": "2.0.1", + "default_value": "2.0.3", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" }, { "name": "Max Players", @@ -73,7 +77,8 @@ "default_value": "24", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" } ] -} +} \ No newline at end of file From 7bc6cbb92fcca1feac0ce80086ba29e1dea0bbe1 Mon Sep 17 00:00:00 2001 From: TuEye <26883979+TuEye@users.noreply.github.com> Date: Wed, 8 Jun 2022 01:28:49 +0200 Subject: [PATCH 0428/1001] fix: PostgresSQL (#1643) Fixes user creation and allowing remote connections --- database/sql/postgres/egg-postgres.json | 57 +- database/sql/postgres/postgres.conf | 658 ------------------------ 2 files changed, 22 insertions(+), 693 deletions(-) delete mode 100644 database/sql/postgres/postgres.conf diff --git a/database/sql/postgres/egg-postgres.json b/database/sql/postgres/egg-postgres.json index 638692e7..ef889584 100644 --- a/database/sql/postgres/egg-postgres.json +++ b/database/sql/postgres/egg-postgres.json @@ -1,62 +1,49 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v1", + "update_url": null }, - "exported_at": "2020-03-04T09:53:34-05:00", + "exported_at": "2022-05-08T21:54:05+02:00", "name": "Postgres", "author": "parker@parkervcp.com", "description": "A default Postgres install that is not really editable.", - "image": "quay.io\/parkervcp\/pterodactyl-images:db_postgres", + "features": null, + "images": [ + "ghcr.io\/parkervcp\/yolks:postgres_14" + ], + "file_denylist": [], "startup": "postgres -D \/home\/container\/postgres_db\/", "config": { - "files": "{\r\n \"postgres_db\/postgresql.conf\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n\t\t \"#port =\": \"port = {{server.build.default.port}}\",\r\n \"#external_pid_file =\": \"external_pid_file = '\/home\/container\/postgres_db\/run\/postgres.pid'\",\r\n \"#unix_socket_directories =\": \"unix_socket_directories = '\/home\/container\/postgres_db\/run\/'\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"postgres_db\/postgresql.conf\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"#port =\": \"port = {{server.build.default.port}}\",\r\n \"#external_pid_file =\": \"external_pid_file = '\/home\/container\/postgres_db\/run\/postgres.pid'\",\r\n \"#unix_socket_directories =\": \"unix_socket_directories = '\/home\/container\/postgres_db\/run\/'\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"database system is ready to accept connections\"\r\n}", "logs": "{}", "stop": "^C" }, "scripts": { "installation": { - "script": "#! \/bin\/ash\r\nadduser -D -h \/home\/container container\r\n\r\necho $POSTGRES_PASSWORD > .passwd\r\n\r\nchown -R container: \/mnt\/server\/\r\n\r\ncat .passwd\r\n\r\nsu container -c 'initdb -D \/mnt\/server\/postgres_db\/ -A md5 -U container --pwfile .passwd'\r\n\r\nmkdir -p \/mnt\/server\/postgres_db\/run\/\r\n\r\necho -e \"Done\"", - "container": "postgres:13.1-alpine", - "entrypoint": "ash" + "script": "#! \/bin\/ash\r\nadduser -D -h \/home\/container container\r\n\r\nchown -R container: \/mnt\/server\/\r\n\r\nsu container -c 'initdb -D \/mnt\/server\/postgres_db\/ -A md5 -U \"$PGUSER\" --pwfile=<(echo \"$PGPASSWORD\")'\r\n\r\nmkdir -p \/mnt\/server\/postgres_db\/run\/\r\n\r\n## Add default \"allow from all\" auth rule to pg_hba\r\nif ! grep -q \"# Custom rules\" \"\/mnt\/server\/postgres_db\/pg_hba.conf\"; then\r\n echo -e \"# Custom rules\\nhost all all 0.0.0.0\/0 md5\" >> \"\/mnt\/server\/postgres_db\/pg_hba.conf\"\r\nfi\r\n\r\necho -e \"Done\"", + "container": "postgres:14-alpine", + "entrypoint": "bash" } }, "variables": [ { - "name": "Database Password", - "description": "The Postgres user password that can be changed and should change on server restart.", - "env_variable": "PGPASSWORD", - "default_value": "P@55word", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:20" - }, - { - "name": "SuperUser Password", - "description": "The postgres super user password with a strong default.\r\nYou should be generating new ones for each server.\r\nIf you don't then users can hit other users DB's", - "env_variable": "PGROOT", - "default_value": "ZPWgpMN4hETqjXAV", - "user_viewable": 1, - "user_editable": 0, - "rules": "required|string|max:20" - }, - { - "name": "Postgres User", - "description": "The user for the postgres database", + "name": "Superuser Name", + "description": "The username for the postgres superuser", "env_variable": "PGUSER", "default_value": "pterodactyl", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "required|string|max:20" }, { - "name": "Postgres Database", - "description": "The postgres database the user will have access too.", - "env_variable": "PGDATABASE", - "default_value": "pterodactyl", - "user_viewable": 1, - "user_editable": 0, + "name": "Superuser Password", + "description": "The postgres super user password with a strong default.\r\nYou should be generating new ones for each server.\r\nIf you don't then users can hit other users DB's", + "env_variable": "PGPASSWORD", + "default_value": "Pl3453Ch4n63M3!", + "user_viewable": true, + "user_editable": false, "rules": "required|string|max:20" } ] diff --git a/database/sql/postgres/postgres.conf b/database/sql/postgres/postgres.conf deleted file mode 100644 index 19a9762f..00000000 --- a/database/sql/postgres/postgres.conf +++ /dev/null @@ -1,658 +0,0 @@ -# ----------------------------- -# PostgreSQL configuration file -# ----------------------------- -# -# This file consists of lines of the form: -# -# name = value -# -# (The "=" is optional.) Whitespace may be used. Comments are introduced with -# "#" anywhere on a line. The complete list of parameter names and allowed -# values can be found in the PostgreSQL documentation. -# -# The commented-out settings shown in this file represent the default values. -# Re-commenting a setting is NOT sufficient to revert it to the default value; -# you need to reload the server. -# -# This file is read on server startup and when the server receives a SIGHUP -# signal. If you edit the file on a running system, you have to SIGHUP the -# server for the changes to take effect, run "pg_ctl reload", or execute -# "SELECT pg_reload_conf()". Some parameters, which are marked below, -# require a server shutdown and restart to take effect. -# -# Any parameter can also be given as a command-line option to the server, e.g., -# "postgres -c log_connections=on". Some parameters can be changed at run time -# with the "SET" SQL command. -# -# Memory units: kB = kilobytes Time units: ms = milliseconds -# MB = megabytes s = seconds -# GB = gigabytes min = minutes -# TB = terabytes h = hours -# d = days - - -#------------------------------------------------------------------------------ -# FILE LOCATIONS -#------------------------------------------------------------------------------ - -# The default values of these variables are driven from the -D command-line -# option or PGDATA environment variable, represented here as ConfigDir. - -#data_directory = 'ConfigDir' # use data in another directory - # (change requires restart) -#hba_file = 'ConfigDir/pg_hba.conf' # host-based authentication file - # (change requires restart) -#ident_file = 'ConfigDir/pg_ident.conf' # ident configuration file - # (change requires restart) - -# If external_pid_file is not explicitly set, no extra PID file is written. -#external_pid_file = '' # write an extra PID file - # (change requires restart) - - -#------------------------------------------------------------------------------ -# CONNECTIONS AND AUTHENTICATION -#------------------------------------------------------------------------------ - -# - Connection Settings - - -listen_addresses = '*' - # comma-separated list of addresses; - # defaults to 'localhost'; use '*' for all - # (change requires restart) -port = 5432 # (change requires restart) -#max_connections = 100 # (change requires restart) -#superuser_reserved_connections = 3 # (change requires restart) -#unix_socket_directories = '/tmp' # comma-separated list of directories - # (change requires restart) -#unix_socket_group = '' # (change requires restart) -#unix_socket_permissions = 0777 # begin with 0 to use octal notation - # (change requires restart) -#bonjour = off # advertise server via Bonjour - # (change requires restart) -#bonjour_name = '' # defaults to the computer name - # (change requires restart) - -# - Security and Authentication - - -#authentication_timeout = 1min # 1s-600s -#ssl = off -#ssl_ciphers = 'HIGH:MEDIUM:+3DES:!aNULL' # allowed SSL ciphers -#ssl_prefer_server_ciphers = on -#ssl_ecdh_curve = 'prime256v1' -#ssl_dh_params_file = '' -#ssl_cert_file = 'server.crt' -#ssl_key_file = 'server.key' -#ssl_ca_file = '' -#ssl_crl_file = '' -#password_encryption = md5 # md5 or scram-sha-256 -#db_user_namespace = off -#row_security = on - -# GSSAPI using Kerberos -#krb_server_keyfile = '' -#krb_caseins_users = off - -# - TCP Keepalives - -# see "man 7 tcp" for details - -#tcp_keepalives_idle = 0 # TCP_KEEPIDLE, in seconds; - # 0 selects the system default -#tcp_keepalives_interval = 0 # TCP_KEEPINTVL, in seconds; - # 0 selects the system default -#tcp_keepalives_count = 0 # TCP_KEEPCNT; - # 0 selects the system default - - -#------------------------------------------------------------------------------ -# RESOURCE USAGE (except WAL) -#------------------------------------------------------------------------------ - -# - Memory - - -#shared_buffers = 32MB # min 128kB - # (change requires restart) -#huge_pages = try # on, off, or try - # (change requires restart) -#temp_buffers = 8MB # min 800kB -#max_prepared_transactions = 0 # zero disables the feature - # (change requires restart) -# Caution: it is not advisable to set max_prepared_transactions nonzero unless -# you actively intend to use prepared transactions. -#work_mem = 4MB # min 64kB -#maintenance_work_mem = 64MB # min 1MB -#replacement_sort_tuples = 150000 # limits use of replacement selection sort -#autovacuum_work_mem = -1 # min 1MB, or -1 to use maintenance_work_mem -#max_stack_depth = 2MB # min 100kB -#dynamic_shared_memory_type = posix # the default is the first option - # supported by the operating system: - # posix - # sysv - # windows - # mmap - # use none to disable dynamic shared memory - # (change requires restart) - -# - Disk - - -#temp_file_limit = -1 # limits per-process temp file space - # in kB, or -1 for no limit - -# - Kernel Resource Usage - - -#max_files_per_process = 1000 # min 25 - # (change requires restart) -#shared_preload_libraries = '' # (change requires restart) - -# - Cost-Based Vacuum Delay - - -#vacuum_cost_delay = 0 # 0-100 milliseconds -#vacuum_cost_page_hit = 1 # 0-10000 credits -#vacuum_cost_page_miss = 10 # 0-10000 credits -#vacuum_cost_page_dirty = 20 # 0-10000 credits -#vacuum_cost_limit = 200 # 1-10000 credits - -# - Background Writer - - -#bgwriter_delay = 200ms # 10-10000ms between rounds -#bgwriter_lru_maxpages = 100 # 0-1000 max buffers written/round -#bgwriter_lru_multiplier = 2.0 # 0-10.0 multiplier on buffers scanned/round -#bgwriter_flush_after = 0 # measured in pages, 0 disables - -# - Asynchronous Behavior - - -#effective_io_concurrency = 1 # 1-1000; 0 disables prefetching -#max_worker_processes = 8 # (change requires restart) -#max_parallel_workers_per_gather = 2 # taken from max_parallel_workers -#max_parallel_workers = 8 # maximum number of max_worker_processes that - # can be used in parallel queries -#old_snapshot_threshold = -1 # 1min-60d; -1 disables; 0 is immediate - # (change requires restart) -#backend_flush_after = 0 # measured in pages, 0 disables - - -#------------------------------------------------------------------------------ -# WRITE AHEAD LOG -#------------------------------------------------------------------------------ - -# - Settings - - -#wal_level = replica # minimal, replica, or logical - # (change requires restart) -#fsync = on # flush data to disk for crash safety - # (turning this off can cause - # unrecoverable data corruption) -#synchronous_commit = on # synchronization level; - # off, local, remote_write, remote_apply, or on -#wal_sync_method = fsync # the default is the first option - # supported by the operating system: - # open_datasync - # fdatasync (default on Linux) - # fsync - # fsync_writethrough - # open_sync -#full_page_writes = on # recover from partial page writes -#wal_compression = off # enable compression of full-page writes -#wal_log_hints = off # also do full page writes of non-critical updates - # (change requires restart) -#wal_buffers = -1 # min 32kB, -1 sets based on shared_buffers - # (change requires restart) -#wal_writer_delay = 200ms # 1-10000 milliseconds -#wal_writer_flush_after = 1MB # measured in pages, 0 disables - -#commit_delay = 0 # range 0-100000, in microseconds -#commit_siblings = 5 # range 1-1000 - -# - Checkpoints - - -#checkpoint_timeout = 5min # range 30s-1d -#max_wal_size = 1GB -#min_wal_size = 80MB -#checkpoint_completion_target = 0.5 # checkpoint target duration, 0.0 - 1.0 -#checkpoint_flush_after = 0 # measured in pages, 0 disables -#checkpoint_warning = 30s # 0 disables - -# - Archiving - - -#archive_mode = off # enables archiving; off, on, or always - # (change requires restart) -#archive_command = '' # command to use to archive a logfile segment - # placeholders: %p = path of file to archive - # %f = file name only - # e.g. 'test ! -f /mnt/server/archivedir/%f && cp %p /mnt/server/archivedir/%f' -#archive_timeout = 0 # force a logfile segment switch after this - # number of seconds; 0 disables - - -#------------------------------------------------------------------------------ -# REPLICATION -#------------------------------------------------------------------------------ - -# - Sending Server(s) - - -# Set these on the master and on any standby that will send replication data. - -#max_wal_senders = 10 # max number of walsender processes - # (change requires restart) -#wal_keep_segments = 0 # in logfile segments, 16MB each; 0 disables -#wal_sender_timeout = 60s # in milliseconds; 0 disables - -#max_replication_slots = 10 # max number of replication slots - # (change requires restart) -#track_commit_timestamp = off # collect timestamp of transaction commit - # (change requires restart) - -# - Master Server - - -# These settings are ignored on a standby server. - -#synchronous_standby_names = '' # standby servers that provide sync rep - # method to choose sync standbys, number of sync standbys, - # and comma-separated list of application_name - # from standby(s); '*' = all -#vacuum_defer_cleanup_age = 0 # number of xacts by which cleanup is delayed - -# - Standby Servers - - -# These settings are ignored on a master server. - -#hot_standby = on # "off" disallows queries during recovery - # (change requires restart) -#max_standby_archive_delay = 30s # max delay before canceling queries - # when reading WAL from archive; - # -1 allows indefinite delay -#max_standby_streaming_delay = 30s # max delay before canceling queries - # when reading streaming WAL; - # -1 allows indefinite delay -#wal_receiver_status_interval = 10s # send replies at least this often - # 0 disables -#hot_standby_feedback = off # send info from standby to prevent - # query conflicts -#wal_receiver_timeout = 60s # time that receiver waits for - # communication from master - # in milliseconds; 0 disables -#wal_retrieve_retry_interval = 5s # time to wait before retrying to - # retrieve WAL after a failed attempt - -# - Subscribers - - -# These settings are ignored on a publisher. - -#max_logical_replication_workers = 4 # taken from max_worker_processes - # (change requires restart) -#max_sync_workers_per_subscription = 2 # taken from max_logical_replication_workers - - -#------------------------------------------------------------------------------ -# QUERY TUNING -#------------------------------------------------------------------------------ - -# - Planner Method Configuration - - -#enable_bitmapscan = on -#enable_hashagg = on -#enable_hashjoin = on -#enable_indexscan = on -#enable_indexonlyscan = on -#enable_material = on -#enable_mergejoin = on -#enable_nestloop = on -#enable_seqscan = on -#enable_sort = on -#enable_tidscan = on - -# - Planner Cost Constants - - -#seq_page_cost = 1.0 # measured on an arbitrary scale -#random_page_cost = 4.0 # same scale as above -#cpu_tuple_cost = 0.01 # same scale as above -#cpu_index_tuple_cost = 0.005 # same scale as above -#cpu_operator_cost = 0.0025 # same scale as above -#parallel_tuple_cost = 0.1 # same scale as above -#parallel_setup_cost = 1000.0 # same scale as above -#min_parallel_table_scan_size = 8MB -#min_parallel_index_scan_size = 512kB -#effective_cache_size = 4GB - -# - Genetic Query Optimizer - - -#geqo = on -#geqo_threshold = 12 -#geqo_effort = 5 # range 1-10 -#geqo_pool_size = 0 # selects default based on effort -#geqo_generations = 0 # selects default based on effort -#geqo_selection_bias = 2.0 # range 1.5-2.0 -#geqo_seed = 0.0 # range 0.0-1.0 - -# - Other Planner Options - - -#default_statistics_target = 100 # range 1-10000 -#constraint_exclusion = partition # on, off, or partition -#cursor_tuple_fraction = 0.1 # range 0.0-1.0 -#from_collapse_limit = 8 -#join_collapse_limit = 8 # 1 disables collapsing of explicit - # JOIN clauses -#force_parallel_mode = off - - -#------------------------------------------------------------------------------ -# ERROR REPORTING AND LOGGING -#------------------------------------------------------------------------------ - -# - Where to Log - - -#log_destination = 'stderr' # Valid values are combinations of - # stderr, csvlog, syslog, and eventlog, - # depending on platform. csvlog - # requires logging_collector to be on. - -# This is used when logging to stderr: -#logging_collector = off # Enable capturing of stderr and csvlog - # into log files. Required to be on for - # csvlogs. - # (change requires restart) - -# These are only used if logging_collector is on: -#log_directory = 'log' # directory where log files are written, - # can be absolute or relative to PGDATA -#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log' # log file name pattern, - # can include strftime() escapes -#log_file_mode = 0600 # creation mode for log files, - # begin with 0 to use octal notation -#log_truncate_on_rotation = off # If on, an existing log file with the - # same name as the new log file will be - # truncated rather than appended to. - # But such truncation only occurs on - # time-driven rotation, not on restarts - # or size-driven rotation. Default is - # off, meaning append to existing files - # in all cases. -#log_rotation_age = 1d # Automatic rotation of logfiles will - # happen after that time. 0 disables. -#log_rotation_size = 10MB # Automatic rotation of logfiles will - # happen after that much log output. - # 0 disables. - -# These are relevant when logging to syslog: -#syslog_facility = 'LOCAL0' -#syslog_ident = 'postgres' -#syslog_sequence_numbers = on -#syslog_split_messages = on - -# This is only relevant when logging to eventlog (win32): -# (change requires restart) -#event_source = 'PostgreSQL' - -# - When to Log - - -#client_min_messages = notice # values in order of decreasing detail: - # debug5 - # debug4 - # debug3 - # debug2 - # debug1 - # log - # notice - # warning - # error - -#log_min_messages = warning # values in order of decreasing detail: - # debug5 - # debug4 - # debug3 - # debug2 - # debug1 - # info - # notice - # warning - # error - # log - # fatal - # panic - -#log_min_error_statement = error # values in order of decreasing detail: - # debug5 - # debug4 - # debug3 - # debug2 - # debug1 - # info - # notice - # warning - # error - # log - # fatal - # panic (effectively off) - -#log_min_duration_statement = -1 # -1 is disabled, 0 logs all statements - # and their durations, > 0 logs only - # statements running at least this number - # of milliseconds - - -# - What to Log - - -#debug_print_parse = off -#debug_print_rewritten = off -#debug_print_plan = off -#debug_pretty_print = on -#log_checkpoints = off -#log_connections = off -#log_disconnections = off -#log_duration = off -#log_error_verbosity = default # terse, default, or verbose messages -#log_hostname = off -#log_line_prefix = '%m [%p] ' # special values: - # %a = application name - # %u = user name - # %d = database name - # %r = remote host and port - # %h = remote host - # %p = process ID - # %t = timestamp without milliseconds - # %m = timestamp with milliseconds - # %n = timestamp with milliseconds (as a Unix epoch) - # %i = command tag - # %e = SQL state - # %c = session ID - # %l = session line number - # %s = session start timestamp - # %v = virtual transaction ID - # %x = transaction ID (0 if none) - # %q = stop here in non-session - # processes - # %% = '%' - # e.g. '<%u%%%d> ' -#log_lock_waits = off # log lock waits >= deadlock_timeout -#log_statement = 'none' # none, ddl, mod, all -#log_replication_commands = off -#log_temp_files = -1 # log temporary files equal or larger - # than the specified size in kilobytes; - # -1 disables, 0 logs all temp files -#log_timezone = 'GMT' - - -# - Process Title - - -#cluster_name = '' # added to process titles if nonempty - # (change requires restart) -#update_process_title = on - - -#------------------------------------------------------------------------------ -# RUNTIME STATISTICS -#------------------------------------------------------------------------------ - -# - Query/Index Statistics Collector - - -#track_activities = on -#track_counts = on -#track_io_timing = off -#track_functions = none # none, pl, all -#track_activity_query_size = 1024 # (change requires restart) -#stats_temp_directory = 'pg_stat_tmp' - - -# - Statistics Monitoring - - -#log_parser_stats = off -#log_planner_stats = off -#log_executor_stats = off -#log_statement_stats = off - - -#------------------------------------------------------------------------------ -# AUTOVACUUM PARAMETERS -#------------------------------------------------------------------------------ - -#autovacuum = on # Enable autovacuum subprocess? 'on' - # requires track_counts to also be on. -#log_autovacuum_min_duration = -1 # -1 disables, 0 logs all actions and - # their durations, > 0 logs only - # actions running at least this number - # of milliseconds. -#autovacuum_max_workers = 3 # max number of autovacuum subprocesses - # (change requires restart) -#autovacuum_naptime = 1min # time between autovacuum runs -#autovacuum_vacuum_threshold = 50 # min number of row updates before - # vacuum -#autovacuum_analyze_threshold = 50 # min number of row updates before - # analyze -#autovacuum_vacuum_scale_factor = 0.2 # fraction of table size before vacuum -#autovacuum_analyze_scale_factor = 0.1 # fraction of table size before analyze -#autovacuum_freeze_max_age = 200000000 # maximum XID age before forced vacuum - # (change requires restart) -#autovacuum_multixact_freeze_max_age = 400000000 # maximum multixact age - # before forced vacuum - # (change requires restart) -#autovacuum_vacuum_cost_delay = 20ms # default vacuum cost delay for - # autovacuum, in milliseconds; - # -1 means use vacuum_cost_delay -#autovacuum_vacuum_cost_limit = -1 # default vacuum cost limit for - # autovacuum, -1 means use - # vacuum_cost_limit - - -#------------------------------------------------------------------------------ -# CLIENT CONNECTION DEFAULTS -#------------------------------------------------------------------------------ - -# - Statement Behavior - - -#search_path = '"$user", public' # schema names -#default_tablespace = '' # a tablespace name, '' uses the default -#temp_tablespaces = '' # a list of tablespace names, '' uses - # only default tablespace -#check_function_bodies = on -#default_transaction_isolation = 'read committed' -#default_transaction_read_only = off -#default_transaction_deferrable = off -#session_replication_role = 'origin' -#statement_timeout = 0 # in milliseconds, 0 is disabled -#lock_timeout = 0 # in milliseconds, 0 is disabled -#idle_in_transaction_session_timeout = 0 # in milliseconds, 0 is disabled -#vacuum_freeze_min_age = 50000000 -#vacuum_freeze_table_age = 150000000 -#vacuum_multixact_freeze_min_age = 5000000 -#vacuum_multixact_freeze_table_age = 150000000 -#bytea_output = 'hex' # hex, escape -#xmlbinary = 'base64' -#xmloption = 'content' -#gin_fuzzy_search_limit = 0 -#gin_pending_list_limit = 4MB - -# - Locale and Formatting - - -#datestyle = 'iso, mdy' -#intervalstyle = 'postgres' -#timezone = 'GMT' -#timezone_abbreviations = 'Default' # Select the set of available time zone - # abbreviations. Currently, there are - # Default - # Australia (historical usage) - # India - # You can create your own file in - # share/timezonesets/. -#extra_float_digits = 0 # min -15, max 3 -#client_encoding = sql_ascii # actually, defaults to database - # encoding - -# These settings are initialized by initdb, but they can be changed. -#lc_messages = 'C' # locale for system error message - # strings -#lc_monetary = 'C' # locale for monetary formatting -#lc_numeric = 'C' # locale for number formatting -#lc_time = 'C' # locale for time formatting - -# default configuration for text search -#default_text_search_config = 'pg_catalog.simple' - -# - Other Defaults - - -#dynamic_library_path = '$libdir' -#local_preload_libraries = '' -#session_preload_libraries = '' - - -#------------------------------------------------------------------------------ -# LOCK MANAGEMENT -#------------------------------------------------------------------------------ - -#deadlock_timeout = 1s -#max_locks_per_transaction = 64 # min 10 - # (change requires restart) -#max_pred_locks_per_transaction = 64 # min 10 - # (change requires restart) -#max_pred_locks_per_relation = -2 # negative values mean - # (max_pred_locks_per_transaction - # / -max_pred_locks_per_relation) - 1 -#max_pred_locks_per_page = 2 # min 0 - - -#------------------------------------------------------------------------------ -# VERSION/PLATFORM COMPATIBILITY -#------------------------------------------------------------------------------ - -# - Previous PostgreSQL Versions - - -#array_nulls = on -#backslash_quote = safe_encoding # on, off, or safe_encoding -#default_with_oids = off -#escape_string_warning = on -#lo_compat_privileges = off -#operator_precedence_warning = off -#quote_all_identifiers = off -#standard_conforming_strings = on -#synchronize_seqscans = on - -# - Other Platforms and Clients - - -#transform_null_equals = off - - -#------------------------------------------------------------------------------ -# ERROR HANDLING -#------------------------------------------------------------------------------ - -#exit_on_error = off # terminate session on any error? -#restart_after_crash = on # reinitialize after backend crash? - - -#------------------------------------------------------------------------------ -# CONFIG FILE INCLUDES -#------------------------------------------------------------------------------ - -# These options allow settings to be loaded from files other than the -# default postgresql.conf. - -#include_dir = 'conf.d' # include files ending in '.conf' from - # directory 'conf.d' -#include_if_exists = 'exists.conf' # include file only if it exists -#include = 'special.conf' # include file - - -#------------------------------------------------------------------------------ -# CUSTOMIZED OPTIONS -#------------------------------------------------------------------------------ - -# Add settings for extensions here From 2e61f77c5509df29775b4ab3b448a9e92ce2a412 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Fri, 10 Jun 2022 15:09:30 -0400 Subject: [PATCH 0429/1001] update curseforge egg to use new api New api requires updates. tested with mod id 253026 --- .../curseforge-generic/egg-curseforge-generic.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json b/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json index 8cb53d17..66706ae4 100644 --- a/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json +++ b/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2022-01-24T02:52:47+01:00", + "exported_at": "2022-06-10T15:03:34-04:00", "name": "Curseforge Generic", "author": "parker@parkervcp.com", "description": "A generic egg for a forge modpack", @@ -29,7 +29,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir -p \/mnt\/server\r\nfi\r\n\r\nfunction install_required {\r\n apt update\r\n apt install -y curl jq unzip dos2unix\r\n}\r\n\r\nfunction get_download {\r\n # get json data to work with\r\n echo -e \"Curling the json for the modpack\"\r\n echo -e \"running: curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID}\"\r\n JSON_DATA=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID})\r\n\r\n # if no modpack version is set or is set to latest\r\n if [ -z ${MODPACK_VERSION} ] || [ \"${MODPACK_VERSION}\" = \"latest\" ]; then\r\n echo -e \"Getting latest download url\"\r\n # parse data to get the download url\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r .defaultFileId)\r\n echo -e \"File ID is: ${FILE_ID}\"\r\n if [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".latestFiles[] | select(.id==$FILE_ID) | .isServerPack\")\" == \"false\" ] && [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\" != \"null\" ]; then\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\r\n DOWNLOAD_URL=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID}\/file\/${FILE_ID}\/download-url)\r\n else\r\n DOWNLOAD_URL=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID}\/file\/${FILE_ID}\/download-url)\r\n fi\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n else\r\n echo -e \"Looking for download url for version ${MODPACK_VERSION}\"\r\n # parse files for version match\r\n FILES_JSON_DATA=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID}\/files)\r\n # get element number to get the exact location in the json\r\n FILES_JSON_ELEMENT=$(echo -e ${FILES_JSON_DATA} | jq --arg VERSION \"${MODPACK_VERSION}\" '.[] | select(.displayName) | .displayName | contains($VERSION)' | grep -n true | cut -f1 -d: | tail -1)\r\n # if there wasn't a match default to latest\r\n if [ ! -z ${FILES_JSON_ELEMENT} ]; then\r\n echo -e \"No matching version found\"\r\n echo -e \"defaulting to latest\"\r\n DOWNLOAD_URL=$(echo -e ${FILES_JSON_DATA} | jq --arg ELEMENT \"${FILES_JSON_ELEMENT}\" '.[$ELEMENT|tonumber-1] | .downloadUrl')\r\n else\r\n echo -e \"Version match found\"\r\n DOWNLOAD_URL=$(echo -e ${JSON_DATA} | jq -r .latestFiles[0].downloadUrl)\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n fi\r\n fi\r\n ## download modpack files\r\n cd \/mnt\/server\r\n echo \"Executing curl -L ${DOWNLOAD_URL} -o server.zip\"\r\n curl -L -g \"${DOWNLOAD_URL}\" -o server.zip\r\n unzip -o server.zip\r\n rm -rf server.zip\r\n}\r\n\r\nfunction forge_install {\r\n echo -e \"\\nInstalling forge server using the installer jar file.\\n\"\r\n if [ -f \/mnt\/server\/*installer.jar ]; then\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n else\r\n echo \"No forge installer found moving on.\"\r\n fi\r\n mv FTBServer.jar server.jar\r\n}\r\n\r\nfunction forge_cleanup {\r\n echo -e \"\\nDeleting installer jar file and cleaning up.\\n\"\r\n rm -rf *installer.jar\r\n if [ ! -f \/mnt\/server\/*universal.jar ]; then\r\n mv -v \/mnt\/server\/*\/* \/mnt\/server\/\r\n if [ ! -f \/mnt\/server\/*universal.jar ]; then\r\n mv forge*.jar server.jar\r\n else\r\n mv *universal.jar server.jar \r\n fi\r\n else\r\n mv *universal.jar server.jar\r\n fi\r\n}\r\n\r\nfunction json_download_prework {\r\n mkdir -p \/mnt\/server\/mods\r\n cd \/mnt\/server\/mods\r\n}\r\n\r\nfunction json_download_mods {\r\n MANIFEST=\/mnt\/server\/manifest.json\r\n for mod in $(jq -c '.files[]' ${MANIFEST} ); do\r\n projID=$(echo $mod | jq -r \".projectID\")\r\n fileID=$(echo $mod | jq -r \".fileID\")\r\n URL=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${projID}\/file\/${fileID}\/download-url)\r\n # this is saving everything as \/mnt\/server\/mods\/download\r\n echo \"Mod direct url: ${URL}\"\r\n curl -JLO \"${URL}\"\r\n done\r\n}\r\n\r\nfunction json_download_forge {\r\n cd \/mnt\/server\r\n FORGE=$(jq -r '.minecraft.modLoaders[0].id' \/mnt\/server\/manifest.json | cut -d '-' -f2)\r\n MCVER=$(jq -r '.minecraft.version' \/mnt\/server\/manifest.json)\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\"\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction json_download_overrides {\r\n if [ -d \/mnt\/server\/overrides ]; then\r\n mv \/mnt\/server\/overrides\/mods\/* \/mnt\/server\/mods\/\r\n rmdir \/mnt\/server\/overrides\/mods\r\n mv \/mnt\/server\/overrides\/* \/mnt\/server\r\n rmdir \/mnt\/server\/overrides\r\n fi\r\n}\r\n\r\nfunction cfg_download_forge {\r\n dos2unix settings.cfg # In case the pack was distributed with Windows-style line endings in the cfg file\r\n MCVER=`grep 'MCVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n FORGE=`grep 'FORGEVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n \r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n echo -e ${FORGE_VERSION}\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\"\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction ftb_install {\r\n chmod +x \/mnt\/server\/settings.sh \r\n . \/mnt\/server\/settings.sh \r\n curl https:\/\/s3.amazonaws.com\/Minecraft.Download\/versions\/${MCVER}\/minecraft_server.${MCVER}.jar -o ${JARFILE} \r\n curl https:\/\/libraries.minecraft.net\/${LAUNCHWRAPPER} -o \/mnt\/server\/libraries\/${LAUNCHWRAPPER}\r\n}\r\n\r\ninstall_required\r\nget_download\r\n\r\nif [ -f \/mnt\/server\/manifest.json ]; then\r\n json_download_prework\r\n json_download_mods\r\n json_download_overrides\r\n json_download_forge\r\nelif [ -f \/mnt\/server\/settings.cfg ]; then\r\n cfg_download_forge\r\nelif [ -f \/mnt\/server\/version.json ]; then\r\n if [ \"$(cat \/mnt\/server\/version.json | jq -r '.packID | contains(\"FTB\")')\" == \"true\" ]; then\r\n ftb_install\r\n fi\r\nelse\r\n forge_install\r\n forge_cleanup\r\nfi\r\necho -e \"\\n\\nInstall completed succesfully, enjoy!\"", + "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir -p \/mnt\/server\r\nfi\r\n\r\nfunction install_required {\r\n apt update\r\n apt install -y curl jq unzip dos2unix\r\n}\r\n\r\nfunction get_download {\r\n # get json data to work with\r\n echo -e \"Curling the json for the modpack\"\r\n echo -e \"running: curl -sSLX GET https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID} -H 'Accept: application\/json' -H 'x-api-key: API_KEY'\"\r\n JSON_DATA=$(curl -ssLX GET https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID} -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\")\r\n\r\n # if no modpack version is set or is set to latest\r\n if [ -z ${MODPACK_VERSION} ] || [ \"${MODPACK_VERSION}\" = \"latest\" ]; then\r\n echo -e \"Getting latest download url\"\r\n # parse data to get the download url\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r \".data.mainFileId\")\r\n echo -e \"File ID is: ${FILE_ID}\"\r\n if [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .isServerPack\")\" == \"false\" ] && [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\" != \"null\" ]; then\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\r\n DOWNLOAD_URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files\/${FILE_ID}\/download-url | jq -r \".data\")\r\n else\r\n DOWNLOAD_URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files\/${FILE_ID}\/download-url | jq -r \".data\")\r\n fi\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n else\r\n echo -e \"Looking for download url for version ${MODPACK_VERSION}\"\r\n # parse files for version match\r\n FILES_JSON_DATA=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files)\r\n # get element number to get the exact location in the json\r\n FILES_JSON_ELEMENT=$(echo -e ${FILES_JSON_DATA} | jq --arg VERSION \"${MODPACK_VERSION}\" '.[] | select(.displayName) | .displayName | contains($VERSION)' | grep -n true | cut -f1 -d: | tail -1)\r\n # if there wasn't a match default to latest\r\n if [ ! -z ${FILES_JSON_ELEMENT} ]; then\r\n echo -e \"No matching version found\"\r\n echo -e \"defaulting to latest\"\r\n DOWNLOAD_URL=$(echo -e ${FILES_JSON_DATA} | jq --arg ELEMENT \"${FILES_JSON_ELEMENT}\" '.[$ELEMENT|tonumber-1] | .downloadUrl')\r\n else\r\n echo -e \"Version match found\"\r\n DOWNLOAD_URL=$(echo -e ${JSON_DATA} | jq -r .latestFiles[0].downloadUrl)\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n fi\r\n fi\r\n ## download modpack files\r\n cd \/mnt\/server\r\n echo \"Executing curl -L ${DOWNLOAD_URL} -o server.zip\"\r\n curl -L -g \"${DOWNLOAD_URL}\" -o server.zip\r\n unzip -o server.zip\r\n rm -rf server.zip\r\n}\r\n\r\nfunction forge_install {\r\n echo -e \"\\nInstalling forge server using the installer jar file.\\n\"\r\n if [ -f \/mnt\/server\/*installer.jar ]; then\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n else\r\n echo \"No forge installer found moving on.\"\r\n fi\r\n mv FTBServer.jar server.jar\r\n}\r\n\r\nfunction forge_cleanup {\r\n echo -e \"\\nDeleting installer jar file and cleaning up.\\n\"\r\n rm -rf *installer.jar\r\n if [ ! -f \/mnt\/server\/*universal.jar ]; then\r\n mv -v \/mnt\/server\/*\/* \/mnt\/server\/\r\n if [ ! -f \/mnt\/server\/*universal.jar ]; then\r\n mv forge*.jar server.jar\r\n else\r\n mv *universal.jar server.jar \r\n fi\r\n else\r\n mv forge*universal.jar server.jar\r\n fi\r\n}\r\n\r\nfunction json_download_prework {\r\n mkdir -p \/mnt\/server\/mods\r\n cd \/mnt\/server\/mods\r\n}\r\n\r\nfunction json_download_mods {\r\n MANIFEST=\/mnt\/server\/manifest.json\r\n for mod in $(jq -c '.files[]' ${MANIFEST} ); do\r\n projID=$(echo $mod | jq -r \".projectID\")\r\n fileID=$(echo $mod | jq -r \".fileID\")\r\n URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${projID}\/files\/${fileID}\/download-url jq -r \".data\")\r\n # this is saving everything as \/mnt\/server\/mods\/download\r\n echo \"Mod direct url: ${URL}\"\r\n curl -JLO \"${URL}\"\r\n done\r\n}\r\n\r\nfunction json_download_forge {\r\n cd \/mnt\/server\r\n FORGE=$(jq -r '.minecraft.modLoaders[0].id' \/mnt\/server\/manifest.json | cut -d '-' -f2)\r\n MCVER=$(jq -r '.minecraft.version' \/mnt\/server\/manifest.json)\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\"\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction json_download_overrides {\r\n if [ -d \/mnt\/server\/overrides ]; then\r\n mv \/mnt\/server\/overrides\/mods\/* \/mnt\/server\/mods\/\r\n rmdir \/mnt\/server\/overrides\/mods\r\n mv \/mnt\/server\/overrides\/* \/mnt\/server\r\n rmdir \/mnt\/server\/overrides\r\n fi\r\n}\r\n\r\nfunction cfg_download_forge {\r\n dos2unix settings.cfg # In case the pack was distributed with Windows-style line endings in the cfg file\r\n MCVER=`grep 'MCVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n FORGE=`grep 'FORGEVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n \r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n echo -e ${FORGE_VERSION}\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n PARSED_LINK=$(echo -e \"$FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\" | sed 's\/ \/\/g')\r\n\r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $PARSED_LINK\"\r\n curl -sSL $PARSED_LINK-installer.jar -o installer.jar\r\n curl -sSL $PARSED_LINK-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction ftb_install {\r\n chmod +x \/mnt\/server\/settings.sh \r\n . \/mnt\/server\/settings.sh \r\n curl https:\/\/s3.amazonaws.com\/Minecraft.Download\/versions\/${MCVER}\/minecraft_server.${MCVER}.jar -o ${JARFILE} \r\n curl https:\/\/libraries.minecraft.net\/${LAUNCHWRAPPER} -o \/mnt\/server\/libraries\/${LAUNCHWRAPPER}\r\n}\r\n\r\ninstall_required\r\nget_download\r\n\r\nif [ -f \/mnt\/server\/manifest.json ]; then\r\n json_download_prework\r\n json_download_mods\r\n json_download_overrides\r\n json_download_forge\r\nelif [ -f \/mnt\/server\/settings.cfg ]; then\r\n cfg_download_forge\r\nelif [ -f \/mnt\/server\/version.json ]; then\r\n if [ \"$(cat \/mnt\/server\/version.json | jq -r '.packID | contains(\"FTB\")')\" == \"true\" ]; then\r\n ftb_install\r\n fi\r\nelse\r\n forge_install\r\n forge_cleanup\r\nfi\r\n\r\necho -e \"\\n\\nInstall completed succesfully, enjoy!\"", "container": "openjdk:8-jdk-slim", "entrypoint": "bash" } @@ -52,6 +52,15 @@ "user_viewable": true, "user_editable": true, "rules": "required|string|max:20" + }, + { + "name": "API Key", + "description": "This is a new requirement and will be needed to pull mods packs\r\n\r\nYou need and account to generate an api-key here\r\nhttps:\/\/console.curseforge.com\/#\/api-keys", + "env_variable": "API_KEY", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "required|string" } ] } \ No newline at end of file From 7f07ffb8b2f7fda20a2aa8360359d3f2379cf1d9 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Fri, 10 Jun 2022 15:13:28 -0400 Subject: [PATCH 0430/1001] Update README --- game_eggs/minecraft/java/forge/curseforge-generic/README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/game_eggs/minecraft/java/forge/curseforge-generic/README.md b/game_eggs/minecraft/java/forge/curseforge-generic/README.md index 31a4eb0e..defb1f5d 100644 --- a/game_eggs/minecraft/java/forge/curseforge-generic/README.md +++ b/game_eggs/minecraft/java/forge/curseforge-generic/README.md @@ -9,6 +9,12 @@ This will grab the latest release when the version is set to latest. It "should" grab versions of the pack based on the modpack version numbers +## API Kays + +You will need to get an API key to run the installer now. Make an account at https://console.curseforge.com/ + +https://console.curseforge.com/#/api-keys + ## Server Ports The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. From 14f8b288180a60ac3c235e739b0a5f076b6ca900 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Fri, 10 Jun 2022 15:55:11 -0400 Subject: [PATCH 0431/1001] Fix server jar issue fixes an issue renaming the server jar properly --- .../java/forge/curseforge-generic/egg-curseforge-generic.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json b/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json index 66706ae4..8b9255af 100644 --- a/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json +++ b/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2022-06-10T15:03:34-04:00", + "exported_at": "2022-06-10T15:54:18-04:00", "name": "Curseforge Generic", "author": "parker@parkervcp.com", "description": "A generic egg for a forge modpack", @@ -29,7 +29,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir -p \/mnt\/server\r\nfi\r\n\r\nfunction install_required {\r\n apt update\r\n apt install -y curl jq unzip dos2unix\r\n}\r\n\r\nfunction get_download {\r\n # get json data to work with\r\n echo -e \"Curling the json for the modpack\"\r\n echo -e \"running: curl -sSLX GET https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID} -H 'Accept: application\/json' -H 'x-api-key: API_KEY'\"\r\n JSON_DATA=$(curl -ssLX GET https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID} -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\")\r\n\r\n # if no modpack version is set or is set to latest\r\n if [ -z ${MODPACK_VERSION} ] || [ \"${MODPACK_VERSION}\" = \"latest\" ]; then\r\n echo -e \"Getting latest download url\"\r\n # parse data to get the download url\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r \".data.mainFileId\")\r\n echo -e \"File ID is: ${FILE_ID}\"\r\n if [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .isServerPack\")\" == \"false\" ] && [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\" != \"null\" ]; then\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\r\n DOWNLOAD_URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files\/${FILE_ID}\/download-url | jq -r \".data\")\r\n else\r\n DOWNLOAD_URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files\/${FILE_ID}\/download-url | jq -r \".data\")\r\n fi\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n else\r\n echo -e \"Looking for download url for version ${MODPACK_VERSION}\"\r\n # parse files for version match\r\n FILES_JSON_DATA=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files)\r\n # get element number to get the exact location in the json\r\n FILES_JSON_ELEMENT=$(echo -e ${FILES_JSON_DATA} | jq --arg VERSION \"${MODPACK_VERSION}\" '.[] | select(.displayName) | .displayName | contains($VERSION)' | grep -n true | cut -f1 -d: | tail -1)\r\n # if there wasn't a match default to latest\r\n if [ ! -z ${FILES_JSON_ELEMENT} ]; then\r\n echo -e \"No matching version found\"\r\n echo -e \"defaulting to latest\"\r\n DOWNLOAD_URL=$(echo -e ${FILES_JSON_DATA} | jq --arg ELEMENT \"${FILES_JSON_ELEMENT}\" '.[$ELEMENT|tonumber-1] | .downloadUrl')\r\n else\r\n echo -e \"Version match found\"\r\n DOWNLOAD_URL=$(echo -e ${JSON_DATA} | jq -r .latestFiles[0].downloadUrl)\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n fi\r\n fi\r\n ## download modpack files\r\n cd \/mnt\/server\r\n echo \"Executing curl -L ${DOWNLOAD_URL} -o server.zip\"\r\n curl -L -g \"${DOWNLOAD_URL}\" -o server.zip\r\n unzip -o server.zip\r\n rm -rf server.zip\r\n}\r\n\r\nfunction forge_install {\r\n echo -e \"\\nInstalling forge server using the installer jar file.\\n\"\r\n if [ -f \/mnt\/server\/*installer.jar ]; then\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n else\r\n echo \"No forge installer found moving on.\"\r\n fi\r\n mv FTBServer.jar server.jar\r\n}\r\n\r\nfunction forge_cleanup {\r\n echo -e \"\\nDeleting installer jar file and cleaning up.\\n\"\r\n rm -rf *installer.jar\r\n if [ ! -f \/mnt\/server\/*universal.jar ]; then\r\n mv -v \/mnt\/server\/*\/* \/mnt\/server\/\r\n if [ ! -f \/mnt\/server\/*universal.jar ]; then\r\n mv forge*.jar server.jar\r\n else\r\n mv *universal.jar server.jar \r\n fi\r\n else\r\n mv forge*universal.jar server.jar\r\n fi\r\n}\r\n\r\nfunction json_download_prework {\r\n mkdir -p \/mnt\/server\/mods\r\n cd \/mnt\/server\/mods\r\n}\r\n\r\nfunction json_download_mods {\r\n MANIFEST=\/mnt\/server\/manifest.json\r\n for mod in $(jq -c '.files[]' ${MANIFEST} ); do\r\n projID=$(echo $mod | jq -r \".projectID\")\r\n fileID=$(echo $mod | jq -r \".fileID\")\r\n URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${projID}\/files\/${fileID}\/download-url jq -r \".data\")\r\n # this is saving everything as \/mnt\/server\/mods\/download\r\n echo \"Mod direct url: ${URL}\"\r\n curl -JLO \"${URL}\"\r\n done\r\n}\r\n\r\nfunction json_download_forge {\r\n cd \/mnt\/server\r\n FORGE=$(jq -r '.minecraft.modLoaders[0].id' \/mnt\/server\/manifest.json | cut -d '-' -f2)\r\n MCVER=$(jq -r '.minecraft.version' \/mnt\/server\/manifest.json)\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\"\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction json_download_overrides {\r\n if [ -d \/mnt\/server\/overrides ]; then\r\n mv \/mnt\/server\/overrides\/mods\/* \/mnt\/server\/mods\/\r\n rmdir \/mnt\/server\/overrides\/mods\r\n mv \/mnt\/server\/overrides\/* \/mnt\/server\r\n rmdir \/mnt\/server\/overrides\r\n fi\r\n}\r\n\r\nfunction cfg_download_forge {\r\n dos2unix settings.cfg # In case the pack was distributed with Windows-style line endings in the cfg file\r\n MCVER=`grep 'MCVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n FORGE=`grep 'FORGEVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n \r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n echo -e ${FORGE_VERSION}\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n PARSED_LINK=$(echo -e \"$FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\" | sed 's\/ \/\/g')\r\n\r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $PARSED_LINK\"\r\n curl -sSL $PARSED_LINK-installer.jar -o installer.jar\r\n curl -sSL $PARSED_LINK-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction ftb_install {\r\n chmod +x \/mnt\/server\/settings.sh \r\n . \/mnt\/server\/settings.sh \r\n curl https:\/\/s3.amazonaws.com\/Minecraft.Download\/versions\/${MCVER}\/minecraft_server.${MCVER}.jar -o ${JARFILE} \r\n curl https:\/\/libraries.minecraft.net\/${LAUNCHWRAPPER} -o \/mnt\/server\/libraries\/${LAUNCHWRAPPER}\r\n}\r\n\r\ninstall_required\r\nget_download\r\n\r\nif [ -f \/mnt\/server\/manifest.json ]; then\r\n json_download_prework\r\n json_download_mods\r\n json_download_overrides\r\n json_download_forge\r\nelif [ -f \/mnt\/server\/settings.cfg ]; then\r\n cfg_download_forge\r\nelif [ -f \/mnt\/server\/version.json ]; then\r\n if [ \"$(cat \/mnt\/server\/version.json | jq -r '.packID | contains(\"FTB\")')\" == \"true\" ]; then\r\n ftb_install\r\n fi\r\nelse\r\n forge_install\r\n forge_cleanup\r\nfi\r\n\r\necho -e \"\\n\\nInstall completed succesfully, enjoy!\"", + "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir -p \/mnt\/server\r\nfi\r\n\r\nfunction install_required {\r\n apt update\r\n apt install -y curl jq unzip dos2unix\r\n}\r\n\r\nfunction get_download {\r\n # get json data to work with\r\n echo -e \"Curling the json for the modpack\"\r\n echo -e \"running: curl -sSLX GET https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID} -H 'Accept: application\/json' -H 'x-api-key: API_KEY'\"\r\n JSON_DATA=$(curl -ssLX GET https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID} -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\")\r\n\r\n # if no modpack version is set or is set to latest\r\n if [ -z ${MODPACK_VERSION} ] || [ \"${MODPACK_VERSION}\" = \"latest\" ]; then\r\n echo -e \"Getting latest download url\"\r\n # parse data to get the download url\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r \".data.mainFileId\")\r\n echo -e \"File ID is: ${FILE_ID}\"\r\n if [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .isServerPack\")\" == \"false\" ] && [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\" != \"null\" ]; then\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\r\n DOWNLOAD_URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files\/${FILE_ID}\/download-url | jq -r \".data\")\r\n else\r\n DOWNLOAD_URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files\/${FILE_ID}\/download-url | jq -r \".data\")\r\n fi\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n else\r\n echo -e \"Looking for download url for version ${MODPACK_VERSION}\"\r\n # parse files for version match\r\n FILES_JSON_DATA=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files)\r\n # get element number to get the exact location in the json\r\n FILES_JSON_ELEMENT=$(echo -e ${FILES_JSON_DATA} | jq --arg VERSION \"${MODPACK_VERSION}\" '.[] | select(.displayName) | .displayName | contains($VERSION)' | grep -n true | cut -f1 -d: | tail -1)\r\n # if there wasn't a match default to latest\r\n if [ ! -z ${FILES_JSON_ELEMENT} ]; then\r\n echo -e \"No matching version found\"\r\n echo -e \"defaulting to latest\"\r\n DOWNLOAD_URL=$(echo -e ${FILES_JSON_DATA} | jq --arg ELEMENT \"${FILES_JSON_ELEMENT}\" '.[$ELEMENT|tonumber-1] | .downloadUrl')\r\n else\r\n echo -e \"Version match found\"\r\n DOWNLOAD_URL=$(echo -e ${JSON_DATA} | jq -r .latestFiles[0].downloadUrl)\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n fi\r\n fi\r\n ## download modpack files\r\n cd \/mnt\/server\r\n echo \"Executing curl -L ${DOWNLOAD_URL} -o server.zip\"\r\n curl -L -g \"${DOWNLOAD_URL}\" -o server.zip\r\n unzip -o server.zip\r\n rm -rf server.zip\r\n}\r\n\r\nfunction forge_install {\r\n echo -e \"\\nInstalling forge server using the installer jar file.\\n\"\r\n if [ -f \/mnt\/server\/*installer.jar ]; then\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n else\r\n echo \"No forge installer found moving on.\"\r\n fi\r\n mv FTBServer.jar server.jar\r\n}\r\n\r\nfunction forge_cleanup {\r\n echo -e \"\\nDeleting installer jar file and cleaning up.\\n\"\r\n rm -rf *installer.jar\r\n if [ ! -f \/mnt\/server\/forge*universal.jar ]; then\r\n mv -v \/mnt\/server\/*\/* \/mnt\/server\/\r\n if [ ! -f \/mnt\/server\/*universal.jar ]; then\r\n mv forge*.jar server.jar\r\n else\r\n mv forge*universal.jar server.jar \r\n fi\r\n else\r\n mv forge*universal.jar server.jar\r\n fi\r\n}\r\n\r\nfunction json_download_prework {\r\n mkdir -p \/mnt\/server\/mods\r\n cd \/mnt\/server\/mods\r\n}\r\n\r\nfunction json_download_mods {\r\n MANIFEST=\/mnt\/server\/manifest.json\r\n for mod in $(jq -c '.files[]' ${MANIFEST} ); do\r\n projID=$(echo $mod | jq -r \".projectID\")\r\n fileID=$(echo $mod | jq -r \".fileID\")\r\n URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${projID}\/files\/${fileID}\/download-url jq -r \".data\")\r\n # this is saving everything as \/mnt\/server\/mods\/download\r\n echo \"Mod direct url: ${URL}\"\r\n curl -JLO \"${URL}\"\r\n done\r\n}\r\n\r\nfunction json_download_forge {\r\n cd \/mnt\/server\r\n FORGE=$(jq -r '.minecraft.modLoaders[0].id' \/mnt\/server\/manifest.json | cut -d '-' -f2)\r\n MCVER=$(jq -r '.minecraft.version' \/mnt\/server\/manifest.json)\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\"\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction json_download_overrides {\r\n if [ -d \/mnt\/server\/overrides ]; then\r\n mv \/mnt\/server\/overrides\/mods\/* \/mnt\/server\/mods\/\r\n rmdir \/mnt\/server\/overrides\/mods\r\n mv \/mnt\/server\/overrides\/* \/mnt\/server\r\n rmdir \/mnt\/server\/overrides\r\n fi\r\n}\r\n\r\nfunction cfg_download_forge {\r\n dos2unix settings.cfg # In case the pack was distributed with Windows-style line endings in the cfg file\r\n MCVER=`grep 'MCVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n FORGE=`grep 'FORGEVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n \r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n echo -e ${FORGE_VERSION}\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n PARSED_LINK=$(echo -e \"$FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\" | sed 's\/ \/\/g')\r\n\r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $PARSED_LINK\"\r\n curl -sSL $PARSED_LINK-installer.jar -o installer.jar\r\n curl -sSL $PARSED_LINK-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction ftb_install {\r\n chmod +x \/mnt\/server\/settings.sh \r\n . \/mnt\/server\/settings.sh \r\n curl https:\/\/s3.amazonaws.com\/Minecraft.Download\/versions\/${MCVER}\/minecraft_server.${MCVER}.jar -o ${JARFILE} \r\n curl https:\/\/libraries.minecraft.net\/${LAUNCHWRAPPER} -o \/mnt\/server\/libraries\/${LAUNCHWRAPPER}\r\n}\r\n\r\ninstall_required\r\nget_download\r\n\r\nif [ -f \/mnt\/server\/manifest.json ]; then\r\n json_download_prework\r\n json_download_mods\r\n json_download_overrides\r\n json_download_forge\r\nelif [ -f \/mnt\/server\/settings.cfg ]; then\r\n cfg_download_forge\r\nelif [ -f \/mnt\/server\/version.json ]; then\r\n if [ \"$(cat \/mnt\/server\/version.json | jq -r '.packID | contains(\"FTB\")')\" == \"true\" ]; then\r\n ftb_install\r\n fi\r\nelse\r\n forge_install\r\n forge_cleanup\r\nfi\r\n\r\necho -e \"\\n\\nInstall completed succesfully, enjoy!\"", "container": "openjdk:8-jdk-slim", "entrypoint": "bash" } From bcf464adf0b536be4ab32c2bc4d9ac5b366e061d Mon Sep 17 00:00:00 2001 From: Elite Espeon Date: Sat, 11 Jun 2022 12:51:40 -0400 Subject: [PATCH 0432/1001] Add Open Fortress Add egg for Open Fortress --- .../steamcmd_servers/open_fortress/README.md | 14 ++++ .../open_fortress/egg-open-fortress.json | 74 +++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 game_eggs/steamcmd_servers/open_fortress/README.md create mode 100644 game_eggs/steamcmd_servers/open_fortress/egg-open-fortress.json diff --git a/game_eggs/steamcmd_servers/open_fortress/README.md b/game_eggs/steamcmd_servers/open_fortress/README.md new file mode 100644 index 00000000..1d488524 --- /dev/null +++ b/game_eggs/steamcmd_servers/open_fortress/README.md @@ -0,0 +1,14 @@ +# Open Fortress + +## From their [Website](https://openfortress.fun/) + +Open Fortress is a free Team Fortress 2 mod that introduces new gamemodes, weapons, characters, maps, and more to the world of TF2. + +## Server Ports + +Open Fortress servers require 1 port to be open, the SourceTV port can also be opened for spectators. + +| Port | default | +|-----------|---------| +| Game/rcon | 27015 | +| SourceTV | 27020 | diff --git a/game_eggs/steamcmd_servers/open_fortress/egg-open-fortress.json b/game_eggs/steamcmd_servers/open_fortress/egg-open-fortress.json new file mode 100644 index 00000000..a2d73ab8 --- /dev/null +++ b/game_eggs/steamcmd_servers/open_fortress/egg-open-fortress.json @@ -0,0 +1,74 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2022-06-11T12:47:33-04:00", + "name": "Open Fortress", + "author": "espeon@espeon.dev", + "description": "Open Fortress is a free Team Fortress 2 mod that introduces new gamemodes, weapons, characters, maps, and more to the world of TF2.", + "features": [ + "steam_disk_space" + ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:games_source": "ghcr.io\/parkervcp\/yolks:games_source" + }, + "file_denylist": [], + "startup": ".\/srcds_run -game {{SRCDS_GAME}} -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart -debug +maxplayers {{MAXPLAYERS}}", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"gameserver Steam ID\"\r\n}", + "logs": "{}", + "stop": "quit" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates p7zip-full wget\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\nSTEAM_USER=anonymous\r\nSTEAM_PASS=\"\"\r\nSTEAM_AUTH=\"\"\r\nfi\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\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\nexport HOME=\/mnt\/server\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n## install tf2 content using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server\/tf2 +app_update 232250 ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n## download OpenFortress\r\ncd \/mnt\/server\r\nmv bin bin_dontdeleteme\r\nwget https:\/\/dl.spiderden.net\/murse\/linux -O murse 2> \/dev\/null\r\nchmod +x murse\r\n.\/murse upgrade asdrggvead\/open_fortress\r\nmv \/mnt\/server\/asdrggvead\/open_fortress \/mnt\/server\/open_fortress\r\nrm -rf asdrggvead\r\nmv bin_dontdeleteme bin\r\n## download fixed gameinfo\r\ncd \/mnt\/server\/open_fortress\r\nwget -v https:\/\/espeon.dev\/gameinfo.txt -O gameinfo.txt\r\n## fix issue \/w symlink\r\ncd \/mnt\/server\/bin\r\nln -s datacache_srv.so datacache.so\r\nln -s dedicated_srv.so dedicated.so\r\nln -s engine_srv.so engine.so\r\nln -s materialsystem_srv.so materialsystem.so\r\nln -s replay_srv.so replay.so\r\nln -s scenefilecache_srv.so scenefilecache.so\r\nln -s shaderapiempty_srv.so shaderapiempty.so\r\nln -s soundemittersystem_srv.so soundemittersystem.so\r\nln -s studiorender_srv.so studiorender.so\r\nln -s vphysics_srv.so vphysics.so\r\n## more symlink fixes\r\ncd \/mnt\/server\/open_fortress\/bin\r\nln -s server.so server_srv.so", + "container": "ubuntu:18.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Game ID", + "description": "The ID corresponding to the game to download and run using SRCDS.", + "env_variable": "SRCDS_APPID", + "default_value": "244310", + "user_viewable": true, + "user_editable": false, + "rules": "required|regex:\/^(244310)$\/", + "field_type": "text" + }, + { + "name": "Game Name", + "description": "The name corresponding to the game to download and run using SRCDS.", + "env_variable": "SRCDS_GAME", + "default_value": "open_fortress", + "user_viewable": true, + "user_editable": false, + "rules": "required|regex:\/^(open_fortress)$\/", + "field_type": "text" + }, + { + "name": "Default Map", + "description": "The default map to use when starting the server.", + "env_variable": "SRCDS_MAP", + "default_value": "dm_2fort", + "user_viewable": true, + "user_editable": true, + "rules": "required|regex:\/^(\\w{1,20})$\/", + "field_type": "text" + }, + { + "name": "Max Players", + "description": "The maximum amount of players allowed on the server.", + "env_variable": "MAXPLAYERS", + "default_value": "24", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:32", + "field_type": "text" + } + ] +} \ No newline at end of file From 995873340ad445cb0f21f816731eadf75ba841cb Mon Sep 17 00:00:00 2001 From: Elite Espeon Date: Sat, 11 Jun 2022 12:56:01 -0400 Subject: [PATCH 0433/1001] Add Open Fortress to main README --- game_eggs/steamcmd_servers/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/game_eggs/steamcmd_servers/README.md b/game_eggs/steamcmd_servers/README.md index 4201e3f9..f357147a 100644 --- a/game_eggs/steamcmd_servers/README.md +++ b/game_eggs/steamcmd_servers/README.md @@ -92,6 +92,10 @@ This is a collection of servers that use SteamCMD to install. [Onset](onset) +## Open Fortress + +[Open Fortress](open_fortress) + ## Pavlov VR [Pavlov VR](pavlov_vr) From 00d60f07c3df00544c5cf9a09592d15cc55bc774 Mon Sep 17 00:00:00 2001 From: Elite Espeon Date: Sat, 11 Jun 2022 13:00:55 -0400 Subject: [PATCH 0434/1001] Add Open Fortress to all README --- README.md | 1 + game_eggs/README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 815bd96b..7d6b172f 100644 --- a/README.md +++ b/README.md @@ -213,6 +213,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Mordhau](game_eggs/steamcmd_servers/mordhau) * [No More Room in Hell](game_eggs/steamcmd_servers/nmrih) * [Onset](game_eggs/steamcmd_servers/onset) +* [Open Fortress](game_eggs/steamcmd_servers/open_fortress) * [Pavlov VR](game_eggs/steamcmd_servers/pavlov_vr) * [PixARK](game_eggs/steamcmd_servers/pixark) * [Post Scriptum](game_eggs/steamcmd_servers/post_scriptum) diff --git a/game_eggs/README.md b/game_eggs/README.md index b08ba47a..3e685a6f 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -130,6 +130,7 @@ * [Mordhau](steamcmd_servers/mordhau) * [No More Room in Hell](steamcmd_servers/nmrih) * [Onset](steamcmd_servers/onset) +* [Open Fortress](steamcmd_servers/open_fortress) * [Pavlov VR](steamcmd_servers/pavlov_vr) * [PixARK](steamcmd_servers/pixark) * [Post Scriptum](steamcmd_servers/post_scriptum) From 4a30fc71a5ff83699ad5844fb69afc3ccdf517df Mon Sep 17 00:00:00 2001 From: Elite Espeon Date: Sat, 11 Jun 2022 13:13:35 -0400 Subject: [PATCH 0435/1001] Add GameInfo for Open Fortress --- .../open_fortress/gameinfo.txt | 134 ++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100644 game_eggs/steamcmd_servers/open_fortress/gameinfo.txt diff --git a/game_eggs/steamcmd_servers/open_fortress/gameinfo.txt b/game_eggs/steamcmd_servers/open_fortress/gameinfo.txt new file mode 100644 index 00000000..c3aadb27 --- /dev/null +++ b/game_eggs/steamcmd_servers/open_fortress/gameinfo.txt @@ -0,0 +1,134 @@ +"GameInfo" +{ + game "Open Fortress" + title "" + title2 "" + gamelogo "1" + developer "https://github.com/AgitationSkeleton/open_fortress/blob/master/credits.txt" + developer_url "https://github.com/KaidemonLP/Open-Fortress-Source" + manual "" + + type "multiplayer_only" + hasportals "0" // gameui.dll + hashdcontent "0" // gameui.dll + nomodels "0" // gameui.dll + nohimodel "0" // gameui.dll + nocrosshair "0" // gameui.dll + advcrosshair "1" // gameui.dll + nodifficulty "1" // gameui.dll + supportsvr "0" // engine.dll + gameui.dll + bots "0" // gameui.dll + nodegraph "1" // engine.dll + perfwizard "0" // unused + SupportsDX8 "0" // unused + SupportsDX9 "1" // unused + SupportsDX10 "0" // unused + SupportsDX11 "0" // unused + SupportsXbox "0" // unused + SupportsXbox360 "0" // unused + SupportsXboxOne "0" // unused + SupportsPS3 "0" // unused + SupportsPS4 "0" // unused + icon "resource/game" + GameData "ofd_fic2.fgd" + InstancePath "maps/instances/" + + hidden_maps + { + "test_speakers" 1 + "test_hardware" 1 + "background01" 1 + "background02" 1 + "background03" 1 + "background04" 1 + "background05" 1 + "background06" 1 + "background07" 1 + "background08" 1 + "background09" 1 + "background12" 1 + "background15" 1 + "ep1_c17_00" 1 + "ep1_c17_00a" 1 + "ep1_c17_01" 1 + "ep1_c17_01a" 1 + "ep1_c17_02" 1 + "ep1_c17_02a" 1 + "ep1_c17_02b" 1 + "ep1_c17_05" 1 + "ep1_c17_06" 1 + "ep1_citadel_00" 1 + "ep1_citadel_00_demo" 1 + "ep1_citadel_01" 1 + "ep1_citadel_02" 1 + "ep1_citadel_02b" 1 + "ep1_citadel_03" 1 + "ep1_citadel_04" 1 + "ep1_background01" 1 + "ep1_background01a" 1 + "ep1_background02" 1 + "ep2_outland_01" 1 + "ep2_outland_01a" 1 + "ep2_outland_02" 1 + "ep2_outland_03" 1 + "ep2_outland_04" 1 + "ep2_outland_05" 1 + "ep2_outland_06" 1 + "ep2_outland_06a" 1 + "ep2_outland_07" 1 + "ep2_outland_08" 1 + "ep2_outland_09" 1 + "ep2_outland_10" 1 + "ep2_outland_10a" 1 + "ep2_outland_11" 1 + "ep2_outland_11a" 1 + "ep2_outland_11b" 1 + "ep2_outland_12" 1 + "ep2_outland_12a" 1 + "ep2_background01" 1 + "ep2_background02" 1 + "ep2_background02a" 1 + "ep2_background03" 1 + "credits" 1 + "vst_lostcoast" 1 + "test" 1 + "sdk_vehicles" 1 + } + + FileSystem + { + SteamAppId 243750 + + SearchPaths + { + game+mod |gameinfo_path|custom/* + game+game_write+mod+mod_write+default_write_path |gameinfo_path|. + gamebin |gameinfo_path|bin + + // The lines below until the BREAK comment are responsible for the game resources to work properly + // in Hammer and other Source tools. The default setup assumes that you have everything (Steam, TF2, + // Source SDK and OF) in the same drive letter/partition. If you have a different storage configuration, + // feel free to modify the paths below between quotes (example: D:\Steam\steamapps\common\Team Fortress 2\tf). + game "/home/container/tf2/tf/tf2_misc.vpk" + game "/home/container/tf2/tf/tf2_sound_misc.vpk" + game "/home/container/tf2/tf/tf2_sound_vo_english.vpk" + game "/home/container/tf2/tf/tf2_textures.vpk" + game "/home/container/tf2/tf" + + game "/home/container/tf2/hl2/hl2_textures.vpk" + game "/home/container/tf2/hl2/hl2_sound_vo_english.vpk" + game "/home/container/tf2/hl2/hl2_sound_misc.vpk" + + // The hl2 folder here is from Source SDK Base 2013 Multiplayer. + game "|all_source_engine_paths|hl2\hl2_misc.vpk" + game "|all_source_engine_paths|hl2" + // ========== BREAK ========== + + platform |all_source_engine_paths|platform/platform_misc.vpk + platform |all_source_engine_paths|platform + + game+download |gameinfo_path|download + + } + } +} From 6db071c6886ee03163ee6903b9367c12549f0dee Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 12 Jun 2022 02:45:29 +0300 Subject: [PATCH 0436/1001] docs: fix typo in forge readme --- game_eggs/minecraft/java/forge/curseforge-generic/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/minecraft/java/forge/curseforge-generic/README.md b/game_eggs/minecraft/java/forge/curseforge-generic/README.md index defb1f5d..6dbb3c44 100644 --- a/game_eggs/minecraft/java/forge/curseforge-generic/README.md +++ b/game_eggs/minecraft/java/forge/curseforge-generic/README.md @@ -9,7 +9,7 @@ This will grab the latest release when the version is set to latest. It "should" grab versions of the pack based on the modpack version numbers -## API Kays +## API Keys You will need to get an API key to run the installer now. Make an account at https://console.curseforge.com/ From 2fef8c5c36f84c875211f1f37d6dbd35eea8da3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matou=C5=A1=20Ku=C4=8Dera?= <34477304+zlataovce@users.noreply.github.com> Date: Sun, 12 Jun 2022 18:48:21 +0200 Subject: [PATCH 0437/1001] fix: update reposilite maven url --- software/reposilite/egg-reposilite.json | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/software/reposilite/egg-reposilite.json b/software/reposilite/egg-reposilite.json index c2c2a577..585d78bc 100644 --- a/software/reposilite/egg-reposilite.json +++ b/software/reposilite/egg-reposilite.json @@ -1,20 +1,20 @@ { "_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-03-19T18:47:13+01:00", + "exported_at": "2022-06-12T18:45:04+02:00", "name": "Reposilite", "author": "mk@kcra.me", "description": "Lightweight and easy-to-use repository management software dedicated for Maven based artifacts in the JVM ecosystem.", "features": null, - "images": [ - "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_17" - ], + "docker_images": { + "ghcr.io\/pterodactyl\/yolks:java_8": "ghcr.io\/pterodactyl\/yolks:java_8", + "ghcr.io\/pterodactyl\/yolks:java_11": "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_16": "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_17": "ghcr.io\/pterodactyl\/yolks:java_17" + }, "file_denylist": [], "startup": "java -Xmx{{SERVER_MEMORY}}M -Dreposilite.port={{SERVER_PORT}} -jar reposilite.jar --port {{SERVER_PORT}}", "config": { @@ -25,7 +25,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/sh\r\n# Switch to mounted directory\r\ncd \/mnt\/server\r\n# Find latest Reposilite version, if needed\r\nif [ \"$REPOSILITE_VERSION\" == \"latest\" ]; then\r\n REPOSILITE_VERSION=$(grep -oPm1 \"(?<=)[^<]+\" <<< \"$(curl -s https:\/\/repo.panda-lang.org\/releases\/org\/panda-lang\/reposilite\/maven-metadata.xml)\")\r\nfi\r\n# Check if -all suffixed jar is available\r\nstatus_code=$(curl --write-out '%{http_code}' -X HEAD -s -o \/dev\/null https:\/\/repo.panda-lang.org\/releases\/org\/panda-lang\/reposilite\/${REPOSILITE_VERSION}\/reposilite-${REPOSILITE_VERSION}-all.jar)\r\n# Download new Reposilite\r\nif [ \"$status_code\" == 200 ]; then\r\n curl -o reposilite.jar https:\/\/repo.panda-lang.org\/releases\/org\/panda-lang\/reposilite\/${REPOSILITE_VERSION}\/reposilite-${REPOSILITE_VERSION}-all.jar\r\nelse\r\n curl -o reposilite.jar https:\/\/repo.panda-lang.org\/releases\/org\/panda-lang\/reposilite\/${REPOSILITE_VERSION}\/reposilite-${REPOSILITE_VERSION}.jar\r\nfi", + "script": "#!\/bin\/sh\r\n# Switch to mounted directory\r\ncd \/mnt\/server\r\n# Find latest Reposilite version, if needed\r\nif [ \"$REPOSILITE_VERSION\" == \"latest\" ]; then\r\n REPOSILITE_VERSION=$(grep -oPm1 \"(?<=)[^<]+\" <<< \"$(curl -s https:\/\/maven.reposilite.com\/releases\/org\/panda-lang\/reposilite\/maven-metadata.xml)\")\r\nfi\r\n# Check if -all suffixed jar is available\r\nstatus_code=$(curl --write-out '%{http_code}' -X HEAD -s -o \/dev\/null https:\/\/maven.reposilite.com\/releases\/org\/panda-lang\/reposilite\/${REPOSILITE_VERSION}\/reposilite-${REPOSILITE_VERSION}-all.jar)\r\n# Download new Reposilite\r\nif [ \"$status_code\" == 200 ]; then\r\n curl -o reposilite.jar https:\/\/maven.reposilite.com\/releases\/org\/panda-lang\/reposilite\/${REPOSILITE_VERSION}\/reposilite-${REPOSILITE_VERSION}-all.jar\r\nelse\r\n curl -o reposilite.jar https:\/\/maven.reposilite.com\/releases\/org\/panda-lang\/reposilite\/${REPOSILITE_VERSION}\/reposilite-${REPOSILITE_VERSION}.jar\r\nfi", "container": "ghcr.io\/pterodactyl\/installers:debian", "entrypoint": "bash" } @@ -38,7 +38,8 @@ "default_value": "latest", "user_viewable": true, "user_editable": true, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" } ] } \ No newline at end of file From 6c5631b906b99e0e2b1bb714b440fb8cd05e3421 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Sun, 12 Jun 2022 23:08:22 +0300 Subject: [PATCH 0438/1001] ref: change variable permissions Changed: Do not SteamCMD validate files Do not allow users to modify RCON port Display the query port to users Use PTLD_V2 Fixes #1700 --- .../v_rising/egg-v-rising.json | 83 ++++++++++++------- 1 file changed, 53 insertions(+), 30 deletions(-) diff --git a/game_eggs/steamcmd_servers/v_rising/egg-v-rising.json b/game_eggs/steamcmd_servers/v_rising/egg-v-rising.json index 5b7a68b8..97162880 100644 --- a/game_eggs/steamcmd_servers/v_rising/egg-v-rising.json +++ b/game_eggs/steamcmd_servers/v_rising/egg-v-rising.json @@ -1,18 +1,19 @@ { - "_comment": "Pterodactyl V Rising Egg ~ David Wolfe (Red-Thirten) and Kapatheus ~ 2022-05-28", + "_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-06-12T23:01:53+03:00", "name": "V Rising", "author": "rehlmgaming@gmail.com", "description": "Awaken as a vampire. Hunt for blood in nearby settlements to regain your strength and evade the scorching sun to survive. Raise your castle and thrive in an ever-changing open world full of mystery. Gain allies online and conquer the land of the living.", "features": [ "steam_disk_space" ], - "images": [ - "ghcr.io\/parkervcp\/yolks:wine_latest" - ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:wine_latest": "ghcr.io\/parkervcp\/yolks:wine_latest" + }, "file_denylist": [], "startup": "wine64 .\/VRisingServer.exe -persistentDataPath save-data -address 0.0.0.0", "config": { @@ -23,7 +24,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl V Rising Egg - egg-v-rising.json\r\n## Authors: David Wolfe (Red-Thirten), Kapatheus\r\n## Date: 2022\/05\/28\r\n## License: MIT License\r\n## Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n# Install packages. Default packages below are skipped if using image noted above, thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n# Download and install SteamCMD\r\nexport HOME=\/mnt\/server\r\ncd \/tmp\r\nmkdir -p $HOME\/steamcmd $HOME\/steamapps\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C $HOME\/steamcmd\r\ncd $HOME\/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\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +force_install_dir $HOME +login anonymous $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} validate +quit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so $HOME\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so $HOME\/.steam\/sdk64\/steamclient.so\r\n\r\n## V Rising Setup\r\nmkdir -p $HOME\/save-data\/Settings && cd \"$_\"\r\ncat > ServerHostSettings.json << EOF\r\n{\r\n \"Name\": \"${SERVER_NAME}\",\r\n \"Description\": \"${DESCRIPTION}\",\r\n \"Port\": ${SERVER_PORT},\r\n \"QueryPort\": ${QUERY_PORT},\r\n \"MaxConnectedUsers\": ${MAX_PLAYERS},\r\n \"MaxConnectedAdmins\": ${MAX_ADMINS},\r\n \"ServerFps\": ${FPS},\r\n \"SaveName\": \"${SAVE_NAME}\",\r\n \"Password\": \"${SERVER_PASSWORD}\",\r\n \"Secure\": ${SERVER_SECURE},\r\n \"ListOnMasterServer\": ${SERVER_LIST},\r\n \"AutoSaveCount\": ${SAVE_COUNT},\r\n \"AutoSaveInterval\": ${SAVE_INTERVAL},\r\n \"GameSettingsPreset\": \"${GAME_SETTINGS_PRESET}\",\r\n \"AdminOnlyDebugEvents\": ${ADMIN_ONLY_DEBUG_EVENTS},\r\n \"DisableDebugEvents\": ${DEBUG_EVENTS},\r\n \"Rcon\": {\r\n \"Enabled\": ${RCON},\r\n \"Password\": \"${RCON_PASS}\",\r\n \"Port\": ${RCON_PORT}\r\n }\r\n}\r\nEOF", + "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl V Rising Egg - egg-v-rising.json\r\n## Authors: David Wolfe (Red-Thirten), Kapatheus\r\n## Date: 2022\/05\/28\r\n## License: MIT License\r\n## Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n# Install packages. Default packages below are skipped if using image noted above, thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n# Download and install SteamCMD\r\nexport HOME=\/mnt\/server\r\ncd \/tmp\r\nmkdir -p $HOME\/steamcmd $HOME\/steamapps\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C $HOME\/steamcmd\r\ncd $HOME\/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\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +force_install_dir $HOME +login anonymous $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} +quit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so $HOME\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so $HOME\/.steam\/sdk64\/steamclient.so\r\n\r\n## V Rising Setup\r\nmkdir -p $HOME\/save-data\/Settings && cd \"$_\"\r\ncat > ServerHostSettings.json << EOF\r\n{\r\n \"Name\": \"${SERVER_NAME}\",\r\n \"Description\": \"${DESCRIPTION}\",\r\n \"Port\": ${SERVER_PORT},\r\n \"QueryPort\": ${QUERY_PORT},\r\n \"MaxConnectedUsers\": ${MAX_PLAYERS},\r\n \"MaxConnectedAdmins\": ${MAX_ADMINS},\r\n \"ServerFps\": ${FPS},\r\n \"SaveName\": \"${SAVE_NAME}\",\r\n \"Password\": \"${SERVER_PASSWORD}\",\r\n \"Secure\": ${SERVER_SECURE},\r\n \"ListOnMasterServer\": ${SERVER_LIST},\r\n \"AutoSaveCount\": ${SAVE_COUNT},\r\n \"AutoSaveInterval\": ${SAVE_INTERVAL},\r\n \"GameSettingsPreset\": \"${GAME_SETTINGS_PRESET}\",\r\n \"AdminOnlyDebugEvents\": ${ADMIN_ONLY_DEBUG_EVENTS},\r\n \"DisableDebugEvents\": ${DEBUG_EVENTS},\r\n \"Rcon\": {\r\n \"Enabled\": ${RCON},\r\n \"Password\": \"${RCON_PASS}\",\r\n \"Port\": ${RCON_PORT}\r\n }\r\n}\r\nEOF", "container": "ghcr.io\/pterodactyl\/installers:debian", "entrypoint": "\/bin\/bash" } @@ -34,9 +35,10 @@ "description": "UDP port for Steam server list features.", "env_variable": "QUERY_PORT", "default_value": "9877", - "user_viewable": false, + "user_viewable": true, "user_editable": false, - "rules": "required|integer|between:1024,65536" + "rules": "required|integer|between:1024,65536", + "field_type": "text" }, { "name": "Automatic Updates", @@ -45,7 +47,8 @@ "default_value": "1", "user_viewable": true, "user_editable": true, - "rules": "boolean" + "rules": "boolean", + "field_type": "text" }, { "name": "Game Settings Preset", @@ -54,7 +57,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string|in:,DuoPvP,HardcorePvP,Level30PvE,Level30PvP,Level50PvE,Level50PvP,Level70PvE,Level70PvP,SoloPvP,StandardPvE_Easy,StandardPvE_Hard,StandardPvE,StandardPvP_Easy,StandardPvP_Hard,StandardPVP" + "rules": "nullable|string|in:,DuoPvP,HardcorePvP,Level30PvE,Level30PvP,Level50PvE,Level50PvP,Level70PvE,Level70PvP,SoloPvP,StandardPvE_Easy,StandardPvE_Hard,StandardPvE,StandardPvP_Easy,StandardPvP_Hard,StandardPVP", + "field_type": "text" }, { "name": "Server Name", @@ -63,7 +67,8 @@ "default_value": "V Rising Dedicated Server", "user_viewable": true, "user_editable": true, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" }, { "name": "Server Description", @@ -72,7 +77,8 @@ "default_value": "Welcome to the server!", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Max Connected Users", @@ -81,7 +87,8 @@ "default_value": "40", "user_viewable": true, "user_editable": true, - "rules": "required|integer|min:1" + "rules": "required|integer|min:1", + "field_type": "text" }, { "name": "Max Connected Admins", @@ -90,7 +97,8 @@ "default_value": "4", "user_viewable": true, "user_editable": true, - "rules": "required|integer|min:0" + "rules": "required|integer|min:0", + "field_type": "text" }, { "name": "Server Password", @@ -99,7 +107,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Save Name", @@ -108,7 +117,8 @@ "default_value": "world1", "user_viewable": true, "user_editable": true, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" }, { "name": "Auto Save Count", @@ -117,7 +127,8 @@ "default_value": "50", "user_viewable": true, "user_editable": true, - "rules": "required|integer|min:0" + "rules": "required|integer|min:0", + "field_type": "text" }, { "name": "Auto Save Interval", @@ -126,7 +137,8 @@ "default_value": "600", "user_viewable": true, "user_editable": true, - "rules": "required|integer|min:1" + "rules": "required|integer|min:1", + "field_type": "text" }, { "name": "List On Master Server", @@ -135,7 +147,8 @@ "default_value": "true", "user_viewable": true, "user_editable": true, - "rules": "required|string|in:true,false" + "rules": "required|string|in:true,false", + "field_type": "text" }, { "name": "[Repair] Validate Server Files", @@ -144,7 +157,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "string|nullable" + "rules": "string|nullable", + "field_type": "text" }, { "name": "[Advanced] Server FPS", @@ -153,7 +167,8 @@ "default_value": "30", "user_viewable": true, "user_editable": true, - "rules": "required|integer|min:1" + "rules": "required|integer|min:1", + "field_type": "text" }, { "name": "[Advanced] Enable RCON", @@ -162,7 +177,8 @@ "default_value": "false", "user_viewable": true, "user_editable": true, - "rules": "required|string|in:true,false" + "rules": "required|string|in:true,false", + "field_type": "text" }, { "name": "[Advanced] RCON Password", @@ -171,7 +187,8 @@ "default_value": "somepassword", "user_viewable": true, "user_editable": true, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" }, { "name": "[Advanced] RCON Port", @@ -179,8 +196,9 @@ "env_variable": "RCON_PORT", "default_value": "25575", "user_viewable": true, - "user_editable": true, - "rules": "required|integer|between:1024,65536" + "user_editable": false, + "rules": "required|integer|between:1024,65536", + "field_type": "text" }, { "name": "[Advanced] Secure Server", @@ -189,7 +207,8 @@ "default_value": "true", "user_viewable": true, "user_editable": true, - "rules": "required|string|in:true,false" + "rules": "required|string|in:true,false", + "field_type": "text" }, { "name": "[Advanced] Admin Only Debug Events", @@ -198,7 +217,8 @@ "default_value": "true", "user_viewable": true, "user_editable": true, - "rules": "required|string|in:true,false" + "rules": "required|string|in:true,false", + "field_type": "text" }, { "name": "[Advanced] Disable Debug Events", @@ -207,7 +227,8 @@ "default_value": "false", "user_viewable": true, "user_editable": true, - "rules": "required|string|in:true,false" + "rules": "required|string|in:true,false", + "field_type": "text" }, { "name": "[Advanced] V Rising Dedicated Server App ID", @@ -216,7 +237,8 @@ "default_value": "1829350", "user_viewable": false, "user_editable": false, - "rules": "required|integer" + "rules": "required|integer", + "field_type": "text" }, { "name": "[Advanced] Use Windows Branch", @@ -225,7 +247,8 @@ "default_value": "1", "user_viewable": false, "user_editable": false, - "rules": "required|string|in:1" + "rules": "required|string|in:1", + "field_type": "text" } ] } \ No newline at end of file From a764c987f4c4b333de7ac038153de651ead0c682 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Mon, 13 Jun 2022 16:31:04 +0200 Subject: [PATCH 0439/1001] docs(ark) : add new Fjordur to map variable escription (#1704) --- .../ark_survival_evolved/egg-ark--survival-evolved.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json b/game_eggs/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json index 51c0c553..9addbcd7 100644 --- a/game_eggs/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json +++ b/game_eggs/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json @@ -50,7 +50,7 @@ }, { "name": "Server Map", - "description": "Available Maps: TheIsland, TheCenter, Ragnarok, ScorchedEarth_P, Aberration_P, Extinction, Valguero_P, Genesis, CrystalIsles, Gen2", + "description": "Available Maps: TheIsland, TheCenter, Ragnarok, ScorchedEarth_P, Aberration_P, Extinction, Valguero_P, Genesis, CrystalIsles, Gen2, Fjordur", "env_variable": "SERVER_MAP", "default_value": "TheIsland", "user_viewable": true, From 75bb533d185144b1a316c31fff039227e9759512 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 14 Jun 2022 17:00:24 -0400 Subject: [PATCH 0440/1001] fix(forge): follow download url redirects (#1702) --- .../minecraft/java/forge/forge/egg-forge-enhanced.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json b/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json index 5038cae9..0f173522 100644 --- a/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json +++ b/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-12-11T23:06:46+00:00", + "exported_at": "2022-06-11T19:29:34-04:00", "name": "Forge Enhanced", "author": "parker@parkervcp.com", "description": "Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.", @@ -29,7 +29,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nif [[ ! -d \/mnt\/server ]]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n# Remove spaces from the version number to avoid issues with curl\r\nFORGE_VERSION=\"$(echo \"$FORGE_VERSION\" | tr -d ' ')\"\r\nMC_VERSION=\"$(echo \"$MC_VERSION\" | tr -d ' ')\"\r\n\r\nif [[ ! -z ${FORGE_VERSION} ]]; then\r\n DOWNLOAD_LINK=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/${FORGE_VERSION}\/forge-${FORGE_VERSION}\r\n FORGE_JAR=forge-${FORGE_VERSION}*.jar\r\nelse\r\n JSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\n if [[ \"${MC_VERSION}\" == \"latest\" ]] || [[ \"${MC_VERSION}\" == \"\" ]]; then\r\n echo -e \"getting latest version of forge.\"\r\n MC_VERSION=$(echo -e ${JSON_DATA} | jq -r '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains(\"latest\")) | split(\"-\")[0]' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)\r\n BUILD_TYPE=latest\r\n fi\r\n\r\n if [[ \"${BUILD_TYPE}\" != \"recommended\" ]] && [[ \"${BUILD_TYPE}\" != \"latest\" ]]; then\r\n BUILD_TYPE=recommended\r\n fi\r\n\r\n echo -e \"minecraft version: ${MC_VERSION}\"\r\n echo -e \"build type: ${BUILD_TYPE}\"\r\n\r\n ## some variables for getting versions and things\r\n FILE_SITE=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n ## locating the forge version\r\n if [[ \"${VERSION_KEY}\" == \"\" ]] && [[ \"${BUILD_TYPE}\" == \"recommended\" ]]; then\r\n echo -e \"dropping back to latest from recommended due to there not being a recommended version of forge for the mc version requested.\"\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"latest\"))')\r\n fi\r\n\r\n ## Error if the mc version set wasn't valid.\r\n if [ \"${VERSION_KEY}\" == \"\" ] || [ \"${VERSION_KEY}\" == \"null\" ]; then\r\n echo -e \"The install failed because there is no valid version of forge for the version of minecraft selected.\"\r\n exit 1\r\n fi\r\n\r\n FORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\n if [[ \"${MC_VERSION}\" == \"1.7.10\" ]] || [[ \"${MC_VERSION}\" == \"1.8.9\" ]]; then\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}.jar\r\n if [[ \"${MC_VERSION}\" == \"1.7.10\" ]]; then\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}-universal.jar\r\n fi\r\n else\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}.jar\r\n fi\r\nfi\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version ${FORGE_VERSION}\"\r\necho -e \"Download link is ${DOWNLOAD_LINK}\"\r\n\r\nif [[ ! -z \"${DOWNLOAD_LINK}\" ]]; then\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-installer.jar; then\r\n echo -e \"installer jar download link is valid.\"\r\n else\r\n echo -e \"link is invalid. Exiting now\"\r\n exit 2\r\n fi\r\nelse\r\n echo -e \"no download link provided. Exiting now\"\r\n exit 3\r\nfi\r\n\r\ncurl -s -o installer.jar -sS ${DOWNLOAD_LINK}-installer.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [[ ! -f .\/installer.jar ]]; then\r\n echo \"!!! Error downloading forge version ${FORGE_VERSION} !!!\"\r\n exit\r\nfi\r\n\r\nfunction unix_args {\r\n echo -e \"Detected Forge 1.17 or newer version. Setting up forge unix args.\"\r\n ln -sf libraries\/net\/minecraftforge\/forge\/*\/unix_args.txt unix_args.txt\r\n}\r\n\r\n# Delete args to support downgrading\/upgrading\r\nrm -rf libraries\/net\/minecraftforge\/forge\r\nrm unix_args.txt\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer || { echo -e \"install failed using Forge version ${FORGE_VERSION} and Minecraft version ${MINECRAFT_VERSION}\"; exit 4; }\r\n\r\n# Check if we need a symlink for 1.17+ Forge JPMS args\r\nif [[ $MC_VERSION =~ ^1\\.(17|18|19|20|21|22|23) || $FORGE_VERSION =~ ^1\\.(17|18|19|20|21|22|23) ]]; then\r\n unix_args\r\n\r\n# Check if someone has set MC to latest but overwrote it with older Forge version, otherwise we would have false positives\r\nelif [[ $MC_VERSION == \"latest\" && $FORGE_VERSION =~ ^1\\.(17|18|19|20|21|22|23) ]]; then\r\n unix_args\r\nelse\r\n # For versions below 1.17 that ship with jar\r\n mv $FORGE_JAR $SERVER_JARFILE\r\nfi\r\n\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar", + "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nif [[ ! -d \/mnt\/server ]]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n# Remove spaces from the version number to avoid issues with curl\r\nFORGE_VERSION=\"$(echo \"$FORGE_VERSION\" | tr -d ' ')\"\r\nMC_VERSION=\"$(echo \"$MC_VERSION\" | tr -d ' ')\"\r\n\r\nif [[ ! -z ${FORGE_VERSION} ]]; then\r\n DOWNLOAD_LINK=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/${FORGE_VERSION}\/forge-${FORGE_VERSION}\r\n FORGE_JAR=forge-${FORGE_VERSION}*.jar\r\nelse\r\n JSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\n if [[ \"${MC_VERSION}\" == \"latest\" ]] || [[ \"${MC_VERSION}\" == \"\" ]]; then\r\n echo -e \"getting latest version of forge.\"\r\n MC_VERSION=$(echo -e ${JSON_DATA} | jq -r '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains(\"latest\")) | split(\"-\")[0]' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)\r\n BUILD_TYPE=latest\r\n fi\r\n\r\n if [[ \"${BUILD_TYPE}\" != \"recommended\" ]] && [[ \"${BUILD_TYPE}\" != \"latest\" ]]; then\r\n BUILD_TYPE=recommended\r\n fi\r\n\r\n echo -e \"minecraft version: ${MC_VERSION}\"\r\n echo -e \"build type: ${BUILD_TYPE}\"\r\n\r\n ## some variables for getting versions and things\r\n FILE_SITE=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n ## locating the forge version\r\n if [[ \"${VERSION_KEY}\" == \"\" ]] && [[ \"${BUILD_TYPE}\" == \"recommended\" ]]; then\r\n echo -e \"dropping back to latest from recommended due to there not being a recommended version of forge for the mc version requested.\"\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"latest\"))')\r\n fi\r\n\r\n ## Error if the mc version set wasn't valid.\r\n if [ \"${VERSION_KEY}\" == \"\" ] || [ \"${VERSION_KEY}\" == \"null\" ]; then\r\n echo -e \"The install failed because there is no valid version of forge for the version of minecraft selected.\"\r\n exit 1\r\n fi\r\n\r\n FORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\n if [[ \"${MC_VERSION}\" == \"1.7.10\" ]] || [[ \"${MC_VERSION}\" == \"1.8.9\" ]]; then\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}.jar\r\n if [[ \"${MC_VERSION}\" == \"1.7.10\" ]]; then\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}-universal.jar\r\n fi\r\n else\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}.jar\r\n fi\r\nfi\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version ${FORGE_VERSION}\"\r\necho -e \"Download link is ${DOWNLOAD_LINK}\"\r\n\r\nif [[ ! -z \"${DOWNLOAD_LINK}\" ]]; then\r\n if curl -sSL --output \/dev\/null --head --fail ${DOWNLOAD_LINK}-installer.jar; then\r\n echo -e \"installer jar download link is valid.\"\r\n else\r\n echo -e \"link is invalid. Exiting now\"\r\n exit 2\r\n fi\r\nelse\r\n echo -e \"no download link provided. Exiting now\"\r\n exit 3\r\nfi\r\n\r\ncurl -sSL -o installer.jar ${DOWNLOAD_LINK}-installer.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [[ ! -f .\/installer.jar ]]; then\r\n echo \"!!! Error downloading forge version ${FORGE_VERSION} !!!\"\r\n exit\r\nfi\r\n\r\nfunction unix_args {\r\n echo -e \"Detected Forge 1.17 or newer version. Setting up forge unix args.\"\r\n ln -sf libraries\/net\/minecraftforge\/forge\/*\/unix_args.txt unix_args.txt\r\n}\r\n\r\n# Delete args to support downgrading\/upgrading\r\nrm -rf libraries\/net\/minecraftforge\/forge\r\nrm unix_args.txt\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer || { echo -e \"install failed using Forge version ${FORGE_VERSION} and Minecraft version ${MINECRAFT_VERSION}\"; exit 4; }\r\n\r\n# Check if we need a symlink for 1.17+ Forge JPMS args\r\nif [[ $MC_VERSION =~ ^1\\.(17|18|19|20|21|22|23) || $FORGE_VERSION =~ ^1\\.(17|18|19|20|21|22|23) ]]; then\r\n unix_args\r\n\r\n# Check if someone has set MC to latest but overwrote it with older Forge version, otherwise we would have false positives\r\nelif [[ $MC_VERSION == \"latest\" && $FORGE_VERSION =~ ^1\\.(17|18|19|20|21|22|23) ]]; then\r\n unix_args\r\nelse\r\n # For versions below 1.17 that ship with jar\r\n mv $FORGE_JAR $SERVER_JARFILE\r\nfi\r\n\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar", "container": "openjdk:8-jdk-slim", "entrypoint": "bash" } @@ -72,4 +72,4 @@ "rules": "nullable|string|max:25" } ] -} +} \ No newline at end of file From c7e6ca093824329214fe4e33f83e466540c59aff Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 20 Jun 2022 12:35:41 +0300 Subject: [PATCH 0441/1001] fix: do not set default rcon password fixes #1710 --- game_eggs/minecraft/bedrock/pocketmine_mp/server.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/minecraft/bedrock/pocketmine_mp/server.properties b/game_eggs/minecraft/bedrock/pocketmine_mp/server.properties index 92d323d6..f3bbc192 100644 --- a/game_eggs/minecraft/bedrock/pocketmine_mp/server.properties +++ b/game_eggs/minecraft/bedrock/pocketmine_mp/server.properties @@ -20,9 +20,9 @@ level-seed= level-type=DEFAULT enable-query=true enable-rcon=off -rcon.password=BhPTpB1bvi +rcon.password= auto-save=on view-distance=8 xbox-auth=on server-ip=0.0.0.0 -query.port=25573 \ No newline at end of file +query.port=25573 From 193f00b6e2332c1c21a2b9ca7538a9080efa7098 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 20 Jun 2022 12:56:38 +0300 Subject: [PATCH 0442/1001] templates: fix markdown formatting issue The markdown parsing would remove any additional spaces unless the code example is inserted into its distinct code block. This fixes the sed command. --- .github/ISSUE_TEMPLATE/bug-report.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index e17866da..bedeb50f 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -79,8 +79,10 @@ body: description: | Run the command below on the SSH terminal of your Wings machine and provide the link to logs. - `tail -n 100 $(ls -Alrt /var/log/pterodactyl/install/*.log | tail -1 | sed 's/ */ /g' | cut -s -d' ' -f9) | nc pteropaste.com 99` + ``` + tail -n 1000 $(ls -Alrt /var/log/pterodactyl/install/*.log | tail -1 | sed 's/ */ /g' | cut -s -d' ' -f9) | nc pteropaste.com 99 + ``` placeholder: | https://pteropaste.com/exampleLogs validations: - required: true \ No newline at end of file + required: true From bfa648387bfc6e6099caa8c2efcb6a3df03d53cf Mon Sep 17 00:00:00 2001 From: JackOXI <53652452+JackW6809@users.noreply.github.com> Date: Wed, 22 Jun 2022 15:12:56 +0100 Subject: [PATCH 0443/1001] Update Among Us - Impostor The .NET Image used here is out of date and it requires .NET 6 to run. They have their own image so I have instead switched the image to that and the issue has been resolved. --- .../impostor_server/egg-among-us--impostor-server.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/among_us/impostor_server/egg-among-us--impostor-server.json b/game_eggs/among_us/impostor_server/egg-among-us--impostor-server.json index 0e91ab91..00296c92 100644 --- a/game_eggs/among_us/impostor_server/egg-among-us--impostor-server.json +++ b/game_eggs/among_us/impostor_server/egg-among-us--impostor-server.json @@ -10,7 +10,7 @@ "description": "Impostor is one of the first Among Us private servers, written in C#.\r\n\r\nThe latest version supported is 2020.9.22, both desktop and mobile.\r\n\r\nThere are no special features at this moment, the goal is aiming to be as close as possible to the real server, for now. In a later stage, making modifications to game logic by modifying GameData packets can be looked at.", "features": null, "images": [ - "quay.io\/parkervcp\/pterodactyl-images:debian_dotnet-5" + "qaeonlucid/impostor:nightly" ], "file_denylist": [], "startup": ".\/Impostor.Server", @@ -38,4 +38,4 @@ "rules": "required|string|max:30" } ] -} \ No newline at end of file +} From 55829f9e66ca1fd97c7be1f8faf8ea062cc253d8 Mon Sep 17 00:00:00 2001 From: JackOXI <53652452+JackW6809@users.noreply.github.com> Date: Wed, 22 Jun 2022 15:14:31 +0100 Subject: [PATCH 0444/1001] Update egg-among-us--impostor-server.json --- .../among_us/impostor_server/egg-among-us--impostor-server.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/among_us/impostor_server/egg-among-us--impostor-server.json b/game_eggs/among_us/impostor_server/egg-among-us--impostor-server.json index 00296c92..a42c1537 100644 --- a/game_eggs/among_us/impostor_server/egg-among-us--impostor-server.json +++ b/game_eggs/among_us/impostor_server/egg-among-us--impostor-server.json @@ -7,7 +7,7 @@ "exported_at": "2021-07-23T12:00:05+03:00", "name": "Among Us - Impostor Server", "author": "info@goover.de", - "description": "Impostor is one of the first Among Us private servers, written in C#.\r\n\r\nThe latest version supported is 2020.9.22, both desktop and mobile.\r\n\r\nThere are no special features at this moment, the goal is aiming to be as close as possible to the real server, for now. In a later stage, making modifications to game logic by modifying GameData packets can be looked at.", + "description": "Impostor is one of the first Among Us private servers, written in C#.\r\n\r\nThe latest version supported is 2022.4.19, both desktop and mobile.\r\n\r\nThere are no special features at this moment, the goal is aiming to be as close as possible to the real server, for now. In a later stage, making modifications to game logic by modifying GameData packets can be looked at.", "features": null, "images": [ "qaeonlucid/impostor:nightly" From a3b6fae30bfa3f279c800b41986cd9454c8b4e91 Mon Sep 17 00:00:00 2001 From: JackOXI <53652452+JackW6809@users.noreply.github.com> Date: Wed, 22 Jun 2022 15:35:05 +0100 Subject: [PATCH 0445/1001] Update egg-among-us--impostor-server.json --- .../among_us/impostor_server/egg-among-us--impostor-server.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/among_us/impostor_server/egg-among-us--impostor-server.json b/game_eggs/among_us/impostor_server/egg-among-us--impostor-server.json index a42c1537..876b4a19 100644 --- a/game_eggs/among_us/impostor_server/egg-among-us--impostor-server.json +++ b/game_eggs/among_us/impostor_server/egg-among-us--impostor-server.json @@ -10,7 +10,7 @@ "description": "Impostor is one of the first Among Us private servers, written in C#.\r\n\r\nThe latest version supported is 2022.4.19, both desktop and mobile.\r\n\r\nThere are no special features at this moment, the goal is aiming to be as close as possible to the real server, for now. In a later stage, making modifications to game logic by modifying GameData packets can be looked at.", "features": null, "images": [ - "qaeonlucid/impostor:nightly" + "ghcr.io/parkervcp/yolks:dotnet_6" ], "file_denylist": [], "startup": ".\/Impostor.Server", From d9c28e23ad82c7fae8a50fa3f84e6543a628dd43 Mon Sep 17 00:00:00 2001 From: HyperBeats Date: Thu, 23 Jun 2022 16:08:08 +0200 Subject: [PATCH 0446/1001] Create eggs Iosoccer --- .../iosoccer/eggs-iosoccer.json | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 game_eggs/steamcmd_servers/iosoccer/eggs-iosoccer.json diff --git a/game_eggs/steamcmd_servers/iosoccer/eggs-iosoccer.json b/game_eggs/steamcmd_servers/iosoccer/eggs-iosoccer.json new file mode 100644 index 00000000..1764464c --- /dev/null +++ b/game_eggs/steamcmd_servers/iosoccer/eggs-iosoccer.json @@ -0,0 +1,88 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2022-02-20T01:24:34+01:00", + "name": "IOSOCER-server-hyper", + "author": "hyperbeats@raptorhost.fr", + "description": "SERVER IOSOCCER", + "features": [ + "steam_disk_space" + ], + "images": [ + "ghcr.io\/parkervcp\/games:source" + ], + "file_denylist": [], + "startup": ".\/srcds_run -console -game iosoccer -condebug -port {{SERVER_PORT}} +maxplayers {{SLOTS}} +fps_max {{MAX_FPS}} -tickrate {{TICKRATE}} +map {{MAP}} +rcon_password {{RCON}}", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Connection to Steam servers successful.\",\r\n \"userInteraction\": []\r\n}", + "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "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 lib32gcc-s1 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} validate +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", + "container": "ghcr.io\/parkervcp\/installers:debian", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Game ID", + "description": "Game ID", + "env_variable": "SRCDS_APPID", + "default_value": "673990", + "user_viewable": true, + "user_editable": false, + "rules": "required|regex:\/^(673990)$\/" + }, + { + "name": "MAP", + "description": "", + "env_variable": "MAP", + "default_value": "8v8_vienna", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + }, + { + "name": "SLOTS", + "description": "", + "env_variable": "SLOTS", + "default_value": "32", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + }, + { + "name": "TICKRATE", + "description": "", + "env_variable": "TICKRATE", + "default_value": "100", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + }, + { + "name": "MAX FPS", + "description": "", + "env_variable": "MAX_FPS", + "default_value": "500", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + }, + { + "name": "RCON", + "description": "", + "env_variable": "RCON", + "default_value": "pleasechangepassword", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + } + ] +} From dd8bddcb83cbac0aee5910a22ab24c4fab99a6c9 Mon Sep 17 00:00:00 2001 From: HyperBeats Date: Thu, 23 Jun 2022 16:09:16 +0200 Subject: [PATCH 0447/1001] Update eggs-iosoccer.json --- game_eggs/steamcmd_servers/iosoccer/eggs-iosoccer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/iosoccer/eggs-iosoccer.json b/game_eggs/steamcmd_servers/iosoccer/eggs-iosoccer.json index 1764464c..0936c2a4 100644 --- a/game_eggs/steamcmd_servers/iosoccer/eggs-iosoccer.json +++ b/game_eggs/steamcmd_servers/iosoccer/eggs-iosoccer.json @@ -5,7 +5,7 @@ "update_url": null }, "exported_at": "2022-02-20T01:24:34+01:00", - "name": "IOSOCER-server-hyper", + "name": "IOSOCER-server", "author": "hyperbeats@raptorhost.fr", "description": "SERVER IOSOCCER", "features": [ From 39c197bb60dec74a76601775a48ab9641712e050 Mon Sep 17 00:00:00 2001 From: HyperBeats <45314346+HyperBeats@users.noreply.github.com> Date: Thu, 23 Jun 2022 18:35:15 +0200 Subject: [PATCH 0448/1001] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a83e91d3..58fbc2d9 100644 --- a/README.md +++ b/README.md @@ -243,6 +243,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Valheim](game_eggs/steamcmd_servers/valheim) * [Valheim Vanilla](game_eggs/steamcmd_servers/valheim/valheim_vanilla) * [Valheim Plus Mod](game_eggs/steamcmd_servers/valheim/valheim_plus) +* [iosoccer](game_eggs/steamcmd_servers/iosoccer) [Teeworlds](game_eggs/teeworlds) From 84e09df0f75041045d8813ca0967641a32b1d0b1 Mon Sep 17 00:00:00 2001 From: Digital Raven Studio <84991804+digitalravenstudio@users.noreply.github.com> Date: Sat, 25 Jun 2022 22:48:36 +0200 Subject: [PATCH 0449/1001] fix: support 1.4+ tmodloader (#1686) Co-authored-by: softwarenoob resolves #1644 --- .../terraria/tmodloader/egg-t-modloader.json | 66 +++++++++++-------- 1 file changed, 38 insertions(+), 28 deletions(-) diff --git a/game_eggs/terraria/tmodloader/egg-t-modloader.json b/game_eggs/terraria/tmodloader/egg-t-modloader.json index 22376c34..0887643d 100755 --- a/game_eggs/terraria/tmodloader/egg-t-modloader.json +++ b/game_eggs/terraria/tmodloader/egg-t-modloader.json @@ -1,42 +1,33 @@ { "_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-05-14T02:54:50-05:00", + "exported_at": "2022-06-25T23:43:59+03:00", "name": "tModloader", "author": "parker@parkervcp.com", "description": "tModLoader is essentially a mod that provides a way to load your own mods without having to work directly with Terraria's source code itself. This means you can easily make mods that are compatible with other people's mods, save yourself the trouble of having to decompile and recompile Terraria.exe, and escape from having to understand all of the obscure \"intricacies\" of Terraria's source code. It is made to work for Terraria 1.3+.", "features": null, - "images": [ - "quay.io\/parkervcp\/pterodactyl-images:debian_mono-5" - ], + "docker_images": { + "Dotnet 6": "ghcr.io\/parkervcp\/yolks:dotnet_6" + }, "file_denylist": [], - "startup": ".\/tModLoaderServer -ip 0.0.0.0 -port ${SERVER_PORT} -maxplayers ${MAX_PLAYERS} -difficulty ${DIFFICULTY} -password \"${SERVER_PASSWORD}\" -motd \"${MOTD}\" -lang ${LANGUAGE} -world ~\/saves\/Worlds\/${WORLD_NAME}.wld -worldname ${WORLD_NAME} -autocreate ${WORLD_SIZE} -savedirectory ~\/ -tmlsavedirectory ~\/saves -modpath ~\/mods", + "startup": ".\/tModLoaderServer -ip 0.0.0.0 -port {{SERVER_PORT}} -maxplayers {{MAX_PLAYERS}} -difficulty {{DIFFICULTY}} -password \"{{SERVER_PASSWORD}}\" -motd \"{{MOTD}}\" -lang {{LANGUAGE}} -world ~\/saves\/Worlds\/{{WORLD_NAME}}.wld -worldname {{WORLD_NAME}} -autocreate {{WORLD_SIZE}} -savedirectory ~\/ -tmlsavedirectory ~\/saves -modpath ~\/mods", "config": { "files": "{}", - "startup": "{\r\n \"done\": \"Type 'help' for a list of commands\",\r\n \"userInteraction\": []\r\n}", + "startup": "{\r\n \"done\": \"Type 'help' for a list of commands\"\r\n}", "logs": "{}", "stop": "exit" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Vanilla tModloader 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 jq file unzip\r\n\r\nGITHUB_PACKAGE=tModLoader\/tModLoader\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\/tmodloader\/tmodloader\/releases\" | jq -c '.[] | select(.name | contains(\"v0\"))' | head -1)\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/$GITHUB_PACKAGE\/releases\" | jq '.[] | select(.name | contains(\"v0\"))')\r\n\r\n\r\nif [ -z \"$VERSION\" ] || [ \"$VERSION\" == \"latest\" ]; then\r\n echo -e \"defaulting to latest release\"\r\n DOWNLOAD_LINK=$(echo $LATEST_JSON | jq .assets | jq -r .[].browser_download_url | grep -i linux | grep -i zip)\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 linux)\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 | grep -i linux | grep -i zip)\r\n fi\r\nfi\r\n\r\n## mkdir and cd to \/mnt\/server\/\r\nmkdir -p \/mnt\/server\r\n\r\ncd \/mnt\/server\r\n\r\n## download release\r\necho -e \"running: curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\"\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip -o ${DOWNLOAD_LINK##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exiting\"\r\n exit 2 \r\nfi\r\n\r\nchmod +x tModLoaderServer.bin.x86_64\r\nchmod +x tModLoaderServer\r\n\r\necho -e \"Cleaning up extra files.\"\r\nrm -rf terraria-server-${CLEAN_VERSION}.zip rm ${DOWNLOAD_LINK##*\/}", + "script": "#!\/bin\/bash\r\n# Vanilla tModloader 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 jq file unzip\r\n\r\nGITHUB_PACKAGE=tmodloader\/tmodloader\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\" | jq -c '.[]' | head -1)\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/$GITHUB_PACKAGE\/releases\" | jq '.[]')\r\n\r\n\r\nif [ -z \"$VERSION\" ] || [ \"$VERSION\" == \"latest\" ]; then\r\n echo -e \"defaulting to latest release\"\r\n DOWNLOAD_LINK=$(echo $LATEST_JSON | jq .assets | jq -r .[].browser_download_url | grep -i tmodloader.zip)\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 if [[ \"$VERSION\" == v0* ]]; then\r\n DOWNLOAD_LINK=$(echo $RELEASES | jq -r --arg VERSION \"$VERSION\" '. | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i linux | grep -i zip)\r\n else\r\n DOWNLOAD_LINK=$(echo $RELEASES | jq -r --arg VERSION \"$VERSION\" '. | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i tmodloader.zip)\r\n fi\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 | grep -i tmodloader.zip)\r\n fi\r\nfi\r\n\r\n## mkdir and cd to \/mnt\/server\/\r\nmkdir -p \/mnt\/server\r\n\r\ncd \/mnt\/server || exit 5\r\n\r\n## download release\r\necho -e \"running: curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\"\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip -o ${DOWNLOAD_LINK##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exiting\"\r\n exit 2\r\nfi\r\n\r\nif [[ \"$VERSION\" == v0* ]]; then\r\n chmod +x tModLoaderServer.bin.x86_64\r\n chmod +x tModLoaderServer\r\nelse\r\n #tiny startup script for backward compatibility\r\n echo 'dotnet tModLoader.dll -server \"$@\"' > tModLoaderServer\r\n chmod +x tModLoaderServer\r\nfi\r\n\r\necho -e \"Cleaning up extra files.\"\r\nrm -rf terraria-server-*.zip rm ${DOWNLOAD_LINK##*\/}\r\nif [[ \"$VERSION\" != v0* ]]; then\r\n rm -rf DedicatedServerUtils LaunchUtils PlatformVariantLibs tModPorter RecentGitHubCommits.txt *.bat *.sh\r\nfi", "container": "debian:buster-slim", "entrypoint": "bash" } }, "variables": [ - { - "name": "tModloader Version", - "description": "The version of tModloader that is to be used.", - "env_variable": "VERSION", - "default_value": "latest", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:20" - }, { "name": "World Name", "description": "The name for the world file.", @@ -44,7 +35,8 @@ "default_value": "world", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" }, { "name": "Max Players", @@ -53,7 +45,8 @@ "default_value": "8", "user_viewable": true, "user_editable": false, - "rules": "required|numeric|digits_between:1,3" + "rules": "required|numeric|digits_between:1,3", + "field_type": "text" }, { "name": "World Size", @@ -62,7 +55,18 @@ "default_value": "1", "user_viewable": true, "user_editable": true, - "rules": "required|numeric|digits_between:1,3" + "rules": "required|string|in:1,2,3", + "field_type": "text" + }, + { + "name": "tModloader Version", + "description": "The version of tModloader that is to be used.", + "env_variable": "VERSION", + "default_value": "latest", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20", + "field_type": "text" }, { "name": "GitHub User", @@ -71,7 +75,8 @@ "default_value": "", "user_viewable": false, "user_editable": false, - "rules": "string|nullable" + "rules": "string|nullable", + "field_type": "text" }, { "name": "GitHub OAuth Token", @@ -80,16 +85,18 @@ "default_value": "", "user_viewable": false, "user_editable": false, - "rules": "string|nullable" + "rules": "string|nullable", + "field_type": "text" }, { "name": "Difficulty", - "description": "Sets the difficulty of the world when using autocreate 0(normal), 1(expert)", + "description": "Sets the difficulty of the world when using auto-create 0(normal), 1(expert). Toggle to choose expert (1).", "env_variable": "DIFFICULTY", "default_value": "0", "user_viewable": true, "user_editable": true, - "rules": "required|numeric|digits_between:0,1" + "rules": "required|string|in:0,1", + "field_type": "text" }, { "name": "Server Password", @@ -98,7 +105,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" }, { "name": "MOTD", @@ -107,7 +115,8 @@ "default_value": "Please don\u2019t cut the purple trees!", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:40" + "rules": "required|string|max:40", + "field_type": "text" }, { "name": "Language", @@ -116,7 +125,8 @@ "default_value": "1", "user_viewable": true, "user_editable": true, - "rules": "required|numeric|digits_between:1,5" + "rules": "required|string|in:1,2,3,4,5", + "field_type": "text" } ] -} +} \ No newline at end of file From 32938e17c9663ab4b3e1a7d93957fa2b7c08980e Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Tue, 28 Jun 2022 19:08:52 -0700 Subject: [PATCH 0450/1001] [OpenRCT2] Fix Release Installations & Upgrade to PTDL_v2 - Updated egg to now allow successful installation and running of release versions. - Updated README with up to date information. --- game_eggs/tycoon_games/openrct2/README.md | 8 +- .../tycoon_games/openrct2/egg-openrct2.json | 80 +++++++++++++------ 2 files changed, 57 insertions(+), 31 deletions(-) diff --git a/game_eggs/tycoon_games/openrct2/README.md b/game_eggs/tycoon_games/openrct2/README.md index b0dbaf98..082e3378 100644 --- a/game_eggs/tycoon_games/openrct2/README.md +++ b/game_eggs/tycoon_games/openrct2/README.md @@ -50,9 +50,9 @@ ___ | | Minimum | |---------|---------| -| Processor | Multiarch is supported for most modern processors | +| Processor | x86/64 (\*multiarch may be supported for develop builds, but has not been tested) | | RAM | 256-512 MiB (depends on # of clients & park size) | -| Storage | 80 MB (*may require more if building from source*) | +| Storage | 110 MB (*may require more if building from source*) | | RCT2 Files | **Not required** | ___ @@ -71,15 +71,13 @@ Unfortunately, because console commands currently do not register, becoming the 1. Ensure the "Log Server Actions" startup variable is set to "true". 2. Start the server and join it with the client you want to make an admin. 3. Open `ServerData/serverlogs//.txt` and copy the SHA1 hash next to your client's username (note the username as well). -4. Then, open `ServerData/users.json`. Paste the hash into the "hash" value, and change the "name" value to your client's username. +4. Then, open `ServerData/users.json`. Paste the hash into the "hash" value, change the "name" value to your client's username, and save the file. 5. Reboot the server, re-join it, and you should be an admin! After becoming an admin, you can use the in-game users management window to add additional admins (or groups) more easily if you wish. ___ ### Known Issues The following are known issues that are unique to running OpenRCT2 on Pterodactyl, but likely can only be fixed by further development/updates from OpenRCT2. -- Only building from source from the `develop` branch currently yields a package that is bootable. This will no longer be true for any OpenRCT2 releases after v.0.3.5.1. - - This also means that clients joining the server must be on the latest `develop` branch as well. - Configuring a password on the server disallows non-admin clients from entering in a password in their client to connect; it just disconnects them. Admin clients can still join normally. (reference issue [OpenRCT2/OpenRCT2#16396](https://github.com/OpenRCT2/OpenRCT2/issues/16396)) - You may rarely run into the server crashing on start due to a "Floating point exception(core dumped)" error. If this occurs to you, please help with OpenRCT2 development by doing the following: 1. Add the following to the beginning of your server's startup command: `SEGFAULT_SIGNALS=fpe LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so ` diff --git a/game_eggs/tycoon_games/openrct2/egg-openrct2.json b/game_eggs/tycoon_games/openrct2/egg-openrct2.json index ed070f1a..a7ec143d 100644 --- a/game_eggs/tycoon_games/openrct2/egg-openrct2.json +++ b/game_eggs/tycoon_games/openrct2/egg-openrct2.json @@ -1,27 +1,27 @@ { - "_comment": "Pterodactyl OpenRCT2 Egg ~ Red-Thirten and parkervcp ~ 2022-01-12", + "_comment": "Pterodactyl OpenRCT2 Egg ~ Red-Thirten and parkervcp ~ 2022-06-28", "meta": { - "version": "PTDL_v1", + "version": "PTDL_v2", "update_url": null }, "name": "OpenRCT2", "author": "rehlmgaming@gmail.com", "description": "OpenRCT2 is an open-source re-implementation of RollerCoaster Tycoon 2 (RCT2), expanding the game with new features, fixing bugs and raising game limits.", "features": null, - "images": [ - "ghcr.io\/parkervcp\/yolks:debian" - ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:debian": "ghcr.io\/parkervcp\/yolks:debian" + }, "file_denylist": [], "startup": ".\/OpenRCT2\/openrct2-cli --version && .\/OpenRCT2\/openrct2-cli host $(if {{LOAD_AUTOSAVE}} && [ -d ServerData\/save\/autosave\/ ]; then find ServerData\/save\/autosave\/ | sort -r | head -1; else echo \"{{SAVE_URI}}\"; fi) --port {{SERVER_PORT}} --user-data-path \/home\/container\/ServerData\/", "config": { "files": "{\r\n \"ServerData\/config.ini\": {\r\n \"parser\": \"ini\",\r\n \"find\": {\r\n \"general.autosave\": \"{{server.build.env.AUTOSAVE_INTERVAL}}\",\r\n \"general.autosave_amount\": \"{{server.build.env.AUTOSAVE_AMOUNT}}\",\r\n \"network.player_name\": \"\\\"{{server.build.env.SERVER_PLAYER_NAME}}\\\"\",\r\n \"network.default_port\": \"{{server.build.default.port}}\",\r\n \"network.default_password\": \"\\\"{{server.build.env.SERVER_PASSWORD}}\\\"\",\r\n \"network.advertise\": \"{{server.build.env.SERVER_ADVERTISE}}\",\r\n \"network.maxplayers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"network.server_name\": \"\\\"{{server.build.env.SERVER_NAME}}\\\"\",\r\n \"network.server_description\": \"\\\"{{server.build.env.SERVER_DESCRIPTION}}\\\"\",\r\n \"network.server_greeting\": \"\\\"{{server.build.env.SERVER_GREETING}}\\\"\",\r\n \"network.provider_name\": \"\\\"{{server.build.env.PROVIDER_NAME}}\\\"\",\r\n \"network.provider_email\": \"\\\"{{server.build.env.PROVIDER_EMAIL}}\\\"\",\r\n \"network.provider_website\": \"\\\"{{server.build.env.PROVIDER_WEBSITE}}\\\"\",\r\n \"network.log_chat\": \"{{server.build.env.LOG_CHAT}}\",\r\n \"network.log_server_actions\": \"{{server.build.env.LOG_SERVER_ACTIONS}}\",\r\n \"network.pause_server_if_no_clients\": \"{{server.build.env.PAUSE_NO_CLIENTS}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Listening for clients on\"\r\n}", "logs": "{}", - "stop": "^C^C" + "stop": "^C" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl OpenRCT2 Egg - egg-openrct2.json\r\n## Authors: David Wolfe (Red-Thirten), parkervcp\r\n## Date: 2022\/01\/12\r\n## License: MIT License\r\n\r\nGITHUB_PACKAGE=\"OpenRCT2\/OpenRCT2\"\r\nMATCH=\"linux-bullseye-x86_64.tar.gz\"\r\nDEFAULT_SAVE=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/tycoon_games\/openrct2\/save.park\"\r\n\r\n## OpenRCT2 Install\r\napt -y update\r\n[ ! -d \/mnt\/server ] && mkdir \/mnt\/server\r\ncd \/mnt\/server\r\n# Remove existing installation if present\r\n[ -d OpenRCT2 ] && rm -rf OpenRCT2\r\n\r\n# Determine if installing from source or from release\r\nif [ \"${VERSION}\" == \"develop\" ]; then\r\n # Get required packages\r\n apt -y install curl git make cmake gcc build-essential libicu-dev pkg-config libcurl4-openssl-dev libcrypto++-dev libpng-dev libssl-dev libzip-dev duktape-dev nlohmann-json3-dev\r\n echo -e \"\\nInstalling\/Updating OpenRCT2 from source...\\n\"\r\n # Setup temp directory for building and move to it\r\n [ -d temp ] && rm -rf temp\r\n mkdir temp && cd temp\r\n # Clone the branch and check if successful\r\n git clone --branch \"${VERSION}\" https:\/\/github.com\/${GITHUB_PACKAGE}\r\n if [ ! -d OpenRCT2 ]; then\r\n echo -e \"\\nFailed to clone \\\"${VERSION}\\\" branch from https:\/\/github.com\/${GITHUB_PACKAGE}\\n\"\r\n exit 1\r\n fi\r\n cd OpenRCT2\r\n mkdir build && cd build\r\n # Prepare CMake files for a lightweight and CLI-only build of OpenRCT2, using the appropriate flags\r\n cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DPORTABLE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_FLAGS=\"-g -gz\" -DDISABLE_TTF=ON -DDISABLE_GOOGLE_BENCHMARK=ON -DDISABLE_DISCORD_RPC=ON -DDISABLE_GUI=ON\r\n echo -e \"\\nBuilding OpenRCT2 package from source...\\n\\tThis process can take quite some time. Grab a coffee :)\\n\"\r\n # Build OpenRCT2\r\n DESTDIR=. make install\r\n # Check if build was successful and move to it\r\n if [ ! -d usr\/local ]; then\r\n echo -e \"\\nFailed to successfully build OpenRCT2!\\n\"\r\n exit 1\r\n fi\r\n cd usr\/local\r\n # Make executable-ready package by moving compiled files to the correct locations\r\n mkdir -p \/mnt\/server\/OpenRCT2\/data\r\n mv bin\/* \/mnt\/server\/OpenRCT2\/\r\n mv share\/openrct2\/* share\/openrct2-cli\/* \/mnt\/server\/OpenRCT2\/data\/\r\n mv share\/doc \/mnt\/server\/OpenRCT2\/\r\n cd \/mnt\/server\r\n rm -rf temp # Clean up temp building directory\r\n echo -e \"\\nBuild of OpenRCT2 package complete!\"\r\nelse\r\n # Get required packages\r\n apt install -y curl jq\r\n echo -e \"\\nInstalling\/Updating OpenRCT2 from release tag \\\"${VERSION}\\\"...\\n\"\r\n # This is a simple script to use the GitHub API for release versions.\r\n # This requires the egg has a variable for GITHUB_PACKAGE, VERSION and MATCH (MATCH is to match the filename in some way).\r\n # Get release info and download links\r\n LATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\n RELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\n if [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\n else\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 -i ${MATCH})\r\n else\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\n fi\r\n # Download and unpackage the release\r\n curl -L ${DOWNLOAD_URL} | tar -xzv\r\n # Check if it was successful\r\n if [ -d OpenRCT2 ]; then\r\n echo -e \"\\nDownload of OpenRCT2 release successful!\"\r\n else\r\n echo -e \"\\nFailed to download\/unpack file: ${DOWNLOAD_URL}\\n\"\r\n exit 1\r\n fi\r\nfi\r\n\r\n## OpenRCT2 Setup\r\n# Setup ServerData\/save directory\r\n[ ! -d ServerData\/save ] && mkdir -p ServerData\/save\r\ncd ServerData\/save\r\n# Download default save.park if missing\r\nif [ ! -f save.park ]; then\r\n echo -e \"Downloading default save.park file from ${DEFAULT_SAVE}\"\r\n curl -sSLO ${DEFAULT_SAVE}\r\nfi\r\n\r\necho -e \"\\nOpenRCT2 Successfully Installed!\"", + "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl OpenRCT2 Egg - egg-openrct2.json\r\n## Authors: David Wolfe (Red-Thirten), parkervcp\r\n## Date: 2022\/06\/28\r\n## License: MIT License\r\n\r\nGITHUB_PACKAGE=\"OpenRCT2\/OpenRCT2\"\r\nMATCH=\"linux-x86_64.AppImage\"\r\nDEFAULT_SAVE=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/tycoon_games\/openrct2\/save.park\"\r\n\r\n## OpenRCT2 Install\r\napt -y update\r\n[ ! -d \/mnt\/server ] && mkdir \/mnt\/server\r\ncd \/mnt\/server\r\n# Remove existing installation if present\r\n[ -d OpenRCT2 ] && rm -rf OpenRCT2\r\n# Setup OpenRCT2 directory\r\nmkdir -p OpenRCT2\/data\r\n# Setup temp directory for building and move to it\r\n[ -d temp ] && rm -rf temp\r\nmkdir temp && cd temp\r\n\r\n# Determine if installing from source or from release\r\nif [ \"${VERSION}\" == \"develop\" ]; then\r\n # Get required packages\r\n apt -y install curl git make cmake gcc build-essential libicu-dev pkg-config libcurl4-openssl-dev libcrypto++-dev libpng-dev libssl-dev libzip-dev duktape-dev nlohmann-json3-dev\r\n echo -e \"\\nInstalling\/Updating OpenRCT2 from source...\\n\"\r\n \r\n # Clone the branch and check if successful\r\n git clone --branch \"${VERSION}\" https:\/\/github.com\/${GITHUB_PACKAGE}\r\n if [ ! -d OpenRCT2 ]; then\r\n echo -e \"\\nFailed to clone \\\"${VERSION}\\\" branch from https:\/\/github.com\/${GITHUB_PACKAGE}\\n\"\r\n exit 1\r\n fi\r\n \r\n cd OpenRCT2\r\n mkdir build && cd build\r\n # Prepare CMake files for a lightweight and CLI-only build of OpenRCT2, using the appropriate flags\r\n cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DPORTABLE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_FLAGS=\"-g -gz\" -DDISABLE_TTF=ON -DDISABLE_GOOGLE_BENCHMARK=ON -DDISABLE_DISCORD_RPC=ON -DDISABLE_GUI=ON\r\n echo -e \"\\nBuilding OpenRCT2 package from source...\\n\\tThis process can take quite some time. Grab a coffee :)\\n\"\r\n # Build OpenRCT2\r\n DESTDIR=. make install\r\n # Check if build was successful\r\n if [ ! -d usr\/local ]; then\r\n echo -e \"\\nFailed to successfully build OpenRCT2!\\n\"\r\n exit 1\r\n fi\r\n \r\n # Make executable-ready package by moving compiled files to the correct locations\r\n cd usr\/local\r\n mv bin\/* \/mnt\/server\/OpenRCT2\/\r\n mv share\/openrct2\/* share\/openrct2-cli\/* \/mnt\/server\/OpenRCT2\/data\/\r\n mv share\/doc \/mnt\/server\/OpenRCT2\/\r\n echo -e \"\\nBuild of OpenRCT2 package complete!\"\r\nelse\r\n # Get required packages\r\n apt install -y curl jq\r\n echo -e \"\\nInstalling\/Updating OpenRCT2 from release tag \\\"${VERSION}\\\"...\\n\"\r\n \r\n # This is a simple script to use the GitHub API for release versions.\r\n # This requires the egg has a variable for GITHUB_PACKAGE, VERSION and MATCH (MATCH is to match the filename in some way).\r\n # Get release info and download links\r\n LATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\n RELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n if [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\n else\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 -i ${MATCH})\r\n else\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\n fi\r\n # Download the release and check if successful\r\n curl -L ${DOWNLOAD_URL} -o OpenRCT2.AppImage\r\n if [ ! -f OpenRCT2.AppImage ]; then\r\n echo -e \"\\nFailed to download release: ${DOWNLOAD_URL}\\n\"\r\n exit 1\r\n fi\r\n \r\n chmod +x OpenRCT2.AppImage\r\n # Extract AppImage and check if successful\r\n echo -e \"Extracting AppImage files...\"\r\n .\/OpenRCT2.AppImage --appimage-extract\r\n if [ ! -d squashfs-root\/usr ]; then\r\n echo -e \"\\nFailed to extract AppImage!\\n\\t(Is the `MATCH` variable set to download an AppImage?)\\n\"\r\n exit 1\r\n fi\r\n \r\n # Move needed files to correct directories\r\n cd squashfs-root\/usr\r\n mv lib bin\/openrct2-cli \/mnt\/server\/OpenRCT2\/\r\n mv share\/openrct2\/* \/mnt\/server\/OpenRCT2\/data\/\r\n mkdir \/mnt\/server\/OpenRCT2\/doc && mv share\/doc\/openrct2 $_\r\n echo -e \"\\nDownload\/Update of OpenRCT2 release successful!\"\r\nfi\r\n\r\ncd \/mnt\/server\r\nrm -rf temp # Clean up temp building directory\r\n\r\n## OpenRCT2 Setup\r\n# Setup ServerData\/save directory\r\n[ ! -d ServerData\/save ] && mkdir -p ServerData\/save\r\ncd ServerData\/save\r\n# Download default save.park if missing\r\nif [ ! -f save.park ]; then\r\n echo -e \"Downloading default save.park file from ${DEFAULT_SAVE}\"\r\n curl -sSLO ${DEFAULT_SAVE}\r\nfi\r\n\r\necho -e \"\\nOpenRCT2 Successfully Installed!\"", "container": "debian:bullseye-slim", "entrypoint": "\/bin\/bash" } @@ -34,7 +34,8 @@ "default_value": "ServerData\/save\/save.park", "user_viewable": true, "user_editable": true, - "rules": "required|string|min:4" + "rules": "required|string|min:4", + "field_type": "text" }, { "name": "Load Latest Autosave", @@ -43,7 +44,8 @@ "default_value": "true", "user_viewable": true, "user_editable": true, - "rules": "required|string|in:true,false" + "rules": "required|string|in:true,false", + "field_type": "text" }, { "name": "Autosave Interval", @@ -52,7 +54,8 @@ "default_value": "1", "user_viewable": true, "user_editable": true, - "rules": "required|integer|between:0,5" + "rules": "required|integer|between:0,5", + "field_type": "text" }, { "name": "Autosaves To Keep", @@ -61,7 +64,8 @@ "default_value": "10", "user_viewable": true, "user_editable": true, - "rules": "required|integer|min:0" + "rules": "required|integer|min:0", + "field_type": "text" }, { "name": "Max Players", @@ -70,7 +74,8 @@ "default_value": "16", "user_viewable": true, "user_editable": true, - "rules": "required|integer|min:0" + "rules": "required|integer|min:0", + "field_type": "text" }, { "name": "Server Password", @@ -79,7 +84,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "string|nullable" + "rules": "string|nullable", + "field_type": "text" }, { "name": "Advertise Server", @@ -88,7 +94,8 @@ "default_value": "true", "user_viewable": true, "user_editable": true, - "rules": "required|string|in:true,false" + "rules": "required|string|in:true,false", + "field_type": "text" }, { "name": "Pause Server If No Clients", @@ -97,7 +104,8 @@ "default_value": "false", "user_viewable": true, "user_editable": true, - "rules": "required|string|in:true,false" + "rules": "required|string|in:true,false", + "field_type": "text" }, { "name": "Server Name", @@ -106,7 +114,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "string|nullable" + "rules": "string|nullable", + "field_type": "text" }, { "name": "Server Description", @@ -115,7 +124,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "string|nullable" + "rules": "string|nullable", + "field_type": "text" }, { "name": "Server Player Name", @@ -124,7 +134,8 @@ "default_value": "Server", "user_viewable": true, "user_editable": true, - "rules": "string|nullable" + "rules": "string|nullable", + "field_type": "text" }, { "name": "Server Greeting", @@ -133,7 +144,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "string|nullable" + "rules": "string|nullable", + "field_type": "text" }, { "name": "Provider Name", @@ -142,7 +154,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "string|nullable" + "rules": "string|nullable", + "field_type": "text" }, { "name": "Server Provider E-Mail", @@ -151,7 +164,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "string|nullable" + "rules": "string|nullable", + "field_type": "text" }, { "name": "Server Provider Website", @@ -160,7 +174,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "string|nullable" + "rules": "string|nullable", + "field_type": "text" }, { "name": "Log Chat", @@ -169,7 +184,8 @@ "default_value": "false", "user_viewable": true, "user_editable": true, - "rules": "required|string|in:true,false" + "rules": "required|string|in:true,false", + "field_type": "text" }, { "name": "Log Server Actions", @@ -178,16 +194,28 @@ "default_value": "false", "user_viewable": true, "user_editable": true, - "rules": "required|string|in:true,false" + "rules": "required|string|in:true,false", + "field_type": "text" }, { "name": "OpenRCT2 Version", "description": "The release tag (version) of OpenRCT2 to download and install from their official Github (ie. \"v0.3.5.1\"). Use \"latest\" to download the latest release, or \"develop\" to build from the latest source (takes longer to install but is the most up to date).", "env_variable": "VERSION", - "default_value": "develop", + "default_value": "latest", "user_viewable": true, "user_editable": true, - "rules": "required|string|min:1" + "rules": "required|string|min:1", + "field_type": "text" + }, + { + "name": "[Advanced] Library Path", + "description": "What path to load libraries from for release binaries. Rarely needs to be changed.", + "env_variable": "LD_LIBRARY_PATH", + "default_value": ".\/OpenRCT2\/lib", + "user_viewable": false, + "user_editable": false, + "rules": "required|string", + "field_type": "text" } ] } \ No newline at end of file From d4c32966967cac31f93de88f98a558833a6c7b38 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Sat, 2 Jul 2022 08:17:53 -0700 Subject: [PATCH 0451/1001] fix(satisfactory): SteamCMD download link & PTDL_v2 Upgrade (#1727) --- .../steamcmd_servers/satisfactory/README.md | 2 +- .../satisfactory/egg-satisfactory.json | 54 ++++++++++++------- 2 files changed, 35 insertions(+), 21 deletions(-) diff --git a/game_eggs/steamcmd_servers/satisfactory/README.md b/game_eggs/steamcmd_servers/satisfactory/README.md index ccd22a4f..d76b4c8e 100644 --- a/game_eggs/steamcmd_servers/satisfactory/README.md +++ b/game_eggs/steamcmd_servers/satisfactory/README.md @@ -152,7 +152,7 @@ ___ ### Console Commands -As of v0.5.1.10, the console tab in the client server manager is the only way to execute commands. Entering commands via Pterodactyl do nothing. +The console tab in the client server manager is the only way to execute commands. Entering commands via Pterodactyl do nothing. [List of known commands can be found via the Wiki.](https://satisfactory.fandom.com/wiki/Dedicated_servers#Console_commands) diff --git a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json index cc82ea88..c9515b07 100644 --- a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json +++ b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json @@ -1,7 +1,7 @@ { - "_comment": "Pterodactyl Satisfactory Egg ~ Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord ~ 2022-02-07", + "_comment": "Pterodactyl Satisfactory Egg ~ Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord ~ 2022-06-27", "meta": { - "version": "PTDL_v1", + "version": "PTDL_v2", "update_url": null }, "name": "Satisfactory", @@ -10,9 +10,9 @@ "features": [ "steam_disk_space" ], - "images": [ - "ghcr.io\/parkervcp\/games:source" - ], + "docker_images": { + "ghcr.io\/parkervcp\/games:source": "ghcr.io\/parkervcp\/games:source" + }, "file_denylist": [], "startup": ".\/Engine\/Binaries\/Linux\/UE4Server-Linux-Shipping FactoryGame ?listen -Port={{SERVER_PORT}} -ServerQueryPort={{QUERY_PORT}} -BeaconPort={{BEACON_PORT}} -multihome=0.0.0.0 $(if {{DISABLE_SEASONAL}}; then echo \"-DisableSeasonalEvents\"; fi)", "config": { @@ -23,7 +23,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\n# File: Pterodactyl Satisfactory Egg - egg-satisfactory.json\r\n# Authors: Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord\r\n# Date: 2021\/11\/29\r\n# License: MIT License\r\n\r\n## Download and install SteamCMD\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\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\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login anonymous +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) validate +exit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so\r\n\r\n## Satisfactory setup\r\n# Check for successful installation and make the core binary executable.\r\ncd \/mnt\/server\/Engine\/Binaries\/Linux\r\nif [[ ! -f UE4Server-Linux-Shipping ]]; then\r\n echo -e \"\\n\\nSteamCMD failed to install the Satisfactory Dedicated Server!\"\r\n echo -e \"\\tTry reinstalling the server again.\\n\"\r\n exit 1\r\nelse\r\n chmod +x UE4Server-Linux-Shipping\r\nfi\r\n\r\n# Make Config directory and default .ini files (since they are not initially present before first server start)\r\nmkdir -p \/mnt\/server\/FactoryGame\/Saved\/Config\/LinuxServer\/ && cd \"$_\"\r\n# Currently, this will delete & re-create certain .ini files during a re-install if they are already present.\r\n# While undesirable, this is required due to a current Pterodactyl ini config parser limitation.\r\n# When the patch to this limitation hits the production branch, this will be updated.\r\nrm -f Engine.ini Game.ini GameUserSettings.ini\r\n\r\necho -e '\\nCreating default \"Engine.ini\" configuration file...'\r\ncat > Engine.ini << EOF\r\n[\/Script\/FactoryGame.FGSaveSession]\r\nmNumRotatingAutosaves=${NUM_AUTOSAVES}\r\n\r\n[CrashReportClient]\r\nbImplicitSend=${UPLOAD_CRASH_REPORT}\r\n\r\n[\/Script\/OnlineSubsystemUtils.IpNetDriver]\r\nInitialConnectTimeout=${INIT_CONNECT_TIMEOUT}\r\nConnectionTimeout=${CONNECT_TIMEOUT}\r\nEOF\r\n\r\necho -e 'Creating default \"Game.ini\" configuration file...'\r\ncat > Game.ini << EOF\r\n[\/Script\/Engine.GameSession]\r\nMaxPlayers=${MAX_PLAYERS}\r\nEOF\r\n\r\necho -e 'Creating default \"GameUserSettings.ini\" configuration file...'\r\ncat > GameUserSettings.ini << EOF\r\n[\/Script\/FactoryGame.FGGameUserSettings]\r\nmIntValues=((\"FG.NetworkQuality\", ${NETWORK_QUALITY}))\r\nmFloatValues=((\"FG.AutosaveInterval\", ${AUTOSAVE_INTERVAL}))\r\nEOF\r\n\r\necho -e \"\\nSatisfactory Dedicated Server successfully installed!\\n\"", + "script": "#!\/bin\/bash\r\n\r\n# File: Pterodactyl Satisfactory Egg - egg-satisfactory.json\r\n# Authors: Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord\r\n# Date: 2022\/06\/27\r\n# License: MIT License\r\n\r\n## Download and install SteamCMD\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login anonymous +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) validate +exit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so\r\n\r\n## Satisfactory setup\r\n# Check for successful installation and make the core binary executable.\r\ncd \/mnt\/server\/Engine\/Binaries\/Linux\r\nif [[ ! -f UE4Server-Linux-Shipping ]]; then\r\n echo -e \"\\n\\nSteamCMD failed to install the Satisfactory Dedicated Server!\"\r\n echo -e \"\\tTry reinstalling the server again.\\n\"\r\n exit 1\r\nelse\r\n chmod +x UE4Server-Linux-Shipping\r\nfi\r\n\r\n# Make Config directory and default .ini files (since they are not initially present before first server start)\r\nmkdir -p \/mnt\/server\/FactoryGame\/Saved\/Config\/LinuxServer\/ && cd \"$_\"\r\n# Currently, this will delete & re-create certain .ini files during a re-install if they are already present.\r\n# While undesirable, this is required due to a current Pterodactyl ini config parser limitation.\r\n# When the patch to this limitation hits the production branch, this will be updated.\r\nrm -f Engine.ini Game.ini GameUserSettings.ini\r\n\r\necho -e '\\nCreating default \"Engine.ini\" configuration file...'\r\ncat > Engine.ini << EOF\r\n[\/Script\/FactoryGame.FGSaveSession]\r\nmNumRotatingAutosaves=${NUM_AUTOSAVES}\r\n\r\n[CrashReportClient]\r\nbImplicitSend=${UPLOAD_CRASH_REPORT}\r\n\r\n[\/Script\/OnlineSubsystemUtils.IpNetDriver]\r\nInitialConnectTimeout=${INIT_CONNECT_TIMEOUT}\r\nConnectionTimeout=${CONNECT_TIMEOUT}\r\nEOF\r\n\r\necho -e 'Creating default \"Game.ini\" configuration file...'\r\ncat > Game.ini << EOF\r\n[\/Script\/Engine.GameSession]\r\nMaxPlayers=${MAX_PLAYERS}\r\nEOF\r\n\r\necho -e 'Creating default \"GameUserSettings.ini\" configuration file...'\r\ncat > GameUserSettings.ini << EOF\r\n[\/Script\/FactoryGame.FGGameUserSettings]\r\nmIntValues=((\"FG.NetworkQuality\", ${NETWORK_QUALITY}))\r\nmFloatValues=((\"FG.AutosaveInterval\", ${AUTOSAVE_INTERVAL}))\r\nEOF\r\n\r\necho -e \"\\nSatisfactory Dedicated Server successfully installed!\\n\"", "container": "ghcr.io\/pterodactyl\/installers:debian", "entrypoint": "\/bin\/bash" } @@ -36,7 +36,8 @@ "default_value": "15777", "user_viewable": true, "user_editable": false, - "rules": "required|integer|between:1024,65536" + "rules": "required|integer|between:1024,65536", + "field_type": "text" }, { "name": "[REQUIRED] Beacon Port", @@ -45,7 +46,8 @@ "default_value": "15000", "user_viewable": true, "user_editable": false, - "rules": "required|integer|between:1024,65536" + "rules": "required|integer|between:1024,65536", + "field_type": "text" }, { "name": "Automatic Updates", @@ -54,7 +56,8 @@ "default_value": "1", "user_viewable": true, "user_editable": true, - "rules": "boolean" + "rules": "boolean", + "field_type": "text" }, { "name": "[Repair] Validate Server Files", @@ -63,7 +66,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "string|nullable" + "rules": "string|nullable", + "field_type": "text" }, { "name": "Autosave Interval", @@ -72,7 +76,8 @@ "default_value": "300", "user_viewable": true, "user_editable": true, - "rules": "required|numeric|min:1" + "rules": "required|numeric|min:1", + "field_type": "text" }, { "name": "Number of Rotating Autosaves", @@ -81,7 +86,8 @@ "default_value": "3", "user_viewable": true, "user_editable": true, - "rules": "required|integer|min:0" + "rules": "required|integer|min:0", + "field_type": "text" }, { "name": "Upload Crash Reports", @@ -90,7 +96,8 @@ "default_value": "true", "user_viewable": true, "user_editable": true, - "rules": "required|string|in:true,false" + "rules": "required|string|in:true,false", + "field_type": "text" }, { "name": "Disable Seasonal Events", @@ -99,7 +106,8 @@ "default_value": "false", "user_viewable": true, "user_editable": true, - "rules": "required|string|in:true,false" + "rules": "required|string|in:true,false", + "field_type": "text" }, { "name": "[Experimental] Max Players", @@ -108,7 +116,8 @@ "default_value": "4", "user_viewable": true, "user_editable": true, - "rules": "required|integer|min:1" + "rules": "required|integer|min:1", + "field_type": "text" }, { "name": "[Advanced] Client Initial Connection Timeout", @@ -117,7 +126,8 @@ "default_value": "30", "user_viewable": true, "user_editable": true, - "rules": "required|numeric|min:1" + "rules": "required|numeric|min:1", + "field_type": "text" }, { "name": "[Advanced] Client Established Connection Timeout", @@ -126,7 +136,8 @@ "default_value": "20", "user_viewable": true, "user_editable": true, - "rules": "required|numeric|min:1" + "rules": "required|numeric|min:1", + "field_type": "text" }, { "name": "[Advanced] Network Quality", @@ -135,7 +146,8 @@ "default_value": "3", "user_viewable": true, "user_editable": true, - "rules": "required|integer|between:0,3" + "rules": "required|integer|between:0,3", + "field_type": "text" }, { "name": "[Advanced] Branch Name", @@ -144,7 +156,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "string|nullable|in:public,experimental" + "rules": "string|nullable|in:public,experimental", + "field_type": "text" }, { "name": "[Advanced] Satisfactory Dedicated Server App ID", @@ -153,7 +166,8 @@ "default_value": "1690800", "user_viewable": false, "user_editable": false, - "rules": "required|integer|min:1" + "rules": "required|integer|min:1", + "field_type": "text" } ] } From 7e883d1e0bb7f964f5da21ee89db7f9f31133fff Mon Sep 17 00:00:00 2001 From: Jack Date: Mon, 4 Jul 2022 06:46:00 +0930 Subject: [PATCH 0452/1001] fix: Curse Forge Generic Improvements (#1692) * Allow Installation from zip archive file *Better File Finding for forge installer and server.jar * chore: clean up and update to PTDL_V2 Co-authored-by: softwarenoob --- .../egg-curseforge-generic.json | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json b/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json index 8b9255af..b86afb49 100644 --- a/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json +++ b/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json @@ -1,10 +1,10 @@ { "_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-06-10T15:54:18-04:00", + "exported_at": "2022-07-03T17:12:36-04:00", "name": "Curseforge Generic", "author": "parker@parkervcp.com", "description": "A generic egg for a forge modpack", @@ -13,23 +13,23 @@ "java_version", "pid_limit" ], - "images": [ - "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_17" - ], + "docker_images": { + "Java 8": "ghcr.io\/pterodactyl\/yolks:java_8", + "Java 11": "ghcr.io\/pterodactyl\/yolks:java_11", + "Java 16": "ghcr.io\/pterodactyl\/yolks:java_16", + "Java 17": "ghcr.io\/pterodactyl\/yolks:java_17" + }, "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar server.jar", "config": { - "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \")! For help, type \",\r\n \"userInteraction\": [\r\n \"Go to eula.txt for more info.\"\r\n ]\r\n}", + "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \")! For help, type \"\r\n}", "logs": "{}", "stop": "stop" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir -p \/mnt\/server\r\nfi\r\n\r\nfunction install_required {\r\n apt update\r\n apt install -y curl jq unzip dos2unix\r\n}\r\n\r\nfunction get_download {\r\n # get json data to work with\r\n echo -e \"Curling the json for the modpack\"\r\n echo -e \"running: curl -sSLX GET https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID} -H 'Accept: application\/json' -H 'x-api-key: API_KEY'\"\r\n JSON_DATA=$(curl -ssLX GET https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID} -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\")\r\n\r\n # if no modpack version is set or is set to latest\r\n if [ -z ${MODPACK_VERSION} ] || [ \"${MODPACK_VERSION}\" = \"latest\" ]; then\r\n echo -e \"Getting latest download url\"\r\n # parse data to get the download url\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r \".data.mainFileId\")\r\n echo -e \"File ID is: ${FILE_ID}\"\r\n if [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .isServerPack\")\" == \"false\" ] && [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\" != \"null\" ]; then\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\r\n DOWNLOAD_URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files\/${FILE_ID}\/download-url | jq -r \".data\")\r\n else\r\n DOWNLOAD_URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files\/${FILE_ID}\/download-url | jq -r \".data\")\r\n fi\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n else\r\n echo -e \"Looking for download url for version ${MODPACK_VERSION}\"\r\n # parse files for version match\r\n FILES_JSON_DATA=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files)\r\n # get element number to get the exact location in the json\r\n FILES_JSON_ELEMENT=$(echo -e ${FILES_JSON_DATA} | jq --arg VERSION \"${MODPACK_VERSION}\" '.[] | select(.displayName) | .displayName | contains($VERSION)' | grep -n true | cut -f1 -d: | tail -1)\r\n # if there wasn't a match default to latest\r\n if [ ! -z ${FILES_JSON_ELEMENT} ]; then\r\n echo -e \"No matching version found\"\r\n echo -e \"defaulting to latest\"\r\n DOWNLOAD_URL=$(echo -e ${FILES_JSON_DATA} | jq --arg ELEMENT \"${FILES_JSON_ELEMENT}\" '.[$ELEMENT|tonumber-1] | .downloadUrl')\r\n else\r\n echo -e \"Version match found\"\r\n DOWNLOAD_URL=$(echo -e ${JSON_DATA} | jq -r .latestFiles[0].downloadUrl)\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n fi\r\n fi\r\n ## download modpack files\r\n cd \/mnt\/server\r\n echo \"Executing curl -L ${DOWNLOAD_URL} -o server.zip\"\r\n curl -L -g \"${DOWNLOAD_URL}\" -o server.zip\r\n unzip -o server.zip\r\n rm -rf server.zip\r\n}\r\n\r\nfunction forge_install {\r\n echo -e \"\\nInstalling forge server using the installer jar file.\\n\"\r\n if [ -f \/mnt\/server\/*installer.jar ]; then\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n else\r\n echo \"No forge installer found moving on.\"\r\n fi\r\n mv FTBServer.jar server.jar\r\n}\r\n\r\nfunction forge_cleanup {\r\n echo -e \"\\nDeleting installer jar file and cleaning up.\\n\"\r\n rm -rf *installer.jar\r\n if [ ! -f \/mnt\/server\/forge*universal.jar ]; then\r\n mv -v \/mnt\/server\/*\/* \/mnt\/server\/\r\n if [ ! -f \/mnt\/server\/*universal.jar ]; then\r\n mv forge*.jar server.jar\r\n else\r\n mv forge*universal.jar server.jar \r\n fi\r\n else\r\n mv forge*universal.jar server.jar\r\n fi\r\n}\r\n\r\nfunction json_download_prework {\r\n mkdir -p \/mnt\/server\/mods\r\n cd \/mnt\/server\/mods\r\n}\r\n\r\nfunction json_download_mods {\r\n MANIFEST=\/mnt\/server\/manifest.json\r\n for mod in $(jq -c '.files[]' ${MANIFEST} ); do\r\n projID=$(echo $mod | jq -r \".projectID\")\r\n fileID=$(echo $mod | jq -r \".fileID\")\r\n URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${projID}\/files\/${fileID}\/download-url jq -r \".data\")\r\n # this is saving everything as \/mnt\/server\/mods\/download\r\n echo \"Mod direct url: ${URL}\"\r\n curl -JLO \"${URL}\"\r\n done\r\n}\r\n\r\nfunction json_download_forge {\r\n cd \/mnt\/server\r\n FORGE=$(jq -r '.minecraft.modLoaders[0].id' \/mnt\/server\/manifest.json | cut -d '-' -f2)\r\n MCVER=$(jq -r '.minecraft.version' \/mnt\/server\/manifest.json)\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\"\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction json_download_overrides {\r\n if [ -d \/mnt\/server\/overrides ]; then\r\n mv \/mnt\/server\/overrides\/mods\/* \/mnt\/server\/mods\/\r\n rmdir \/mnt\/server\/overrides\/mods\r\n mv \/mnt\/server\/overrides\/* \/mnt\/server\r\n rmdir \/mnt\/server\/overrides\r\n fi\r\n}\r\n\r\nfunction cfg_download_forge {\r\n dos2unix settings.cfg # In case the pack was distributed with Windows-style line endings in the cfg file\r\n MCVER=`grep 'MCVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n FORGE=`grep 'FORGEVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n \r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n echo -e ${FORGE_VERSION}\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n PARSED_LINK=$(echo -e \"$FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\" | sed 's\/ \/\/g')\r\n\r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $PARSED_LINK\"\r\n curl -sSL $PARSED_LINK-installer.jar -o installer.jar\r\n curl -sSL $PARSED_LINK-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction ftb_install {\r\n chmod +x \/mnt\/server\/settings.sh \r\n . \/mnt\/server\/settings.sh \r\n curl https:\/\/s3.amazonaws.com\/Minecraft.Download\/versions\/${MCVER}\/minecraft_server.${MCVER}.jar -o ${JARFILE} \r\n curl https:\/\/libraries.minecraft.net\/${LAUNCHWRAPPER} -o \/mnt\/server\/libraries\/${LAUNCHWRAPPER}\r\n}\r\n\r\ninstall_required\r\nget_download\r\n\r\nif [ -f \/mnt\/server\/manifest.json ]; then\r\n json_download_prework\r\n json_download_mods\r\n json_download_overrides\r\n json_download_forge\r\nelif [ -f \/mnt\/server\/settings.cfg ]; then\r\n cfg_download_forge\r\nelif [ -f \/mnt\/server\/version.json ]; then\r\n if [ \"$(cat \/mnt\/server\/version.json | jq -r '.packID | contains(\"FTB\")')\" == \"true\" ]; then\r\n ftb_install\r\n fi\r\nelse\r\n forge_install\r\n forge_cleanup\r\nfi\r\n\r\necho -e \"\\n\\nInstall completed succesfully, enjoy!\"", + "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\nmkdir -p \/mnt\/server\r\n\r\nfunction install_required {\r\n apt update\r\n apt install -y curl jq unzip dos2unix\r\n}\r\n\r\nfunction get_download {\r\n # get json data to work with\r\n echo -e \"Curling the json for the modpack\"\r\n echo -e \"running: curl -sSLX GET https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID} -H 'Accept: application\/json' -H 'x-api-key: API_KEY'\"\r\n JSON_DATA=$(curl -ssLX GET https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID} -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\")\r\n\r\n # if no modpack version is set or is set to latest\r\n if [ -z ${MODPACK_VERSION} ] || [ \"${MODPACK_VERSION}\" = \"latest\" ]; then\r\n echo -e \"Getting latest download url\"\r\n # parse data to get the download url\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r \".data.mainFileId\")\r\n echo -e \"File ID is: ${FILE_ID}\"\r\n if [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .isServerPack\")\" == \"false\" ] && [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\" != \"null\" ]; then\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\r\n DOWNLOAD_URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files\/${FILE_ID}\/download-url | jq -r \".data\")\r\n else\r\n DOWNLOAD_URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files\/${FILE_ID}\/download-url | jq -r \".data\")\r\n fi\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n else\r\n echo -e \"Looking for download url for version ${MODPACK_VERSION}\"\r\n # parse files for version match\r\n FILES_JSON_DATA=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files)\r\n # get element number to get the exact location in the json\r\n FILES_JSON_ELEMENT=$(echo -e ${FILES_JSON_DATA} | jq --arg VERSION \"${MODPACK_VERSION}\" '.[] | select(.displayName) | .displayName | contains($VERSION)' | grep -n true | cut -f1 -d: | tail -1)\r\n # if there wasn't a match default to latest\r\n if [ ! -z ${FILES_JSON_ELEMENT} ]; then\r\n echo -e \"No matching version found\"\r\n echo -e \"defaulting to latest\"\r\n DOWNLOAD_URL=$(echo -e ${FILES_JSON_DATA} | jq --arg ELEMENT \"${FILES_JSON_ELEMENT}\" '.[$ELEMENT|tonumber-1] | .downloadUrl')\r\n else\r\n echo -e \"Version match found\"\r\n DOWNLOAD_URL=$(echo -e ${JSON_DATA} | jq -r .latestFiles[0].downloadUrl)\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n fi\r\n fi\r\n ## download modpack files\r\n cd \/mnt\/server\r\n echo \"Executing curl -L ${DOWNLOAD_URL} -o server.zip\"\r\n curl -L -g \"${DOWNLOAD_URL}\" -o server.zip\r\n unzip -o server.zip\r\n rm -rf server.zip\r\n}\r\n\r\nfunction unpack_zip {\r\n cd \/mnt\/server\r\n unzip -o server.zip\r\n}\r\n\r\nfunction forge_install {\r\n echo -e \"\\nInstalling forge server using the installer jar file.\\n\"\r\n if [ -f \/mnt\/server\/*installer.jar ]; then\r\n\t\tmv *installer.jar installer.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n else\r\n echo \"No forge installer found moving on.\"\r\n fi\r\n mv FTBServer.jar server.jar\r\n}\r\n\r\nfunction forge_cleanup {\r\n echo -e \"\\nDeleting installer jar file and cleaning up.\\n\"\r\n rm -rf *installer.jar\r\n if [ ! -f \/mnt\/server\/forge*universal.jar ]; then\r\n mv -v \/mnt\/server\/*\/* \/mnt\/server\/\r\n if [ ! -f \/mnt\/server\/*universal.jar ]; then\r\n mv forge*.jar server.jar\r\n else\r\n mv forge*universal.jar server.jar \r\n fi\r\n else\r\n mv forge*universal.jar server.jar\r\n fi\r\n}\r\n\r\nfunction json_download_prework {\r\n mkdir -p \/mnt\/server\/mods\r\n cd \/mnt\/server\/mods\r\n}\r\n\r\nfunction json_download_mods {\r\n MANIFEST=\/mnt\/server\/manifest.json\r\n for mod in $(jq -c '.files[]' ${MANIFEST} ); do\r\n projID=$(echo $mod | jq -r \".projectID\")\r\n fileID=$(echo $mod | jq -r \".fileID\")\r\n URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${projID}\/files\/${fileID}\/download-url jq -r \".data\")\r\n # this is saving everything as \/mnt\/server\/mods\/download\r\n echo \"Mod direct url: ${URL}\"\r\n curl -JLO \"${URL}\"\r\n done\r\n}\r\n\r\nfunction json_download_forge {\r\n cd \/mnt\/server\r\n FORGE=$(jq -r '.minecraft.modLoaders[0].id' \/mnt\/server\/manifest.json | cut -d '-' -f2)\r\n MCVER=$(jq -r '.minecraft.version' \/mnt\/server\/manifest.json)\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\"\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction json_download_overrides {\r\n if [ -d \/mnt\/server\/overrides ]; then\r\n mv \/mnt\/server\/overrides\/mods\/* \/mnt\/server\/mods\/\r\n rmdir \/mnt\/server\/overrides\/mods\r\n mv \/mnt\/server\/overrides\/* \/mnt\/server\r\n rmdir \/mnt\/server\/overrides\r\n fi\r\n}\r\n\r\nfunction cfg_download_forge {\r\n dos2unix settings.cfg # In case the pack was distributed with Windows-style line endings in the cfg file\r\n MCVER=`grep 'MCVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n FORGE=`grep 'FORGEVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n \r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n echo -e ${FORGE_VERSION}\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n PARSED_LINK=$(echo -e \"$FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\" | sed 's\/ \/\/g')\r\n\r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $PARSED_LINK\"\r\n curl -sSL $PARSED_LINK-installer.jar -o installer.jar\r\n curl -sSL $PARSED_LINK-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction ftb_install {\r\n chmod +x \/mnt\/server\/settings.sh \r\n . \/mnt\/server\/settings.sh \r\n curl https:\/\/s3.amazonaws.com\/Minecraft.Download\/versions\/${MCVER}\/minecraft_server.${MCVER}.jar -o ${JARFILE} \r\n curl https:\/\/libraries.minecraft.net\/${LAUNCHWRAPPER} -o \/mnt\/server\/libraries\/${LAUNCHWRAPPER}\r\n}\r\n\r\ninstall_required\r\nif [ ! -z ${MODPACK_ID} ] && [ ! \"${MODPACK_ID}\" = \"zip\" ]; then\r\n\tget_download\r\n\tunpack_zip\r\n rm -rf server.zip\r\nelse\r\n\tunpack_zip\r\nfi\r\n\r\nif [ -f \/mnt\/server\/manifest.json ]; then\r\n json_download_prework\r\n json_download_mods\r\n json_download_overrides\r\n json_download_forge\r\nelif [ -f \/mnt\/server\/settings.cfg ]; then\r\n cfg_download_forge\r\nelif [ -f \/mnt\/server\/version.json ]; then\r\n if [ \"$(cat \/mnt\/server\/version.json | jq -r '.packID | contains(\"FTB\")')\" == \"true\" ]; then\r\n ftb_install\r\n fi\r\nelse\r\n forge_install\r\n forge_cleanup\r\nfi\r\n\r\necho -e \"\\n\\nInstall completed succesfully, enjoy!\"", "container": "openjdk:8-jdk-slim", "entrypoint": "bash" } @@ -37,12 +37,13 @@ "variables": [ { "name": "Modpack Project ID", - "description": "The modpack project ID from the curseforge site on the pack page.\r\n\r\n(Ex. https:\/\/www.curseforge.com\/minecraft\/modpacks\/bofa-mods ID is 375152)", + "description": "The modpack project ID from the curseforge site on the pack page.\r\nOr 'zip' if installing from an uploaded server.zip file.\r\n(Ex. https:\/\/www.curseforge.com\/minecraft\/modpacks\/bofa-mods ID is 375152)", "env_variable": "MODPACK_ID", "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" }, { "name": "Modpack Version", @@ -51,7 +52,8 @@ "default_value": "latest", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" }, { "name": "API Key", @@ -60,7 +62,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" } ] } \ No newline at end of file From 76df21e79fe42d0e67309777edcbb0d9ad94dc76 Mon Sep 17 00:00:00 2001 From: realkarmakun <20980281+realkarmakun@users.noreply.github.com> Date: Mon, 4 Jul 2022 03:51:38 +0600 Subject: [PATCH 0453/1001] feaT: Add Loki egg (#1606) Co-authored-by: softwarenoob --- README.md | 11 ++++++--- monitoring/loki/README.md | 25 +++++++++++++++++++++ monitoring/loki/egg-loki.json | 42 +++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 monitoring/loki/README.md create mode 100644 monitoring/loki/egg-loki.json diff --git a/README.md b/README.md index a83e91d3..cd0ac048 100644 --- a/README.md +++ b/README.md @@ -142,9 +142,9 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Airplane](game_eggs/minecraft/java/airplane) * [Cuberite](game_eggs/minecraft/java/cuberite) * [Fabric](game_eggs/minecraft/java/fabric) - * [Feather](game_eggs/minecraft/java/feather) - * [Feed The Beast](game_eggs/minecraft/java/ftb) - * [Forge](game_eggs/minecraft/java/forge) + * [Feather](game_eggs/minecraft/java/feather) + * [Feed The Beast](game_eggs/minecraft/java/ftb) + * [Forge](game_eggs/minecraft/java/forge) * [Glowstone](game_eggs/minecraft/java/glowstone) * [Magma](game_eggs/minecraft/java/magma) * [Mohist](game_eggs/minecraft/java/mohist) @@ -255,6 +255,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [TShock](game_eggs/terraria/tshock) [Tycoon Games](game_eggs/tycoon_games) + * [OpenRCT2](game_eggs/tycoon_games/openrct2) * [OpenTTD](game_eggs/tycoon_games/openttd) @@ -270,6 +271,10 @@ If you are reading this it looks like you are looking to add an egg to your serv ## [Monitoring](/monitoring/) +### Loki + +* [Loki](/monitoring/loki) + ### Prometheus * [Prometheus](/monitoring/prometheus) diff --git a/monitoring/loki/README.md b/monitoring/loki/README.md new file mode 100644 index 00000000..d99b1be7 --- /dev/null +++ b/monitoring/loki/README.md @@ -0,0 +1,25 @@ +# Loki + +## From the [Loki](https://github.com/grafana/loki) GitHub repository + +Loki is a horizontally-scalable, highly-available, multi-tenant log aggregation system inspired by Prometheus. It is designed to be very cost effective and easy to operate. + +## Working with Loki + +To get logs "into" Loki you need a scrape agent, such as official [Promtail](https://grafana.com/docs/loki/latest/clients/promtail/installation/) or a library for your app that can push logs through HTTP endpoint (gRPC endpoint is disabled in Docker enviroment by default) + +## Resource consumption + +As this egg sets up Loki in single node mode, it can consume a lot of disk space really fast. It is possible to setup different kind of storages for different parts of Loki files. For further information refer to official [Loki documentation](https://grafana.com/docs/loki/latest/operations/storage/). + +To get started, you can go with a minimum of 3GB RAM and >=2.5GB disk space. + +Keep in mind that those numbers can grow pretty quick! + +## Server Ports + +Ports required to run the server in a table format. + +| Port | default | +|-------------|---------| +| Loki server | 3100 | diff --git a/monitoring/loki/egg-loki.json b/monitoring/loki/egg-loki.json new file mode 100644 index 00000000..04ee7e0a --- /dev/null +++ b/monitoring/loki/egg-loki.json @@ -0,0 +1,42 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2022-07-03T17:40:29-04:00", + "name": "Loki", + "author": "unknown@unknown.com", + "description": "Prometheus but for logs. This egg is for Loki instance only! You usually need pushing agents like Promtail to put logs in this", + "features": null, + "docker_images": { + "ghcr.io\/pterodactyl\/yolks:debian": "ghcr.io\/pterodactyl\/yolks:debian" + }, + "file_denylist": [], + "startup": ".\/loki-linux-amd64 -config.file=loki-docker-config.yaml", + "config": { + "files": "{\r\n \"loki-docker-config.yaml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"server.http_listen_port\": \"{{server.build.default.port}}\",\r\n \"common.ring.instance_addr\": \"0.0.0.0\",\r\n \"common.path_prefix\": \"\/home\/container\/loki\",\r\n \"common.storage.filesystem.chunks_directory\": \"\/home\/container\/loki\/chunks\",\r\n \"common.storage.filesystem.rules_directory\": \"\/home\/container\/loki\/rules\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Loki started\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# Switch to mounted working install directory\r\ncd \/mnt\/server\r\n\r\n# Download and extract Loki\r\n\r\nif [ \"$LOKI_VERSION\" = \"latest\" ]; then LOKI_VERSION=$(curl --silent \"https:\/\/api.github.com\/repos\/grafana\/loki\/releases\/latest\" | grep '\"tag_name\":' | sed -E 's\/.*\"([^\"]+)\".*\/\\1\/' | cut -c2-); fi\r\necho -e \"running curl -L https:\/\/github.com\/grafana\/loki\/releases\/download\/v${LOKI_VERSION}\/loki-linux-amd64.zip --output loki-linux-amd64.zip\"\r\ncurl -L https:\/\/github.com\/grafana\/loki\/releases\/download\/v${LOKI_VERSION}\/loki-linux-amd64.zip --output loki-linux-amd64.zip\r\nunzip loki-linux-amd64.zip\r\nrm -rf loki-linux-amd64.zip\r\ncurl -L https:\/\/raw.githubusercontent.com\/grafana\/loki\/v${LOKI_VERSION}\/cmd\/loki\/loki-docker-config.yaml --output loki-docker-config.yaml\r\necho -e \"installation completed\"", + "container": "ghcr.io\/parkervcp\/installers:debian", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Loki Version", + "description": "The version of Loki to use.\r\n\r\nFind all versions from https:\/\/github.com\/grafana\/loki", + "env_variable": "LOKI_VERSION", + "default_value": "latest", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20", + "field_type": "text" + } + ] +} \ No newline at end of file From f6389e09d2b9818d99b3b579683ef59d560dccd5 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Mon, 4 Jul 2022 00:22:57 +0200 Subject: [PATCH 0454/1001] fix(jts3servermod): use yolks images and clean install script (#1733) Co-authored-by: softwarenoob --- .../jts3servermod/egg-j-t-s3-server-mod.json | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/bots/teamspeak3/jts3servermod/egg-j-t-s3-server-mod.json b/bots/teamspeak3/jts3servermod/egg-j-t-s3-server-mod.json index 8bdf21d3..ec7cda59 100644 --- a/bots/teamspeak3/jts3servermod/egg-j-t-s3-server-mod.json +++ b/bots/teamspeak3/jts3servermod/egg-j-t-s3-server-mod.json @@ -1,36 +1,42 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v2", + "update_url": null }, - "exported_at": "2019-01-11T00:40:33+01:00", + "exported_at": "2022-07-03T18:18:04-04:00", "name": "JTS3ServerMod", "author": "teamwuffy@gmail.com", "description": "Setup:\r\n- Install the latest version\r\n- Go into config\/server1 and edit JTS3ServerMod_server.cfg\r\n- Save and start the server\r\n\r\nAuthor: https:\/\/www.stefan1200.de\/forum\/index.php?topic=2.0", - "image": "quay.io\/pterodactyl\/core:java", - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar .\/JTS3ServerMod.jar", + "features": null, + "docker_images": { + "ghcr.io\/pterodactyl\/yolks:java_8": "ghcr.io\/pterodactyl\/yolks:java_8" + }, + "file_denylist": [], + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar JTS3ServerMod.jar", "config": { "files": "{}", - "startup": "{\r\n \"done\": \"Successful connected to \",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "startup": "{\r\n \"done\": \"Successful connected to \"\r\n}", + "logs": "{}", "stop": "^C" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# JTS3ServerMod\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y install wget unzip\r\n\r\ncd \/tmp\r\n\r\nif [ -z \"$SERVER_VERSION\" ] || [ \"$SERVER_VERSION\" == \"latest\" ]; then\r\n wget -q -O JTS3ServerMod.zip 'https:\/\/www.stefan1200.de\/dlrequest.php?file=jts3servermod&type=.zip'\r\nelse\r\n wget -q -O JTS3ServerMod.zip 'https:\/\/www.stefan1200.de\/downloads\/JTS3ServerMod_$SERVER_VERSION.zip'\r\nfi\r\n\r\nunzip JTS3ServerMod.zip\r\n\r\nmkdir -p \/mnt\/server\r\nexport HOME=\/mnt\/server\r\n\r\nmv \/tmp\/JTS3ServerMod\/* \/mnt\/server\/", - "container": "ubuntu:18.04", + "script": "#!\/bin\/bash\r\n# JTS3ServerMod\r\n#\r\n# Server Files: \/mnt\/server\r\n# All required packages are installed in the used install image ghcr.io\/parkervcp\/installers:debian\r\n\r\nexport HOME=\/mnt\/server\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ -z \"$SERVER_VERSION\" ] || [ \"$SERVER_VERSION\" == \"latest\" ]; then\r\n echo -e \"Downloading latest version with curl -L \"https:\/\/www.stefan1200.de\/dlrequest.php?file=jts3servermod &\r\n type=.zip\" -o JTS3ServerMod.zip\"\r\n curl -L \"https:\/\/www.stefan1200.de\/dlrequest.php?file=jts3servermod&type=.zip\" -o JTS3ServerMod.zip\r\nelse\r\n echo -e \"running curl -L \"https:\/\/www.stefan1200.de\/downloads\/JTS3ServerMod_$SERVER_VERSION.zip\" -o JTS3ServerMod.zip\"\r\n curl -L \"https:\/\/www.stefan1200.de\/downloads\/JTS3ServerMod_$SERVER_VERSION.zip\" -o JTS3ServerMod.zip\r\nfi\r\n\r\n# no need to continue if we don't have an archive\r\nif [ ! -f JTS3ServerMod.zip ]; then\r\n echo \"JTS3ServerMod.zip not found. Something went wrong. Exiting\"\r\n exit 2\r\nfi\r\n\r\nunzip JTS3ServerMod.zip\r\nrm JTS3ServerMod.zip JTS3ServerMod-Windows.exe JTS3ServerMod-Windows_NoWindow.exe jts3servermod_startscript.sh\r\necho -e \"Installation completed.\\nConfiguration of the server must be done in the config folder to proceed.\"", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, "variables": [ { "name": "Version", - "description": "", + "description": "Version to download. Use latest to install latest version", "env_variable": "SERVER_VERSION", "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:20" + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20", + "field_type": "text" } ] -} +} From 7b1de0a8b06b63a47f756bf2aac92f72dc2e42d0 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Wed, 6 Jul 2022 16:54:57 +0200 Subject: [PATCH 0455/1001] Create egg-teamspeak3-ARM64-server.json --- .../egg-teamspeak3-ARM64-server.json | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 voice_servers/teamspeak_arm64/egg-teamspeak3-ARM64-server.json diff --git a/voice_servers/teamspeak_arm64/egg-teamspeak3-ARM64-server.json b/voice_servers/teamspeak_arm64/egg-teamspeak3-ARM64-server.json new file mode 100644 index 00000000..df828049 --- /dev/null +++ b/voice_servers/teamspeak_arm64/egg-teamspeak3-ARM64-server.json @@ -0,0 +1,62 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2022-07-06T09:30:23+02:00", + "name": "Teamspeak3 Server ARM64", + "author": "josdekurk@gmail.com", + "description": "VoIP software designed with security in mind, featuring crystal clear voice quality, endless customization options, and scalabilty up to thousands of simultaneous users.", + "features": null, + "docker_images": { + "ARM64": "ghcr.io\/parkervcp\/yolks:box64" + }, + "file_denylist": [], + "startup": "box64 .\/ts3server default_voice_port={{SERVER_PORT}} query_port={{QUERY_PORT}} filetransfer_ip=0.0.0.0 filetransfer_port={{FILE_TRANSFER}} license_accepted=1", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"listening on 0.0.0.0:\"\r\n}", + "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/ts3.log\"\r\n}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/ash\r\n# TS3 Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\nif [ -z ${TS_VERSION} ] || [ ${TS_VERSION} == latest ]; then\r\n TS_VERSION=$(curl -sSL https:\/\/teamspeak.com\/versions\/server.json | jq -r '.linux.x86_64.version')\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"getting files from http:\/\/files.teamspeak-services.com\/releases\/server\/${TS_VERSION}\/teamspeak3-server_linux_x86-${TS_VERSION}.tar.bz2\" \r\ncurl -L http:\/\/files.teamspeak-services.com\/releases\/server\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2 | tar -xvj --strip-components=1", + "container": "ghcr.io\/pterodactyl\/installers:alpine", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Server Version", + "description": "The version of Teamspeak 3 to use when running the server.", + "env_variable": "TS_VERSION", + "default_value": "latest", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:6", + "field_type": "text" + }, + { + "name": "File Transfer Port", + "description": "The Teamspeak file transfer port", + "env_variable": "FILE_TRANSFER", + "default_value": "30033", + "user_viewable": true, + "user_editable": false, + "rules": "required|integer|between:1,65535", + "field_type": "text" + }, + { + "name": "Query Port", + "description": "The Teamspeak Query Port", + "env_variable": "QUERY_PORT", + "default_value": "10011", + "user_viewable": true, + "user_editable": false, + "rules": "required|integer|between:1,65535", + "field_type": "text" + } + ] +} From 5ad73aeb54ee7e04063e172dd435a1fe78be1906 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Wed, 6 Jul 2022 17:00:51 +0200 Subject: [PATCH 0456/1001] add unique README.md --- voice_servers/teamspeak_arm64/Readme.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 voice_servers/teamspeak_arm64/Readme.md diff --git a/voice_servers/teamspeak_arm64/Readme.md b/voice_servers/teamspeak_arm64/Readme.md new file mode 100644 index 00000000..4563a71b --- /dev/null +++ b/voice_servers/teamspeak_arm64/Readme.md @@ -0,0 +1,14 @@ +# TeamSpeak ARM64 + +## From their [Website](https://www.teamspeak.com/) + + +## Server Ports + +Ports required to run the server in a table format. + +| Port | default | +|---------|---------| +| Voice | 9987 | +| Query | 10011 | +| File | 30033 | From 4915cdc11b3a018902ab6d91b3b8ab6cc088364e Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Wed, 6 Jul 2022 17:01:43 +0200 Subject: [PATCH 0457/1001] add to main Readme.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cd0ac048..a108b65e 100644 --- a/README.md +++ b/README.md @@ -76,6 +76,7 @@ If you are reading this it looks like you are looking to add an egg to your serv ## [Voice Servers](/voice_servers) * [Lavalink](/voice_servers/lavalink) +* [Teamspeak_arm64](/voice_servers/teamspeak_arm64) * [TeaSpeak](/voice_servers/teaspeak) * [TS3-Manager](/voice_servers/ts3_manager) From e6ea34581ea9f3a14786a1f31ed8fed2819cb197 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Wed, 6 Jul 2022 17:06:02 +0200 Subject: [PATCH 0458/1001] use proper casing --- README.md | 2 +- voice_servers/{teamspeak_arm64 => teamspeak_ARM64}/Readme.md | 0 .../egg-teamspeak3-arm64-server.json} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename voice_servers/{teamspeak_arm64 => teamspeak_ARM64}/Readme.md (100%) rename voice_servers/{teamspeak_arm64/egg-teamspeak3-ARM64-server.json => teamspeak_ARM64/egg-teamspeak3-arm64-server.json} (100%) diff --git a/README.md b/README.md index a108b65e..be740610 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ If you are reading this it looks like you are looking to add an egg to your serv ## [Voice Servers](/voice_servers) * [Lavalink](/voice_servers/lavalink) -* [Teamspeak_arm64](/voice_servers/teamspeak_arm64) +* [Teamspeak_ARM64](/voice_servers/teamspeak_ARM64) * [TeaSpeak](/voice_servers/teaspeak) * [TS3-Manager](/voice_servers/ts3_manager) diff --git a/voice_servers/teamspeak_arm64/Readme.md b/voice_servers/teamspeak_ARM64/Readme.md similarity index 100% rename from voice_servers/teamspeak_arm64/Readme.md rename to voice_servers/teamspeak_ARM64/Readme.md diff --git a/voice_servers/teamspeak_arm64/egg-teamspeak3-ARM64-server.json b/voice_servers/teamspeak_ARM64/egg-teamspeak3-arm64-server.json similarity index 100% rename from voice_servers/teamspeak_arm64/egg-teamspeak3-ARM64-server.json rename to voice_servers/teamspeak_ARM64/egg-teamspeak3-arm64-server.json From e430bfba6b521768e21d864dee2cdf74f94fde2b Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Wed, 6 Jul 2022 17:11:07 +0200 Subject: [PATCH 0459/1001] fix invalid Json --- .../teamspeak_ARM64/egg-teamspeak3-arm64-server.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/voice_servers/teamspeak_ARM64/egg-teamspeak3-arm64-server.json b/voice_servers/teamspeak_ARM64/egg-teamspeak3-arm64-server.json index df828049..975baecb 100644 --- a/voice_servers/teamspeak_ARM64/egg-teamspeak3-arm64-server.json +++ b/voice_servers/teamspeak_ARM64/egg-teamspeak3-arm64-server.json @@ -4,13 +4,13 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-07-06T09:30:23+02:00", + "exported_at": "2022-07-06T17:10:16+02:00", "name": "Teamspeak3 Server ARM64", "author": "josdekurk@gmail.com", "description": "VoIP software designed with security in mind, featuring crystal clear voice quality, endless customization options, and scalabilty up to thousands of simultaneous users.", "features": null, "docker_images": { - "ARM64": "ghcr.io\/parkervcp\/yolks:box64" + "ghcr.io\/parkervcp\/yolks:box64": "ghcr.io\/parkervcp\/yolks:box64" }, "file_denylist": [], "startup": "box64 .\/ts3server default_voice_port={{SERVER_PORT}} query_port={{QUERY_PORT}} filetransfer_ip=0.0.0.0 filetransfer_port={{FILE_TRANSFER}} license_accepted=1", @@ -59,4 +59,4 @@ "field_type": "text" } ] -} +} \ No newline at end of file From 8ab66a55bbcd7160fb4f747a2c70fc1ac70d565e Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Wed, 6 Jul 2022 17:15:29 +0200 Subject: [PATCH 0460/1001] Create egg-vanilla-bedrock-ARM64.json --- .../bedrock/egg-vanilla-bedrock-ARM64.json | 94 +++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 game_eggs/minecraft/bedrock/bedrock/egg-vanilla-bedrock-ARM64.json diff --git a/game_eggs/minecraft/bedrock/bedrock/egg-vanilla-bedrock-ARM64.json b/game_eggs/minecraft/bedrock/bedrock/egg-vanilla-bedrock-ARM64.json new file mode 100644 index 00000000..30a6633f --- /dev/null +++ b/game_eggs/minecraft/bedrock/bedrock/egg-vanilla-bedrock-ARM64.json @@ -0,0 +1,94 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2022-07-06T17:14:36+02:00", + "name": "Vanilla Bedrock ARM64", + "author": "josdekurk@gmail.com", + "description": "Bedrock Edition (also known as the Bedrock Version, Bedrock Codebase, Bedrock Engine or just Bedrock) refers to the multi-platform family of editions of Minecraft developed by Mojang AB, Microsoft Studios, 4J Studios, and SkyBox Labs. Prior to this term, as the engine originated with Pocket Edition, this entire product family was referred to as \"Pocket Edition\", \"MCPE\", or \"Pocket\/Windows 10 Edition\".", + "features": [ + "pid_limit" + ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:box64": "ghcr.io\/parkervcp\/yolks:box64" + }, + "file_denylist": [], + "startup": "box64 .\/bedrock_server", + "config": { + "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-port\": \"{{server.build.default.port}}\",\r\n \"server-name\": \"{{server.build.env.SERVERNAME}}\",\r\n \"gamemode\": \"{{server.build.env.GAMEMODE}}\",\r\n \"difficulty\": \"{{server.build.env.DIFFICULTY}}\",\r\n \"allow-cheats\": \"{{server.build.env.CHEATS}}\",\r\n \"max-threads\": \"2\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Server started\"\r\n}", + "logs": "{}", + "stop": "stop" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y zip unzip wget curl\r\n\r\nif [ ! -d \/mnt\/server\/ ]; then\r\n mkdir \/mnt\/server\/\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n# Minecraft CDN Akamai blocks script user-agents\r\nRANDVERSION=$(echo $((1 + $RANDOM % 4000)))\r\n\r\nif [ -z \"${BEDROCK_VERSION}\" ] || [ \"${BEDROCK_VERSION}\" == \"latest\" ]; then\r\n echo -e \"\\n Downloading latest Bedrock server\"\r\n curl -L -A \"Mozilla\/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit\/537.36 (KHTML, like Gecko) Chrome\/90.0.$RANDVERSION.212 Safari\/537.36\" -H \"Accept-Language: en\" -H \"Accept-Encoding: gzip, deflate\" -o versions.html.gz https:\/\/www.minecraft.net\/en-us\/download\/server\/bedrock\r\n DOWNLOAD_URL=$(zgrep -o 'https:\/\/minecraft.azureedge.net\/bin-linux\/[^\"]*' versions.html.gz)\r\nelse \r\n echo -e \"\\n Downloading ${BEDROCK_VERSION} Bedrock server\"\r\n DOWNLOAD_URL=https:\/\/minecraft.azureedge.net\/bin-linux\/bedrock-server-$BEDROCK_VERSION.zip\r\nfi\r\n\r\nDOWNLOAD_FILE=$(echo ${DOWNLOAD_URL} | cut -d\"\/\" -f5) # Retrieve archive name\r\n\r\necho -e \"backing up config files\"\r\nrm *.bak versions.html.gz\r\ncp server.properties server.properties.bak\r\ncp permissions.json permissions.json.bak\r\ncp whitelist.json whitelist.json.bak\r\n\r\necho -e \"Downloading files from: $DOWNLOAD_URL\"\r\n\r\ncurl -L -A \"Mozilla\/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit\/537.36 (KHTML, like Gecko) Chrome\/90.0.$RANDVERSION.212 Safari\/537.36\" -H \"Accept-Language: en\" -o $DOWNLOAD_FILE $DOWNLOAD_URL\r\n\r\necho -e \"Unpacking server files\"\r\nunzip -o $DOWNLOAD_FILE\r\n\r\necho -e \"Cleaning up after installing\"\r\nrm $DOWNLOAD_FILE\r\n\r\necho 'emit-server-telemetry=true' >> server.properties\r\n\r\necho -e \"restoring backup config files - on first install there will be file not found errors which you can ignore.\"\r\ncp -rf server.properties.bak server.properties\r\ncp -rf permissions.json.bak permissions.json\r\ncp -rf whitelist.json.bak whitelist.json\r\n\r\nchmod +x bedrock_server\r\n\r\necho -e \"Install Completed\"", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Bedrock Version", + "description": "The version of bedrock. (Ex. 1.7.0.13)\r\n\r\nDefault version is latest.", + "env_variable": "BEDROCK_VERSION", + "default_value": "latest", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20", + "field_type": "text" + }, + { + "name": "ld lib path", + "description": "Dumb reasons to need this", + "env_variable": "LD_LIBRARY_PATH", + "default_value": ".", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:20", + "field_type": "text" + }, + { + "name": "Server Name", + "description": "The name for the server", + "env_variable": "SERVERNAME", + "default_value": "Bedrock Dedicated Server", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:50", + "field_type": "text" + }, + { + "name": "Gamemode", + "description": "Allowed values: \"survival\", \"creative\", or \"adventure\"", + "env_variable": "GAMEMODE", + "default_value": "survival", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:survival,creative,adventure", + "field_type": "text" + }, + { + "name": "Difficulty", + "description": "Allowed values: \"peaceful\", \"easy\", \"normal\", or \"hard\"", + "env_variable": "DIFFICULTY", + "default_value": "easy", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:peaceful,easy,normal,hard", + "field_type": "text" + }, + { + "name": "Allow cheats", + "description": "If true then cheats like commands can be used.\r\n\r\nAllowed values: \"true\" or \"false\"", + "env_variable": "CHEATS", + "default_value": "false", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:true,false", + "field_type": "text" + } + ] +} From 02d4892248a3cef919e3ccfeb3b844b42d7f7d27 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Fri, 8 Jul 2022 15:50:50 +0200 Subject: [PATCH 0461/1001] Update egg-loki.json Update loki to support arm64 --- monitoring/loki/egg-loki.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/monitoring/loki/egg-loki.json b/monitoring/loki/egg-loki.json index 04ee7e0a..204bd959 100644 --- a/monitoring/loki/egg-loki.json +++ b/monitoring/loki/egg-loki.json @@ -4,16 +4,16 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-07-03T17:40:29-04:00", + "exported_at": "2022-07-08T15:50:16+02:00", "name": "Loki", "author": "unknown@unknown.com", "description": "Prometheus but for logs. This egg is for Loki instance only! You usually need pushing agents like Promtail to put logs in this", "features": null, "docker_images": { - "ghcr.io\/pterodactyl\/yolks:debian": "ghcr.io\/pterodactyl\/yolks:debian" + "ghcr.io\/parkervcp\/yolks:debian": "ghcr.io\/parkervcp\/yolks:debian" }, "file_denylist": [], - "startup": ".\/loki-linux-amd64 -config.file=loki-docker-config.yaml", + "startup": ".\/loki-linux -config.file=loki-docker-config.yaml", "config": { "files": "{\r\n \"loki-docker-config.yaml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"server.http_listen_port\": \"{{server.build.default.port}}\",\r\n \"common.ring.instance_addr\": \"0.0.0.0\",\r\n \"common.path_prefix\": \"\/home\/container\/loki\",\r\n \"common.storage.filesystem.chunks_directory\": \"\/home\/container\/loki\/chunks\",\r\n \"common.storage.filesystem.rules_directory\": \"\/home\/container\/loki\/rules\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Loki started\"\r\n}", @@ -22,8 +22,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Switch to mounted working install directory\r\ncd \/mnt\/server\r\n\r\n# Download and extract Loki\r\n\r\nif [ \"$LOKI_VERSION\" = \"latest\" ]; then LOKI_VERSION=$(curl --silent \"https:\/\/api.github.com\/repos\/grafana\/loki\/releases\/latest\" | grep '\"tag_name\":' | sed -E 's\/.*\"([^\"]+)\".*\/\\1\/' | cut -c2-); fi\r\necho -e \"running curl -L https:\/\/github.com\/grafana\/loki\/releases\/download\/v${LOKI_VERSION}\/loki-linux-amd64.zip --output loki-linux-amd64.zip\"\r\ncurl -L https:\/\/github.com\/grafana\/loki\/releases\/download\/v${LOKI_VERSION}\/loki-linux-amd64.zip --output loki-linux-amd64.zip\r\nunzip loki-linux-amd64.zip\r\nrm -rf loki-linux-amd64.zip\r\ncurl -L https:\/\/raw.githubusercontent.com\/grafana\/loki\/v${LOKI_VERSION}\/cmd\/loki\/loki-docker-config.yaml --output loki-docker-config.yaml\r\necho -e \"installation completed\"", - "container": "ghcr.io\/parkervcp\/installers:debian", + "script": "#!\/bin\/bash\r\n# Switch to mounted working install directory\r\ncd \/mnt\/server\r\n\r\napt update\r\napt install -y zip unzip wget curl git file\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"amd64\" || echo \"arm64\")\r\n# Download and extract Loki\r\n\r\nif [ \"$LOKI_VERSION\" = \"latest\" ]; then LOKI_VERSION=$(curl --silent \"https:\/\/api.github.com\/repos\/grafana\/loki\/releases\/latest\" | grep '\"tag_name\":' | sed -E 's\/.*\"([^\"]+)\".*\/\\1\/' | cut -c2-); fi\r\necho -e \"running curl -L https:\/\/github.com\/grafana\/loki\/releases\/download\/v${LOKI_VERSION}\/loki-linux-${ARCH}.zip --output loki-linux-amd64.zip\"\r\ncurl -L https:\/\/github.com\/grafana\/loki\/releases\/download\/v${LOKI_VERSION}\/loki-linux-${ARCH}.zip --output loki-linux-${ARCH}.zip\r\nunzip loki-linux-${ARCH}.zip\r\nrm -rf loki-linux-${ARCH}.zip\r\ncurl -L https:\/\/raw.githubusercontent.com\/grafana\/loki\/v${LOKI_VERSION}\/cmd\/loki\/loki-docker-config.yaml --output loki-docker-config.yaml\r\nmv loki-linux-* loki-linux\r\necho -e \"installation completed\"", + "container": "ghcr.io\/pterodactyl\/installers:debian", "entrypoint": "bash" } }, @@ -39,4 +39,4 @@ "field_type": "text" } ] -} \ No newline at end of file +} From a7efc8983aca7ae9a9554b124da017278f44b0d1 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Fri, 8 Jul 2022 15:59:28 +0200 Subject: [PATCH 0462/1001] Update prometheus to support ARM64 --- monitoring/prometheus/egg-prometheus.json | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/monitoring/prometheus/egg-prometheus.json b/monitoring/prometheus/egg-prometheus.json index 3376353b..54bd4f85 100644 --- a/monitoring/prometheus/egg-prometheus.json +++ b/monitoring/prometheus/egg-prometheus.json @@ -1,17 +1,17 @@ { "_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-01-22T05:45:16-05:00", + "exported_at": "2022-07-08T15:58:56+02:00", "name": "Prometheus", "author": "p.zarrad@outlook.de", "description": "The Prometheus monitoring system and time series database.", "features": null, - "images": [ - "ghcr.io\/parkervcp\/yolks:debian" - ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:debian": "ghcr.io\/parkervcp\/yolks:debian" + }, "file_denylist": [], "startup": ".\/prometheus --web.listen-address=0.0.0.0:{{SERVER_PORT}} --config.file=\/home\/container\/prometheus.yml --storage.tsdb.path=\/home\/container\/data --web.console.templates=\/home\/container\/consoles --web.console.libraries=\/home\/container\/console_libraries --web.config.file=\/home\/container\/prometheus.web.yml", "config": { @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/sh\r\nshopt -s extglob\r\n# Switch to mounted directory\r\ncd \/mnt\/server\r\n# Update installation system and install curl\r\napt-get update\r\napt-get install -y curl\r\n# Cleanup previous install if available\r\nif [ -f \"prometheus.yml\" ]; then mv prometheus.yml prometheus.yml.bak; fi\r\nif [ -f \"prometheus.web.yml\" ]; then mv prometheus.web.yml prometheus.web.yml.bak; fi\r\nrm -rfv !(data|prometheus.yml.bak|prometheus.web.yml.bak)\r\n# Download and extract Prometheus\r\nversion=${PROMETHEUS_VERSION}\r\nif [ \"$version\" = \"latest\" ]; then version=$(curl --silent \"https:\/\/api.github.com\/repos\/prometheus\/prometheus\/releases\/latest\" | grep '\"tag_name\":' | sed -E 's\/.*\"([^\"]+)\".*\/\\1\/' | cut -c2-); fi\r\ncurl -L https:\/\/github.com\/prometheus\/prometheus\/releases\/download\/v${version}\/prometheus-${version}.linux-amd64.tar.gz --output prometheus.tar.gz\r\ntar -zxvf prometheus.tar.gz\r\nmv -n prometheus-*\/* .\/\r\nrm -rf prometheus.tar.gz prometheus-*\/\r\n# Restore configuration if necessary\r\nif [ -f \"prometheus.yml.bak\" ]; then rm -rf prometheus.yml && mv prometheus.yml.bak prometheus.yml && rm -rf prometheus.yml.bak; fi\r\nif [ -f \"prometheus.web.yml.bak\" ]; then rm -rf prometheus.web.yml && mv prometheus.web.yml.bak prometheus.web.yml && rm -rf prometheus.web.yml.bak; fi\r\n# Create dummy prometheus.web.yml as a placeholder\r\nif [ ! -f \"prometheus.web.yml\" ]; then touch prometheus.web.yml; fi", + "script": "#!\/bin\/sh\r\nshopt -s extglob\r\n# Switch to mounted directory\r\ncd \/mnt\/server\r\n# Update installation system and install curl\r\napt-get update\r\napt-get install -y curl\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"amd64\" || echo \"arm64\")\r\n# Cleanup previous install if available\r\nif [ -f \"prometheus.yml\" ]; then mv prometheus.yml prometheus.yml.bak; fi\r\nif [ -f \"prometheus.web.yml\" ]; then mv prometheus.web.yml prometheus.web.yml.bak; fi\r\nrm -rfv !(data|prometheus.yml.bak|prometheus.web.yml.bak)\r\n# Download and extract Prometheus\r\nversion=${PROMETHEUS_VERSION}\r\nif [ \"$version\" = \"latest\" ]; then version=$(curl --silent \"https:\/\/api.github.com\/repos\/prometheus\/prometheus\/releases\/latest\" | grep '\"tag_name\":' | sed -E 's\/.*\"([^\"]+)\".*\/\\1\/' | cut -c2-); fi\r\ncurl -L https:\/\/github.com\/prometheus\/prometheus\/releases\/download\/v${version}\/prometheus-${version}.linux-${ARCH}.tar.gz --output prometheus.tar.gz\r\ntar -zxvf prometheus.tar.gz\r\nmv -n prometheus-*\/* .\/\r\nrm -rf prometheus.tar.gz prometheus-*\/\r\n# Restore configuration if necessary\r\nif [ -f \"prometheus.yml.bak\" ]; then rm -rf prometheus.yml && mv prometheus.yml.bak prometheus.yml && rm -rf prometheus.yml.bak; fi\r\nif [ -f \"prometheus.web.yml.bak\" ]; then rm -rf prometheus.web.yml && mv prometheus.web.yml.bak prometheus.web.yml && rm -rf prometheus.web.yml.bak; fi\r\n# Create dummy prometheus.web.yml as a placeholder\r\nif [ ! -f \"prometheus.web.yml\" ]; then touch prometheus.web.yml; fi", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -35,7 +35,8 @@ "default_value": "latest", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" } ] } From 4ba86c9f15343e5af704525dadc0292bef2d4c8c Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Fri, 8 Jul 2022 16:16:37 +0200 Subject: [PATCH 0463/1001] Update Minio to support ARM and move to debian images --- storage/minio/egg-minio-s3.json | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/storage/minio/egg-minio-s3.json b/storage/minio/egg-minio-s3.json index 9ef0e0cf..7358c5fb 100644 --- a/storage/minio/egg-minio-s3.json +++ b/storage/minio/egg-minio-s3.json @@ -1,27 +1,28 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1", + "version": "PTDL_v2", "update_url": null }, - "exported_at": "2021-01-11T15:35:14-05:00", + "exported_at": "2022-07-08T16:16:10+02:00", "name": "Minio S3", "author": "accounts@bofanodes.io", "description": "MinIO is a cloud storage server compatible with Amazon S3, released under Apache License v2. As an object store, MinIO can store unstructured data such as photos, videos, log files, backups and container images. The maximum size of an object is 5TB.", "features": null, - "images": [ - "quay.io\/parkervcp\/pterodactyl-images:ubuntu" - ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:debian": "ghcr.io\/parkervcp\/yolks:debian" + }, + "file_denylist": [], "startup": ".\/minio.sh", "config": { "files": "{}", "startup": "{\r\n \"done\": \"guide\"\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "logs": "{}", "stop": "^C" }, "scripts": { "installation": { - "script": "#\r\n#\r\napt update\r\napt install -y wget\r\ncd \/mnt\/server\r\nwget https:\/\/dl.min.io\/server\/minio\/release\/linux-amd64\/minio\r\nchmod +x minio\r\nmkdir data\r\nmkdir keys\r\n\r\nwget https:\/\/github.com\/\/parkervcp\/eggs\/raw\/master\/storage\/minio\/minio.sh\r\nchmod +x minio.sh\r\nexport MINIO_ACCESS_KEY=$(cat \/dev\/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)\r\necho $MINIO_ACCESS_KEY > keys\/key.txt\r\nexport MINIO_SECRET_KEY=$(cat \/dev\/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)\r\necho $MINIO_SECRET_KEY > keys\/secret.txt\r\necho done", + "script": "#!\/bin\/bash\r\n#\r\napt update\r\napt install -y wget\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"amd64\" || echo \"arm64\")\r\ncd \/mnt\/server\r\nwget https:\/\/dl.min.io\/server\/minio\/release\/linux-${ARCH}\/minio\r\nchmod +x minio\r\nmkdir data\r\nmkdir keys\r\n\r\nwget https:\/\/github.com\/\/parkervcp\/eggs\/raw\/master\/storage\/minio\/minio.sh\r\nchmod +x minio.sh\r\nexport MINIO_ACCESS_KEY=$(cat \/dev\/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)\r\necho $MINIO_ACCESS_KEY > keys\/key.txt\r\nexport MINIO_SECRET_KEY=$(cat \/dev\/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)\r\necho $MINIO_SECRET_KEY > keys\/secret.txt\r\necho done", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -34,7 +35,8 @@ "default_value": "normal", "user_viewable": true, "user_editable": true, - "rules": "required|string|in:normal,rotate,update" + "rules": "required|string|in:normal,rotate,update", + "field_type": "text" } ] } From 49dc623e1eb109fb7f4bd0423def4138b80860e1 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Fri, 8 Jul 2022 16:21:08 +0200 Subject: [PATCH 0464/1001] Update minio.sh to support ARM64 --- storage/minio/minio.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/storage/minio/minio.sh b/storage/minio/minio.sh index 9460824b..473cc9f0 100644 --- a/storage/minio/minio.sh +++ b/storage/minio/minio.sh @@ -42,7 +42,8 @@ echo "$(tput setaf 3)Performing update...." echo "$(tput setaf 1)Removing old minio version" rm minio echo "$(tput setaf 3)Downloading new minio version" -wget https://dl.min.io/server/minio/release/linux-amd64/minio +export ARCH=$([[ "$(uname -m)" == "x86_64" ]] && echo "amd64" || echo "arm64") +wget https://dl.min.io/server/minio/release/linux-$ARCH/minio chmod +x minio echo "$(tput setaf 2)Update Complete" fi From f0e333dcc0e421df6a2090605e85cb850f7c6a81 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Mon, 11 Jul 2022 13:19:40 +0200 Subject: [PATCH 0465/1001] update redis to new image --- .../{egg-redis.json => egg-redis-5.json} | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) rename database/redis/redis-5/{egg-redis.json => egg-redis-5.json} (78%) diff --git a/database/redis/redis-5/egg-redis.json b/database/redis/redis-5/egg-redis-5.json similarity index 78% rename from database/redis/redis-5/egg-redis.json rename to database/redis/redis-5/egg-redis-5.json index 6ac93d66..440ace5f 100644 --- a/database/redis/redis-5/egg-redis.json +++ b/database/redis/redis-5/egg-redis-5.json @@ -1,13 +1,18 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v2", + "update_url": null }, - "exported_at": "2020-03-04T11:05:29-05:00", + "exported_at": "2022-07-11T13:17:43+02:00", "name": "Redis", "author": "parker@parkervcp.com", "description": "Redis is an open source (BSD licensed), in-memory data structure store, used as a database, cache and message broker. It supports data structures such as strings, hashes, lists, sets, sorted sets with range queries, bitmaps, hyperloglogs, geospatial indexes with radius queries and streams.", - "image": "quay.io\/parkervcp\/pterodactyl-images:db_redis", + "features": null, + "docker_images": { + "ghcr.io\/parkervcp\/yolks:redis_5": "ghcr.io\/parkervcp\/yolks:redis_5" + }, + "file_denylist": [], "startup": "redis-server --bind 0.0.0.0 --port {{SERVER_PORT}} --requirepass {{SERVER_PASSWORD}} --maxmemory {{SERVER_MEMORY}}mb --daemonize yes && redis-cli -p {{SERVER_PORT}} -a {{SERVER_PASSWORD}} && redis-cli -p {{SERVER_PORT}} -a {{SERVER_PASSWORD}} shutdown save", "config": { "files": "{}", @@ -28,9 +33,10 @@ "description": "The password redis should use to secure the server.", "env_variable": "SERVER_PASSWORD", "default_value": "P@55w0rd", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string" + "user_viewable": true, + "user_editable": true, + "rules": "required|string", + "field_type": "text" } ] -} \ No newline at end of file +} From afc767e7e4d2cd8daa43f0295061b569b7d2f923 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Mon, 11 Jul 2022 13:20:41 +0200 Subject: [PATCH 0466/1001] Update egg-redis-6.json --- database/redis/redis-6/egg-redis-6.json | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/database/redis/redis-6/egg-redis-6.json b/database/redis/redis-6/egg-redis-6.json index d82fcb0e..ead0ed28 100644 --- a/database/redis/redis-6/egg-redis-6.json +++ b/database/redis/redis-6/egg-redis-6.json @@ -1,13 +1,18 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v2", + "update_url": null }, - "exported_at": "2020-09-28T21:07:40-04:00", + "exported_at": "2022-07-11T13:18:27+02:00", "name": "Redis-6", "author": "parker@parkervcp.com", "description": "Redis is an open source (BSD licensed), in-memory data structure store, used as a database, cache and message broker. It supports data structures such as strings, hashes, lists, sets, sorted sets with range queries, bitmaps, hyperloglogs, geospatial indexes with radius queries and streams.", - "image": "quay.io\/parkervcp\/pterodactyl-images:db_redis-6", + "features": null, + "docker_images": { + "ghcr.io\/parkervcp\/yolks:redis_6": "ghcr.io\/parkervcp\/yolks:redis_6" + }, + "file_denylist": [], "startup": "\/usr\/local\/bin\/redis-server \/home\/container\/redis.conf --save 60 1 --dir \/home\/container\/ --bind 0.0.0.0 --port {{SERVER_PORT}} --requirepass {{SERVER_PASSWORD}} --maxmemory {{SERVER_MEMORY}}mb --daemonize yes && redis-cli -p {{SERVER_PORT}} -a {{SERVER_PASSWORD}}; redis-cli -p {{SERVER_PORT}} -a {{SERVER_PASSWORD}} shutdown save", "config": { "files": "{}", @@ -28,9 +33,10 @@ "description": "The password redis should use to secure the server.", "env_variable": "SERVER_PASSWORD", "default_value": "P@55w0rd", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string" + "user_viewable": true, + "user_editable": true, + "rules": "required|string", + "field_type": "text" } ] -} \ No newline at end of file +} From b8cfdf2bff69532cc2e3146ceab7ff32a9e10c06 Mon Sep 17 00:00:00 2001 From: Yamiru Date: Sun, 17 Jul 2022 07:29:56 +0200 Subject: [PATCH 0467/1001] info --- game_eggs/steamcmd_servers/black_mesa/README.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 game_eggs/steamcmd_servers/black_mesa/README.md diff --git a/game_eggs/steamcmd_servers/black_mesa/README.md b/game_eggs/steamcmd_servers/black_mesa/README.md new file mode 100644 index 00000000..3a1e3980 --- /dev/null +++ b/game_eggs/steamcmd_servers/black_mesa/README.md @@ -0,0 +1,17 @@ +# Black Mesa + +## From their [Website](https://www.crowbarcollective.com/games/black-mesa) + +Black Mesa is a 2020 first-person shooter game. It is a third-party remake of Half-Life (1998) made in the Source game engine. + +## Server Ports + +BlackMessa servers require 2 ports to be open, the SourceTV port can also be opened for spectators. + +| Port | default | +|-----------|---------| +| Game/rcon | 27015 | +| SourceTV | 27020 | +| ClientPort | 27005 | + +## Steam Download [SteamStore](https://store.steampowered.com/app/362890/Black_Mesa/) From fc73b9dbf6f19df426e6b605d327c01ed928293a Mon Sep 17 00:00:00 2001 From: Yamiru Date: Sun, 17 Jul 2022 07:30:18 +0200 Subject: [PATCH 0468/1001] Black Mesa --- .../black_mesa/egg-black-mesa.json | 92 +++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 game_eggs/steamcmd_servers/black_mesa/egg-black-mesa.json diff --git a/game_eggs/steamcmd_servers/black_mesa/egg-black-mesa.json b/game_eggs/steamcmd_servers/black_mesa/egg-black-mesa.json new file mode 100644 index 00000000..8d2dfdbc --- /dev/null +++ b/game_eggs/steamcmd_servers/black_mesa/egg-black-mesa.json @@ -0,0 +1,92 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2022-07-17T07:02:24+02:00", + "name": "Black Mesa", + "author": "yamiru@yamiru.com", + "description": "Black Mesa is a 2020 first-person shooter game. It is a third-party remake of Half-Life (1998) made in the Source game engine.", + "features": null, + "docker_images": { + "quay.io\/pterodactyl\/core:source": "quay.io\/pterodactyl\/core:source" + }, + "file_denylist": [], + "startup": ".\/srcds_run -game {{SRCDS_GAME}} -strictportbind -ip 0.0.0.0 -port {{SERVER_PORT}} +clientport {{SRCDS_CPORT}} +tv_port {{SRCDS_STV}} +map {{SRCDS_MAP}} +servercfgfile server.cfg -maxplayers {{MAX_PLAYERS}}", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"gameserver Steam ID\"\r\n}", + "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "stop": "quit" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id ffound here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# EXTRA_FLAGS - when a server has extra glas for things like beta installs or updates.\r\n#\r\n##\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Game ID", + "description": "nmrih id", + "env_variable": "SRCDS_APPID", + "default_value": "346680", + "user_viewable": true, + "user_editable": false, + "rules": "required|string|max:20", + "field_type": "text" + }, + { + "name": "Game Name", + "description": "game name", + "env_variable": "SRCDS_GAME", + "default_value": "bms", + "user_viewable": true, + "user_editable": false, + "rules": "required|string|max:20", + "field_type": "text" + }, + { + "name": "Default Map", + "description": "default map", + "env_variable": "SRCDS_MAP", + "default_value": "dm_crossfire", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:25", + "field_type": "text" + }, + { + "name": "Client port", + "description": "client port", + "env_variable": "SRCDS_CPORT", + "default_value": "27005", + "user_viewable": true, + "user_editable": false, + "rules": "required|regex:\/^(\\w{1,20})$\/", + "field_type": "text" + }, + { + "name": "Source TV", + "description": "source TV", + "env_variable": "SRCDS_STV", + "default_value": "27020", + "user_viewable": true, + "user_editable": false, + "rules": "required|string|max:20", + "field_type": "text" + }, + { + "name": "Max Players", + "description": "The maximum amount of players allowed on your game server.", + "env_variable": "MAX_PLAYERS", + "default_value": "32", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|max:128", + "field_type": "text" + } + ] +} \ No newline at end of file From e4759cda41048875488a3747a974163ce3c0ab88 Mon Sep 17 00:00:00 2001 From: Yamiru Date: Sun, 17 Jul 2022 07:33:17 +0200 Subject: [PATCH 0469/1001] added Black mesa --- game_eggs/steamcmd_servers/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/game_eggs/steamcmd_servers/README.md b/game_eggs/steamcmd_servers/README.md index d6085c8a..58afb14b 100644 --- a/game_eggs/steamcmd_servers/README.md +++ b/game_eggs/steamcmd_servers/README.md @@ -28,6 +28,10 @@ This is a collection of servers that use SteamCMD to install. [Barotrauma](barotrauma) +## Black Mesa + +[Black Mesa](black_mesa) + ## Citadel: Forged with Fire [citadel](citadel) From b99103906d60b56b94f6e3a90731b294cd43a803 Mon Sep 17 00:00:00 2001 From: Yamiru Date: Sun, 17 Jul 2022 07:34:33 +0200 Subject: [PATCH 0470/1001] added black mesa --- game_eggs/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/game_eggs/README.md b/game_eggs/README.md index 1a62e6e1..5f3aa6c0 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -112,6 +112,7 @@ * [Assetto Corsa](steamcmd_servers/assetto_corsa) * [Avorion](steamcmd_servers/avorion) * [Barotrauma](steamcmd_servers/barotrauma) +* [Black Mesa](steamcmd_servers/black_mesa) * [Citadel: Forged with Fire](steamcmd_servers/citadel) * [Conan Exiles](steamcmd_servers/conan_exiles) * [CryoFall](steamcmd_servers/cryofall) From 48e8e905da01a5c80fbaf20e928c7d1963c9dbd9 Mon Sep 17 00:00:00 2001 From: Yamiru Date: Sun, 17 Jul 2022 07:35:11 +0200 Subject: [PATCH 0471/1001] added Black Mesa --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cd0ac048..9896a1c4 100644 --- a/README.md +++ b/README.md @@ -194,6 +194,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Assetto Corsa](game_eggs/steamcmd_servers/assetto_corsa) * [Avorion](game_eggs/steamcmd_servers/avorion) * [Barotrauma](game_eggs/steamcmd_servers/barotrauma) +* [Black Mesa](game_eggs/steamcmd_servers/black_mesa) * [Citadel: Forged with Fire](game_eggs/steamcmd_servers/citadel) * [Conan Exiles](game_eggs/steamcmd_servers/conan_exiles) * [Craftopia](game_eggs/steamcmd_servers/craftopia) From 892b3659479b7e8a89b6bdc5514d461cdb01ae13 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 17 Jul 2022 02:01:26 -0400 Subject: [PATCH 0472/1001] default fivem to recommended still support latest --- game_eggs/gta/fivem/egg-five-m.json | 42 +++++++++++++++++------------ 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/game_eggs/gta/fivem/egg-five-m.json b/game_eggs/gta/fivem/egg-five-m.json index 142588eb..b49f0fe1 100644 --- a/game_eggs/gta/fivem/egg-five-m.json +++ b/game_eggs/gta/fivem/egg-five-m.json @@ -1,17 +1,17 @@ { "_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-01-11T10:14:56-05:00", + "exported_at": "2022-07-17T01:59:57-04:00", "name": "FiveM", "author": "parker@parkervcp.com", "description": "A new FiveM egg for the latest builds due to recent changes in FiveM", "features": null, - "images": [ - "quay.io\/parkervcp\/pterodactyl-images:base_debian" - ], + "docker_images": { + "quay.io\/parkervcp\/pterodactyl-images:base_debian": "quay.io\/parkervcp\/pterodactyl-images:base_debian" + }, "file_denylist": [], "startup": "$(pwd)\/alpine\/opt\/cfx-server\/ld-musl-x86_64.so.1 --library-path \"$(pwd)\/alpine\/usr\/lib\/v8\/:$(pwd)\/alpine\/lib\/:$(pwd)\/alpine\/usr\/lib\/\" -- $(pwd)\/alpine\/opt\/cfx-server\/FXServer +set citizen_dir $(pwd)\/alpine\/opt\/cfx-server\/citizen\/ +set sv_licenseKey {{FIVEM_LICENSE}} +set steam_webApiKey {{STEAM_WEBAPIKEY}} +set sv_maxplayers {{MAX_PLAYERS}} +set serverProfile default +set txAdminPort {{TXADMIN_PORT}} $( [ \"$TXADMIN_ENABLE\" == \"1\" ] || printf %s '+exec server.cfg' )", "config": { @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# FiveM Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update -y\r\napt install -y tar xz-utils curl git file jq\r\n\r\nmkdir -p \/mnt\/server\/resources\r\n\r\ncd \/mnt\/server\r\n\r\necho \"updating citizenfx resource files\"\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/tmp\r\ncp -Rf \/tmp\/resources\/* resources\/\r\n\r\nRELEASE_PAGE=$(curl -sSL https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/)\r\nCHANGELOGS_PAGE=$(curl -sSL https:\/\/changelogs-live.fivem.net\/api\/changelog\/versions\/linux\/server)\r\n\r\nif [[ \"${FIVEM_VERSION}\" == \"latest\" ]] || [[ -z ${FIVEM_VERSION} ]]; then\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.latest_download')\r\nelse\r\n VERSION_LINK=$(echo -e \"${RELEASE_PAGE}\" | grep -Eo '\".*\/*.tar.xz\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | sed 's\/\\.\\\/\/\/1' | grep ${CFX_VERSION})\r\n if [[ \"${VERSION_LINK}\" == \"\" ]]; then\r\n echo -e \"defaulting to latest as the version requested was invalid.\"\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.latest_download')\r\n else\r\n DOWNLOAD_LINK=$(echo https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${VERSION_LINK})\r\n fi\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else\r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\necho -e \"Running curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\"\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho \"Extracting fivem files\"\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"XZ\" ]; then\r\n tar xvf ${DOWNLOAD_LINK##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exiting\"\r\n exit 2\r\nfi\r\n\r\nrm -rf ${DOWNLOAD_LINK##*\/} run.sh\r\n\r\nif [ -e server.cfg ]; then\r\n echo \"Skipping downloading default server config file as one already exists\"\r\nelse\r\n echo \"Downloading default fivem config\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/gta\/fivem\/server.cfg >>server.cfg\r\nfi\r\n\r\nmkdir -p logs\/\r\n\r\necho \"install complete\"", + "script": "#!\/bin\/ash\r\n# FiveM Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update -y\r\napt install -y tar xz-utils curl git file jq\r\n\r\nmkdir -p \/mnt\/server\/resources\r\n\r\ncd \/mnt\/server\r\n\r\necho \"updating citizenfx resource files\"\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/tmp\r\ncp -Rf \/tmp\/resources\/* resources\/\r\n\r\nRELEASE_PAGE=$(curl -sSL https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/)\r\nCHANGELOGS_PAGE=$(curl -sSL https:\/\/changelogs-live.fivem.net\/api\/changelog\/versions\/linux\/server)\r\n\r\nif [[ \"${FIVEM_VERSION}\" == \"recommended\" ]] || [[ -z ${FIVEM_VERSION} ]]; then\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.recommended_download')\r\nelif [[ \"${FIVEM_VERSION}\" == \"latest\" ]]; then\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.latest_download')\r\nelse\r\n VERSION_LINK=$(echo -e \"${RELEASE_PAGE}\" | grep -Eo '\".*\/*.tar.xz\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | sed 's\/\\.\\\/\/\/1' | grep ${CFX_VERSION})\r\n if [[ \"${VERSION_LINK}\" == \"\" ]]; then\r\n echo -e \"defaulting to recommedned as the version requested was invalid.\"\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.recommended_download')\r\n else\r\n DOWNLOAD_LINK=$(echo https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${VERSION_LINK})\r\n fi\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else\r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\necho -e \"Running curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\"\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho \"Extracting fivem files\"\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"XZ\" ]; then\r\n tar xvf ${DOWNLOAD_LINK##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exiting\"\r\n exit 2\r\nfi\r\n\r\nrm -rf ${DOWNLOAD_LINK##*\/} run.sh\r\n\r\nif [ -e server.cfg ]; then\r\n echo \"Skipping downloading default server config file as one already exists\"\r\nelse\r\n echo \"Downloading default fivem config\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/gta\/fivem\/server.cfg >>server.cfg\r\nfi\r\n\r\nmkdir -p logs\/\r\n\r\necho \"install complete\"", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -35,7 +35,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:33" + "rules": "required|string|max:33", + "field_type": "text" }, { "name": "Max Players", @@ -44,7 +45,8 @@ "default_value": "48", "user_viewable": true, "user_editable": false, - "rules": "required|integer|between:1,48" + "rules": "required|integer|between:1,48", + "field_type": "text" }, { "name": "Server Hostname", @@ -53,16 +55,18 @@ "default_value": "My new FXServer!", "user_viewable": true, "user_editable": true, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" }, { "name": "fivem version", - "description": "The fivem version that is to be installed. Invalid versions will default to latest.\r\n\r\nAn example is `1383-e5ea040353ce1b8bc86e37982bf5d888938e3096`\r\n\r\nYou can get the latest version from here - https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/", + "description": "The fivem version that is to be installed. Invalid versions will default to recommended.\r\n\r\nAn example is `1383-e5ea040353ce1b8bc86e37982bf5d888938e3096`\r\n\r\nYou can get the latest version from here - https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/", "env_variable": "FIVEM_VERSION", - "default_value": "latest", + "default_value": "recommended", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:50" + "rules": "required|string|max:50", + "field_type": "text" }, { "name": "Download Link", @@ -71,7 +75,8 @@ "default_value": "", "user_viewable": false, "user_editable": false, - "rules": "string|nullable" + "rules": "string|nullable", + "field_type": "text" }, { "name": "Steam Web Api Key", @@ -80,7 +85,8 @@ "default_value": "none", "user_viewable": true, "user_editable": true, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" }, { "name": "txAdmin Port", @@ -89,7 +95,8 @@ "default_value": "40120", "user_viewable": true, "user_editable": false, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" }, { "name": "Enable txadmin", @@ -98,7 +105,8 @@ "default_value": "0", "user_viewable": true, "user_editable": true, - "rules": "required|boolean" + "rules": "required|boolean", + "field_type": "text" } ] -} +} \ No newline at end of file From 3e2ff1c205ad19b9eac71097d121610e5a25df08 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 17 Jul 2022 02:17:24 -0400 Subject: [PATCH 0473/1001] update image and log config --- game_eggs/gta/fivem/egg-five-m.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/gta/fivem/egg-five-m.json b/game_eggs/gta/fivem/egg-five-m.json index b49f0fe1..2f13b6e8 100644 --- a/game_eggs/gta/fivem/egg-five-m.json +++ b/game_eggs/gta/fivem/egg-five-m.json @@ -4,20 +4,20 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-07-17T01:59:57-04:00", + "exported_at": "2022-07-17T02:16:42-04:00", "name": "FiveM", "author": "parker@parkervcp.com", "description": "A new FiveM egg for the latest builds due to recent changes in FiveM", "features": null, "docker_images": { - "quay.io\/parkervcp\/pterodactyl-images:base_debian": "quay.io\/parkervcp\/pterodactyl-images:base_debian" + "ghcr.io\/parkervcp\/yolks:debian": "ghcr.io\/parkervcp\/yolks:debian" }, "file_denylist": [], "startup": "$(pwd)\/alpine\/opt\/cfx-server\/ld-musl-x86_64.so.1 --library-path \"$(pwd)\/alpine\/usr\/lib\/v8\/:$(pwd)\/alpine\/lib\/:$(pwd)\/alpine\/usr\/lib\/\" -- $(pwd)\/alpine\/opt\/cfx-server\/FXServer +set citizen_dir $(pwd)\/alpine\/opt\/cfx-server\/citizen\/ +set sv_licenseKey {{FIVEM_LICENSE}} +set steam_webApiKey {{STEAM_WEBAPIKEY}} +set sv_maxplayers {{MAX_PLAYERS}} +set serverProfile default +set txAdminPort {{TXADMIN_PORT}} $( [ \"$TXADMIN_ENABLE\" == \"1\" ] || printf %s '+exec server.cfg' )", "config": { "files": "{\r\n \"server.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"endpoint_add_tcp\": \"endpoint_add_tcp \\\"0.0.0.0:{{server.build.default.port}}\\\"\",\r\n \"endpoint_add_udp\": \"endpoint_add_udp \\\"0.0.0.0:{{server.build.default.port}}\\\"\",\r\n \"sv_hostname\": \"sv_hostname \\\"{{server.build.env.SERVER_HOSTNAME}}\\\"\",\r\n \"set sv_licenseKey\": \"set sv_licenseKey {{server.build.env.FIVEM_LICENSE}}\",\r\n \"set steam_webApiKey\": \"set steam_webApiKey {{server.build.env.STEAM_WEBAPIKEY}}\",\r\n \"sv_maxclients\": \"sv_maxclients {{server.build.env.MAX_PLAYERS}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"succeeded. Welcome!\"\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "logs": "{}", "stop": "quit" }, "scripts": { From 2cec3f5cf747a6439a25538f750ab72dde6d53b5 Mon Sep 17 00:00:00 2001 From: Enozi <54645039+enozii@users.noreply.github.com> Date: Mon, 18 Jul 2022 08:17:04 +0200 Subject: [PATCH 0474/1001] Update egg-the-isle.json Updated to work with Update 5 --- .../the_isle/egg-the-isle.json | 55 +++++++++++-------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/game_eggs/steamcmd_servers/the_isle/egg-the-isle.json b/game_eggs/steamcmd_servers/the_isle/egg-the-isle.json index 3459b86b..5de38e6d 100644 --- a/game_eggs/steamcmd_servers/the_isle/egg-the-isle.json +++ b/game_eggs/steamcmd_servers/the_isle/egg-the-isle.json @@ -1,28 +1,28 @@ { "_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-05-17T00:10:05+02:00", + "exported_at": "2022-07-18T08:05:28+02:00", "name": "The Isle", "author": "fredrik.johansenfuun@gmail.com", "description": "The Isle is an open beta with an open-world survival game where players choose from three factions in an attempt to survive a fierce island. Hunt. Prey. Survive.", "features": null, - "images": [ - "ghcr.io\/parkervcp\/games:source" - ], + "docker_images": { + "ghcr.io\/parkervcp\/games:source": "ghcr.io\/parkervcp\/games:source" + }, "file_denylist": [], - "startup": "\/home\/container\/steamcmd\/steamcmd.sh +force_install_dir \/home\/container +login Anonymous +app_update 412680 -beta evrima +quit && \/home\/container\/TheIsle\/Binaries\/Linux\/TheIsleServer-Linux-Shipping -Port=$SERVER_PORT -QueryPort=$QUERY_PORT", + "startup": "\/home\/container\/steamcmd\/steamcmd.sh +force_install_dir \/home\/container +login Anonymous +app_update 412680 -beta evrima +quit && \/home\/container\/TheIsle\/Binaries\/Linux\/TheIsleServer-Linux-Shipping -Port=$SERVER_PORT -ini:Engine:[EpicOnlineServices]:DedicatedServerClientId=xyza7891gk5PRo3J7G9puCJGFJjmEguW -ini:Engine:[EpicOnlineServices]:DedicatedServerClientSecret=pKWl6t5i9NJK8gTpVlAxzENZ65P8hYzodV8Dqe5Rlc8", "config": { - "files": "{\r\n \"\/TheIsle\/Saved\/Config\/LinuxServer\/Game.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"ServerName\": \"ServerName={{server.build.env.SERVER_NAME}}\",\r\n \"MaxPlayerCount\": \"MaxPlayerCount={{server.build.env.PLAYER_COUNT}}\",\r\n \"MaxPlayers\": \"MaxPlayers={{server.build.env.PLAYER_COUNT}}\",\r\n \"RconEnabled\": \"RconEnabled={{server.build.env.RCON}}\",\r\n \"RconPort\": \"RconPort={{server.build.env.RCON_PORT}}\",\r\n \"RconPassword\": \"RconPassword={{server.build.env.RCON_PASSWORD}}\",\r\n\"QueuePort\": \"QueuePort={{server.build.env.QUEUE_PORT}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Anti cheat Session start result\"\r\n}", + "files": "{\r\n \"\/TheIsle\/Saved\/Config\/LinuxServer\/Game.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"ServerName\": \"ServerName={{server.build.env.SERVER_NAME}}\",\r\n \"MaxPlayerCount\": \"MaxPlayerCount={{server.build.env.PLAYER_COUNT}}\",\r\n \"MaxPlayers\": \"MaxPlayers={{server.build.env.PLAYER_COUNT}}\",\r\n \"RconEnabled\": \"RconEnabled={{server.build.env.RCON}}\",\r\n \"RconPort\": \"RconPort={{server.build.env.RCON_PORT}}\",\r\n \"RconPassword\": \"RconPassword={{server.build.env.RCON_PASSWORD}}\",\r\n \"QueuePort\": \"QueuePort={{server.build.env.QUEUE_PORT}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Queue system listening on'\"\r\n}", "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "^C" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id ffound here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# EXTRA_FLAGS - when a server has extra glas for things like beta installs or updates.\r\n#\r\n##\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\necho -e \"steam user is not set.\\n\"\r\necho -e \"Using anonymous user.\\n\"\r\nSTEAM_USER=anonymous\r\nSTEAM_PASS=\"\"\r\nSTEAM_AUTH=\"\"\r\nelse\r\necho -e \"user set to ${STEAM_USER}\"\r\nfi\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\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\nexport HOME=\/mnt\/server\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login Anonymous +app_update 412680 -beta evrima validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n# The Isle\r\nmkdir -p \/mnt\/server\/TheIsle\/Saved\/Config\/LinuxServer\r\ncat > \/mnt\/server\/TheIsle\/Saved\/Config\/LinuxServer\/Game.ini << ENDOFFILE\r\n[\/Script\/Engine.Game]\r\nRconEnabled=${RCON}\r\nRconPort=${RCON_PORT}\r\nRconPassword=${RCON_PASSWORD}\r\n-\r\n[\/Script\/TheIsle.TIGameSession]\r\nServerName=${SERVER_NAME}\r\nMaxPlayerCount=${PLAYER_COUNT}\r\nbEnableGlobalChat=true\r\nbGlobalIsSpeciesOnly=false\r\nbLocalIsSpeciesOnly=true\r\nLocalChatRange=20000.f\r\nQueuePort=${QUEUE_PORT}\r\n-\r\n[\/Script\/Engine.GameSession]\r\nMaxPlayers=${PLAYER_COUNT}\r\n-\r\n[\/Script\/TheIsle.TIGameStateBase]\r\nAdminsSteamIDs=${ADMINSTEAMID}\r\nENDOFFILE\r\nchmod -R 777 \/mnt\/server\/TheIsle\/Saved\/Config\/LinuxServer", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id ffound here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# EXTRA_FLAGS - when a server has extra glas for things like beta installs or updates.\r\n#\r\n##\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\necho -e \"steam user is not set.\\n\"\r\necho -e \"Using anonymous user.\\n\"\r\nSTEAM_USER=anonymous\r\nSTEAM_PASS=\"\"\r\nSTEAM_AUTH=\"\"\r\nelse\r\necho -e \"user set to ${STEAM_USER}\"\r\nfi\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\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\nexport HOME=\/mnt\/server\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login Anonymous +app_update 412680 -beta evrima validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n# The Isle\r\nmkdir -p \/mnt\/server\/TheIsle\/Saved\/Config\/LinuxServer\r\n#Config File\r\ncat > \/mnt\/server\/TheIsle\/Saved\/Config\/LinuxServer\/Game.ini << ENDOFFILE\r\n[\/Script\/Engine.Game]\r\nRconEnabled=${RCON}\r\nRconPort=${RCON_PORT}\r\nRconPassword=${RCON_PASSWORD}\r\n-\r\n[\/Script\/TheIsle.TIGameSession]\r\nServerName=${SERVER_NAME}\r\nMaxPlayerCount=${PLAYER_COUNT}\r\nbEnableGlobalChat=true\r\nbGlobalIsSpeciesOnly=false\r\nbLocalIsSpeciesOnly=true\r\nLocalChatRange=20000.f\r\nQueuePort=${QUEUE_PORT}\r\n-\r\n[\/Script\/Engine.GameSession]\r\nMaxPlayers=${PLAYER_COUNT}\r\n-\r\n[\/Script\/TheIsle.TIGameStateBase]\r\nAdminsSteamIDs=${ADMINSTEAMID}\r\nENDOFFILE\r\n#Hotfix\r\ncat > \/mnt\/server\/TheIsle\/Saved\/Config\/LinuxServer\/Engine.ini << ENDOFFILE\r\n[Core.System]\r\nPaths=..\/..\/..\/Engine\/Content\r\nPaths=%GAMEDIR%Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/Runtime\/SoundUtilities\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/Runtime\/Synthesis\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/Runtime\/AudioSynesthesia\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/Runtime\/WebBrowserWidget\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/FX\/Niagara\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/Experimental\/PythonScriptPlugin\/Content\r\nPaths=..\/..\/..\/TheIsle\/Plugins\/SteamCore\/Content\r\nPaths=..\/..\/..\/TheIsle\/Plugins\/RVTObjectLandscapeBlending\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/Runtime\/Nvidia\/DLSS\/Content\r\nPaths=..\/..\/..\/TheIsle\/Plugins\/DonMeshPainting\/Content\r\nPaths=..\/..\/..\/TheIsle\/Plugins\/UIPF\/Content\r\nPaths=..\/..\/..\/TheIsle\/Plugins\/EOSCore\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/Experimental\/ControlRig\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/Runtime\/Nvidia\/DLSSMoviePipelineSupport\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/MovieScene\/MovieRenderPipeline\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/Compositing\/OpenColorIO\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/MovieScene\/SequencerScripting\/Content\r\nPaths=..\/..\/..\/TheIsle\/Plugins\/ImpostorBaker\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/2D\/Paper2D\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/Developer\/AnimationSharing\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/Editor\/GeometryMode\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/Editor\/SpeedTreeImporter\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/Enterprise\/DatasmithContent\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/Experimental\/ChaosClothEditor\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/Experimental\/GeometryProcessing\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/Experimental\/GeometryCollectionPlugin\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/Experimental\/ChaosSolverPlugin\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/Experimental\/ChaosNiagara\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/Experimental\/MotoSynth\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/Media\/MediaCompositing\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/Runtime\/OpenXREyeTracker\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/Runtime\/OpenXR\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/Runtime\/OpenXRHandTracking\/Content\r\nPaths=..\/..\/..\/Engine\/Plugins\/VirtualProduction\/Takes\/Content\r\n\r\n[EpicOnlineServices]\r\nDedicatedServerClientId=xyza7891gk5PRo3J7G9puCJGFJjmEguW\r\nDedicatedServerClientSecret=pKWl6t5i9NJK8gTpVlAxzENZ65P8hYzodV8Dqe5Rlc8\r\nENDOFFILE\r\nchmod -R 777 \/mnt\/server\/TheIsle\/Saved\/Config\/LinuxServer", "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } @@ -32,10 +32,11 @@ "name": "Server Name", "description": "Sets the name for the server", "env_variable": "SERVER_NAME", - "default_value": "A Pterodactyl server!", + "default_value": "Norden", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:40" + "rules": "required|string|max:40", + "field_type": "text" }, { "name": "Player Count", @@ -44,16 +45,18 @@ "default_value": "100", "user_viewable": true, "user_editable": true, - "rules": "required|numeric|digits_between:1,100" + "rules": "required|numeric|digits_between:1,100", + "field_type": "text" }, { - "name": "Query Port", + "name": "Server admin", "description": "", - "env_variable": "QUERY_PORT", - "default_value": "7778", - "user_viewable": false, - "user_editable": false, - "rules": "required" + "env_variable": "ADMINSTEAMID", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable", + "field_type": "text" }, { "name": "RCON", @@ -62,16 +65,18 @@ "default_value": "false", "user_viewable": true, "user_editable": true, - "rules": "required|in:true,false" + "rules": "required|in:true,false", + "field_type": "text" }, { "name": "Rcon Port", "description": "", "env_variable": "RCON_PORT", - "default_value": "9999", + "default_value": "44000", "user_viewable": true, "user_editable": true, - "rules": "required|numeric" + "rules": "required|numeric", + "field_type": "text" }, { "name": "RCON Password", @@ -80,16 +85,18 @@ "default_value": "RCON_password_is_a_must", "user_viewable": true, "user_editable": true, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" }, { "name": "Queue Port", "description": "", "env_variable": "QUEUE_PORT", - "default_value": "10000", + "default_value": "44000", "user_viewable": true, "user_editable": true, - "rules": "required|numeric" + "rules": "required|numeric", + "field_type": "text" } ] } From b8d4022ccee93dc35f2ea28199b55d4997879a12 Mon Sep 17 00:00:00 2001 From: Enozi <54645039+enozii@users.noreply.github.com> Date: Mon, 18 Jul 2022 08:17:26 +0200 Subject: [PATCH 0475/1001] Update README.md Removed Query port as it is no longer used --- game_eggs/steamcmd_servers/the_isle/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/the_isle/README.md b/game_eggs/steamcmd_servers/the_isle/README.md index 3d30b42f..eca87641 100644 --- a/game_eggs/steamcmd_servers/the_isle/README.md +++ b/game_eggs/steamcmd_servers/the_isle/README.md @@ -8,6 +8,5 @@ The Isle requires 4 ports | Port | default | |-------|---------| | Game | 7777 | -| Query | 7778 | | Rcon | 9999 | | Queue | 10000 | From 07ec40e50b902ad55f054ee311a20f5d1b8e3074 Mon Sep 17 00:00:00 2001 From: Enozi <54645039+enozii@users.noreply.github.com> Date: Mon, 18 Jul 2022 08:35:39 +0200 Subject: [PATCH 0476/1001] Update egg-the-isle.json Updated to work with Update 5 --- game_eggs/steamcmd_servers/the_isle/egg-the-isle.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/the_isle/egg-the-isle.json b/game_eggs/steamcmd_servers/the_isle/egg-the-isle.json index 5de38e6d..964631b3 100644 --- a/game_eggs/steamcmd_servers/the_isle/egg-the-isle.json +++ b/game_eggs/steamcmd_servers/the_isle/egg-the-isle.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-07-18T08:05:28+02:00", + "exported_at": "2022-07-18T08:34:37+02:00", "name": "The Isle", "author": "fredrik.johansenfuun@gmail.com", "description": "The Isle is an open beta with an open-world survival game where players choose from three factions in an attempt to survive a fierce island. Hunt. Prey. Survive.", @@ -16,7 +16,7 @@ "startup": "\/home\/container\/steamcmd\/steamcmd.sh +force_install_dir \/home\/container +login Anonymous +app_update 412680 -beta evrima +quit && \/home\/container\/TheIsle\/Binaries\/Linux\/TheIsleServer-Linux-Shipping -Port=$SERVER_PORT -ini:Engine:[EpicOnlineServices]:DedicatedServerClientId=xyza7891gk5PRo3J7G9puCJGFJjmEguW -ini:Engine:[EpicOnlineServices]:DedicatedServerClientSecret=pKWl6t5i9NJK8gTpVlAxzENZ65P8hYzodV8Dqe5Rlc8", "config": { "files": "{\r\n \"\/TheIsle\/Saved\/Config\/LinuxServer\/Game.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"ServerName\": \"ServerName={{server.build.env.SERVER_NAME}}\",\r\n \"MaxPlayerCount\": \"MaxPlayerCount={{server.build.env.PLAYER_COUNT}}\",\r\n \"MaxPlayers\": \"MaxPlayers={{server.build.env.PLAYER_COUNT}}\",\r\n \"RconEnabled\": \"RconEnabled={{server.build.env.RCON}}\",\r\n \"RconPort\": \"RconPort={{server.build.env.RCON_PORT}}\",\r\n \"RconPassword\": \"RconPassword={{server.build.env.RCON_PASSWORD}}\",\r\n \"QueuePort\": \"QueuePort={{server.build.env.QUEUE_PORT}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Queue system listening on'\"\r\n}", + "startup": "{\r\n \"done\": \"Queue system listening on\"\r\n}", "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "^C" }, From e59dc07134f9c21b42da76d3376e410964913e97 Mon Sep 17 00:00:00 2001 From: Elite Espeon Date: Mon, 18 Jul 2022 10:08:16 -0400 Subject: [PATCH 0477/1001] Fixed issue with Murse failing to download + corrected gamedata download --- .../steamcmd_servers/open_fortress/egg-open-fortress.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/open_fortress/egg-open-fortress.json b/game_eggs/steamcmd_servers/open_fortress/egg-open-fortress.json index a2d73ab8..577ef45c 100644 --- a/game_eggs/steamcmd_servers/open_fortress/egg-open-fortress.json +++ b/game_eggs/steamcmd_servers/open_fortress/egg-open-fortress.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-06-11T12:47:33-04:00", + "exported_at": "2022-07-18T08:23:04-04:00", "name": "Open Fortress", "author": "espeon@espeon.dev", "description": "Open Fortress is a free Team Fortress 2 mod that introduces new gamemodes, weapons, characters, maps, and more to the world of TF2.", @@ -24,7 +24,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates p7zip-full wget\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\nSTEAM_USER=anonymous\r\nSTEAM_PASS=\"\"\r\nSTEAM_AUTH=\"\"\r\nfi\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\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\nexport HOME=\/mnt\/server\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n## install tf2 content using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server\/tf2 +app_update 232250 ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n## download OpenFortress\r\ncd \/mnt\/server\r\nmv bin bin_dontdeleteme\r\nwget https:\/\/dl.spiderden.net\/murse\/linux -O murse 2> \/dev\/null\r\nchmod +x murse\r\n.\/murse upgrade asdrggvead\/open_fortress\r\nmv \/mnt\/server\/asdrggvead\/open_fortress \/mnt\/server\/open_fortress\r\nrm -rf asdrggvead\r\nmv bin_dontdeleteme bin\r\n## download fixed gameinfo\r\ncd \/mnt\/server\/open_fortress\r\nwget -v https:\/\/espeon.dev\/gameinfo.txt -O gameinfo.txt\r\n## fix issue \/w symlink\r\ncd \/mnt\/server\/bin\r\nln -s datacache_srv.so datacache.so\r\nln -s dedicated_srv.so dedicated.so\r\nln -s engine_srv.so engine.so\r\nln -s materialsystem_srv.so materialsystem.so\r\nln -s replay_srv.so replay.so\r\nln -s scenefilecache_srv.so scenefilecache.so\r\nln -s shaderapiempty_srv.so shaderapiempty.so\r\nln -s soundemittersystem_srv.so soundemittersystem.so\r\nln -s studiorender_srv.so studiorender.so\r\nln -s vphysics_srv.so vphysics.so\r\n## more symlink fixes\r\ncd \/mnt\/server\/open_fortress\/bin\r\nln -s server.so server_srv.so", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates p7zip-full wget\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\nSTEAM_USER=anonymous\r\nSTEAM_PASS=\"\"\r\nSTEAM_AUTH=\"\"\r\nfi\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\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\nexport HOME=\/mnt\/server\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n## install tf2 content using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server\/tf2 +app_update 232250 ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n## download OpenFortress\r\ncd \/mnt\/server\r\nmv bin bin_dontdeleteme\r\nwget https:\/\/dl.spiderden.net\/murse\/linux -O murse 2> \/dev\/null\r\nchmod +x murse\r\n.\/murse upgrade -u https:\/\/toast1.openfortress.fun\/toast -c $(curl https:\/\/toast1.openfortress.fun\/toast\/reithreads) asdrggvead\/open_fortress\r\nmv \/mnt\/server\/asdrggvead\/open_fortress \/mnt\/server\/open_fortress\r\nrm -rf asdrggvead\r\nmv bin_dontdeleteme bin\r\n## add fixed gameinfo\r\ncd \/mnt\/server\/open_fortress\r\nrm -rf gameinfo.txt\r\ncat >> gameinfo.txt << EOF\r\n\"GameInfo\"\r\n{\r\ngame \"Open Fortress\"\r\ntitle \"\"\r\ntitle2 \"\"\r\ngamelogo \"1\"\r\ndeveloper \"https:\/\/github.com\/AgitationSkeleton\/open_fortress\/blob\/master\/credits.txt\"\r\ndeveloper_url\t\"https:\/\/github.com\/KaidemonLP\/Open-Fortress-Source\"\r\nmanual \"\"\r\ntype \"multiplayer_only\"\r\nhasportals \"0\" \/\/ gameui.dll\r\nhashdcontent\t\"0\" \/\/ gameui.dll\r\nnomodels \"0\" \/\/ gameui.dll\r\nnohimodel \"0\" \/\/ gameui.dll\r\nnocrosshair \"0\" \/\/ gameui.dll\r\nadvcrosshair \"1\" \/\/ gameui.dll\r\nnodifficulty\t\"1\" \/\/ gameui.dll\r\nsupportsvr \"0\" \/\/ engine.dll + gameui.dll\r\nbots \"0\" \/\/ gameui.dll\r\nnodegraph \"1\" \/\/ engine.dll\r\nperfwizard \"0\" \/\/ unused\r\nSupportsDX8 \"0\" \/\/ unused\r\nSupportsDX9 \"1\" \/\/ unused\r\nSupportsDX10\t\"0\" \/\/ unused\r\nSupportsDX11\t\"0\" \/\/ unused\r\nSupportsXbox\t\"0\" \/\/ unused\r\nSupportsXbox360\t\"0\" \/\/ unused\r\nSupportsXboxOne\t\"0\" \/\/ unused\r\nSupportsPS3 \"0\" \/\/ unused\r\nSupportsPS4 \"0\" \/\/ unused\r\nicon \"resource\/game\"\r\nGameData \"ofd_fic2.fgd\"\r\nInstancePath\t\"maps\/instances\/\"\r\nhidden_maps\r\n{\r\n\"test_speakers\" 1\r\n\"test_hardware\" 1\r\n\"background01\" 1\r\n\"background02\" 1\r\n\"background03\" 1\r\n\"background04\" 1\r\n\"background05\" 1\r\n\"background06\" 1\r\n\"background07\" 1\r\n\"background08\" 1\r\n\"background09\" 1\r\n\"background12\" 1\r\n\"background15\" 1\r\n\"ep1_c17_00\" 1\r\n\"ep1_c17_00a\" 1\r\n\"ep1_c17_01\" 1\r\n\"ep1_c17_01a\" 1\r\n\"ep1_c17_02\" 1\r\n\"ep1_c17_02a\" 1\r\n\"ep1_c17_02b\" 1\r\n\"ep1_c17_05\" 1\r\n\"ep1_c17_06\" 1\r\n\"ep1_citadel_00\"\t1\r\n\"ep1_citadel_00_demo\" 1\r\n\"ep1_citadel_01\"\t1\r\n\"ep1_citadel_02\"\t1\r\n\"ep1_citadel_02b\"\t1\r\n\"ep1_citadel_03\"\t1\r\n\"ep1_citadel_04\"\t1\r\n\"ep1_background01\"\t1\r\n\"ep1_background01a\"\t1\r\n\"ep1_background02\"\t1\r\n\"ep2_outland_01\"\t1\r\n\"ep2_outland_01a\"\t1\r\n\"ep2_outland_02\"\t1\r\n\"ep2_outland_03\"\t1\r\n\"ep2_outland_04\"\t1\r\n\"ep2_outland_05\"\t1\r\n\"ep2_outland_06\"\t1\r\n\"ep2_outland_06a\"\t1\r\n\"ep2_outland_07\"\t1\r\n\"ep2_outland_08\"\t1\r\n\"ep2_outland_09\"\t1\r\n\"ep2_outland_10\"\t1\r\n\"ep2_outland_10a\"\t1\r\n\"ep2_outland_11\"\t1\r\n\"ep2_outland_11a\"\t1\r\n\"ep2_outland_11b\"\t1\r\n\"ep2_outland_12\"\t1\r\n\"ep2_outland_12a\"\t1\r\n\"ep2_background01\"\t1\r\n\"ep2_background02\"\t1\r\n\"ep2_background02a\"\t1\r\n\"ep2_background03\"\t1\r\n\"credits\" 1\r\n\"vst_lostcoast\" 1\r\n\"test\" 1\r\n\"sdk_vehicles\" 1\r\n}\r\nFileSystem\r\n{\r\nSteamAppId 243750\r\nSearchPaths\r\n{\r\ngame+mod |gameinfo_path|custom\/*\r\ngame+game_write+mod+mod_write+default_write_path |gameinfo_path|.\r\ngamebin |gameinfo_path|bin\r\n\/\/ The lines below until the BREAK comment are responsible for the game resources to work properly\r\n\/\/ in Hammer and other Source tools. The default setup assumes that you have everything (Steam, TF2,\r\n\/\/ Source SDK and OF) in the same drive letter\/partition. If you have a different storage configuration,\r\n\/\/ feel free to modify the paths below between quotes (example: D:\\Steam\\steamapps\\common\\Team Fortress 2\\tf).\r\ngame \"\/home\/container\/tf2\/tf\/tf2_misc.vpk\"\r\ngame \"\/home\/container\/tf2\/tf\/tf2_sound_misc.vpk\"\r\ngame \"\/home\/container\/tf2\/tf\/tf2_sound_vo_english.vpk\"\r\ngame \"\/home\/container\/tf2\/tf\/tf2_textures.vpk\"\r\ngame \"\/home\/container\/tf2\/tf\"\r\ngame \"\/home\/container\/tf2\/hl2\/hl2_textures.vpk\"\r\ngame \"\/home\/container\/tf2\/hl2\/hl2_sound_vo_english.vpk\"\r\ngame \"\/home\/container\/tf2\/hl2\/hl2_sound_misc.vpk\"\r\n\/\/ The hl2 folder here is from Source SDK Base 2013 Multiplayer.\r\ngame \"|all_source_engine_paths|hl2\\hl2_misc.vpk\"\r\ngame \"|all_source_engine_paths|hl2\"\r\n\/\/ ========== BREAK ==========\r\nplatform |all_source_engine_paths|platform\/platform_misc.vpk\r\nplatform |all_source_engine_paths|platform\r\ngame+download |gameinfo_path|download\r\n}\r\n}\r\n}\r\nEOF\r\n## fix issue \/w symlink\r\ncd \/mnt\/server\/bin\r\nln -s datacache_srv.so datacache.so\r\nln -s dedicated_srv.so dedicated.so\r\nln -s engine_srv.so engine.so\r\nln -s materialsystem_srv.so materialsystem.so\r\nln -s replay_srv.so replay.so\r\nln -s scenefilecache_srv.so scenefilecache.so\r\nln -s shaderapiempty_srv.so shaderapiempty.so\r\nln -s soundemittersystem_srv.so soundemittersystem.so\r\nln -s studiorender_srv.so studiorender.so\r\nln -s vphysics_srv.so vphysics.so\r\n## more symlink fixes\r\ncd \/mnt\/server\/open_fortress\/bin\r\nln -s server.so server_srv.so", "container": "ubuntu:18.04", "entrypoint": "bash" } From 5d431fea616d54a9b8f7f7b5f8503d0739125c3a Mon Sep 17 00:00:00 2001 From: Enozi <54645039+enozii@users.noreply.github.com> Date: Tue, 19 Jul 2022 08:33:27 +0200 Subject: [PATCH 0478/1001] Update README.md --- game_eggs/steamcmd_servers/the_isle/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/the_isle/README.md b/game_eggs/steamcmd_servers/the_isle/README.md index eca87641..d13f42b1 100644 --- a/game_eggs/steamcmd_servers/the_isle/README.md +++ b/game_eggs/steamcmd_servers/the_isle/README.md @@ -1,9 +1,9 @@ -# The Isle +# The Isle Evrima The Isle is an open beta with an open-world survival game where players choose from three factions in an attempt to survive a fierce island. Hunt. Prey. Survive. ### Server Ports -The Isle requires 4 ports +The Isle requires 3 ports | Port | default | |-------|---------| From a48b985db9cd1dbafdbb326f63ee0b5a14242b49 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Tue, 19 Jul 2022 15:58:41 +0200 Subject: [PATCH 0479/1001] Update configparsing --- .../craftopia/egg-craftopia.json | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json b/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json index 5a24cf53..afd4700f 100644 --- a/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json +++ b/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json @@ -1,30 +1,30 @@ { "_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-01-11T16:08:26+01:00", + "exported_at": "2022-07-19T15:47:00+02:00", "name": "Craftopia", "author": "info@goover.de", "description": "Craftopia is the brand new multiplayer survival action game made in Japan. We combined many features we find enjoyable, such as hunting, farming, hack-and-slash, building, automation to develop this game.", "features": [ "steam_disk_space" ], - "images": [ - "ghcr.io\/parkervcp\/games:source" - ], + "docker_images": { + "ghcr.io\/parkervcp\/games:source": "ghcr.io\/parkervcp\/games:source" + }, "file_denylist": [], "startup": ".\/Craftopia.x86_64", "config": { - "files": "{\r\n \"ServerSetting.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"name=\": \"name={{server.build.env.WORLD_NAME}}\",\r\n \"port=\": \"port={{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"ServerSetting.ini\": {\r\n \"parser\": \"ini\",\r\n \"find\": {\r\n \"GameWorld.name=\": \"{{server.build.env.WORLD_NAME}}\",\r\n \"Host.port=\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"World is loaded!\"\r\n}", "logs": "{}", "stop": "^^C" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n#SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n \r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n ##\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } @@ -37,7 +37,8 @@ "default_value": "1670340", "user_viewable": false, "user_editable": false, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" }, { "name": "Auto Update", @@ -46,7 +47,8 @@ "default_value": "1", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" }, { "name": "World Name", @@ -55,7 +57,8 @@ "default_value": "Pterodactyl Server", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:50" + "rules": "required|string|max:50", + "field_type": "text" } ] -} +} \ No newline at end of file From 7bd6970b543277a21db329ff98daa7e831220723 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Tue, 19 Jul 2022 11:55:13 -0400 Subject: [PATCH 0480/1001] minor updates use debian install image update red dead redemption --- game_eggs/gta/fivem/egg-five-m.json | 6 ++-- game_eggs/rdr/redm/egg-red-m.json | 50 ++++++++++++++++------------- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/game_eggs/gta/fivem/egg-five-m.json b/game_eggs/gta/fivem/egg-five-m.json index 2f13b6e8..9752a14a 100644 --- a/game_eggs/gta/fivem/egg-five-m.json +++ b/game_eggs/gta/fivem/egg-five-m.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-07-17T02:16:42-04:00", + "exported_at": "2022-07-19T11:53:00-04:00", "name": "FiveM", "author": "parker@parkervcp.com", "description": "A new FiveM egg for the latest builds due to recent changes in FiveM", @@ -22,8 +22,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# FiveM Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update -y\r\napt install -y tar xz-utils curl git file jq\r\n\r\nmkdir -p \/mnt\/server\/resources\r\n\r\ncd \/mnt\/server\r\n\r\necho \"updating citizenfx resource files\"\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/tmp\r\ncp -Rf \/tmp\/resources\/* resources\/\r\n\r\nRELEASE_PAGE=$(curl -sSL https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/)\r\nCHANGELOGS_PAGE=$(curl -sSL https:\/\/changelogs-live.fivem.net\/api\/changelog\/versions\/linux\/server)\r\n\r\nif [[ \"${FIVEM_VERSION}\" == \"recommended\" ]] || [[ -z ${FIVEM_VERSION} ]]; then\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.recommended_download')\r\nelif [[ \"${FIVEM_VERSION}\" == \"latest\" ]]; then\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.latest_download')\r\nelse\r\n VERSION_LINK=$(echo -e \"${RELEASE_PAGE}\" | grep -Eo '\".*\/*.tar.xz\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | sed 's\/\\.\\\/\/\/1' | grep ${CFX_VERSION})\r\n if [[ \"${VERSION_LINK}\" == \"\" ]]; then\r\n echo -e \"defaulting to recommedned as the version requested was invalid.\"\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.recommended_download')\r\n else\r\n DOWNLOAD_LINK=$(echo https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${VERSION_LINK})\r\n fi\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else\r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\necho -e \"Running curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\"\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho \"Extracting fivem files\"\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"XZ\" ]; then\r\n tar xvf ${DOWNLOAD_LINK##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exiting\"\r\n exit 2\r\nfi\r\n\r\nrm -rf ${DOWNLOAD_LINK##*\/} run.sh\r\n\r\nif [ -e server.cfg ]; then\r\n echo \"Skipping downloading default server config file as one already exists\"\r\nelse\r\n echo \"Downloading default fivem config\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/gta\/fivem\/server.cfg >>server.cfg\r\nfi\r\n\r\nmkdir -p logs\/\r\n\r\necho \"install complete\"", - "container": "debian:buster-slim", + "script": "#!\/bin\/ash\r\n# FiveM Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update -y\r\napt install -y tar xz-utils file jq\r\n\r\nmkdir -p \/mnt\/server\/resources\r\n\r\ncd \/mnt\/server\r\n\r\necho \"updating citizenfx resource files\"\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/tmp\r\ncp -Rf \/tmp\/resources\/* resources\/\r\n\r\nRELEASE_PAGE=$(curl -sSL https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/)\r\nCHANGELOGS_PAGE=$(curl -sSL https:\/\/changelogs-live.fivem.net\/api\/changelog\/versions\/linux\/server)\r\n\r\nif [[ \"${FIVEM_VERSION}\" == \"recommended\" ]] || [[ -z ${FIVEM_VERSION} ]]; then\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.recommended_download')\r\nelif [[ \"${FIVEM_VERSION}\" == \"latest\" ]]; then\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.latest_download')\r\nelse\r\n VERSION_LINK=$(echo -e \"${RELEASE_PAGE}\" | grep -Eo '\".*\/*.tar.xz\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | sed 's\/\\.\\\/\/\/1' | grep ${CFX_VERSION})\r\n if [[ \"${VERSION_LINK}\" == \"\" ]]; then\r\n echo -e \"defaulting to recommedned as the version requested was invalid.\"\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.recommended_download')\r\n else\r\n DOWNLOAD_LINK=$(echo https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${VERSION_LINK})\r\n fi\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else\r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\necho -e \"Running curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\"\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho \"Extracting fivem files\"\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"XZ\" ]; then\r\n tar xvf ${DOWNLOAD_LINK##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exiting\"\r\n exit 2\r\nfi\r\n\r\nrm -rf ${DOWNLOAD_LINK##*\/} run.sh\r\n\r\nif [ -e server.cfg ]; then\r\n echo \"Skipping downloading default server config file as one already exists\"\r\nelse\r\n echo \"Downloading default fivem config\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/gta\/fivem\/server.cfg >>server.cfg\r\nfi\r\n\r\nmkdir -p logs\/\r\n\r\necho \"install complete\"", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, diff --git a/game_eggs/rdr/redm/egg-red-m.json b/game_eggs/rdr/redm/egg-red-m.json index 95a784b3..6dae0027 100644 --- a/game_eggs/rdr/redm/egg-red-m.json +++ b/game_eggs/rdr/redm/egg-red-m.json @@ -1,17 +1,17 @@ { "_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-01-22T05:43:25-05:00", + "exported_at": "2022-07-19T11:52:55-04:00", "name": "RedM", "author": "parker@parkervcp.com", "description": "A new RedM egg for the latest builds due to recent changes in RedM", "features": null, - "images": [ - "ghcr.io\/parkervcp\/yolks:debian" - ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:debian": "ghcr.io\/parkervcp\/yolks:debian" + }, "file_denylist": [], "startup": "$(pwd)\/alpine\/opt\/cfx-server\/ld-musl-x86_64.so.1 --library-path \"$(pwd)\/alpine\/usr\/lib\/v8\/:$(pwd)\/alpine\/lib\/:$(pwd)\/alpine\/usr\/lib\/\" -- $(pwd)\/alpine\/opt\/cfx-server\/FXServer +set citizen_dir $(pwd)\/alpine\/opt\/cfx-server\/citizen\/ +set sv_licenseKey {{CFX_LICENSE}} +set steam_webApiKey {{STEAM_WEBAPIKEY}} +set sv_maxplayers {{MAX_PLAYERS}} +exec server.cfg +set gamename rdr3", "config": { @@ -22,8 +22,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# CFx Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add openssl tar xz curl wget git file --no-cache jq\r\n\r\nmkdir -p \/mnt\/server\/resources \/mnt\/server\/logs\/\r\n\r\ncd \/mnt\/server\r\n\r\necho \"updating citizenfx resource files\"\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/tmp\r\ncp -Rf \/tmp\/resources\/* resources\/\r\n\r\nRELEASE_PAGE=$(curl -sSL https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/)\r\nCHANGELOGS_PAGE=$(curl -sSL https:\/\/changelogs-live.fivem.net\/api\/changelog\/versions\/linux\/server)\r\n\r\nif [[ \"${CFX_VERSION}\" == \"latest\" ]] || [[ -z ${CFX_VERSION} ]]; then\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.latest_download')\r\nelse\r\n VERSION_LINK=$(echo -e \"${RELEASE_PAGE}\" | grep -Eo '\".*\/*.tar.xz\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | sed 's\/\\.\\\/\/\/1' | grep ${CFX_VERSION})\r\n if [[ \"${VERSION_LINK}\" == \"\" ]]; then\r\n echo -e \"defaulting to latest as the version requested was invalid.\"\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.latest_download')\r\n else\r\n DOWNLOAD_LINK=$(echo https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${VERSION_LINK})\r\n fi\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else\r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\necho -e \"Running curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\"\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho \"Extracting fivem files\"\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"XZ\" ]; then\r\n tar xvf ${DOWNLOAD_LINK##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exiting\"\r\n exit 2\r\nfi\r\n\r\nrm -rf ${DOWNLOAD_LINK##*\/} run.sh\r\n\r\nif [ -e server.cfg ]; then\r\n echo \"server config file exists\"\r\nelse\r\n echo \"Downloading default fivem config\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/gta\/fivem\/server.cfg >>server.cfg\r\nfi\r\n\r\necho \"install complete\"", - "container": "alpine:3.10", + "script": "#!\/bin\/ash\r\n# CFx Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update -y\r\napt install -y tar xz-utils file jq\r\n\r\nmkdir -p \/mnt\/server\/resources \/mnt\/server\/logs\/\r\n\r\ncd \/mnt\/server\r\n\r\necho \"updating citizenfx resource files\"\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/tmp\r\ncp -Rf \/tmp\/resources\/* resources\/\r\n\r\nRELEASE_PAGE=$(curl -sSL https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/)\r\nCHANGELOGS_PAGE=$(curl -sSL https:\/\/changelogs-live.fivem.net\/api\/changelog\/versions\/linux\/server)\r\n\r\nif [[ \"${CFX_VERSION}\" == \"recommended\" ]] || [[ -z ${CFX_VERSION} ]]; then\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.recommended_download')\r\nelif [[ \"${CFX_VERSION}\" == \"latest\" ]]; then\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.latest_download')\r\nelse\r\n VERSION_LINK=$(echo -e \"${RELEASE_PAGE}\" | grep -Eo '\".*\/*.tar.xz\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | sed 's\/\\.\\\/\/\/1' | grep ${CFX_VERSION})\r\n if [[ \"${VERSION_LINK}\" == \"\" ]]; then\r\n echo -e \"defaulting to recommedned as the version requested was invalid.\"\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.recommended_download')\r\n else\r\n DOWNLOAD_LINK=$(echo https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${VERSION_LINK})\r\n fi\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else\r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\necho -e \"Running curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\"\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho \"Extracting fivem files\"\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"XZ\" ]; then\r\n tar xvf ${DOWNLOAD_LINK##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exiting\"\r\n exit 2\r\nfi\r\n\r\nrm -rf ${DOWNLOAD_LINK##*\/} run.sh\r\n\r\nif [ -e server.cfg ]; then\r\n echo \"server config file exists\"\r\nelse\r\n echo \"Downloading default fivem config\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/gta\/fivem\/server.cfg >>server.cfg\r\nfi\r\n\r\necho \"install complete\"", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "ash" } }, @@ -35,16 +35,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "required|string" - }, - { - "name": "Steam Web Api Key", - "description": "Use your Steam WebApiKey or set to 'none'. Get your key at https:\/\/steamcommunity.com\/dev\/apikey\/", - "env_variable": "STEAM_WEBAPIKEY", - "default_value": "none", - "user_viewable": true, - "user_editable": true, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" }, { "name": "Max Players", @@ -53,7 +45,8 @@ "default_value": "32", "user_viewable": true, "user_editable": false, - "rules": "required|integer|between:1,32" + "rules": "required|integer|between:1,32", + "field_type": "text" }, { "name": "Server Hostname", @@ -62,7 +55,8 @@ "default_value": "My new FXServer!", "user_viewable": true, "user_editable": true, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" }, { "name": "CFX version", @@ -71,7 +65,8 @@ "default_value": "latest", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:50" + "rules": "required|string|max:50", + "field_type": "text" }, { "name": "Download Link", @@ -80,7 +75,18 @@ "default_value": "", "user_viewable": false, "user_editable": false, - "rules": "string|nullable" + "rules": "string|nullable", + "field_type": "text" + }, + { + "name": "Steam Web Api Key", + "description": "Use your Steam WebApiKey or set to 'none'. Get your key at https:\/\/steamcommunity.com\/dev\/apikey\/", + "env_variable": "STEAM_WEBAPIKEY", + "default_value": "none", + "user_viewable": true, + "user_editable": true, + "rules": "required|string", + "field_type": "text" } ] -} +} \ No newline at end of file From eb3da59c590eec221b1e75b6f874935dfa67e851 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Tue, 19 Jul 2022 18:26:06 +0200 Subject: [PATCH 0481/1001] add the emulation warning --- game_eggs/minecraft/bedrock/bedrock/README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/game_eggs/minecraft/bedrock/bedrock/README.md b/game_eggs/minecraft/bedrock/bedrock/README.md index 3d58ffa3..1eb64f8e 100644 --- a/game_eggs/minecraft/bedrock/bedrock/README.md +++ b/game_eggs/minecraft/bedrock/bedrock/README.md @@ -18,4 +18,8 @@ Also see the [Mojang Issue tracker](https://bugs.mojang.com/projects/BDS/issues/ * On start the server will report is is listening on port 19132 but is listening on the correct port * Constant `NO LOG FILE` in the console before every log line. * Server chat is not printed to the console. -* when you set ops in game they do not get saved. \ No newline at end of file +* when you set ops in game they do not get saved. +* The arm64 may not perform as expected due to the amd64 to arm emulaton. + +### arm64 +* The arm64 may not perform as expected due to the amd64 to arm emulaton. From e6864239842307edd62f7a003a0111de0e0b40e0 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Tue, 19 Jul 2022 18:28:46 +0200 Subject: [PATCH 0482/1001] add emulation warning --- voice_servers/teamspeak_ARM64/Readme.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/voice_servers/teamspeak_ARM64/Readme.md b/voice_servers/teamspeak_ARM64/Readme.md index 4563a71b..ebccfefe 100644 --- a/voice_servers/teamspeak_ARM64/Readme.md +++ b/voice_servers/teamspeak_ARM64/Readme.md @@ -12,3 +12,6 @@ Ports required to run the server in a table format. | Voice | 9987 | | Query | 10011 | | File | 30033 | + +### arm64 +* The arm64 may not perform as expected due to the amd64 to arm emulaton. \ No newline at end of file From 067d2ed34d06a202c44d802dec1edecf75690a09 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Tue, 19 Jul 2022 18:36:08 +0200 Subject: [PATCH 0483/1001] fix double line --- game_eggs/minecraft/bedrock/bedrock/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/game_eggs/minecraft/bedrock/bedrock/README.md b/game_eggs/minecraft/bedrock/bedrock/README.md index 1eb64f8e..191afb52 100644 --- a/game_eggs/minecraft/bedrock/bedrock/README.md +++ b/game_eggs/minecraft/bedrock/bedrock/README.md @@ -19,7 +19,6 @@ Also see the [Mojang Issue tracker](https://bugs.mojang.com/projects/BDS/issues/ * Constant `NO LOG FILE` in the console before every log line. * Server chat is not printed to the console. * when you set ops in game they do not get saved. -* The arm64 may not perform as expected due to the amd64 to arm emulaton. ### arm64 * The arm64 may not perform as expected due to the amd64 to arm emulaton. From 3f3a7f9d52a5eb4a55a0361c6de6f15d0524686b Mon Sep 17 00:00:00 2001 From: Enozi <54645039+enozii@users.noreply.github.com> Date: Tue, 19 Jul 2022 20:19:43 +0200 Subject: [PATCH 0484/1001] Made sub folder for Evrima --- .../steamcmd_servers/the_isle/{ => evrima}/egg-the-isle.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename game_eggs/steamcmd_servers/the_isle/{ => evrima}/egg-the-isle.json (100%) diff --git a/game_eggs/steamcmd_servers/the_isle/egg-the-isle.json b/game_eggs/steamcmd_servers/the_isle/evrima/egg-the-isle.json similarity index 100% rename from game_eggs/steamcmd_servers/the_isle/egg-the-isle.json rename to game_eggs/steamcmd_servers/the_isle/evrima/egg-the-isle.json From a01f299bcd1ab42f493ee3a38dee2f1229ddb82a Mon Sep 17 00:00:00 2001 From: Enozi <54645039+enozii@users.noreply.github.com> Date: Tue, 19 Jul 2022 20:20:10 +0200 Subject: [PATCH 0485/1001] Moved into sub folder --- game_eggs/steamcmd_servers/the_isle/{ => evrima}/README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename game_eggs/steamcmd_servers/the_isle/{ => evrima}/README.md (100%) diff --git a/game_eggs/steamcmd_servers/the_isle/README.md b/game_eggs/steamcmd_servers/the_isle/evrima/README.md similarity index 100% rename from game_eggs/steamcmd_servers/the_isle/README.md rename to game_eggs/steamcmd_servers/the_isle/evrima/README.md From 694b6693124623cf04194c5370c506dc1a4197ae Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Wed, 20 Jul 2022 17:35:38 +0200 Subject: [PATCH 0486/1001] Update alt:v --- game_eggs/gta/altv/egg-alt--v.json | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/game_eggs/gta/altv/egg-alt--v.json b/game_eggs/gta/altv/egg-alt--v.json index 5052a307..ef127936 100644 --- a/game_eggs/gta/altv/egg-alt--v.json +++ b/game_eggs/gta/altv/egg-alt--v.json @@ -1,19 +1,19 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1", + "version": "PTDL_v2", "update_url": null }, - "exported_at": "2021-01-31T13:27:52+00:00", + "exported_at": "2022-07-20T17:34:40+02:00", "name": "alt:V", "author": "parker@parkervcp.com", "description": "alt:V Multiplayer a third-party multiplayer modification for Grand Theft Auto: V", "features": null, - "images": [ - "quay.io\/parkervcp\/pterodactyl-images:game_altv" - ], - "file_denylist": "", - "startup": "chmod +x .\/altv-server && .\/altv-server", + "docker_images": { + "ghcr.io\/parkervcp\/games:altv": "ghcr.io\/parkervcp\/games:altv" + }, + "file_denylist": [], + "startup": ".\/altv-server", "config": { "files": "{\r\n \"server.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"host:\": \"host: 0.0.0.0\",\r\n \"port:\": \"port: {{server.build.default.port}}\",\r\n \"password:\": \"password: {{server.build.env.PASSWORD}}\",\r\n \"description:\": \"description: {{server.build.env.SERVER_DESC}}\"\r\n }\r\n },\r\n \"update.cfg\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"branch\": \"{{server.build.env.BUILD}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Server started\"\r\n}", @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n#\r\n# Script Name: update.sh\r\n#\r\n# Author: Lhoerion\r\n#\r\n# Description: The following script compares SHA-1 hashes of remote and local alt:V files. If local file is missing or outdated, script automatically downloads it to script directory.\r\n# Old files are preserved as *.old. Script also keep track of current branch and build. Server start script gets created if missing.\r\n#\r\n# Run Information: This script is run manually.\r\n# Dependencies: coreutils, wget, >=jq_1.4, pcregrep\r\n#\r\n\r\napt update\r\napt install -y libatomic1 zip unzip jq curl wget libc-bin\r\ncd \/mnt\/server\r\n\r\nnoBackup=false\r\nnoLogFile=false\r\ndryRun=false\r\nsilent=false\r\nfor arg in \"$@\"\r\ndo\r\n if [ $arg = '--no-logfile' ]; then\r\n noLogFile=true\r\n elif [ $arg = '--no-backup' ]; then\r\n noBackup=true\r\n elif [ $arg = '--dry-run' ]; then\r\n dryRun=true\r\n elif [ $arg = '--silent' ]; then\r\n silent=true\r\n fi\r\ndone\r\nfiles=()\r\nprintAndLog() {\r\n if [[ \"$silent\" == false ]]; then\r\n outFd=1\r\n else\r\n exec {outFd}>\/dev\/null\r\n fi\r\n if [ \"$2\" = 'ERR' ]; then\r\n printf \"\\e[91m[$(date +%T)][Error] $1\\e[39m\" |& ([ $noLogFile != true ] && tee -a 'update.log' >& $outFd || cat)\r\n elif [ \"$2\" = 'WARN' ]; then\r\n printf \"\\e[93m[$(date +%T)][Warning] $1\\e[39m\" |& ([ $noLogFile != true ] && tee -a 'update.log' >& $outFd || cat)\r\n elif [ \"$2\" = 'APP' ]; then\r\n printf \"$1\" |& ([ $noLogFile != true ] && tee -a 'update.log' >& $outFd || cat)\r\n else\r\n printf \"[$(date +%T)] $1\" |& ([ $noLogFile != true ] && tee -a 'update.log' >& $outFd || cat)\r\n fi\r\n}\r\nsemVerCmp() {\r\n declare -r \"semVerRegex=^(0|[1-9]\\d*)(?:\\.(0|[1-9]\\d*))?\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$\"\r\n local matchA=(${1##v})\r\n local matchB=(${2##v})\r\n for i in {1..5}\r\n do\r\n matchA+=(`echo ${1##v} | pcregrep \"-o$i\" $semVerRegex`)\r\n matchB+=(`echo ${2##v} | pcregrep \"-o$i\" $semVerRegex`)\r\n done\r\n if [ ${1##v} == ${2##v} ]; then\r\n echo 0 && return 0\r\n fi\r\n if [ \\( -z $matchA[4] \\) -a \\( ! -z $matchB[4] \\) ]; then\r\n echo 1 && return 0\r\n elif [ \\( ! -z $matchA[4] \\) -a \\( -z $matchB[4] \\) ]; then\r\n echo -1 && return 0\r\n fi\r\n local i=0\r\n for a in ${matchA[@]}\r\n do\r\n local b=\"${matchB[$i]}\"\r\n if [ \\( $i -eq 2 \\) -a \\( \\( -z $a \\) -o \\( -z $b \\) \\) ]; then\r\n continue\r\n fi\r\n if [[ $a > $b ]]; then\r\n echo 1 && return 0\r\n elif [[ $a < $b ]]; then\r\n echo -1 && return 0\r\n fi\r\n i=$((i + 1))\r\n done\r\n echo 0 && return 0\r\n}\r\nfetchUpdateData() {\r\n updateData=$(curl -s \"https:\/\/cdn.altv.mp\/server\/$localBranch\/x64_linux\/update.json\" -A 'AltPublicAgent')\r\n echo $updateData | jq -e '.' >\/dev\/null 2>&1\r\n if [ $? -ne 0 ]; then\r\n printAndLog \"Failed to check for update, try again later\\n\" 'ERR'\r\n exit 1\r\n fi\r\n str='. | to_entries | map(if .key==\"hashList\" then {\"key\":.key} + {\"value\":(.value | to_entries | map(. + {\"value\":[.value, \"%s\"]}) | from_entries)} else . end) | from_entries'\r\n local updateTmp=($(mktemp '\/tmp\/update.sh.XXX'))\r\n echo '{}' > ${updateTmp[0]}\r\n echo $updateData | jq -c \"$(printf \"$str\" 'server')\" > ${updateTmp[0]}\r\n for (( i=0; i < ${#modules[@]}; i++ ))\r\n do\r\n if [[ \"${modules[$i]}\" == 'csharp-module' ]]; then\r\n modules[$i]='coreclr-module'\r\n fi\r\n local moduleName=${modules[$i]}\r\n updateData=$(curl -s \"https:\/\/cdn.altv.mp\/$moduleName\/$localBranch\/x64_linux\/update.json\" -A 'AltPublicAgent')\r\n echo $updateData | jq -e '.' >\/dev\/null 2>&1\r\n if [ $? -ne 0 ]; then\r\n printAndLog \"Failed to check for $moduleName update\\n\" 'WARN'\r\n else\r\n if [[ \"$moduleName\" == 'csharp-module' ]]; then\r\n if [[ $(echo $updateData | jq -c '.hashList | has(\"AltV.Net.Host.dll\")') == false ]]; then\r\n updateData=$(echo $updateData | jq '.hashList |= . + {\"AltV.Net.Host.dll\":\"'$(printf \"%0.s0\" {1..40})'\"}')\r\n updateData=$(echo $updateData | jq '.hashList |= . + {\"AltV.Net.Host.runtimeconfig.json\":\"'$(printf \"%0.s0\" {1..40})'\"}')\r\n fi\r\n if [[ $(echo $updateData | jq -c '.hashList | has(\"modules\/libcsharp-module.so\")') == false ]]; then\r\n updateData=$(echo $updateData | jq '.hashList |= . + {\"modules\/libcsharp-module.so\":\"'$(printf \"%0.s0\" {1..40})'\"}')\r\n fi\r\n fi\r\n updateTmp+=($(mktemp '\/tmp\/update.sh.XXX'))\r\n echo '{}' > \"${updateTmp[${#updateTmp[@]} - 1]}\"\r\n echo $updateData | jq -c \"$(printf \"$str\" \"$moduleName\")\" > \"${updateTmp[${#updateTmp[@]} - 1]}\"\r\n fi\r\n done\r\n updateData=$(jq -s '.[0].latestBuildNumber as $b | .[0].version as $c | reduce .[] as $x ({}; . * $x) | .latestBuildNumber=$b | .version=$c' ${updateTmp[@]})\r\n remoteBuild=\"$(echo \"$updateData\" | jq -r '.latestBuildNumber')\"\r\n [[ $remoteBuild -eq -1 ]] && remoteBuild=$(echo \"$updateData\" | jq -r '.version')\r\n}\r\nvalidateFiles() {\r\n files=()\r\n for file in $(echo $updateData | jq -r '.hashList | keys[]')\r\n do\r\n if [[ ! -e \"$file\" || $(sha1sum \"$file\" | awk '{print $1}') != \"$(echo \"$updateData\" | jq -r \".hashList.\\\"$file\\\"[0]\")\" ]]; then\r\n files+=(\"$file\")\r\n fi\r\n done\r\n if [ ! -e 'server.cfg' ]; then\r\n printAndLog \"Server file server.cfg not found, creating one . . . \"\r\n if [[ \"$dryRun\" == false ]]; then\r\n printf 'name: \"alt:V Server\"\\nhost: 0.0.0.0\\nport: 7788\\nplayers: 128\\n#password: ultra-password\\nannounce: false\\n#token: YOUR_TOKEN\\ngamemode: Freeroam\\nwebsite: example.com\\nlanguage: en\\ndescription: \"alt:V Sample Server\"\\nmodules: [\\n \\n]\\nresources: [\\n \\n]\\n' > 'server.cfg' && printAndLog 'done\\n' 'APP' || printAndLog 'failed\\n' 'APP'\r\n else\r\n printAndLog 'done\\n' 'APP'\r\n fi\r\n fi\r\n if [[ ! $localBuild =~ ^[0-9]+$ || $localBuild -ge 1232 ]]; then\r\n local nodeExist=$([ -e 'libnode.so.72' ] && echo true || echo false)\r\n local moduleExist=$([ -e 'modules\/libnode-module.so' ] && echo true || echo false)\r\n if [[ \"$nodeExist\" == true || \"$moduleExist\" == true ]]; then\r\n printAndLog \"Found old node-module files, removing . . . \"\r\n if [[ \"$dryRun\" == false ]]; then\r\n local result1=true\r\n local result2=true\r\n if [[ \"$nodeExist\" == true ]]; then\r\n rm -f 'libnode.so.72'\r\n result1=$([[ \"$?\" -eq 0 ]] && echo true || echo false)\r\n fi\r\n if [[ \"$moduleExist\" == true ]]; then\r\n rm -f 'modules\/libnode-module.so'\r\n result2=$([[ \"$?\" -eq 0 ]] && echo true || echo false)\r\n fi\r\n if [[ \"$result1\" == true && \"$result2\" == true ]]; then\r\n printAndLog 'done\\n' 'APP'\r\n else\r\n printAndLog 'failed\\n' 'APP'\r\n fi\r\n else\r\n printAndLog 'done\\n' 'APP'\r\n fi\r\n fi\r\n fi\r\n if [ $localBuild != $remoteBuild ]; then\r\n printAndLog \"Server files update is available\\n\"\r\n elif [ \"${#files[@]}\" -ne 0 ]; then\r\n printAndLog \"Server files are invalidated\/corrupted, ${#files[@]} in total\\n\"\r\n else\r\n printAndLog \"Server files are up-to-date, no action required\\n\"\r\n fi\r\n\r\n if [[ \"$dryRun\" == false ]]; then\r\n localBuild=$remoteBuild\r\n modulesTemp=\"\"\r\n for (( i=0; i < ${#modules[@]}; i++ ))\r\n do\r\n modulesTemp+=\"\\\"${modules[$i]}\\\"\"\r\n if [ $(($i + 1)) -ne ${#modules[@]} ]; then\r\n modulesTemp+=','\r\n fi\r\n done\r\n if [[ $localBuild =~ ^[0-9]+$ ]]; then\r\n printf '{\"branch\":\"%s\",\"build\":%d,\"modules\":[%s]}' $localBranch $localBuild $modulesTemp | jq '.' > 'update.cfg'\r\n else\r\n printf '{\"branch\":\"%s\",\"build\":\"%s\",\"modules\":[%s]}' $localBranch $localBuild $modulesTemp | jq '.' > 'update.cfg'\r\n fi\r\n fi\r\n }\r\n downloadFiles() {\r\n if [ \"${#files[@]}\" -eq 0 ]; then\r\n return\r\n fi\r\n for file in ${files[@]}\r\n do\r\n dlType=\"$(echo \"$updateData\" | jq -r \".hashList.\\\"$file\\\"[1]\")\"\r\n outDir=\"$(dirname $file)\"\r\n printAndLog \"Downloading file $file . . . \"\r\n if [[ \"$dryRun\" == false ]]; then\r\n if [[ \"$noBackup\" == false && -e \"$file\" ]]; then\r\n mv \"$file\" \"$file.old\"\r\n fi\r\n if [[ ! -e \"$outDir\/\" ]]; then\r\n mkdir -p \"$outDir\/\"\r\n fi\r\n wget \"https:\/\/cdn.altv.mp\/$dlType\/$localBranch\/x64_linux\/${file}?build=$localBuild\" -U 'AltPublicAgent' -O \"$file\" -N -q && printAndLog 'done\\n' 'APP' || printAndLog 'failed\\n' 'APP'\r\n if [ ! -e \"$file\" ]; then\r\n continue\r\n fi\r\n if [ -e \"$file.old\" ]; then\r\n chmod --reference=\"$file.old\" \"$file\" || printAndLog \"Failed to copy chmod to file $file\\n\" 'ERR'\r\n chmod -x \"$file.old\" || printAndLog \"Failed to remove execution permissions from file $file.old\\n\" 'ERR'\r\n else\r\n chmod +x \"$file\" || printAndLog \"Failed to add execution permissions to file $file\\n\" 'ERR'\r\n fi\r\n else\r\n printAndLog 'done\\n' 'APP'\r\n fi\r\n done\r\n validateFiles\r\n }\r\n\r\n if [ $noLogFile != true ]; then\r\n truncate -s 0 'update.log'\r\n fi\r\n if [[ ( \"$dryRun\" == false ) && ( ! -e 'update.cfg' ) ]]; then\r\n printf '{\"branch\":\"release\",\"modules\":[\"js-module\"]}' | jq '.' > 'update.cfg'\r\n fi\r\n updateCfg=$([[ -e 'update.cfg' ]] && cat 'update.cfg' || printf '{\"branch\":\"release\",\"modules\":[\"js-module\"]}' | jq '.')\r\n localBranch=$(echo \"$updateCfg\" | jq -r '.branch')\r\n [[ ! -n \"$localBranch\" || \"$localBranch\" != 'release' && \"$localBranch\" != 'rc' && \"$localBranch\" != 'dev' ]] && localBranch='release'\r\n modules=($(echo \"$updateCfg\" | jq -r '.modules \/\/ \"\"' | tr -d '[],\"'))\r\n [[ ! -n \"$modules\" ]] && modules=('js-module')\r\n fetchUpdateData\r\n localBuild=\"$(echo \"$updateCfg\" | jq -r 'if .build == null then empty else .build end')\"\r\n [[ -z $localBuild || $localBuild == \"-1\" ]] && localBuild=$remoteBuild\r\n printAndLog \"Current version: $localBuild\\n\"\r\n printAndLog \"Latest version: $remoteBuild\\n\"\r\n validateFiles\r\n downloadFiles\r\nchmod +x .\/altv-server\r\necho -e \"install complete\"", + "script": "#!\/bin\/bash\r\n#\r\n# Script Name: update.sh\r\n#\r\n# Author: Lhoerion\r\n#\r\n# Description: The following script compares SHA-1 hashes of remote and local alt:V files. If local file is missing or outdated, script automatically downloads it to script directory.\r\n# Old files are preserved as *.old. Script also keep track of current branch and build. Server start script gets created if missing.\r\n#\r\n# Run Information: This script is run manually.\r\n# Dependencies: coreutils, wget, >=jq_1.4, pcregrep\r\n#\r\n\r\napt update\r\napt install -y libatomic1 zip unzip jq curl wget libc-bin coreutils pcregrep\r\ncd \/mnt\/server\r\n\r\n\r\n#!\/bin\/bash\r\n#\r\n# Script Name: update.sh\r\n#\r\n# Author: Lhoerion\r\n#\r\n# Description: The following script compares SHA-1 hashes of remote and local alt:V files. If local file is missing or outdated, script automatically downloads it to script directory.\r\n# Old files are preserved as *.old. Script also keep track of current branch and build. Server start script gets created if missing.\r\n#\r\n# Run Information: This script is run manually.\r\n# Dependencies: coreutils, wget, >=jq_1.4, pcregrep\r\n#\r\n\r\nnoBackup=false\r\nnoLogFile=false\r\ndryRun=false\r\nsilent=false\r\nfor arg in \"$@\"\r\ndo\r\n if [ $arg = '--no-logfile' ]; then\r\n noLogFile=true\r\n elif [ $arg = '--no-backup' ]; then\r\n noBackup=true\r\n elif [ $arg = '--dry-run' ]; then\r\n dryRun=true\r\n elif [ $arg = '--silent' ]; then\r\n silent=true\r\n fi\r\ndone\r\nfiles=()\r\nprintAndLog() {\r\n if [[ \"$silent\" == false ]]; then\r\n outFd=1\r\n else\r\n exec {outFd}>\/dev\/null\r\n fi\r\n if [ \"$2\" = 'ERR' ]; then\r\n printf \"\\e[91m[$(date +%T)][Error] $1\\e[39m\" |& ([ $noLogFile != true ] && tee -a 'update.log' >& $outFd || cat)\r\n elif [ \"$2\" = 'WARN' ]; then\r\n printf \"\\e[93m[$(date +%T)][Warning] $1\\e[39m\" |& ([ $noLogFile != true ] && tee -a 'update.log' >& $outFd || cat)\r\n elif [ \"$2\" = 'APP' ]; then\r\n printf \"$1\" |& ([ $noLogFile != true ] && tee -a 'update.log' >& $outFd || cat)\r\n else\r\n printf \"[$(date +%T)] $1\" |& ([ $noLogFile != true ] && tee -a 'update.log' >& $outFd || cat)\r\n fi\r\n}\r\nsemVerCmp() {\r\n declare -r \"semVerRegex=^(0|[1-9]\\d*)(?:\\.(0|[1-9]\\d*))?\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$\"\r\n local matchA=(${1##v})\r\n local matchB=(${2##v})\r\n for i in {1..5}\r\n do\r\n matchA+=$(`echo ${1##v} | pcregrep \"-o$i\" $semVerRegex`)\r\n matchB+=$(`echo ${2##v} | pcregrep \"-o$i\" $semVerRegex`)\r\n done\r\n if [ ${1##v} == ${2##v} ]; then\r\n echo 0 && return 0\r\n fi\r\n if [ \\( -z $matchA[4] \\) -a \\( ! -z $matchB[4] \\) ]; then\r\n echo 1 && return 0\r\n elif [ \\( ! -z $matchA[4] \\) -a \\( -z $matchB[4] \\) ]; then\r\n echo -1 && return 0\r\n fi\r\n local i=0\r\n for a in ${matchA[@]}\r\n do\r\n local b=\"${matchB[$i]}\"\r\n if [ \\( $i -eq 2 \\) -a \\( \\( -z $a \\) -o \\( -z $b \\) \\) ]; then\r\n continue\r\n fi\r\n if [[ $a > $b ]]; then\r\n echo 1 && return 0\r\n elif [[ $a < $b ]]; then\r\n echo -1 && return 0\r\n fi\r\n i=$((i + 1))\r\n done\r\n echo 0 && return 0\r\n}\r\ngetFileHash() {\r\n local file=(${1##v})\r\n sha1sum \"$file\" | awk '{print $1}'\r\n}\r\nfetchUpdateData() {\r\n updateData=$(curl -s \"https:\/\/cdn.altv.mp\/server\/$localBranch\/x64_linux\/update.json\" -A 'AltPublicAgent')\r\n echo $updateData | jq -e '.' >\/dev\/null 2>&1\r\n if [ $? -ne 0 ]; then\r\n printAndLog \"Failed to check for update, try again later\\n\" 'ERR'\r\n exit 1\r\n fi\r\n\r\n str='. | to_entries | map(if .key==\"hashList\" then {\"key\":.key} + {\"value\":(.value | to_entries | map(. + {\"value\":[.value, \"%s\"]}) | from_entries)} else . end) | from_entries'\r\n \r\n local updateTmp=($(mktemp '\/tmp\/update.sh.XXX'))\r\n\r\n echo '{}' > ${updateTmp[0]}\r\n echo $updateData | jq -c \"$(printf \"$str\" 'server')\" > ${updateTmp[0]}\r\n\r\n updateData=$(curl -s \"https:\/\/cdn.altv.mp\/data\/$localBranch\/update.json\" -A 'AltPublicAgent')\r\n if [ $? -ne 0 ]; then\r\n printAndLog \"Failed to check for update, try again later\\n\" 'ERR'\r\n exit 1\r\n fi\r\n\r\n updateTmp+=($(mktemp '\/tmp\/update.sh.XXX'))\r\n echo '{}' > \"${updateTmp[${#updateTmp[@]} - 1]}\"\r\n echo $updateData | jq -c \"$(printf \"$str\" 'data')\" > \"${updateTmp[${#updateTmp[@]} - 1]}\"\r\n\r\n for (( i=0; i < ${#modules[@]}; i++ ))\r\n do\r\n if [[ \"${modules[$i]}\" == 'csharp-module' ]]; then\r\n modules[$i]='coreclr-module'\r\n fi\r\n local moduleName=${modules[$i]}\r\n updateData=$(curl -s \"https:\/\/cdn.altv.mp\/$moduleName\/$localBranch\/x64_linux\/update.json\" -A 'AltPublicAgent')\r\n echo $updateData | jq -e '.' >\/dev\/null 2>&1\r\n if [ $? -ne 0 ]; then\r\n printAndLog \"Failed to check for $moduleName update\\n\" 'WARN'\r\n else\r\n updateTmp+=($(mktemp '\/tmp\/update.sh.XXX'))\r\n echo '{}' > \"${updateTmp[${#updateTmp[@]} - 1]}\"\r\n echo $updateData | jq -c \"$(printf \"$str\" \"$moduleName\")\" > \"${updateTmp[${#updateTmp[@]} - 1]}\"\r\n fi\r\n done\r\n updateData=$(jq -s '.[0].latestBuildNumber as $b | .[0].version as $c | reduce .[] as $x ({}; . * $x) | .latestBuildNumber=$b | .version=$c' ${updateTmp[@]})\r\n remoteBuild=\"$(echo \"$updateData\" | jq -r '.latestBuildNumber')\"\r\n [[ $remoteBuild -eq -1 ]] && remoteBuild=$(echo \"$updateData\" | jq -r '.version')\r\n}\r\nvalidateFiles() {\r\n files=()\r\n for file in $(echo $updateData | jq -r '.hashList | keys[]')\r\n do\r\n if [[ ! -e \"$file\" || (\"$(printf \"%0.s0\" {1..40})\" != \"$(echo \"$updateData\" | jq -r \".hashList.\\\"$file\\\"[0]\")\" && $(getFileHash \"$file\") != \"$(echo \"$updateData\" | jq -r \".hashList.\\\"$file\\\"[0]\")\") ]]; then\r\n files+=(\"$file\")\r\n fi\r\n done\r\n if [ ! -e 'server.cfg' ]; then\r\n printAndLog \"Server file server.cfg not found, creating one . . . \"\r\n if [[ \"$dryRun\" == false ]]; then\r\n printf 'name: \"alt:V Server\"\\nhost: 0.0.0.0\\nport: 7788\\nplayers: 128\\n#password: ultra-password\\nannounce: false\\n#token: YOUR_TOKEN\\ngamemode: Freeroam\\nwebsite: example.com\\nlanguage: en\\ndescription: \"alt:V Sample Server\"\\nmodules: [\\n \\n]\\nresources: [\\n \\n]\\n' > 'server.cfg' && printAndLog 'done\\n' 'APP' || printAndLog 'failed\\n' 'APP'\r\n else\r\n printAndLog 'done\\n' 'APP'\r\n fi\r\n fi\r\n if [[ ! $localBuild =~ ^[0-9]+$ || $localBuild -ge 1232 ]]; then\r\n local nodeExist=$([ -e 'libnode.so.72' ] && echo true || echo false)\r\n local moduleExist=$([ -e 'modules\/libnode-module.so' ] && echo true || echo false)\r\n if [[ \"$nodeExist\" == true || \"$moduleExist\" == true ]]; then\r\n printAndLog \"Found old node-module files, removing . . . \"\r\n if [[ \"$dryRun\" == false ]]; then\r\n local result1=true\r\n local result2=true\r\n if [[ \"$nodeExist\" == true ]]; then\r\n rm -f 'libnode.so.72'\r\n result1=$([[ \"$?\" -eq 0 ]] && echo true || echo false)\r\n fi\r\n if [[ \"$moduleExist\" == true ]]; then\r\n rm -f 'modules\/libnode-module.so'\r\n result2=$([[ \"$?\" -eq 0 ]] && echo true || echo false)\r\n fi\r\n if [[ \"$result1\" == true && \"$result2\" == true ]]; then\r\n printAndLog 'done\\n' 'APP'\r\n else\r\n printAndLog 'failed\\n' 'APP'\r\n fi\r\n else\r\n printAndLog 'done\\n' 'APP'\r\n fi\r\n fi\r\n fi\r\n if [ $localBuild != $remoteBuild ]; then\r\n printAndLog \"Server files update is available\\n\"\r\n elif [ \"${#files[@]}\" -ne 0 ]; then\r\n printAndLog \"Server files are invalidated\/corrupted, ${#files[@]} in total\\n\"\r\n else\r\n printAndLog \"Server files are up-to-date, no action required\\n\"\r\n fi\r\n\r\n if [[ \"$dryRun\" == false ]]; then\r\n localBuild=$remoteBuild\r\n modulesTemp=\"\"\r\n for (( i=0; i < ${#modules[@]}; i++ ))\r\n do\r\n modulesTemp+=\"\\\"${modules[$i]}\\\"\"\r\n if [ $(($i + 1)) -ne ${#modules[@]} ]; then\r\n modulesTemp+=','\r\n fi\r\n done\r\n if [[ $localBuild =~ ^[0-9]+$ ]]; then\r\n printf '{\"branch\":\"%s\",\"build\":%d,\"modules\":[%s]}' $localBranch $localBuild $modulesTemp | jq '.' > 'update.cfg'\r\n else\r\n printf '{\"branch\":\"%s\",\"build\":\"%s\",\"modules\":[%s]}' $localBranch $localBuild $modulesTemp | jq '.' > 'update.cfg'\r\n fi\r\n fi\r\n}\r\ndownloadFiles() {\r\n if [ \"${#files[@]}\" -eq 0 ]; then\r\n return\r\n fi\r\n for file in ${files[@]}\r\n do\r\n dlType=\"$(echo \"$updateData\" | jq -r \".hashList.\\\"$file\\\"[1]\")\"\r\n platform=$([ \"$dlType\" == \"data\" ] && echo \"\" || echo \"x64_linux\/\")\r\n updateData=\"$(echo $updateData | jq -r '.hashList.\"altv-server\"[1] = \"server\"')\"\r\n outDir=\"$(dirname $file)\"\r\n printAndLog \"Downloading file $file . . . \"\r\n if [[ \"$dryRun\" == false ]]; then\r\n if [[ \"$noBackup\" == false && -e \"$file\" ]]; then\r\n mv \"$file\" \"$file.old\"\r\n fi\r\n if [[ ! -e \"$outDir\/\" ]]; then\r\n mkdir -p \"$outDir\/\"\r\n fi\r\n\r\n wget \"https:\/\/cdn.altv.mp\/$dlType\/$localBranch\/$platform${file}?build=$localBuild\" -U 'AltPublicAgent' -O \"$file\" -N -q && printAndLog 'done\\n' 'APP' || printAndLog 'failed\\n' 'APP'\r\n if [ ! -e \"$file\" ]; then\r\n continue\r\n fi\r\n if [ -e \"$file.old\" ]; then\r\n chmod --reference=\"$file.old\" \"$file\" || printAndLog \"Failed to copy chmod to file $file\\n\" 'ERR'\r\n chmod -x \"$file.old\" || printAndLog \"Failed to remove execution permissions from file $file.old\\n\" 'ERR'\r\n else\r\n chmod +x \"$file\" || printAndLog \"Failed to add execution permissions to file $file\\n\" 'ERR'\r\n fi\r\n else\r\n printAndLog 'done\\n' 'APP'\r\n fi\r\n done\r\n validateFiles\r\n}\r\n\r\nif [ $noLogFile != true ]; then\r\n truncate -s 0 'update.log'\r\nfi\r\nif [[ ( \"$dryRun\" == false ) && ( ! -e 'update.cfg' ) ]]; then\r\n printf '{\"branch\":\"release\",\"modules\":[\"js-module\"]}' | jq '.' > 'update.cfg'\r\nfi\r\nupdateCfg=$([[ -e 'update.cfg' ]] && cat 'update.cfg' || printf '{\"branch\":\"release\",\"modules\":[\"js-module\"]}' | jq '.')\r\nlocalBranch=$(echo \"$updateCfg\" | jq -r '.branch')\r\n[[ ! -n \"$localBranch\" || \"$localBranch\" != 'release' && \"$localBranch\" != 'rc' && \"$localBranch\" != 'dev' ]] && localBranch='release'\r\nmodules=($(echo \"$updateCfg\" | jq -r '.modules \/\/ \"\"' | tr -d '[],\"'))\r\n[[ ! -n \"$modules\" ]] && modules=('js-module')\r\nfetchUpdateData\r\nlocalBuild=\"$(echo \"$updateCfg\" | jq -r 'if .build == null then empty else .build end')\"\r\n[[ -z $localBuild || $localBuild == \"-1\" ]] && localBuild=$remoteBuild\r\nprintAndLog \"Current version: $localBuild\\n\"\r\nprintAndLog \"Latest version: $remoteBuild\\n\"\r\nvalidateFiles\r\ndownloadFiles\r\n\r\nchmod +x .\/altv-server\r\n\r\ncd \/mnt\/server\/data\r\n\r\nif [ -f \"vehmodels.bin\" ];\r\nthen\r\n echo \"vehmodels.bin found.\"\r\nelse\r\n echo \"vehmodels.bin has not been found, downloading it\"\r\n wget https:\/\/cdn.altv.mp\/data\/${BUILD}\/data\/vehmodels.bin\r\nfi\r\n\r\nif [ -f \"vehmods.bin\" ];\r\nthen\r\n echo \"vehmods.bin found.\"\r\nelse\r\n echo \"vehmods.bin has not been found, downloading it\"\r\n wget https:\/\/cdn.altv.mp\/data\/${BUILD}\/data\/vehmods.bin\r\nfi\r\n\r\nif [ -f \"clothes.bin\" ];\r\nthen\r\n echo \"clothes.bin found.\"\r\nelse\r\n echo \"clothes.bin has not been found, downloading it\"\r\n wget wget https:\/\/cdn.altv.mp\/data\/${BUILD}\/data\/clothes.bin\r\nfi\r\n\r\ncd \/mnt\/server\r\necho -e \"install complete\"", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -35,7 +35,8 @@ "default_value": ".", "user_viewable": false, "user_editable": false, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" }, { "name": "Release Branch", @@ -44,7 +45,8 @@ "default_value": "release", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" }, { "name": "Server Password", @@ -53,7 +55,8 @@ "default_value": "ChangeMe", "user_viewable": true, "user_editable": true, - "rules": "nullable|string|min:6" + "rules": "nullable|string|min:6", + "field_type": "text" }, { "name": "Server Description", @@ -62,7 +65,8 @@ "default_value": "A Pterodactyl Hosted Server", "user_viewable": true, "user_editable": true, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" } ] } From 940eda73a1dd47fa4b831c45c38b337e99020bed Mon Sep 17 00:00:00 2001 From: Grant <99215336+runbgp@users.noreply.github.com> Date: Wed, 20 Jul 2022 17:32:49 -0400 Subject: [PATCH 0487/1001] Update beammp.json --- game_eggs/beamng/beammp/beammp.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/game_eggs/beamng/beammp/beammp.json b/game_eggs/beamng/beammp/beammp.json index 18388a3c..40eb5fd4 100644 --- a/game_eggs/beamng/beammp/beammp.json +++ b/game_eggs/beamng/beammp/beammp.json @@ -4,10 +4,10 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2022-04-17T16:09:38-05:00", - "name": "BeamMP", - "author": "me@grnt.dev", - "description": "Servers are an integral part of BeamMP; players are connected to each other through the server. They run natively on Windows and Linux. This Pterodactyl Egg makes it easier than ever to get a server up and running.\r\n\r\nYou can make private servers, which only people you invite can join, or public servers, which will show in our official server list.\r\n\r\nYou can read more about BeamMP Servers here https:\/\/wiki.beammp.com\/en\/home\/Server_Mod", + "exported_at": "2021-12-22T09:10:34+00:00", + "name": "BeamMP Servers", + "author": "noah@noahserver.online", + "description": "This is the server for the multiplayer mod BeamMP for the game BeamNG.drive. The server is the point through which all clients communicate. You can write lua mods for the server, detailed instructions on the BeamMP Wiki.", "features": null, "images": [ "ghcr.io\/parkervcp\/yolks:debian" From 860f40a4945dbda4826ee05fd0143089a1fc3a67 Mon Sep 17 00:00:00 2001 From: ICon Date: Sat, 23 Jul 2022 18:57:29 -0600 Subject: [PATCH 0488/1001] Fixed broken Minecraft Readme Links --- game_eggs/minecraft/README.md | 54 +++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/game_eggs/minecraft/README.md b/game_eggs/minecraft/README.md index 29f64f6f..74fec827 100644 --- a/game_eggs/minecraft/README.md +++ b/game_eggs/minecraft/README.md @@ -13,26 +13,26 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, ## [Java](java) Servers for Java Minecraft -* [Airplane](minecraft/java/airplane) -* [Cuberite](minecraft/java/cuberite) -* [Fabric](minecraft/java/fabric) -* [Feather](minecraft/java/feather) -* [Forge](minecraft/java/forge) - * [Forge](minecraft/java/forge/forge) - * [CusreForge Generic](minecraft/java/forge/curseforge-generic) -* [Feed The Beast](minecraft/java/ftb) -* [Glowstone](/minecraft/java/glowstone) -* [Krypton](/minecraft/java/krypton) -* [Magma](minecraft/java/magma) -* [Mohist](minecraft/java/mohist) -* [NanoLimbo](/minecraft/java/nanolimbo) -* [Paper](minecraft/java/paper) -* [Purpur](minecraft/java/purpur) -* [Spigot](minecraft/java/spigot) -* [SpongeForge](minecraft/java/spongeforge) -* [SpongeVanilla](minecraft/java/spongevanilla) -* [Technic](minecraft/java/technic) -* [VanillaCord](minecraft/java/vanillacord) +* [Airplane](java/airplane) +* [Cuberite](java/cuberite) +* [Fabric](java/fabric) +* [Feather](java/feather) +* [Forge](java/forge) + * [Forge](java/forge/forge) + * [CusreForge Generic](java/forge/curseforge-generic) +* [Feed The Beast](java/ftb) +* [Glowstone](java/glowstone) +* [Krypton](java/krypton) +* [Magma](java/magma) +* [Mohist](java/mohist) +* [NanoLimbo](java/nanolimbo) +* [Paper](java/paper) +* [Purpur](java/purpur) +* [Spigot](java/spigot) +* [SpongeForge](java/spongeforge) +* [SpongeVanilla](java/spongevanilla) +* [Technic](java/technic) +* [VanillaCord](java/vanillacord) ## [Proxies](proxy) Minecraft Server Proxies @@ -41,10 +41,10 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [Cross Platform](proxy/cross_platform) * [GeyserMC](proxy/cross_platform/geyser) * [Waterdog](proxy/cross_platform/waterdog) -* [Java](proxy/java) - * [FlameCord](proxy/java/flamecord) - * [Travertine](proxy/java/travertine) - * [TyphoonLimbo](proxy/java/typhoonlimbo) - * [Velocity](proxy/java/velocity) - * [VIAaas](proxy/java/viaaas) - * [Waterfall](proxy/java/waterfall) +* [Java](proxyjava) + * [FlameCord](proxyjava/flamecord) + * [Travertine](proxyjava/travertine) + * [TyphoonLimbo](proxyjava/typhoonlimbo) + * [Velocity](proxyjava/velocity) + * [VIAaas](proxyjava/viaaas) + * [Waterfall](proxyjava/waterfall) From 63bf3e497e0dd059c25e5b877b1a5f0550ec3aa3 Mon Sep 17 00:00:00 2001 From: ICon Date: Sat, 23 Jul 2022 19:13:23 -0600 Subject: [PATCH 0489/1001] Fixed previous MC Link Update --- game_eggs/minecraft/README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/game_eggs/minecraft/README.md b/game_eggs/minecraft/README.md index 74fec827..f949b939 100644 --- a/game_eggs/minecraft/README.md +++ b/game_eggs/minecraft/README.md @@ -41,10 +41,10 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [Cross Platform](proxy/cross_platform) * [GeyserMC](proxy/cross_platform/geyser) * [Waterdog](proxy/cross_platform/waterdog) -* [Java](proxyjava) - * [FlameCord](proxyjava/flamecord) - * [Travertine](proxyjava/travertine) - * [TyphoonLimbo](proxyjava/typhoonlimbo) - * [Velocity](proxyjava/velocity) - * [VIAaas](proxyjava/viaaas) - * [Waterfall](proxyjava/waterfall) +* [Java](proxy/java) + * [FlameCord](proxy/java/flamecord) + * [Travertine](proxy/java/travertine) + * [TyphoonLimbo](proxy/java/typhoonlimbo) + * [Velocity](proxy/java/velocity) + * [VIAaas](proxy/java/viaaas) + * [Waterfall](proxy/java/waterfall) From d5eaf2615482731162c3b06dbc33390b79228d90 Mon Sep 17 00:00:00 2001 From: toblerus <37512320+toblerus@users.noreply.github.com> Date: Mon, 25 Jul 2022 22:28:35 +0200 Subject: [PATCH 0490/1001] Added BetterCrewlink egg and edited READMEs --- game_eggs/among_us/README.md | 3 + .../among_us/bettercrewlink_server/README.md | 15 +++ .../egg-better-crewlink-server.json | 92 +++++++++++++++++++ 3 files changed, 110 insertions(+) create mode 100644 game_eggs/among_us/bettercrewlink_server/README.md create mode 100644 game_eggs/among_us/bettercrewlink_server/egg-better-crewlink-server.json diff --git a/game_eggs/among_us/README.md b/game_eggs/among_us/README.md index a87d34a4..7a63dd78 100644 --- a/game_eggs/among_us/README.md +++ b/game_eggs/among_us/README.md @@ -1,5 +1,8 @@ # Among Us +[BetterCrewLink Server](bettercrewlink_server) +This project implements proximity voice chat in Among Us. Everyone in an Among Us lobby with this program running will be able to communicate over voice in-game, with no third-party programs required. + [CrewLink Server](crewlink_server) This project implements proximity voice chat in Among Us. Everyone in an Among Us lobby with this program running will be able to communicate over voice in-game, with no third-party programs required. diff --git a/game_eggs/among_us/bettercrewlink_server/README.md b/game_eggs/among_us/bettercrewlink_server/README.md new file mode 100644 index 00000000..55a4cab3 --- /dev/null +++ b/game_eggs/among_us/bettercrewlink_server/README.md @@ -0,0 +1,15 @@ +# Among Us - BetterCrewLink Server + +## From their [Github](https://github.com/OhMyGuus/BetterCrewLink) + +This project implements proximity voice chat in Among Us. Everyone in an Among Us lobby with this program running will be able to communicate over voice in-game, with no third-party programs required. Spatial audio ensures that you can only hear people close to you. + +## Server Port + +Ports required to run the server in a table format. + +| Port | default (HTTPS enabled) | default (HTTPS disabled) | +|---------|---------|---------| +| Game | 443 | 9736 | + +Default port is 443 if HTTPS is enabled, and 9736 if not. But you can change to any port or domain/ip in the egg diff --git a/game_eggs/among_us/bettercrewlink_server/egg-better-crewlink-server.json b/game_eggs/among_us/bettercrewlink_server/egg-better-crewlink-server.json new file mode 100644 index 00000000..3a7f18e9 --- /dev/null +++ b/game_eggs/among_us/bettercrewlink_server/egg-better-crewlink-server.json @@ -0,0 +1,92 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2022-07-25T21:57:48+02:00", + "name": "BetterCrewlink Server", + "author": "tobiornotto@gmail.com", + "description": "An egg designed to allow support for Proximity Chat in Among Us using BetterCrewLink Server", + "features": null, + "docker_images": { + "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-12": "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-12" + }, + "file_denylist": [], + "startup": "yarn start", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \" BetterCrewLink Server started\"\r\n}", + "logs": "{}", + "stop": "^c" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nINSTALL_REPO=\"https:\/\/github.com\/OhMyGuus\/BetterCrewLink-server.git\"\r\necho -e Install repo set to ${INSTALL_REPO}\r\necho -e \"\/mnt\/server is empty.\\ncloning files from repo\"\r\necho -e \"running 'git clone --single-branch --branch ${BRANCH} ${INSTALL_REPO} .'\"\r\ngit clone --single-branch --branch ${BRANCH} ${INSTALL_REPO} .\r\n\r\nif [ -f \/mnt\/server\/package.json ]; then\r\n \/usr\/local\/bin\/yarn install\r\nfi\r\n\r\necho -e \"install complete\"\r\nexit 0", + "container": "node:12-buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Github branch", + "description": "Select one of the available BetterCrewLink-server branches available. Master per default.", + "env_variable": "BRANCH", + "default_value": "master", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20", + "field_type": "text" + }, + { + "name": "Domain", + "description": "The hostname or IP of the server (a record without a proxy so if you have cloudflare make a extra dns record named for example direct.domain.com and disable the proxy for that record (this is for the turn server)", + "env_variable": "HOSTNAME", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|max:50", + "field_type": "text" + }, + { + "name": "Server name", + "description": "Specifiy the name of your BetterCrewLink server", + "env_variable": "NAME", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:75", + "field_type": "text" + }, + { + "name": "Use HTTPS", + "description": "Enables https. You must place privkey.pem and fullchain.pem in your CWD.", + "env_variable": "HTTPS", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|max:20", + "field_type": "text" + }, + { + "name": "Path to SSL", + "description": "Alternate path to SSL certificates.", + "env_variable": "SSLPATH", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|max:250", + "field_type": "text" + }, + { + "name": "Port", + "description": "Choose the port your server should run on", + "env_variable": "PORT", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20", + "field_type": "text" + } + ] +} \ No newline at end of file From 4c7583d455541c105e0b38d026dd949d61a61ce0 Mon Sep 17 00:00:00 2001 From: toblerus <37512320+toblerus@users.noreply.github.com> Date: Mon, 25 Jul 2022 22:39:47 +0200 Subject: [PATCH 0491/1001] Changed Domain variable description --- .../bettercrewlink_server/egg-better-crewlink-server.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/among_us/bettercrewlink_server/egg-better-crewlink-server.json b/game_eggs/among_us/bettercrewlink_server/egg-better-crewlink-server.json index 3a7f18e9..4a3a393d 100644 --- a/game_eggs/among_us/bettercrewlink_server/egg-better-crewlink-server.json +++ b/game_eggs/among_us/bettercrewlink_server/egg-better-crewlink-server.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-07-25T21:57:48+02:00", + "exported_at": "2022-07-25T22:35:11+02:00", "name": "BetterCrewlink Server", "author": "tobiornotto@gmail.com", "description": "An egg designed to allow support for Proximity Chat in Among Us using BetterCrewLink Server", @@ -40,7 +40,7 @@ }, { "name": "Domain", - "description": "The hostname or IP of the server (a record without a proxy so if you have cloudflare make a extra dns record named for example direct.domain.com and disable the proxy for that record (this is for the turn server)", + "description": "Domain of your server or ip of your server", "env_variable": "HOSTNAME", "default_value": "", "user_viewable": true, From bc93c5ff18f4ab1efbdb8075294d251b9e12eef8 Mon Sep 17 00:00:00 2001 From: toblerus <37512320+toblerus@users.noreply.github.com> Date: Mon, 25 Jul 2022 22:43:41 +0200 Subject: [PATCH 0492/1001] Fixed variable description typo --- .../bettercrewlink_server/egg-better-crewlink-server.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/among_us/bettercrewlink_server/egg-better-crewlink-server.json b/game_eggs/among_us/bettercrewlink_server/egg-better-crewlink-server.json index 4a3a393d..ab1b7f25 100644 --- a/game_eggs/among_us/bettercrewlink_server/egg-better-crewlink-server.json +++ b/game_eggs/among_us/bettercrewlink_server/egg-better-crewlink-server.json @@ -30,7 +30,7 @@ "variables": [ { "name": "Github branch", - "description": "Select one of the available BetterCrewLink-server branches available. Master per default.", + "description": "Select one of the available BetterCrewLink-server branches. Master per default.", "env_variable": "BRANCH", "default_value": "master", "user_viewable": true, From 01a123b4ba9a3a55f5a40901362c19d31f0cbc5a Mon Sep 17 00:00:00 2001 From: toblerus <37512320+toblerus@users.noreply.github.com> Date: Mon, 25 Jul 2022 23:49:13 +0200 Subject: [PATCH 0493/1001] Updated to use new yolk image --- .../bettercrewlink_server/egg-better-crewlink-server.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/among_us/bettercrewlink_server/egg-better-crewlink-server.json b/game_eggs/among_us/bettercrewlink_server/egg-better-crewlink-server.json index ab1b7f25..8ffd1b97 100644 --- a/game_eggs/among_us/bettercrewlink_server/egg-better-crewlink-server.json +++ b/game_eggs/among_us/bettercrewlink_server/egg-better-crewlink-server.json @@ -4,13 +4,13 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-07-25T22:35:11+02:00", + "exported_at": "2022-07-25T23:48:33+02:00", "name": "BetterCrewlink Server", "author": "tobiornotto@gmail.com", "description": "An egg designed to allow support for Proximity Chat in Among Us using BetterCrewLink Server", "features": null, "docker_images": { - "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-12": "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-12" + "ghcr.io\/parkervcp\/yolks:nodejs_12": "ghcr.io\/parkervcp\/yolks:nodejs_12" }, "file_denylist": [], "startup": "yarn start", From 201771a075e7c9e00d7e259f54996ff1cc031ba4 Mon Sep 17 00:00:00 2001 From: NotDemonix <90858555+NotDemonix@users.noreply.github.com> Date: Wed, 27 Jul 2022 10:08:32 +0200 Subject: [PATCH 0494/1001] Nodejs18 support for discord.js-generic egg I also tested this to make sure everything works --- bots/discord/discord.js/egg-discord-js-generic.json | 1 + 1 file changed, 1 insertion(+) diff --git a/bots/discord/discord.js/egg-discord-js-generic.json b/bots/discord/discord.js/egg-discord-js-generic.json index 3085b663..dd8ce583 100644 --- a/bots/discord/discord.js/egg-discord-js-generic.json +++ b/bots/discord/discord.js/egg-discord-js-generic.json @@ -10,6 +10,7 @@ "description": "a generic discord js bot egg\r\n\r\nThis will clone a git repo for a bot. it defaults to master if no branch is specified.\r\n\r\nInstalls the node_modules on install. If you set user_upload then I assume you know what you are doing.", "features": null, "images": [ + "ghcr.io\/parkervcp\/yolks:nodejs_18", "ghcr.io\/parkervcp\/yolks:nodejs_17", "ghcr.io\/parkervcp\/yolks:nodejs_16", "ghcr.io\/parkervcp\/yolks:nodejs_15", From b749113b816cf474ef1bf103bd409943c9a38d8f Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Thu, 28 Jul 2022 18:56:43 +0200 Subject: [PATCH 0495/1001] Update egg-pocketmine-m-p.json --- .../pocketmine_mp/egg-pocketmine-m-p.json | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json b/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json index aebd5da2..85deba50 100644 --- a/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json +++ b/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json @@ -1,17 +1,17 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1", + "version": "PTDL_v2", "update_url": null }, - "exported_at": "2021-12-11T19:52:34+00:00", + "exported_at": "2022-07-28T18:56:34+02:00", "name": "PocketmineMP", "author": "info@swisscrafting.ch", "description": "Pocketmine Egg\r\nby onekintaro from swisscrafting.ch\r\nwith the nice help from #eggs Channel on Pterodactyl-Discord :)", "features": null, - "images": [ - "ghcr.io\/parkervcp\/yolks:debian" - ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:debian": "ghcr.io\/parkervcp\/yolks:debian" + }, "file_denylist": [], "startup": ".\/bin\/php7\/bin\/php .\/PocketMine-MP.phar --no-wizard --disable-ansi", "config": { @@ -22,8 +22,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\n# This is already installed in our Script container image. Leaving it here for future reference | apt install -y curl jq\r\n\r\ncd \/mnt\/server\r\n\r\n# Restrict versions to latest pm3 and pm4 for now.\r\nif [[ \"${VERSION}\" == \"pm4\" ]] || [[ \"${VERSION}\" == \"\" ]]; then\r\n DOWNLOAD_LINK=$(curl -ssL https:\/\/update.pmmp.io\/api?channel=stable | grep 'download_url' | cut -d '\"' -f 4)\r\n echo -e \"Downloading latest PocketMine 4 from ${DOWNLOAD_LINK}\"\r\n curl -ssL \"${DOWNLOAD_LINK}\" -o PocketMine-MP.phar\r\nelif [[ \"${VERSION}\" == \"pm3\" ]]; then\r\n DOWNLOAD_LINK=$(curl -ssL https:\/\/update.pmmp.io\/api?channel=pm3 | grep 'download_url' | cut -d '\"' -f 4)\r\n echo -e \"Downloading latest PocketMine 3 from ${DOWNLOAD_LINK}\"\r\n curl -ssL \"${DOWNLOAD_LINK}\" -o PocketMine-MP.phar\r\nelse\r\n echo -e \"Unknown version ${VERSION}\"\r\n exit 1\r\nfi\r\n\r\necho -e \"\\n downloading latest php build from PocketMine https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\r\n\r\nif [[ ! -f server.properties ]]; then\r\n echo -e \"\\n downloading default server.properties\"\r\n curl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/pocketmine_mp\/server.properties >server.properties\r\nfi\r\n\r\necho -e \"\\n unpacking php binaries\"\r\ntar -xzvf php.binary.tar.gz\r\n\r\necho -e \"\\n removing php packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n configuring PHP extensions library directory\"\r\nEXTENSION_DIR=$(find \"bin\" -name *debug-zts*)\r\ngrep -q '^extension_dir' bin\/php7\/bin\/php.ini && sed -i'bak' \"s{^extension_dir=.*{extension_dir=\\\"$EXTENSION_DIR\\\"{\" bin\/php7\/bin\/php.ini || echo \"extension_dir=\\\"$EXTENSION_DIR\\\"\" >>bin\/php7\/bin\/php.ini\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.txt banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs\r\n\r\necho -e \"\\n\\nInstall script completed. Enjoy!\"", - "container": "ghcr.io\/parkervcp\/installers:debian", + "script": "#!\/bin\/bash\r\n\r\n# This is already installed in our Script container image. Leaving it here for future reference | apt install -y curl jq\r\n\r\napt update\r\napt install -y git curl wget jq file tar unzip zip\r\n\r\ncd \/mnt\/server\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"amd64\" || echo \"arm64\")\r\n\r\necho ${ARCH}\r\n\r\n# Restrict versions to latest pm3 and pm4 for now.\r\nif [[ \"${VERSION}\" == \"pm4\" ]] || [[ \"${VERSION}\" == \"\" ]]; then\r\n DOWNLOAD_LINK=$(curl -ssL https:\/\/update.pmmp.io\/api?channel=stable | grep 'download_url' | cut -d '\"' -f 4)\r\n echo -e \"Downloading latest PocketMine 4 from ${DOWNLOAD_LINK}\"\r\n curl -ssL \"${DOWNLOAD_LINK}\" -o PocketMine-MP.phar\r\nelif [[ \"${VERSION}\" == \"pm3\" ]]; then\r\n DOWNLOAD_LINK=$(curl -ssL https:\/\/update.pmmp.io\/api?channel=pm3 | grep 'download_url' | cut -d '\"' -f 4)\r\n echo -e \"Downloading latest PocketMine 3 from ${DOWNLOAD_LINK}\"\r\n curl -ssL \"${DOWNLOAD_LINK}\" -o PocketMine-MP.phar\r\nelse\r\n echo -e \"Unknown version ${VERSION}\"\r\n exit 1\r\nfi\r\n\r\n\r\n\r\nif [[ \"${ARCH}\" == \"amd64\" ]]; then\r\necho \"amd64 php\"\r\necho -e \"\\n downloading latest php build from PocketMine https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\r\n\r\necho -e \"\\n unpacking php binaries\"\r\ntar -xzvf php.binary.tar.gz\r\n\r\necho -e \"\\n removing php packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n configuring PHP extensions library directory\"\r\nEXTENSION_DIR=$(find \"bin\" -name *debug-zts*)\r\ngrep -q '^extension_dir' bin\/php7\/bin\/php.ini && sed -i'bak' \"s{^extension_dir=.*{extension_dir=\\\"$EXTENSION_DIR\\\"{\" bin\/php7\/bin\/php.ini || echo \"extension_dir=\\\"$EXTENSION_DIR\\\"\" >>bin\/php7\/bin\/php.ini\r\nelse\r\necho \"arm64 php\"\r\necho \"please wait, this will take some time\"\r\napt install -y libtool-bin libtool make autoconf automake m4 gzip bzip2 bison g++ git cmake pkg-config re2c\r\nwget https:\/\/raw.githubusercontent.com\/pmmp\/php-build-scripts\/stable\/compile.sh -O compile.sh \r\nchmod +x compile.sh\r\necho \"please wait, this will take some time\"\r\n.\/compile.sh\r\nrm compile.sh\r\nrm -rf install_data\/\r\necho -e \"\\n configuring PHP extensions library directory\"\r\nEXTENSION_DIR=$(find \"bin\" -name *debug-zts*)\r\ngrep -q '^extension_dir' bin\/php7\/bin\/php.ini && sed -i'bak' \"s{^extension_dir=.*{extension_dir=\\\"$EXTENSION_DIR\\\"{\" bin\/php7\/bin\/php.ini || echo \"extension_dir=\\\"$EXTENSION_DIR\\\"\" >>bin\/php7\/bin\/php.ini\r\nfi\r\n\r\n\r\nif [[ ! -f server.properties ]]; then\r\n echo -e \"\\n downloading default server.properties\"\r\n curl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/pocketmine_mp\/server.properties >server.properties\r\nfi\r\n\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.txt banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs\r\n\r\necho -e \"\\n\\nInstall script completed. Enjoy!\"", + "container": "ghcr.io\/pterodactyl\/installers:debian", "entrypoint": "bash" } }, @@ -35,7 +35,8 @@ "default_value": "pm4", "user_viewable": true, "user_editable": true, - "rules": "required|string|in:pm3,pm4" + "rules": "required|string|in:pm3,pm4", + "field_type": "text" } ] -} \ No newline at end of file +} From 55e9f49ddacd6d8c76b94f36899e39cc2cd5d112 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Thu, 28 Jul 2022 19:05:36 +0200 Subject: [PATCH 0496/1001] remove debug flags out of install script --- .../minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json b/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json index 85deba50..add3021f 100644 --- a/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json +++ b/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-07-28T18:56:34+02:00", + "exported_at": "2022-07-28T19:04:48+02:00", "name": "PocketmineMP", "author": "info@swisscrafting.ch", "description": "Pocketmine Egg\r\nby onekintaro from swisscrafting.ch\r\nwith the nice help from #eggs Channel on Pterodactyl-Discord :)", @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\n# This is already installed in our Script container image. Leaving it here for future reference | apt install -y curl jq\r\n\r\napt update\r\napt install -y git curl wget jq file tar unzip zip\r\n\r\ncd \/mnt\/server\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"amd64\" || echo \"arm64\")\r\n\r\necho ${ARCH}\r\n\r\n# Restrict versions to latest pm3 and pm4 for now.\r\nif [[ \"${VERSION}\" == \"pm4\" ]] || [[ \"${VERSION}\" == \"\" ]]; then\r\n DOWNLOAD_LINK=$(curl -ssL https:\/\/update.pmmp.io\/api?channel=stable | grep 'download_url' | cut -d '\"' -f 4)\r\n echo -e \"Downloading latest PocketMine 4 from ${DOWNLOAD_LINK}\"\r\n curl -ssL \"${DOWNLOAD_LINK}\" -o PocketMine-MP.phar\r\nelif [[ \"${VERSION}\" == \"pm3\" ]]; then\r\n DOWNLOAD_LINK=$(curl -ssL https:\/\/update.pmmp.io\/api?channel=pm3 | grep 'download_url' | cut -d '\"' -f 4)\r\n echo -e \"Downloading latest PocketMine 3 from ${DOWNLOAD_LINK}\"\r\n curl -ssL \"${DOWNLOAD_LINK}\" -o PocketMine-MP.phar\r\nelse\r\n echo -e \"Unknown version ${VERSION}\"\r\n exit 1\r\nfi\r\n\r\n\r\n\r\nif [[ \"${ARCH}\" == \"amd64\" ]]; then\r\necho \"amd64 php\"\r\necho -e \"\\n downloading latest php build from PocketMine https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\r\n\r\necho -e \"\\n unpacking php binaries\"\r\ntar -xzvf php.binary.tar.gz\r\n\r\necho -e \"\\n removing php packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n configuring PHP extensions library directory\"\r\nEXTENSION_DIR=$(find \"bin\" -name *debug-zts*)\r\ngrep -q '^extension_dir' bin\/php7\/bin\/php.ini && sed -i'bak' \"s{^extension_dir=.*{extension_dir=\\\"$EXTENSION_DIR\\\"{\" bin\/php7\/bin\/php.ini || echo \"extension_dir=\\\"$EXTENSION_DIR\\\"\" >>bin\/php7\/bin\/php.ini\r\nelse\r\necho \"arm64 php\"\r\necho \"please wait, this will take some time\"\r\napt install -y libtool-bin libtool make autoconf automake m4 gzip bzip2 bison g++ git cmake pkg-config re2c\r\nwget https:\/\/raw.githubusercontent.com\/pmmp\/php-build-scripts\/stable\/compile.sh -O compile.sh \r\nchmod +x compile.sh\r\necho \"please wait, this will take some time\"\r\n.\/compile.sh\r\nrm compile.sh\r\nrm -rf install_data\/\r\necho -e \"\\n configuring PHP extensions library directory\"\r\nEXTENSION_DIR=$(find \"bin\" -name *debug-zts*)\r\ngrep -q '^extension_dir' bin\/php7\/bin\/php.ini && sed -i'bak' \"s{^extension_dir=.*{extension_dir=\\\"$EXTENSION_DIR\\\"{\" bin\/php7\/bin\/php.ini || echo \"extension_dir=\\\"$EXTENSION_DIR\\\"\" >>bin\/php7\/bin\/php.ini\r\nfi\r\n\r\n\r\nif [[ ! -f server.properties ]]; then\r\n echo -e \"\\n downloading default server.properties\"\r\n curl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/pocketmine_mp\/server.properties >server.properties\r\nfi\r\n\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.txt banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs\r\n\r\necho -e \"\\n\\nInstall script completed. Enjoy!\"", + "script": "#!\/bin\/bash\r\n\r\n\r\napt update\r\napt install -y git curl wget jq file tar unzip zip\r\n\r\ncd \/mnt\/server\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"amd64\" || echo \"arm64\")\r\n\r\n# Restrict versions to latest pm3 and pm4 for now.\r\nif [[ \"${VERSION}\" == \"pm4\" ]] || [[ \"${VERSION}\" == \"\" ]]; then\r\n DOWNLOAD_LINK=$(curl -ssL https:\/\/update.pmmp.io\/api?channel=stable | grep 'download_url' | cut -d '\"' -f 4)\r\n echo -e \"Downloading latest PocketMine 4 from ${DOWNLOAD_LINK}\"\r\n curl -ssL \"${DOWNLOAD_LINK}\" -o PocketMine-MP.phar\r\nelif [[ \"${VERSION}\" == \"pm3\" ]]; then\r\n DOWNLOAD_LINK=$(curl -ssL https:\/\/update.pmmp.io\/api?channel=pm3 | grep 'download_url' | cut -d '\"' -f 4)\r\n echo -e \"Downloading latest PocketMine 3 from ${DOWNLOAD_LINK}\"\r\n curl -ssL \"${DOWNLOAD_LINK}\" -o PocketMine-MP.phar\r\nelse\r\n echo -e \"Unknown version ${VERSION}\"\r\n exit 1\r\nfi\r\n\r\n\r\n\r\nif [[ \"${ARCH}\" == \"amd64\" ]]; then\r\necho -e \"\\n downloading latest php build from PocketMine https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\r\n\r\necho -e \"\\n unpacking php binaries\"\r\ntar -xzvf php.binary.tar.gz\r\n\r\necho -e \"\\n removing php packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n configuring PHP extensions library directory\"\r\nEXTENSION_DIR=$(find \"bin\" -name *debug-zts*)\r\ngrep -q '^extension_dir' bin\/php7\/bin\/php.ini && sed -i'bak' \"s{^extension_dir=.*{extension_dir=\\\"$EXTENSION_DIR\\\"{\" bin\/php7\/bin\/php.ini || echo \"extension_dir=\\\"$EXTENSION_DIR\\\"\" >>bin\/php7\/bin\/php.ini\r\nelse\r\napt install -y libtool-bin libtool make autoconf automake m4 gzip bzip2 bison g++ git cmake pkg-config re2c\r\n\r\nwget https:\/\/raw.githubusercontent.com\/pmmp\/php-build-scripts\/stable\/compile.sh -O compile.sh \r\nchmod +x compile.sh\r\n\r\necho \"please wait, this will take some time\"\r\n.\/compile.sh\r\nrm compile.sh\r\nrm -rf install_data\/\r\n\r\necho -e \"\\n configuring PHP extensions library directory\"\r\nEXTENSION_DIR=$(find \"bin\" -name *debug-zts*)\r\ngrep -q '^extension_dir' bin\/php7\/bin\/php.ini && sed -i'bak' \"s{^extension_dir=.*{extension_dir=\\\"$EXTENSION_DIR\\\"{\" bin\/php7\/bin\/php.ini || echo \"extension_dir=\\\"$EXTENSION_DIR\\\"\" >>bin\/php7\/bin\/php.ini\r\n\r\nfi\r\n\r\n\r\nif [[ ! -f server.properties ]]; then\r\n echo -e \"\\n downloading default server.properties\"\r\n curl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/pocketmine_mp\/server.properties >server.properties\r\nfi\r\n\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.txt banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs\r\n\r\necho -e \"\\n\\nInstall script completed. Enjoy!\"", "container": "ghcr.io\/pterodactyl\/installers:debian", "entrypoint": "bash" } From fe354c1989b3b486fd14b0dc579696e45201ebea Mon Sep 17 00:00:00 2001 From: ChrissQuartz <69059820+thecrazytech1@users.noreply.github.com> Date: Tue, 2 Aug 2022 14:11:04 +1000 Subject: [PATCH 0497/1001] Grammar PhantomBot README Change S in the word website, to a lowercase s in PhantomBot README --- bots/twitch/phantombot/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bots/twitch/phantombot/README.md b/bots/twitch/phantombot/README.md index ab9e186f..5055ed09 100644 --- a/bots/twitch/phantombot/README.md +++ b/bots/twitch/phantombot/README.md @@ -1,6 +1,6 @@ # PhantomBot -[WebSite](https://phantombot.github.io/PhantomBot/) +[Website](https://phantombot.github.io/PhantomBot/) [GitHub](https://github.com/phantombot/PhantomBot) PhantomBot is an actively developed open source interactive Twitch bot with a vibrant community that provides entertainment and moderation for your channel, allowing you to focus on what matters the most to you - your game and your viewers. From 6a01cfe5cc0bdaf3cec1c00f480d70e8958294e0 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Wed, 3 Aug 2022 17:49:23 +0200 Subject: [PATCH 0498/1001] fix typo --- game_eggs/rdr/redm/egg-red-m.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/rdr/redm/egg-red-m.json b/game_eggs/rdr/redm/egg-red-m.json index 6dae0027..fca67286 100644 --- a/game_eggs/rdr/redm/egg-red-m.json +++ b/game_eggs/rdr/redm/egg-red-m.json @@ -24,7 +24,7 @@ "installation": { "script": "#!\/bin\/ash\r\n# CFx Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update -y\r\napt install -y tar xz-utils file jq\r\n\r\nmkdir -p \/mnt\/server\/resources \/mnt\/server\/logs\/\r\n\r\ncd \/mnt\/server\r\n\r\necho \"updating citizenfx resource files\"\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/tmp\r\ncp -Rf \/tmp\/resources\/* resources\/\r\n\r\nRELEASE_PAGE=$(curl -sSL https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/)\r\nCHANGELOGS_PAGE=$(curl -sSL https:\/\/changelogs-live.fivem.net\/api\/changelog\/versions\/linux\/server)\r\n\r\nif [[ \"${CFX_VERSION}\" == \"recommended\" ]] || [[ -z ${CFX_VERSION} ]]; then\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.recommended_download')\r\nelif [[ \"${CFX_VERSION}\" == \"latest\" ]]; then\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.latest_download')\r\nelse\r\n VERSION_LINK=$(echo -e \"${RELEASE_PAGE}\" | grep -Eo '\".*\/*.tar.xz\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | sed 's\/\\.\\\/\/\/1' | grep ${CFX_VERSION})\r\n if [[ \"${VERSION_LINK}\" == \"\" ]]; then\r\n echo -e \"defaulting to recommedned as the version requested was invalid.\"\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.recommended_download')\r\n else\r\n DOWNLOAD_LINK=$(echo https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${VERSION_LINK})\r\n fi\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else\r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\necho -e \"Running curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\"\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho \"Extracting fivem files\"\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"XZ\" ]; then\r\n tar xvf ${DOWNLOAD_LINK##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exiting\"\r\n exit 2\r\nfi\r\n\r\nrm -rf ${DOWNLOAD_LINK##*\/} run.sh\r\n\r\nif [ -e server.cfg ]; then\r\n echo \"server config file exists\"\r\nelse\r\n echo \"Downloading default fivem config\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/gta\/fivem\/server.cfg >>server.cfg\r\nfi\r\n\r\necho \"install complete\"", "container": "ghcr.io\/parkervcp\/installers:debian", - "entrypoint": "ash" + "entrypoint": "bash" } }, "variables": [ @@ -89,4 +89,4 @@ "field_type": "text" } ] -} \ No newline at end of file +} From d7a9961e720f2b6eee35f3396cd6985986e485a1 Mon Sep 17 00:00:00 2001 From: Eye <54536469+EyeDevs@users.noreply.github.com> Date: Fri, 5 Aug 2022 20:17:05 +0200 Subject: [PATCH 0499/1001] Typo for bash Changed ash to bash (fixed timedout problem for me) --- game_eggs/gta/fivem/egg-five-m.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/gta/fivem/egg-five-m.json b/game_eggs/gta/fivem/egg-five-m.json index 9752a14a..7d08e922 100644 --- a/game_eggs/gta/fivem/egg-five-m.json +++ b/game_eggs/gta/fivem/egg-five-m.json @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# FiveM Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update -y\r\napt install -y tar xz-utils file jq\r\n\r\nmkdir -p \/mnt\/server\/resources\r\n\r\ncd \/mnt\/server\r\n\r\necho \"updating citizenfx resource files\"\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/tmp\r\ncp -Rf \/tmp\/resources\/* resources\/\r\n\r\nRELEASE_PAGE=$(curl -sSL https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/)\r\nCHANGELOGS_PAGE=$(curl -sSL https:\/\/changelogs-live.fivem.net\/api\/changelog\/versions\/linux\/server)\r\n\r\nif [[ \"${FIVEM_VERSION}\" == \"recommended\" ]] || [[ -z ${FIVEM_VERSION} ]]; then\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.recommended_download')\r\nelif [[ \"${FIVEM_VERSION}\" == \"latest\" ]]; then\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.latest_download')\r\nelse\r\n VERSION_LINK=$(echo -e \"${RELEASE_PAGE}\" | grep -Eo '\".*\/*.tar.xz\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | sed 's\/\\.\\\/\/\/1' | grep ${CFX_VERSION})\r\n if [[ \"${VERSION_LINK}\" == \"\" ]]; then\r\n echo -e \"defaulting to recommedned as the version requested was invalid.\"\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.recommended_download')\r\n else\r\n DOWNLOAD_LINK=$(echo https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${VERSION_LINK})\r\n fi\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else\r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\necho -e \"Running curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\"\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho \"Extracting fivem files\"\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"XZ\" ]; then\r\n tar xvf ${DOWNLOAD_LINK##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exiting\"\r\n exit 2\r\nfi\r\n\r\nrm -rf ${DOWNLOAD_LINK##*\/} run.sh\r\n\r\nif [ -e server.cfg ]; then\r\n echo \"Skipping downloading default server config file as one already exists\"\r\nelse\r\n echo \"Downloading default fivem config\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/gta\/fivem\/server.cfg >>server.cfg\r\nfi\r\n\r\nmkdir -p logs\/\r\n\r\necho \"install complete\"", + "script": "#!\/bin\/bash\r\n# FiveM Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update -y\r\napt install -y tar xz-utils file jq\r\n\r\nmkdir -p \/mnt\/server\/resources\r\n\r\ncd \/mnt\/server\r\n\r\necho \"updating citizenfx resource files\"\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/tmp\r\ncp -Rf \/tmp\/resources\/* resources\/\r\n\r\nRELEASE_PAGE=$(curl -sSL https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/)\r\nCHANGELOGS_PAGE=$(curl -sSL https:\/\/changelogs-live.fivem.net\/api\/changelog\/versions\/linux\/server)\r\n\r\nif [[ \"${FIVEM_VERSION}\" == \"recommended\" ]] || [[ -z ${FIVEM_VERSION} ]]; then\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.recommended_download')\r\nelif [[ \"${FIVEM_VERSION}\" == \"latest\" ]]; then\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.latest_download')\r\nelse\r\n VERSION_LINK=$(echo -e \"${RELEASE_PAGE}\" | grep -Eo '\".*\/*.tar.xz\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | sed 's\/\\.\\\/\/\/1' | grep ${CFX_VERSION})\r\n if [[ \"${VERSION_LINK}\" == \"\" ]]; then\r\n echo -e \"defaulting to recommedned as the version requested was invalid.\"\r\n DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.recommended_download')\r\n else\r\n DOWNLOAD_LINK=$(echo https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${VERSION_LINK})\r\n fi\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else\r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\necho -e \"Running curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\"\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho \"Extracting fivem files\"\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"XZ\" ]; then\r\n tar xvf ${DOWNLOAD_LINK##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exiting\"\r\n exit 2\r\nfi\r\n\r\nrm -rf ${DOWNLOAD_LINK##*\/} run.sh\r\n\r\nif [ -e server.cfg ]; then\r\n echo \"Skipping downloading default server config file as one already exists\"\r\nelse\r\n echo \"Downloading default fivem config\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/gta\/fivem\/server.cfg >>server.cfg\r\nfi\r\n\r\nmkdir -p logs\/\r\n\r\necho \"install complete\"", "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } @@ -109,4 +109,4 @@ "field_type": "text" } ] -} \ No newline at end of file +} From bb945488ac2ec6fea6d1f4b1cc8cbd03aaa661f7 Mon Sep 17 00:00:00 2001 From: Elite Espeon Date: Sat, 6 Aug 2022 10:51:06 -0400 Subject: [PATCH 0500/1001] Change Murse download to use correct download link --- game_eggs/steamcmd_servers/open_fortress/egg-open-fortress.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/open_fortress/egg-open-fortress.json b/game_eggs/steamcmd_servers/open_fortress/egg-open-fortress.json index 577ef45c..e3bbd203 100644 --- a/game_eggs/steamcmd_servers/open_fortress/egg-open-fortress.json +++ b/game_eggs/steamcmd_servers/open_fortress/egg-open-fortress.json @@ -24,7 +24,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates p7zip-full wget\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\nSTEAM_USER=anonymous\r\nSTEAM_PASS=\"\"\r\nSTEAM_AUTH=\"\"\r\nfi\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\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\nexport HOME=\/mnt\/server\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n## install tf2 content using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server\/tf2 +app_update 232250 ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n## download OpenFortress\r\ncd \/mnt\/server\r\nmv bin bin_dontdeleteme\r\nwget https:\/\/dl.spiderden.net\/murse\/linux -O murse 2> \/dev\/null\r\nchmod +x murse\r\n.\/murse upgrade -u https:\/\/toast1.openfortress.fun\/toast -c $(curl https:\/\/toast1.openfortress.fun\/toast\/reithreads) asdrggvead\/open_fortress\r\nmv \/mnt\/server\/asdrggvead\/open_fortress \/mnt\/server\/open_fortress\r\nrm -rf asdrggvead\r\nmv bin_dontdeleteme bin\r\n## add fixed gameinfo\r\ncd \/mnt\/server\/open_fortress\r\nrm -rf gameinfo.txt\r\ncat >> gameinfo.txt << EOF\r\n\"GameInfo\"\r\n{\r\ngame \"Open Fortress\"\r\ntitle \"\"\r\ntitle2 \"\"\r\ngamelogo \"1\"\r\ndeveloper \"https:\/\/github.com\/AgitationSkeleton\/open_fortress\/blob\/master\/credits.txt\"\r\ndeveloper_url\t\"https:\/\/github.com\/KaidemonLP\/Open-Fortress-Source\"\r\nmanual \"\"\r\ntype \"multiplayer_only\"\r\nhasportals \"0\" \/\/ gameui.dll\r\nhashdcontent\t\"0\" \/\/ gameui.dll\r\nnomodels \"0\" \/\/ gameui.dll\r\nnohimodel \"0\" \/\/ gameui.dll\r\nnocrosshair \"0\" \/\/ gameui.dll\r\nadvcrosshair \"1\" \/\/ gameui.dll\r\nnodifficulty\t\"1\" \/\/ gameui.dll\r\nsupportsvr \"0\" \/\/ engine.dll + gameui.dll\r\nbots \"0\" \/\/ gameui.dll\r\nnodegraph \"1\" \/\/ engine.dll\r\nperfwizard \"0\" \/\/ unused\r\nSupportsDX8 \"0\" \/\/ unused\r\nSupportsDX9 \"1\" \/\/ unused\r\nSupportsDX10\t\"0\" \/\/ unused\r\nSupportsDX11\t\"0\" \/\/ unused\r\nSupportsXbox\t\"0\" \/\/ unused\r\nSupportsXbox360\t\"0\" \/\/ unused\r\nSupportsXboxOne\t\"0\" \/\/ unused\r\nSupportsPS3 \"0\" \/\/ unused\r\nSupportsPS4 \"0\" \/\/ unused\r\nicon \"resource\/game\"\r\nGameData \"ofd_fic2.fgd\"\r\nInstancePath\t\"maps\/instances\/\"\r\nhidden_maps\r\n{\r\n\"test_speakers\" 1\r\n\"test_hardware\" 1\r\n\"background01\" 1\r\n\"background02\" 1\r\n\"background03\" 1\r\n\"background04\" 1\r\n\"background05\" 1\r\n\"background06\" 1\r\n\"background07\" 1\r\n\"background08\" 1\r\n\"background09\" 1\r\n\"background12\" 1\r\n\"background15\" 1\r\n\"ep1_c17_00\" 1\r\n\"ep1_c17_00a\" 1\r\n\"ep1_c17_01\" 1\r\n\"ep1_c17_01a\" 1\r\n\"ep1_c17_02\" 1\r\n\"ep1_c17_02a\" 1\r\n\"ep1_c17_02b\" 1\r\n\"ep1_c17_05\" 1\r\n\"ep1_c17_06\" 1\r\n\"ep1_citadel_00\"\t1\r\n\"ep1_citadel_00_demo\" 1\r\n\"ep1_citadel_01\"\t1\r\n\"ep1_citadel_02\"\t1\r\n\"ep1_citadel_02b\"\t1\r\n\"ep1_citadel_03\"\t1\r\n\"ep1_citadel_04\"\t1\r\n\"ep1_background01\"\t1\r\n\"ep1_background01a\"\t1\r\n\"ep1_background02\"\t1\r\n\"ep2_outland_01\"\t1\r\n\"ep2_outland_01a\"\t1\r\n\"ep2_outland_02\"\t1\r\n\"ep2_outland_03\"\t1\r\n\"ep2_outland_04\"\t1\r\n\"ep2_outland_05\"\t1\r\n\"ep2_outland_06\"\t1\r\n\"ep2_outland_06a\"\t1\r\n\"ep2_outland_07\"\t1\r\n\"ep2_outland_08\"\t1\r\n\"ep2_outland_09\"\t1\r\n\"ep2_outland_10\"\t1\r\n\"ep2_outland_10a\"\t1\r\n\"ep2_outland_11\"\t1\r\n\"ep2_outland_11a\"\t1\r\n\"ep2_outland_11b\"\t1\r\n\"ep2_outland_12\"\t1\r\n\"ep2_outland_12a\"\t1\r\n\"ep2_background01\"\t1\r\n\"ep2_background02\"\t1\r\n\"ep2_background02a\"\t1\r\n\"ep2_background03\"\t1\r\n\"credits\" 1\r\n\"vst_lostcoast\" 1\r\n\"test\" 1\r\n\"sdk_vehicles\" 1\r\n}\r\nFileSystem\r\n{\r\nSteamAppId 243750\r\nSearchPaths\r\n{\r\ngame+mod |gameinfo_path|custom\/*\r\ngame+game_write+mod+mod_write+default_write_path |gameinfo_path|.\r\ngamebin |gameinfo_path|bin\r\n\/\/ The lines below until the BREAK comment are responsible for the game resources to work properly\r\n\/\/ in Hammer and other Source tools. The default setup assumes that you have everything (Steam, TF2,\r\n\/\/ Source SDK and OF) in the same drive letter\/partition. If you have a different storage configuration,\r\n\/\/ feel free to modify the paths below between quotes (example: D:\\Steam\\steamapps\\common\\Team Fortress 2\\tf).\r\ngame \"\/home\/container\/tf2\/tf\/tf2_misc.vpk\"\r\ngame \"\/home\/container\/tf2\/tf\/tf2_sound_misc.vpk\"\r\ngame \"\/home\/container\/tf2\/tf\/tf2_sound_vo_english.vpk\"\r\ngame \"\/home\/container\/tf2\/tf\/tf2_textures.vpk\"\r\ngame \"\/home\/container\/tf2\/tf\"\r\ngame \"\/home\/container\/tf2\/hl2\/hl2_textures.vpk\"\r\ngame \"\/home\/container\/tf2\/hl2\/hl2_sound_vo_english.vpk\"\r\ngame \"\/home\/container\/tf2\/hl2\/hl2_sound_misc.vpk\"\r\n\/\/ The hl2 folder here is from Source SDK Base 2013 Multiplayer.\r\ngame \"|all_source_engine_paths|hl2\\hl2_misc.vpk\"\r\ngame \"|all_source_engine_paths|hl2\"\r\n\/\/ ========== BREAK ==========\r\nplatform |all_source_engine_paths|platform\/platform_misc.vpk\r\nplatform |all_source_engine_paths|platform\r\ngame+download |gameinfo_path|download\r\n}\r\n}\r\n}\r\nEOF\r\n## fix issue \/w symlink\r\ncd \/mnt\/server\/bin\r\nln -s datacache_srv.so datacache.so\r\nln -s dedicated_srv.so dedicated.so\r\nln -s engine_srv.so engine.so\r\nln -s materialsystem_srv.so materialsystem.so\r\nln -s replay_srv.so replay.so\r\nln -s scenefilecache_srv.so scenefilecache.so\r\nln -s shaderapiempty_srv.so shaderapiempty.so\r\nln -s soundemittersystem_srv.so soundemittersystem.so\r\nln -s studiorender_srv.so studiorender.so\r\nln -s vphysics_srv.so vphysics.so\r\n## more symlink fixes\r\ncd \/mnt\/server\/open_fortress\/bin\r\nln -s server.so server_srv.so", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates p7zip-full wget\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\nSTEAM_USER=anonymous\r\nSTEAM_PASS=\"\"\r\nSTEAM_AUTH=\"\"\r\nfi\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\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\nexport HOME=\/mnt\/server\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n## install tf2 content using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server\/tf2 +app_update 232250 ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n## download OpenFortress\r\ncd \/mnt\/server\r\nmv bin bin_dontdeleteme\r\nwget https:\/\/git.sr.ht\/~welt\/murse\/refs\/download\/v0.2.1\/murse-v0.2.1-linux-amd64.tar.gz -O murse.tgz 2> \/dev\/null\r\ntar xvfz murse.tgz\r\nrm -rf murse.tgz\r\nchmod +x murse\r\n.\/murse upgrade -u https:\/\/toast1.openfortress.fun\/toast -c $(curl https:\/\/toast1.openfortress.fun\/toast\/reithreads) asdrggvead\/open_fortress\r\nmv \/mnt\/server\/asdrggvead\/open_fortress \/mnt\/server\/open_fortress\r\nrm -rf asdrggvead\r\nmv bin_dontdeleteme bin\r\n## add fixed gameinfo\r\ncd \/mnt\/server\/open_fortress\r\nrm -rf gameinfo.txt\r\ncat >> gameinfo.txt << EOF\r\n\"GameInfo\"\r\n{\r\ngame \"Open Fortress\"\r\ntitle \"\"\r\ntitle2 \"\"\r\ngamelogo \"1\"\r\ndeveloper \"https:\/\/github.com\/AgitationSkeleton\/open_fortress\/blob\/master\/credits.txt\"\r\ndeveloper_url\t\"https:\/\/github.com\/KaidemonLP\/Open-Fortress-Source\"\r\nmanual \"\"\r\ntype \"multiplayer_only\"\r\nhasportals \"0\" \/\/ gameui.dll\r\nhashdcontent\t\"0\" \/\/ gameui.dll\r\nnomodels \"0\" \/\/ gameui.dll\r\nnohimodel \"0\" \/\/ gameui.dll\r\nnocrosshair \"0\" \/\/ gameui.dll\r\nadvcrosshair \"1\" \/\/ gameui.dll\r\nnodifficulty\t\"1\" \/\/ gameui.dll\r\nsupportsvr \"0\" \/\/ engine.dll + gameui.dll\r\nbots \"0\" \/\/ gameui.dll\r\nnodegraph \"1\" \/\/ engine.dll\r\nperfwizard \"0\" \/\/ unused\r\nSupportsDX8 \"0\" \/\/ unused\r\nSupportsDX9 \"1\" \/\/ unused\r\nSupportsDX10\t\"0\" \/\/ unused\r\nSupportsDX11\t\"0\" \/\/ unused\r\nSupportsXbox\t\"0\" \/\/ unused\r\nSupportsXbox360\t\"0\" \/\/ unused\r\nSupportsXboxOne\t\"0\" \/\/ unused\r\nSupportsPS3 \"0\" \/\/ unused\r\nSupportsPS4 \"0\" \/\/ unused\r\nicon \"resource\/game\"\r\nGameData \"ofd_fic2.fgd\"\r\nInstancePath\t\"maps\/instances\/\"\r\nhidden_maps\r\n{\r\n\"test_speakers\" 1\r\n\"test_hardware\" 1\r\n\"background01\" 1\r\n\"background02\" 1\r\n\"background03\" 1\r\n\"background04\" 1\r\n\"background05\" 1\r\n\"background06\" 1\r\n\"background07\" 1\r\n\"background08\" 1\r\n\"background09\" 1\r\n\"background12\" 1\r\n\"background15\" 1\r\n\"ep1_c17_00\" 1\r\n\"ep1_c17_00a\" 1\r\n\"ep1_c17_01\" 1\r\n\"ep1_c17_01a\" 1\r\n\"ep1_c17_02\" 1\r\n\"ep1_c17_02a\" 1\r\n\"ep1_c17_02b\" 1\r\n\"ep1_c17_05\" 1\r\n\"ep1_c17_06\" 1\r\n\"ep1_citadel_00\"\t1\r\n\"ep1_citadel_00_demo\" 1\r\n\"ep1_citadel_01\"\t1\r\n\"ep1_citadel_02\"\t1\r\n\"ep1_citadel_02b\"\t1\r\n\"ep1_citadel_03\"\t1\r\n\"ep1_citadel_04\"\t1\r\n\"ep1_background01\"\t1\r\n\"ep1_background01a\"\t1\r\n\"ep1_background02\"\t1\r\n\"ep2_outland_01\"\t1\r\n\"ep2_outland_01a\"\t1\r\n\"ep2_outland_02\"\t1\r\n\"ep2_outland_03\"\t1\r\n\"ep2_outland_04\"\t1\r\n\"ep2_outland_05\"\t1\r\n\"ep2_outland_06\"\t1\r\n\"ep2_outland_06a\"\t1\r\n\"ep2_outland_07\"\t1\r\n\"ep2_outland_08\"\t1\r\n\"ep2_outland_09\"\t1\r\n\"ep2_outland_10\"\t1\r\n\"ep2_outland_10a\"\t1\r\n\"ep2_outland_11\"\t1\r\n\"ep2_outland_11a\"\t1\r\n\"ep2_outland_11b\"\t1\r\n\"ep2_outland_12\"\t1\r\n\"ep2_outland_12a\"\t1\r\n\"ep2_background01\"\t1\r\n\"ep2_background02\"\t1\r\n\"ep2_background02a\"\t1\r\n\"ep2_background03\"\t1\r\n\"credits\" 1\r\n\"vst_lostcoast\" 1\r\n\"test\" 1\r\n\"sdk_vehicles\" 1\r\n}\r\nFileSystem\r\n{\r\nSteamAppId 243750\r\nSearchPaths\r\n{\r\ngame+mod |gameinfo_path|custom\/*\r\ngame+game_write+mod+mod_write+default_write_path |gameinfo_path|.\r\ngamebin |gameinfo_path|bin\r\n\/\/ The lines below until the BREAK comment are responsible for the game resources to work properly\r\n\/\/ in Hammer and other Source tools. The default setup assumes that you have everything (Steam, TF2,\r\n\/\/ Source SDK and OF) in the same drive letter\/partition. If you have a different storage configuration,\r\n\/\/ feel free to modify the paths below between quotes (example: D:\\Steam\\steamapps\\common\\Team Fortress 2\\tf).\r\ngame \"\/home\/container\/tf2\/tf\/tf2_misc.vpk\"\r\ngame \"\/home\/container\/tf2\/tf\/tf2_sound_misc.vpk\"\r\ngame \"\/home\/container\/tf2\/tf\/tf2_sound_vo_english.vpk\"\r\ngame \"\/home\/container\/tf2\/tf\/tf2_textures.vpk\"\r\ngame \"\/home\/container\/tf2\/tf\"\r\ngame \"\/home\/container\/tf2\/hl2\/hl2_textures.vpk\"\r\ngame \"\/home\/container\/tf2\/hl2\/hl2_sound_vo_english.vpk\"\r\ngame \"\/home\/container\/tf2\/hl2\/hl2_sound_misc.vpk\"\r\n\/\/ The hl2 folder here is from Source SDK Base 2013 Multiplayer.\r\ngame \"|all_source_engine_paths|hl2\\hl2_misc.vpk\"\r\ngame \"|all_source_engine_paths|hl2\"\r\n\/\/ ========== BREAK ==========\r\nplatform |all_source_engine_paths|platform\/platform_misc.vpk\r\nplatform |all_source_engine_paths|platform\r\ngame+download |gameinfo_path|download\r\n}\r\n}\r\n}\r\nEOF\r\n## fix issue \/w symlink\r\ncd \/mnt\/server\/bin\r\nln -s datacache_srv.so datacache.so\r\nln -s dedicated_srv.so dedicated.so\r\nln -s engine_srv.so engine.so\r\nln -s materialsystem_srv.so materialsystem.so\r\nln -s replay_srv.so replay.so\r\nln -s scenefilecache_srv.so scenefilecache.so\r\nln -s shaderapiempty_srv.so shaderapiempty.so\r\nln -s soundemittersystem_srv.so soundemittersystem.so\r\nln -s studiorender_srv.so studiorender.so\r\nln -s vphysics_srv.so vphysics.so\r\n## more symlink fixes\r\ncd \/mnt\/server\/open_fortress\/bin\r\nln -s server.so server_srv.so", "container": "ubuntu:18.04", "entrypoint": "bash" } From 7c4cd97a4eb3a22208d391bddefdca0bda31a5da Mon Sep 17 00:00:00 2001 From: Yamiru Date: Sun, 7 Aug 2022 17:57:27 +0200 Subject: [PATCH 0501/1001] Update egg-black-mesa.json --- game_eggs/steamcmd_servers/black_mesa/egg-black-mesa.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/game_eggs/steamcmd_servers/black_mesa/egg-black-mesa.json b/game_eggs/steamcmd_servers/black_mesa/egg-black-mesa.json index 8d2dfdbc..f58682a5 100644 --- a/game_eggs/steamcmd_servers/black_mesa/egg-black-mesa.json +++ b/game_eggs/steamcmd_servers/black_mesa/egg-black-mesa.json @@ -4,9 +4,9 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-07-17T07:02:24+02:00", + "exported_at": "2022-08-07T17:56:38+02:00", "name": "Black Mesa", - "author": "yamiru@yamiru.com", + "author": "avalongamecs@gmail.com", "description": "Black Mesa is a 2020 first-person shooter game. It is a third-party remake of Half-Life (1998) made in the Source game engine.", "features": null, "docker_images": { @@ -23,7 +23,7 @@ "scripts": { "installation": { "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id ffound here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# EXTRA_FLAGS - when a server has extra glas for things like beta installs or updates.\r\n#\r\n##\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", - "container": "debian:buster-slim", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, @@ -89,4 +89,4 @@ "field_type": "text" } ] -} \ No newline at end of file +} From 8b6df7d5827bc1c0dff545585ec72bd7604c3669 Mon Sep 17 00:00:00 2001 From: Stefano Date: Mon, 8 Aug 2022 17:06:40 +0200 Subject: [PATCH 0502/1001] Don't use PTB as a link for the eggs. THis will cause people to have to re-log on the discord website :P --- game_eggs/gta/fivem/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/gta/fivem/README.md b/game_eggs/gta/fivem/README.md index 12f44451..151897eb 100644 --- a/game_eggs/gta/fivem/README.md +++ b/game_eggs/gta/fivem/README.md @@ -5,7 +5,7 @@ Pterodactyl will not be providing support for FiveM. You are free to run a FiveM server but no support will be provided in the Pterodactyl Discord, check the discord annoucement below for details. Worth a read if you plan on running a FiveM server -[Pterodactyl Discord Announcement](https://ptb.discord.com/channels/122900397965705216/124919575534895105/869733533495746560) +[Pterodactyl Discord Announcement](https://discord.com/channels/122900397965705216/124919575534895105/869733533495746560) ## From the [FiveM](https://fivem.net/) Site From 064f690d8d4200538241ae4bf75f5fc2b64d6c32 Mon Sep 17 00:00:00 2001 From: Boy132 Date: Wed, 10 Aug 2022 12:51:53 +0200 Subject: [PATCH 0503/1001] fix links --- database/README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/database/README.md b/database/README.md index 9efc7435..a3021c4d 100644 --- a/database/README.md +++ b/database/README.md @@ -1,23 +1,23 @@ -# databases +# Databases ## In-Memory Databases -### [redis](/redis/) +### [redis](redis) https://redis.io/ ## NoSQL -### [mongodb](/nosql/mongodb/) +### [mongodb](nosql/mongodb) https://www.mongodb.com/ ## SQL Databases -### [mariadb](/sql/mariadb/) +### [mariadb](sql/mariadb) https://mariadb.org/ -### [postgres](/sql/postgres/) +### [postgres](sql/postgres) https://www.postgresql.org/ From d246c1bdf88ba40949e5fcbd3cfbd79ee41877b2 Mon Sep 17 00:00:00 2001 From: NickDevNL <70915191+nickdevnl@users.noreply.github.com> Date: Wed, 10 Aug 2022 22:50:22 +0200 Subject: [PATCH 0504/1001] Changed the author mail to the active mail --- bots/discord/nodemon.js/egg-nodemon.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bots/discord/nodemon.js/egg-nodemon.json b/bots/discord/nodemon.js/egg-nodemon.json index 6a903e3a..43925a41 100644 --- a/bots/discord/nodemon.js/egg-nodemon.json +++ b/bots/discord/nodemon.js/egg-nodemon.json @@ -6,7 +6,7 @@ }, "exported_at": "2021-08-26T23:09:55-04:00", "name": "nodemon", - "author": "nick@blackfortmc.com", + "author": "nick@blackforthosting.com", "description": "Nodemon javascript egg that automatically restarts the node application when file changes in the directory are detected\r\n\r\nThis will clone a git repo for a bot. it defaults to master if no branch is specified.\r\n\r\nInstalls the node_modules on install. If you set user_upload, then I assume you know what you are doing.", "features": null, "images": [ From de09db273b516a9eeea3baeaa1c9cb352709a13d Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 13 Aug 2022 16:22:19 +0200 Subject: [PATCH 0505/1001] remove codx --- game_eggs/README.md | 2 - game_eggs/cod/cod4x/README.md | 162 ------------------- game_eggs/cod/cod4x/egg-call-of-duty4-x.json | 104 ------------ 3 files changed, 268 deletions(-) delete mode 100644 game_eggs/cod/cod4x/README.md delete mode 100644 game_eggs/cod/cod4x/egg-call-of-duty4-x.json diff --git a/game_eggs/README.md b/game_eggs/README.md index aa0e540c..04de8d09 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -14,8 +14,6 @@ * [MCGalaxy](game_eggs/classicube/mcgalaxy) -[Call of Duty 4X](cod/cod4x) - [ET Legacy](enemy_territory/etlegacy) [Factorio](factorio) diff --git a/game_eggs/cod/cod4x/README.md b/game_eggs/cod/cod4x/README.md deleted file mode 100644 index a1b5047c..00000000 --- a/game_eggs/cod/cod4x/README.md +++ /dev/null @@ -1,162 +0,0 @@ -# Call of Duty 4X - -## Game files mounting - -The server does **not** contain the base game files, but they are necessary to use the server. - -While the server itself is open-source, the game files are copyrighted and you will need to own a legitimate copy of the game (Call of Duty 4: Modern Warfare) -in order to provide the game files to the server. - -More information here: - -## Correctly mounting the game files - -In order to give the server access to the needed game files you will need to create a new mount. - -Let's say you copied the game files to your node into the directory `/home/pterodactyl/serverfiles/cod4x` (you can choose any directory you want of course). -The directory structure will look like this:
      - -```md -/home/pterodactyl/serverfiles/cod4x -├── main -│ ├── iw_00.iwd -│ ├── iw_01.iwd -│ ├── iw_02.iwd -│ ├── iw_03.iwd -│ ├── iw_04.iwd -│ ├── iw_05.iwd -│ ├── iw_06.iwd -│ ├── iw_07.iwd -│ ├── iw_08.iwd -│ ├── iw_09.iwd -│ ├── iw_10.iwd -│ ├── iw_11.iwd -│ ├── iw_12.iwd -│ ├── iw_13.iwd -│ ├── localized_english_iw00.iwd -│ ├── localized_english_iw01.iwd -│ ├── localized_english_iw02.iwd -│ ├── localized_english_iw03.iwd -│ ├── localized_english_iw04.iwd -│ ├── localized_english_iw05.iwd -│ └── localized_english_iw06.iwd -└── zone - └── english - ├── ac130.ff - ├── aftermath.ff - ├── airlift.ff - ├── airplane.ff - ├── ambush.ff - ├── armada.ff - ├── blackout.ff - ├── bog_a.ff - ├── bog_b.ff - ├── cargoship.ff - ├── code_post_gfx.ff - ├── code_post_gfx_mp.ff - ├── common.ff - ├── common_mp.ff - ├── coup.ff - ├── hunted.ff - ├── icbm.ff - ├── jeepride.ff - ├── killhouse.ff - ├── launchfacility_a.ff - ├── launchfacility_b.ff - ├── localized_code_post_gfx_mp.ff - ├── localized_common_mp.ff - ├── mp_backlot.ff - ├── mp_backlot_load.ff - ├── mp_bloc.ff - ├── mp_bloc_load.ff - ├── mp_bog.ff - ├── mp_bog_load.ff - ├── mp_broadcast.ff - ├── mp_broadcast_load.ff - ├── mp_carentan.ff - ├── mp_carentan_load.ff - ├── mp_cargoship.ff - ├── mp_cargoship_load.ff - ├── mp_citystreets.ff - ├── mp_citystreets_load.ff - ├── mp_convoy.ff - ├── mp_convoy_load.ff - ├── mp_countdown.ff - ├── mp_countdown_load.ff - ├── mp_crash.ff - ├── mp_crash_load.ff - ├── mp_crash_snow.ff - ├── mp_crash_snow_load.ff - ├── mp_creek.ff - ├── mp_creek_load.ff - ├── mp_crossfire.ff - ├── mp_crossfire_load.ff - ├── mp_farm.ff - ├── mp_farm_load.ff - ├── mp_killhouse.ff - ├── mp_killhouse_load.ff - ├── mp_overgrown.ff - ├── mp_overgrown_load.ff - ├── mp_pipeline.ff - ├── mp_pipeline_load.ff - ├── mp_shipment.ff - ├── mp_shipment_load.ff - ├── mp_showdown.ff - ├── mp_showdown_load.ff - ├── mp_strike.ff - ├── mp_strike_load.ff - ├── mp_vacant.ff - ├── mp_vacant_load.ff - ├── scoutsniper.ff - ├── simplecredits.ff - ├── sniperescape.ff - ├── ui.ff - ├── ui_mp.ff - ├── village_assault.ff - └── village_defend.ff - -3 directories, 93 files -``` - -
      - -First of all add the directory of the mount to the config.yml (in `/etc/pterodactyl`) of your node. - -```md -allowed_mounts: - - /home/pterodactyl/serverfiles -``` - -After you've done this, restart wings with `systemctl restart wings`. - -Now you simply create a mount in the Pterodactyl Panel with the following settings: - -1. Set the source to `/home/pterodactyl/serverfiles/cod4x` -2. Set the target to any directory you want (but not something in `/home/container`, I suggest something like `/mnt/gamefiles/cod4`) -3. Set read-only to "true" ("false" will also work, but then you risk that one instance overwrites files for all other instances) -4. For the rest of the settings you can decide what works best for you -5. Create the mount -6. Add the correct node to the list of nodes for the mount -7. Add the CoD4X egg to the list of eggs for the mount - -### Correctly configuring the servers - -In order for the server to find the game files you have to set "Game file path" variable in the server to the same directory that you used in the "target" field of the mount. -When you start the server for the first time it will prompt you to mount the game files under the configured path. - -1. In the admin interface open your server -2. Go to the tab "Mounts" -3. Klick on the green "+" button on the correct mount in order to mount the game files -4. Restart the server - -**Congratulations!** Your server should be able to find the game files and start. - -## Default Server Ports - -The default is 28960, but the server will automatically use the port defined in the allocation. - -| Port | default | -|---------|---------| -| Game | 28960 | - -### Plugins may require ports to be added to the server diff --git a/game_eggs/cod/cod4x/egg-call-of-duty4-x.json b/game_eggs/cod/cod4x/egg-call-of-duty4-x.json deleted file mode 100644 index 3c295eeb..00000000 --- a/game_eggs/cod/cod4x/egg-call-of-duty4-x.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1", - "update_url": null - }, - "exported_at": "2021-05-04T10:23:27+02:00", - "name": "Call of Duty 4X", - "author": "admin@grimsi.de", - "description": "A client and server modification for Call of Duty 4: Modern Warfare with the aim to fix bugs and enhance gameplay!", - "features": null, - "images": [ - "quay.io\/parkervcp\/pterodactyl-images:base_debian" - ], - "file_denylist": [], - "startup": "if [ ! -d \"{{GAME_FILE_PATH}}\" ]; then echo \"CoD 4 game files not found. Maybe they are not mounted?\"; echo \"In order for the server to start mount the game files here: {{GAME_FILE_PATH}}\"; while true; do sleep 2; done; fi; .\/cod4x18_dedrun +exec server.cfg +set dedicated \"{{SERVER_NETWORK_MODE}}\" +set sv_maxclients \"{{MAX_PLAYERS}}\" +set net_ip 0.0.0.0 +set net_port \"{{SERVER_PORT}}\" +set fs_basepath \"{{GAME_FILE_PATH}}\" +set fs_homepath . +map_rotate", - "config": { - "files": "{\r\n \"main\/server.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"sv_hostname\": \"sv_hostname \\\"{{server.build.env.SERVER_NAME}}\\\"\",\r\n \"rcon_password\": \"rcon_password \\\"{{server.build.env.ADMIN_PASSWORD}}\\\"\",\r\n \"g_password\": \"g_password \\\"{{server.build.env.SERVER_PASSWORD}}\\\"\",\r\n \"sv_authtoken\": \"sv_authtoken \\\"{{server.build.env.SERVER_AUTH_TOKEN}}\\\"\",\r\n \"sv_mapRotation\": \"sv_mapRotation \\\"{{server.build.env.MAP_ROTATION}}\\\"\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"By using this software you agree to the usage conditions\",\r\n \"userInteraction\": []\r\n}", - "logs": "{}", - "stop": "quit" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/ash\r\n# CoD 4X Installation script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\nDOWNLOAD_LINK=https:\/\/cod4x.me\/downloads\/cod4x_server-linux.zip\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\/\r\n\r\n## this is a simple script to validate a download url actually exists and is reachable\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}; then\r\n echo -e \"Download-URL is reachable.\"\r\n else \r\n echo -e \"Could not reach ${DOWNLOAD_LINK}.\"\r\n echo -e \"Aborting installation...\"\r\n exit 1\r\n fi\r\nfi\r\n\r\n# Download the server binaries\r\necho -e \"running 'curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}'\" \r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho -e \"Unpacking server files\"\r\nunzip ${DOWNLOAD_LINK##*\/}\r\n\r\necho -e \"Moving server files to \/mnt\/server\"\r\nmv .\/cod4x-linux-server\/* .\r\n\r\necho -e \"Cleaning up downloaded files.\"\r\nrm ${DOWNLOAD_LINK##*\/}\r\nrm -rf .\/cod4x-linux-server\r\n\r\necho -e \"Installing required runtime libs.\"\r\nmv .\/runtime\/libstdc++.so.6 .\r\n\r\necho -e \"Generating config file\"\r\ncat < .\/main\/server.cfg\r\nsv_hostname \"${SERVER_NAME}\"\r\ng_password \"${SERVER_PASSWORD}\"\r\nrcon_password \"${ADMIN_PASSWORD}\"\r\n\r\nsv_punkbuster \"0\"\r\nsv_cheats \"0\"\r\nsv_voice \"0\"\r\nscr_teambalance \"1\"\r\ng_allowvote \"1\"\r\n\r\nsv_authorizemode \"0\"\r\nsv_authtoken \"${SERVER_AUTH_TOKEN}\"\r\n\r\nsv_floodProtect \"1\"\r\n\r\nsv_mapRotation \"${MAP_ROTATION}\"\r\nEOF\r\n\r\necho -e \"running 'chmod +x .\/cod4x18_dedrun'\"\r\nchmod +x .\/cod4x18_dedrun\r\n\r\necho -e \"Installation complete\"", - "container": "quay.io\/matthewp\/pterodactyl:alpine-install", - "entrypoint": "ash" - } - }, - "variables": [ - { - "name": "Server Name", - "description": "Hostname of the server.", - "env_variable": "SERVER_NAME", - "default_value": "Pterodactyl CoD 4X Server", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:40" - }, - { - "name": "Server Password", - "description": "Password of the server.", - "env_variable": "SERVER_PASSWORD", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|string|max:20" - }, - { - "name": "Admin Password", - "description": "RCON password for the server.", - "env_variable": "ADMIN_PASSWORD", - "default_value": "password123", - "user_viewable": false, - "user_editable": false, - "rules": "required|string|min:8|max:20" - }, - { - "name": "Server Slots", - "description": "Amount of players that can play on the server.", - "env_variable": "MAX_PLAYERS", - "default_value": "32", - "user_viewable": true, - "user_editable": false, - "rules": "required|digits_between:1,3|min:1" - }, - { - "name": "Game File Path", - "description": "Path to the CoD 4 game files (has to be the same as the \"target\" of the mount)", - "env_variable": "GAME_FILE_PATH", - "default_value": "\/mnt\/gamefiles\/cod4", - "user_viewable": false, - "user_editable": false, - "rules": "required|string|max:40" - }, - { - "name": "Map Rotation", - "description": "Map rotation in Quake format.", - "env_variable": "MAP_ROTATION", - "default_value": "gametype war map mp_crossfire", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|string|max:1000" - }, - { - "name": "Server Network Mode", - "description": "1 for LAN only, 2 for public", - "env_variable": "SERVER_NETWORK_MODE", - "default_value": "1", - "user_viewable": true, - "user_editable": true, - "rules": "required|digits:1|min:1|max:2" - }, - { - "name": "Server Authentication Token", - "description": "Token needed to list your server on the public masterserver. Generate here: https:\/\/cod4master.cod4x.me\/index.php?token_generator=true", - "env_variable": "SERVER_AUTH_TOKEN", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|string|size:40" - } - ] -} \ No newline at end of file From 472dc7cb9e5957b88ba1a4429e321f68fbb829fa Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Sun, 14 Aug 2022 15:31:43 +0300 Subject: [PATCH 0506/1001] docs: update contribution guidelines --- CONTRIBUTING.md | 44 ++++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 67d02ffe..f2586b1c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,39 +1,51 @@ -# So you want to make an Egg +# How to contribute -## General rules +You can contribute by either creating a new pull request or testing [existing pull requests](https://github.com/parkervcp/eggs/pulls) and commenting on whether the egg works for you or not. Testing is very important and helpful! +## General rules for eggs 1. Keep it simple. - We don't need 8 miles of install script. + We don't need 8 miles of the install script. -2. Keep it Small. - Only use what is absolutely needed. +2. Keep it small. + Only use what is absolutely needed. The [Yolks install images](https://github.com/parkervcp/yolks#installation-images) already contain the most basic packages that speeds up the installation process. -3. Try to stay in the stock containers. - If you need something in a container, open a PR in [my yolks repo](https://github.com/parkervcp/yolks) where I can review and pull it up to the main repo. In addition, there is a larger quantity of [images here](https://github.com/parkervcp/images) for you to use that have not been migrated to Yolks yet. +3. Stay in the stock containers. + If you need something in a container, open a PR in [my yolks repo](https://github.com/parkervcp/yolks) where it can reviewed and built. Self-hosted or third-party images won't be accepted for security reasons. 4. Don't be afraid to submit PR's to the egg repo. - I don't bite. I will work with you on the egg and the required things to run it. + I don't bite. I will work with you on the egg and the required things to run it. Feel free to open a draft PR if you don't quite have the egg finished yet by yourself. + +### Sources for working on a new egg + +Look at existing eggs to see how they work. In most cases, you can take the existing egg as your new template. There's a brief documentation on how to [create eggs](https://pterodactyl.io/community/config/eggs/creating_a_custom_egg.html) and [Docker images](https://pterodactyl.io/community/config/eggs/creating_a_custom_image.html). + +Use existing Docker images for your egg. You can find them in [Parkers Yolks fork](https://github.com/parkervcp/yolks) and [Pterodactyl Yolks](https://github.com/pterodactyl/yolks). + +We have a collection of [existing install script snippets](https://github.com/parkervcp/eggs/tree/master/scripts) that you can use. ## Step 1 ### Be aware of the pterodactyl install process -The Pterodactyl install process is fairly simple once you know. +The Pterodactyl install process is fairly simple once you know it. ```md 1. Spin up install container - This uses a volume mount on /mnt/server for the server files. - This can pull or set up all that is needed to run the server. + Creates a new container using an install image that's run as root. + Uses a volume mount on `/mnt/server` for the server files, which is the working directory during installation. + The volume will be later mounted as `/home/container` for the server container. Any files outside of `/mnt/server` will be gone after installation. + Install script can pull files or set up all that is needed to run the server, such as writing files, directories or compiling apps. It is regularly used to just download the files required. Such as server files and configs. - 2. Stop install container + 2. Stop and destroy install container 3. Start a new container with the server files in /home/container - This is where the server is actually run. + This is where the server is actually run. No root privileges. Any dependencies installed during the install process are gone. The container that is started should have everything you need. + No packages can be installed. Any required dependencies must exist in the used Docker image. ``` ## Step 2 @@ -49,4 +61,8 @@ This is to maintain a clean repo that others can pull and be fully aware of what ### Make a branch and do your work in there -I have been getting messy PR's due to people always PRing from their master branch. Please make a seperate branch and PR from there. +I have been getting messy PR's due to people always PRing from their master branch. Please make a separate branch and PR from there. + +## Step 4 + +Open a new pull request and fill in the template. Make sure that the readme files have been updated to include the new egg. From 225d5c29113ea18faa5f684acf25ab834ee267c2 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Sun, 14 Aug 2022 15:54:30 +0300 Subject: [PATCH 0507/1001] docs(contributing): change wording for a general rule --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f2586b1c..783aad05 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,8 +10,8 @@ You can contribute by either creating a new pull request or testing [existing pu 2. Keep it small. Only use what is absolutely needed. The [Yolks install images](https://github.com/parkervcp/yolks#installation-images) already contain the most basic packages that speeds up the installation process. -3. Stay in the stock containers. - If you need something in a container, open a PR in [my yolks repo](https://github.com/parkervcp/yolks) where it can reviewed and built. Self-hosted or third-party images won't be accepted for security reasons. +3. Use the stock images. + If you need something in an image, open a PR in [my yolks repo](https://github.com/parkervcp/yolks) where it can be reviewed and built. Self-hosted or third-party images won't be accepted for security reasons. 4. Don't be afraid to submit PR's to the egg repo. I don't bite. I will work with you on the egg and the required things to run it. Feel free to open a draft PR if you don't quite have the egg finished yet by yourself. From e87f3dc365fe07b45e7ca04397d6d0d103c059b3 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Sun, 14 Aug 2022 16:05:58 +0300 Subject: [PATCH 0508/1001] docs(templates): update pull request template --- .github/pull_request_template.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 2192084d..1957a98f 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,13 +1,20 @@ -### All Submissions: +# Description -* [ ] Have you followed the guidelines in our Contributing document? + + +## Checklist for all submissions + + + +* [ ] Have you followed the guidelines in our [Contributing document](https://github.com/parkervcp/eggs/blob/master/CONTRIBUTING.md)? * [ ] Have you checked to ensure there aren't other open [Pull Requests](../pulls) for the same update/change? +* [ ] Have you tested and reviewed your changes with confidence that everything works? * [ ] Did you branch your changes and PR from that branch and not from your master branch? * If not, why?: - + -### New Server Submissions: +## New Server Submissions 1. [ ] Does your submission pass tests (server is connectable)? 2. [ ] Does your server use a custom docker image? @@ -15,8 +22,3 @@ * [ ] Did you PR the necessary changes to make it work? 3. [ ] Have you added the server to the main README.md? 4. [ ] Have you added a unique README.md for the server you are adding? - -### Changes to an existing Egg: - -1. [ ] Have you added an explanation of what your changes do and why you'd like us to include them? -2. [ ] Have you tested your Egg changes? From 3721c5224ff874bf83215538fce3ec74b827482e Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Sun, 14 Aug 2022 16:14:59 +0300 Subject: [PATCH 0509/1001] docs(pr-template): replace server with egg and include readme instructions --- .github/pull_request_template.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 1957a98f..417c9009 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -12,13 +12,13 @@ * [ ] Did you branch your changes and PR from that branch and not from your master branch? * If not, why?: - + -## New Server Submissions +## New egg Submissions 1. [ ] Does your submission pass tests (server is connectable)? -2. [ ] Does your server use a custom docker image? +2. [ ] Does your egg use a custom docker image? * [ ] Have you tried to use a generic image? * [ ] Did you PR the necessary changes to make it work? -3. [ ] Have you added the server to the main README.md? -4. [ ] Have you added a unique README.md for the server you are adding? +3. [ ] Have you added the egg to the main README.md and any other README files in subdirectories of the egg (e.g /game_eggs) according to the alphabetical order? +4. [ ] Have you added a unique README.md for the egg you are adding according to the alphabetical order? From 6bd54a27bc5ebea50dd5888bd4588692f0189ea2 Mon Sep 17 00:00:00 2001 From: toblerus <37512320+toblerus@users.noreply.github.com> Date: Sun, 14 Aug 2022 15:23:37 +0200 Subject: [PATCH 0510/1001] docs(readme): add missing entry for better crew link (#1805) Co-authored-by: softwarenoob --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 14b69cc2..2e11920b 100644 --- a/README.md +++ b/README.md @@ -85,8 +85,9 @@ If you are reading this it looks like you are looking to add an egg to your serv [Among Us](game_eggs/among_us) -* [Impostor Server](game_eggs/among_us/impostor_server) +* [BetterCrewLink Server](game_eggs/among_us/bettercrewlink_server) * [CrewLink Server](game_eggs/among_us/crewlink_server) +* [Impostor Server](game_eggs/among_us/impostor_server) [BeamNG.drive](game_eggs/beamng) @@ -312,7 +313,9 @@ If you are reading this it looks like you are looking to add an egg to your serv ### haste-server * [haste-server](/software/haste-server) + ### LanguageTool + * [languagetool](/software/languagetool) ### Owncast @@ -330,4 +333,3 @@ If you are reading this it looks like you are looking to add an egg to your serv ### 5e Tools * [5e Tools](/software/5e-tools) - From a4851a34adcdf273cd5fa1322a86c9fcfb261922 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 14 Aug 2022 15:25:54 +0200 Subject: [PATCH 0511/1001] fix(the-forest): disable sound to prevent soundcard errors (#1802) --- .../the_forest/egg-the-forest.json | 48 ++++++++++++------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/game_eggs/steamcmd_servers/the_forest/egg-the-forest.json b/game_eggs/steamcmd_servers/the_forest/egg-the-forest.json index 23b736c0..f0b2f4a8 100644 --- a/game_eggs/steamcmd_servers/the_forest/egg-the-forest.json +++ b/game_eggs/steamcmd_servers/the_forest/egg-the-forest.json @@ -1,21 +1,21 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1", + "version": "PTDL_v2", "update_url": null }, - "exported_at": "2021-11-25T23:18:02+00:00", + "exported_at": "2022-08-08T17:51:35+02:00", "name": "The Forest", "author": "admin@softwarenoob.com", "description": "As the lone survivor of a passenger jet crash, you find yourself in a mysterious forest battling to stay alive against a society of cannibalistic mutants. Build, explore, survive in this terrifying first-person survival horror simulator.", "features": [ "steam_disk_space" ], - "images": [ - "ghcr.io\/parkervcp\/yolks:wine_latest" - ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:wine_latest": "ghcr.io\/parkervcp\/yolks:wine_latest" + }, "file_denylist": [], - "startup": "xvfb-run --auto-servernum --server-args='-screen 0 640x480x24:32' wine64 \/home\/container\/TheForestDedicatedServer.exe -batchmode -nographics -nosteamclient -savefolderpath \/home\/container\/TheForestDedicatedServer_Data -configfilepath \/home\/container\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg |grep -v 'RenderTexture.Create failed: format unsupported - 2.'", + "startup": "winetricks sound=disabled; export WINEDEBUG=-all; xvfb-run --auto-servernum --server-args='-screen 0 640x480x24:32' wine64 \/home\/container\/TheForestDedicatedServer.exe -batchmode -nographics -nosteamclient -savefolderpath \/home\/container\/TheForestDedicatedServer_Data -configfilepath \/home\/container\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg |grep -v 'RenderTexture.Create failed: format unsupported - 2.'", "config": { "files": "{\r\n \"\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"serverIP\": \"serverIP 0.0.0.0\",\r\n \"serverSteamPort\": \"serverSteamPort {{server.build.env.STEAM_PORT}}\",\r\n \"serverGamePort\": \"serverGamePort {{server.build.default.port}}\",\r\n \"serverQueryPort\": \"serverQueryPort {{server.build.env.QUERY_PORT}}\",\r\n \"serverName\": \"serverName {{server.build.env.SERVER_NAME}}\",\r\n \"serverPlayers\": \"serverPlayers {{server.build.env.MAX_PLAYERS}}\",\r\n \"serverPassword\": \"serverPassword {{server.build.env.SERVER_PASS}}\",\r\n \"serverPasswordAdmin\": \"serverPasswordAdmin {{server.build.env.ADMIN_PASS}}\",\r\n \"serverSteamAccount\": \"serverSteamAccount {{server.build.env.STEAM_ACC}}\",\r\n \"enableVAC\": \"enableVAC {{server.build.env.VAC}}\",\r\n \"difficulty\": \"difficulty {{server.build.env.SERVER_DIFFICULTY}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Game autosave started\"\r\n}", @@ -37,7 +37,8 @@ "default_value": "556450", "user_viewable": false, "user_editable": false, - "rules": "required|numeric|digits_between:1,6" + "rules": "required|numeric|digits_between:1,6", + "field_type": "text" }, { "name": "Server Name", @@ -46,7 +47,8 @@ "default_value": "Pterodactyl Forest Server", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:64" + "rules": "required|string|max:64", + "field_type": "text" }, { "name": "Steam Port", @@ -55,7 +57,8 @@ "default_value": "8766", "user_viewable": true, "user_editable": false, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" }, { "name": "[Connection Port] Query Port", @@ -64,7 +67,8 @@ "default_value": "27016", "user_viewable": true, "user_editable": false, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" }, { "name": "Max Players", @@ -73,7 +77,8 @@ "default_value": "10", "user_viewable": true, "user_editable": false, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" }, { "name": "Difficulty", @@ -82,7 +87,8 @@ "default_value": "Normal", "user_viewable": true, "user_editable": true, - "rules": "required|string|in:Peaceful,Normal,Hard" + "rules": "required|string|in:Peaceful,Normal,Hard", + "field_type": "text" }, { "name": "Steam Account Token", @@ -91,7 +97,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Server Password", @@ -100,7 +107,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string|max:20" + "rules": "nullable|string|max:20", + "field_type": "text" }, { "name": "Admin Password", @@ -109,7 +117,8 @@ "default_value": "cHanGetHePaSwWord", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" }, { "name": "Enable VAC", @@ -118,7 +127,8 @@ "default_value": "off", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:3" + "rules": "required|string|max:3", + "field_type": "text" }, { "name": "Windows Install", @@ -127,7 +137,8 @@ "default_value": "1", "user_viewable": false, "user_editable": false, - "rules": "required|string|in:1" + "rules": "required|string|in:1", + "field_type": "text" }, { "name": "Auto-Update", @@ -136,7 +147,8 @@ "default_value": "1", "user_viewable": true, "user_editable": true, - "rules": "required|boolean" + "rules": "required|boolean", + "field_type": "text" } ] } From a306d220d3d4ed8d6dfe2193f29da5c4bc40dd90 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 14 Aug 2022 17:43:40 +0200 Subject: [PATCH 0512/1001] docs(readme): add missing entry for scpl:exiled (#1818) --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2e11920b..c99d9e9f 100644 --- a/README.md +++ b/README.md @@ -233,6 +233,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Satisfactory](game_eggs/steamcmd_servers/satisfactory) * [SCP: Secret Laboratory](game_eggs/steamcmd_servers/scpsl) * [dedicated](game_eggs/steamcmd_servers/scpsl/dedicated) + * [exiled](game_eggs/steamcmd_servers/scpsl/exiled) * [multiadmin](game_eggs/steamcmd_servers/scpsl/multiadmin) * [Soldat](game_eggs/steamcmd_servers/soldat) * [Space Engineers](game_eggs/steamcmd_servers/space_engineers) From 2901bf08ec892c265e4f0d9c47070741b4368121 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 16 Aug 2022 14:18:48 +0300 Subject: [PATCH 0513/1001] docs(egg-request): warning for docker image Specify that a docker image is not a viable download link or installation documentation, since so many requests appear to simply have a link to the docker hub. --- .github/ISSUE_TEMPLATE/egg-request.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/egg-request.yml b/.github/ISSUE_TEMPLATE/egg-request.yml index 731f4cfd..1f58b59d 100644 --- a/.github/ISSUE_TEMPLATE/egg-request.yml +++ b/.github/ISSUE_TEMPLATE/egg-request.yml @@ -27,7 +27,7 @@ body: id: download-link attributes: label: Links for the download - description: This needs to be an official link and not one that is hosted on some forum page or a personal Github page. + description: This needs to be an official link and not one that is hosted on some forum page or a personal Github page. Docker image is not a viable option. validations: required: true validations: @@ -36,7 +36,6 @@ body: id: instruction-link attributes: label: Links for the install docs - description: Link to install instructions or documentation based on which the server can be created - placeholder: Install the server, start it, play + description: Link to installation instructions or documentation covering required dependencies and configuration for the server creation. Docker image is not installation documentation! validations: required: true From ca84ab0ef0c36a710304552a999be6e33db9a0b0 Mon Sep 17 00:00:00 2001 From: Wazbat Date: Fri, 19 Aug 2022 18:38:35 +0200 Subject: [PATCH 0514/1001] =?UTF-8?q?=F0=9F=A7=B1=20Updated=20starbound=20?= =?UTF-8?q?egg=20install=20script?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updated script to handle multiple or incorrectly named .pak files --- .../starbound/egg-starbound.json | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/game_eggs/steamcmd_servers/starbound/egg-starbound.json b/game_eggs/steamcmd_servers/starbound/egg-starbound.json index 6a890b4d..7a4536e0 100644 --- a/game_eggs/steamcmd_servers/starbound/egg-starbound.json +++ b/game_eggs/steamcmd_servers/starbound/egg-starbound.json @@ -1,19 +1,19 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1", + "version": "PTDL_v2", "update_url": null }, - "exported_at": "2021-07-02T04:25:07+03:00", + "exported_at": "2022-08-19T12:33:06-04:00", "name": "Starbound", "author": "parker@parkervcp.com", "description": "Starbound takes place in a two-dimensional, procedurally generated universe which the player is able to explore in order to obtain new weapons, armor, and items, and to visit towns and villages inhabited by various intelligent lifeforms.", "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": ".\/starbound_server", "config": { @@ -24,7 +24,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## Starbound specific setup.\r\ncd \/mnt\/server\/\r\n\r\n\r\n## edit sbinit config\r\nmv \/mnt\/server\/linux\/* \/mnt\/server\/\r\nrm -rf \/mnt\/server\/linux\r\nsed -i -e 's\/\\.\\.\/\\.\/g' \/mnt\/server\/sbinit.config\r\n\r\n## pull starbound_server.config\r\nmkdir -p \/mnt\/server\/storage\r\ncurl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/steamcmd_servers\/starbound\/starbound_server.config > \/mnt\/server\/storage\/starbound_server.config\r\n\r\n## use Worksop content\r\nif [ \"${WORKSHOP}\" == \"1\" ]; then\r\n for dir in \/mnt\/server\/steamapps\/workshop\/content\/211820\/*\/\r\n do\r\n dir=${dir%*\/}\r\n echo Sym-linking mod ${dir##*\/} into the mods folder\r\n ln -r -s \/mnt\/server\/steamapps\/workshop\/content\/211820\/${dir##*\/}\/contents.pak \/mnt\/server\/mods\/${dir##*\/}.pak\r\n done\r\nfi", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## Starbound specific setup.\r\ncd \/mnt\/server\/\r\n\r\n\r\n## edit sbinit config\r\nmv \/mnt\/server\/linux\/* \/mnt\/server\/\r\nrm -rf \/mnt\/server\/linux\r\nsed -i -e 's\/\\.\\.\/\\.\/g' \/mnt\/server\/sbinit.config\r\n\r\n## pull starbound_server.config\r\nmkdir -p \/mnt\/server\/storage\r\ncurl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/steamcmd_servers\/starbound\/starbound_server.config > \/mnt\/server\/storage\/starbound_server.config\r\n\r\n## use Worksop content\r\nif [ \"${WORKSHOP}\" == \"1\" ]; then\r\n for dir in \/mnt\/server\/steamapps\/workshop\/content\/211820\/*\/\r\n do\r\n # Removes the trailing slash from the full path\r\n dir=${dir%*\/}\r\n echo Sym-linking mod ${dir##*\/} files into the mods folder\r\n INDEX=0\r\n for pakfile in ${dir}\/*.pak\r\n do\r\n echo $pakfile\r\n ln -r -s $pakfile \/mnt\/server\/mods\/${dir##*\/}_${INDEX}.pak\r\n INDEX=$((INDEX+1))\r\n done\r\n done\r\nfi", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -37,7 +37,8 @@ "default_value": "", "user_viewable": false, "user_editable": false, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" }, { "name": "Steam Password", @@ -46,7 +47,8 @@ "default_value": "", "user_viewable": false, "user_editable": false, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Game ID", @@ -55,7 +57,8 @@ "default_value": "211820", "user_viewable": true, "user_editable": false, - "rules": "string" + "rules": "string", + "field_type": "text" }, { "name": "Steam Auth", @@ -64,7 +67,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string|max:5" + "rules": "nullable|string|max:5", + "field_type": "text" }, { "name": "Auto Update Server", @@ -73,7 +77,8 @@ "default_value": "1", "user_viewable": true, "user_editable": true, - "rules": "required|boolean" + "rules": "required|boolean", + "field_type": "text" }, { "name": "Use Workshop content", @@ -82,7 +87,8 @@ "default_value": "0", "user_viewable": true, "user_editable": true, - "rules": "required|boolean" + "rules": "required|boolean", + "field_type": "text" } ] -} +} \ No newline at end of file From 15b922a05fb9b43c1a2c07704564c4e315344b9d Mon Sep 17 00:00:00 2001 From: Wazbat Date: Fri, 19 Aug 2022 20:59:03 +0200 Subject: [PATCH 0515/1001] =?UTF-8?q?=F0=9F=94=96=20Updated=20docker=20ima?= =?UTF-8?q?ge=20tag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game_eggs/steamcmd_servers/starbound/egg-starbound.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/steamcmd_servers/starbound/egg-starbound.json b/game_eggs/steamcmd_servers/starbound/egg-starbound.json index 7a4536e0..eb0ec237 100644 --- a/game_eggs/steamcmd_servers/starbound/egg-starbound.json +++ b/game_eggs/steamcmd_servers/starbound/egg-starbound.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-08-19T12:33:06-04:00", + "exported_at": "2022-08-19T14:57:25-04:00", "name": "Starbound", "author": "parker@parkervcp.com", "description": "Starbound takes place in a two-dimensional, procedurally generated universe which the player is able to explore in order to obtain new weapons, armor, and items, and to visit towns and villages inhabited by various intelligent lifeforms.", @@ -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": ".\/starbound_server", @@ -24,7 +24,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## Starbound specific setup.\r\ncd \/mnt\/server\/\r\n\r\n\r\n## edit sbinit config\r\nmv \/mnt\/server\/linux\/* \/mnt\/server\/\r\nrm -rf \/mnt\/server\/linux\r\nsed -i -e 's\/\\.\\.\/\\.\/g' \/mnt\/server\/sbinit.config\r\n\r\n## pull starbound_server.config\r\nmkdir -p \/mnt\/server\/storage\r\ncurl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/steamcmd_servers\/starbound\/starbound_server.config > \/mnt\/server\/storage\/starbound_server.config\r\n\r\n## use Worksop content\r\nif [ \"${WORKSHOP}\" == \"1\" ]; then\r\n for dir in \/mnt\/server\/steamapps\/workshop\/content\/211820\/*\/\r\n do\r\n # Removes the trailing slash from the full path\r\n dir=${dir%*\/}\r\n echo Sym-linking mod ${dir##*\/} files into the mods folder\r\n INDEX=0\r\n for pakfile in ${dir}\/*.pak\r\n do\r\n echo $pakfile\r\n ln -r -s $pakfile \/mnt\/server\/mods\/${dir##*\/}_${INDEX}.pak\r\n INDEX=$((INDEX+1))\r\n done\r\n done\r\nfi", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## Starbound specific setup.\r\ncd \/mnt\/server\/\r\n\r\n\r\n## edit sbinit config\r\nmv \/mnt\/server\/linux\/* \/mnt\/server\/\r\nrm -rf \/mnt\/server\/linux\r\nsed -i -e 's\/\\.\\.\/\\.\/g' \/mnt\/server\/sbinit.config\r\n\r\n## pull starbound_server.config\r\nmkdir -p \/mnt\/server\/storage\r\ncurl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/steamcmd_servers\/starbound\/starbound_server.config > \/mnt\/server\/storage\/starbound_server.config\r\n\r\n## use Worksop content\r\nif [ \"${WORKSHOP}\" == \"1\" ]; then\r\n for dir in \/mnt\/server\/steamapps\/workshop\/content\/211820\/*\/\r\n do\r\n # Removes the trailing slash from the full path\r\n dir=${dir%*\/}\r\n echo Sym-linking mod ${dir##*\/} files into the mods folder\r\n INDEX=0\r\n for pakfile in ${dir}\/*.pak\r\n do\r\n ln -r -s $pakfile \/mnt\/server\/mods\/${dir##*\/}_${INDEX}.pak\r\n INDEX=$((INDEX+1))\r\n done\r\n done\r\nfi", "container": "debian:buster-slim", "entrypoint": "bash" } From e9157fef4368f0ebea8b0ddc28891ae87a4cfbff Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 20 Aug 2022 12:40:14 +0200 Subject: [PATCH 0516/1001] update install Image (#1) * update install Image * removed apt install --- game_eggs/steamcmd_servers/starbound/egg-starbound.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/game_eggs/steamcmd_servers/starbound/egg-starbound.json b/game_eggs/steamcmd_servers/starbound/egg-starbound.json index eb0ec237..f2620735 100644 --- a/game_eggs/steamcmd_servers/starbound/egg-starbound.json +++ b/game_eggs/steamcmd_servers/starbound/egg-starbound.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-08-19T14:57:25-04:00", + "exported_at": "2022-08-20T08:17:48+02:00", "name": "Starbound", "author": "parker@parkervcp.com", "description": "Starbound takes place in a two-dimensional, procedurally generated universe which the player is able to explore in order to obtain new weapons, armor, and items, and to visit towns and villages inhabited by various intelligent lifeforms.", @@ -24,8 +24,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## Starbound specific setup.\r\ncd \/mnt\/server\/\r\n\r\n\r\n## edit sbinit config\r\nmv \/mnt\/server\/linux\/* \/mnt\/server\/\r\nrm -rf \/mnt\/server\/linux\r\nsed -i -e 's\/\\.\\.\/\\.\/g' \/mnt\/server\/sbinit.config\r\n\r\n## pull starbound_server.config\r\nmkdir -p \/mnt\/server\/storage\r\ncurl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/steamcmd_servers\/starbound\/starbound_server.config > \/mnt\/server\/storage\/starbound_server.config\r\n\r\n## use Worksop content\r\nif [ \"${WORKSHOP}\" == \"1\" ]; then\r\n for dir in \/mnt\/server\/steamapps\/workshop\/content\/211820\/*\/\r\n do\r\n # Removes the trailing slash from the full path\r\n dir=${dir%*\/}\r\n echo Sym-linking mod ${dir##*\/} files into the mods folder\r\n INDEX=0\r\n for pakfile in ${dir}\/*.pak\r\n do\r\n ln -r -s $pakfile \/mnt\/server\/mods\/${dir##*\/}_${INDEX}.pak\r\n INDEX=$((INDEX+1))\r\n done\r\n done\r\nfi", - "container": "debian:buster-slim", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## Starbound specific setup.\r\ncd \/mnt\/server\/\r\n\r\n\r\n## edit sbinit config\r\nmv \/mnt\/server\/linux\/* \/mnt\/server\/\r\nrm -rf \/mnt\/server\/linux\r\nsed -i -e 's\/\\.\\.\/\\.\/g' \/mnt\/server\/sbinit.config\r\n\r\n## pull starbound_server.config\r\nmkdir -p \/mnt\/server\/storage\r\ncurl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/steamcmd_servers\/starbound\/starbound_server.config > \/mnt\/server\/storage\/starbound_server.config\r\n\r\n## use Worksop content\r\nif [ \"${WORKSHOP}\" == \"1\" ]; then\r\n for dir in \/mnt\/server\/steamapps\/workshop\/content\/211820\/*\/\r\n do\r\n # Removes the trailing slash from the full path\r\n dir=${dir%*\/}\r\n echo Sym-linking mod ${dir##*\/} files into the mods folder\r\n INDEX=0\r\n for pakfile in ${dir}\/*.pak\r\n do\r\n ln -r -s $pakfile \/mnt\/server\/mods\/${dir##*\/}_${INDEX}.pak\r\n INDEX=$((INDEX+1))\r\n done\r\n done\r\nfi", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, @@ -91,4 +91,4 @@ "field_type": "text" } ] -} \ No newline at end of file +} From 3194c942aa328ca2961ee6e9c32f120e7614a348 Mon Sep 17 00:00:00 2001 From: hz-ad <79017780+hz-ad@users.noreply.github.com> Date: Sun, 21 Aug 2022 15:41:40 -0700 Subject: [PATCH 0517/1001] Correct Failed Installer Egg fails to install due to ubuntu installer package issues. Switched to debian, changed gcc package name. Also updated from quay to ghcr --- game_eggs/steamcmd_servers/tower_unite/egg-tower-unite.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/steamcmd_servers/tower_unite/egg-tower-unite.json b/game_eggs/steamcmd_servers/tower_unite/egg-tower-unite.json index 733cba6c..963f1a2f 100644 --- a/game_eggs/steamcmd_servers/tower_unite/egg-tower-unite.json +++ b/game_eggs/steamcmd_servers/tower_unite/egg-tower-unite.json @@ -12,7 +12,7 @@ "steam_disk_space" ], "images": [ - "quay.io\/pterodactyl\/core:source" + "ghcr.io/pterodactyl/games:source" ], "file_denylist": [], "startup": ".\/Tower\/Binaries\/Linux\/TowerServer-Linux-Shipping -log -Port={{SERVER_PORT}} -MULTIHOME=0.0.0.0 -TowerServerINI=..\/..\/Saved\/Config\/TowerServer.ini", @@ -24,8 +24,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Tower Unite Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --install-recommends install curl ca-certificates lib32gcc1\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\n\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\n\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 439660 validate +quit\r\n\r\ncd mnt\/server\r\n\r\nmkdir -p Tower\/Saved\/Config\r\nmkdir -p Tower\/Binaries\/Linux\r\n\r\nmv \/mnt\/server\/steamcmd\/linux64\/steamclient.so \/mnt\/server\/Tower\/Binaries\/Linux\r\n\r\ncat <> Tower\/Saved\/Config\/TowerServer.ini\r\n[\/script\/towernetworking.dedicatedserveroptions]\r\nMaxPlayers=$SERVER_MAX_PLAYER\r\nServerTitle=$SERVER_TITLE\r\nSteamLoginToken=$STEAM_LOGIN_TOKEN\r\n\r\n[Administration]\r\nAdminSteamID=$STEAM_ADMIN_ID\r\nEOF", - "container": "ubuntu:18.10", + "script": "#!\/bin\/bash\r\n# Tower Unite Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --install-recommends install curl ca-certificates lib32gcc-s1\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\n\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\n\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 439660 validate +quit\r\n\r\ncd mnt\/server\r\n\r\nmkdir -p Tower\/Saved\/Config\r\nmkdir -p Tower\/Binaries\/Linux\r\n\r\nmv \/mnt\/server\/steamcmd\/linux64\/steamclient.so \/mnt\/server\/Tower\/Binaries\/Linux\r\n\r\ncat <> Tower\/Saved\/Config\/TowerServer.ini\r\n[\/script\/towernetworking.dedicatedserveroptions]\r\nMaxPlayers=$SERVER_MAX_PLAYER\r\nServerTitle=$SERVER_TITLE\r\nSteamLoginToken=$STEAM_LOGIN_TOKEN\r\n\r\n[Administration]\r\nAdminSteamID=$STEAM_ADMIN_ID\r\nEOF", + "container": "ghcr.io/pterodactyl/installers:debian", "entrypoint": "bash" } }, From f6738dd7040c6e55461816e307c1ceccd8b398c0 Mon Sep 17 00:00:00 2001 From: Leon <64979109+ItsLeon15@users.noreply.github.com> Date: Tue, 23 Aug 2022 22:10:43 +0100 Subject: [PATCH 0518/1001] Update egg-lavalink.json Removed old description as GitHub repo was removed. Switched to https://github.com//freyacodes/Lavalink#lavalink description. --- voice_servers/lavalink/egg-lavalink.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/voice_servers/lavalink/egg-lavalink.json b/voice_servers/lavalink/egg-lavalink.json index 5fee7eba..d846af2e 100644 --- a/voice_servers/lavalink/egg-lavalink.json +++ b/voice_servers/lavalink/egg-lavalink.json @@ -7,7 +7,7 @@ "exported_at": "2021-04-11T13:56:42+02:00", "name": "Lavalink", "author": "damuffin36@gmail.com", - "description": "Standalone audio sending node based on Lavaplayer and JDA-Audio. Allows for sending audio without it ever reaching any of your shards.\r\nDescription taken from https:\/\/github.com\/Frederikam\/Lavalink", + "description": "A standalone audio sending node based on Lavaplayer and Koe. Allows for sending audio without it ever reaching any of your shards.\r\nDescription taken from https:\/\/github.com\/freyacodes\/Lavalink", "features": null, "images": [ "ghcr.io/parkervcp/yolks:java_11" From 1e50f2524602614bd800e8e54b18749964f90651 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sun, 28 Aug 2022 13:34:17 +0200 Subject: [PATCH 0519/1001] update MongoDB to new images --- database/nosql/mongodb/egg-mongo-d-b.json | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/database/nosql/mongodb/egg-mongo-d-b.json b/database/nosql/mongodb/egg-mongo-d-b.json index 311f157b..113bfe4f 100644 --- a/database/nosql/mongodb/egg-mongo-d-b.json +++ b/database/nosql/mongodb/egg-mongo-d-b.json @@ -1,13 +1,19 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v2", + "update_url": null }, - "exported_at": "2020-10-30T13:01:44+00:00", + "exported_at": "2022-08-28T13:33:51+02:00", "name": "MongoDB", "author": "parker@parkervcp.com", "description": "MongoDB is a general purpose, document-based, distributed database built for modern application developers and for my butt era.", - "image": "quay.io\/parkervcp\/pterodactyl-images:db_mongo-4", + "features": null, + "docker_images": { + "MongoDB_4": "ghcr.io\/parkervcp\/yolks:mongodb_4", + "MongoDB_5": "ghcr.io\/parkervcp\/yolks:mongodb_5" + }, + "file_denylist": [], "startup": "mongod --fork --dbpath \/home\/container\/mongodb\/ --port ${SERVER_PORT} --bind_ip 0.0.0.0 --logpath \/home\/container\/logs\/mongo.log -f \/home\/container\/mongod.conf; until nc -z -v -w5 127.0.0.1 ${SERVER_PORT}; do echo 'Waiting for mongodb connection...'; sleep 5; done && mongo --username ${MONGO_USER} --password ${MONGO_USER_PASS} --host 127.0.0.1:${SERVER_PORT} && mongo --eval \"db.getSiblingDB('admin').shutdownServer()\" 127.0.0.1:${SERVER_PORT}", "config": { "files": "{}", @@ -30,7 +36,8 @@ "default_value": "admin", "user_viewable": true, "user_editable": true, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" }, { "name": "Mongo Admin Password", @@ -39,7 +46,8 @@ "default_value": "aP@55word", "user_viewable": true, "user_editable": true, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" } ] } From a567ee56cdb9ad00ccfa07b6f47214f4aab755e4 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 28 Aug 2022 14:15:18 +0200 Subject: [PATCH 0520/1001] added MongoDB6 to Mongodb egg --- database/nosql/mongodb/egg-mongo-d-b.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/database/nosql/mongodb/egg-mongo-d-b.json b/database/nosql/mongodb/egg-mongo-d-b.json index 113bfe4f..f324983d 100644 --- a/database/nosql/mongodb/egg-mongo-d-b.json +++ b/database/nosql/mongodb/egg-mongo-d-b.json @@ -11,7 +11,8 @@ "features": null, "docker_images": { "MongoDB_4": "ghcr.io\/parkervcp\/yolks:mongodb_4", - "MongoDB_5": "ghcr.io\/parkervcp\/yolks:mongodb_5" + "MongoDB_5": "ghcr.io\/parkervcp\/yolks:mongodb_5", + "MongoDB_6": "ghcr.io\/parkervcp\/yolks:mongodb_6" }, "file_denylist": [], "startup": "mongod --fork --dbpath \/home\/container\/mongodb\/ --port ${SERVER_PORT} --bind_ip 0.0.0.0 --logpath \/home\/container\/logs\/mongo.log -f \/home\/container\/mongod.conf; until nc -z -v -w5 127.0.0.1 ${SERVER_PORT}; do echo 'Waiting for mongodb connection...'; sleep 5; done && mongo --username ${MONGO_USER} --password ${MONGO_USER_PASS} --host 127.0.0.1:${SERVER_PORT} && mongo --eval \"db.getSiblingDB('admin').shutdownServer()\" 127.0.0.1:${SERVER_PORT}", From 0814d8d15496bc1e03e001e5dcface6636cc732f Mon Sep 17 00:00:00 2001 From: DiscoverSquishy <26318936+DiscoverSquishy@users.noreply.github.com> Date: Sun, 28 Aug 2022 17:30:28 +0300 Subject: [PATCH 0521/1001] Updated velocity.toml to new config default --- .../proxy/java/velocity/velocity.toml | 176 ++++++++++-------- 1 file changed, 98 insertions(+), 78 deletions(-) diff --git a/game_eggs/minecraft/proxy/java/velocity/velocity.toml b/game_eggs/minecraft/proxy/java/velocity/velocity.toml index 0e5741ac..167a9427 100644 --- a/game_eggs/minecraft/proxy/java/velocity/velocity.toml +++ b/game_eggs/minecraft/proxy/java/velocity/velocity.toml @@ -1,19 +1,28 @@ # Config version. Do not change this -config-version = "1.0" +config-version = "2.5" + # What port should the proxy be bound to? By default, we'll bind to all addresses on port 25577. bind = "0.0.0.0:25577" + # What should be the MOTD? This gets displayed when the player adds your server to # their server list. Legacy color codes and JSON are accepted. -motd = "&3A Velocity Server" +motd = " add3A Velocity Server" + # What should we display for the maximum number of players? (Velocity does not support a cap # on the number of players online.) show-max-players = 500 + # Should we authenticate players with Mojang? By default, this is on. online-mode = true + +# Should the proxy enforce the new public key security standard? By default, this is on. +force-key-authentication = true + # If client's ISP/AS sent from this proxy is different from the one from Mojang's # authentication server, the player is kicked. This disallows some VPN and proxy # connections but is a weak form of protection. prevent-client-proxy-connections = false + # Should we forward IP addresses and other data to backend servers? # Available options: # - "none": No forwarding will be done. All players will appear to be connecting @@ -25,18 +34,23 @@ prevent-client-proxy-connections = false # unable to implement network level firewalling (on a shared host). # - "modern": Forward player IPs and UUIDs as part of the login process using # Velocity's native forwarding. Only applicable for Minecraft 1.13 or higher. -player-info-forwarding-mode = "legacy" -# If you are using modern or BungeeGuard IP forwarding, configure an unique secret here. -forwarding-secret = "" +player-info-forwarding-mode = "NONE" + +# If you are using modern or BungeeGuard IP forwarding, configure a file that contains a unique secret here. +# The file is expected to be UTF-8 encoded and not empty. +forwarding-secret-file = "forwarding.secret" + # Announce whether or not your server supports Forge. If you run a modded server, we # suggest turning this on. -# +# # If your network runs one modpack consistently, consider using ping-passthrough = "mods" # instead for a nicer display in the server list. announce-forge = false + # If enabled (default is false) and the proxy is in online mode, Velocity will kick # any existing player who is online if a duplicate connection attempt is made. kick-existing-players = false + # Should Velocity pass server list ping requests to a backend server? # Available options: # - "disabled": No pass-through will be done. The velocity.toml and server-icon.png @@ -52,84 +66,90 @@ kick-existing-players = false # configuration is used if no servers could be contacted. ping-passthrough = "DISABLED" +# If not enabled (default is true) player IP addresses will be replaced by in logs +enable-player-address-logging = true + [servers] - # Configure your servers here. Each key represents the server's name, and the value - # represents the IP address of the server to connect to. - lobby = "127.0.0.1:30066" - minigames = "127.0.0.1:30068" - # In what order we should try servers when a player logs in or is kicked from aserver. - try = ["lobby"] - factions = "127.0.0.1:30067" +# Configure your servers here. Each key represents the server's name, and the value +# represents the IP address of the server to connect to. +lobby = "127.0.0.1:30066" +factions = "127.0.0.1:30067" +minigames = "127.0.0.1:30068" + +# In what order we should try servers when a player logs in or is kicked from a server. +try = [ + "lobby" +] [forced-hosts] - "minigames.example.com" = ["minigames"] - # Configure your forced hosts here. - "lobby.example.com" = ["lobby"] - "factions.example.com" = ["factions"] +# Configure your forced hosts here. +"lobby.example.com" = [ + "lobby" +] +"factions.example.com" = [ + "factions" +] +"minigames.example.com" = [ + "minigames" +] [advanced] - # Specify a custom timeout for connection timeouts here. The default is five seconds. - connection-timeout = 5000 - # Enables BungeeCord plugin messaging channel support on Velocity. - bungee-plugin-message-channel = true - # Specify a read timeout for connections here. The default is 30 seconds. - read-timeout = 30000 - # Enables compatibility with HAProxy. - proxy-protocol = false - # Enables TCP fast open support on the proxy. Requires the proxy to run on Linux. - tcp-fast-open = true - # Shows ping requests to the proxy from clients. - show-ping-requests = false - # By default, Velocity will attempt to gracefully handle situations where the user unexpectedly - # loses connection to the server without an explicit disconnect message by attempting to fall the - # user back, except in the case of read timeouts. BungeeCord will disconnect the user instead. You - # can disable this setting to use the BungeeCord behavior. - failover-on-unexpected-server-disconnect = true - # How much compression should be done (from 0-9). The default is -1, which uses the - # default level of 6. - compression-level = -1 - # Declares the proxy commands to 1.13+ clients. - announce-proxy-commands = true - # Enables the logging of commands - log-command-executions = false - # How large a Minecraft packet has to be before we compress it. Setting this to zero will - # compress all packets, and setting it to -1 will disable compression entirely. - compression-threshold = 256 - # How fast (in milliseconds) are clients allowed to connect after the last connection? By - # default, this is three seconds. Disable this by setting this to 0. - login-ratelimit = 3000 +# How large a Minecraft packet has to be before we compress it. Setting this to zero will +# compress all packets, and setting it to -1 will disable compression entirely. +compression-threshold = 256 + +# How much compression should be done (from 0-9). The default is -1, which uses the +# default level of 6. +compression-level = -1 + +# How fast (in milliseconds) are clients allowed to connect after the last connection? By +# default, this is three seconds. Disable this by setting this to 0. +login-ratelimit = 3000 + +# Specify a custom timeout for connection timeouts here. The default is five seconds. +connection-timeout = 5000 + +# Specify a read timeout for connections here. The default is 30 seconds. +read-timeout = 30000 + +# Enables compatibility with HAProxy's PROXY protocol. If you don't know what this is for, then +# don't enable it. +haproxy-protocol = false + +# Enables TCP fast open support on the proxy. Requires the proxy to run on Linux. +tcp-fast-open = false + +# Enables BungeeCord plugin messaging channel support on Velocity. +bungee-plugin-message-channel = true + +# Shows ping requests to the proxy from clients. +show-ping-requests = false + +# By default, Velocity will attempt to gracefully handle situations where the user unexpectedly +# loses connection to the server without an explicit disconnect message by attempting to fall the +# user back, except in the case of read timeouts. BungeeCord will disconnect the user instead. You +# can disable this setting to use the BungeeCord behavior. +failover-on-unexpected-server-disconnect = true + +# Declares the proxy commands to 1.13+ clients. +announce-proxy-commands = true + +# Enables the logging of commands +log-command-executions = false + +# Enables logging of player connections when connecting to the proxy, switching servers +# and disconnecting from the proxy. +log-player-connections = true [query] - # If query is enabled, on what port should the query protocol listen on? - port = 25577 - # Whether plugins should be shown in query response by default or not - show-plugins = false - # This is the map name that is reported to the query services. - map = "Velocity" - # Whether to enable responding to GameSpy 4 query responses or not. - enabled = false +# Whether to enable responding to GameSpy 4 query responses or not. +enabled = false -[metrics] - # A unique, anonymous ID to identify this proxy with. - id = "" - log-failure = false - # Whether metrics will be reported to bStats (https://bstats.org). - # bStats collects some basic information, like how many people use Velocity and their - # player count. We recommend keeping bStats enabled, but if you're not comfortable with - # this, you can turn this setting off. There is no performance penalty associated with - # having metrics enabled, and data sent to bStats can't identify your server. - enabled = false +# If query is enabled, on what port should the query protocol listen on? +port = 25577 -# Legacy color codes and JSON are accepted in all messages. -[messages] - generic-connection-error = "&cAn internal error occurred in your connection." - already-connected = "&cYou are already connected to this proxy!" - online-mode-only = "&cThis server only accepts connections from online-mode clients.\n\n&7Did you change your username? Sign out of Minecraft, sign back in, and try again." - # Prefix when the player is disconnected from a server. - # First argument '%s': the server name - disconnect-prefix = "&cCan't connect to %s: " - no-available-servers = "&cThere are no available servers." - # Prefix when the player gets kicked from a server. - # First argument '%s': the server name - kick-prefix = "&cKicked from %s: " - moved-to-new-server-prefix = "&cThe server you were on kicked you: " \ No newline at end of file +# This is the map name that is reported to the query services. +map = "Velocity" + +# Whether plugins should be shown in query response by default or not +show-plugins = false \ No newline at end of file From c8db45945a6705feef408e7df8e7363fa783ed8c Mon Sep 17 00:00:00 2001 From: DiscoverSquishy <26318936+DiscoverSquishy@users.noreply.github.com> Date: Sun, 28 Aug 2022 17:31:14 +0300 Subject: [PATCH 0522/1001] Modified egg script to accomodate for new forwarding.secret --- game_eggs/minecraft/proxy/java/velocity/egg-velocity.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json b/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json index 6d818780..25cf326e 100644 --- a/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json +++ b/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json @@ -29,7 +29,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Velocity Proxy Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=velocity\r\n\r\nif [[ -z ${VELOCITY_VERSION} ]] || [[ ${VELOCITY_VERSION} == \"latest\" ]]; then\r\n VELOCITY_VERSION=\"latest\"\r\nfi\r\n\r\nif [[ -n \"${DOWNLOAD_LINK}\" ]]; then\r\n echo -e \"Using supplied download url: ${DOWNLOAD_LINK}\"\r\n DOWNLOAD_URL=$(eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g'))\r\nelse\r\n\r\n VER_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r --arg VERSION $VELOCITY_VERSION '.versions[] | contains($VERSION)' | grep true)\r\n LATEST_VERSION=$(curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]')\r\n\r\n if [[ \"${VER_EXISTS}\" == \"true\" ]]; then\r\n echo -e \"Version is valid. Using version ${VELOCITY_VERSION}\"\r\n else\r\n\r\n echo -e \"Using the latest ${PROJECT} version\"\r\n VELOCITY_VERSION=${LATEST_VERSION}\r\n fi\r\n BUILD_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${VELOCITY_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | tostring | contains($BUILD)' | grep true)\r\n LATEST_BUILD=$(curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${VELOCITY_VERSION} | jq -r '.builds' | jq -r '.[-1]')\r\n\r\n if [[ \"${BUILD_EXISTS}\" == \"true\" ]]; then\r\n echo -e \"Build is valid for version ${VELOCITY_VERSION}. Using build ${BUILD_NUMBER}\"\r\n else\r\n echo -e \"Using the latest ${PROJECT} build for version ${VELOCITY_VERSION}\"\r\n BUILD_NUMBER=${LATEST_BUILD}\r\n fi\r\n\r\n JAR_NAME=${PROJECT}-${VELOCITY_VERSION}-${BUILD_NUMBER}.jar\r\n\r\n echo \"Version being downloaded\"\r\n echo -e \"Velocity Version: ${VELOCITY_VERSION}\"\r\n echo -e \"Build: ${BUILD_NUMBER}\"\r\n echo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\r\n DOWNLOAD_URL=https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${VELOCITY_VERSION}\/builds\/${BUILD_NUMBER}\/downloads\/${JAR_NAME}\r\nfi\r\n\r\ncd \/mnt\/server\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [[ -f ${SERVER_JARFILE} ]]; then\r\n mv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\nif [[ -f velocity.toml ]]; then\r\n echo -e \"velocity config file exists\"\r\nelse\r\n echo -e \"downloading velocity config file.\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/proxy\/java\/velocity\/velocity.toml -o velocity.toml\r\n\r\nfi\r\necho -e \"install complete\"", + "script": "#!\/bin\/ash\r\n# Velocity Proxy Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=velocity\r\nif [[ -z ${VELOCITY_VERSION} ]] || [[ ${VELOCITY_VERSION} == \"latest\" ]]; then\r\nVELOCITY_VERSION=\"latest\"\r\nfi\r\nif [[ -n \"${DOWNLOAD_LINK}\" ]]; then\r\necho -e \"Using supplied download url: ${DOWNLOAD_LINK}\"\r\nDOWNLOAD_URL=$(eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g'))\r\nelse\r\nVER_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r --arg VERSION $VELOCITY_VERSION '.versions[] | contains($VERSION)' | grep true)\r\nLATEST_VERSION=$(curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]')\r\nif [[ \"${VER_EXISTS}\" == \"true\" ]]; then\r\necho -e \"Version is valid. Using version ${VELOCITY_VERSION}\"\r\nelse\r\necho -e \"Using the latest ${PROJECT} version\"\r\nVELOCITY_VERSION=${LATEST_VERSION}\r\nfi\r\nBUILD_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${VELOCITY_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | tostring | contains($BUILD)' | grep true)\r\nLATEST_BUILD=$(curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${VELOCITY_VERSION} | jq -r '.builds' | jq -r '.[-1]')\r\nif [[ \"${BUILD_EXISTS}\" == \"true\" ]]; then\r\necho -e \"Build is valid for version ${VELOCITY_VERSION}. Using build ${BUILD_NUMBER}\"\r\nelse\r\necho -e \"Using the latest ${PROJECT} build for version ${VELOCITY_VERSION}\"\r\nBUILD_NUMBER=${LATEST_BUILD}\r\nfi\r\nJAR_NAME=${PROJECT}-${VELOCITY_VERSION}-${BUILD_NUMBER}.jar\r\necho \"Version being downloaded\"\r\necho -e \"Velocity Version: ${VELOCITY_VERSION}\"\r\necho -e \"Build: ${BUILD_NUMBER}\"\r\necho -e \"JAR Name of Build: ${JAR_NAME}\"\r\nDOWNLOAD_URL=https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${VELOCITY_VERSION}\/builds\/${BUILD_NUMBER}\/downloads\/${JAR_NAME}\r\nfi\r\ncd \/mnt\/server\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\nif [[ -f ${SERVER_JARFILE} ]]; then\r\nmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\nif [[ -f velocity.toml ]]; then\r\necho -e \"velocity config file exists\"\r\nelse\r\necho -e \"downloading velocity config file.\"\r\ncurl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/proxy\/java\/velocity\/velocity.toml -o velocity.toml\r\nfi\r\nif [[ -f forwarding.secret ]]; then\r\necho -e \"velocity forwarding secret file already exists\"\r\nelse\r\necho -e \"creating forwarding secret file\"\r\ntouch forwarding.secret\r\ndate +%s | sha256sum | base64 | head -c 12 > forwarding.secret\r\nfi\r\necho -e \"install complete\"", "container": "ghcr.io\/pterodactyl\/installers:alpine", "entrypoint": "ash" } @@ -72,4 +72,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From b4116c645f0a51ac27c9bacb1db85a992f1c446c Mon Sep 17 00:00:00 2001 From: DiscoverSquishy <26318936+DiscoverSquishy@users.noreply.github.com> Date: Sun, 28 Aug 2022 17:37:20 +0300 Subject: [PATCH 0523/1001] Modified velocity.toml to use "legacy" forwading by default --- game_eggs/minecraft/proxy/java/velocity/velocity.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/minecraft/proxy/java/velocity/velocity.toml b/game_eggs/minecraft/proxy/java/velocity/velocity.toml index 167a9427..bb22e994 100644 --- a/game_eggs/minecraft/proxy/java/velocity/velocity.toml +++ b/game_eggs/minecraft/proxy/java/velocity/velocity.toml @@ -34,7 +34,7 @@ prevent-client-proxy-connections = false # unable to implement network level firewalling (on a shared host). # - "modern": Forward player IPs and UUIDs as part of the login process using # Velocity's native forwarding. Only applicable for Minecraft 1.13 or higher. -player-info-forwarding-mode = "NONE" +player-info-forwarding-mode = "legacy" # If you are using modern or BungeeGuard IP forwarding, configure a file that contains a unique secret here. # The file is expected to be UTF-8 encoded and not empty. @@ -42,7 +42,7 @@ forwarding-secret-file = "forwarding.secret" # Announce whether or not your server supports Forge. If you run a modded server, we # suggest turning this on. -# +# # If your network runs one modpack consistently, consider using ping-passthrough = "mods" # instead for a nicer display in the server list. announce-forge = false From 3568cd16d302c0ef1547f8e60d9955cbfa6c68f8 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Mon, 29 Aug 2022 15:13:17 +0200 Subject: [PATCH 0524/1001] Create egg-tekkit-2.json --- .../java/technic/Tekkit-2/egg-tekkit-2.json | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 game_eggs/minecraft/java/technic/Tekkit-2/egg-tekkit-2.json diff --git a/game_eggs/minecraft/java/technic/Tekkit-2/egg-tekkit-2.json b/game_eggs/minecraft/java/technic/Tekkit-2/egg-tekkit-2.json new file mode 100644 index 00000000..091ad6f4 --- /dev/null +++ b/game_eggs/minecraft/java/technic/Tekkit-2/egg-tekkit-2.json @@ -0,0 +1,46 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2022-08-29T15:07:44+02:00", + "name": "Tekkit 2", + "author": "josdekurk@gmail.com", + "description": "Those of you who are nostalgic for the early days of Tekkit (now known as Tekkit Classic), will love what awaits you in Tekkit 2!\r\n\r\nWith a collection of nostalgic mods and plenty of new improvements, Tekkit 2 is sure to capture the feeling of possibility and consequence that you felt while exploring the world of machines and contraptions that made the original fun. Keep an eye out for classics such as IndustrialCraft, ProjectE (Equivalent Exchange), Project Red (RedPower) and BuildCraft, alongside additions such as Galacticraft and Tekkit Jaffa Cakes! The world is yours to bend and exploit to your will, whether through alchemy or sprawling factories and mines.\r\n\r\nWhat fresh horrors will you create?", + "features": [ + "eula", + "java_version" + ], + "docker_images": { + "Java8": "ghcr.io\/pterodactyl\/yolks:java_8", + "Java11": "ghcr.io\/pterodactyl\/yolks:java_11" + }, + "file_denylist": [], + "startup": "java -server -Xms128M -Xmx{{SERVER_MEMORY}}M -Dfml.queryResult=confirm -jar forge.jar nogui", + "config": { + "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Server tick complete! \"\r\n}", + "logs": "{}", + "stop": "stop" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/ash\r\n# Tekkit Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt -y install curl zip unzip\r\n\r\nmkdir -p \/mnt\/server\r\n\r\ncd \/mnt\/server\r\n\r\ncurl -sSL https:\/\/servers.technicpack.net\/Technic\/servers\/tekkit-2\/Tekkit-2_Server_$MODPACK_VERSION.zip -o Tekkit-2_Server_$MODPACK_VERSION.zip\r\n\r\nunzip -o Tekkit-2_Server_$MODPACK_VERSION.zip\r\n\r\nrm -rf Tekkit-2_Server_$MODPACK_VERSION.zip\r\n\r\nrm RestoreBackup.bat\r\n\r\nrm LaunchServer.bat\r\n\r\nrm LaunchServer.sh\r\n\r\nrm RestoreBackup.sh\r\n\r\nmv forge-1.12.2-*.jar forge.jar\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"Downloading MC server.properties\"\r\n curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/java\/server.properties\r\nfi\r\n\r\necho \"done\"", + "container": "debian:bullseye-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Modpack Version", + "description": "", + "env_variable": "MODPACK_VERSION", + "default_value": "v1.0.0", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:10", + "field_type": "text" + } + ] +} From 4a9decb009f597b615cc6a6b007322470b61cf61 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Mon, 29 Aug 2022 15:14:10 +0200 Subject: [PATCH 0525/1001] Update README.md --- game_eggs/minecraft/java/technic/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/game_eggs/minecraft/java/technic/README.md b/game_eggs/minecraft/java/technic/README.md index 6b1a055e..a6f88370 100644 --- a/game_eggs/minecraft/java/technic/README.md +++ b/game_eggs/minecraft/java/technic/README.md @@ -6,6 +6,7 @@ * [Blightfall](/game_eggs/minecraft/java/technic/blightfall/) * [Hexxit](/game_eggs/minecraft/java/technic/hexxit/) * [Tekkit](/game_eggs/minecraft/java/technic/Tekkit/) +* [Tekkit 2](/game_eggs/minecraft/java/technic/Tekkit-2/) * [Tekkit Classic](/game_eggs/minecraft/java/technic/tekkit-classic/) * [Tekkit Legends](/game_eggs/minecraft/java/technic/tekkit-legends/) * [The 1.7.10 Pack](/game_eggs/minecraft/java/technic/the-1-7-10-pack/) From fc127f14f404bc78e2cfaa58dad336765da7f255 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Mon, 29 Aug 2022 15:14:42 +0200 Subject: [PATCH 0526/1001] Create README.md --- game_eggs/minecraft/java/technic/Tekkit-2/README.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 game_eggs/minecraft/java/technic/Tekkit-2/README.md diff --git a/game_eggs/minecraft/java/technic/Tekkit-2/README.md b/game_eggs/minecraft/java/technic/Tekkit-2/README.md new file mode 100644 index 00000000..f45969ab --- /dev/null +++ b/game_eggs/minecraft/java/technic/Tekkit-2/README.md @@ -0,0 +1,9 @@ +# Minecraft: Tekkit 2 + +## Server Ports +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. + + +| Port | default | +|-------|---------| +| Game | 25565 | From 3d7678ac5a14537307b1580d91bb4967d57edc48 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Mon, 29 Aug 2022 16:19:08 +0200 Subject: [PATCH 0527/1001] Create egg-rage-c-o-o-p.json --- game_eggs/gta/ragecoop/egg-rage-c-o-o-p.json | 42 ++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 game_eggs/gta/ragecoop/egg-rage-c-o-o-p.json diff --git a/game_eggs/gta/ragecoop/egg-rage-c-o-o-p.json b/game_eggs/gta/ragecoop/egg-rage-c-o-o-p.json new file mode 100644 index 00000000..d4ab8e09 --- /dev/null +++ b/game_eggs/gta/ragecoop/egg-rage-c-o-o-p.json @@ -0,0 +1,42 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2022-08-29T16:18:03+02:00", + "name": "RageCOOP", + "author": "josdekurk@gmail.com", + "description": "Drive around the interstate with your buddy, enjoy GTAs environment, make own missions and events or just chill in Grove Street! \ud83c\udf10", + "features": null, + "docker_images": { + "ghcr.io\/parkervcp\/yolks:debian": "ghcr.io\/parkervcp\/yolks:debian" + }, + "file_denylist": [], + "startup": ".\/RageCoop.Server", + "config": { + "files": "{\r\n \"Settings.xml\": {\r\n \"parser\": \"xml\",\r\n \"find\": {\r\n \"Settings.Port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Listening for clients\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n\r\napt update\r\napt -y install curl wget git zip unzip jq\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"x64\" || echo \"arm\")\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/RAGECOOP\/RAGECOOP-V\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/RAGECOOP\/RAGECOOP-V\/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 RageCoop.Server-linux-${ARCH}.zip)\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 -i RageCoop.Server-linux-${ARCH}.zip)\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 | grep -i RageCoop.Server-linux-${ARCH}.zip)\r\n fi\r\nfi\r\n\r\necho ${DOWNLOAD_URL}\r\nwget ${DOWNLOAD_URL} -O RageCoop.Server-linux.zip\r\nRageCoop.Server-linux.zip\r\n\r\nunzip RageCoop.Server-linux.zip\r\n\r\nrm RageCoop.Server-linux.zip\r\n\r\nchmod +x RageCoop.Server\r\n\r\ncat < Settings.xml\r\n\r\n\t4499<\/Port>\r\n\t32<\/MaxPlayers>\r\n\t500<\/MaxLatency>\r\n\tRAGECOOP server<\/Name>\r\n\thttps:\/\/ragecoop.online\/<\/Website>\r\n\tRAGECOOP server<\/Description>\r\n\tFreeRoam<\/GameMode>\r\n\tEnglish<\/Language>\r\n\tWelcome on this server :)<\/WelcomeMessage>\r\n\tfalse<\/AnnounceSelf>\r\n\thttps:\/\/masterserver.ragecoop.online\/<\/MasterServer>\r\n\t0<\/LogLevel>\r\n\t500<\/NpcStreamingDistance>\r\n\t-1<\/PlayerStreamingDistance>\r\n\ttrue<\/WeatherTimeSync>\r\n\tABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890-_<\/AllowedUsernameChars>\r\n\tfalse<\/UseP2P>\r\n\tfalse<\/UseZeroTier>\r\n\tfalse<\/UseVoice>\r\n\t8056c2e21c000001<\/ZeroTierNetworkID>\r\n\tfalse<\/AutoUpdate>\r\n\tfalse<\/KickGodMode>\r\n\ttrue<\/KickSpamming>\r\n<\/Settings>\r\nEOF\r\n\r\necho \"done\"", + "container": "debian:bullseye-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Version", + "description": "The version you want of RAGECOOP-V\r\n\r\nExample: latest, nightly , 1.5.3", + "env_variable": "VERSION", + "default_value": "latest", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20", + "field_type": "text" + } + ] +} From f91db69dc7200fb79a470814f2ab94786792f5fe Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Mon, 29 Aug 2022 16:21:05 +0200 Subject: [PATCH 0528/1001] Create README.md --- game_eggs/gta/ragecoop/README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 game_eggs/gta/ragecoop/README.md diff --git a/game_eggs/gta/ragecoop/README.md b/game_eggs/gta/ragecoop/README.md new file mode 100644 index 00000000..80ace539 --- /dev/null +++ b/game_eggs/gta/ragecoop/README.md @@ -0,0 +1,11 @@ +# ragecoop.online + +The [ragecoop](https://ragecoop.online/) Drive around the interstate with your buddy, enjoy GTAs environment, make own missions and events or just chill in Grove Street! 🌐 + +## Server Ports + +ragecoop requires one port for both UDP/TCP + +| Port | default | +|---------|----------| +| Game | 4499 | From de0cc272f94dbba56af33e6947a53caedbafcbd1 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Mon, 29 Aug 2022 16:22:15 +0200 Subject: [PATCH 0529/1001] Update README.md --- game_eggs/gta/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/game_eggs/gta/README.md b/game_eggs/gta/README.md index d79f00a7..028bc6f6 100644 --- a/game_eggs/gta/README.md +++ b/game_eggs/gta/README.md @@ -11,6 +11,9 @@ RAGE Multiplayer is an multiplayer modification for Grand Theft Auto V that is a [alt:V](https://altv.mp) alt:V Multiplayer a third-party multiplayer modification for Grand Theft Auto: V +[ragecoop](https://ragecoop.online/) +ragecoop Drive around the interstate with your buddy, enjoy GTAs environment, make own missions and events or just chill in Grove Street! 🌐 + ## San Andreas [GTA SA:MP](https://www.sa-mp.com/) From d15360f0bb87216d47d4981dc8dfd36133f8c051 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Mon, 29 Aug 2022 16:22:53 +0200 Subject: [PATCH 0530/1001] Update README.md --- game_eggs/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game_eggs/README.md b/game_eggs/README.md index 04de8d09..4fb9cead 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -27,7 +27,8 @@ * GTA V * [FiveM](gta/fivem) - * [RageMP](gta/ragemp) + * [RageMP](gta/ragemp + * [ragecoop](gta/ragecoop) * [alt:V](gta/altv) * GTA SA From 18da9795fc6c54d53f2347bf92764b6b34c0ba13 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Mon, 29 Aug 2022 16:23:32 +0200 Subject: [PATCH 0531/1001] fix readme --- game_eggs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/README.md b/game_eggs/README.md index 4fb9cead..9616010e 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -27,7 +27,7 @@ * GTA V * [FiveM](gta/fivem) - * [RageMP](gta/ragemp + * [RageMP](gta/ragemp) * [ragecoop](gta/ragecoop) * [alt:V](gta/altv) From e2b276363b6aee8005c3628b48c3d7608051bd5e Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Mon, 29 Aug 2022 16:24:22 +0200 Subject: [PATCH 0532/1001] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c99d9e9f..aa1390f7 100644 --- a/README.md +++ b/README.md @@ -113,6 +113,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * GTA V * [FiveM](game_eggs/gta/fivem) + * [ragecoop](game_eggs/gta/ragecoop) * [RageMP](game_eggs/gta/ragemp) * [alt:V](game_eggs/gta/altv) From 0f591d7daa8e41b9d30a7762895e3d83e4e7306c Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Mon, 29 Aug 2022 16:24:54 +0200 Subject: [PATCH 0533/1001] Update README.md --- game_eggs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/README.md b/game_eggs/README.md index 9616010e..6a91552b 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -27,8 +27,8 @@ * GTA V * [FiveM](gta/fivem) - * [RageMP](gta/ragemp) * [ragecoop](gta/ragecoop) + * [RageMP](gta/ragemp) * [alt:V](gta/altv) * GTA SA From 325354c740181a1046d3a244fd5786c88586d439 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Mon, 29 Aug 2022 16:25:22 +0200 Subject: [PATCH 0534/1001] Update README.md --- game_eggs/gta/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/game_eggs/gta/README.md b/game_eggs/gta/README.md index 028bc6f6..9ac0a052 100644 --- a/game_eggs/gta/README.md +++ b/game_eggs/gta/README.md @@ -5,14 +5,15 @@ [FiveM](https://fivem.net/) FiveM is a modification for Grand Theft Auto V enabling you to play multiplayer on customized dedicated servers. +[ragecoop](https://ragecoop.online/) +ragecoop Drive around the interstate with your buddy, enjoy GTAs environment, make own missions and events or just chill in Grove Street! 🌐 + [Rage MP](https://rage.mp/) RAGE Multiplayer is an multiplayer modification for Grand Theft Auto V that is alternative to GTA Online. [alt:V](https://altv.mp) alt:V Multiplayer a third-party multiplayer modification for Grand Theft Auto: V -[ragecoop](https://ragecoop.online/) -ragecoop Drive around the interstate with your buddy, enjoy GTAs environment, make own missions and events or just chill in Grove Street! 🌐 ## San Andreas From aebbc795d5f315ef6c8526e3aaa149fb6df8a82d Mon Sep 17 00:00:00 2001 From: TheRealGramdalf <79593869+TheRealGramdalf@users.noreply.github.com> Date: Tue, 30 Aug 2022 12:50:20 -0700 Subject: [PATCH 0535/1001] add purper-geyser-floodgate --- .../purpur-geysermc-floodgate/README.md | 14 ++++ .../egg-purpur-geysermc-floodgate.json | 84 +++++++++++++++++++ .../bedrock/purpur-geysermc-floodgate/tmp.sh | 53 ++++++++++++ 3 files changed, 151 insertions(+) create mode 100644 game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/README.md create mode 100644 game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json create mode 100644 game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/tmp.sh diff --git a/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/README.md b/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/README.md new file mode 100644 index 00000000..92735500 --- /dev/null +++ b/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/README.md @@ -0,0 +1,14 @@ +# Purpur + +Purpur is a drop-in replacement for Paper servers designed for configurability, and new fun and exciting gameplay features. + +[Purpur GitHub](https://github.com/PurpurMC/Purpur) +[Purpur Website](https://purpurmc.org/) + +## Server Ports + +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. + +| Port | default | +|-------|---------| +| Game | 25565 | diff --git a/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json b/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json new file mode 100644 index 00000000..eaebab32 --- /dev/null +++ b/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json @@ -0,0 +1,84 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-12-18T19:20:26-05:00", + "name": "Purpur-Geyser", + "author": "purpur@birdflop.com", + "description": "A drop-in replacement for Paper servers designed for configurability, and new fun and exciting gameplay features, with the addition of GeyserMC and Floodgate", + "features": [ + "eula", + "java_version", + "pid_limit" + ], + "images": [ + "ghcr.io\/pterodactyl\/yolks:java_17", + "ghcr.io\/pterodactyl\/yolks:java_16", + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_8" + ], + "file_denylist": [], + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", + "config": { + "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \")! For help, type \"\r\n}", + "logs": "{}", + "stop": "stop" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=purpur\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} version\"\r\n\t\tMINECRAFT_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\t\r\n\tBUILD_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all | tostring | contains($BUILD)' | grep true`\r\n\tLATEST_BUILD=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r '.builds.latest'`\r\n\t\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\t\tBUILD_NUMBER=${LATEST_BUILD}\r\n\tfi\r\n\t\r\n\tJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n\techo \"Version being downloaded\"\r\n\techo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n\techo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\tDOWNLOAD_URL=https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"Downloading MC server.properties\"\r\n curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", + "container": "ghcr.io\/pterodactyl\/installers:alpine", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Minecraft Version", + "description": "The version of Minecraft to download. \r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.", + "env_variable": "MINECRAFT_VERSION", + "default_value": "latest", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + }, + { + "name": "Server Jar File", + "description": "The name of the .jar file to run the server with.", + "env_variable": "SERVER_JARFILE", + "default_value": "server.jar", + "user_viewable": true, + "user_editable": true, + "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/|max:80" + }, + { + "name": "Build Number", + "description": "The build number for the Purpur release.\r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.\r\nAccepted values: `latest-stable` `latest-successful`", + "env_variable": "BUILD_NUMBER", + "default_value": "latest", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + } + { + "name": "GeyserMC Build Number", + "description": "The build number for the GeyserMC release.\r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.\r\nAccepted values: `latest-stable` `latest-successful`", + "env_variable": "GEYSER_BUILD_NUMBER", + "default_value": "latest-stable", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + } + { + "name": "Floodgate Build Number", + "description": "The build number for the Floodgate release.\r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.\r\nAccepted values: `latest-stable` `latest-successful`", + "env_variable": "FLOODGATE_BUILD_NUMBER", + "default_value": "latest-stable", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20|regex:latest-stable|regex:latest-succsessful" + } + ] +} diff --git a/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/tmp.sh b/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/tmp.sh new file mode 100644 index 00000000..3d223b22 --- /dev/null +++ b/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/tmp.sh @@ -0,0 +1,53 @@ +#!\/bin\/ash +# Paper Installation Script +# +# Server Files: \/mnt\/server +PROJECT=purpur + +if [ -n \"${DL_PATH}\" ]; then +echo -e \"Using supplied download url: ${DL_PATH}\" +DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')` +else +VER_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true` +LATEST_VERSION=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'` + +if [ \"${VER_EXISTS}\" == \"true\" ]; then +echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\" +else +echo -e \"Using the latest ${PROJECT} version\" +MINECRAFT_VERSION=${LATEST_VERSION} +fi + +BUILD_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all | tostring | contains($BUILD)' | grep true` +LATEST_BUILD=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r '.builds.latest'` + +if [ \"${BUILD_EXISTS}\" == \"true\" ]; then +echo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\" +else +echo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\" +BUILD_NUMBER=${LATEST_BUILD} +fi + +JAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar + +echo \"Version being downloaded\" +echo -e \"MC Version: ${MINECRAFT_VERSION}\" +echo -e \"Build: ${BUILD_NUMBER}\" +echo -e \"JAR Name of Build: ${JAR_NAME}\" +DOWNLOAD_URL=https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download +fi + +cd \/mnt\/server + +echo -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\" + +if [ -f ${SERVER_JARFILE} ]; then +mv ${SERVER_JARFILE} ${SERVER_JARFILE}.old +fi + +curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL} + +if [ ! -f server.properties ]; then + echo -e \"Downloading MC server.properties\" + curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties +fi", \ No newline at end of file From cec8d9cdd5ea0401c028b644fdc6bccffcd1d740 Mon Sep 17 00:00:00 2001 From: TheRealGramdalf <79593869+TheRealGramdalf@users.noreply.github.com> Date: Tue, 30 Aug 2022 14:30:34 -0700 Subject: [PATCH 0536/1001] finished? --- .../egg-purpur-geysermc-floodgate.json | 18 +++++++++--------- .../purpur-geysermc-floodgate/floodgatepart.sh | 2 ++ .../purpur-geysermc-floodgate/geyserpart.sh | 2 ++ .../bedrock/purpur-geysermc-floodgate/tmp.sh | 3 ++- 4 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/floodgatepart.sh create mode 100644 game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/geyserpart.sh diff --git a/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json b/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json index eaebab32..f86048da 100644 --- a/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json +++ b/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json @@ -29,7 +29,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=purpur\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} version\"\r\n\t\tMINECRAFT_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\t\r\n\tBUILD_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all | tostring | contains($BUILD)' | grep true`\r\n\tLATEST_BUILD=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r '.builds.latest'`\r\n\t\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\t\tBUILD_NUMBER=${LATEST_BUILD}\r\n\tfi\r\n\t\r\n\tJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n\techo \"Version being downloaded\"\r\n\techo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n\techo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\tDOWNLOAD_URL=https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"Downloading MC server.properties\"\r\n curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", + "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=purpur\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} version\"\r\n\t\tMINECRAFT_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\t\r\n\tBUILD_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all | tostring | contains($BUILD)' | grep true`\r\n\tLATEST_BUILD=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r '.builds.latest'`\r\n\t\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\t\tBUILD_NUMBER=${LATEST_BUILD}\r\n\tfi\r\n\t\r\n\tJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n\techo \"Version being downloaded\"\r\n\techo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n\techo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\tDOWNLOAD_URL=https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download\r\nfi\r\n\r\nif [ \"$GEYSER_BUILD\" == \"latest-stable\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/Geyser-Spigot.jar\r\nelif [ \"$GEYSER_BUILD\" == \"latest-successful\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastSuccessfulBuild\/artifact\/spigot\/build\/libs\/Geyser-Spigot.jar\r\nfi\r\nGEYSER_STABLE_OR_SUCCESSFUL=`echo \"${GEYSER_BUILD}\" | grep -o -e stable -e succsessful`\r\n\r\nif [ \"$FLOODGATE_BUILD\" == \"latest-stable\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar\r\nelif [ \"$FLOODGATE_BUILD\" == \"latest-successful\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastSuccessfulBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar\r\nfi\r\nFLOODGATE_STABLE_OR_SUCCESSFUL=`echo \"${FLOODGATE_BUILD}\" | grep -o -e stable -e succsessful`\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\necho -e \'Downloading latest \"${GEYSER_STABLE_OR_SUCCESSFUL}\" build with curl -o \"${DOWNLOAD_URL}\"\'\r\ncurl -o \"${DOWNLOAD_URL}\"\r\n\r\n# Put by other curl cmd's\r\necho -e \'Downloading latest \"${FLOODGATE_STABLE_OR_SUCCESSFUL}\" build with curl -o \"${DOWNLOAD_URL}\"\'\r\ncurl -o \"${DOWNLOAD_URL}\"\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"Downloading MC server.properties\"\r\n curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", "container": "ghcr.io\/pterodactyl\/installers:alpine", "entrypoint": "ash" } @@ -55,25 +55,25 @@ }, { "name": "Build Number", - "description": "The build number for the Purpur release.\r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.\r\nAccepted values: `latest-stable` `latest-successful`", + "description": "The build number for the Purpur release.\r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.\r\n\r\nAccepted values: `latest-stable` `latest-successful`", "env_variable": "BUILD_NUMBER", "default_value": "latest", "user_viewable": true, "user_editable": true, "rules": "required|string|max:20" - } + }, { - "name": "GeyserMC Build Number", - "description": "The build number for the GeyserMC release.\r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.\r\nAccepted values: `latest-stable` `latest-successful`", + "name": "GeyserMC Build", + "description": "The build number for the GeyserMC release.\r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.\r\n\r\nAccepted values: `latest-stable` `latest-successful`", "env_variable": "GEYSER_BUILD_NUMBER", "default_value": "latest-stable", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" - } + "rules": "required|string|max:20|regex:latest-stable|regex:latest-succsessful" + }, { - "name": "Floodgate Build Number", - "description": "The build number for the Floodgate release.\r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.\r\nAccepted values: `latest-stable` `latest-successful`", + "name": "Floodgate Build", + "description": "The build number for the Floodgate release.\r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.\r\n\r\nAccepted values: `latest-stable` `latest-successful`", "env_variable": "FLOODGATE_BUILD_NUMBER", "default_value": "latest-stable", "user_viewable": true, diff --git a/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/floodgatepart.sh b/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/floodgatepart.sh new file mode 100644 index 00000000..1a45ea2c --- /dev/null +++ b/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/floodgatepart.sh @@ -0,0 +1,2 @@ +\r\nif [ \"$FLOODGATE_BUILD\" == \"latest-stable\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar\r\nelif [ \"$FLOODGATE_BUILD\" == "latest-successful" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastSuccessfulBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar\r\nfi\r\nFLOODGATE_STABLE_OR_SUCCESSFUL=`echo \"${FLOODGATE_BUILD}\" | grep -o -e stable -e succsessful`\r\n +\r\n# Put by other curl cmd's\r\necho -e \'Downloading latest \"${FLOODGATE_STABLE_OR_SUCCESSFUL}\" build with curl -o \"${DOWNLOAD_URL}\"\'\r\ncurl -o \"${DOWNLOAD_URL}\"\r\n \ No newline at end of file diff --git a/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/geyserpart.sh b/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/geyserpart.sh new file mode 100644 index 00000000..f45d3259 --- /dev/null +++ b/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/geyserpart.sh @@ -0,0 +1,2 @@ +\r\nif [ \"$GEYSER_BUILD\" == \"latest-stable\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/Geyser-Spigot.jar\r\nelif [ \"$GEYSER_BUILD\" == "latest-successful" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastSuccessfulBuild\/artifact\/spigot\/build\/libs\/Geyser-Spigot.jar\r\nfi\r\nGEYSER_STABLE_OR_SUCCESSFUL=`echo \"${GEYSER_BUILD}\" | grep -o -e stable -e succsessful`\r\n +\r\necho -e \'Downloading latest \"${GEYSER_STABLE_OR_SUCCESSFUL}\" build with curl -o \"${DOWNLOAD_URL}\"\'\r\ncurl -o \"${DOWNLOAD_URL}\"\r\n \ No newline at end of file diff --git a/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/tmp.sh b/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/tmp.sh index 3d223b22..dd010283 100644 --- a/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/tmp.sh +++ b/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/tmp.sh @@ -2,6 +2,7 @@ # Paper Installation Script # # Server Files: \/mnt\/server +# shellcheck shell=bash PROJECT=purpur if [ -n \"${DL_PATH}\" ]; then @@ -50,4 +51,4 @@ curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL} if [ ! -f server.properties ]; then echo -e \"Downloading MC server.properties\" curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties -fi", \ No newline at end of file +fi \ No newline at end of file From 945bd252c7862774dd99eaf31c061c9d499c4863 Mon Sep 17 00:00:00 2001 From: TheRealGramdalf <79593869+TheRealGramdalf@users.noreply.github.com> Date: Tue, 30 Aug 2022 14:46:04 -0700 Subject: [PATCH 0537/1001] move to crossplay folder --- .../{bedrock => crossplay}/purpur-geysermc-floodgate/README.md | 0 .../egg-purpur-geysermc-floodgate.json | 2 +- .../purpur-geysermc-floodgate/floodgatepart.sh | 0 .../purpur-geysermc-floodgate/geyserpart.sh | 0 .../{bedrock => crossplay}/purpur-geysermc-floodgate/tmp.sh | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename game_eggs/minecraft/{bedrock => crossplay}/purpur-geysermc-floodgate/README.md (100%) rename game_eggs/minecraft/{bedrock => crossplay}/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json (97%) rename game_eggs/minecraft/{bedrock => crossplay}/purpur-geysermc-floodgate/floodgatepart.sh (100%) rename game_eggs/minecraft/{bedrock => crossplay}/purpur-geysermc-floodgate/geyserpart.sh (100%) rename game_eggs/minecraft/{bedrock => crossplay}/purpur-geysermc-floodgate/tmp.sh (100%) diff --git a/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/README.md b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/README.md similarity index 100% rename from game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/README.md rename to game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/README.md diff --git a/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json similarity index 97% rename from game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json rename to game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json index f86048da..dfb68005 100644 --- a/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json +++ b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json @@ -29,7 +29,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=purpur\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} version\"\r\n\t\tMINECRAFT_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\t\r\n\tBUILD_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all | tostring | contains($BUILD)' | grep true`\r\n\tLATEST_BUILD=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r '.builds.latest'`\r\n\t\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\t\tBUILD_NUMBER=${LATEST_BUILD}\r\n\tfi\r\n\t\r\n\tJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n\techo \"Version being downloaded\"\r\n\techo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n\techo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\tDOWNLOAD_URL=https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download\r\nfi\r\n\r\nif [ \"$GEYSER_BUILD\" == \"latest-stable\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/Geyser-Spigot.jar\r\nelif [ \"$GEYSER_BUILD\" == \"latest-successful\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastSuccessfulBuild\/artifact\/spigot\/build\/libs\/Geyser-Spigot.jar\r\nfi\r\nGEYSER_STABLE_OR_SUCCESSFUL=`echo \"${GEYSER_BUILD}\" | grep -o -e stable -e succsessful`\r\n\r\nif [ \"$FLOODGATE_BUILD\" == \"latest-stable\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar\r\nelif [ \"$FLOODGATE_BUILD\" == \"latest-successful\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastSuccessfulBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar\r\nfi\r\nFLOODGATE_STABLE_OR_SUCCESSFUL=`echo \"${FLOODGATE_BUILD}\" | grep -o -e stable -e succsessful`\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\necho -e \'Downloading latest \"${GEYSER_STABLE_OR_SUCCESSFUL}\" build with curl -o \"${DOWNLOAD_URL}\"\'\r\ncurl -o \"${DOWNLOAD_URL}\"\r\n\r\n# Put by other curl cmd's\r\necho -e \'Downloading latest \"${FLOODGATE_STABLE_OR_SUCCESSFUL}\" build with curl -o \"${DOWNLOAD_URL}\"\'\r\ncurl -o \"${DOWNLOAD_URL}\"\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"Downloading MC server.properties\"\r\n curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", + "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=purpur\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} version\"\r\n\t\tMINECRAFT_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\t\r\n\tBUILD_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all | tostring | contains($BUILD)' | grep true`\r\n\tLATEST_BUILD=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r '.builds.latest'`\r\n\t\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\t\tBUILD_NUMBER=${LATEST_BUILD}\r\n\tfi\r\n\t\r\n\tJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n\techo \"Version being downloaded\"\r\n\techo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n\techo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\tDOWNLOAD_URL=https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download\r\nfi\r\n\r\nif [ \"$GEYSER_BUILD\" == \"latest-stable\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/Geyser-Spigot.jar\r\nelif [ \"$GEYSER_BUILD\" == \"latest-successful\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastSuccessfulBuild\/artifact\/spigot\/build\/libs\/Geyser-Spigot.jar\r\nfi\r\nGEYSER_STABLE_OR_SUCCESSFUL=`echo \"${GEYSER_BUILD}\" | grep -o -e stable -e succsessful`\r\n\r\nif [ \"$FLOODGATE_BUILD\" == \"latest-stable\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar\r\nelif [ \"$FLOODGATE_BUILD\" == \"latest-successful\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastSuccessfulBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar\r\nfi\r\nFLOODGATE_STABLE_OR_SUCCESSFUL=`echo \"${FLOODGATE_BUILD}\" | grep -o -e stable -e succsessful`\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\necho -e \'Downloading latest \"${GEYSER_STABLE_OR_SUCCESSFUL}\" build with curl -o \"${DOWNLOAD_URL}\"\'\r\ncurl -o \"${DOWNLOAD_URL}\"\r\n\r\n# Put by other curl cmd's\r\necho -e \'Downloading latest \"${FLOODGATE_STABLE_OR_SUCCESSFUL}\" build with curl -o \"${DOWNLOAD_URL}\"\'\r\ncurl -o \"${DOWNLOAD_URL}\"\r\n\r\nif [ ! -f server.properties ]; then\r\n\techo -e \"Downloading MC server.properties\"\r\n\tcurl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", "container": "ghcr.io\/pterodactyl\/installers:alpine", "entrypoint": "ash" } diff --git a/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/floodgatepart.sh b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/floodgatepart.sh similarity index 100% rename from game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/floodgatepart.sh rename to game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/floodgatepart.sh diff --git a/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/geyserpart.sh b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/geyserpart.sh similarity index 100% rename from game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/geyserpart.sh rename to game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/geyserpart.sh diff --git a/game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/tmp.sh b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/tmp.sh similarity index 100% rename from game_eggs/minecraft/bedrock/purpur-geysermc-floodgate/tmp.sh rename to game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/tmp.sh From 5f0855ef3cf957e322cbce829f33df9ae58b2d10 Mon Sep 17 00:00:00 2001 From: TheRealGramdalf <79593869+TheRealGramdalf@users.noreply.github.com> Date: Tue, 30 Aug 2022 15:01:45 -0700 Subject: [PATCH 0538/1001] fixed unexpected escape character --- .../egg-purpur-geysermc-floodgate.json | 8 ++++---- .../purpur-geysermc-floodgate/geyserpart.sh | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json index dfb68005..73e4ff3a 100644 --- a/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json +++ b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json @@ -5,7 +5,7 @@ "update_url": null }, "exported_at": "2021-12-18T19:20:26-05:00", - "name": "Purpur-Geyser", + "name": "Purpur-Geyser-Floodgate", "author": "purpur@birdflop.com", "description": "A drop-in replacement for Paper servers designed for configurability, and new fun and exciting gameplay features, with the addition of GeyserMC and Floodgate", "features": [ @@ -29,7 +29,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=purpur\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} version\"\r\n\t\tMINECRAFT_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\t\r\n\tBUILD_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all | tostring | contains($BUILD)' | grep true`\r\n\tLATEST_BUILD=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r '.builds.latest'`\r\n\t\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\t\tBUILD_NUMBER=${LATEST_BUILD}\r\n\tfi\r\n\t\r\n\tJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n\techo \"Version being downloaded\"\r\n\techo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n\techo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\tDOWNLOAD_URL=https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download\r\nfi\r\n\r\nif [ \"$GEYSER_BUILD\" == \"latest-stable\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/Geyser-Spigot.jar\r\nelif [ \"$GEYSER_BUILD\" == \"latest-successful\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastSuccessfulBuild\/artifact\/spigot\/build\/libs\/Geyser-Spigot.jar\r\nfi\r\nGEYSER_STABLE_OR_SUCCESSFUL=`echo \"${GEYSER_BUILD}\" | grep -o -e stable -e succsessful`\r\n\r\nif [ \"$FLOODGATE_BUILD\" == \"latest-stable\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar\r\nelif [ \"$FLOODGATE_BUILD\" == \"latest-successful\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastSuccessfulBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar\r\nfi\r\nFLOODGATE_STABLE_OR_SUCCESSFUL=`echo \"${FLOODGATE_BUILD}\" | grep -o -e stable -e succsessful`\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\necho -e \'Downloading latest \"${GEYSER_STABLE_OR_SUCCESSFUL}\" build with curl -o \"${DOWNLOAD_URL}\"\'\r\ncurl -o \"${DOWNLOAD_URL}\"\r\n\r\n# Put by other curl cmd's\r\necho -e \'Downloading latest \"${FLOODGATE_STABLE_OR_SUCCESSFUL}\" build with curl -o \"${DOWNLOAD_URL}\"\'\r\ncurl -o \"${DOWNLOAD_URL}\"\r\n\r\nif [ ! -f server.properties ]; then\r\n\techo -e \"Downloading MC server.properties\"\r\n\tcurl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", + "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=purpur\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} version\"\r\n\t\tMINECRAFT_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\t\r\n\tBUILD_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all | tostring | contains($BUILD)' | grep true`\r\n\tLATEST_BUILD=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r '.builds.latest'`\r\n\t\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\t\tBUILD_NUMBER=${LATEST_BUILD}\r\n\tfi\r\n\t\r\n\tJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n\techo \"Version being downloaded\"\r\n\techo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n\techo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\tDOWNLOAD_URL=https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download\r\nfi\r\n\r\nif [ \"$GEYSER_BUILD\" == \"latest-stable\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Geyser\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/Geyser-Spigot.jar\r\nelif [ \"$GEYSER_BUILD\" == \"latest-successful\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastSuccessfulBuild\/artifact\/spigot\/build\/libs\/Geyser-Spigot.jar\r\nelse\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Geyser\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/Geyser-Spigot.jar\r\nfi\r\nGEYSER_STABLE_OR_SUCCESSFUL=`echo \"${GEYSER_BUILD}\" | grep -o -e stable -e succsessful`\r\n\r\nif [ \"$FLOODGATE_BUILD\" == \"latest-stable\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar\r\nelif [ \"$FLOODGATE_BUILD\" == \"latest-successful\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastSuccessfulBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar\r\nelse\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar\r\nfi\r\nFLOODGATE_STABLE_OR_SUCCESSFUL=`echo \"${FLOODGATE_BUILD}\" | grep -o -e stable -e succsessful`\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\necho -e \"Downloading latest ${GEYSER_STABLE_OR_SUCCESSFUL} build with curl -o ${DOWNLOAD_URL}\"\r\ncurl -o \"${DOWNLOAD_URL}\"\r\n\r\n# Put by other curl cmd's\r\necho -e \"Downloading latest ${FLOODGATE_STABLE_OR_SUCCESSFUL} build with curl -o ${DOWNLOAD_URL}\"\r\ncurl -o \"${DOWNLOAD_URL}\"\r\n\r\nif [ ! -f server.properties ]; then\r\n\techo -e \"Downloading MC server.properties\"\r\n\tcurl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", "container": "ghcr.io\/pterodactyl\/installers:alpine", "entrypoint": "ash" } @@ -55,7 +55,7 @@ }, { "name": "Build Number", - "description": "The build number for the Purpur release.\r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.\r\n\r\nAccepted values: `latest-stable` `latest-successful`", + "description": "The build number for the Purpur release.\r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest-stable.\r\n\r\nAccepted values: 'latest-stable' 'latest-successful'", "env_variable": "BUILD_NUMBER", "default_value": "latest", "user_viewable": true, @@ -64,7 +64,7 @@ }, { "name": "GeyserMC Build", - "description": "The build number for the GeyserMC release.\r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.\r\n\r\nAccepted values: `latest-stable` `latest-successful`", + "description": "The build number for the GeyserMC release.\r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest-stable.\r\n\r\nAccepted values: 'latest-stable' 'latest-successful'", "env_variable": "GEYSER_BUILD_NUMBER", "default_value": "latest-stable", "user_viewable": true, diff --git a/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/geyserpart.sh b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/geyserpart.sh index f45d3259..5f8cc805 100644 --- a/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/geyserpart.sh +++ b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/geyserpart.sh @@ -1,2 +1,12 @@ -\r\nif [ \"$GEYSER_BUILD\" == \"latest-stable\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/Geyser-Spigot.jar\r\nelif [ \"$GEYSER_BUILD\" == "latest-successful" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastSuccessfulBuild\/artifact\/spigot\/build\/libs\/Geyser-Spigot.jar\r\nfi\r\nGEYSER_STABLE_OR_SUCCESSFUL=`echo \"${GEYSER_BUILD}\" | grep -o -e stable -e succsessful`\r\n -\r\necho -e \'Downloading latest \"${GEYSER_STABLE_OR_SUCCESSFUL}\" build with curl -o \"${DOWNLOAD_URL}\"\'\r\ncurl -o \"${DOWNLOAD_URL}\"\r\n \ No newline at end of file + +if [ \"$GEYSER_BUILD\" == \"latest-stable\" ]; then + DOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/Geyser-Spigot.jar +elif [ \"$GEYSER_BUILD\" == \"latest-successful\" ]; then + DOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastSuccessfulBuild\/artifact\/spigot\/build\/libs\/Geyser-Spigot.jar +else\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar +fi +GEYSER_STABLE_OR_SUCCESSFUL=`echo \"${GEYSER_BUILD}\" | grep -o -e stable -e succsessful` + + +echo -e \'Downloading latest ${GEYSER_STABLE_OR_SUCCESSFUL} build with curl -o ${DOWNLOAD_URL}\' +curl -o \"${DOWNLOAD_URL}\" From 53d509d4e59747f8ae06b61cc10d66661d649e19 Mon Sep 17 00:00:00 2001 From: TheRealGramdalf <79593869+TheRealGramdalf@users.noreply.github.com> Date: Tue, 30 Aug 2022 15:02:29 -0700 Subject: [PATCH 0539/1001] Remove temp files --- .../floodgatepart.sh | 2 - .../purpur-geysermc-floodgate/geyserpart.sh | 12 ----- .../purpur-geysermc-floodgate/tmp.sh | 54 ------------------- 3 files changed, 68 deletions(-) delete mode 100644 game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/floodgatepart.sh delete mode 100644 game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/geyserpart.sh delete mode 100644 game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/tmp.sh diff --git a/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/floodgatepart.sh b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/floodgatepart.sh deleted file mode 100644 index 1a45ea2c..00000000 --- a/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/floodgatepart.sh +++ /dev/null @@ -1,2 +0,0 @@ -\r\nif [ \"$FLOODGATE_BUILD\" == \"latest-stable\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar\r\nelif [ \"$FLOODGATE_BUILD\" == "latest-successful" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastSuccessfulBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar\r\nfi\r\nFLOODGATE_STABLE_OR_SUCCESSFUL=`echo \"${FLOODGATE_BUILD}\" | grep -o -e stable -e succsessful`\r\n -\r\n# Put by other curl cmd's\r\necho -e \'Downloading latest \"${FLOODGATE_STABLE_OR_SUCCESSFUL}\" build with curl -o \"${DOWNLOAD_URL}\"\'\r\ncurl -o \"${DOWNLOAD_URL}\"\r\n \ No newline at end of file diff --git a/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/geyserpart.sh b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/geyserpart.sh deleted file mode 100644 index 5f8cc805..00000000 --- a/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/geyserpart.sh +++ /dev/null @@ -1,12 +0,0 @@ - -if [ \"$GEYSER_BUILD\" == \"latest-stable\" ]; then - DOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/Geyser-Spigot.jar -elif [ \"$GEYSER_BUILD\" == \"latest-successful\" ]; then - DOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastSuccessfulBuild\/artifact\/spigot\/build\/libs\/Geyser-Spigot.jar -else\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar -fi -GEYSER_STABLE_OR_SUCCESSFUL=`echo \"${GEYSER_BUILD}\" | grep -o -e stable -e succsessful` - - -echo -e \'Downloading latest ${GEYSER_STABLE_OR_SUCCESSFUL} build with curl -o ${DOWNLOAD_URL}\' -curl -o \"${DOWNLOAD_URL}\" diff --git a/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/tmp.sh b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/tmp.sh deleted file mode 100644 index dd010283..00000000 --- a/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/tmp.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!\/bin\/ash -# Paper Installation Script -# -# Server Files: \/mnt\/server -# shellcheck shell=bash -PROJECT=purpur - -if [ -n \"${DL_PATH}\" ]; then -echo -e \"Using supplied download url: ${DL_PATH}\" -DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')` -else -VER_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true` -LATEST_VERSION=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'` - -if [ \"${VER_EXISTS}\" == \"true\" ]; then -echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\" -else -echo -e \"Using the latest ${PROJECT} version\" -MINECRAFT_VERSION=${LATEST_VERSION} -fi - -BUILD_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all | tostring | contains($BUILD)' | grep true` -LATEST_BUILD=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r '.builds.latest'` - -if [ \"${BUILD_EXISTS}\" == \"true\" ]; then -echo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\" -else -echo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\" -BUILD_NUMBER=${LATEST_BUILD} -fi - -JAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar - -echo \"Version being downloaded\" -echo -e \"MC Version: ${MINECRAFT_VERSION}\" -echo -e \"Build: ${BUILD_NUMBER}\" -echo -e \"JAR Name of Build: ${JAR_NAME}\" -DOWNLOAD_URL=https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download -fi - -cd \/mnt\/server - -echo -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\" - -if [ -f ${SERVER_JARFILE} ]; then -mv ${SERVER_JARFILE} ${SERVER_JARFILE}.old -fi - -curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL} - -if [ ! -f server.properties ]; then - echo -e \"Downloading MC server.properties\" - curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties -fi \ No newline at end of file From 2f27fa72eaecbb8ef09d81c1d913ecd0b61a0d58 Mon Sep 17 00:00:00 2001 From: TheRealGramdalf <79593869+TheRealGramdalf@users.noreply.github.com> Date: Tue, 30 Aug 2022 16:34:16 -0700 Subject: [PATCH 0540/1001] completely wasted my time and redid everything --- .../.gitignore-test.sh | 62 +++++++++++++++++++ .../egg-purpur-geysermc-floodgate.json | 22 +------ 2 files changed, 64 insertions(+), 20 deletions(-) create mode 100644 game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/.gitignore-test.sh diff --git a/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/.gitignore-test.sh b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/.gitignore-test.sh new file mode 100644 index 00000000..73ea8859 --- /dev/null +++ b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/.gitignore-test.sh @@ -0,0 +1,62 @@ +#!\/bin\/ash +# Paper Installation Script +# +# Server Files: \/mnt\/server +PROJECT=purpur + +# Download paths for Geyser and Floodgate. Do not change!! +GEYSER_DOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Geyser\/job\/master\/lastSuccessfulBuild\/artifact\/bootstrap\/spigot\/target\/Geyser-Spigot.jar +FLOODGATE_DOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job/GeyserMC\/job/Floodgate\/job/master\/lastSuccessfulBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar +if [ -n \"${DL_PATH}\" ]; then + echo -e \"Using supplied download url: ${DL_PATH}\" + DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')` +else + VER_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true` + LATEST_VERSION=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'` + + if [ \"${VER_EXISTS}\" == \"true\" ]; then + echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\" + else + echo -e \"Using the latest ${PROJECT} version\" + MINECRAFT_VERSION=${LATEST_VERSION} + fi + + BUILD_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all | tostring | contains($BUILD)' | grep true` + LATEST_BUILD=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r '.builds.latest'` + + if [ \"${BUILD_EXISTS}\" == \"true\" ]; then + echo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\" + else + echo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\" + BUILD_NUMBER=${LATEST_BUILD} + fi + + JAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar + + echo \"Version being downloaded\" + echo -e \"MC Version: ${MINECRAFT_VERSION}\" + echo -e \"Build: ${BUILD_NUMBER}\" + echo -e \"JAR Name of Build: ${JAR_NAME}\" + DOWNLOAD_URL=https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download +fi + +cd \/mnt\/server + +echo -e \"Downloading the requested purpur buid with curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\" + +if [ -f ${SERVER_JARFILE} ]; then + mv ${SERVER_JARFILE} ${SERVER_JARFILE}.old +fi +mkdir -p \/mnt\/server\/plugins +curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL} + +echo -e \"Downloading last successful build with curl -o plugins\/geyser-spigot ${GEYSER_DOWNLOAD_URL}\" +curl -o plugins\/geyser-spigot.jar ${GEYSER_DOWNLOAD_URL} + +echo -e \"Downloading last successful build with curl -o plugins\/floodgate-spigot ${FLOODGATE_DOWNLOAD_URL}\" +curl -o plugins\/floodgate-spigot ${FLOODGATE_DOWNLOAD_URL} + +if [ ! -f server.properties ]; then + echo -e \"Downloading MC server.properties\" + curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties +fi \ No newline at end of file diff --git a/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json index 73e4ff3a..77d368d7 100644 --- a/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json +++ b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json @@ -20,7 +20,7 @@ "ghcr.io\/pterodactyl\/yolks:java_8" ], "file_denylist": [], - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true --add-modules=jdk.incubator.vector -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \")! For help, type \"\r\n}", @@ -29,7 +29,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=purpur\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} version\"\r\n\t\tMINECRAFT_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\t\r\n\tBUILD_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all | tostring | contains($BUILD)' | grep true`\r\n\tLATEST_BUILD=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r '.builds.latest'`\r\n\t\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\t\tBUILD_NUMBER=${LATEST_BUILD}\r\n\tfi\r\n\t\r\n\tJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n\techo \"Version being downloaded\"\r\n\techo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n\techo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\tDOWNLOAD_URL=https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download\r\nfi\r\n\r\nif [ \"$GEYSER_BUILD\" == \"latest-stable\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Geyser\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/Geyser-Spigot.jar\r\nelif [ \"$GEYSER_BUILD\" == \"latest-successful\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastSuccessfulBuild\/artifact\/spigot\/build\/libs\/Geyser-Spigot.jar\r\nelse\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Geyser\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/Geyser-Spigot.jar\r\nfi\r\nGEYSER_STABLE_OR_SUCCESSFUL=`echo \"${GEYSER_BUILD}\" | grep -o -e stable -e succsessful`\r\n\r\nif [ \"$FLOODGATE_BUILD\" == \"latest-stable\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar\r\nelif [ \"$FLOODGATE_BUILD\" == \"latest-successful\" ]; then\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastSuccessfulBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar\r\nelse\r\n\tDOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Floodgate\/job\/master\/lastStableBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar\r\nfi\r\nFLOODGATE_STABLE_OR_SUCCESSFUL=`echo \"${FLOODGATE_BUILD}\" | grep -o -e stable -e succsessful`\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\necho -e \"Downloading latest ${GEYSER_STABLE_OR_SUCCESSFUL} build with curl -o ${DOWNLOAD_URL}\"\r\ncurl -o \"${DOWNLOAD_URL}\"\r\n\r\n# Put by other curl cmd's\r\necho -e \"Downloading latest ${FLOODGATE_STABLE_OR_SUCCESSFUL} build with curl -o ${DOWNLOAD_URL}\"\r\ncurl -o \"${DOWNLOAD_URL}\"\r\n\r\nif [ ! -f server.properties ]; then\r\n\techo -e \"Downloading MC server.properties\"\r\n\tcurl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", + "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=purpur\r\n\r\n# Download paths for Geyser and Floodgate. Do not change!!\r\nGEYSER_DOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Geyser\/job\/master\/lastSuccessfulBuild\/artifact\/bootstrap\/spigot\/target\/Geyser-Spigot.jar\r\nFLOODGATE_DOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job/GeyserMC\/job/Floodgate\/job/master\/lastSuccessfulBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} version\"\r\n\t\tMINECRAFT_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\t\r\n\tBUILD_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all | tostring | contains($BUILD)' | grep true`\r\n\tLATEST_BUILD=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r '.builds.latest'`\r\n\t\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\t\tBUILD_NUMBER=${LATEST_BUILD}\r\n\tfi\r\n\t\r\n\tJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n\techo \"Version being downloaded\"\r\n\techo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n\techo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\tDOWNLOAD_URL=https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Downloading the requested purpur buid with curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\nmkdir -p \/mnt\/server\/plugins\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\necho -e \"Downloading last successful build with curl -o plugins\/geyser-spigot ${GEYSER_DOWNLOAD_URL}\"\r\ncurl -o plugins\/geyser-spigot.jar ${GEYSER_DOWNLOAD_URL}\r\n\r\necho -e \"Downloading last successful build with curl -o plugins\/floodgate-spigot ${FLOODGATE_DOWNLOAD_URL}\"\r\ncurl -o plugins\/floodgate-spigot ${FLOODGATE_DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n\techo -e \"Downloading MC server.properties\"\r\n\tcurl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", "container": "ghcr.io\/pterodactyl\/installers:alpine", "entrypoint": "ash" } @@ -61,24 +61,6 @@ "user_viewable": true, "user_editable": true, "rules": "required|string|max:20" - }, - { - "name": "GeyserMC Build", - "description": "The build number for the GeyserMC release.\r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest-stable.\r\n\r\nAccepted values: 'latest-stable' 'latest-successful'", - "env_variable": "GEYSER_BUILD_NUMBER", - "default_value": "latest-stable", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:20|regex:latest-stable|regex:latest-succsessful" - }, - { - "name": "Floodgate Build", - "description": "The build number for the Floodgate release.\r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.\r\n\r\nAccepted values: `latest-stable` `latest-successful`", - "env_variable": "FLOODGATE_BUILD_NUMBER", - "default_value": "latest-stable", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:20|regex:latest-stable|regex:latest-succsessful" } ] } From 004b99ead5bb84e21fabbf99cdaa0737ab6fdf2d Mon Sep 17 00:00:00 2001 From: TheRealGramdalf <79593869+TheRealGramdalf@users.noreply.github.com> Date: Tue, 30 Aug 2022 16:38:07 -0700 Subject: [PATCH 0541/1001] added pesky .jar --- .../.gitignore-test.sh | 62 ------------------- .../egg-purpur-geysermc-floodgate.json | 2 +- 2 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/.gitignore-test.sh diff --git a/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/.gitignore-test.sh b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/.gitignore-test.sh deleted file mode 100644 index 73ea8859..00000000 --- a/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/.gitignore-test.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!\/bin\/ash -# Paper Installation Script -# -# Server Files: \/mnt\/server -PROJECT=purpur - -# Download paths for Geyser and Floodgate. Do not change!! -GEYSER_DOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Geyser\/job\/master\/lastSuccessfulBuild\/artifact\/bootstrap\/spigot\/target\/Geyser-Spigot.jar -FLOODGATE_DOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job/GeyserMC\/job/Floodgate\/job/master\/lastSuccessfulBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar -if [ -n \"${DL_PATH}\" ]; then - echo -e \"Using supplied download url: ${DL_PATH}\" - DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')` -else - VER_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true` - LATEST_VERSION=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'` - - if [ \"${VER_EXISTS}\" == \"true\" ]; then - echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\" - else - echo -e \"Using the latest ${PROJECT} version\" - MINECRAFT_VERSION=${LATEST_VERSION} - fi - - BUILD_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all | tostring | contains($BUILD)' | grep true` - LATEST_BUILD=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r '.builds.latest'` - - if [ \"${BUILD_EXISTS}\" == \"true\" ]; then - echo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\" - else - echo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\" - BUILD_NUMBER=${LATEST_BUILD} - fi - - JAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar - - echo \"Version being downloaded\" - echo -e \"MC Version: ${MINECRAFT_VERSION}\" - echo -e \"Build: ${BUILD_NUMBER}\" - echo -e \"JAR Name of Build: ${JAR_NAME}\" - DOWNLOAD_URL=https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download -fi - -cd \/mnt\/server - -echo -e \"Downloading the requested purpur buid with curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\" - -if [ -f ${SERVER_JARFILE} ]; then - mv ${SERVER_JARFILE} ${SERVER_JARFILE}.old -fi -mkdir -p \/mnt\/server\/plugins -curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL} - -echo -e \"Downloading last successful build with curl -o plugins\/geyser-spigot ${GEYSER_DOWNLOAD_URL}\" -curl -o plugins\/geyser-spigot.jar ${GEYSER_DOWNLOAD_URL} - -echo -e \"Downloading last successful build with curl -o plugins\/floodgate-spigot ${FLOODGATE_DOWNLOAD_URL}\" -curl -o plugins\/floodgate-spigot ${FLOODGATE_DOWNLOAD_URL} - -if [ ! -f server.properties ]; then - echo -e \"Downloading MC server.properties\" - curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties -fi \ No newline at end of file diff --git a/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json index 77d368d7..41f93ad1 100644 --- a/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json +++ b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/egg-purpur-geysermc-floodgate.json @@ -29,7 +29,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=purpur\r\n\r\n# Download paths for Geyser and Floodgate. Do not change!!\r\nGEYSER_DOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Geyser\/job\/master\/lastSuccessfulBuild\/artifact\/bootstrap\/spigot\/target\/Geyser-Spigot.jar\r\nFLOODGATE_DOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job/GeyserMC\/job/Floodgate\/job/master\/lastSuccessfulBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} version\"\r\n\t\tMINECRAFT_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\t\r\n\tBUILD_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all | tostring | contains($BUILD)' | grep true`\r\n\tLATEST_BUILD=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r '.builds.latest'`\r\n\t\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\t\tBUILD_NUMBER=${LATEST_BUILD}\r\n\tfi\r\n\t\r\n\tJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n\techo \"Version being downloaded\"\r\n\techo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n\techo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\tDOWNLOAD_URL=https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Downloading the requested purpur buid with curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\nmkdir -p \/mnt\/server\/plugins\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\necho -e \"Downloading last successful build with curl -o plugins\/geyser-spigot ${GEYSER_DOWNLOAD_URL}\"\r\ncurl -o plugins\/geyser-spigot.jar ${GEYSER_DOWNLOAD_URL}\r\n\r\necho -e \"Downloading last successful build with curl -o plugins\/floodgate-spigot ${FLOODGATE_DOWNLOAD_URL}\"\r\ncurl -o plugins\/floodgate-spigot ${FLOODGATE_DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n\techo -e \"Downloading MC server.properties\"\r\n\tcurl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", + "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=purpur\r\n\r\n# Download paths for Geyser and Floodgate. Do not change!!\r\nGEYSER_DOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job\/GeyserMC\/job\/Geyser\/job\/master\/lastSuccessfulBuild\/artifact\/bootstrap\/spigot\/target\/Geyser-Spigot.jar\r\nFLOODGATE_DOWNLOAD_URL=https:\/\/ci.opencollab.dev\/job/GeyserMC\/job/Floodgate\/job/master\/lastSuccessfulBuild\/artifact\/spigot\/build\/libs\/floodgate-spigot.jar\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} version\"\r\n\t\tMINECRAFT_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\t\r\n\tBUILD_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all | tostring | contains($BUILD)' | grep true`\r\n\tLATEST_BUILD=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r '.builds.latest'`\r\n\t\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\t\tBUILD_NUMBER=${LATEST_BUILD}\r\n\tfi\r\n\t\r\n\tJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n\techo \"Version being downloaded\"\r\n\techo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n\techo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\tDOWNLOAD_URL=https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Downloading the requested purpur buid with curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\nmkdir -p \/mnt\/server\/plugins\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\necho -e \"Downloading last successful build with curl -o plugins\/geyser-spigot ${GEYSER_DOWNLOAD_URL}\"\r\ncurl -o plugins\/geyser-spigot.jar ${GEYSER_DOWNLOAD_URL}\r\n\r\necho -e \"Downloading last successful build with curl -o plugins\/floodgate-spigot.jar ${FLOODGATE_DOWNLOAD_URL}\"\r\ncurl -o plugins\/floodgate-spigot.jar ${FLOODGATE_DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n\techo -e \"Downloading MC server.properties\"\r\n\tcurl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", "container": "ghcr.io\/pterodactyl\/installers:alpine", "entrypoint": "ash" } From 344f204df6b1e327d1eaa3992a4fedf72a453c27 Mon Sep 17 00:00:00 2001 From: TheRealGramdalf <79593869+TheRealGramdalf@users.noreply.github.com> Date: Tue, 30 Aug 2022 16:51:53 -0700 Subject: [PATCH 0542/1001] change readme.md --- .../crossplay/purpur-geysermc-floodgate/README.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/README.md b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/README.md index 92735500..c02d122f 100644 --- a/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/README.md +++ b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/README.md @@ -1,14 +1,19 @@ # Purpur -Purpur is a drop-in replacement for Paper servers designed for configurability, and new fun and exciting gameplay features. +Purpur-GeyserMC-Floodgate is a drop-in replacement for Paper servers designed for configurability, and new fun and exciting gameplay features, with the addition of GeyserMC and Floodgate [Purpur GitHub](https://github.com/PurpurMC/Purpur) [Purpur Website](https://purpurmc.org/) +[GeyserMC/Floodgate Website](https://geysermc.org/) +[GeyserMC GitHub](https://github.com/GeyserMC/Geyser) +[Floodgate GitHub](https://github.com/GeyserMC/Floodgate/) + ## Server Ports -The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. +The minecraft server requires a single port for access (default 25565). GeyserMC requires an additional port (default 19132). Any other plugins you add may require extra ports to enabled for the server. -| Port | default | -|-------|---------| -| Game | 25565 | +| Port | default | +|----------|---------| +| Java | 25565 | +| Bedrock | 19132 | From 808656b74c71bc8b55f689f5d3f6b6e4d6646c6f Mon Sep 17 00:00:00 2001 From: TheRealGramdalf <79593869+TheRealGramdalf@users.noreply.github.com> Date: Tue, 30 Aug 2022 16:52:18 -0700 Subject: [PATCH 0543/1001] change title --- .../minecraft/crossplay/purpur-geysermc-floodgate/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/README.md b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/README.md index c02d122f..d3a5e98c 100644 --- a/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/README.md +++ b/game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/README.md @@ -1,4 +1,4 @@ -# Purpur +# Purpur-Geyser-Floodgate Purpur-GeyserMC-Floodgate is a drop-in replacement for Paper servers designed for configurability, and new fun and exciting gameplay features, with the addition of GeyserMC and Floodgate From 00dae296e6c8159523be86a0ffd2609496b81f63 Mon Sep 17 00:00:00 2001 From: TheRealGramdalf <79593869+TheRealGramdalf@users.noreply.github.com> Date: Tue, 30 Aug 2022 16:58:28 -0700 Subject: [PATCH 0544/1001] edit readme.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index c99d9e9f..3d073b45 100644 --- a/README.md +++ b/README.md @@ -162,6 +162,9 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Technic](game_eggs/minecraft/java/technic) * [VanillaCord](game_eggs/minecraft/java/vanillacord) +* [Crossplay](game_eggs/minecraft/crossplay/) servers for crossplay between Bedrock and Java edition + *[Purpur-GeyserMC-Floodgate](game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/) + * [Proxies](game_eggs/minecraft/proxy) Minecraft Server Proxies * [Java](game_eggs/minecraft/proxy/java) * [FlameCord](game_eggs/minecraft/proxy/java/flamecord) From bd5ba757674b5ed511ebf7de1227d3d8b2351f9c Mon Sep 17 00:00:00 2001 From: TheRealGramdalf <79593869+TheRealGramdalf@users.noreply.github.com> Date: Tue, 30 Aug 2022 17:09:51 -0700 Subject: [PATCH 0545/1001] edit readme again --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3d073b45..b372f360 100644 --- a/README.md +++ b/README.md @@ -163,7 +163,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [VanillaCord](game_eggs/minecraft/java/vanillacord) * [Crossplay](game_eggs/minecraft/crossplay/) servers for crossplay between Bedrock and Java edition - *[Purpur-GeyserMC-Floodgate](game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/) + * [Purpur-GeyserMC-Floodgate](game_eggs/minecraft/crossplay/purpur-geysermc-floodgate/) * [Proxies](game_eggs/minecraft/proxy) Minecraft Server Proxies * [Java](game_eggs/minecraft/proxy/java) From a91b3e1252bcab05e32056dd23331ed1e89e02e6 Mon Sep 17 00:00:00 2001 From: Elite Espeon Date: Sun, 4 Sep 2022 11:53:39 -0400 Subject: [PATCH 0546/1001] fix issue with libstdc++.so --- game_eggs/steamcmd_servers/open_fortress/egg-open-fortress.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/open_fortress/egg-open-fortress.json b/game_eggs/steamcmd_servers/open_fortress/egg-open-fortress.json index e3bbd203..c6c5740d 100644 --- a/game_eggs/steamcmd_servers/open_fortress/egg-open-fortress.json +++ b/game_eggs/steamcmd_servers/open_fortress/egg-open-fortress.json @@ -24,7 +24,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates p7zip-full wget\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\nSTEAM_USER=anonymous\r\nSTEAM_PASS=\"\"\r\nSTEAM_AUTH=\"\"\r\nfi\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\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\nexport HOME=\/mnt\/server\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n## install tf2 content using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server\/tf2 +app_update 232250 ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n## download OpenFortress\r\ncd \/mnt\/server\r\nmv bin bin_dontdeleteme\r\nwget https:\/\/git.sr.ht\/~welt\/murse\/refs\/download\/v0.2.1\/murse-v0.2.1-linux-amd64.tar.gz -O murse.tgz 2> \/dev\/null\r\ntar xvfz murse.tgz\r\nrm -rf murse.tgz\r\nchmod +x murse\r\n.\/murse upgrade -u https:\/\/toast1.openfortress.fun\/toast -c $(curl https:\/\/toast1.openfortress.fun\/toast\/reithreads) asdrggvead\/open_fortress\r\nmv \/mnt\/server\/asdrggvead\/open_fortress \/mnt\/server\/open_fortress\r\nrm -rf asdrggvead\r\nmv bin_dontdeleteme bin\r\n## add fixed gameinfo\r\ncd \/mnt\/server\/open_fortress\r\nrm -rf gameinfo.txt\r\ncat >> gameinfo.txt << EOF\r\n\"GameInfo\"\r\n{\r\ngame \"Open Fortress\"\r\ntitle \"\"\r\ntitle2 \"\"\r\ngamelogo \"1\"\r\ndeveloper \"https:\/\/github.com\/AgitationSkeleton\/open_fortress\/blob\/master\/credits.txt\"\r\ndeveloper_url\t\"https:\/\/github.com\/KaidemonLP\/Open-Fortress-Source\"\r\nmanual \"\"\r\ntype \"multiplayer_only\"\r\nhasportals \"0\" \/\/ gameui.dll\r\nhashdcontent\t\"0\" \/\/ gameui.dll\r\nnomodels \"0\" \/\/ gameui.dll\r\nnohimodel \"0\" \/\/ gameui.dll\r\nnocrosshair \"0\" \/\/ gameui.dll\r\nadvcrosshair \"1\" \/\/ gameui.dll\r\nnodifficulty\t\"1\" \/\/ gameui.dll\r\nsupportsvr \"0\" \/\/ engine.dll + gameui.dll\r\nbots \"0\" \/\/ gameui.dll\r\nnodegraph \"1\" \/\/ engine.dll\r\nperfwizard \"0\" \/\/ unused\r\nSupportsDX8 \"0\" \/\/ unused\r\nSupportsDX9 \"1\" \/\/ unused\r\nSupportsDX10\t\"0\" \/\/ unused\r\nSupportsDX11\t\"0\" \/\/ unused\r\nSupportsXbox\t\"0\" \/\/ unused\r\nSupportsXbox360\t\"0\" \/\/ unused\r\nSupportsXboxOne\t\"0\" \/\/ unused\r\nSupportsPS3 \"0\" \/\/ unused\r\nSupportsPS4 \"0\" \/\/ unused\r\nicon \"resource\/game\"\r\nGameData \"ofd_fic2.fgd\"\r\nInstancePath\t\"maps\/instances\/\"\r\nhidden_maps\r\n{\r\n\"test_speakers\" 1\r\n\"test_hardware\" 1\r\n\"background01\" 1\r\n\"background02\" 1\r\n\"background03\" 1\r\n\"background04\" 1\r\n\"background05\" 1\r\n\"background06\" 1\r\n\"background07\" 1\r\n\"background08\" 1\r\n\"background09\" 1\r\n\"background12\" 1\r\n\"background15\" 1\r\n\"ep1_c17_00\" 1\r\n\"ep1_c17_00a\" 1\r\n\"ep1_c17_01\" 1\r\n\"ep1_c17_01a\" 1\r\n\"ep1_c17_02\" 1\r\n\"ep1_c17_02a\" 1\r\n\"ep1_c17_02b\" 1\r\n\"ep1_c17_05\" 1\r\n\"ep1_c17_06\" 1\r\n\"ep1_citadel_00\"\t1\r\n\"ep1_citadel_00_demo\" 1\r\n\"ep1_citadel_01\"\t1\r\n\"ep1_citadel_02\"\t1\r\n\"ep1_citadel_02b\"\t1\r\n\"ep1_citadel_03\"\t1\r\n\"ep1_citadel_04\"\t1\r\n\"ep1_background01\"\t1\r\n\"ep1_background01a\"\t1\r\n\"ep1_background02\"\t1\r\n\"ep2_outland_01\"\t1\r\n\"ep2_outland_01a\"\t1\r\n\"ep2_outland_02\"\t1\r\n\"ep2_outland_03\"\t1\r\n\"ep2_outland_04\"\t1\r\n\"ep2_outland_05\"\t1\r\n\"ep2_outland_06\"\t1\r\n\"ep2_outland_06a\"\t1\r\n\"ep2_outland_07\"\t1\r\n\"ep2_outland_08\"\t1\r\n\"ep2_outland_09\"\t1\r\n\"ep2_outland_10\"\t1\r\n\"ep2_outland_10a\"\t1\r\n\"ep2_outland_11\"\t1\r\n\"ep2_outland_11a\"\t1\r\n\"ep2_outland_11b\"\t1\r\n\"ep2_outland_12\"\t1\r\n\"ep2_outland_12a\"\t1\r\n\"ep2_background01\"\t1\r\n\"ep2_background02\"\t1\r\n\"ep2_background02a\"\t1\r\n\"ep2_background03\"\t1\r\n\"credits\" 1\r\n\"vst_lostcoast\" 1\r\n\"test\" 1\r\n\"sdk_vehicles\" 1\r\n}\r\nFileSystem\r\n{\r\nSteamAppId 243750\r\nSearchPaths\r\n{\r\ngame+mod |gameinfo_path|custom\/*\r\ngame+game_write+mod+mod_write+default_write_path |gameinfo_path|.\r\ngamebin |gameinfo_path|bin\r\n\/\/ The lines below until the BREAK comment are responsible for the game resources to work properly\r\n\/\/ in Hammer and other Source tools. The default setup assumes that you have everything (Steam, TF2,\r\n\/\/ Source SDK and OF) in the same drive letter\/partition. If you have a different storage configuration,\r\n\/\/ feel free to modify the paths below between quotes (example: D:\\Steam\\steamapps\\common\\Team Fortress 2\\tf).\r\ngame \"\/home\/container\/tf2\/tf\/tf2_misc.vpk\"\r\ngame \"\/home\/container\/tf2\/tf\/tf2_sound_misc.vpk\"\r\ngame \"\/home\/container\/tf2\/tf\/tf2_sound_vo_english.vpk\"\r\ngame \"\/home\/container\/tf2\/tf\/tf2_textures.vpk\"\r\ngame \"\/home\/container\/tf2\/tf\"\r\ngame \"\/home\/container\/tf2\/hl2\/hl2_textures.vpk\"\r\ngame \"\/home\/container\/tf2\/hl2\/hl2_sound_vo_english.vpk\"\r\ngame \"\/home\/container\/tf2\/hl2\/hl2_sound_misc.vpk\"\r\n\/\/ The hl2 folder here is from Source SDK Base 2013 Multiplayer.\r\ngame \"|all_source_engine_paths|hl2\\hl2_misc.vpk\"\r\ngame \"|all_source_engine_paths|hl2\"\r\n\/\/ ========== BREAK ==========\r\nplatform |all_source_engine_paths|platform\/platform_misc.vpk\r\nplatform |all_source_engine_paths|platform\r\ngame+download |gameinfo_path|download\r\n}\r\n}\r\n}\r\nEOF\r\n## fix issue \/w symlink\r\ncd \/mnt\/server\/bin\r\nln -s datacache_srv.so datacache.so\r\nln -s dedicated_srv.so dedicated.so\r\nln -s engine_srv.so engine.so\r\nln -s materialsystem_srv.so materialsystem.so\r\nln -s replay_srv.so replay.so\r\nln -s scenefilecache_srv.so scenefilecache.so\r\nln -s shaderapiempty_srv.so shaderapiempty.so\r\nln -s soundemittersystem_srv.so soundemittersystem.so\r\nln -s studiorender_srv.so studiorender.so\r\nln -s vphysics_srv.so vphysics.so\r\n## more symlink fixes\r\ncd \/mnt\/server\/open_fortress\/bin\r\nln -s server.so server_srv.so", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates p7zip-full wget\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\nSTEAM_USER=anonymous\r\nSTEAM_PASS=\"\"\r\nSTEAM_AUTH=\"\"\r\nfi\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\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\nexport HOME=\/mnt\/server\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n## install tf2 content using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server\/tf2 +app_update 232250 ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n## download OpenFortress\r\ncd \/mnt\/server\r\nmv bin bin_dontdeleteme\r\nwget https:\/\/git.sr.ht\/~welt\/murse\/refs\/download\/v0.2.1\/murse-v0.2.1-linux-amd64.tar.gz -O murse.tgz 2> \/dev\/null\r\ntar xvfz murse.tgz\r\nrm -rf murse.tgz\r\nchmod +x murse\r\n.\/murse upgrade -u https:\/\/toast1.openfortress.fun\/toast -c $(curl https:\/\/toast1.openfortress.fun\/toast\/reithreads) asdrggvead\/open_fortress\r\nmv \/mnt\/server\/asdrggvead\/open_fortress \/mnt\/server\/open_fortress\r\nrm -rf asdrggvead\r\nmv bin_dontdeleteme bin\r\n## add fixed gameinfo\r\ncd \/mnt\/server\/open_fortress\r\nrm -rf gameinfo.txt\r\ncat >> gameinfo.txt << EOF\r\n\"GameInfo\"\r\n{\r\ngame \"Open Fortress\"\r\ntitle \"\"\r\ntitle2 \"\"\r\ngamelogo \"1\"\r\ndeveloper \"https:\/\/github.com\/AgitationSkeleton\/open_fortress\/blob\/master\/credits.txt\"\r\ndeveloper_url\t\"https:\/\/github.com\/KaidemonLP\/Open-Fortress-Source\"\r\nmanual \"\"\r\ntype \"multiplayer_only\"\r\nhasportals \"0\" \/\/ gameui.dll\r\nhashdcontent\t\"0\" \/\/ gameui.dll\r\nnomodels \"0\" \/\/ gameui.dll\r\nnohimodel \"0\" \/\/ gameui.dll\r\nnocrosshair \"0\" \/\/ gameui.dll\r\nadvcrosshair \"1\" \/\/ gameui.dll\r\nnodifficulty\t\"1\" \/\/ gameui.dll\r\nsupportsvr \"0\" \/\/ engine.dll + gameui.dll\r\nbots \"0\" \/\/ gameui.dll\r\nnodegraph \"1\" \/\/ engine.dll\r\nperfwizard \"0\" \/\/ unused\r\nSupportsDX8 \"0\" \/\/ unused\r\nSupportsDX9 \"1\" \/\/ unused\r\nSupportsDX10\t\"0\" \/\/ unused\r\nSupportsDX11\t\"0\" \/\/ unused\r\nSupportsXbox\t\"0\" \/\/ unused\r\nSupportsXbox360\t\"0\" \/\/ unused\r\nSupportsXboxOne\t\"0\" \/\/ unused\r\nSupportsPS3 \"0\" \/\/ unused\r\nSupportsPS4 \"0\" \/\/ unused\r\nicon \"resource\/game\"\r\nGameData \"ofd_fic2.fgd\"\r\nInstancePath\t\"maps\/instances\/\"\r\nhidden_maps\r\n{\r\n\"test_speakers\" 1\r\n\"test_hardware\" 1\r\n\"background01\" 1\r\n\"background02\" 1\r\n\"background03\" 1\r\n\"background04\" 1\r\n\"background05\" 1\r\n\"background06\" 1\r\n\"background07\" 1\r\n\"background08\" 1\r\n\"background09\" 1\r\n\"background12\" 1\r\n\"background15\" 1\r\n\"ep1_c17_00\" 1\r\n\"ep1_c17_00a\" 1\r\n\"ep1_c17_01\" 1\r\n\"ep1_c17_01a\" 1\r\n\"ep1_c17_02\" 1\r\n\"ep1_c17_02a\" 1\r\n\"ep1_c17_02b\" 1\r\n\"ep1_c17_05\" 1\r\n\"ep1_c17_06\" 1\r\n\"ep1_citadel_00\"\t1\r\n\"ep1_citadel_00_demo\" 1\r\n\"ep1_citadel_01\"\t1\r\n\"ep1_citadel_02\"\t1\r\n\"ep1_citadel_02b\"\t1\r\n\"ep1_citadel_03\"\t1\r\n\"ep1_citadel_04\"\t1\r\n\"ep1_background01\"\t1\r\n\"ep1_background01a\"\t1\r\n\"ep1_background02\"\t1\r\n\"ep2_outland_01\"\t1\r\n\"ep2_outland_01a\"\t1\r\n\"ep2_outland_02\"\t1\r\n\"ep2_outland_03\"\t1\r\n\"ep2_outland_04\"\t1\r\n\"ep2_outland_05\"\t1\r\n\"ep2_outland_06\"\t1\r\n\"ep2_outland_06a\"\t1\r\n\"ep2_outland_07\"\t1\r\n\"ep2_outland_08\"\t1\r\n\"ep2_outland_09\"\t1\r\n\"ep2_outland_10\"\t1\r\n\"ep2_outland_10a\"\t1\r\n\"ep2_outland_11\"\t1\r\n\"ep2_outland_11a\"\t1\r\n\"ep2_outland_11b\"\t1\r\n\"ep2_outland_12\"\t1\r\n\"ep2_outland_12a\"\t1\r\n\"ep2_background01\"\t1\r\n\"ep2_background02\"\t1\r\n\"ep2_background02a\"\t1\r\n\"ep2_background03\"\t1\r\n\"credits\" 1\r\n\"vst_lostcoast\" 1\r\n\"test\" 1\r\n\"sdk_vehicles\" 1\r\n}\r\nFileSystem\r\n{\r\nSteamAppId 243750\r\nSearchPaths\r\n{\r\ngame+mod |gameinfo_path|custom\/*\r\ngame+game_write+mod+mod_write+default_write_path |gameinfo_path|.\r\ngamebin |gameinfo_path|bin\r\n\/\/ The lines below until the BREAK comment are responsible for the game resources to work properly\r\n\/\/ in Hammer and other Source tools. The default setup assumes that you have everything (Steam, TF2,\r\n\/\/ Source SDK and OF) in the same drive letter\/partition. If you have a different storage configuration,\r\n\/\/ feel free to modify the paths below between quotes (example: D:\\Steam\\steamapps\\common\\Team Fortress 2\\tf).\r\ngame \"\/home\/container\/tf2\/tf\/tf2_misc.vpk\"\r\ngame \"\/home\/container\/tf2\/tf\/tf2_sound_misc.vpk\"\r\ngame \"\/home\/container\/tf2\/tf\/tf2_sound_vo_english.vpk\"\r\ngame \"\/home\/container\/tf2\/tf\/tf2_textures.vpk\"\r\ngame \"\/home\/container\/tf2\/tf\"\r\ngame \"\/home\/container\/tf2\/hl2\/hl2_textures.vpk\"\r\ngame \"\/home\/container\/tf2\/hl2\/hl2_sound_vo_english.vpk\"\r\ngame \"\/home\/container\/tf2\/hl2\/hl2_sound_misc.vpk\"\r\n\/\/ The hl2 folder here is from Source SDK Base 2013 Multiplayer.\r\ngame \"|all_source_engine_paths|hl2\\hl2_misc.vpk\"\r\ngame \"|all_source_engine_paths|hl2\"\r\n\/\/ ========== BREAK ==========\r\nplatform |all_source_engine_paths|platform\/platform_misc.vpk\r\nplatform |all_source_engine_paths|platform\r\ngame+download |gameinfo_path|download\r\n}\r\n}\r\n}\r\nEOF\r\n## fix issue \/w symlink\r\ncd \/mnt\/server\/bin\r\nln -s datacache_srv.so datacache.so\r\nln -s dedicated_srv.so dedicated.so\r\nln -s engine_srv.so engine.so\r\nln -s materialsystem_srv.so materialsystem.so\r\nln -s replay_srv.so replay.so\r\nln -s scenefilecache_srv.so scenefilecache.so\r\nln -s shaderapiempty_srv.so shaderapiempty.so\r\nln -s soundemittersystem_srv.so soundemittersystem.so\r\nln -s studiorender_srv.so studiorender.so\r\nln -s vphysics_srv.so vphysics.so\r\n## more symlink fixes\r\ncd \/mnt\/server\/open_fortress\/bin\r\nln -s server.so server_srv.so\r\n## fix issue with libstdc++.so\r\nrm -rf \/mnt\/server\/bin\/libstdc++.so.6", "container": "ubuntu:18.04", "entrypoint": "bash" } From e5c3c659de86897475e36c44b07af407161abeb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sondre=20Sj=C3=B8lyst?= Date: Tue, 6 Sep 2022 14:13:42 +0200 Subject: [PATCH 0547/1001] project_zomboid image When running "Buster" image the installation of project zomboid will never complete. Proposing to change it to a "bullseye" image. --- .../steamcmd_servers/project_zomboid/egg-project-zomboid.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json b/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json index a13be003..5012b832 100644 --- a/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json +++ b/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json @@ -12,7 +12,7 @@ "steam_disk_space" ], "images": [ - "ghcr.io\/pterodactyl\/games:source" + "ghcr.io\/parkervcp\/games:source" ], "file_denylist": [], "startup": "\/home\/container\/start-server.sh -port {{SERVER_PORT}} -steamport1 {{STEAM_PORT}} -cachedir=\/home\/container\/.cache -servername \"{{SERVER_NAME}}\" -adminusername {{ADMIN_USER}} -adminpassword \"{{ADMIN_PASSWORD}}\"", From eb58300a7ea24f5eea403d54bf74961a497c403f Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Wed, 7 Sep 2022 18:16:06 +0200 Subject: [PATCH 0548/1001] update veloren --- game_eggs/veloren/egg-veloren.json | 61 +++++++++++++++++++++++++----- game_eggs/veloren/settings.ron | 20 ---------- 2 files changed, 51 insertions(+), 30 deletions(-) delete mode 100644 game_eggs/veloren/settings.ron diff --git a/game_eggs/veloren/egg-veloren.json b/game_eggs/veloren/egg-veloren.json index d4bda0d7..2c3ec6d1 100644 --- a/game_eggs/veloren/egg-veloren.json +++ b/game_eggs/veloren/egg-veloren.json @@ -1,31 +1,72 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1", + "version": "PTDL_v2", "update_url": null }, - "exported_at": "2021-07-02T04:27:30+03:00", + "exported_at": "2022-09-07T18:12:29+02:00", "name": "Veloren", "author": "parker@parkervcp.com", "description": "Veloren is a multiplayer voxel RPG written in Rust. It is inspired by games such as Cube World, Legend of Zelda: Breath of the Wild, Dwarf Fortress and Minecraft.", "features": null, - "images": [ - "quay.io\/parkervcp\/pterodactyl-images:base_debian" - ], + "docker_images": { + "DEBIAN": "ghcr.io\/parkervcp\/yolks:debian" + }, "file_denylist": [], "startup": ".\/veloren-server-cli", "config": { - "files": "{\r\n \"userdata\/server\/server_config\/settings.ron\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \" gameserver_address\": \" gameserver_address: \\\"0.0.0.0:{{server.build.default.port}}\\\",\",\r\n\t \" server_name\": \" server_name: \\\"{{server.build.env.SERVER_NAME}}\\\",\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"userdata\/server\/server_config\/settings.ron\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \" gameserver_address\": \" gameserver_address: \\\"0.0.0.0:{{server.build.default.port}}\\\",\",\r\n \" metrics_address\": \" metrics_address: \\\"0.0.0.0:{{server.build.env.METRICS_PORT}}\\\",\",\r\n \" server_name\": \" server_name: \\\"{{server.build.env.SERVER_NAME}}\\\",\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Server is ready to accept connections\"\r\n}", "logs": "{}", "stop": "shutdown graceful 10" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl git-lfs\r\n\r\nmkdir -p \/mnt\/server\/assets\r\n\r\ncd \/tmp.\r\n\r\ngit clone https:\/\/gitlab.com\/veloren\/veloren.git\r\n\r\n## build veloran server cli\r\nexport VELOREN_USERDATA_STRATEGY=executable\r\ncd veloren\r\necho -e \"building veloran server, this is gonna take a bit\" \r\ncargo build --bin veloren-server-cli --release\r\n\r\ncp -f target\/release\/veloren-server-cli \/mnt\/server\/\r\ncp -Rf assets\/{common,server,world} \/mnt\/server\/assets\/\r\n\r\n## get config from repo because there is no better way to get it.\r\nmkdir -p \/mnt\/server\/userdata\/server\/server_config\/\r\nif [ ! -f \/mnt\/server\/userdata\/server\/server_config\/settings.ron ]; then\r\n echo -e \"getting default config from git repo\"\r\n curl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/veloren\/settings.ron > \/mnt\/server\/userdata\/server\/server_config\/settings.ron\r\n echo -e \"config pulled\"\r\nfi\r\n\r\necho -e \"install complete\"", - "container": "rust:slim-buster", + "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl wget unzip git jq\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/veloren\/veloren\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"-linux-x86_64-\" || echo \"-linux-aarch64-\")\r\nMARCH_AND_SPACES=$(echo ${VERSION} && echo ${ARCH} && echo ${RELEASE_DATE})\r\nMATCH=$(echo ${MARCH_AND_SPACES} | sed 's\/ \/\/g')\r\n\r\necho ${MATCH}\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"weekly\" ]; 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 -i ${MATCH})\r\n else\r\n echo -e \"invalid ${RELEASE_DATE}\"\r\n fi\r\nfi\r\n\r\nwget ${DOWNLOAD_URL} -O files.zip\r\n\r\nunzip files.zip\r\nrm files.zip\r\n\r\nchmod +x veloren-server-cli\r\n\r\n## generate config because there is no better way to get it.\r\nmkdir -p \/mnt\/server\/userdata\/server\/server_config\/\r\nif [ ! -f \/mnt\/server\/userdata\/server\/server_config\/settings.ron ]; then\r\n echo -e \"creating default config\"\r\n echo -n \"(\r\n gameserver_address: \"0.0.0.0:14004\",\r\n metrics_address: \"0.0.0.0:14005\",\r\n auth_server_address: Some(\"https:\/\/auth.veloren.net\"),\r\n max_players: 100,\r\n world_seed: 25269,\r\n server_name: \"Veloren Alpha\",\r\n start_time: 32400,\r\n map_file: None,\r\n max_view_distance: Some(65),\r\n banned_words_files: [],\r\n max_player_group_size: 6,\r\n client_timeout: (\r\n secs: 40,\r\n nanos: 0,\r\n ),\r\n spawn_town: None,\r\n safe_spawn: true,\r\n max_player_for_kill_broadcast: Some(20),\r\n)\r\n\" > \/mnt\/server\/userdata\/server\/server_config\/settings.ron\r\n echo -e \"config pulled\"\r\nfi\r\n\r\necho -e \"install complete\"", + "container": "debian:bullseye-slim", "entrypoint": "bash" } }, - "variables": [] -} + "variables": [ + { + "name": "Version", + "description": "The version you want weekly or nightly", + "env_variable": "VERSION", + "default_value": "weekly", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|in:weekly,nightly", + "field_type": "text" + }, + { + "name": "Release date", + "description": "The date of the version you want look here:\r\nhttps:\/\/github.com\/veloren\/veloren\/releases\r\n\r\neverything after the x86_64 but not the first -\r\nand not the .zip extention\r\n\r\nexample:\r\n2022-08-31T08_26", + "env_variable": "RELEASE_DATE", + "default_value": "2022-08-31T08_26", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:40", + "field_type": "text" + }, + { + "name": "Server name", + "description": "The name your server will be displaying", + "env_variable": "SERVER_NAME", + "default_value": "A ptero hosted server", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:64", + "field_type": "text" + }, + { + "name": "Metrics port", + "description": "Game port +1", + "env_variable": "METRICS_PORT", + "default_value": "14005", + "user_viewable": true, + "user_editable": false, + "rules": "required|integer", + "field_type": "text" + } + ] +} \ No newline at end of file diff --git a/game_eggs/veloren/settings.ron b/game_eggs/veloren/settings.ron deleted file mode 100644 index 7d59fda2..00000000 --- a/game_eggs/veloren/settings.ron +++ /dev/null @@ -1,20 +0,0 @@ -( - gameserver_address: "0.0.0.0:14004", - metrics_address: "0.0.0.0:14005", - auth_server_address: Some("https://auth.veloren.net"), - max_players: 100, - world_seed: 25269, - server_name: "Veloren Alpha", - start_time: 32400, - map_file: None, - max_view_distance: Some(65), - banned_words_files: [], - max_player_group_size: 6, - client_timeout: ( - secs: 40, - nanos: 0, - ), - spawn_town: None, - safe_spawn: true, - max_player_for_kill_broadcast: None, -) \ No newline at end of file From 0b8b3d91982c343056976f39fc53c21acb533341 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Wed, 7 Sep 2022 12:27:11 -0400 Subject: [PATCH 0549/1001] Move generic eggs --- README.md | 17 ++- bots/discord/README.md | 20 --- generic/README.md | 41 ++++++ {bots/discord => generic}/deno/README.md | 0 .../deno/egg-deno-generic.json | 0 .../discordgo => generic/golang}/README.md | 0 .../golang/egg-golang-generic.json | 31 +++-- .../discord.java => generic/java}/README.md | 0 .../java/egg-java.json | 2 +- {bots/discord => generic}/lua/luvit/README.md | 0 .../lua/luvit/egg-luvit-generic.json | 8 +- .../discord.js => generic/nodejs}/README.md | 0 .../nodejs/egg-node-js-generic.json | 64 +++++---- generic/nodejs/egg-node-js-generic.json~HEAD | 126 ++++++++++++++++++ .../nodemon.js => generic/nodemon}/README.md | 0 .../nodemon}/egg-nodemon.json | 0 .../discord.py => generic/python}/README.md | 0 .../python/egg-python-generic.json | 61 +++++---- .../discord.rs => generic/rust}/README.md | 0 .../rust/egg-rust-generic.json | 44 +++--- 20 files changed, 293 insertions(+), 121 deletions(-) create mode 100644 generic/README.md rename {bots/discord => generic}/deno/README.md (100%) rename {bots/discord => generic}/deno/egg-deno-generic.json (100%) rename {bots/discord/discordgo => generic/golang}/README.md (100%) rename bots/discord/discordgo/egg-discordgo-generic.json => generic/golang/egg-golang-generic.json (56%) rename {bots/discord/discord.java => generic/java}/README.md (100%) rename bots/discord/discord.java/egg-discord-java.json => generic/java/egg-java.json (97%) rename {bots/discord => generic}/lua/luvit/README.md (100%) rename {bots/discord => generic}/lua/luvit/egg-luvit-generic.json (73%) rename {bots/discord/discord.js => generic/nodejs}/README.md (100%) rename bots/discord/discord.js/egg-discord-js-generic.json => generic/nodejs/egg-node-js-generic.json (57%) create mode 100644 generic/nodejs/egg-node-js-generic.json~HEAD rename {bots/discord/nodemon.js => generic/nodemon}/README.md (100%) rename {bots/discord/nodemon.js => generic/nodemon}/egg-nodemon.json (100%) rename {bots/discord/discord.py => generic/python}/README.md (100%) rename bots/discord/discord.py/egg-discord-py-generic.json => generic/python/egg-python-generic.json (76%) rename {bots/discord/discord.rs => generic/rust}/README.md (100%) rename bots/discord/discord.rs/egg-discord-rs-generic.json => generic/rust/egg-rust-generic.json (81%) diff --git a/README.md b/README.md index c99d9e9f..4cc20127 100644 --- a/README.md +++ b/README.md @@ -29,15 +29,9 @@ If you are reading this it looks like you are looking to add an egg to your serv * [ATL Bot](/bots/discord/atlbot) Node JS * [Bastion](/bots/discord/bastion) Node JS * [CorpBot](/bots/discord/corpbot) Python -* [discordgo](bots/discord/discordgo) Golang generic -* [discord.java](bots/discord/discord.java) Java generic -* [discord.js](bots/discord/discord.js) Node JS generic -* [discord.py](bots/discord/discord.py) Python generic -* [discord.rs](bots/discord/discord.rs) Rust generic * [Dynamica](/bots/discord/dynamica) Node JS * [fragbot](/bots/discord/fragbot) Golang * [JMusicBot](/bots/discord/jmusicbot) Java -* [nodemon.js](bots/discord/nodemon.js) Nodemon JS generic * [parkertron](/bots/discord/parkertron) Golang * [pixel-bot](/bots/discord/pixelbot) Python * [Redbot](/bots/discord/redbot) Python @@ -56,6 +50,17 @@ If you are reading this it looks like you are looking to add an egg to your serv * [JTS3ServerMod](/bots/teamspeak3/jts3servermod) +## [Generic Languages](/generic) + +* [deno](/generic/deno/) +* [golang](/generic/golang/) +* [java](/generic/java/) +* [lua](/generic/lua/) +* [nodejs](/generic/nodejs/) +* [nodemon](/generic/nodemon/) +* [python](/generic/python/) +* [rust](/generic/rust/) + ## [Database](/database) ### In-Memory Databases diff --git a/bots/discord/README.md b/bots/discord/README.md index 6d7490ad..4974190a 100644 --- a/bots/discord/README.md +++ b/bots/discord/README.md @@ -17,21 +17,6 @@ Give awesome perks to your Discord server! [corpnewt/CorpBot.py](https://github.com/corpnewt/CorpBot.py) A very clumsy python bot for discord -### [DiscordJS](discord.js) - -[discord.js](https://discord.js.org/) -A generic discord.js egg for running discord bots. - -### [DiscordPY](discord.py) - -[discord.py](https://discordpy.readthedocs.io/en/latest/) -A generic discord.py egg for running discord bots. - -### [discordgo](discordgo) - -[discordgo](https://github.com/bwmarrin/discordgo) -A generic go application egg. - ### [FragBot](fragbot) [fragforce/fragbot](https://github.com/fragforce/fragbot) @@ -42,11 +27,6 @@ The bot that runs as the fragforce `@Fragbot` offering looking-for-group service [jagrosh/MusicBot](https://github.com/jagrosh/MusicBot) A Discord music bot that's easy to set up and run yourself! -### [nodemon](nodemon.js) - -[nodemon](https://nodemon.io/) -A nodemon javascript egg for running and automatically restarting the node application when file changes in the directory are detected - ### [parkertron](parkertron) [parkervcp/parkertron](https://github.com/parkervcp/parkertron) diff --git a/generic/README.md b/generic/README.md new file mode 100644 index 00000000..24b04c8b --- /dev/null +++ b/generic/README.md @@ -0,0 +1,41 @@ +# Generic Language + +### [Deno](deno) + +[deno](https://deno.land/) +A generic deno egg + +### [Golang](golang) + +[golang](https://go.dev/) +A generic go egg + +### [Java](java) + +[java](https://www.java.com/en/) +A generic java egg + +### [Lua](lua) + +[lua](https://www.lua.org/) +A generic luvit/lua egg + +### [Node JS](nodejs) + +[nodejs](https://nodejs.org) +A generic node.js egg + +### [nodemon](nodemon) + +[nodemon](https://nodemon.io/) +A nodemon javascript egg for running and automatically restarting the node application when file changes in the directory are detected + +### [Python](python) + +[python](https://www.python.org/) +A generic python egg + +### [Rust](python) + +[rust](https://www.rust-lang.org/) +A generic rust egg diff --git a/bots/discord/deno/README.md b/generic/deno/README.md similarity index 100% rename from bots/discord/deno/README.md rename to generic/deno/README.md diff --git a/bots/discord/deno/egg-deno-generic.json b/generic/deno/egg-deno-generic.json similarity index 100% rename from bots/discord/deno/egg-deno-generic.json rename to generic/deno/egg-deno-generic.json diff --git a/bots/discord/discordgo/README.md b/generic/golang/README.md similarity index 100% rename from bots/discord/discordgo/README.md rename to generic/golang/README.md diff --git a/bots/discord/discordgo/egg-discordgo-generic.json b/generic/golang/egg-golang-generic.json similarity index 56% rename from bots/discord/discordgo/egg-discordgo-generic.json rename to generic/golang/egg-golang-generic.json index 45b981ef..e34ded0d 100644 --- a/bots/discord/discordgo/egg-discordgo-generic.json +++ b/generic/golang/egg-golang-generic.json @@ -1,13 +1,18 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v2", + "update_url": null }, - "exported_at": "2020-10-11T12:12:50-04:00", - "name": "discordgo generic", + "exported_at": "2022-07-25T14:20:37-04:00", + "name": "golang generic", "author": "parker@parkervcp.com", - "description": "A generic golang egg.\r\n\r\nMeant to be customized before it is used.", - "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", + "description": "A generic golang egg that compiles the application and saves an executable\r\n\r\nMeant to be customized before it is used.", + "features": null, + "docker_images": { + "quay.io\/parkervcp\/pterodactyl-images:base_debian": "quay.io\/parkervcp\/pterodactyl-images:base_debian" + }, + "file_denylist": [], "startup": ".\/${EXECUTABLE}", "config": { "files": "{}", @@ -28,18 +33,20 @@ "description": "Go package to get and build", "env_variable": "GO_PACKAGE", "default_value": "", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string" + "user_viewable": true, + "user_editable": true, + "rules": "required|string", + "field_type": "text" }, { "name": "Executable", - "description": "This is the executable from the bot build.", + "description": "This is the executable from the build.", "env_variable": "EXECUTABLE", "default_value": "", - "user_viewable": 1, - "user_editable": 0, - "rules": "required|string" + "user_viewable": true, + "user_editable": false, + "rules": "required|string", + "field_type": "text" } ] } \ No newline at end of file diff --git a/bots/discord/discord.java/README.md b/generic/java/README.md similarity index 100% rename from bots/discord/discord.java/README.md rename to generic/java/README.md diff --git a/bots/discord/discord.java/egg-discord-java.json b/generic/java/egg-java.json similarity index 97% rename from bots/discord/discord.java/egg-discord-java.json rename to generic/java/egg-java.json index 9d687778..baef14f3 100644 --- a/bots/discord/discord.java/egg-discord-java.json +++ b/generic/java/egg-java.json @@ -5,7 +5,7 @@ "update_url": null }, "exported_at": "2021-07-21T18:23:17+03:00", - "name": "Discord Java", + "name": "Generic Java", "author": "sneaky@sneakyhub.com", "description": "Creates a container that runs java.", "features": null, diff --git a/bots/discord/lua/luvit/README.md b/generic/lua/luvit/README.md similarity index 100% rename from bots/discord/lua/luvit/README.md rename to generic/lua/luvit/README.md diff --git a/bots/discord/lua/luvit/egg-luvit-generic.json b/generic/lua/luvit/egg-luvit-generic.json similarity index 73% rename from bots/discord/lua/luvit/egg-luvit-generic.json rename to generic/lua/luvit/egg-luvit-generic.json index 99a651dd..b1c4bc09 100644 --- a/bots/discord/lua/luvit/egg-luvit-generic.json +++ b/generic/lua/luvit/egg-luvit-generic.json @@ -7,7 +7,7 @@ "exported_at": "2022-01-22T05:40:57-05:00", "name": "luvit generic", "author": "parker@parkervcp.com", - "description": "A generic luvit egg This will clone a git repo for a bot. It defaults to master if no branch is specified.\r\n\r\nSupports the discordia lua framework.", + "description": "A generic luvit egg This will clone a git repo. It defaults to master if no branch is specified.\r\n\r\nSupports the discordia lua framework.", "features": null, "images": [ "ghcr.io\/parkervcp\/yolks:debian" @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n## luvit generic install script\r\n\r\napt update\r\napt install -y git curl jq file unzip\r\n\r\n## get git files\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n echo -e \"assuming user knows what they are doing have a good day.\"\r\n exit 0\r\nfi\r\n\r\n## add git ending if it's not on the address\r\nif [[ ${GIT_ADDRESS} != *.git ]]; then\r\n GIT_ADDRESS=${GIT_ADDRESS}.git\r\nfi\r\n\r\nif [ -z \"${USERNAME}\" ] && [ -z \"${ACCESS_TOKEN}\" ]; then\r\n echo -e \"using anon api call\"\r\nelse\r\n GIT_ADDRESS=\"https:\/\/${USERNAME}:${ACCESS_TOKEN}@$(echo -e ${GIT_ADDRESS} | cut -d\/ -f3-)\"\r\nfi\r\n\r\n## pull git js bot repo\r\nif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n echo -e \"\/mnt\/server directory is not empty.\"\r\n if [ -d .git ]; then\r\n echo -e \".git directory exists\"\r\n if [ -f .git\/config ]; then\r\n echo -e \"loading info from git config\"\r\n ORIGIN=$(git config --get remote.origin.url)\r\n else\r\n echo -e \"files found with no git config\"\r\n echo -e \"closing out without touching things to not break anything\"\r\n exit 10\r\n fi\r\n fi\r\n\r\n if [ \"${ORIGIN}\" == \"${GIT_ADDRESS}\" ]; then\r\n echo \"pulling latest from github\"\r\n git pull\r\n fi\r\nelse\r\n echo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n if [ -z ${BRANCH} ]; then\r\n echo -e \"cloning default branch\"\r\n git clone ${GIT_ADDRESS} .\r\n else\r\n echo -e \"cloning ${BRANCH}'\"\r\n git clone --single-branch --branch ${BRANCH} ${GIT_ADDRESS} .\r\n fi\r\nfi\r\n\r\n## install luvit for install time\r\ncurl -L https:\/\/github.com\/luvit\/lit\/raw\/master\/get-lit.sh | sh\r\n\r\n## Install luvit packages\r\n.\/lit install ${LIT_PACKAGES}", + "script": "#!\/bin\/bash\r\n## luvit generic install script\r\n\r\napt update\r\napt install -y git curl jq file unzip\r\n\r\n## get git files\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n echo -e \"assuming user knows what they are doing have a good day.\"\r\n exit 0\r\nfi\r\n\r\n## add git ending if it's not on the address\r\nif [[ ${GIT_ADDRESS} != *.git ]]; then\r\n GIT_ADDRESS=${GIT_ADDRESS}.git\r\nfi\r\n\r\nif [ -z \"${USERNAME}\" ] && [ -z \"${ACCESS_TOKEN}\" ]; then\r\n echo -e \"using anon api call\"\r\nelse\r\n GIT_ADDRESS=\"https:\/\/${USERNAME}:${ACCESS_TOKEN}@$(echo -e ${GIT_ADDRESS} | cut -d\/ -f3-)\"\r\nfi\r\n\r\n## pull git repo\r\nif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n echo -e \"\/mnt\/server directory is not empty.\"\r\n if [ -d .git ]; then\r\n echo -e \".git directory exists\"\r\n if [ -f .git\/config ]; then\r\n echo -e \"loading info from git config\"\r\n ORIGIN=$(git config --get remote.origin.url)\r\n else\r\n echo -e \"files found with no git config\"\r\n echo -e \"closing out without touching things to not break anything\"\r\n exit 10\r\n fi\r\n fi\r\n\r\n if [ \"${ORIGIN}\" == \"${GIT_ADDRESS}\" ]; then\r\n echo \"pulling latest from github\"\r\n git pull\r\n fi\r\nelse\r\n echo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n if [ -z ${BRANCH} ]; then\r\n echo -e \"cloning default branch\"\r\n git clone ${GIT_ADDRESS} .\r\n else\r\n echo -e \"cloning ${BRANCH}'\"\r\n git clone --single-branch --branch ${BRANCH} ${GIT_ADDRESS} .\r\n fi\r\nfi\r\n\r\n## install luvit for install time\r\ncurl -L https:\/\/github.com\/luvit\/lit\/raw\/master\/get-lit.sh | sh\r\n\r\n## Install luvit packages\r\n.\/lit install ${LIT_PACKAGES}", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -74,10 +74,10 @@ "rules": "nullable|string" }, { - "name": "Bot lua file", + "name": "lua file", "description": "The Lua file to run", "env_variable": "LUA_FILE", - "default_value": "bot.lua", + "default_value": "app.lua", "user_viewable": true, "user_editable": true, "rules": "required|string" diff --git a/bots/discord/discord.js/README.md b/generic/nodejs/README.md similarity index 100% rename from bots/discord/discord.js/README.md rename to generic/nodejs/README.md diff --git a/bots/discord/discord.js/egg-discord-js-generic.json b/generic/nodejs/egg-node-js-generic.json similarity index 57% rename from bots/discord/discord.js/egg-discord-js-generic.json rename to generic/nodejs/egg-node-js-generic.json index dd8ce583..fa063f12 100644 --- a/bots/discord/discord.js/egg-discord-js-generic.json +++ b/generic/nodejs/egg-node-js-generic.json @@ -1,24 +1,23 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1", + "version": "PTDL_v2", "update_url": null }, - "exported_at": "2021-10-22T07:43:48-04:00", - "name": "discord.js generic", + "exported_at": "2022-07-25T14:13:08-04:00", + "name": "node.js generic", "author": "parker@parkervcp.com", - "description": "a generic discord js bot egg\r\n\r\nThis will clone a git repo for a bot. it defaults to master if no branch is specified.\r\n\r\nInstalls the node_modules on install. If you set user_upload then I assume you know what you are doing.", + "description": "a generic node.js egg\r\n\r\nThis will clone a git repo. it defaults to master if no branch is specified.\r\n\r\nInstalls the node_modules on install. If you set user_upload then I assume you know what you are doing.", "features": null, - "images": [ - "ghcr.io\/parkervcp\/yolks:nodejs_18", - "ghcr.io\/parkervcp\/yolks:nodejs_17", - "ghcr.io\/parkervcp\/yolks:nodejs_16", - "ghcr.io\/parkervcp\/yolks:nodejs_15", - "ghcr.io\/parkervcp\/yolks:nodejs_14", - "ghcr.io\/parkervcp\/yolks:nodejs_12" - ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:nodejs_17": "ghcr.io\/parkervcp\/yolks:nodejs_17", + "ghcr.io\/parkervcp\/yolks:nodejs_16": "ghcr.io\/parkervcp\/yolks:nodejs_16", + "ghcr.io\/parkervcp\/yolks:nodejs_15": "ghcr.io\/parkervcp\/yolks:nodejs_15", + "ghcr.io\/parkervcp\/yolks:nodejs_14": "ghcr.io\/parkervcp\/yolks:nodejs_14", + "ghcr.io\/parkervcp\/yolks:nodejs_12": "ghcr.io\/parkervcp\/yolks:nodejs_12" + }, "file_denylist": [], - "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; if [[ ! -z ${NODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm install ${NODE_PACKAGES}; fi; if [[ ! -z ${UNNODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm uninstall ${UNNODE_PACKAGES}; fi; if [ -f \/home\/container\/package.json ]; then \/usr\/local\/bin\/npm install; fi; \/usr\/local\/bin\/node \/home\/container\/{{BOT_JS_FILE}}", + "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; if [[ ! -z ${NODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm install ${NODE_PACKAGES}; fi; if [[ ! -z ${UNNODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm uninstall ${UNNODE_PACKAGES}; fi; if [ -f \/home\/container\/package.json ]; then \/usr\/local\/bin\/npm install; fi; \/usr\/local\/bin\/node \/home\/container\/{{JS_FILE}}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"change this part\"\r\n}", @@ -27,7 +26,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# NodeJS Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git curl jq file unzip make gcc g++ python python-dev libtool\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n echo -e \"assuming user knows what they are doing have a good day.\"\r\n exit 0\r\nfi\r\n\r\n## add git ending if it's not on the address\r\nif [[ ${GIT_ADDRESS} != *.git ]]; then\r\n GIT_ADDRESS=${GIT_ADDRESS}.git\r\nfi\r\n\r\nif [ -z \"${USERNAME}\" ] && [ -z \"${ACCESS_TOKEN}\" ]; then\r\n echo -e \"using anon api call\"\r\nelse\r\n GIT_ADDRESS=\"https:\/\/${USERNAME}:${ACCESS_TOKEN}@$(echo -e ${GIT_ADDRESS} | cut -d\/ -f3-)\"\r\nfi\r\n\r\n## pull git js bot repo\r\nif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n echo -e \"\/mnt\/server directory is not empty.\"\r\n if [ -d .git ]; then\r\n echo -e \".git directory exists\"\r\n if [ -f .git\/config ]; then\r\n echo -e \"loading info from git config\"\r\n ORIGIN=$(git config --get remote.origin.url)\r\n else\r\n echo -e \"files found with no git config\"\r\n echo -e \"closing out without touching things to not break anything\"\r\n exit 10\r\n fi\r\n fi\r\n\r\n if [ \"${ORIGIN}\" == \"${GIT_ADDRESS}\" ]; then\r\n echo \"pulling latest from github\"\r\n git pull\r\n fi\r\nelse\r\n echo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n if [ -z ${BRANCH} ]; then\r\n echo -e \"cloning default branch\"\r\n git clone ${GIT_ADDRESS} .\r\n else\r\n echo -e \"cloning ${BRANCH}'\"\r\n git clone --single-branch --branch ${BRANCH} ${GIT_ADDRESS} .\r\n fi\r\n\r\nfi\r\n\r\necho \"Installing nodejs packages\"\r\nif [[ ! -z ${NODE_PACKAGES} ]]; then\r\n \/usr\/local\/bin\/npm install ${NODE_PACKAGES}\r\nfi\r\n\r\nif [ -f \/mnt\/server\/package.json ]; then\r\n \/usr\/local\/bin\/npm install --production\r\nfi\r\n\r\necho -e \"install complete\"\r\nexit 0", + "script": "#!\/bin\/bash\r\n# NodeJS App Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git curl jq file unzip make gcc g++ python python-dev libtool\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n echo -e \"assuming user knows what they are doing have a good day.\"\r\n exit 0\r\nfi\r\n\r\n## add git ending if it's not on the address\r\nif [[ ${GIT_ADDRESS} != *.git ]]; then\r\n GIT_ADDRESS=${GIT_ADDRESS}.git\r\nfi\r\n\r\nif [ -z \"${USERNAME}\" ] && [ -z \"${ACCESS_TOKEN}\" ]; then\r\n echo -e \"using anon api call\"\r\nelse\r\n GIT_ADDRESS=\"https:\/\/${USERNAME}:${ACCESS_TOKEN}@$(echo -e ${GIT_ADDRESS} | cut -d\/ -f3-)\"\r\nfi\r\n\r\n## pull git js repo\r\nif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n echo -e \"\/mnt\/server directory is not empty.\"\r\n if [ -d .git ]; then\r\n echo -e \".git directory exists\"\r\n if [ -f .git\/config ]; then\r\n echo -e \"loading info from git config\"\r\n ORIGIN=$(git config --get remote.origin.url)\r\n else\r\n echo -e \"files found with no git config\"\r\n echo -e \"closing out without touching things to not break anything\"\r\n exit 10\r\n fi\r\n fi\r\n\r\n if [ \"${ORIGIN}\" == \"${GIT_ADDRESS}\" ]; then\r\n echo \"pulling latest from github\"\r\n git pull\r\n fi\r\nelse\r\n echo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n if [ -z ${BRANCH} ]; then\r\n echo -e \"cloning default branch\"\r\n git clone ${GIT_ADDRESS} .\r\n else\r\n echo -e \"cloning ${BRANCH}'\"\r\n git clone --single-branch --branch ${BRANCH} ${GIT_ADDRESS} .\r\n fi\r\n\r\nfi\r\n\r\necho \"Installing nodejs packages\"\r\nif [[ ! -z ${NODE_PACKAGES} ]]; then\r\n \/usr\/local\/bin\/npm install ${NODE_PACKAGES}\r\nfi\r\n\r\nif [ -f \/mnt\/server\/package.json ]; then\r\n \/usr\/local\/bin\/npm install --production\r\nfi\r\n\r\necho -e \"install complete\"\r\nexit 0", "container": "node:14-buster-slim", "entrypoint": "bash" } @@ -40,16 +39,18 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Install Branch", - "description": "The branch of the bot to install.", + "description": "The branch to install.", "env_variable": "BRANCH", "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "User Uploaded Files", @@ -58,7 +59,8 @@ "default_value": "0", "user_viewable": true, "user_editable": true, - "rules": "required|boolean" + "rules": "required|boolean", + "field_type": "text" }, { "name": "Auto Update", @@ -67,16 +69,18 @@ "default_value": "0", "user_viewable": true, "user_editable": true, - "rules": "required|boolean" + "rules": "required|boolean", + "field_type": "text" }, { - "name": "Bot js file", - "description": "The file that starts the bot.", - "env_variable": "BOT_JS_FILE", + "name": "JS file", + "description": "The file that starts the app", + "env_variable": "JS_FILE", "default_value": "index.js", "user_viewable": true, "user_editable": true, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" }, { "name": "Additional Node packages", @@ -85,7 +89,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Git Username", @@ -94,7 +99,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Git Access Token", @@ -103,7 +109,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Uninstall Node packages", @@ -112,7 +119,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" } ] -} +} \ No newline at end of file diff --git a/generic/nodejs/egg-node-js-generic.json~HEAD b/generic/nodejs/egg-node-js-generic.json~HEAD new file mode 100644 index 00000000..fa063f12 --- /dev/null +++ b/generic/nodejs/egg-node-js-generic.json~HEAD @@ -0,0 +1,126 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2022-07-25T14:13:08-04:00", + "name": "node.js generic", + "author": "parker@parkervcp.com", + "description": "a generic node.js egg\r\n\r\nThis will clone a git repo. it defaults to master if no branch is specified.\r\n\r\nInstalls the node_modules on install. If you set user_upload then I assume you know what you are doing.", + "features": null, + "docker_images": { + "ghcr.io\/parkervcp\/yolks:nodejs_17": "ghcr.io\/parkervcp\/yolks:nodejs_17", + "ghcr.io\/parkervcp\/yolks:nodejs_16": "ghcr.io\/parkervcp\/yolks:nodejs_16", + "ghcr.io\/parkervcp\/yolks:nodejs_15": "ghcr.io\/parkervcp\/yolks:nodejs_15", + "ghcr.io\/parkervcp\/yolks:nodejs_14": "ghcr.io\/parkervcp\/yolks:nodejs_14", + "ghcr.io\/parkervcp\/yolks:nodejs_12": "ghcr.io\/parkervcp\/yolks:nodejs_12" + }, + "file_denylist": [], + "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; if [[ ! -z ${NODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm install ${NODE_PACKAGES}; fi; if [[ ! -z ${UNNODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm uninstall ${UNNODE_PACKAGES}; fi; if [ -f \/home\/container\/package.json ]; then \/usr\/local\/bin\/npm install; fi; \/usr\/local\/bin\/node \/home\/container\/{{JS_FILE}}", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"change this part\"\r\n}", + "logs": "{}", + "stop": "^^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# NodeJS App Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git curl jq file unzip make gcc g++ python python-dev libtool\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n echo -e \"assuming user knows what they are doing have a good day.\"\r\n exit 0\r\nfi\r\n\r\n## add git ending if it's not on the address\r\nif [[ ${GIT_ADDRESS} != *.git ]]; then\r\n GIT_ADDRESS=${GIT_ADDRESS}.git\r\nfi\r\n\r\nif [ -z \"${USERNAME}\" ] && [ -z \"${ACCESS_TOKEN}\" ]; then\r\n echo -e \"using anon api call\"\r\nelse\r\n GIT_ADDRESS=\"https:\/\/${USERNAME}:${ACCESS_TOKEN}@$(echo -e ${GIT_ADDRESS} | cut -d\/ -f3-)\"\r\nfi\r\n\r\n## pull git js repo\r\nif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n echo -e \"\/mnt\/server directory is not empty.\"\r\n if [ -d .git ]; then\r\n echo -e \".git directory exists\"\r\n if [ -f .git\/config ]; then\r\n echo -e \"loading info from git config\"\r\n ORIGIN=$(git config --get remote.origin.url)\r\n else\r\n echo -e \"files found with no git config\"\r\n echo -e \"closing out without touching things to not break anything\"\r\n exit 10\r\n fi\r\n fi\r\n\r\n if [ \"${ORIGIN}\" == \"${GIT_ADDRESS}\" ]; then\r\n echo \"pulling latest from github\"\r\n git pull\r\n fi\r\nelse\r\n echo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n if [ -z ${BRANCH} ]; then\r\n echo -e \"cloning default branch\"\r\n git clone ${GIT_ADDRESS} .\r\n else\r\n echo -e \"cloning ${BRANCH}'\"\r\n git clone --single-branch --branch ${BRANCH} ${GIT_ADDRESS} .\r\n fi\r\n\r\nfi\r\n\r\necho \"Installing nodejs packages\"\r\nif [[ ! -z ${NODE_PACKAGES} ]]; then\r\n \/usr\/local\/bin\/npm install ${NODE_PACKAGES}\r\nfi\r\n\r\nif [ -f \/mnt\/server\/package.json ]; then\r\n \/usr\/local\/bin\/npm install --production\r\nfi\r\n\r\necho -e \"install complete\"\r\nexit 0", + "container": "node:14-buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Git Repo Address", + "description": "GitHub Repo to clone\r\n\r\nI.E. https:\/\/github.com\/parkervcp\/repo_name", + "env_variable": "GIT_ADDRESS", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string", + "field_type": "text" + }, + { + "name": "Install Branch", + "description": "The branch to install.", + "env_variable": "BRANCH", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string", + "field_type": "text" + }, + { + "name": "User Uploaded Files", + "description": "Skip all the install stuff if you are letting a user upload files.\r\n\r\n0 = false (default)\r\n1 = true", + "env_variable": "USER_UPLOAD", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "required|boolean", + "field_type": "text" + }, + { + "name": "Auto Update", + "description": "Pull the latest files on startup when using a GitHub repo.", + "env_variable": "AUTO_UPDATE", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "required|boolean", + "field_type": "text" + }, + { + "name": "JS file", + "description": "The file that starts the app", + "env_variable": "JS_FILE", + "default_value": "index.js", + "user_viewable": true, + "user_editable": true, + "rules": "required|string", + "field_type": "text" + }, + { + "name": "Additional Node packages", + "description": "Install additional node packages.\r\n\r\nUse spaces to separate.", + "env_variable": "NODE_PACKAGES", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string", + "field_type": "text" + }, + { + "name": "Git Username", + "description": "Username to auth with git.", + "env_variable": "USERNAME", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string", + "field_type": "text" + }, + { + "name": "Git Access Token", + "description": "Password to use with git.\r\n\r\nIt's best practice to use a Personal Access Token.\r\nhttps:\/\/github.com\/settings\/tokens\r\nhttps:\/\/gitlab.com\/-\/profile\/personal_access_tokens", + "env_variable": "ACCESS_TOKEN", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string", + "field_type": "text" + }, + { + "name": "Uninstall Node packages", + "description": "Uninstall node packages.\r\n\r\nUse spaces to separate.", + "env_variable": "UNNODE_PACKAGES", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string", + "field_type": "text" + } + ] +} \ No newline at end of file diff --git a/bots/discord/nodemon.js/README.md b/generic/nodemon/README.md similarity index 100% rename from bots/discord/nodemon.js/README.md rename to generic/nodemon/README.md diff --git a/bots/discord/nodemon.js/egg-nodemon.json b/generic/nodemon/egg-nodemon.json similarity index 100% rename from bots/discord/nodemon.js/egg-nodemon.json rename to generic/nodemon/egg-nodemon.json diff --git a/bots/discord/discord.py/README.md b/generic/python/README.md similarity index 100% rename from bots/discord/discord.py/README.md rename to generic/python/README.md diff --git a/bots/discord/discord.py/egg-discord-py-generic.json b/generic/python/egg-python-generic.json similarity index 76% rename from bots/discord/discord.py/egg-discord-py-generic.json rename to generic/python/egg-python-generic.json index 884599f6..775b8d28 100644 --- a/bots/discord/discord.py/egg-discord-py-generic.json +++ b/generic/python/egg-python-generic.json @@ -1,23 +1,23 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1", + "version": "PTDL_v2", "update_url": null }, - "exported_at": "2021-10-19T13:22:35-04:00", - "name": "discord.py generic", + "exported_at": "2022-07-25T14:17:50-04:00", + "name": "python generic", "author": "parker@parkervcp.com", - "description": "A Discord bot written in Python using discord.py\r\n\r\nhttps:\/\/github.com\/Ispira\/pixel-bot", + "description": "A Generic Python Egg for Pterodactyl\r\n\r\nTested with: https:\/\/github.com\/Ispira\/pixel-bot", "features": null, - "images": [ - "ghcr.io\/parkervcp\/yolks:python_3.10", - "ghcr.io\/parkervcp\/yolks:python_3.9", - "ghcr.io\/parkervcp\/yolks:python_3.8", - "ghcr.io\/parkervcp\/yolks:python_3.7", - "ghcr.io\/parkervcp\/yolks:python_2.7" - ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:python_3.10": "ghcr.io\/parkervcp\/yolks:python_3.10", + "ghcr.io\/parkervcp\/yolks:python_3.9": "ghcr.io\/parkervcp\/yolks:python_3.9", + "ghcr.io\/parkervcp\/yolks:python_3.8": "ghcr.io\/parkervcp\/yolks:python_3.8", + "ghcr.io\/parkervcp\/yolks:python_3.7": "ghcr.io\/parkervcp\/yolks:python_3.7", + "ghcr.io\/parkervcp\/yolks:python_2.7": "ghcr.io\/parkervcp\/yolks:python_2.7" + }, "file_denylist": [], - "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; if [[ ! -z {{PY_PACKAGES}} ]]; then pip install -U --prefix .local {{PY_PACKAGES}}; fi; if [[ -f \/home\/container\/${REQUIREMENTS_FILE} ]]; then pip install -U --prefix .local -r ${REQUIREMENTS_FILE}; fi; \/usr\/local\/bin\/python \/home\/container\/{{BOT_PY_FILE}}", + "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; if [[ ! -z {{PY_PACKAGES}} ]]; then pip install -U --prefix .local {{PY_PACKAGES}}; fi; if [[ -f \/home\/container\/${REQUIREMENTS_FILE} ]]; then pip install -U --prefix .local -r ${REQUIREMENTS_FILE}; fi; \/usr\/local\/bin\/python \/home\/container\/{{PY_FILE}}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"change this part\"\r\n}", @@ -26,7 +26,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Python Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git curl jq file unzip make gcc g++ python python-dev libtool\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n echo -e \"assuming user knows what they are doing have a good day.\"\r\n exit 0\r\nfi\r\n\r\n## add git ending if it's not on the address\r\nif [[ ${GIT_ADDRESS} != *.git ]]; then\r\n GIT_ADDRESS=${GIT_ADDRESS}.git\r\nfi\r\n\r\nif [ -z \"${USERNAME}\" ] && [ -z \"${ACCESS_TOKEN}\" ]; then\r\n echo -e \"using anon api call\"\r\nelse\r\n GIT_ADDRESS=\"https:\/\/${USERNAME}:${ACCESS_TOKEN}@$(echo -e ${GIT_ADDRESS} | cut -d\/ -f3-)\"\r\nfi\r\n\r\n## pull git js bot repo\r\nif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n echo -e \"\/mnt\/server directory is not empty.\"\r\n if [ -d .git ]; then\r\n echo -e \".git directory exists\"\r\n if [ -f .git\/config ]; then\r\n echo -e \"loading info from git config\"\r\n ORIGIN=$(git config --get remote.origin.url)\r\n else\r\n echo -e \"files found with no git config\"\r\n echo -e \"closing out without touching things to not break anything\"\r\n exit 10\r\n fi\r\n fi\r\n\r\n if [ \"${ORIGIN}\" == \"${GIT_ADDRESS}\" ]; then\r\n echo \"pulling latest from github\"\r\n git pull\r\n fi\r\nelse\r\n echo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n if [ -z ${BRANCH} ]; then\r\n echo -e \"cloning default branch\"\r\n git clone ${GIT_ADDRESS} .\r\n else\r\n echo -e \"cloning ${BRANCH}'\"\r\n git clone --single-branch --branch ${BRANCH} ${GIT_ADDRESS} .\r\n fi\r\n\r\nfi\r\n\r\nexport HOME=\/mnt\/server\r\n\r\necho \"Installing python requirements into folder\"\r\nif [[ ! -z ${PY_PACKAGES} ]]; then\r\n pip install -U --prefix .local ${PY_PACKAGES}\r\nfi\r\n\r\nif [ -f \/mnt\/server\/requirements.txt ]; then\r\n pip install -U --prefix .local -r ${REQUIREMENTS_FILE}\r\nfi\r\n\r\necho -e \"install complete\"\r\nexit 0", + "script": "#!\/bin\/bash\r\n# Python App Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git curl jq file unzip make gcc g++ python python-dev libtool\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n echo -e \"assuming user knows what they are doing have a good day.\"\r\n exit 0\r\nfi\r\n\r\n## add git ending if it's not on the address\r\nif [[ ${GIT_ADDRESS} != *.git ]]; then\r\n GIT_ADDRESS=${GIT_ADDRESS}.git\r\nfi\r\n\r\nif [ -z \"${USERNAME}\" ] && [ -z \"${ACCESS_TOKEN}\" ]; then\r\n echo -e \"using anon api call\"\r\nelse\r\n GIT_ADDRESS=\"https:\/\/${USERNAME}:${ACCESS_TOKEN}@$(echo -e ${GIT_ADDRESS} | cut -d\/ -f3-)\"\r\nfi\r\n\r\n## pull git python repo\r\nif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n echo -e \"\/mnt\/server directory is not empty.\"\r\n if [ -d .git ]; then\r\n echo -e \".git directory exists\"\r\n if [ -f .git\/config ]; then\r\n echo -e \"loading info from git config\"\r\n ORIGIN=$(git config --get remote.origin.url)\r\n else\r\n echo -e \"files found with no git config\"\r\n echo -e \"closing out without touching things to not break anything\"\r\n exit 10\r\n fi\r\n fi\r\n\r\n if [ \"${ORIGIN}\" == \"${GIT_ADDRESS}\" ]; then\r\n echo \"pulling latest from github\"\r\n git pull\r\n fi\r\nelse\r\n echo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n if [ -z ${BRANCH} ]; then\r\n echo -e \"cloning default branch\"\r\n git clone ${GIT_ADDRESS} .\r\n else\r\n echo -e \"cloning ${BRANCH}'\"\r\n git clone --single-branch --branch ${BRANCH} ${GIT_ADDRESS} .\r\n fi\r\n\r\nfi\r\n\r\nexport HOME=\/mnt\/server\r\n\r\necho \"Installing python requirements into folder\"\r\nif [[ ! -z ${PY_PACKAGES} ]]; then\r\n pip install -U --prefix .local ${PY_PACKAGES}\r\nfi\r\n\r\nif [ -f \/mnt\/server\/requirements.txt ]; then\r\n pip install -U --prefix .local -r ${REQUIREMENTS_FILE}\r\nfi\r\n\r\necho -e \"install complete\"\r\nexit 0", "container": "python:3.8-slim", "entrypoint": "bash" } @@ -39,7 +39,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Git Branch", @@ -48,7 +49,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "User Uploaded Files", @@ -57,7 +59,8 @@ "default_value": "0", "user_viewable": true, "user_editable": true, - "rules": "required|boolean" + "rules": "required|boolean", + "field_type": "text" }, { "name": "Auto Update", @@ -66,16 +69,18 @@ "default_value": "0", "user_viewable": true, "user_editable": true, - "rules": "required|boolean" + "rules": "required|boolean", + "field_type": "text" }, { - "name": "Bot py file", - "description": "The file that starts the bot.", - "env_variable": "BOT_PY_FILE", - "default_value": "bot.py", + "name": "App py file", + "description": "The file that starts the App.", + "env_variable": "PY_FILE", + "default_value": "app.py", "user_viewable": true, "user_editable": true, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" }, { "name": "Additional Python packages", @@ -84,7 +89,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Git Username", @@ -93,7 +99,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Git Access Token", @@ -102,7 +109,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Requirements file", @@ -111,7 +119,8 @@ "default_value": "requirements.txt", "user_viewable": true, "user_editable": true, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" } ] } \ No newline at end of file diff --git a/bots/discord/discord.rs/README.md b/generic/rust/README.md similarity index 100% rename from bots/discord/discord.rs/README.md rename to generic/rust/README.md diff --git a/bots/discord/discord.rs/egg-discord-rs-generic.json b/generic/rust/egg-rust-generic.json similarity index 81% rename from bots/discord/discord.rs/egg-discord-rs-generic.json rename to generic/rust/egg-rust-generic.json index 2457cfa5..ec27dcc8 100644 --- a/bots/discord/discord.rs/egg-discord-rs-generic.json +++ b/generic/rust/egg-rust-generic.json @@ -1,20 +1,20 @@ { "_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-04-17T16:56:51+01:00", - "name": "discord.rs generic", + "exported_at": "2022-07-25T14:36:57-04:00", + "name": "rust generic", "author": "ethan.coward@icloud.com", "description": "Creates a container that runs rust with cargo.", "features": null, - "images": [ - "ghcr.io\/parkervcp\/yolks:rust_1.31", - "ghcr.io\/parkervcp\/yolks:rust_1.56", - "ghcr.io\/parkervcp\/yolks:rust_1.60", - "ghcr.io\/parkervcp\/yolks:rust_latest" - ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:rust_1.31": "ghcr.io\/parkervcp\/yolks:rust_1.31", + "ghcr.io\/parkervcp\/yolks:rust_1.56": "ghcr.io\/parkervcp\/yolks:rust_1.56", + "ghcr.io\/parkervcp\/yolks:rust_1.60": "ghcr.io\/parkervcp\/yolks:rust_1.60", + "ghcr.io\/parkervcp\/yolks:rust_latest": "ghcr.io\/parkervcp\/yolks:rust_latest" + }, "file_denylist": [], "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; cargo run --release", "config": { @@ -38,7 +38,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Git Branch", @@ -47,7 +48,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Auto Update", @@ -56,7 +58,8 @@ "default_value": "0", "user_viewable": true, "user_editable": true, - "rules": "required|boolean" + "rules": "required|boolean", + "field_type": "text" }, { "name": "Git Username", @@ -65,7 +68,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Git Access Token", @@ -74,16 +78,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" - }, - { - "name": "Bot Token", - "description": "The discord token used to run your bot. Sets to the environment variable `DISCORD_TOKEN`\r\n\r\nAlternatively, you can use a .env file", - "env_variable": "DISCORD_TOKEN", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" } ] -} +} \ No newline at end of file From aef23dd9c86f542f8e0aafe8f06b85b85fbdd624 Mon Sep 17 00:00:00 2001 From: Fuggschen <64164659+Fuggschen@users.noreply.github.com> Date: Thu, 8 Sep 2022 03:39:16 +0200 Subject: [PATCH 0550/1001] Update egg-phantom-bot.json I added your egg for phantombot and it was not running as expected. Installing latest stable release was not possible because the release tag pattern has changed and there are some outdated URLs in the variable descriptions, so: * Updated latest release download URL with wget because curl don't want to download zip * Removed OAUTH variables because setup is now integrated in the bot itself * updated length of API keys because newer keys are longer than 64 chars * updated phantombot documentation URLs in the variables to new domain I am using this updated egg on our own server and it's now working again --- bots/twitch/phantombot/egg-phantom-bot.json | 60 ++++++++++----------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/bots/twitch/phantombot/egg-phantom-bot.json b/bots/twitch/phantombot/egg-phantom-bot.json index e10dc43e..661b7fc3 100644 --- a/bots/twitch/phantombot/egg-phantom-bot.json +++ b/bots/twitch/phantombot/egg-phantom-bot.json @@ -1,24 +1,28 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v2", + "update_url": null }, - "exported_at": "2020-12-16T19:18:24+02:00", + "exported_at": "2022-09-08T03:33:45+02:00", "name": "PhantomBot", "author": "mail@wuffy.eu", "description": "PhantomBot is an actively developed open source interactive Twitch bot with a vibrant community that provides entertainment and moderation for your channel, allowing you to focus on what matters the most to you - your game and your viewers.", "features": null, - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11", + "docker_images": { + "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11" + }, + "file_denylist": [], "startup": "java --add-opens java.base\/java.lang=ALL-UNNAMED -Djava.security.policy=config\/security -Dinteractive -Xms1m -Dfile.encoding=UTF-8 -jar PhantomBot.jar", "config": { - "files": "{\r\n \"config\/botlogin.txt\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"baseport\": \"{{server.build.default.port}}\",\r\n \"channel\": \"{{server.build.env.CHANNEL_NAME}}\",\r\n \"owner\": \"{{server.build.env.CHANNEL_OWNER}}\",\r\n \"apioauth\": \"{{server.build.env.USER_OAUTH_TOKEN}}\",\r\n \"oauth\": \"{{server.build.env.BOT_OAUTH_TOKEN}}\",\r\n \"paneluser\": \"{{server.build.env.WEBPANEL_USERNAME}}\",\r\n \"panelpassword\": \"{{server.build.env.WEBPANEL_PASSWORD}}\",\r\n \"user\": \"{{server.build.env.BOT_TWITCH_USERNAME}}\",\r\n \"youtubekey\": \"{{server.build.env.YOUTUBE_API_KEY}}\",\r\n \"discord_token\": \"{{server.build.env.DISCORD_BOT_TOKEN}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"config\/botlogin.txt\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"baseport\": \"{{server.build.default.port}}\",\r\n \"channel\": \"{{server.build.env.CHANNEL_NAME}}\",\r\n \"owner\": \"{{server.build.env.CHANNEL_OWNER}}\",\r\n \"paneluser\": \"{{server.build.env.WEBPANEL_USERNAME}}\",\r\n \"panelpassword\": \"{{server.build.env.WEBPANEL_PASSWORD}}\",\r\n \"user\": \"{{server.build.env.BOT_TWITCH_USERNAME}}\",\r\n \"youtubekey\": \"{{server.build.env.YOUTUBE_API_KEY}}\",\r\n \"discord_token\": \"{{server.build.env.DISCORD_BOT_TOKEN}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Connecting to Twitch WS-IRC Server\",\r\n \"userInteraction\": []\r\n}", "logs": "{\r\n \"custom\": true,\r\n \"location\": \"latest.log\"\r\n}", "stop": "exit" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# PhantomBot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt -y --no-install-recommends install curl ca-certificates unzip\r\n\r\ncd \/tmp\r\n\r\n# Fetching latest github release\r\nif [ -z \"${RELEASE_VERSION}\" ] || [ \"${RELEASE_VERSION}\" == \"master\" ]; then\r\n echo -e \"Using latest Github Master version\"\r\n DOWNLOAD_URL=https:\/\/raw.githubusercontent.com\/PhantomBot\/nightly-build\/master\/PhantomBot-nightly-lin.zip\r\nelse\r\n if [ -z \"${RELEASE_VERSION}\" ] || [ \"${RELEASE_VERSION}\" == \"latest\" ]; then\r\n echo -e \"Using latest release version\"\r\n RELEASE_VERSION=$(curl -s \"https:\/\/github.com\/PhantomBot\/PhantomBot\/releases\/latest\" | grep -o '[0-9].[0-9].[0-9]')\r\n fi\r\n DOWNLOAD_URL=https:\/\/github.com\/PhantomBot\/PhantomBot\/releases\/download\/v${RELEASE_VERSION}\/PhantomBot-${RELEASE_VERSION}.zip\r\nfi\r\n\r\n# Download files\r\ncd \/mnt\/server\r\ncurl -LJO ${DOWNLOAD_URL}\r\nunzip -o PhantomBot-*.zip\r\n\r\n# Move unzipped files into the server folder\r\ncp -f -r .\/PhantomBot-*\/* \/mnt\/server\/\r\n\r\n# Creating default config\r\nif [ ! -f \/mnt\/server\/config\/botlogin.txt ]; then\r\n echo -e \"Creating config\/botlogin.txt\"\r\n cat << EOF > \/mnt\/server\/config\/botlogin.txt\r\n #PhantomBot Configuration File\r\n #\r\n # Here is a list wiht all config values:\r\n # https:\/\/community.phantom.bot\/t\/settings-for-botlogin-txt\/78\r\n #\r\n apioauth=\r\n baseport=\r\n channel=\r\n oauth=\r\n owner=\r\n panelpassword=\r\n paneluser=\r\n user=\r\n youtubekey=\r\n discord_token=\r\nEOF\r\nfi", + "script": "#!\/bin\/bash\r\n# PhantomBot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt -y --no-install-recommends install curl wget ca-certificates unzip\r\n\r\ncd \/tmp\r\n\r\n# Fetching latest github release\r\nif [ -z \"${RELEASE_VERSION}\" ] || [ \"${RELEASE_VERSION}\" == \"master\" ]; then\r\n echo -e \"Using latest Github Master version\"\r\n DOWNLOAD_URL=https:\/\/raw.githubusercontent.com\/PhantomBot\/nightly-build\/master\/PhantomBot-nightly-lin.zip\r\nelse\r\n if [ -z \"${RELEASE_VERSION}\" ] || [ \"${RELEASE_VERSION}\" == \"latest\" ]; then\r\n echo -e \"Using latest release version\"\r\n RELEASE_VERSION=$(curl -s \"https:\/\/api.github.com\/repos\/PhantomBot\/PhantomBot\/releases\/latest\" | grep -e '\"tag_name\"' | sed -E 's\/.*\"([^\"]+)\".*\/\\1\/' | sed 's\/^.\/\/')\r\n fi\r\n DOWNLOAD_URL=https:\/\/github.com\/PhantomBot\/PhantomBot\/releases\/download\/v${RELEASE_VERSION}\/PhantomBot-${RELEASE_VERSION}-lin.zip\r\n echo -e \"${DOWNLOAD_URL}\"\r\nfi\r\n\r\n# Download files\r\ncd \/mnt\/server\r\nwget ${DOWNLOAD_URL}\r\nunzip -o PhantomBot-*.zip\r\n\r\n# Move unzipped files into the server folder\r\ncp -f -r .\/PhantomBot-*\/* \/mnt\/server\/\r\n\r\n# Creating default config\r\nif [ ! -f \/mnt\/server\/config\/botlogin.txt ]; then\r\n echo -e \"Creating config\/botlogin.txt\"\r\n cat << EOF > \/mnt\/server\/config\/botlogin.txt\r\n #PhantomBot Configuration File\r\n #\r\n # Here is a list wiht all config values:\r\n # https:\/\/community.phantom.bot\/t\/settings-for-botlogin-txt\/78\r\n #\r\n apioauth=\r\n baseport=\r\n channel=\r\n oauth=\r\n owner=\r\n panelpassword=\r\n paneluser=\r\n user=\r\n youtubekey=\r\n discord_token=\r\nEOF\r\nfi", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -31,7 +35,8 @@ "default_value": "latest", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:9" + "rules": "required|string|max:9", + "field_type": "text" }, { "name": "Twitch Channel Name", @@ -40,7 +45,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:26" + "rules": "required|string|max:26", + "field_type": "text" }, { "name": "Channel Owner", @@ -49,25 +55,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:26" - }, - { - "name": "Bot OAuth Token", - "description": "Please note, this OAuth token needs to be generated while you're logged in into the bot's Twitch account.\r\nIf you're not logged in as the bot, please go to https:\/\/twitch.tv\/ and login as the bot.\r\nGet the bot's OAuth token here: https:\/\/twitchapps.com\/tmi\/", - "env_variable": "BOT_OAUTH_TOKEN", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:64" - }, - { - "name": "Your OAuth Token", - "description": "Please note, this OAuth token needs to be generated while you're logged in into your caster account.\r\nIf you're not logged in as the caster, please go to https:\/\/twitch.tv\/ and login as the caster.\r\nGet the your OAuth token here: https:\/\/phantombot.github.io\/PhantomBot\/oauth\/", - "env_variable": "USER_OAUTH_TOKEN", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:64" + "rules": "required|string|max:26", + "field_type": "text" }, { "name": "Bot Twitch Username", @@ -76,7 +65,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:26" + "rules": "required|string|max:26", + "field_type": "text" }, { "name": "Webpanel Username", @@ -85,7 +75,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:64" + "rules": "required|string|max:64", + "field_type": "text" }, { "name": "Webpanel Password", @@ -94,25 +85,28 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:2000" + "rules": "required|string|max:2000", + "field_type": "text" }, { "name": "Youtube API Key", - "description": "https:\/\/community.phantom.bot\/t\/acquire-youtube-api-key\/222", + "description": "https:\/\/phantombot.dev\/guides\/#guide=content\/integrations\/youtubesetup", "env_variable": "YOUTUBE_API_KEY", "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "max:64" + "rules": "max:128", + "field_type": "text" }, { "name": "Discord Bot Token", - "description": "https:\/\/community.phantom.bot\/t\/discord-integration-setup\/64", + "description": "https:\/\/phantombot.dev\/guides\/#guide=content\/integrations\/discordintegrationsetup", "env_variable": "DISCORD_BOT_TOKEN", "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "max:64" + "rules": "max:128", + "field_type": "text" } ] } From 03af9b6669da0f7a8fa65219ad68a71a5364a6ee Mon Sep 17 00:00:00 2001 From: Fuggschen <64164659+Fuggschen@users.noreply.github.com> Date: Thu, 8 Sep 2022 16:59:55 +0200 Subject: [PATCH 0551/1001] Update egg-phantom-bot.json Changed accordingly to the request the image, logs, and removed the userInteraction --- bots/twitch/phantombot/egg-phantom-bot.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bots/twitch/phantombot/egg-phantom-bot.json b/bots/twitch/phantombot/egg-phantom-bot.json index 661b7fc3..bccbaca3 100644 --- a/bots/twitch/phantombot/egg-phantom-bot.json +++ b/bots/twitch/phantombot/egg-phantom-bot.json @@ -4,20 +4,20 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-09-08T03:33:45+02:00", + "exported_at": "2022-09-08T16:55:56+02:00", "name": "PhantomBot", "author": "mail@wuffy.eu", "description": "PhantomBot is an actively developed open source interactive Twitch bot with a vibrant community that provides entertainment and moderation for your channel, allowing you to focus on what matters the most to you - your game and your viewers.", "features": null, "docker_images": { - "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11" + "ghcr.io\/parkervcp\/yolks:java_11": "ghcr.io\/parkervcp\/yolks:java_11" }, "file_denylist": [], "startup": "java --add-opens java.base\/java.lang=ALL-UNNAMED -Djava.security.policy=config\/security -Dinteractive -Xms1m -Dfile.encoding=UTF-8 -jar PhantomBot.jar", "config": { "files": "{\r\n \"config\/botlogin.txt\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"baseport\": \"{{server.build.default.port}}\",\r\n \"channel\": \"{{server.build.env.CHANNEL_NAME}}\",\r\n \"owner\": \"{{server.build.env.CHANNEL_OWNER}}\",\r\n \"paneluser\": \"{{server.build.env.WEBPANEL_USERNAME}}\",\r\n \"panelpassword\": \"{{server.build.env.WEBPANEL_PASSWORD}}\",\r\n \"user\": \"{{server.build.env.BOT_TWITCH_USERNAME}}\",\r\n \"youtubekey\": \"{{server.build.env.YOUTUBE_API_KEY}}\",\r\n \"discord_token\": \"{{server.build.env.DISCORD_BOT_TOKEN}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Connecting to Twitch WS-IRC Server\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"latest.log\"\r\n}", + "startup": "{\r\n \"done\": \"Connecting to Twitch WS-IRC Server\"\r\n}", + "logs": "{}", "stop": "exit" }, "scripts": { From c605cd6356e0a571724be23287d88d677dcacfd6 Mon Sep 17 00:00:00 2001 From: Xen0Xys Date: Fri, 9 Sep 2022 23:47:41 +0200 Subject: [PATCH 0552/1001] Add java 17 docker image to discord.java egg --- bots/discord/discord.java/egg-discord-java.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bots/discord/discord.java/egg-discord-java.json b/bots/discord/discord.java/egg-discord-java.json index 9d687778..f62dd5ea 100644 --- a/bots/discord/discord.java/egg-discord-java.json +++ b/bots/discord/discord.java/egg-discord-java.json @@ -12,7 +12,8 @@ "images": [ "ghcr.io\/parkervcp\/yolks:java_8", "ghcr.io\/parkervcp\/yolks:java_11", - "ghcr.io\/parkervcp\/yolks:java_16" + "ghcr.io\/parkervcp\/yolks:java_16", + "ghcr.io\/parkervcp\/yolks:java_17" ], "file_denylist": [], "startup": "java -Dterminal.jline=false -Dterminal.ansi=true -jar {{JARFILE}}", From 9bfe675b637786a78c31e5ef8007ad8bca40a9a0 Mon Sep 17 00:00:00 2001 From: Xen0Xys <47594493+Xen0Xys@users.noreply.github.com> Date: Sat, 10 Sep 2022 00:04:54 +0200 Subject: [PATCH 0553/1001] Update egg with panel export feature --- .../discord.java/egg-discord-java.json | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/bots/discord/discord.java/egg-discord-java.json b/bots/discord/discord.java/egg-discord-java.json index f62dd5ea..3dd7830a 100644 --- a/bots/discord/discord.java/egg-discord-java.json +++ b/bots/discord/discord.java/egg-discord-java.json @@ -1,20 +1,20 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1", + "version": "PTDL_v2", "update_url": null }, - "exported_at": "2021-07-21T18:23:17+03:00", + "exported_at": "2022-09-10T00:03:57+02:00", "name": "Discord Java", "author": "sneaky@sneakyhub.com", "description": "Creates a container that runs java.", "features": null, - "images": [ - "ghcr.io\/parkervcp\/yolks:java_8", - "ghcr.io\/parkervcp\/yolks:java_11", - "ghcr.io\/parkervcp\/yolks:java_16", - "ghcr.io\/parkervcp\/yolks:java_17" - ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:java_8": "ghcr.io\/parkervcp\/yolks:java_8", + "ghcr.io\/parkervcp\/yolks:java_11": "ghcr.io\/parkervcp\/yolks:java_11", + "ghcr.io\/parkervcp\/yolks:java_16": "ghcr.io\/parkervcp\/yolks:java_16", + "ghcr.io\/parkervcp\/yolks:java_17": "ghcr.io\/parkervcp\/yolks:java_17" + }, "file_denylist": [], "startup": "java -Dterminal.jline=false -Dterminal.ansi=true -jar {{JARFILE}}", "config": { @@ -38,7 +38,8 @@ "default_value": "sneakyhub.jar", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" } ] } \ No newline at end of file From 7b51c411871fbe693696d4d224b57412333166e7 Mon Sep 17 00:00:00 2001 From: Devonte <69095599+devnote-dev@users.noreply.github.com> Date: Sun, 18 Sep 2022 01:47:35 +0100 Subject: [PATCH 0554/1001] fix: remove password from startup option --- database/redis/redis-6/egg-redis-6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/redis/redis-6/egg-redis-6.json b/database/redis/redis-6/egg-redis-6.json index ead0ed28..d7e5ba2b 100644 --- a/database/redis/redis-6/egg-redis-6.json +++ b/database/redis/redis-6/egg-redis-6.json @@ -13,7 +13,7 @@ "ghcr.io\/parkervcp\/yolks:redis_6": "ghcr.io\/parkervcp\/yolks:redis_6" }, "file_denylist": [], - "startup": "\/usr\/local\/bin\/redis-server \/home\/container\/redis.conf --save 60 1 --dir \/home\/container\/ --bind 0.0.0.0 --port {{SERVER_PORT}} --requirepass {{SERVER_PASSWORD}} --maxmemory {{SERVER_MEMORY}}mb --daemonize yes && redis-cli -p {{SERVER_PORT}} -a {{SERVER_PASSWORD}}; redis-cli -p {{SERVER_PORT}} -a {{SERVER_PASSWORD}} shutdown save", + "startup": "\/usr\/local\/bin\/redis-server \/home\/container\/redis.conf --save 60 1 --dir \/home\/container\/ --bind 0.0.0.0 --port {{SERVER_PORT}} --requirepass {{SERVER_PASSWORD}} --maxmemory {{SERVER_MEMORY}}mb --daemonize yes && redis-cli -p {{SERVER_PORT}}; redis-cli -p {{SERVER_PORT}} -a {{SERVER_PASSWORD}} shutdown save", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Configuration loaded\"\r\n}", From 24158e96a27c91bd90977ba4061958c1e2cd28a2 Mon Sep 17 00:00:00 2001 From: Devonte <69095599+devnote-dev@users.noreply.github.com> Date: Sun, 18 Sep 2022 01:52:09 +0100 Subject: [PATCH 0555/1001] feat: add startup notice --- database/redis/redis-6/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/database/redis/redis-6/README.md b/database/redis/redis-6/README.md index 3531c1d1..d425ff64 100644 --- a/database/redis/redis-6/README.md +++ b/database/redis/redis-6/README.md @@ -4,6 +4,10 @@ Redis is an open source (BSD licensed), in-memory data structure store, used as a database, cache and message broker. +## Server Startup + +You must first authenticate before trying to execute commands, to do this run `AUTH ` (without the `<>`). This should be the same as the password set in the `SERVER_PASSWORD` variable. + ## Minimum RAM warning It's recommended to have 4gb of RAM for redis From d93502b2a14b7791cd1207378c781c85308ae73f Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Wed, 7 Sep 2022 12:27:11 -0400 Subject: [PATCH 0556/1001] Move generic eggs --- README.md | 17 ++- bots/discord/README.md | 20 --- generic/README.md | 41 ++++++ {bots/discord => generic}/deno/README.md | 0 .../deno/egg-deno-generic.json | 0 .../discordgo => generic/golang}/README.md | 0 .../golang/egg-golang-generic.json | 31 +++-- .../discord.java => generic/java}/README.md | 0 .../java/egg-java.json | 20 ++- {bots/discord => generic}/lua/luvit/README.md | 0 .../lua/luvit/egg-luvit-generic.json | 8 +- .../discord.js => generic/nodejs}/README.md | 0 .../nodejs/egg-node-js-generic.json | 64 +++++---- generic/nodejs/egg-node-js-generic.json~HEAD | 126 ++++++++++++++++++ .../nodemon.js => generic/nodemon}/README.md | 0 .../nodemon}/egg-nodemon.json | 0 .../discord.py => generic/python}/README.md | 0 .../python/egg-python-generic.json | 61 +++++---- .../discord.rs => generic/rust}/README.md | 0 .../rust/egg-rust-generic.json | 44 +++--- 20 files changed, 301 insertions(+), 131 deletions(-) create mode 100644 generic/README.md rename {bots/discord => generic}/deno/README.md (100%) rename {bots/discord => generic}/deno/egg-deno-generic.json (100%) rename {bots/discord/discordgo => generic/golang}/README.md (100%) rename bots/discord/discordgo/egg-discordgo-generic.json => generic/golang/egg-golang-generic.json (56%) rename {bots/discord/discord.java => generic/java}/README.md (100%) rename bots/discord/discord.java/egg-discord-java.json => generic/java/egg-java.json (67%) rename {bots/discord => generic}/lua/luvit/README.md (100%) rename {bots/discord => generic}/lua/luvit/egg-luvit-generic.json (73%) rename {bots/discord/discord.js => generic/nodejs}/README.md (100%) rename bots/discord/discord.js/egg-discord-js-generic.json => generic/nodejs/egg-node-js-generic.json (57%) create mode 100644 generic/nodejs/egg-node-js-generic.json~HEAD rename {bots/discord/nodemon.js => generic/nodemon}/README.md (100%) rename {bots/discord/nodemon.js => generic/nodemon}/egg-nodemon.json (100%) rename {bots/discord/discord.py => generic/python}/README.md (100%) rename bots/discord/discord.py/egg-discord-py-generic.json => generic/python/egg-python-generic.json (76%) rename {bots/discord/discord.rs => generic/rust}/README.md (100%) rename bots/discord/discord.rs/egg-discord-rs-generic.json => generic/rust/egg-rust-generic.json (81%) diff --git a/README.md b/README.md index c99d9e9f..4cc20127 100644 --- a/README.md +++ b/README.md @@ -29,15 +29,9 @@ If you are reading this it looks like you are looking to add an egg to your serv * [ATL Bot](/bots/discord/atlbot) Node JS * [Bastion](/bots/discord/bastion) Node JS * [CorpBot](/bots/discord/corpbot) Python -* [discordgo](bots/discord/discordgo) Golang generic -* [discord.java](bots/discord/discord.java) Java generic -* [discord.js](bots/discord/discord.js) Node JS generic -* [discord.py](bots/discord/discord.py) Python generic -* [discord.rs](bots/discord/discord.rs) Rust generic * [Dynamica](/bots/discord/dynamica) Node JS * [fragbot](/bots/discord/fragbot) Golang * [JMusicBot](/bots/discord/jmusicbot) Java -* [nodemon.js](bots/discord/nodemon.js) Nodemon JS generic * [parkertron](/bots/discord/parkertron) Golang * [pixel-bot](/bots/discord/pixelbot) Python * [Redbot](/bots/discord/redbot) Python @@ -56,6 +50,17 @@ If you are reading this it looks like you are looking to add an egg to your serv * [JTS3ServerMod](/bots/teamspeak3/jts3servermod) +## [Generic Languages](/generic) + +* [deno](/generic/deno/) +* [golang](/generic/golang/) +* [java](/generic/java/) +* [lua](/generic/lua/) +* [nodejs](/generic/nodejs/) +* [nodemon](/generic/nodemon/) +* [python](/generic/python/) +* [rust](/generic/rust/) + ## [Database](/database) ### In-Memory Databases diff --git a/bots/discord/README.md b/bots/discord/README.md index 6d7490ad..4974190a 100644 --- a/bots/discord/README.md +++ b/bots/discord/README.md @@ -17,21 +17,6 @@ Give awesome perks to your Discord server! [corpnewt/CorpBot.py](https://github.com/corpnewt/CorpBot.py) A very clumsy python bot for discord -### [DiscordJS](discord.js) - -[discord.js](https://discord.js.org/) -A generic discord.js egg for running discord bots. - -### [DiscordPY](discord.py) - -[discord.py](https://discordpy.readthedocs.io/en/latest/) -A generic discord.py egg for running discord bots. - -### [discordgo](discordgo) - -[discordgo](https://github.com/bwmarrin/discordgo) -A generic go application egg. - ### [FragBot](fragbot) [fragforce/fragbot](https://github.com/fragforce/fragbot) @@ -42,11 +27,6 @@ The bot that runs as the fragforce `@Fragbot` offering looking-for-group service [jagrosh/MusicBot](https://github.com/jagrosh/MusicBot) A Discord music bot that's easy to set up and run yourself! -### [nodemon](nodemon.js) - -[nodemon](https://nodemon.io/) -A nodemon javascript egg for running and automatically restarting the node application when file changes in the directory are detected - ### [parkertron](parkertron) [parkervcp/parkertron](https://github.com/parkervcp/parkertron) diff --git a/generic/README.md b/generic/README.md new file mode 100644 index 00000000..24b04c8b --- /dev/null +++ b/generic/README.md @@ -0,0 +1,41 @@ +# Generic Language + +### [Deno](deno) + +[deno](https://deno.land/) +A generic deno egg + +### [Golang](golang) + +[golang](https://go.dev/) +A generic go egg + +### [Java](java) + +[java](https://www.java.com/en/) +A generic java egg + +### [Lua](lua) + +[lua](https://www.lua.org/) +A generic luvit/lua egg + +### [Node JS](nodejs) + +[nodejs](https://nodejs.org) +A generic node.js egg + +### [nodemon](nodemon) + +[nodemon](https://nodemon.io/) +A nodemon javascript egg for running and automatically restarting the node application when file changes in the directory are detected + +### [Python](python) + +[python](https://www.python.org/) +A generic python egg + +### [Rust](python) + +[rust](https://www.rust-lang.org/) +A generic rust egg diff --git a/bots/discord/deno/README.md b/generic/deno/README.md similarity index 100% rename from bots/discord/deno/README.md rename to generic/deno/README.md diff --git a/bots/discord/deno/egg-deno-generic.json b/generic/deno/egg-deno-generic.json similarity index 100% rename from bots/discord/deno/egg-deno-generic.json rename to generic/deno/egg-deno-generic.json diff --git a/bots/discord/discordgo/README.md b/generic/golang/README.md similarity index 100% rename from bots/discord/discordgo/README.md rename to generic/golang/README.md diff --git a/bots/discord/discordgo/egg-discordgo-generic.json b/generic/golang/egg-golang-generic.json similarity index 56% rename from bots/discord/discordgo/egg-discordgo-generic.json rename to generic/golang/egg-golang-generic.json index 45b981ef..e34ded0d 100644 --- a/bots/discord/discordgo/egg-discordgo-generic.json +++ b/generic/golang/egg-golang-generic.json @@ -1,13 +1,18 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v2", + "update_url": null }, - "exported_at": "2020-10-11T12:12:50-04:00", - "name": "discordgo generic", + "exported_at": "2022-07-25T14:20:37-04:00", + "name": "golang generic", "author": "parker@parkervcp.com", - "description": "A generic golang egg.\r\n\r\nMeant to be customized before it is used.", - "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", + "description": "A generic golang egg that compiles the application and saves an executable\r\n\r\nMeant to be customized before it is used.", + "features": null, + "docker_images": { + "quay.io\/parkervcp\/pterodactyl-images:base_debian": "quay.io\/parkervcp\/pterodactyl-images:base_debian" + }, + "file_denylist": [], "startup": ".\/${EXECUTABLE}", "config": { "files": "{}", @@ -28,18 +33,20 @@ "description": "Go package to get and build", "env_variable": "GO_PACKAGE", "default_value": "", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string" + "user_viewable": true, + "user_editable": true, + "rules": "required|string", + "field_type": "text" }, { "name": "Executable", - "description": "This is the executable from the bot build.", + "description": "This is the executable from the build.", "env_variable": "EXECUTABLE", "default_value": "", - "user_viewable": 1, - "user_editable": 0, - "rules": "required|string" + "user_viewable": true, + "user_editable": false, + "rules": "required|string", + "field_type": "text" } ] } \ No newline at end of file diff --git a/bots/discord/discord.java/README.md b/generic/java/README.md similarity index 100% rename from bots/discord/discord.java/README.md rename to generic/java/README.md diff --git a/bots/discord/discord.java/egg-discord-java.json b/generic/java/egg-java.json similarity index 67% rename from bots/discord/discord.java/egg-discord-java.json rename to generic/java/egg-java.json index 3dd7830a..baef14f3 100644 --- a/bots/discord/discord.java/egg-discord-java.json +++ b/generic/java/egg-java.json @@ -1,20 +1,19 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v2", + "version": "PTDL_v1", "update_url": null }, - "exported_at": "2022-09-10T00:03:57+02:00", - "name": "Discord Java", + "exported_at": "2021-07-21T18:23:17+03:00", + "name": "Generic Java", "author": "sneaky@sneakyhub.com", "description": "Creates a container that runs java.", "features": null, - "docker_images": { - "ghcr.io\/parkervcp\/yolks:java_8": "ghcr.io\/parkervcp\/yolks:java_8", - "ghcr.io\/parkervcp\/yolks:java_11": "ghcr.io\/parkervcp\/yolks:java_11", - "ghcr.io\/parkervcp\/yolks:java_16": "ghcr.io\/parkervcp\/yolks:java_16", - "ghcr.io\/parkervcp\/yolks:java_17": "ghcr.io\/parkervcp\/yolks:java_17" - }, + "images": [ + "ghcr.io\/parkervcp\/yolks:java_8", + "ghcr.io\/parkervcp\/yolks:java_11", + "ghcr.io\/parkervcp\/yolks:java_16" + ], "file_denylist": [], "startup": "java -Dterminal.jline=false -Dterminal.ansi=true -jar {{JARFILE}}", "config": { @@ -38,8 +37,7 @@ "default_value": "sneakyhub.jar", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20", - "field_type": "text" + "rules": "required|string|max:20" } ] } \ No newline at end of file diff --git a/bots/discord/lua/luvit/README.md b/generic/lua/luvit/README.md similarity index 100% rename from bots/discord/lua/luvit/README.md rename to generic/lua/luvit/README.md diff --git a/bots/discord/lua/luvit/egg-luvit-generic.json b/generic/lua/luvit/egg-luvit-generic.json similarity index 73% rename from bots/discord/lua/luvit/egg-luvit-generic.json rename to generic/lua/luvit/egg-luvit-generic.json index 99a651dd..b1c4bc09 100644 --- a/bots/discord/lua/luvit/egg-luvit-generic.json +++ b/generic/lua/luvit/egg-luvit-generic.json @@ -7,7 +7,7 @@ "exported_at": "2022-01-22T05:40:57-05:00", "name": "luvit generic", "author": "parker@parkervcp.com", - "description": "A generic luvit egg This will clone a git repo for a bot. It defaults to master if no branch is specified.\r\n\r\nSupports the discordia lua framework.", + "description": "A generic luvit egg This will clone a git repo. It defaults to master if no branch is specified.\r\n\r\nSupports the discordia lua framework.", "features": null, "images": [ "ghcr.io\/parkervcp\/yolks:debian" @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n## luvit generic install script\r\n\r\napt update\r\napt install -y git curl jq file unzip\r\n\r\n## get git files\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n echo -e \"assuming user knows what they are doing have a good day.\"\r\n exit 0\r\nfi\r\n\r\n## add git ending if it's not on the address\r\nif [[ ${GIT_ADDRESS} != *.git ]]; then\r\n GIT_ADDRESS=${GIT_ADDRESS}.git\r\nfi\r\n\r\nif [ -z \"${USERNAME}\" ] && [ -z \"${ACCESS_TOKEN}\" ]; then\r\n echo -e \"using anon api call\"\r\nelse\r\n GIT_ADDRESS=\"https:\/\/${USERNAME}:${ACCESS_TOKEN}@$(echo -e ${GIT_ADDRESS} | cut -d\/ -f3-)\"\r\nfi\r\n\r\n## pull git js bot repo\r\nif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n echo -e \"\/mnt\/server directory is not empty.\"\r\n if [ -d .git ]; then\r\n echo -e \".git directory exists\"\r\n if [ -f .git\/config ]; then\r\n echo -e \"loading info from git config\"\r\n ORIGIN=$(git config --get remote.origin.url)\r\n else\r\n echo -e \"files found with no git config\"\r\n echo -e \"closing out without touching things to not break anything\"\r\n exit 10\r\n fi\r\n fi\r\n\r\n if [ \"${ORIGIN}\" == \"${GIT_ADDRESS}\" ]; then\r\n echo \"pulling latest from github\"\r\n git pull\r\n fi\r\nelse\r\n echo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n if [ -z ${BRANCH} ]; then\r\n echo -e \"cloning default branch\"\r\n git clone ${GIT_ADDRESS} .\r\n else\r\n echo -e \"cloning ${BRANCH}'\"\r\n git clone --single-branch --branch ${BRANCH} ${GIT_ADDRESS} .\r\n fi\r\nfi\r\n\r\n## install luvit for install time\r\ncurl -L https:\/\/github.com\/luvit\/lit\/raw\/master\/get-lit.sh | sh\r\n\r\n## Install luvit packages\r\n.\/lit install ${LIT_PACKAGES}", + "script": "#!\/bin\/bash\r\n## luvit generic install script\r\n\r\napt update\r\napt install -y git curl jq file unzip\r\n\r\n## get git files\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n echo -e \"assuming user knows what they are doing have a good day.\"\r\n exit 0\r\nfi\r\n\r\n## add git ending if it's not on the address\r\nif [[ ${GIT_ADDRESS} != *.git ]]; then\r\n GIT_ADDRESS=${GIT_ADDRESS}.git\r\nfi\r\n\r\nif [ -z \"${USERNAME}\" ] && [ -z \"${ACCESS_TOKEN}\" ]; then\r\n echo -e \"using anon api call\"\r\nelse\r\n GIT_ADDRESS=\"https:\/\/${USERNAME}:${ACCESS_TOKEN}@$(echo -e ${GIT_ADDRESS} | cut -d\/ -f3-)\"\r\nfi\r\n\r\n## pull git repo\r\nif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n echo -e \"\/mnt\/server directory is not empty.\"\r\n if [ -d .git ]; then\r\n echo -e \".git directory exists\"\r\n if [ -f .git\/config ]; then\r\n echo -e \"loading info from git config\"\r\n ORIGIN=$(git config --get remote.origin.url)\r\n else\r\n echo -e \"files found with no git config\"\r\n echo -e \"closing out without touching things to not break anything\"\r\n exit 10\r\n fi\r\n fi\r\n\r\n if [ \"${ORIGIN}\" == \"${GIT_ADDRESS}\" ]; then\r\n echo \"pulling latest from github\"\r\n git pull\r\n fi\r\nelse\r\n echo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n if [ -z ${BRANCH} ]; then\r\n echo -e \"cloning default branch\"\r\n git clone ${GIT_ADDRESS} .\r\n else\r\n echo -e \"cloning ${BRANCH}'\"\r\n git clone --single-branch --branch ${BRANCH} ${GIT_ADDRESS} .\r\n fi\r\nfi\r\n\r\n## install luvit for install time\r\ncurl -L https:\/\/github.com\/luvit\/lit\/raw\/master\/get-lit.sh | sh\r\n\r\n## Install luvit packages\r\n.\/lit install ${LIT_PACKAGES}", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -74,10 +74,10 @@ "rules": "nullable|string" }, { - "name": "Bot lua file", + "name": "lua file", "description": "The Lua file to run", "env_variable": "LUA_FILE", - "default_value": "bot.lua", + "default_value": "app.lua", "user_viewable": true, "user_editable": true, "rules": "required|string" diff --git a/bots/discord/discord.js/README.md b/generic/nodejs/README.md similarity index 100% rename from bots/discord/discord.js/README.md rename to generic/nodejs/README.md diff --git a/bots/discord/discord.js/egg-discord-js-generic.json b/generic/nodejs/egg-node-js-generic.json similarity index 57% rename from bots/discord/discord.js/egg-discord-js-generic.json rename to generic/nodejs/egg-node-js-generic.json index dd8ce583..fa063f12 100644 --- a/bots/discord/discord.js/egg-discord-js-generic.json +++ b/generic/nodejs/egg-node-js-generic.json @@ -1,24 +1,23 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1", + "version": "PTDL_v2", "update_url": null }, - "exported_at": "2021-10-22T07:43:48-04:00", - "name": "discord.js generic", + "exported_at": "2022-07-25T14:13:08-04:00", + "name": "node.js generic", "author": "parker@parkervcp.com", - "description": "a generic discord js bot egg\r\n\r\nThis will clone a git repo for a bot. it defaults to master if no branch is specified.\r\n\r\nInstalls the node_modules on install. If you set user_upload then I assume you know what you are doing.", + "description": "a generic node.js egg\r\n\r\nThis will clone a git repo. it defaults to master if no branch is specified.\r\n\r\nInstalls the node_modules on install. If you set user_upload then I assume you know what you are doing.", "features": null, - "images": [ - "ghcr.io\/parkervcp\/yolks:nodejs_18", - "ghcr.io\/parkervcp\/yolks:nodejs_17", - "ghcr.io\/parkervcp\/yolks:nodejs_16", - "ghcr.io\/parkervcp\/yolks:nodejs_15", - "ghcr.io\/parkervcp\/yolks:nodejs_14", - "ghcr.io\/parkervcp\/yolks:nodejs_12" - ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:nodejs_17": "ghcr.io\/parkervcp\/yolks:nodejs_17", + "ghcr.io\/parkervcp\/yolks:nodejs_16": "ghcr.io\/parkervcp\/yolks:nodejs_16", + "ghcr.io\/parkervcp\/yolks:nodejs_15": "ghcr.io\/parkervcp\/yolks:nodejs_15", + "ghcr.io\/parkervcp\/yolks:nodejs_14": "ghcr.io\/parkervcp\/yolks:nodejs_14", + "ghcr.io\/parkervcp\/yolks:nodejs_12": "ghcr.io\/parkervcp\/yolks:nodejs_12" + }, "file_denylist": [], - "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; if [[ ! -z ${NODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm install ${NODE_PACKAGES}; fi; if [[ ! -z ${UNNODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm uninstall ${UNNODE_PACKAGES}; fi; if [ -f \/home\/container\/package.json ]; then \/usr\/local\/bin\/npm install; fi; \/usr\/local\/bin\/node \/home\/container\/{{BOT_JS_FILE}}", + "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; if [[ ! -z ${NODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm install ${NODE_PACKAGES}; fi; if [[ ! -z ${UNNODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm uninstall ${UNNODE_PACKAGES}; fi; if [ -f \/home\/container\/package.json ]; then \/usr\/local\/bin\/npm install; fi; \/usr\/local\/bin\/node \/home\/container\/{{JS_FILE}}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"change this part\"\r\n}", @@ -27,7 +26,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# NodeJS Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git curl jq file unzip make gcc g++ python python-dev libtool\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n echo -e \"assuming user knows what they are doing have a good day.\"\r\n exit 0\r\nfi\r\n\r\n## add git ending if it's not on the address\r\nif [[ ${GIT_ADDRESS} != *.git ]]; then\r\n GIT_ADDRESS=${GIT_ADDRESS}.git\r\nfi\r\n\r\nif [ -z \"${USERNAME}\" ] && [ -z \"${ACCESS_TOKEN}\" ]; then\r\n echo -e \"using anon api call\"\r\nelse\r\n GIT_ADDRESS=\"https:\/\/${USERNAME}:${ACCESS_TOKEN}@$(echo -e ${GIT_ADDRESS} | cut -d\/ -f3-)\"\r\nfi\r\n\r\n## pull git js bot repo\r\nif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n echo -e \"\/mnt\/server directory is not empty.\"\r\n if [ -d .git ]; then\r\n echo -e \".git directory exists\"\r\n if [ -f .git\/config ]; then\r\n echo -e \"loading info from git config\"\r\n ORIGIN=$(git config --get remote.origin.url)\r\n else\r\n echo -e \"files found with no git config\"\r\n echo -e \"closing out without touching things to not break anything\"\r\n exit 10\r\n fi\r\n fi\r\n\r\n if [ \"${ORIGIN}\" == \"${GIT_ADDRESS}\" ]; then\r\n echo \"pulling latest from github\"\r\n git pull\r\n fi\r\nelse\r\n echo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n if [ -z ${BRANCH} ]; then\r\n echo -e \"cloning default branch\"\r\n git clone ${GIT_ADDRESS} .\r\n else\r\n echo -e \"cloning ${BRANCH}'\"\r\n git clone --single-branch --branch ${BRANCH} ${GIT_ADDRESS} .\r\n fi\r\n\r\nfi\r\n\r\necho \"Installing nodejs packages\"\r\nif [[ ! -z ${NODE_PACKAGES} ]]; then\r\n \/usr\/local\/bin\/npm install ${NODE_PACKAGES}\r\nfi\r\n\r\nif [ -f \/mnt\/server\/package.json ]; then\r\n \/usr\/local\/bin\/npm install --production\r\nfi\r\n\r\necho -e \"install complete\"\r\nexit 0", + "script": "#!\/bin\/bash\r\n# NodeJS App Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git curl jq file unzip make gcc g++ python python-dev libtool\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n echo -e \"assuming user knows what they are doing have a good day.\"\r\n exit 0\r\nfi\r\n\r\n## add git ending if it's not on the address\r\nif [[ ${GIT_ADDRESS} != *.git ]]; then\r\n GIT_ADDRESS=${GIT_ADDRESS}.git\r\nfi\r\n\r\nif [ -z \"${USERNAME}\" ] && [ -z \"${ACCESS_TOKEN}\" ]; then\r\n echo -e \"using anon api call\"\r\nelse\r\n GIT_ADDRESS=\"https:\/\/${USERNAME}:${ACCESS_TOKEN}@$(echo -e ${GIT_ADDRESS} | cut -d\/ -f3-)\"\r\nfi\r\n\r\n## pull git js repo\r\nif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n echo -e \"\/mnt\/server directory is not empty.\"\r\n if [ -d .git ]; then\r\n echo -e \".git directory exists\"\r\n if [ -f .git\/config ]; then\r\n echo -e \"loading info from git config\"\r\n ORIGIN=$(git config --get remote.origin.url)\r\n else\r\n echo -e \"files found with no git config\"\r\n echo -e \"closing out without touching things to not break anything\"\r\n exit 10\r\n fi\r\n fi\r\n\r\n if [ \"${ORIGIN}\" == \"${GIT_ADDRESS}\" ]; then\r\n echo \"pulling latest from github\"\r\n git pull\r\n fi\r\nelse\r\n echo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n if [ -z ${BRANCH} ]; then\r\n echo -e \"cloning default branch\"\r\n git clone ${GIT_ADDRESS} .\r\n else\r\n echo -e \"cloning ${BRANCH}'\"\r\n git clone --single-branch --branch ${BRANCH} ${GIT_ADDRESS} .\r\n fi\r\n\r\nfi\r\n\r\necho \"Installing nodejs packages\"\r\nif [[ ! -z ${NODE_PACKAGES} ]]; then\r\n \/usr\/local\/bin\/npm install ${NODE_PACKAGES}\r\nfi\r\n\r\nif [ -f \/mnt\/server\/package.json ]; then\r\n \/usr\/local\/bin\/npm install --production\r\nfi\r\n\r\necho -e \"install complete\"\r\nexit 0", "container": "node:14-buster-slim", "entrypoint": "bash" } @@ -40,16 +39,18 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Install Branch", - "description": "The branch of the bot to install.", + "description": "The branch to install.", "env_variable": "BRANCH", "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "User Uploaded Files", @@ -58,7 +59,8 @@ "default_value": "0", "user_viewable": true, "user_editable": true, - "rules": "required|boolean" + "rules": "required|boolean", + "field_type": "text" }, { "name": "Auto Update", @@ -67,16 +69,18 @@ "default_value": "0", "user_viewable": true, "user_editable": true, - "rules": "required|boolean" + "rules": "required|boolean", + "field_type": "text" }, { - "name": "Bot js file", - "description": "The file that starts the bot.", - "env_variable": "BOT_JS_FILE", + "name": "JS file", + "description": "The file that starts the app", + "env_variable": "JS_FILE", "default_value": "index.js", "user_viewable": true, "user_editable": true, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" }, { "name": "Additional Node packages", @@ -85,7 +89,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Git Username", @@ -94,7 +99,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Git Access Token", @@ -103,7 +109,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Uninstall Node packages", @@ -112,7 +119,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" } ] -} +} \ No newline at end of file diff --git a/generic/nodejs/egg-node-js-generic.json~HEAD b/generic/nodejs/egg-node-js-generic.json~HEAD new file mode 100644 index 00000000..fa063f12 --- /dev/null +++ b/generic/nodejs/egg-node-js-generic.json~HEAD @@ -0,0 +1,126 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2022-07-25T14:13:08-04:00", + "name": "node.js generic", + "author": "parker@parkervcp.com", + "description": "a generic node.js egg\r\n\r\nThis will clone a git repo. it defaults to master if no branch is specified.\r\n\r\nInstalls the node_modules on install. If you set user_upload then I assume you know what you are doing.", + "features": null, + "docker_images": { + "ghcr.io\/parkervcp\/yolks:nodejs_17": "ghcr.io\/parkervcp\/yolks:nodejs_17", + "ghcr.io\/parkervcp\/yolks:nodejs_16": "ghcr.io\/parkervcp\/yolks:nodejs_16", + "ghcr.io\/parkervcp\/yolks:nodejs_15": "ghcr.io\/parkervcp\/yolks:nodejs_15", + "ghcr.io\/parkervcp\/yolks:nodejs_14": "ghcr.io\/parkervcp\/yolks:nodejs_14", + "ghcr.io\/parkervcp\/yolks:nodejs_12": "ghcr.io\/parkervcp\/yolks:nodejs_12" + }, + "file_denylist": [], + "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; if [[ ! -z ${NODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm install ${NODE_PACKAGES}; fi; if [[ ! -z ${UNNODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm uninstall ${UNNODE_PACKAGES}; fi; if [ -f \/home\/container\/package.json ]; then \/usr\/local\/bin\/npm install; fi; \/usr\/local\/bin\/node \/home\/container\/{{JS_FILE}}", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"change this part\"\r\n}", + "logs": "{}", + "stop": "^^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# NodeJS App Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git curl jq file unzip make gcc g++ python python-dev libtool\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n echo -e \"assuming user knows what they are doing have a good day.\"\r\n exit 0\r\nfi\r\n\r\n## add git ending if it's not on the address\r\nif [[ ${GIT_ADDRESS} != *.git ]]; then\r\n GIT_ADDRESS=${GIT_ADDRESS}.git\r\nfi\r\n\r\nif [ -z \"${USERNAME}\" ] && [ -z \"${ACCESS_TOKEN}\" ]; then\r\n echo -e \"using anon api call\"\r\nelse\r\n GIT_ADDRESS=\"https:\/\/${USERNAME}:${ACCESS_TOKEN}@$(echo -e ${GIT_ADDRESS} | cut -d\/ -f3-)\"\r\nfi\r\n\r\n## pull git js repo\r\nif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n echo -e \"\/mnt\/server directory is not empty.\"\r\n if [ -d .git ]; then\r\n echo -e \".git directory exists\"\r\n if [ -f .git\/config ]; then\r\n echo -e \"loading info from git config\"\r\n ORIGIN=$(git config --get remote.origin.url)\r\n else\r\n echo -e \"files found with no git config\"\r\n echo -e \"closing out without touching things to not break anything\"\r\n exit 10\r\n fi\r\n fi\r\n\r\n if [ \"${ORIGIN}\" == \"${GIT_ADDRESS}\" ]; then\r\n echo \"pulling latest from github\"\r\n git pull\r\n fi\r\nelse\r\n echo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n if [ -z ${BRANCH} ]; then\r\n echo -e \"cloning default branch\"\r\n git clone ${GIT_ADDRESS} .\r\n else\r\n echo -e \"cloning ${BRANCH}'\"\r\n git clone --single-branch --branch ${BRANCH} ${GIT_ADDRESS} .\r\n fi\r\n\r\nfi\r\n\r\necho \"Installing nodejs packages\"\r\nif [[ ! -z ${NODE_PACKAGES} ]]; then\r\n \/usr\/local\/bin\/npm install ${NODE_PACKAGES}\r\nfi\r\n\r\nif [ -f \/mnt\/server\/package.json ]; then\r\n \/usr\/local\/bin\/npm install --production\r\nfi\r\n\r\necho -e \"install complete\"\r\nexit 0", + "container": "node:14-buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Git Repo Address", + "description": "GitHub Repo to clone\r\n\r\nI.E. https:\/\/github.com\/parkervcp\/repo_name", + "env_variable": "GIT_ADDRESS", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string", + "field_type": "text" + }, + { + "name": "Install Branch", + "description": "The branch to install.", + "env_variable": "BRANCH", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string", + "field_type": "text" + }, + { + "name": "User Uploaded Files", + "description": "Skip all the install stuff if you are letting a user upload files.\r\n\r\n0 = false (default)\r\n1 = true", + "env_variable": "USER_UPLOAD", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "required|boolean", + "field_type": "text" + }, + { + "name": "Auto Update", + "description": "Pull the latest files on startup when using a GitHub repo.", + "env_variable": "AUTO_UPDATE", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "required|boolean", + "field_type": "text" + }, + { + "name": "JS file", + "description": "The file that starts the app", + "env_variable": "JS_FILE", + "default_value": "index.js", + "user_viewable": true, + "user_editable": true, + "rules": "required|string", + "field_type": "text" + }, + { + "name": "Additional Node packages", + "description": "Install additional node packages.\r\n\r\nUse spaces to separate.", + "env_variable": "NODE_PACKAGES", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string", + "field_type": "text" + }, + { + "name": "Git Username", + "description": "Username to auth with git.", + "env_variable": "USERNAME", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string", + "field_type": "text" + }, + { + "name": "Git Access Token", + "description": "Password to use with git.\r\n\r\nIt's best practice to use a Personal Access Token.\r\nhttps:\/\/github.com\/settings\/tokens\r\nhttps:\/\/gitlab.com\/-\/profile\/personal_access_tokens", + "env_variable": "ACCESS_TOKEN", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string", + "field_type": "text" + }, + { + "name": "Uninstall Node packages", + "description": "Uninstall node packages.\r\n\r\nUse spaces to separate.", + "env_variable": "UNNODE_PACKAGES", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string", + "field_type": "text" + } + ] +} \ No newline at end of file diff --git a/bots/discord/nodemon.js/README.md b/generic/nodemon/README.md similarity index 100% rename from bots/discord/nodemon.js/README.md rename to generic/nodemon/README.md diff --git a/bots/discord/nodemon.js/egg-nodemon.json b/generic/nodemon/egg-nodemon.json similarity index 100% rename from bots/discord/nodemon.js/egg-nodemon.json rename to generic/nodemon/egg-nodemon.json diff --git a/bots/discord/discord.py/README.md b/generic/python/README.md similarity index 100% rename from bots/discord/discord.py/README.md rename to generic/python/README.md diff --git a/bots/discord/discord.py/egg-discord-py-generic.json b/generic/python/egg-python-generic.json similarity index 76% rename from bots/discord/discord.py/egg-discord-py-generic.json rename to generic/python/egg-python-generic.json index 884599f6..775b8d28 100644 --- a/bots/discord/discord.py/egg-discord-py-generic.json +++ b/generic/python/egg-python-generic.json @@ -1,23 +1,23 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1", + "version": "PTDL_v2", "update_url": null }, - "exported_at": "2021-10-19T13:22:35-04:00", - "name": "discord.py generic", + "exported_at": "2022-07-25T14:17:50-04:00", + "name": "python generic", "author": "parker@parkervcp.com", - "description": "A Discord bot written in Python using discord.py\r\n\r\nhttps:\/\/github.com\/Ispira\/pixel-bot", + "description": "A Generic Python Egg for Pterodactyl\r\n\r\nTested with: https:\/\/github.com\/Ispira\/pixel-bot", "features": null, - "images": [ - "ghcr.io\/parkervcp\/yolks:python_3.10", - "ghcr.io\/parkervcp\/yolks:python_3.9", - "ghcr.io\/parkervcp\/yolks:python_3.8", - "ghcr.io\/parkervcp\/yolks:python_3.7", - "ghcr.io\/parkervcp\/yolks:python_2.7" - ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:python_3.10": "ghcr.io\/parkervcp\/yolks:python_3.10", + "ghcr.io\/parkervcp\/yolks:python_3.9": "ghcr.io\/parkervcp\/yolks:python_3.9", + "ghcr.io\/parkervcp\/yolks:python_3.8": "ghcr.io\/parkervcp\/yolks:python_3.8", + "ghcr.io\/parkervcp\/yolks:python_3.7": "ghcr.io\/parkervcp\/yolks:python_3.7", + "ghcr.io\/parkervcp\/yolks:python_2.7": "ghcr.io\/parkervcp\/yolks:python_2.7" + }, "file_denylist": [], - "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; if [[ ! -z {{PY_PACKAGES}} ]]; then pip install -U --prefix .local {{PY_PACKAGES}}; fi; if [[ -f \/home\/container\/${REQUIREMENTS_FILE} ]]; then pip install -U --prefix .local -r ${REQUIREMENTS_FILE}; fi; \/usr\/local\/bin\/python \/home\/container\/{{BOT_PY_FILE}}", + "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; if [[ ! -z {{PY_PACKAGES}} ]]; then pip install -U --prefix .local {{PY_PACKAGES}}; fi; if [[ -f \/home\/container\/${REQUIREMENTS_FILE} ]]; then pip install -U --prefix .local -r ${REQUIREMENTS_FILE}; fi; \/usr\/local\/bin\/python \/home\/container\/{{PY_FILE}}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"change this part\"\r\n}", @@ -26,7 +26,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Python Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git curl jq file unzip make gcc g++ python python-dev libtool\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n echo -e \"assuming user knows what they are doing have a good day.\"\r\n exit 0\r\nfi\r\n\r\n## add git ending if it's not on the address\r\nif [[ ${GIT_ADDRESS} != *.git ]]; then\r\n GIT_ADDRESS=${GIT_ADDRESS}.git\r\nfi\r\n\r\nif [ -z \"${USERNAME}\" ] && [ -z \"${ACCESS_TOKEN}\" ]; then\r\n echo -e \"using anon api call\"\r\nelse\r\n GIT_ADDRESS=\"https:\/\/${USERNAME}:${ACCESS_TOKEN}@$(echo -e ${GIT_ADDRESS} | cut -d\/ -f3-)\"\r\nfi\r\n\r\n## pull git js bot repo\r\nif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n echo -e \"\/mnt\/server directory is not empty.\"\r\n if [ -d .git ]; then\r\n echo -e \".git directory exists\"\r\n if [ -f .git\/config ]; then\r\n echo -e \"loading info from git config\"\r\n ORIGIN=$(git config --get remote.origin.url)\r\n else\r\n echo -e \"files found with no git config\"\r\n echo -e \"closing out without touching things to not break anything\"\r\n exit 10\r\n fi\r\n fi\r\n\r\n if [ \"${ORIGIN}\" == \"${GIT_ADDRESS}\" ]; then\r\n echo \"pulling latest from github\"\r\n git pull\r\n fi\r\nelse\r\n echo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n if [ -z ${BRANCH} ]; then\r\n echo -e \"cloning default branch\"\r\n git clone ${GIT_ADDRESS} .\r\n else\r\n echo -e \"cloning ${BRANCH}'\"\r\n git clone --single-branch --branch ${BRANCH} ${GIT_ADDRESS} .\r\n fi\r\n\r\nfi\r\n\r\nexport HOME=\/mnt\/server\r\n\r\necho \"Installing python requirements into folder\"\r\nif [[ ! -z ${PY_PACKAGES} ]]; then\r\n pip install -U --prefix .local ${PY_PACKAGES}\r\nfi\r\n\r\nif [ -f \/mnt\/server\/requirements.txt ]; then\r\n pip install -U --prefix .local -r ${REQUIREMENTS_FILE}\r\nfi\r\n\r\necho -e \"install complete\"\r\nexit 0", + "script": "#!\/bin\/bash\r\n# Python App Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git curl jq file unzip make gcc g++ python python-dev libtool\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n echo -e \"assuming user knows what they are doing have a good day.\"\r\n exit 0\r\nfi\r\n\r\n## add git ending if it's not on the address\r\nif [[ ${GIT_ADDRESS} != *.git ]]; then\r\n GIT_ADDRESS=${GIT_ADDRESS}.git\r\nfi\r\n\r\nif [ -z \"${USERNAME}\" ] && [ -z \"${ACCESS_TOKEN}\" ]; then\r\n echo -e \"using anon api call\"\r\nelse\r\n GIT_ADDRESS=\"https:\/\/${USERNAME}:${ACCESS_TOKEN}@$(echo -e ${GIT_ADDRESS} | cut -d\/ -f3-)\"\r\nfi\r\n\r\n## pull git python repo\r\nif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n echo -e \"\/mnt\/server directory is not empty.\"\r\n if [ -d .git ]; then\r\n echo -e \".git directory exists\"\r\n if [ -f .git\/config ]; then\r\n echo -e \"loading info from git config\"\r\n ORIGIN=$(git config --get remote.origin.url)\r\n else\r\n echo -e \"files found with no git config\"\r\n echo -e \"closing out without touching things to not break anything\"\r\n exit 10\r\n fi\r\n fi\r\n\r\n if [ \"${ORIGIN}\" == \"${GIT_ADDRESS}\" ]; then\r\n echo \"pulling latest from github\"\r\n git pull\r\n fi\r\nelse\r\n echo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n if [ -z ${BRANCH} ]; then\r\n echo -e \"cloning default branch\"\r\n git clone ${GIT_ADDRESS} .\r\n else\r\n echo -e \"cloning ${BRANCH}'\"\r\n git clone --single-branch --branch ${BRANCH} ${GIT_ADDRESS} .\r\n fi\r\n\r\nfi\r\n\r\nexport HOME=\/mnt\/server\r\n\r\necho \"Installing python requirements into folder\"\r\nif [[ ! -z ${PY_PACKAGES} ]]; then\r\n pip install -U --prefix .local ${PY_PACKAGES}\r\nfi\r\n\r\nif [ -f \/mnt\/server\/requirements.txt ]; then\r\n pip install -U --prefix .local -r ${REQUIREMENTS_FILE}\r\nfi\r\n\r\necho -e \"install complete\"\r\nexit 0", "container": "python:3.8-slim", "entrypoint": "bash" } @@ -39,7 +39,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Git Branch", @@ -48,7 +49,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "User Uploaded Files", @@ -57,7 +59,8 @@ "default_value": "0", "user_viewable": true, "user_editable": true, - "rules": "required|boolean" + "rules": "required|boolean", + "field_type": "text" }, { "name": "Auto Update", @@ -66,16 +69,18 @@ "default_value": "0", "user_viewable": true, "user_editable": true, - "rules": "required|boolean" + "rules": "required|boolean", + "field_type": "text" }, { - "name": "Bot py file", - "description": "The file that starts the bot.", - "env_variable": "BOT_PY_FILE", - "default_value": "bot.py", + "name": "App py file", + "description": "The file that starts the App.", + "env_variable": "PY_FILE", + "default_value": "app.py", "user_viewable": true, "user_editable": true, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" }, { "name": "Additional Python packages", @@ -84,7 +89,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Git Username", @@ -93,7 +99,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Git Access Token", @@ -102,7 +109,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Requirements file", @@ -111,7 +119,8 @@ "default_value": "requirements.txt", "user_viewable": true, "user_editable": true, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" } ] } \ No newline at end of file diff --git a/bots/discord/discord.rs/README.md b/generic/rust/README.md similarity index 100% rename from bots/discord/discord.rs/README.md rename to generic/rust/README.md diff --git a/bots/discord/discord.rs/egg-discord-rs-generic.json b/generic/rust/egg-rust-generic.json similarity index 81% rename from bots/discord/discord.rs/egg-discord-rs-generic.json rename to generic/rust/egg-rust-generic.json index 2457cfa5..ec27dcc8 100644 --- a/bots/discord/discord.rs/egg-discord-rs-generic.json +++ b/generic/rust/egg-rust-generic.json @@ -1,20 +1,20 @@ { "_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-04-17T16:56:51+01:00", - "name": "discord.rs generic", + "exported_at": "2022-07-25T14:36:57-04:00", + "name": "rust generic", "author": "ethan.coward@icloud.com", "description": "Creates a container that runs rust with cargo.", "features": null, - "images": [ - "ghcr.io\/parkervcp\/yolks:rust_1.31", - "ghcr.io\/parkervcp\/yolks:rust_1.56", - "ghcr.io\/parkervcp\/yolks:rust_1.60", - "ghcr.io\/parkervcp\/yolks:rust_latest" - ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:rust_1.31": "ghcr.io\/parkervcp\/yolks:rust_1.31", + "ghcr.io\/parkervcp\/yolks:rust_1.56": "ghcr.io\/parkervcp\/yolks:rust_1.56", + "ghcr.io\/parkervcp\/yolks:rust_1.60": "ghcr.io\/parkervcp\/yolks:rust_1.60", + "ghcr.io\/parkervcp\/yolks:rust_latest": "ghcr.io\/parkervcp\/yolks:rust_latest" + }, "file_denylist": [], "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; cargo run --release", "config": { @@ -38,7 +38,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Git Branch", @@ -47,7 +48,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Auto Update", @@ -56,7 +58,8 @@ "default_value": "0", "user_viewable": true, "user_editable": true, - "rules": "required|boolean" + "rules": "required|boolean", + "field_type": "text" }, { "name": "Git Username", @@ -65,7 +68,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" }, { "name": "Git Access Token", @@ -74,16 +78,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string" - }, - { - "name": "Bot Token", - "description": "The discord token used to run your bot. Sets to the environment variable `DISCORD_TOKEN`\r\n\r\nAlternatively, you can use a .env file", - "env_variable": "DISCORD_TOKEN", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|string" + "rules": "nullable|string", + "field_type": "text" } ] -} +} \ No newline at end of file From 653cba504affe8e1a0427f5a38ec528d4c84ebd2 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Mon, 19 Sep 2022 08:42:12 -0400 Subject: [PATCH 0557/1001] update golang image --- generic/golang/egg-golang-generic.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generic/golang/egg-golang-generic.json b/generic/golang/egg-golang-generic.json index e34ded0d..8eb373b5 100644 --- a/generic/golang/egg-golang-generic.json +++ b/generic/golang/egg-golang-generic.json @@ -10,7 +10,7 @@ "description": "A generic golang egg that compiles the application and saves an executable\r\n\r\nMeant to be customized before it is used.", "features": null, "docker_images": { - "quay.io\/parkervcp\/pterodactyl-images:base_debian": "quay.io\/parkervcp\/pterodactyl-images:base_debian" + "ghcr.io\/parkervcp\/yolks:debian": "ghcr.io\/parkervcp\/yolks:debian" }, "file_denylist": [], "startup": ".\/${EXECUTABLE}", From 8c72d5ae3330a413d33b025a6072814e748b72d6 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Tue, 20 Sep 2022 18:05:52 -0700 Subject: [PATCH 0558/1001] Update Satisfactory README.md Notes the increase in RAM required to run the server without crashing due to the recent Satisfactory Update 6 coming to the Early Access branch today. --- game_eggs/steamcmd_servers/satisfactory/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/satisfactory/README.md b/game_eggs/steamcmd_servers/satisfactory/README.md index d76b4c8e..22ffcc41 100644 --- a/game_eggs/steamcmd_servers/satisfactory/README.md +++ b/game_eggs/steamcmd_servers/satisfactory/README.md @@ -99,11 +99,11 @@ ___ ___ ### Installation/System Requirements - +*Note (9/20/22): Update 6 drastically increased RAM requirement. Servers given less than minimum have a high chance of crashing.* | | Bare Minimum | Recommended | |---------|---------|---------| | Processor | Recent x86/64 (AMD/Intel) processor. No 32 bit or ARM support. | Favours higher single-core performance over multiple cores. | -| RAM | 4096 MiB | 6144-8192 MiB (especially for 4 players or large save files) | +| RAM | 10240-12288 MiB | 16384-24576 MiB (especially for 4 players or large save files) | | Storage | 5 GB | 7-10 GB (or more, depending on save size or frequency) | | Network | 0.512 Mbit/s | 1-5 Mbit/s ([may require server *and* client config tweeks](https://satisfactory.fandom.com/wiki/Multiplayer#Temporary_lag_solution)) | | Host OS | Most stable Linux OS branches should work | Using the latest kernel version for your installed OS can prevent some edge-case installation/boot issues. | From a45a1c348bae18fd33e5450d8590c093815586ba Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Wed, 21 Sep 2022 15:17:51 +0200 Subject: [PATCH 0559/1001] tekkit-2 update Modpack Version to v1.0.5 --- game_eggs/minecraft/java/technic/Tekkit-2/egg-tekkit-2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/minecraft/java/technic/Tekkit-2/egg-tekkit-2.json b/game_eggs/minecraft/java/technic/Tekkit-2/egg-tekkit-2.json index 091ad6f4..06c8c7d5 100644 --- a/game_eggs/minecraft/java/technic/Tekkit-2/egg-tekkit-2.json +++ b/game_eggs/minecraft/java/technic/Tekkit-2/egg-tekkit-2.json @@ -36,7 +36,7 @@ "name": "Modpack Version", "description": "", "env_variable": "MODPACK_VERSION", - "default_value": "v1.0.0", + "default_value": "v1.0.5", "user_viewable": true, "user_editable": true, "rules": "required|string|max:10", From fd4680c2f59ac88cc9ef6293a09c748935ee2038 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Thu, 22 Sep 2022 15:44:11 -0400 Subject: [PATCH 0560/1001] Delete egg-node-js-generic.json~HEAD --- generic/nodejs/egg-node-js-generic.json~HEAD | 126 ------------------- 1 file changed, 126 deletions(-) delete mode 100644 generic/nodejs/egg-node-js-generic.json~HEAD diff --git a/generic/nodejs/egg-node-js-generic.json~HEAD b/generic/nodejs/egg-node-js-generic.json~HEAD deleted file mode 100644 index fa063f12..00000000 --- a/generic/nodejs/egg-node-js-generic.json~HEAD +++ /dev/null @@ -1,126 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v2", - "update_url": null - }, - "exported_at": "2022-07-25T14:13:08-04:00", - "name": "node.js generic", - "author": "parker@parkervcp.com", - "description": "a generic node.js egg\r\n\r\nThis will clone a git repo. it defaults to master if no branch is specified.\r\n\r\nInstalls the node_modules on install. If you set user_upload then I assume you know what you are doing.", - "features": null, - "docker_images": { - "ghcr.io\/parkervcp\/yolks:nodejs_17": "ghcr.io\/parkervcp\/yolks:nodejs_17", - "ghcr.io\/parkervcp\/yolks:nodejs_16": "ghcr.io\/parkervcp\/yolks:nodejs_16", - "ghcr.io\/parkervcp\/yolks:nodejs_15": "ghcr.io\/parkervcp\/yolks:nodejs_15", - "ghcr.io\/parkervcp\/yolks:nodejs_14": "ghcr.io\/parkervcp\/yolks:nodejs_14", - "ghcr.io\/parkervcp\/yolks:nodejs_12": "ghcr.io\/parkervcp\/yolks:nodejs_12" - }, - "file_denylist": [], - "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; if [[ ! -z ${NODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm install ${NODE_PACKAGES}; fi; if [[ ! -z ${UNNODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm uninstall ${UNNODE_PACKAGES}; fi; if [ -f \/home\/container\/package.json ]; then \/usr\/local\/bin\/npm install; fi; \/usr\/local\/bin\/node \/home\/container\/{{JS_FILE}}", - "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"change this part\"\r\n}", - "logs": "{}", - "stop": "^^C" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n# NodeJS App Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git curl jq file unzip make gcc g++ python python-dev libtool\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n echo -e \"assuming user knows what they are doing have a good day.\"\r\n exit 0\r\nfi\r\n\r\n## add git ending if it's not on the address\r\nif [[ ${GIT_ADDRESS} != *.git ]]; then\r\n GIT_ADDRESS=${GIT_ADDRESS}.git\r\nfi\r\n\r\nif [ -z \"${USERNAME}\" ] && [ -z \"${ACCESS_TOKEN}\" ]; then\r\n echo -e \"using anon api call\"\r\nelse\r\n GIT_ADDRESS=\"https:\/\/${USERNAME}:${ACCESS_TOKEN}@$(echo -e ${GIT_ADDRESS} | cut -d\/ -f3-)\"\r\nfi\r\n\r\n## pull git js repo\r\nif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n echo -e \"\/mnt\/server directory is not empty.\"\r\n if [ -d .git ]; then\r\n echo -e \".git directory exists\"\r\n if [ -f .git\/config ]; then\r\n echo -e \"loading info from git config\"\r\n ORIGIN=$(git config --get remote.origin.url)\r\n else\r\n echo -e \"files found with no git config\"\r\n echo -e \"closing out without touching things to not break anything\"\r\n exit 10\r\n fi\r\n fi\r\n\r\n if [ \"${ORIGIN}\" == \"${GIT_ADDRESS}\" ]; then\r\n echo \"pulling latest from github\"\r\n git pull\r\n fi\r\nelse\r\n echo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n if [ -z ${BRANCH} ]; then\r\n echo -e \"cloning default branch\"\r\n git clone ${GIT_ADDRESS} .\r\n else\r\n echo -e \"cloning ${BRANCH}'\"\r\n git clone --single-branch --branch ${BRANCH} ${GIT_ADDRESS} .\r\n fi\r\n\r\nfi\r\n\r\necho \"Installing nodejs packages\"\r\nif [[ ! -z ${NODE_PACKAGES} ]]; then\r\n \/usr\/local\/bin\/npm install ${NODE_PACKAGES}\r\nfi\r\n\r\nif [ -f \/mnt\/server\/package.json ]; then\r\n \/usr\/local\/bin\/npm install --production\r\nfi\r\n\r\necho -e \"install complete\"\r\nexit 0", - "container": "node:14-buster-slim", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Git Repo Address", - "description": "GitHub Repo to clone\r\n\r\nI.E. https:\/\/github.com\/parkervcp\/repo_name", - "env_variable": "GIT_ADDRESS", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|string", - "field_type": "text" - }, - { - "name": "Install Branch", - "description": "The branch to install.", - "env_variable": "BRANCH", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|string", - "field_type": "text" - }, - { - "name": "User Uploaded Files", - "description": "Skip all the install stuff if you are letting a user upload files.\r\n\r\n0 = false (default)\r\n1 = true", - "env_variable": "USER_UPLOAD", - "default_value": "0", - "user_viewable": true, - "user_editable": true, - "rules": "required|boolean", - "field_type": "text" - }, - { - "name": "Auto Update", - "description": "Pull the latest files on startup when using a GitHub repo.", - "env_variable": "AUTO_UPDATE", - "default_value": "0", - "user_viewable": true, - "user_editable": true, - "rules": "required|boolean", - "field_type": "text" - }, - { - "name": "JS file", - "description": "The file that starts the app", - "env_variable": "JS_FILE", - "default_value": "index.js", - "user_viewable": true, - "user_editable": true, - "rules": "required|string", - "field_type": "text" - }, - { - "name": "Additional Node packages", - "description": "Install additional node packages.\r\n\r\nUse spaces to separate.", - "env_variable": "NODE_PACKAGES", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|string", - "field_type": "text" - }, - { - "name": "Git Username", - "description": "Username to auth with git.", - "env_variable": "USERNAME", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|string", - "field_type": "text" - }, - { - "name": "Git Access Token", - "description": "Password to use with git.\r\n\r\nIt's best practice to use a Personal Access Token.\r\nhttps:\/\/github.com\/settings\/tokens\r\nhttps:\/\/gitlab.com\/-\/profile\/personal_access_tokens", - "env_variable": "ACCESS_TOKEN", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|string", - "field_type": "text" - }, - { - "name": "Uninstall Node packages", - "description": "Uninstall node packages.\r\n\r\nUse spaces to separate.", - "env_variable": "UNNODE_PACKAGES", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|string", - "field_type": "text" - } - ] -} \ No newline at end of file From 33cc7f6e3b8d7108ec5f195331d18371140c324f Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Thu, 22 Sep 2022 15:49:22 -0400 Subject: [PATCH 0561/1001] Update README.md --- generic/rust/README.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/generic/rust/README.md b/generic/rust/README.md index 5e9499f7..93397da4 100644 --- a/generic/rust/README.md +++ b/generic/rust/README.md @@ -1,3 +1,18 @@ -# discord.rs generic +# rust generic This egg is designed to run any generic Rust application with cargo, allowing users to pull their own Rust discord bot from a GitHub repository. + +## Configuration + +The server will be stuck as `starting` until the egg Start Configuration is modified. You have to edit the text to match something your bot will print for Pterodactyl panel to detect it as running. +![image](https://user-images.githubusercontent.com/10975908/126516861-c5cb4630-9f25-405c-8199-97bf5ec15a7f.png) + +You can use arrays to have multiple different values when different bots are being used + +```json +{ + "done":[ + "change this text 1", + "change this text 2" + ] +} From ed84bf8cff1172b64062c9f3d53a309949c32a95 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Thu, 22 Sep 2022 15:49:56 -0400 Subject: [PATCH 0562/1001] Update README.md --- generic/lua/luvit/README.md | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/generic/lua/luvit/README.md b/generic/lua/luvit/README.md index 5a4114c2..0991c90d 100644 --- a/generic/lua/luvit/README.md +++ b/generic/lua/luvit/README.md @@ -1,7 +1,22 @@ # luvit generic -This egg was designed to allow a user to pull their own lua discord bot from a repo and run it with luvit. +This egg was designed to allow a user to pull their own lua code from a repo and run it with luvit. -There is an option to allow a user to upload their own files to run a bot. +There is an option to allow a user to upload their own files to run an app. The startup configs and commands may need changing to actually function properly. + +## Configuration + +The server will be stuck as `starting` until the egg Start Configuration is modified. You have to edit the text to match something your bot will print for Pterodactyl panel to detect it as running. +![image](https://user-images.githubusercontent.com/10975908/126516861-c5cb4630-9f25-405c-8199-97bf5ec15a7f.png) + +You can use arrays to have multiple different values when different bots are being used + +```json +{ + "done":[ + "change this text 1", + "change this text 2" + ] +} From 8ce0fd0d464df5e5ec65121ff3f84927eb9e81fd Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 23 Sep 2022 12:59:25 -0400 Subject: [PATCH 0563/1001] Update egg-golang-generic.json --- generic/golang/egg-golang-generic.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generic/golang/egg-golang-generic.json b/generic/golang/egg-golang-generic.json index 8eb373b5..ea660805 100644 --- a/generic/golang/egg-golang-generic.json +++ b/generic/golang/egg-golang-generic.json @@ -16,7 +16,7 @@ "startup": ".\/${EXECUTABLE}", "config": { "files": "{}", - "startup": "{}", + "startup": "{\r\n \"done\": \"change this part\"\r\n}",, "logs": "{}", "stop": "^C" }, @@ -49,4 +49,4 @@ "field_type": "text" } ] -} \ No newline at end of file +} From 2c036d0b96db28471e60033159e5d31195a057bd Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Fri, 23 Sep 2022 20:13:19 +0200 Subject: [PATCH 0564/1001] ragecoop.online update This update is to stop supporting arm as it is a 32 bit bin and that does not work for ptero so only let it download the amd64 bin --- game_eggs/gta/ragecoop/egg-rage-c-o-o-p.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/gta/ragecoop/egg-rage-c-o-o-p.json b/game_eggs/gta/ragecoop/egg-rage-c-o-o-p.json index d4ab8e09..9520545d 100644 --- a/game_eggs/gta/ragecoop/egg-rage-c-o-o-p.json +++ b/game_eggs/gta/ragecoop/egg-rage-c-o-o-p.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-08-29T16:18:03+02:00", + "exported_at": "2022-09-23T20:11:15+02:00", "name": "RageCOOP", "author": "josdekurk@gmail.com", "description": "Drive around the interstate with your buddy, enjoy GTAs environment, make own missions and events or just chill in Grove Street! \ud83c\udf10", @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt update\r\napt -y install curl wget git zip unzip jq\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"x64\" || echo \"arm\")\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/RAGECOOP\/RAGECOOP-V\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/RAGECOOP\/RAGECOOP-V\/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 RageCoop.Server-linux-${ARCH}.zip)\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 -i RageCoop.Server-linux-${ARCH}.zip)\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 | grep -i RageCoop.Server-linux-${ARCH}.zip)\r\n fi\r\nfi\r\n\r\necho ${DOWNLOAD_URL}\r\nwget ${DOWNLOAD_URL} -O RageCoop.Server-linux.zip\r\nRageCoop.Server-linux.zip\r\n\r\nunzip RageCoop.Server-linux.zip\r\n\r\nrm RageCoop.Server-linux.zip\r\n\r\nchmod +x RageCoop.Server\r\n\r\ncat < Settings.xml\r\n\r\n\t4499<\/Port>\r\n\t32<\/MaxPlayers>\r\n\t500<\/MaxLatency>\r\n\tRAGECOOP server<\/Name>\r\n\thttps:\/\/ragecoop.online\/<\/Website>\r\n\tRAGECOOP server<\/Description>\r\n\tFreeRoam<\/GameMode>\r\n\tEnglish<\/Language>\r\n\tWelcome on this server :)<\/WelcomeMessage>\r\n\tfalse<\/AnnounceSelf>\r\n\thttps:\/\/masterserver.ragecoop.online\/<\/MasterServer>\r\n\t0<\/LogLevel>\r\n\t500<\/NpcStreamingDistance>\r\n\t-1<\/PlayerStreamingDistance>\r\n\ttrue<\/WeatherTimeSync>\r\n\tABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890-_<\/AllowedUsernameChars>\r\n\tfalse<\/UseP2P>\r\n\tfalse<\/UseZeroTier>\r\n\tfalse<\/UseVoice>\r\n\t8056c2e21c000001<\/ZeroTierNetworkID>\r\n\tfalse<\/AutoUpdate>\r\n\tfalse<\/KickGodMode>\r\n\ttrue<\/KickSpamming>\r\n<\/Settings>\r\nEOF\r\n\r\necho \"done\"", + "script": "#!\/bin\/bash\r\n\r\napt update\r\napt -y install curl wget git zip unzip jq\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/RAGECOOP\/RAGECOOP-V\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/RAGECOOP\/RAGECOOP-V\/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 RageCoop.Server-linux-x64.zip)\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 -i RageCoop.Server-linux-x64.zip)\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 | grep -i RageCoop.Server-linux-x64.zip)\r\n fi\r\nfi\r\n\r\necho ${DOWNLOAD_URL}\r\nwget ${DOWNLOAD_URL} -O RageCoop.Server-linux.zip\r\nRageCoop.Server-linux.zip\r\n\r\nunzip RageCoop.Server-linux.zip\r\n\r\nrm RageCoop.Server-linux.zip\r\n\r\nchmod +x RageCoop.Server\r\n\r\ncat < Settings.xml\r\n\r\n\t4499<\/Port>\r\n\t32<\/MaxPlayers>\r\n\t500<\/MaxLatency>\r\n\tRAGECOOP server<\/Name>\r\n\thttps:\/\/ragecoop.online\/<\/Website>\r\n\tRAGECOOP server<\/Description>\r\n\tFreeRoam<\/GameMode>\r\n\tEnglish<\/Language>\r\n\tWelcome on this server :)<\/WelcomeMessage>\r\n\tfalse<\/AnnounceSelf>\r\n\thttps:\/\/masterserver.ragecoop.online\/<\/MasterServer>\r\n\t0<\/LogLevel>\r\n\t500<\/NpcStreamingDistance>\r\n\t-1<\/PlayerStreamingDistance>\r\n\ttrue<\/WeatherTimeSync>\r\n\tABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890-_<\/AllowedUsernameChars>\r\n\tfalse<\/UseP2P>\r\n\tfalse<\/UseZeroTier>\r\n\tfalse<\/UseVoice>\r\n\t8056c2e21c000001<\/ZeroTierNetworkID>\r\n\tfalse<\/AutoUpdate>\r\n\tfalse<\/KickGodMode>\r\n\ttrue<\/KickSpamming>\r\n<\/Settings>\r\nEOF\r\n\r\necho \"done\"", "container": "debian:bullseye-slim", "entrypoint": "bash" } From 95381e95e43b9d3cbb02d9131b2656e2089db329 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sat, 24 Sep 2022 11:10:19 -0400 Subject: [PATCH 0565/1001] update issue templates --- .github/ISSUE_TEMPLATE/bug-report.yml | 6 +- .github/ISSUE_TEMPLATE/egg-request.yml | 6 +- .github/ISSUE_TEMPLATE/install-bug-report.yml | 88 +++++++++++++++++++ 3 files changed, 94 insertions(+), 6 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/install-bug-report.yml diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index bedeb50f..dd1ac249 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -1,7 +1,7 @@ name: 🐛 Bug Report -description: Report an issue for an egg -title: "[Bug]: " -labels: [Bug] +description: Report an Egg issue +title: "[Bug]: " +labels: ["bug", "not confirmed"] body: - type: markdown attributes: diff --git a/.github/ISSUE_TEMPLATE/egg-request.yml b/.github/ISSUE_TEMPLATE/egg-request.yml index 1f58b59d..3749c3ce 100644 --- a/.github/ISSUE_TEMPLATE/egg-request.yml +++ b/.github/ISSUE_TEMPLATE/egg-request.yml @@ -1,12 +1,12 @@ name: 🥚 Egg Request description: Suggest a server to build an egg for -title: "[Egg Request]: " -labels: [Egg Request] +title: "[Egg Request]: " +labels: ["egg request"] body: - type: markdown attributes: value: | - Make sure there are no existing egg requests by searching the [repository issues](https://github.com/parkervcp/eggs/issues?q=is%3Aissue+is%3Aopen+label%3A%22Egg+Request%22). Please understand how Pterodactyl works when you are requesting an egg. (ie. docker-compose doesn't work for a pterodactyl server) + Make sure there are no existing egg requests by searching the [repository issues](https://github.com/parkervcp/eggs/labels/egg%20request). Please understand how Pterodactyl works when you are requesting an egg. (ie. docker-compose doesn't work for a pterodactyl server) - type: dropdown id: expand attributes: diff --git a/.github/ISSUE_TEMPLATE/install-bug-report.yml b/.github/ISSUE_TEMPLATE/install-bug-report.yml new file mode 100644 index 00000000..d20b6168 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/install-bug-report.yml @@ -0,0 +1,88 @@ +name: 🐛 Install Bug Report +description: Resport an Egg install issue +title: "[Install Bug]: " +labels: ["install bug", "not confirmed"] +body: + - type: markdown + attributes: + value: | + If you see any of the following, go to [Discord](https://discord.gg/pterodactyl) and report your error in a support channel. + * `A fatal error was encountered while starting this server.` + * `No server egg configuration could be located; aborting startup.` + + Make sure there are no existing bug reports by searching the [repository issues](https://github.com/parkervcp/eggs/issues?q=is%3Aopen+is%3Aissue+label%3ABug). + - type: input + id: panel-version + attributes: + label: Panel Version + description: Version number of your Panel (latest is not a version) + placeholder: 1.x.x + validations: + required: true + - type: input + id: wings-version + attributes: + label: Wings Version + description: Version number of your Wings (latest is not a version) + placeholder: 1.x.x + validations: + required: true + - type: input + id: service + attributes: + label: Service + description: Service you are experiencing issues with + placeholder: minecraft/factorio/etc + validations: + required: true + - type: dropdown + id: modified + attributes: + label: Modified + description: Did you add or change things, this includes startup configs/install scripts/variables + options: + - Yes, I modified the egg (will provide details below) + - No, I did not modify the egg + validations: + required: true + - type: textarea + id: expected-behavior + attributes: + label: Expected Behavior + description: What did you expect to happen + placeholder: Install the server, start it, play + validations: + required: true + - type: textarea + id: actual-behavior + attributes: + label: Actual Behavior + description: What actually happened instead + placeholder: Server crashed with error X + validations: + required: true + - type: textarea + id: reproduce-steps + attributes: + label: Steps To Reproduce + description: Step by step what to do to cause the issue + placeholder: | + Step 1 Set version to latest + Step 2 install + Step 3 Receive error X or Y + validations: + required: true + - type: input + id: install-logs + attributes: + label: Install logs + description: | + Run the command below on the SSH terminal of your Wings machine and provide the link to logs. + + ``` + tail -n 1000 $(ls -Alrt /var/log/pterodactyl/install/*.log | tail -1 | sed 's/ */ /g' | cut -s -d' ' -f9) | nc pteropaste.com 99 + ``` + placeholder: | + https://pteropaste.com/exampleLogs + validations: + required: true From a1f595ac06888111af7b418661efd1231e8cf9d4 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sat, 24 Sep 2022 11:27:49 -0400 Subject: [PATCH 0566/1001] Update install-bug-report.yml update issue link to look for install bugs --- .github/ISSUE_TEMPLATE/install-bug-report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/install-bug-report.yml b/.github/ISSUE_TEMPLATE/install-bug-report.yml index d20b6168..510d124f 100644 --- a/.github/ISSUE_TEMPLATE/install-bug-report.yml +++ b/.github/ISSUE_TEMPLATE/install-bug-report.yml @@ -10,7 +10,7 @@ body: * `A fatal error was encountered while starting this server.` * `No server egg configuration could be located; aborting startup.` - Make sure there are no existing bug reports by searching the [repository issues](https://github.com/parkervcp/eggs/issues?q=is%3Aopen+is%3Aissue+label%3ABug). + Make sure there are no existing bug reports by searching the the issues for [install bugs](https://github.com/parkervcp/eggs/labels/install%20bug). - type: input id: panel-version attributes: From 6648403036ff00d98a9ac3b5ff89fbb25692bd0b Mon Sep 17 00:00:00 2001 From: Enozi <54645039+enozii@users.noreply.github.com> Date: Mon, 26 Sep 2022 07:06:13 +0200 Subject: [PATCH 0567/1001] Update README.md added Evrima --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1d751908..ac7d39e4 100644 --- a/README.md +++ b/README.md @@ -238,6 +238,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Sven Co-op](game_eggs/steamcmd_servers/svencoop) * [The Forest](game_eggs/steamcmd_servers/the_forest) * [The Isle](game_eggs/steamcmd_servers/the_isle) + * [Evrima](game_eggs/steamcmd_servers/the_isle/evrima) * [Team Fortress 2 Classic](game_eggs/steamcmd_servers/team_fortress_2_classic) * [Tower Unite](game_eggs/steamcmd_servers/tower_unite) * [Unturned](game_eggs/steamcmd_servers/unturned) From b8bad1e6028443ef56224471535b96864f8b8be4 Mon Sep 17 00:00:00 2001 From: Enozi <54645039+enozii@users.noreply.github.com> Date: Mon, 26 Sep 2022 07:07:55 +0200 Subject: [PATCH 0568/1001] Update README.md Added Evrima --- game_eggs/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/game_eggs/README.md b/game_eggs/README.md index cdc941cd..6256ad00 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -155,6 +155,7 @@ * [Team Fortress 2 Classic](steamcmd_servers/team_fortress_2_classic) * [The Forest](steamcmd_servers/the_forest) * [The Isle](steamcmd_servers/the_isle) + * [Evrima](steamcmd_servers/the_isle/evrima) * [Tower Unite](steamcmd_servers/tower_unite) * [Unturned](steamcmd_servers/unturned) * [Valheim](steamcmd_servers/valheim) From 301aeaf2ef21f77c49d4d95a77578663cfd46b88 Mon Sep 17 00:00:00 2001 From: Enozi <54645039+enozii@users.noreply.github.com> Date: Mon, 26 Sep 2022 07:09:52 +0200 Subject: [PATCH 0569/1001] Update README.md Added Evrima --- game_eggs/steamcmd_servers/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/README.md b/game_eggs/steamcmd_servers/README.md index d3e292c6..ffc39161 100644 --- a/game_eggs/steamcmd_servers/README.md +++ b/game_eggs/steamcmd_servers/README.md @@ -174,7 +174,8 @@ This is a collection of servers that use SteamCMD to install. ## The Isle -[The Isle](the_isle) +* [The Isle](the_isle) + * [Evrima](the_isle/evrima/) ## Tower Unite From 1020f582bc7cda8219eea3688c88fdf60a905e98 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Tue, 27 Sep 2022 09:07:39 -0400 Subject: [PATCH 0570/1001] add mongodb 6 egg add a separate modgo 6 egg. This uses the new mongosh tool that replaces the mongo application. --- database/nosql/mongodb/egg-mongo-d-b6.json | 52 ++++++++++++++++++++++ generic/golang/egg-golang-generic.json | 2 +- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 database/nosql/mongodb/egg-mongo-d-b6.json diff --git a/database/nosql/mongodb/egg-mongo-d-b6.json b/database/nosql/mongodb/egg-mongo-d-b6.json new file mode 100644 index 00000000..2e8aff43 --- /dev/null +++ b/database/nosql/mongodb/egg-mongo-d-b6.json @@ -0,0 +1,52 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2022-09-27T08:58:45-04:00", + "name": "MongoDB 6", + "author": "parker@parkervcp.com", + "description": "MongoDB is a general purpose, document-based, distributed database built for modern application developers and for my butt era.", + "features": null, + "docker_images": { + "MongoDB_6": "ghcr.io\/parkervcp\/yolks:mongodb_6" + }, + "file_denylist": [], + "startup": "mongod --fork --dbpath \/home\/container\/mongodb\/ --port ${SERVER_PORT} --bind_ip 0.0.0.0 --logpath \/home\/container\/logs\/mongo.log -f \/home\/container\/mongod.conf; until nc -z -v -w5 127.0.0.1 ${SERVER_PORT}; do echo 'Waiting for mongodb connection...'; sleep 5; done; mongosh --username ${MONGO_USER} --password ${MONGO_USER_PASS} --host 127.0.0.1:${SERVER_PORT} && mongosh --eval \"db.getSiblingDB('admin').shutdownServer()\" 127.0.0.1:${SERVER_PORT}", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"child process started successfully\"\r\n}", + "logs": "{}", + "stop": "exit" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash \r\nif [ ! -d \/mnt\/server\/ ]; then\r\n mkdir \/mnt\/server\/\r\nfi\r\n\r\ncd \/mnt\/server\/\r\n\r\ncp \/etc\/mongod.conf.orig \/mnt\/server\/mongod.conf\r\n\r\nmkdir mongodb logs\r\n\r\nmongod --port 27017 --dbpath \/mnt\/server\/mongodb\/ --logpath \/mnt\/server\/logs\/mongo.log --fork\r\n\r\nmongosh --eval \"db.getSiblingDB('admin').createUser({user: '${MONGO_USER}', pwd: '${MONGO_USER_PASS}', roles: ['root']})\"\r\n\r\nmongosh --eval \"db.getSiblingDB('admin').shutdownServer()\"", + "container": "mongo:6-focal", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Mongo Admin Username", + "description": "The MongoDB Admin user", + "env_variable": "MONGO_USER", + "default_value": "admin", + "user_viewable": true, + "user_editable": true, + "rules": "required|string", + "field_type": "text" + }, + { + "name": "Mongo Admin Password", + "description": "", + "env_variable": "MONGO_USER_PASS", + "default_value": "NewPa55w0rd", + "user_viewable": true, + "user_editable": true, + "rules": "required|string", + "field_type": "text" + } + ] +} \ No newline at end of file diff --git a/generic/golang/egg-golang-generic.json b/generic/golang/egg-golang-generic.json index ea660805..b1412f5c 100644 --- a/generic/golang/egg-golang-generic.json +++ b/generic/golang/egg-golang-generic.json @@ -16,7 +16,7 @@ "startup": ".\/${EXECUTABLE}", "config": { "files": "{}", - "startup": "{\r\n \"done\": \"change this part\"\r\n}",, + "startup": "{\r\n \"done\": \"change this part\"\r\n}", "logs": "{}", "stop": "^C" }, From 8e89159760e3051aa50d42d4b655b23390c303e8 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Tue, 27 Sep 2022 09:24:26 -0400 Subject: [PATCH 0571/1001] add note about free monitoring --- database/nosql/mongodb/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/database/nosql/mongodb/README.md b/database/nosql/mongodb/README.md index 0a6415ae..b72a3a7d 100644 --- a/database/nosql/mongodb/README.md +++ b/database/nosql/mongodb/README.md @@ -4,6 +4,10 @@ MongoDB is a general purpose, document-based, distributed database built for modern application developers and for the cloud era. +### MongoDB free monitoring. + +To disable the message about free monitoring you can run `db.disableFreeMonitoring()`. + ## Minimum RAM warning MongoDB requires approximately 1GB of RAM per 100.000 assets. If the system has to start swapping memory to disk, this will have a severely negative impact on performance, and should be avoided. From b3b5d6db51d9eb9600ae613bca8aebdc75db1747 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 27 Sep 2022 10:16:19 -0400 Subject: [PATCH 0572/1001] Update egg-mongo-d-b.json --- database/nosql/mongodb/egg-mongo-d-b.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/database/nosql/mongodb/egg-mongo-d-b.json b/database/nosql/mongodb/egg-mongo-d-b.json index f324983d..113bfe4f 100644 --- a/database/nosql/mongodb/egg-mongo-d-b.json +++ b/database/nosql/mongodb/egg-mongo-d-b.json @@ -11,8 +11,7 @@ "features": null, "docker_images": { "MongoDB_4": "ghcr.io\/parkervcp\/yolks:mongodb_4", - "MongoDB_5": "ghcr.io\/parkervcp\/yolks:mongodb_5", - "MongoDB_6": "ghcr.io\/parkervcp\/yolks:mongodb_6" + "MongoDB_5": "ghcr.io\/parkervcp\/yolks:mongodb_5" }, "file_denylist": [], "startup": "mongod --fork --dbpath \/home\/container\/mongodb\/ --port ${SERVER_PORT} --bind_ip 0.0.0.0 --logpath \/home\/container\/logs\/mongo.log -f \/home\/container\/mongod.conf; until nc -z -v -w5 127.0.0.1 ${SERVER_PORT}; do echo 'Waiting for mongodb connection...'; sleep 5; done && mongo --username ${MONGO_USER} --password ${MONGO_USER_PASS} --host 127.0.0.1:${SERVER_PORT} && mongo --eval \"db.getSiblingDB('admin').shutdownServer()\" 127.0.0.1:${SERVER_PORT}", From 18280a1d6c5a9fa6cb6a6aed1ca70db64bc6d974 Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Wed, 28 Sep 2022 00:24:10 -0700 Subject: [PATCH 0573/1001] Fix typo in Install Bug Report template --- .github/ISSUE_TEMPLATE/install-bug-report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/install-bug-report.yml b/.github/ISSUE_TEMPLATE/install-bug-report.yml index 510d124f..bd1d2114 100644 --- a/.github/ISSUE_TEMPLATE/install-bug-report.yml +++ b/.github/ISSUE_TEMPLATE/install-bug-report.yml @@ -1,5 +1,5 @@ name: 🐛 Install Bug Report -description: Resport an Egg install issue +description: Report an Egg install issue title: "[Install Bug]: " labels: ["install bug", "not confirmed"] body: From 27535a6f9849f72f8c3aab1aa78c0c7fdbd9d58c Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Wed, 28 Sep 2022 17:51:03 +0800 Subject: [PATCH 0574/1001] Remove Airplane Remove Airplane as it's no longer developed or supported --- README.md | 1 - game_eggs/README.md | 1 - game_eggs/minecraft/README.md | 1 - game_eggs/minecraft/java/README.md | 5 -- game_eggs/minecraft/java/airplane/README.md | 15 ----- .../minecraft/java/airplane/egg-airplane.json | 66 ------------------- 6 files changed, 89 deletions(-) delete mode 100644 game_eggs/minecraft/java/airplane/README.md delete mode 100644 game_eggs/minecraft/java/airplane/egg-airplane.json diff --git a/README.md b/README.md index 4cc20127..df829dde 100644 --- a/README.md +++ b/README.md @@ -149,7 +149,6 @@ If you are reading this it looks like you are looking to add an egg to your serv * [PocketMine MP](game_eggs/minecraft/bedrock/pocketmine_mp) * [Java](game_eggs/minecraft/java) Servers for Java Minecraft - * [Airplane](game_eggs/minecraft/java/airplane) * [Cuberite](game_eggs/minecraft/java/cuberite) * [Fabric](game_eggs/minecraft/java/fabric) * [Feather](game_eggs/minecraft/java/feather) diff --git a/game_eggs/README.md b/game_eggs/README.md index 04de8d09..04d83bfe 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -52,7 +52,6 @@ * [PocketMine MP](minecraft/bedrock/pocketmine_mp) * [Java](minecraft/java) Servers for Java Minecraft - * [Airplane](minecraft/java/airplane) * [Cuberite](minecraft/java/cuberite) * [CusreForge Generic](minecraft/java/forge/curseforge-generic) * [Fabric](minecraft/java/fabric) diff --git a/game_eggs/minecraft/README.md b/game_eggs/minecraft/README.md index f949b939..3b66247f 100644 --- a/game_eggs/minecraft/README.md +++ b/game_eggs/minecraft/README.md @@ -13,7 +13,6 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, ## [Java](java) Servers for Java Minecraft -* [Airplane](java/airplane) * [Cuberite](java/cuberite) * [Fabric](java/fabric) * [Feather](java/feather) diff --git a/game_eggs/minecraft/java/README.md b/game_eggs/minecraft/java/README.md index fdd1b58a..a2bde658 100644 --- a/game_eggs/minecraft/java/README.md +++ b/game_eggs/minecraft/java/README.md @@ -110,11 +110,6 @@ This is a direct fork of the default spigot service with the added benefit of be - (It's noted that building the jar is intensive and time consuming) -### [Airplane](airplane) - -[Airplane Github](https://github.com/TECHNOVE/Airplane) -A stable, optimized and well supported Paper fork. - ## Sponge Powered ### [SpongeForge](spongeforge) diff --git a/game_eggs/minecraft/java/airplane/README.md b/game_eggs/minecraft/java/airplane/README.md deleted file mode 100644 index 5771f165..00000000 --- a/game_eggs/minecraft/java/airplane/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# Airplane - -A stable, optimized, well supported Paper fork. - -[Airplane Github](https://github.com/TECHNOVE/Airplane) - -## Minimum RAM warning - -Approximately 2048MB - -## Server Ports - -| Port | default | -|---------|---------| -| Game | 25565 | diff --git a/game_eggs/minecraft/java/airplane/egg-airplane.json b/game_eggs/minecraft/java/airplane/egg-airplane.json deleted file mode 100644 index 764a8679..00000000 --- a/game_eggs/minecraft/java/airplane/egg-airplane.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1", - "update_url": null - }, - "exported_at": "2021-12-09T13:31:17-05:00", - "name": "Airplane", - "author": "info@ttr3.eu", - "description": "A stable, optimized and fast Paper fork.\r\nhttps:\/\/github.com\/TECHNOVE\/Airplane", - "features": [ - "eula", - "java_version", - "pid_limit" - ], - "images": [ - "ghcr.io\/pterodactyl\/yolks:java_17", - "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_8" - ], - "file_denylist": [], - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", - "config": { - "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \")! For help, type \",\r\n \"userInteraction\": [\r\n \"Go to eula.txt for more info.\"\r\n ]\r\n}", - "logs": "{}", - "stop": "stop" - }, - "scripts": { - "installation": { - "script": "apt update\r\napt -y install wget\r\ncd \/mnt\/server\r\nif [ -z \"$BUILDVERSION\" ] || [ \"$BUILDVERSION\" == \"latest\" ]; then\r\n wget https:\/\/ci.tivy.ca\/job\/Airplane-${VER}\/lastSuccessfulBuild\/artifact\/launcher-airplane.jar -O ${SERVER_JARFILE}\r\nelse\r\n wget https:\/\/ci.tivy.ca\/job\/Airplane-${VER}\/${BUILDVERSION}\/artifact\/launcher-airplane.jar -O ${SERVER_JARFILE}\r\nfi", - "container": "debian:buster-slim", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Server file name", - "description": "Here you can set the server jar's name", - "env_variable": "SERVER_JARFILE", - "default_value": "server.jar", - "user_viewable": true, - "user_editable": true, - "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" - }, - { - "name": "Minecraft Version", - "description": "Here you can set the server's version (1.17 or 1.16)", - "env_variable": "VER", - "default_value": "1.17", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:20" - }, - { - "name": "Build version", - "description": "Here you can set which build version you want to use from Airplane release\r\n(You can see the version from this site https:\/\/ci.tivy.ca)\r\n\r\nExample: https:\/\/ci.tivy.ca\/job\/Airplane-1.17\/(Build version)\/artifact\/launcher-airplane.jar", - "env_variable": "BUILDVERSION", - "default_value": "latest", - "user_viewable": true, - "user_editable": false, - "rules": "required|string|max:20" - } - ] -} From 597839d34b71b6033b3c1b7ff25117481575bd60 Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Thu, 29 Sep 2022 02:25:17 +0800 Subject: [PATCH 0575/1001] Update Minecraft Magma Re-work install script Add new java images and update to labeled java format Latest version hard coded to 1.18.2 as there is no API to find latest supported MC version --- game_eggs/minecraft/java/magma/README.md | 4 +++ game_eggs/minecraft/java/magma/egg-magma.json | 28 +++++++++++-------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/game_eggs/minecraft/java/magma/README.md b/game_eggs/minecraft/java/magma/README.md index f786b921..02a7ba54 100644 --- a/game_eggs/minecraft/java/magma/README.md +++ b/game_eggs/minecraft/java/magma/README.md @@ -11,3 +11,7 @@ The minecraft server requires a single port for access (default 25565) but plugi | Port | default | |-------|---------| | Game | 25565 | + +## Notes +Providing a Minecraft version of ``latest`` or an empty value will default to 1.18.2 as this is the latest version that Magma supports at this time. +There is no API to query to find the true latest supported version. \ No newline at end of file diff --git a/game_eggs/minecraft/java/magma/egg-magma.json b/game_eggs/minecraft/java/magma/egg-magma.json index 9be55697..38b994c0 100644 --- a/game_eggs/minecraft/java/magma/egg-magma.json +++ b/game_eggs/minecraft/java/magma/egg-magma.json @@ -1,10 +1,10 @@ { "_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-05-22T00:20:47-04:00", + "exported_at": "2022-09-28T18:19:11+00:00", "name": "Magma", "author": "support@pterodactyl.io", "description": "Magma is most powerful Forge server providing you with Forge mods and Bukkit Plugins using Spigot and Paper for Performance Optimization and Stability.", @@ -13,11 +13,12 @@ "java_version", "pid_limit" ], - "images": [ - "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_17" - ], + "docker_images": { + "Java 17": "ghcr.io\/pterodactyl\/yolks:java_17", + "Java 16": "ghcr.io\/pterodactyl\/yolks:java_16", + "Java 11": "ghcr.io\/pterodactyl\/yolks:java_11", + "Java 8": "ghcr.io\/pterodactyl\/yolks:java_8" + }, "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { @@ -28,8 +29,8 @@ }, "scripts": { "installation": { - "script": "apt update\r\napt install -y curl jq\r\n\r\nif [[ ! -d \/mnt\/server ]]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\/\r\n\r\n# get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/v2\/1.16.5\/latest\")\r\n\r\nif [[ -z \"${TAG_VERSION}\" ]]; then\r\n TAG_VERSION = \"latest\"\r\nfi\r\n\r\nif [[ -z \"${MC_VERSION}\" ]] || [[ \"${MC_VERSION}\" == \"latest\" ]]; then\r\n echo -e \"Version not set. Defaulting to latest\"\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq -r .link | grep -i installer.jar)\r\nelif [[ $MC_VERSION =~ ^1\\.(16|17|18|19|20|21|22|23) ]]; then\r\n CUSTOM_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/v2\/${MC_VERSION}\/${TAG_VERSION}\")\r\n DOWNLOAD_LINK=$(echo ${CUSTOM_JSON} | jq -r .link | grep -i installer.jar)\r\nelif [[ \"${MC_VERSION}\" == \"1.12\" ]]; then\r\n CUSTOM_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/v2\/1.12\/${TAG_VERSION}\")\r\n DOWNLOAD_LINK=$(echo ${CUSTOM_JSON} | jq -r .link | grep -i server.jar)\r\nelse\r\n echo -e \"Specified ${MC_VERSION} version not found. Defaulting to latest\"\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .link)\r\nfi\r\n\r\n# validate download link\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then\r\n echo -e \"Validating download link\"\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_LINK}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_LINK}\r\n else\r\n echo -e \"Download URL ${DOWNLOAD_LINK} is invalid. Terminating install.\"\r\n exit 2\r\n fi\r\nfi\r\n\r\nfunction downloadMagma {\r\n echo -e \"running: curl -sSL -o installer.jar ${DOWNLOAD_LINK}\"\r\n curl -sSL -o installer.jar -sSL ${DOWNLOAD_LINK}\r\n}\r\n\r\nif [[ $MC_VERSION =~ ^1\\.(16|17|18|19|20|21|22|23) ]] || [[ -z \"${MC_VERSION}\" ]] || [[ \"${MC_VERSION}\" == \"latest\" ]] ; then\r\n downloadMagma\r\n echo -e \"1.16.5 or newer version detected. Running installer\"\r\n java -jar installer.jar --installServer || { echo -e \"install failed\" exit 4; }\r\n mv forge-*.jar $SERVER_JARFILE\r\n echo -e \"Deleting installer.jar file.\\n\"\r\n rm -rf *installer.jar\r\nelse\r\n downloadMagma\r\n echo -e \"Older magma version detected. Skipping installer\"\r\n mv installer.jar $SERVER_JARFILE\r\nfi\r\n\r\necho -e \"Install Complete\"", - "container": "openjdk:8-jdk-slim", + "script": "apt update\r\napt install -y curl jq\r\n\r\ncd \/mnt\/server\/\r\n\r\n# Hard coded latest version as the magma API doesn't have an endpoint to query for it\r\nLATEST_VERSION=\"1.18.2\"\r\n\r\n# Default TAG_VERSION if empty\r\nif [[ -z \"${TAG_VERSION}\" ]]; then\r\n TAG_VERSION=\"latest\"\r\nfi\r\n\r\n\r\nif [[ -z \"${MC_VERSION}\" ]] || [[ \"${MC_VERSION}\" == \"latest\" ]]; then\r\n echo -e \"Version not set. Defaulting to latest\"\r\n MC_VERSION=${LATEST_VERSION}\r\nfi\r\n\r\necho \"Attempting to install Magma - Version ${MC_VERSION} - Tag ${TAG_VERSION}\"\r\n\r\nif [[ \"${TAG_VERSION}\" == \"latest\" ]]; then\r\n # Didn't ask for a specific tag\r\n VERSION_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/v2\/${MC_VERSION}\/latest\")\r\nelse\r\n # Asked for a specific tag\r\n VERSION_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/v2\/${MC_VERSION}\/latest\/${TAG_VERSION}\")\r\nfi\r\n\r\nDOWNLOAD_LINK=$(echo ${VERSION_JSON} | jq -r .link)\r\necho \"Download Link: '${DOWNLOAD_LINK}'\"\r\n\r\n# Check we found a download link\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then\r\n \r\n # Validate that link works\r\n echo -e \"Validating download link\"\r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_LINK}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_LINK}\r\n else\r\n echo -e \"Download URL ${DOWNLOAD_LINK} is invalid. Terminating install.\"\r\n exit 2\r\n fi\r\nelse\r\n echo -e \"No download URL found. Terminating install.\"\r\n exit 2\r\nfi\r\n\r\n\r\n# Download server.jar\r\necho -e \"running: curl -sSL -o ${SERVER_JARFILE} ${DOWNLOAD_LINK}\"\r\ncurl -sSL -o ${SERVER_JARFILE} -sSL ${DOWNLOAD_LINK}\r\necho -e \"Install Complete\"", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, @@ -41,7 +42,8 @@ "default_value": "server.jar", "user_viewable": true, "user_editable": false, - "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" + "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/", + "field_type": "text" }, { "name": "Minecraft Version", @@ -50,7 +52,8 @@ "default_value": "latest", "user_viewable": true, "user_editable": true, - "rules": "nullable|string|max:20" + "rules": "nullable|string|max:20", + "field_type": "text" }, { "name": "Tag Version", @@ -59,7 +62,8 @@ "default_value": "latest", "user_viewable": true, "user_editable": true, - "rules": "nullable|string|max:20" + "rules": "nullable|string|max:20", + "field_type": "text" } ] } \ No newline at end of file From 68cee74599a8a9eb5ba86742d29de233defc859f Mon Sep 17 00:00:00 2001 From: Jakub D Date: Wed, 28 Sep 2022 21:34:33 +0200 Subject: [PATCH 0576/1001] Remove unmaintained typhoonlimbo --- README.md | 1 - game_eggs/README.md | 1 - game_eggs/minecraft/README.md | 1 - game_eggs/minecraft/proxy/README.md | 1 - game_eggs/minecraft/proxy/java/README.md | 4 --- .../proxy/java/typhoonlimbo/README.md | 10 ------ .../java/typhoonlimbo/egg-typhoon-limbo.json | 33 ------------------- 7 files changed, 51 deletions(-) delete mode 100644 game_eggs/minecraft/proxy/java/typhoonlimbo/README.md delete mode 100644 game_eggs/minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json diff --git a/README.md b/README.md index df829dde..37a64c7f 100644 --- a/README.md +++ b/README.md @@ -170,7 +170,6 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Java](game_eggs/minecraft/proxy/java) * [FlameCord](game_eggs/minecraft/proxy/java/flamecord) * [Travertine](game_eggs/minecraft/proxy/java/travertine) - * [TyphoonLimbo](game_eggs/minecraft/proxy/java/typhoonlimbo) * [Velocity](game_eggs/minecraft/proxy/java/velocity) * [Waterfall](game_eggs/minecraft/proxy/java/waterfall) * [Bedrock](game_eggs/minecraft/proxy/bedrock) diff --git a/game_eggs/README.md b/game_eggs/README.md index 04d83bfe..23bb82ea 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -80,7 +80,6 @@ * [Java](minecraft/proxy/java) * [FlameCord](minecraft/proxy/java/flamecord) * [Travertine](minecraft/proxy/java/travertine) - * [TyphoonLimbo](minecraft/proxy/java/typhoonlimbo) * [Velocity](minecraft/proxy/java/velocity) * [VIAaas](minecraft/proxy/java/viaaas) * [Waterfall](minecraft/proxy/java/waterfall) diff --git a/game_eggs/minecraft/README.md b/game_eggs/minecraft/README.md index 3b66247f..667a445a 100644 --- a/game_eggs/minecraft/README.md +++ b/game_eggs/minecraft/README.md @@ -43,7 +43,6 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [Java](proxy/java) * [FlameCord](proxy/java/flamecord) * [Travertine](proxy/java/travertine) - * [TyphoonLimbo](proxy/java/typhoonlimbo) * [Velocity](proxy/java/velocity) * [VIAaas](proxy/java/viaaas) * [Waterfall](proxy/java/waterfall) diff --git a/game_eggs/minecraft/proxy/README.md b/game_eggs/minecraft/proxy/README.md index 7386363c..ff97f822 100644 --- a/game_eggs/minecraft/proxy/README.md +++ b/game_eggs/minecraft/proxy/README.md @@ -3,7 +3,6 @@ * [Java](/game_eggs/minecraft/proxy/java/) * [FlameCord](/game_eggs/minecraft/proxy/java/flamecord) * [Travertine](/game_eggs/minecraft/proxy/java/travertine) - * [TyphoonLimbo](/game_eggs/minecraft/proxy/java/typhoonlimbo) * [Velocity](/game_eggs/minecraft/proxy/java/velocity) * [VIAaaS](/game_eggs/minecraft/proxy/java/viaaas) * [Waterfall](/game_eggs/minecraft/proxy/java/waterfall) diff --git a/game_eggs/minecraft/proxy/java/README.md b/game_eggs/minecraft/proxy/java/README.md index b546c9c4..0b736419 100644 --- a/game_eggs/minecraft/proxy/java/README.md +++ b/game_eggs/minecraft/proxy/java/README.md @@ -9,10 +9,6 @@ FlameCord is a patch for Travertine to fix possible exploits and add useful func [Travertine](https://papermc.io/downloads#Travertine) Waterfall, with additional support for Minecraft 1.7.10. -#### TyphoonLimbo -[TyphoonLimbo](https://github.com/TyphoonMC/TyphoonLimbo) -A limbo server is a fallback server able to handle a massive amount of simultaneous connections. The player spawns into the void then waits here. It can be used to keep players connected to a network after a lobby crashed or as an afk server. - #### Velocity [Velocity](https://velocitypowered.com) Velocity is a Minecraft server proxy with unparalleled server support, scalability, and flexibility. diff --git a/game_eggs/minecraft/proxy/java/typhoonlimbo/README.md b/game_eggs/minecraft/proxy/java/typhoonlimbo/README.md deleted file mode 100644 index 54e7d22d..00000000 --- a/game_eggs/minecraft/proxy/java/typhoonlimbo/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# TyphoonLimbo server -A limbo server is a fallback server able to handle a massive amount of simultaneous connections. The player spawns into the void then waits here. It can be used to keep players connected to a network after a lobby crashed or as an afk server. - -## Server Ports -The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. - - -| Port | default | -|-------|---------| -| Game | 25565 | \ No newline at end of file diff --git a/game_eggs/minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json b/game_eggs/minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json deleted file mode 100644 index e1c7fb1d..00000000 --- a/game_eggs/minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1", - "update_url": null - }, - "exported_at": "2021-11-25T23:59:39+00:00", - "name": "TyphoonLimbo", - "author": "parker@parkervcp.com", - "description": "Lightweight minecraft limbo server", - "features": [ - "pid_limit" - ], - "images": [ - "ghcr.io\/parkervcp\/yolks:debian" - ], - "file_denylist": [], - "startup": "`sleep 2 && .\/TyphoonLimbo`", - "config": { - "files": "{\r\n \"config.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"listen_address\": \":{{server.build.default.port}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"launched on port\"\r\n}", - "logs": "{}", - "stop": "^C" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n# TyphoonLimbo Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nexport GOPATH=$HOME\/go\r\nexport PATH=$GOROOT\/bin:$GOPATH\/bin:$PATH\r\n\r\napt update\r\napt install -y git curl\r\n\r\ncd \/tmp\/\r\n\r\necho \"pulling the TyphoonLimbo pterodactyl branch\"\r\n\r\ngit clone https:\/\/github.com\/TyphoonMC\/TyphoonLimbo.git\r\ncd TyphoonLimbo\r\n\r\ngo get github.com\/TyphoonMC\/TyphoonCore\r\n\r\necho -e \"building TyphoonLimbo\"\r\ngo build\r\n\r\nmv TyphoonLimbo \/mnt\/server\/\r\n\r\nif [ -f \/mnt\/server\/config.json ]; then\r\n\techo -e \"config exists nothing to do\"\r\nelse\r\n\techo -e \"copying default config over\"\r\n\tcp config.json \/mnt\/server\/\r\nfi\r\n\r\necho -e \"install complete\"", - "container": "golang:1.14-buster", - "entrypoint": "bash" - } - }, - "variables": [] -} From a7290ee4fac8a182a54fb457ba605473225f7b93 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Thu, 29 Sep 2022 16:01:46 -0400 Subject: [PATCH 0577/1001] Update sinusbot to use new image. Updates to latest debian based image. Image has Python 3 to fix youtube-dlp compatability and resolve #1873 --- bots/discord/sinusbot/egg-sinusbot.json | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/bots/discord/sinusbot/egg-sinusbot.json b/bots/discord/sinusbot/egg-sinusbot.json index c57601cc..798f330a 100644 --- a/bots/discord/sinusbot/egg-sinusbot.json +++ b/bots/discord/sinusbot/egg-sinusbot.json @@ -1,17 +1,17 @@ { "_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-02-06T02:44:05+02:00", + "exported_at": "2022-09-29T16:00:25-04:00", "name": "Sinusbot", "author": "support@pterodactyl.io", "description": "Musicbot for Discord and Teamspeak.", "features": null, - "images": [ - "quay.io\/parkervcp\/pterodactyl-images:bot_sinusbot" - ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:bot_sinusbot": "ghcr.io\/parkervcp\/yolks:bot_sinusbot" + }, "file_denylist": [], "startup": ".\/sinusbot --override-password=\"${OVERRIDE_PASSWORD}\"", "config": { @@ -35,7 +35,8 @@ "default_value": "CHANGEME", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" } ] } \ No newline at end of file From 4e02f8d76cd511d6fa8635f16ea72938d12ca00a Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Fri, 30 Sep 2022 05:46:34 +0800 Subject: [PATCH 0578/1001] Update Valheim to use game specific image and support crossplay --- .../valheim/valheim_vanilla/egg-valheim.json | 54 +++++++++++++------ 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/game_eggs/steamcmd_servers/valheim/valheim_vanilla/egg-valheim.json b/game_eggs/steamcmd_servers/valheim/valheim_vanilla/egg-valheim.json index 32bbf258..1425875f 100644 --- a/game_eggs/steamcmd_servers/valheim/valheim_vanilla/egg-valheim.json +++ b/game_eggs/steamcmd_servers/valheim/valheim_vanilla/egg-valheim.json @@ -1,21 +1,21 @@ { "_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-02-18T11:17:53+01:00", + "exported_at": "2022-09-29T21:43:06+00:00", "name": "Valheim", "author": "magi1053@outlook.com", "description": "A brutal exploration and survival game for 1-10 players, set in a procedurally-generated purgatory inspired by viking culture.", "features": [ "steam_disk_space" ], - "images": [ - "ghcr.io\/parkervcp\/games:source" - ], + "docker_images": { + "ghcr.io\/parkervcp\/games:valheim": "ghcr.io\/parkervcp\/games:valheim" + }, "file_denylist": [], - "startup": ".\/valheim_server.x86_64 -nographics -batchmode -name \"{{SERVER_NAME}}\" -port {{SERVER_PORT}} -world \"{{WORLD}}\" -password \"{{PASSWORD}}\" > >(sed -uE \"{{FILTER}}\") & trap \"{{STOP}}\" 15; wait $!", + "startup": ".\/valheim_server.x86_64 -nographics -batchmode -name \"{{SERVER_NAME}}\" -port {{SERVER_PORT}} -world \"{{WORLD}}\" -password \"{{PASSWORD}}\" $( [[ ${ENABLE_CROSSPLAY} -eq 1 ]] && echo \" -crossplay \") > >(sed -uE \"{{FILTER}}\") & trap \"{{STOP}}\" 15; wait $!", "config": { "files": "{}", "startup": "{\r\n \"done\": \"DungeonDB Start\"\r\n}", @@ -37,7 +37,8 @@ "default_value": "My Server", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:60" + "rules": "required|string|max:60", + "field_type": "text" }, { "name": "Server Password", @@ -46,7 +47,8 @@ "default_value": "secret", "user_viewable": true, "user_editable": true, - "rules": "required|string|min:5|max:20" + "rules": "required|string|min:5|max:20", + "field_type": "text" }, { "name": "World Name", @@ -55,7 +57,8 @@ "default_value": "Dedicated", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" }, { "name": "App ID", @@ -64,7 +67,8 @@ "default_value": "896660", "user_viewable": true, "user_editable": false, - "rules": "nullable|numeric" + "rules": "nullable|numeric", + "field_type": "text" }, { "name": "LD Library Path", @@ -73,7 +77,8 @@ "default_value": ".\/linux64", "user_viewable": false, "user_editable": false, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" }, { "name": "Console Filter", @@ -82,7 +87,8 @@ "default_value": "\/^\\(Filename:.*Line:[[:space:]]+[[:digit:]]+\\)$\/d; \/^([[:space:]]+)?$\/d", "user_viewable": false, "user_editable": false, - "rules": "string" + "rules": "string", + "field_type": "text" }, { "name": "Shutdown Command", @@ -91,16 +97,28 @@ "default_value": "kill -2 $!; wait;", "user_viewable": false, "user_editable": false, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" }, { "name": "Auto Update", - "description": "", + "description": "Enable automatic updates.", "env_variable": "AUTO_UPDATE", "default_value": "1", "user_viewable": true, "user_editable": true, - "rules": "boolean" + "rules": "boolean", + "field_type": "text" + }, + { + "name": "Enable Crossplay", + "description": "Enable crossplay support", + "env_variable": "ENABLE_CROSSPLAY", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "boolean", + "field_type": "text" }, { "name": "Beta Branch", @@ -109,7 +127,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "max:30" + "rules": "max:30", + "field_type": "text" }, { "name": "Betapassword", @@ -118,7 +137,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "max:30" + "rules": "max:30", + "field_type": "text" } ] } \ No newline at end of file From d08b58571da8a058b17672ae4e68e928d1726159 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Fri, 30 Sep 2022 18:19:27 +0200 Subject: [PATCH 0579/1001] fix config file download + set Release date var to current newest --- game_eggs/veloren/egg-veloren.json | 6 +++--- game_eggs/veloren/settings.ron | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 game_eggs/veloren/settings.ron diff --git a/game_eggs/veloren/egg-veloren.json b/game_eggs/veloren/egg-veloren.json index 2c3ec6d1..0999c29c 100644 --- a/game_eggs/veloren/egg-veloren.json +++ b/game_eggs/veloren/egg-veloren.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-09-07T18:12:29+02:00", + "exported_at": "2022-09-30T18:17:45+02:00", "name": "Veloren", "author": "parker@parkervcp.com", "description": "Veloren is a multiplayer voxel RPG written in Rust. It is inspired by games such as Cube World, Legend of Zelda: Breath of the Wild, Dwarf Fortress and Minecraft.", @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl wget unzip git jq\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/veloren\/veloren\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"-linux-x86_64-\" || echo \"-linux-aarch64-\")\r\nMARCH_AND_SPACES=$(echo ${VERSION} && echo ${ARCH} && echo ${RELEASE_DATE})\r\nMATCH=$(echo ${MARCH_AND_SPACES} | sed 's\/ \/\/g')\r\n\r\necho ${MATCH}\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"weekly\" ]; 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 -i ${MATCH})\r\n else\r\n echo -e \"invalid ${RELEASE_DATE}\"\r\n fi\r\nfi\r\n\r\nwget ${DOWNLOAD_URL} -O files.zip\r\n\r\nunzip files.zip\r\nrm files.zip\r\n\r\nchmod +x veloren-server-cli\r\n\r\n## generate config because there is no better way to get it.\r\nmkdir -p \/mnt\/server\/userdata\/server\/server_config\/\r\nif [ ! -f \/mnt\/server\/userdata\/server\/server_config\/settings.ron ]; then\r\n echo -e \"creating default config\"\r\n echo -n \"(\r\n gameserver_address: \"0.0.0.0:14004\",\r\n metrics_address: \"0.0.0.0:14005\",\r\n auth_server_address: Some(\"https:\/\/auth.veloren.net\"),\r\n max_players: 100,\r\n world_seed: 25269,\r\n server_name: \"Veloren Alpha\",\r\n start_time: 32400,\r\n map_file: None,\r\n max_view_distance: Some(65),\r\n banned_words_files: [],\r\n max_player_group_size: 6,\r\n client_timeout: (\r\n secs: 40,\r\n nanos: 0,\r\n ),\r\n spawn_town: None,\r\n safe_spawn: true,\r\n max_player_for_kill_broadcast: Some(20),\r\n)\r\n\" > \/mnt\/server\/userdata\/server\/server_config\/settings.ron\r\n echo -e \"config pulled\"\r\nfi\r\n\r\necho -e \"install complete\"", + "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl wget unzip git jq\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/veloren\/veloren\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"-linux-x86_64-\" || echo \"-linux-aarch64-\")\r\nMARCH_AND_SPACES=$(echo ${VERSION} && echo ${ARCH} && echo ${RELEASE_DATE})\r\nMATCH=$(echo ${MARCH_AND_SPACES} | sed 's\/ \/\/g')\r\n\r\necho ${MATCH}\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"weekly\" ]; 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 -i ${MATCH})\r\n else\r\n echo -e \"invalid ${RELEASE_DATE}\"\r\n fi\r\nfi\r\n\r\nwget ${DOWNLOAD_URL} -O files.zip\r\n\r\nunzip files.zip\r\nrm files.zip\r\n\r\nchmod +x veloren-server-cli\r\n\r\n## generate config because there is no better way to get it.\r\nmkdir -p \/mnt\/server\/userdata\/server\/server_config\/\r\nif [ ! -f \/mnt\/server\/userdata\/server\/server_config\/settings.ron ]; then\r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/veloren\/settings.ron -O \/mnt\/server\/userdata\/server\/server_config\/settings.ron\r\n echo \"config file pulled\"\r\nfi\r\n\r\necho -e \"install complete\"", "container": "debian:bullseye-slim", "entrypoint": "bash" } @@ -42,7 +42,7 @@ "name": "Release date", "description": "The date of the version you want look here:\r\nhttps:\/\/github.com\/veloren\/veloren\/releases\r\n\r\neverything after the x86_64 but not the first -\r\nand not the .zip extention\r\n\r\nexample:\r\n2022-08-31T08_26", "env_variable": "RELEASE_DATE", - "default_value": "2022-08-31T08_26", + "default_value": "2022-09-26T13_34", "user_viewable": true, "user_editable": true, "rules": "required|string|max:40", diff --git a/game_eggs/veloren/settings.ron b/game_eggs/veloren/settings.ron new file mode 100644 index 00000000..a73936c7 --- /dev/null +++ b/game_eggs/veloren/settings.ron @@ -0,0 +1,20 @@ +( + gameserver_address: "0.0.0.0:14004", + metrics_address: "0.0.0.0:14005", + auth_server_address: Some("https://auth.veloren.net"), + max_players: 100, + world_seed: 25269, + server_name: "Veloren Alpha", + start_time: 32400, + map_file: None, + max_view_distance: Some(65), + banned_words_files: [], + max_player_group_size: 6, + client_timeout: ( + secs: 40, + nanos: 0, + ), + spawn_town: None, + safe_spawn: true, + max_player_for_kill_broadcast: Some(20), +) From 03dc87e5bdd74053a8d8db3b2edafb3bf3859be4 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Fri, 30 Sep 2022 18:27:39 +0200 Subject: [PATCH 0580/1001] Veloren move settings.rcon to new format --- game_eggs/veloren/settings.ron | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/game_eggs/veloren/settings.ron b/game_eggs/veloren/settings.ron index a73936c7..85807994 100644 --- a/game_eggs/veloren/settings.ron +++ b/game_eggs/veloren/settings.ron @@ -1,20 +1,36 @@ ( - gameserver_address: "0.0.0.0:14004", - metrics_address: "0.0.0.0:14005", + gameserver_protocols: [ + Tcp( + address: "[::]:25568", + ), + Tcp( + address: "0.0.0.0:25568", + ), + ], + metrics_address: "0.0.0.0:25569", auth_server_address: Some("https://auth.veloren.net"), max_players: 100, - world_seed: 25269, - server_name: "Veloren Alpha", - start_time: 32400, + world_seed: 230, + server_name: "A ptero hosted server", + start_time: 32400.0, map_file: None, max_view_distance: Some(65), - banned_words_files: [], max_player_group_size: 6, client_timeout: ( secs: 40, nanos: 0, ), spawn_town: None, - safe_spawn: true, - max_player_for_kill_broadcast: Some(20), -) + max_player_for_kill_broadcast: None, + calendar_mode: Auto, + gameplay: ( + battle_mode: Global(PvP), + safe_spawn: false, + explosion_burn_marks: true, + ), + moderation: ( + banned_words_files: [], + automod: false, + admins_exempt: true, + ), +) \ No newline at end of file From 0f8574c34309e5962a3fbc831a11048010d46f71 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Fri, 30 Sep 2022 18:44:15 +0200 Subject: [PATCH 0581/1001] remove download config file just coppy the exapmle and fix the reinstall issue with the -o flag for unzip --- game_eggs/veloren/egg-veloren.json | 6 ++--- game_eggs/veloren/settings.ron | 36 ------------------------------ 2 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 game_eggs/veloren/settings.ron diff --git a/game_eggs/veloren/egg-veloren.json b/game_eggs/veloren/egg-veloren.json index 0999c29c..91b51a70 100644 --- a/game_eggs/veloren/egg-veloren.json +++ b/game_eggs/veloren/egg-veloren.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-09-30T18:17:45+02:00", + "exported_at": "2022-09-30T18:42:39+02:00", "name": "Veloren", "author": "parker@parkervcp.com", "description": "Veloren is a multiplayer voxel RPG written in Rust. It is inspired by games such as Cube World, Legend of Zelda: Breath of the Wild, Dwarf Fortress and Minecraft.", @@ -15,14 +15,14 @@ "file_denylist": [], "startup": ".\/veloren-server-cli", "config": { - "files": "{\r\n \"userdata\/server\/server_config\/settings.ron\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \" gameserver_address\": \" gameserver_address: \\\"0.0.0.0:{{server.build.default.port}}\\\",\",\r\n \" metrics_address\": \" metrics_address: \\\"0.0.0.0:{{server.build.env.METRICS_PORT}}\\\",\",\r\n \" server_name\": \" server_name: \\\"{{server.build.env.SERVER_NAME}}\\\",\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"userdata\/server\/server_config\/settings.ron\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \" address\": \" address: \\\"0.0.0.0:{{server.build.default.port}}\\\",\",\r\n \" metrics_address\": \" metrics_address: \\\"0.0.0.0:{{server.build.env.METRICS_PORT}}\\\",\",\r\n \" server_name\": \" server_name: \\\"{{server.build.env.SERVER_NAME}}\\\",\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Server is ready to accept connections\"\r\n}", "logs": "{}", "stop": "shutdown graceful 10" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl wget unzip git jq\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/veloren\/veloren\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"-linux-x86_64-\" || echo \"-linux-aarch64-\")\r\nMARCH_AND_SPACES=$(echo ${VERSION} && echo ${ARCH} && echo ${RELEASE_DATE})\r\nMATCH=$(echo ${MARCH_AND_SPACES} | sed 's\/ \/\/g')\r\n\r\necho ${MATCH}\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"weekly\" ]; 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 -i ${MATCH})\r\n else\r\n echo -e \"invalid ${RELEASE_DATE}\"\r\n fi\r\nfi\r\n\r\nwget ${DOWNLOAD_URL} -O files.zip\r\n\r\nunzip files.zip\r\nrm files.zip\r\n\r\nchmod +x veloren-server-cli\r\n\r\n## generate config because there is no better way to get it.\r\nmkdir -p \/mnt\/server\/userdata\/server\/server_config\/\r\nif [ ! -f \/mnt\/server\/userdata\/server\/server_config\/settings.ron ]; then\r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/veloren\/settings.ron -O \/mnt\/server\/userdata\/server\/server_config\/settings.ron\r\n echo \"config file pulled\"\r\nfi\r\n\r\necho -e \"install complete\"", + "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl wget unzip git jq\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/veloren\/veloren\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"-linux-x86_64-\" || echo \"-linux-aarch64-\")\r\nMARCH_AND_SPACES=$(echo ${VERSION} && echo ${ARCH} && echo ${RELEASE_DATE})\r\nMATCH=$(echo ${MARCH_AND_SPACES} | sed 's\/ \/\/g')\r\n\r\necho ${MATCH}\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"weekly\" ]; 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 -i ${MATCH})\r\n else\r\n echo -e \"invalid ${RELEASE_DATE}\"\r\n fi\r\nfi\r\n\r\nwget ${DOWNLOAD_URL} -O files.zip\r\n\r\nunzip -o files.zip\r\nrm files.zip\r\n\r\nchmod +x veloren-server-cli\r\n\r\n## generate config because there is no better way to get it.\r\nmkdir -p \/mnt\/server\/userdata\/server\/server_config\/\r\nif [ ! -f \/mnt\/server\/userdata\/server\/server_config\/settings.ron ]; then\r\n cp \/mnt\/server\/userdata\/server\/server_config\/settings.template.ron \/mnt\/server\/userdata\/server\/server_config\/settings.ron\r\n echo \"config file pulled\"\r\nfi\r\n\r\necho -e \"install complete\"", "container": "debian:bullseye-slim", "entrypoint": "bash" } diff --git a/game_eggs/veloren/settings.ron b/game_eggs/veloren/settings.ron deleted file mode 100644 index 85807994..00000000 --- a/game_eggs/veloren/settings.ron +++ /dev/null @@ -1,36 +0,0 @@ -( - gameserver_protocols: [ - Tcp( - address: "[::]:25568", - ), - Tcp( - address: "0.0.0.0:25568", - ), - ], - metrics_address: "0.0.0.0:25569", - auth_server_address: Some("https://auth.veloren.net"), - max_players: 100, - world_seed: 230, - server_name: "A ptero hosted server", - start_time: 32400.0, - map_file: None, - max_view_distance: Some(65), - max_player_group_size: 6, - client_timeout: ( - secs: 40, - nanos: 0, - ), - spawn_town: None, - max_player_for_kill_broadcast: None, - calendar_mode: Auto, - gameplay: ( - battle_mode: Global(PvP), - safe_spawn: false, - explosion_burn_marks: true, - ), - moderation: ( - banned_words_files: [], - automod: false, - admins_exempt: true, - ), -) \ No newline at end of file From 534a25fce53f5edefaadea7efeda85c1157fb447 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Fri, 30 Sep 2022 19:33:04 +0200 Subject: [PATCH 0582/1001] Do it this way --- game_eggs/veloren/egg-veloren.json | 18 +++++++-------- game_eggs/veloren/settings.ron | 36 ++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 9 deletions(-) create mode 100644 game_eggs/veloren/settings.ron diff --git a/game_eggs/veloren/egg-veloren.json b/game_eggs/veloren/egg-veloren.json index 91b51a70..7b90e24c 100644 --- a/game_eggs/veloren/egg-veloren.json +++ b/game_eggs/veloren/egg-veloren.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-09-30T18:42:39+02:00", + "exported_at": "2022-09-30T19:32:46+02:00", "name": "Veloren", "author": "parker@parkervcp.com", "description": "Veloren is a multiplayer voxel RPG written in Rust. It is inspired by games such as Cube World, Legend of Zelda: Breath of the Wild, Dwarf Fortress and Minecraft.", @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl wget unzip git jq\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/veloren\/veloren\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"-linux-x86_64-\" || echo \"-linux-aarch64-\")\r\nMARCH_AND_SPACES=$(echo ${VERSION} && echo ${ARCH} && echo ${RELEASE_DATE})\r\nMATCH=$(echo ${MARCH_AND_SPACES} | sed 's\/ \/\/g')\r\n\r\necho ${MATCH}\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"weekly\" ]; 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 -i ${MATCH})\r\n else\r\n echo -e \"invalid ${RELEASE_DATE}\"\r\n fi\r\nfi\r\n\r\nwget ${DOWNLOAD_URL} -O files.zip\r\n\r\nunzip -o files.zip\r\nrm files.zip\r\n\r\nchmod +x veloren-server-cli\r\n\r\n## generate config because there is no better way to get it.\r\nmkdir -p \/mnt\/server\/userdata\/server\/server_config\/\r\nif [ ! -f \/mnt\/server\/userdata\/server\/server_config\/settings.ron ]; then\r\n cp \/mnt\/server\/userdata\/server\/server_config\/settings.template.ron \/mnt\/server\/userdata\/server\/server_config\/settings.ron\r\n echo \"config file pulled\"\r\nfi\r\n\r\necho -e \"install complete\"", + "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl wget unzip git jq\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/veloren\/veloren\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/veloren\/veloren\/releases\")\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"linux-x86_64\" || echo \"linux-aarch64\")\r\nPART=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"-linux-x86_64-\" || echo \"-linux-aarch64-\")\r\nMATCH_AND_SPACES=$(echo \"weekly\" && echo ${PART} && echo ${RELEASE_DATE})\r\nMATCH=$(echo ${MATCH_AND_SPACES} | sed 's\/ \/\/g')\r\n\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"weekly\" ]; then\r\n echo -e \"weekly\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i \"${ARCH}\" | tail -n 1)\r\nelif [ \"${VERSION}\" == \"nightly\" ]; then\r\n echo -e \"nightly\"\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"nightly\" '.[] | select(.tag_name==\"nightly\") | .assets[].browser_download_url' | grep -i \"${ARCH}\" | tail -n 1)\r\nelif [ \"${VERSION}\" == \"dated_weekly\" ]; then\r\n echo -e ${MATCH} \r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i \"${MATCH}\")\r\nelse\r\n echo -e \"something went wrong\"\r\nfi\r\n\r\necho -e \"download url: ${DOWNLOAD_URL}\"\r\nwget ${DOWNLOAD_URL} -O files.zip\r\n\r\nunzip -o files.zip\r\nrm files.zip\r\n\r\nchmod +x veloren-server-cli\r\n\r\n## generate config because there is no better way to get it.\r\nmkdir -p \/mnt\/server\/userdata\/server\/server_config\/\r\nif [ ! -f \/mnt\/server\/userdata\/server\/server_config\/settings.ron ]; then\r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/veloren\/settings.ron \/mnt\/server\/userdata\/server\/server_config\/settings.ron\r\n echo \"config file pulled\"\r\nfi\r\n\r\necho -e \"install complete\"", "container": "debian:bullseye-slim", "entrypoint": "bash" } @@ -30,22 +30,22 @@ "variables": [ { "name": "Version", - "description": "The version you want weekly or nightly", + "description": "weekly = download the latest weekly build,\r\nnightly = download the latestes nightly build,\r\ndated_weekly = download specific weekly build for that set the Weekly specific build date.", "env_variable": "VERSION", "default_value": "weekly", - "user_viewable": false, - "user_editable": false, - "rules": "required|string|in:weekly,nightly", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:weekly,nightly,dated_weekly", "field_type": "text" }, { - "name": "Release date", - "description": "The date of the version you want look here:\r\nhttps:\/\/github.com\/veloren\/veloren\/releases\r\n\r\neverything after the x86_64 but not the first -\r\nand not the .zip extention\r\n\r\nexample:\r\n2022-08-31T08_26", + "name": "Weekly specific build date", + "description": "The date of the weekly version you want. \r\nOnly used if Version is set to dated_weekly!\r\nhttps:\/\/github.com\/veloren\/veloren\/releases\r\n\r\nEverything after the x86_64 but not the first -\r\nand not the .zip extention\r\n\r\nexample:\r\n2022-08-31T08_26 or 2022-09-26T13_34", "env_variable": "RELEASE_DATE", "default_value": "2022-09-26T13_34", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:40", + "rules": "nullable|string|max:40", "field_type": "text" }, { diff --git a/game_eggs/veloren/settings.ron b/game_eggs/veloren/settings.ron new file mode 100644 index 00000000..bdff2966 --- /dev/null +++ b/game_eggs/veloren/settings.ron @@ -0,0 +1,36 @@ +( + gameserver_protocols: [ + Tcp( + address: "[::]:14004", + ), + Tcp( + address: "0.0.0.0:14004", + ), + ], + metrics_address: "127.0.0.1:14005", + auth_server_address: Some("https://auth.veloren.net"), + max_players: 100, + world_seed: 230, + server_name: "Veloren Server", + start_time: 32400.0, + map_file: None, + max_view_distance: Some(65), + max_player_group_size: 6, + client_timeout: ( + secs: 40, + nanos: 0, + ), + spawn_town: None, + max_player_for_kill_broadcast: None, + calendar_mode: Auto, + gameplay: ( + battle_mode: Global(PvP), + safe_spawn: false, + explosion_burn_marks: true, + ), + moderation: ( + banned_words_files: [], + automod: false, + admins_exempt: true, + ), +) \ No newline at end of file From 98d008b90917a38babaee2f8d2b8dc6f4619317f Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat, 1 Oct 2022 11:36:17 +0200 Subject: [PATCH 0583/1001] remove default value of Mongo admin password --- database/nosql/mongodb/egg-mongo-d-b.json | 2 +- database/nosql/mongodb/egg-mongo-d-b6.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/database/nosql/mongodb/egg-mongo-d-b.json b/database/nosql/mongodb/egg-mongo-d-b.json index 113bfe4f..facefe3f 100644 --- a/database/nosql/mongodb/egg-mongo-d-b.json +++ b/database/nosql/mongodb/egg-mongo-d-b.json @@ -43,7 +43,7 @@ "name": "Mongo Admin Password", "description": "", "env_variable": "MONGO_USER_PASS", - "default_value": "aP@55word", + "default_value": "", "user_viewable": true, "user_editable": true, "rules": "required|string", diff --git a/database/nosql/mongodb/egg-mongo-d-b6.json b/database/nosql/mongodb/egg-mongo-d-b6.json index 2e8aff43..388adcc9 100644 --- a/database/nosql/mongodb/egg-mongo-d-b6.json +++ b/database/nosql/mongodb/egg-mongo-d-b6.json @@ -42,7 +42,7 @@ "name": "Mongo Admin Password", "description": "", "env_variable": "MONGO_USER_PASS", - "default_value": "NewPa55w0rd", + "default_value": "", "user_viewable": true, "user_editable": true, "rules": "required|string", From c2346a2207621e36160fd885393614bd4946c0df Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat, 1 Oct 2022 12:37:28 +0200 Subject: [PATCH 0584/1001] sinusbot egg cleanup --- bots/discord/sinusbot/README.md | 5 +++++ bots/discord/sinusbot/egg-sinusbot.json | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/bots/discord/sinusbot/README.md b/bots/discord/sinusbot/README.md index 81ab0f0f..532de01d 100644 --- a/bots/discord/sinusbot/README.md +++ b/bots/discord/sinusbot/README.md @@ -6,6 +6,11 @@ Listen to your favorite music together with all of your friends Welcome the Simple, Elegant & great sounding TS3- and Discord-Bot! +## First startup + +On first startup wait until this message in the console appears: `TSClient quit.` Then press restart. +Now the SinusBot will fully startup and you can login to the WebUI. + ## Server Ports 1 port is required to run SinusBot. diff --git a/bots/discord/sinusbot/egg-sinusbot.json b/bots/discord/sinusbot/egg-sinusbot.json index 798f330a..a2417e16 100644 --- a/bots/discord/sinusbot/egg-sinusbot.json +++ b/bots/discord/sinusbot/egg-sinusbot.json @@ -4,25 +4,25 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-09-29T16:00:25-04:00", + "exported_at": "2022-10-01T12:31:15+02:00", "name": "Sinusbot", "author": "support@pterodactyl.io", "description": "Musicbot for Discord and Teamspeak.", "features": null, "docker_images": { - "ghcr.io\/parkervcp\/yolks:bot_sinusbot": "ghcr.io\/parkervcp\/yolks:bot_sinusbot" + "sinusbot": "ghcr.io\/parkervcp\/yolks:bot_sinusbot" }, "file_denylist": [], "startup": ".\/sinusbot --override-password=\"${OVERRIDE_PASSWORD}\"", "config": { "files": "{\r\n \"config.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"ListenPort\": \"ListenPort = {{server.build.default.port}}\",\r\n \"ListenHost\": \"ListenHost = \\\"0.0.0.0\\\"\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Initialization complete\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "startup": "{\r\n \"done\": \"Initialization complete\"\r\n}", + "logs": "{}", "stop": "^C" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Sinusbot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install ca-certificates bzip2 wget tar curl jq\r\napt -q clean all\r\n\r\n#Create needed directories\r\nmkdir -p \/mnt\/server\/TeamSpeak3-Client-linux_amd64\/plugins\r\nmkdir \/mnt\/server\/youtube-dlp\r\n\r\ncd \/mnt\/server\r\n\r\n#Download Sinusbot\r\nwget -qO - https:\/\/www.sinusbot.com\/dl\/sinusbot.current.tar.bz2 | tar xj\r\n\r\n#Download Latest TeamSpeak Client\r\nTS_VERSION=$(curl https:\/\/teamspeak.com\/versions\/client.json | jq -r '.linux.x86_64.version')\r\nTS_DL_LINK=$(curl https:\/\/teamspeak.com\/versions\/client.json | jq -r '.linux.x86_64.mirrors.\"teamspeak.com\"')\r\n\r\necho -e \"downloading teamspeak version ${TS_VERSION}\"\r\necho -e \"running 'wget ${TS_DL_LINK}'\"\r\n\r\nwget ${TS_DL_LINK}\r\n\r\n# Install TeamSpeak Client\r\nchmod 0755 TeamSpeak3-Client-linux_amd64*.run\r\n.\/TeamSpeak3-Client-linux_amd64*.run --tar xfv -C TeamSpeak3-Client-linux_amd64\r\n\r\n## Cleaning up \r\n\r\nrm TeamSpeak3-Client-linux_amd64*.run\r\n# Remove glx-integration lib\r\nrm TeamSpeak3-Client-linux_amd64\/xcbglintegrations\/libqxcb-glx-integration.so\r\n\r\n#Install Sinusbot\r\nchmod +x sinusbot\r\ncp config.ini.dist config.ini\r\nsed -i \"s|^TS3Path.*|TS3Path = \\\"\/home\/container\/TeamSpeak3-Client-linux_amd64\/ts3client_linux_amd64\\\"|g\" config.ini\r\necho 'YoutubeDLPath = \"\/home\/container\/youtube-dlp\/youtube-dlp\"' >> config.ini\r\n\r\n#Install Sinusbot plugin\r\ncp plugin\/libsoundbot_plugin.so TeamSpeak3-Client-linux_amd64\/plugins\r\n\r\n#Download youtube-dlp\r\ncd \/mnt\/server\/youtube-dlp\r\nwget https:\/\/github.com\/yt-dlp\/yt-dlp\/releases\/latest\/download\/yt-dlp -O youtube-dlp\r\nchmod a+rx youtube-dlp", + "script": "#!\/bin\/bash\r\n# Sinusbot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install ca-certificates bzip2 wget tar curl jq\r\napt -q clean all\r\n\r\n#Create needed directories\r\nmkdir -p \/mnt\/server\/TeamSpeak3-Client-linux_amd64\/plugins\r\nmkdir \/mnt\/server\/youtube-dlp\r\n\r\ncd \/mnt\/server\r\n\r\n#Download Sinusbot\r\nwget -qO - https:\/\/www.sinusbot.com\/dl\/sinusbot.current.tar.bz2 | tar xj\r\n\r\n#Download Latest TeamSpeak Client\r\nTS_VERSION=$(curl https:\/\/teamspeak.com\/versions\/client.json | jq -r '.linux.x86_64.version')\r\nTS_DL_LINK=$(curl https:\/\/teamspeak.com\/versions\/client.json | jq -r '.linux.x86_64.mirrors.\"teamspeak.com\"')\r\n\r\necho -e \"downloading teamspeak version ${TS_VERSION}\"\r\necho -e \"running 'wget ${TS_DL_LINK}'\"\r\n\r\nwget ${TS_DL_LINK}\r\n\r\n# Install TeamSpeak Client\r\nchmod 0755 TeamSpeak3-Client-linux_amd64*.run\r\n.\/TeamSpeak3-Client-linux_amd64*.run --tar xfv -C TeamSpeak3-Client-linux_amd64\r\n\r\n## Cleaning up \r\n\r\nrm TeamSpeak3-Client-linux_amd64*.run\r\n# Remove glx-integration lib\r\nrm TeamSpeak3-Client-linux_amd64\/xcbglintegrations\/libqxcb-glx-integration.so\r\n\r\n#Install Sinusbot\r\nchmod +x sinusbot\r\ncp config.ini.dist config.ini\r\nsed -i \"s|^TS3Path.*|TS3Path = \\\"\/home\/container\/TeamSpeak3-Client-linux_amd64\/ts3client_linux_amd64\\\"|g\" config.ini\r\necho 'YoutubeDLPath = \"\/home\/container\/youtube-dlp\/youtube-dlp\"' >> config.ini\r\n\r\n#Install Sinusbot plugin\r\ncp plugin\/libsoundbot_plugin.so TeamSpeak3-Client-linux_amd64\/plugins\r\n\r\n#Download youtube-dlp\r\ncd \/mnt\/server\/youtube-dlp\r\nwget https:\/\/github.com\/yt-dlp\/yt-dlp\/releases\/latest\/download\/yt-dlp -O youtube-dlp\r\nchmod a+rx youtube-dlp\r\n\r\necho \"install finished\"", "container": "ubuntu:18.04", "entrypoint": "bash" } @@ -32,7 +32,7 @@ "name": "Password", "description": "Password for admin account.", "env_variable": "OVERRIDE_PASSWORD", - "default_value": "CHANGEME", + "default_value": "", "user_viewable": true, "user_editable": true, "rules": "required|string|max:20", From 02982ec43982baeca802fae1f69a671041188afa Mon Sep 17 00:00:00 2001 From: CDE90 Date: Sat, 1 Oct 2022 18:38:21 +0100 Subject: [PATCH 0585/1001] Re-order rust versions --- generic/rust/egg-rust-generic.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/generic/rust/egg-rust-generic.json b/generic/rust/egg-rust-generic.json index ec27dcc8..f722f3dc 100644 --- a/generic/rust/egg-rust-generic.json +++ b/generic/rust/egg-rust-generic.json @@ -4,22 +4,22 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-07-25T14:36:57-04:00", + "exported_at": "2022-10-01T18:32:46+01:00", "name": "rust generic", - "author": "ethan.coward@icloud.com", + "author": "ethan@ethancoward.dev", "description": "Creates a container that runs rust with cargo.", "features": null, "docker_images": { - "ghcr.io\/parkervcp\/yolks:rust_1.31": "ghcr.io\/parkervcp\/yolks:rust_1.31", - "ghcr.io\/parkervcp\/yolks:rust_1.56": "ghcr.io\/parkervcp\/yolks:rust_1.56", + "ghcr.io\/parkervcp\/yolks:rust_latest": "ghcr.io\/parkervcp\/yolks:rust_latest", "ghcr.io\/parkervcp\/yolks:rust_1.60": "ghcr.io\/parkervcp\/yolks:rust_1.60", - "ghcr.io\/parkervcp\/yolks:rust_latest": "ghcr.io\/parkervcp\/yolks:rust_latest" + "ghcr.io\/parkervcp\/yolks:rust_1.56": "ghcr.io\/parkervcp\/yolks:rust_1.56", + "ghcr.io\/parkervcp\/yolks:rust_1.31": "ghcr.io\/parkervcp\/yolks:rust_1.31" }, "file_denylist": [], "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; cargo run --release", "config": { "files": "{}", - "startup": "{\r\n \"done\": [\r\n \"Finished\"\r\n ]\r\n}", + "startup": "{\r\n \"done\": [\r\n \"change this part\"\r\n ]\r\n}", "logs": "{}", "stop": "^C" }, From 3418b0979083536169d643b5bb94efe158fd0762 Mon Sep 17 00:00:00 2001 From: Fuggschen <64164659+Fuggschen@users.noreply.github.com> Date: Sat, 1 Oct 2022 21:59:33 +0200 Subject: [PATCH 0586/1001] Update egg-phantom-bot.json Changed the startup message because it has changed. Changed the installation script to delete the downloaded installation zip and extracted folder because another reinstall would try to install an old version if this zip still exists. --- bots/twitch/phantombot/egg-phantom-bot.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bots/twitch/phantombot/egg-phantom-bot.json b/bots/twitch/phantombot/egg-phantom-bot.json index bccbaca3..49bc0c49 100644 --- a/bots/twitch/phantombot/egg-phantom-bot.json +++ b/bots/twitch/phantombot/egg-phantom-bot.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-09-08T16:55:56+02:00", + "exported_at": "2022-10-01T21:57:23+02:00", "name": "PhantomBot", "author": "mail@wuffy.eu", "description": "PhantomBot is an actively developed open source interactive Twitch bot with a vibrant community that provides entertainment and moderation for your channel, allowing you to focus on what matters the most to you - your game and your viewers.", @@ -16,13 +16,13 @@ "startup": "java --add-opens java.base\/java.lang=ALL-UNNAMED -Djava.security.policy=config\/security -Dinteractive -Xms1m -Dfile.encoding=UTF-8 -jar PhantomBot.jar", "config": { "files": "{\r\n \"config\/botlogin.txt\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"baseport\": \"{{server.build.default.port}}\",\r\n \"channel\": \"{{server.build.env.CHANNEL_NAME}}\",\r\n \"owner\": \"{{server.build.env.CHANNEL_OWNER}}\",\r\n \"paneluser\": \"{{server.build.env.WEBPANEL_USERNAME}}\",\r\n \"panelpassword\": \"{{server.build.env.WEBPANEL_PASSWORD}}\",\r\n \"user\": \"{{server.build.env.BOT_TWITCH_USERNAME}}\",\r\n \"youtubekey\": \"{{server.build.env.YOUTUBE_API_KEY}}\",\r\n \"discord_token\": \"{{server.build.env.DISCORD_BOT_TOKEN}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Connecting to Twitch WS-IRC Server\"\r\n}", + "startup": "{\r\n \"done\": \"Joined \"\r\n}", "logs": "{}", "stop": "exit" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# PhantomBot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt -y --no-install-recommends install curl wget ca-certificates unzip\r\n\r\ncd \/tmp\r\n\r\n# Fetching latest github release\r\nif [ -z \"${RELEASE_VERSION}\" ] || [ \"${RELEASE_VERSION}\" == \"master\" ]; then\r\n echo -e \"Using latest Github Master version\"\r\n DOWNLOAD_URL=https:\/\/raw.githubusercontent.com\/PhantomBot\/nightly-build\/master\/PhantomBot-nightly-lin.zip\r\nelse\r\n if [ -z \"${RELEASE_VERSION}\" ] || [ \"${RELEASE_VERSION}\" == \"latest\" ]; then\r\n echo -e \"Using latest release version\"\r\n RELEASE_VERSION=$(curl -s \"https:\/\/api.github.com\/repos\/PhantomBot\/PhantomBot\/releases\/latest\" | grep -e '\"tag_name\"' | sed -E 's\/.*\"([^\"]+)\".*\/\\1\/' | sed 's\/^.\/\/')\r\n fi\r\n DOWNLOAD_URL=https:\/\/github.com\/PhantomBot\/PhantomBot\/releases\/download\/v${RELEASE_VERSION}\/PhantomBot-${RELEASE_VERSION}-lin.zip\r\n echo -e \"${DOWNLOAD_URL}\"\r\nfi\r\n\r\n# Download files\r\ncd \/mnt\/server\r\nwget ${DOWNLOAD_URL}\r\nunzip -o PhantomBot-*.zip\r\n\r\n# Move unzipped files into the server folder\r\ncp -f -r .\/PhantomBot-*\/* \/mnt\/server\/\r\n\r\n# Creating default config\r\nif [ ! -f \/mnt\/server\/config\/botlogin.txt ]; then\r\n echo -e \"Creating config\/botlogin.txt\"\r\n cat << EOF > \/mnt\/server\/config\/botlogin.txt\r\n #PhantomBot Configuration File\r\n #\r\n # Here is a list wiht all config values:\r\n # https:\/\/community.phantom.bot\/t\/settings-for-botlogin-txt\/78\r\n #\r\n apioauth=\r\n baseport=\r\n channel=\r\n oauth=\r\n owner=\r\n panelpassword=\r\n paneluser=\r\n user=\r\n youtubekey=\r\n discord_token=\r\nEOF\r\nfi", + "script": "#!\/bin\/bash\r\n# PhantomBot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt -y --no-install-recommends install curl wget ca-certificates unzip\r\n\r\ncd \/tmp\r\n\r\n# Fetching latest github release\r\nif [ -z \"${RELEASE_VERSION}\" ] || [ \"${RELEASE_VERSION}\" == \"master\" ]; then\r\n echo -e \"Using latest Github Master version\"\r\n DOWNLOAD_URL=https:\/\/raw.githubusercontent.com\/PhantomBot\/nightly-build\/master\/PhantomBot-nightly-lin.zip\r\nelse\r\n if [ -z \"${RELEASE_VERSION}\" ] || [ \"${RELEASE_VERSION}\" == \"latest\" ]; then\r\n echo -e \"Using latest release version\"\r\n RELEASE_VERSION=$(curl -s \"https:\/\/api.github.com\/repos\/PhantomBot\/PhantomBot\/releases\/latest\" | grep -e '\"tag_name\"' | sed -E 's\/.*\"([^\"]+)\".*\/\\1\/' | sed 's\/^.\/\/')\r\n fi\r\n DOWNLOAD_URL=https:\/\/github.com\/PhantomBot\/PhantomBot\/releases\/download\/v${RELEASE_VERSION}\/PhantomBot-${RELEASE_VERSION}-lin.zip\r\n echo -e \"${DOWNLOAD_URL}\"\r\nfi\r\n\r\n# Download files\r\ncd \/mnt\/server\r\nwget ${DOWNLOAD_URL}\r\n\r\n# Unzip files and delete the archive\r\nunzip -o PhantomBot-*.zip\r\nrm PhantomBot-*.zip\r\n\r\n# Move unzipped files into the server folder and delete the folder \r\ncp -f -r .\/PhantomBot-*\/* \/mnt\/server\/\r\nrm -rf PhantomBot-*\/\r\n\r\n# Creating default config\r\nif [ ! -f \/mnt\/server\/config\/botlogin.txt ]; then\r\n echo -e \"Creating config\/botlogin.txt\"\r\n cat << EOF > \/mnt\/server\/config\/botlogin.txt\r\n #PhantomBot Configuration File\r\n #\r\n # Here is a list wiht all config values:\r\n # https:\/\/community.phantom.bot\/t\/settings-for-botlogin-txt\/78\r\n #\r\n apioauth=\r\n baseport=\r\n channel=\r\n oauth=\r\n owner=\r\n panelpassword=\r\n paneluser=\r\n user=\r\n youtubekey=\r\n discord_token=\r\nEOF\r\nfi", "container": "debian:buster-slim", "entrypoint": "bash" } From d4b9017f1855bb2a4c8ae1bd06255638b8725c55 Mon Sep 17 00:00:00 2001 From: CDE90 Date: Sun, 2 Oct 2022 16:32:16 +0100 Subject: [PATCH 0587/1001] add redis 7 egg --- database/redis/redis-7/README.md | 23 + database/redis/redis-7/egg-redis-7.json | 42 + database/redis/redis-7/redis.conf | 2276 +++++++++++++++++++++++ 3 files changed, 2341 insertions(+) create mode 100644 database/redis/redis-7/README.md create mode 100644 database/redis/redis-7/egg-redis-7.json create mode 100644 database/redis/redis-7/redis.conf diff --git a/database/redis/redis-7/README.md b/database/redis/redis-7/README.md new file mode 100644 index 00000000..d425ff64 --- /dev/null +++ b/database/redis/redis-7/README.md @@ -0,0 +1,23 @@ +# Redis + +## From their [Website](https://redis.io/) + +Redis is an open source (BSD licensed), in-memory data structure store, used as a database, cache and message broker. + +## Server Startup + +You must first authenticate before trying to execute commands, to do this run `AUTH ` (without the `<>`). This should be the same as the password set in the `SERVER_PASSWORD` variable. + +## Minimum RAM warning + +It's recommended to have 4gb of RAM for redis + +See here + +## Server Ports + +Ports required to run the server in a table format. + +| Port | default | +|---------|---------| +| Server | 6379 | diff --git a/database/redis/redis-7/egg-redis-7.json b/database/redis/redis-7/egg-redis-7.json new file mode 100644 index 00000000..e5109abc --- /dev/null +++ b/database/redis/redis-7/egg-redis-7.json @@ -0,0 +1,42 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2022-10-02T16:30:14+01:00", + "name": "Redis-7", + "author": "parker@parkervcp.com", + "description": "Redis is an open source (BSD licensed), in-memory data structure store, used as a database, cache and message broker. It supports data structures such as strings, hashes, lists, sets, sorted sets with range queries, bitmaps, hyperloglogs, geospatial indexes with radius queries and streams.", + "features": null, + "docker_images": { + "ghcr.io\/parkervcp\/yolks:redis_7": "ghcr.io\/parkervcp\/yolks:redis_7" + }, + "file_denylist": [], + "startup": "\/usr\/local\/bin\/redis-server \/home\/container\/redis.conf --save 60 1 --dir \/home\/container\/ --bind 0.0.0.0 --port {{SERVER_PORT}} --requirepass {{SERVER_PASSWORD}} --maxmemory {{SERVER_MEMORY}}mb --daemonize yes && redis-cli -p {{SERVER_PORT}}; redis-cli -p {{SERVER_PORT}} -a {{SERVER_PASSWORD}} shutdown save", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Configuration loaded\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/ash\r\n# Redis Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napk add --no-cache curl\r\n\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir \/mnt\/server\/\r\nfi\r\n\r\ncd \/mnt\/server\/\r\n\r\nif [ ! -d \/mnt\/server\/redis.conf ]; then\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/redis\/redis-7\/redis.conf -o redis.conf\r\nfi\r\n\r\nsleep 5\r\necho -e \"Install complete. Made this to not have issues.\"", + "container": "alpine:3.10", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Redis Password", + "description": "The password redis should use to secure the server.", + "env_variable": "SERVER_PASSWORD", + "default_value": "P@55w0rd", + "user_viewable": true, + "user_editable": true, + "rules": "required|string", + "field_type": "text" + } + ] +} \ No newline at end of file diff --git a/database/redis/redis-7/redis.conf b/database/redis/redis-7/redis.conf new file mode 100644 index 00000000..c1d7622f --- /dev/null +++ b/database/redis/redis-7/redis.conf @@ -0,0 +1,2276 @@ +# Redis configuration file example. +# +# Note that in order to read the configuration file, Redis must be +# started with the file path as first argument: +# +# ./redis-server /path/to/redis.conf + +# Note on units: when memory size is needed, it is possible to specify +# it in the usual form of 1k 5GB 4M and so forth: +# +# 1k => 1000 bytes +# 1kb => 1024 bytes +# 1m => 1000000 bytes +# 1mb => 1024*1024 bytes +# 1g => 1000000000 bytes +# 1gb => 1024*1024*1024 bytes +# +# units are case insensitive so 1GB 1Gb 1gB are all the same. + +################################## INCLUDES ################################### + +# Include one or more other config files here. This is useful if you +# have a standard template that goes to all Redis servers but also need +# to customize a few per-server settings. Include files can include +# other files, so use this wisely. +# +# Note that option "include" won't be rewritten by command "CONFIG REWRITE" +# from admin or Redis Sentinel. Since Redis always uses the last processed +# line as value of a configuration directive, you'd better put includes +# at the beginning of this file to avoid overwriting config change at runtime. +# +# If instead you are interested in using includes to override configuration +# options, it is better to use include as the last line. +# +# Included paths may contain wildcards. All files matching the wildcards will +# be included in alphabetical order. +# Note that if an include path contains a wildcards but no files match it when +# the server is started, the include statement will be ignored and no error will +# be emitted. It is safe, therefore, to include wildcard files from empty +# directories. +# +# include /path/to/local.conf +# include /path/to/other.conf +# include /path/to/fragments/*.conf +# + +################################## MODULES ##################################### + +# Load modules at startup. If the server is not able to load modules +# it will abort. It is possible to use multiple loadmodule directives. +# +# loadmodule /path/to/my_module.so +# loadmodule /path/to/other_module.so + +################################## NETWORK ##################################### + +# By default, if no "bind" configuration directive is specified, Redis listens +# for connections from all available network interfaces on the host machine. +# It is possible to listen to just one or multiple selected interfaces using +# the "bind" configuration directive, followed by one or more IP addresses. +# Each address can be prefixed by "-", which means that redis will not fail to +# start if the address is not available. Being not available only refers to +# addresses that does not correspond to any network interface. Addresses that +# are already in use will always fail, and unsupported protocols will always BE +# silently skipped. +# +# Examples: +# +# bind 192.168.1.100 10.0.0.1 # listens on two specific IPv4 addresses +# bind 127.0.0.1 ::1 # listens on loopback IPv4 and IPv6 +# bind * -::* # like the default, all available interfaces +# +# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the +# internet, binding to all the interfaces is dangerous and will expose the +# instance to everybody on the internet. So by default we uncomment the +# following bind directive, that will force Redis to listen only on the +# IPv4 and IPv6 (if available) loopback interface addresses (this means Redis +# will only be able to accept client connections from the same host that it is +# running on). +# +# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES +# COMMENT OUT THE FOLLOWING LINE. +# +# You will also need to set a password unless you explicitly disable protected +# mode. +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +bind 127.0.0.1 -::1 + +# By default, outgoing connections (from replica to master, from Sentinel to +# instances, cluster bus, etc.) are not bound to a specific local address. In +# most cases, this means the operating system will handle that based on routing +# and the interface through which the connection goes out. +# +# Using bind-source-addr it is possible to configure a specific address to bind +# to, which may also affect how the connection gets routed. +# +# Example: +# +# bind-source-addr 10.0.0.1 + +# Protected mode is a layer of security protection, in order to avoid that +# Redis instances left open on the internet are accessed and exploited. +# +# When protected mode is on and the default user has no password, the server +# only accepts local connections from the IPv4 address (127.0.0.1), IPv6 address +# (::1) or Unix domain sockets. +# +# By default protected mode is enabled. You should disable it only if +# you are sure you want clients from other hosts to connect to Redis +# even if no authentication is configured. +protected-mode yes + +# Redis uses default hardened security configuration directives to reduce the +# attack surface on innocent users. Therefore, several sensitive configuration +# directives are immutable, and some potentially-dangerous commands are blocked. +# +# Configuration directives that control files that Redis writes to (e.g., 'dir' +# and 'dbfilename') and that aren't usually modified during runtime +# are protected by making them immutable. +# +# Commands that can increase the attack surface of Redis and that aren't usually +# called by users are blocked by default. +# +# These can be exposed to either all connections or just local ones by setting +# each of the configs listed below to either of these values: +# +# no - Block for any connection (remain immutable) +# yes - Allow for any connection (no protection) +# local - Allow only for local connections. Ones originating from the +# IPv4 address (127.0.0.1), IPv6 address (::1) or Unix domain sockets. +# +# enable-protected-configs no +# enable-debug-command no +# enable-module-command no + +# Accept connections on the specified port, default is 6379 (IANA #815344). +# If port 0 is specified Redis will not listen on a TCP socket. +port 6379 + +# TCP listen() backlog. +# +# In high requests-per-second environments you need a high backlog in order +# to avoid slow clients connection issues. Note that the Linux kernel +# will silently truncate it to the value of /proc/sys/net/core/somaxconn so +# make sure to raise both the value of somaxconn and tcp_max_syn_backlog +# in order to get the desired effect. +tcp-backlog 511 + +# Unix socket. +# +# Specify the path for the Unix socket that will be used to listen for +# incoming connections. There is no default, so Redis will not listen +# on a unix socket when not specified. +# +# unixsocket /run/redis.sock +# unixsocketperm 700 + +# Close the connection after a client is idle for N seconds (0 to disable) +timeout 0 + +# TCP keepalive. +# +# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence +# of communication. This is useful for two reasons: +# +# 1) Detect dead peers. +# 2) Force network equipment in the middle to consider the connection to be +# alive. +# +# On Linux, the specified value (in seconds) is the period used to send ACKs. +# Note that to close the connection the double of the time is needed. +# On other kernels the period depends on the kernel configuration. +# +# A reasonable value for this option is 300 seconds, which is the new +# Redis default starting with Redis 3.2.1. +tcp-keepalive 300 + +# Apply OS-specific mechanism to mark the listening socket with the specified +# ID, to support advanced routing and filtering capabilities. +# +# On Linux, the ID represents a connection mark. +# On FreeBSD, the ID represents a socket cookie ID. +# On OpenBSD, the ID represents a route table ID. +# +# The default value is 0, which implies no marking is required. +# socket-mark-id 0 + +################################# TLS/SSL ##################################### + +# By default, TLS/SSL is disabled. To enable it, the "tls-port" configuration +# directive can be used to define TLS-listening ports. To enable TLS on the +# default port, use: +# +# port 0 +# tls-port 6379 + +# Configure a X.509 certificate and private key to use for authenticating the +# server to connected clients, masters or cluster peers. These files should be +# PEM formatted. +# +# tls-cert-file redis.crt +# tls-key-file redis.key +# +# If the key file is encrypted using a passphrase, it can be included here +# as well. +# +# tls-key-file-pass secret + +# Normally Redis uses the same certificate for both server functions (accepting +# connections) and client functions (replicating from a master, establishing +# cluster bus connections, etc.). +# +# Sometimes certificates are issued with attributes that designate them as +# client-only or server-only certificates. In that case it may be desired to use +# different certificates for incoming (server) and outgoing (client) +# connections. To do that, use the following directives: +# +# tls-client-cert-file client.crt +# tls-client-key-file client.key +# +# If the key file is encrypted using a passphrase, it can be included here +# as well. +# +# tls-client-key-file-pass secret + +# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange, +# required by older versions of OpenSSL (<3.0). Newer versions do not require +# this configuration and recommend against it. +# +# tls-dh-params-file redis.dh + +# Configure a CA certificate(s) bundle or directory to authenticate TLS/SSL +# clients and peers. Redis requires an explicit configuration of at least one +# of these, and will not implicitly use the system wide configuration. +# +# tls-ca-cert-file ca.crt +# tls-ca-cert-dir /etc/ssl/certs + +# By default, clients (including replica servers) on a TLS port are required +# to authenticate using valid client side certificates. +# +# If "no" is specified, client certificates are not required and not accepted. +# If "optional" is specified, client certificates are accepted and must be +# valid if provided, but are not required. +# +# tls-auth-clients no +# tls-auth-clients optional + +# By default, a Redis replica does not attempt to establish a TLS connection +# with its master. +# +# Use the following directive to enable TLS on replication links. +# +# tls-replication yes + +# By default, the Redis Cluster bus uses a plain TCP connection. To enable +# TLS for the bus protocol, use the following directive: +# +# tls-cluster yes + +# By default, only TLSv1.2 and TLSv1.3 are enabled and it is highly recommended +# that older formally deprecated versions are kept disabled to reduce the attack surface. +# You can explicitly specify TLS versions to support. +# Allowed values are case insensitive and include "TLSv1", "TLSv1.1", "TLSv1.2", +# "TLSv1.3" (OpenSSL >= 1.1.1) or any combination. +# To enable only TLSv1.2 and TLSv1.3, use: +# +# tls-protocols "TLSv1.2 TLSv1.3" + +# Configure allowed ciphers. See the ciphers(1ssl) manpage for more information +# about the syntax of this string. +# +# Note: this configuration applies only to <= TLSv1.2. +# +# tls-ciphers DEFAULT:!MEDIUM + +# Configure allowed TLSv1.3 ciphersuites. See the ciphers(1ssl) manpage for more +# information about the syntax of this string, and specifically for TLSv1.3 +# ciphersuites. +# +# tls-ciphersuites TLS_CHACHA20_POLY1305_SHA256 + +# When choosing a cipher, use the server's preference instead of the client +# preference. By default, the server follows the client's preference. +# +# tls-prefer-server-ciphers yes + +# By default, TLS session caching is enabled to allow faster and less expensive +# reconnections by clients that support it. Use the following directive to disable +# caching. +# +# tls-session-caching no + +# Change the default number of TLS sessions cached. A zero value sets the cache +# to unlimited size. The default size is 20480. +# +# tls-session-cache-size 5000 + +# Change the default timeout of cached TLS sessions. The default timeout is 300 +# seconds. +# +# tls-session-cache-timeout 60 + +################################# GENERAL ##################################### + +# By default Redis does not run as a daemon. Use 'yes' if you need it. +# Note that Redis will write a pid file in /var/run/redis.pid when daemonized. +# When Redis is supervised by upstart or systemd, this parameter has no impact. +daemonize no + +# If you run Redis from upstart or systemd, Redis can interact with your +# supervision tree. Options: +# supervised no - no supervision interaction +# supervised upstart - signal upstart by putting Redis into SIGSTOP mode +# requires "expect stop" in your upstart job config +# supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET +# on startup, and updating Redis status on a regular +# basis. +# supervised auto - detect upstart or systemd method based on +# UPSTART_JOB or NOTIFY_SOCKET environment variables +# Note: these supervision methods only signal "process is ready." +# They do not enable continuous pings back to your supervisor. +# +# The default is "no". To run under upstart/systemd, you can simply uncomment +# the line below: +# +# supervised auto + +# If a pid file is specified, Redis writes it where specified at startup +# and removes it at exit. +# +# When the server runs non daemonized, no pid file is created if none is +# specified in the configuration. When the server is daemonized, the pid file +# is used even if not specified, defaulting to "/var/run/redis.pid". +# +# Creating a pid file is best effort: if Redis is not able to create it +# nothing bad happens, the server will start and run normally. +# +# Note that on modern Linux systems "/run/redis.pid" is more conforming +# and should be used instead. +pidfile /var/run/redis_6379.pid + +# Specify the server verbosity level. +# This can be one of: +# debug (a lot of information, useful for development/testing) +# verbose (many rarely useful info, but not a mess like the debug level) +# notice (moderately verbose, what you want in production probably) +# warning (only very important / critical messages are logged) +loglevel notice + +# Specify the log file name. Also the empty string can be used to force +# Redis to log on the standard output. Note that if you use standard +# output for logging but daemonize, logs will be sent to /dev/null +logfile "" + +# To enable logging to the system logger, just set 'syslog-enabled' to yes, +# and optionally update the other syslog parameters to suit your needs. +# syslog-enabled no + +# Specify the syslog identity. +# syslog-ident redis + +# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. +# syslog-facility local0 + +# To disable the built in crash log, which will possibly produce cleaner core +# dumps when they are needed, uncomment the following: +# +# crash-log-enabled no + +# To disable the fast memory check that's run as part of the crash log, which +# will possibly let redis terminate sooner, uncomment the following: +# +# crash-memcheck-enabled no + +# Set the number of databases. The default database is DB 0, you can select +# a different one on a per-connection basis using SELECT where +# dbid is a number between 0 and 'databases'-1 +databases 16 + +# By default Redis shows an ASCII art logo only when started to log to the +# standard output and if the standard output is a TTY and syslog logging is +# disabled. Basically this means that normally a logo is displayed only in +# interactive sessions. +# +# However it is possible to force the pre-4.0 behavior and always show a +# ASCII art logo in startup logs by setting the following option to yes. +always-show-logo no + +# By default, Redis modifies the process title (as seen in 'top' and 'ps') to +# provide some runtime information. It is possible to disable this and leave +# the process name as executed by setting the following to no. +set-proc-title yes + +# When changing the process title, Redis uses the following template to construct +# the modified title. +# +# Template variables are specified in curly brackets. The following variables are +# supported: +# +# {title} Name of process as executed if parent, or type of child process. +# {listen-addr} Bind address or '*' followed by TCP or TLS port listening on, or +# Unix socket if only that's available. +# {server-mode} Special mode, i.e. "[sentinel]" or "[cluster]". +# {port} TCP port listening on, or 0. +# {tls-port} TLS port listening on, or 0. +# {unixsocket} Unix domain socket listening on, or "". +# {config-file} Name of configuration file used. +# +proc-title-template "{title} {listen-addr} {server-mode}" + +################################ SNAPSHOTTING ################################ + +# Save the DB to disk. +# +# save [ ...] +# +# Redis will save the DB if the given number of seconds elapsed and it +# surpassed the given number of write operations against the DB. +# +# Snapshotting can be completely disabled with a single empty string argument +# as in following example: +# +# save "" +# +# Unless specified otherwise, by default Redis will save the DB: +# * After 3600 seconds (an hour) if at least 1 change was performed +# * After 300 seconds (5 minutes) if at least 100 changes were performed +# * After 60 seconds if at least 10000 changes were performed +# +# You can set these explicitly by uncommenting the following line. +# +# save 3600 1 300 100 60 10000 + +# By default Redis will stop accepting writes if RDB snapshots are enabled +# (at least one save point) and the latest background save failed. +# This will make the user aware (in a hard way) that data is not persisting +# on disk properly, otherwise chances are that no one will notice and some +# disaster will happen. +# +# If the background saving process will start working again Redis will +# automatically allow writes again. +# +# However if you have setup your proper monitoring of the Redis server +# and persistence, you may want to disable this feature so that Redis will +# continue to work as usual even if there are problems with disk, +# permissions, and so forth. +stop-writes-on-bgsave-error yes + +# Compress string objects using LZF when dump .rdb databases? +# By default compression is enabled as it's almost always a win. +# If you want to save some CPU in the saving child set it to 'no' but +# the dataset will likely be bigger if you have compressible values or keys. +rdbcompression yes + +# Since version 5 of RDB a CRC64 checksum is placed at the end of the file. +# This makes the format more resistant to corruption but there is a performance +# hit to pay (around 10%) when saving and loading RDB files, so you can disable it +# for maximum performances. +# +# RDB files created with checksum disabled have a checksum of zero that will +# tell the loading code to skip the check. +rdbchecksum yes + +# Enables or disables full sanitization checks for ziplist and listpack etc when +# loading an RDB or RESTORE payload. This reduces the chances of a assertion or +# crash later on while processing commands. +# Options: +# no - Never perform full sanitization +# yes - Always perform full sanitization +# clients - Perform full sanitization only for user connections. +# Excludes: RDB files, RESTORE commands received from the master +# connection, and client connections which have the +# skip-sanitize-payload ACL flag. +# The default should be 'clients' but since it currently affects cluster +# resharding via MIGRATE, it is temporarily set to 'no' by default. +# +# sanitize-dump-payload no + +# The filename where to dump the DB +dbfilename dump.rdb + +# Remove RDB files used by replication in instances without persistence +# enabled. By default this option is disabled, however there are environments +# where for regulations or other security concerns, RDB files persisted on +# disk by masters in order to feed replicas, or stored on disk by replicas +# in order to load them for the initial synchronization, should be deleted +# ASAP. Note that this option ONLY WORKS in instances that have both AOF +# and RDB persistence disabled, otherwise is completely ignored. +# +# An alternative (and sometimes better) way to obtain the same effect is +# to use diskless replication on both master and replicas instances. However +# in the case of replicas, diskless is not always an option. +rdb-del-sync-files no + +# The working directory. +# +# The DB will be written inside this directory, with the filename specified +# above using the 'dbfilename' configuration directive. +# +# The Append Only File will also be created inside this directory. +# +# Note that you must specify a directory here, not a file name. +dir ./ + +################################# REPLICATION ################################# + +# Master-Replica replication. Use replicaof to make a Redis instance a copy of +# another Redis server. A few things to understand ASAP about Redis replication. +# +# +------------------+ +---------------+ +# | Master | ---> | Replica | +# | (receive writes) | | (exact copy) | +# +------------------+ +---------------+ +# +# 1) Redis replication is asynchronous, but you can configure a master to +# stop accepting writes if it appears to be not connected with at least +# a given number of replicas. +# 2) Redis replicas are able to perform a partial resynchronization with the +# master if the replication link is lost for a relatively small amount of +# time. You may want to configure the replication backlog size (see the next +# sections of this file) with a sensible value depending on your needs. +# 3) Replication is automatic and does not need user intervention. After a +# network partition replicas automatically try to reconnect to masters +# and resynchronize with them. +# +# replicaof + +# If the master is password protected (using the "requirepass" configuration +# directive below) it is possible to tell the replica to authenticate before +# starting the replication synchronization process, otherwise the master will +# refuse the replica request. +# +# masterauth +# +# However this is not enough if you are using Redis ACLs (for Redis version +# 6 or greater), and the default user is not capable of running the PSYNC +# command and/or other commands needed for replication. In this case it's +# better to configure a special user to use with replication, and specify the +# masteruser configuration as such: +# +# masteruser +# +# When masteruser is specified, the replica will authenticate against its +# master using the new AUTH form: AUTH . + +# When a replica loses its connection with the master, or when the replication +# is still in progress, the replica can act in two different ways: +# +# 1) if replica-serve-stale-data is set to 'yes' (the default) the replica will +# still reply to client requests, possibly with out of date data, or the +# data set may just be empty if this is the first synchronization. +# +# 2) If replica-serve-stale-data is set to 'no' the replica will reply with error +# "MASTERDOWN Link with MASTER is down and replica-serve-stale-data is set to 'no'" +# to all data access commands, excluding commands such as: +# INFO, REPLICAOF, AUTH, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, +# UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBLISH, PUBSUB, COMMAND, POST, +# HOST and LATENCY. +# +replica-serve-stale-data yes + +# You can configure a replica instance to accept writes or not. Writing against +# a replica instance may be useful to store some ephemeral data (because data +# written on a replica will be easily deleted after resync with the master) but +# may also cause problems if clients are writing to it because of a +# misconfiguration. +# +# Since Redis 2.6 by default replicas are read-only. +# +# Note: read only replicas are not designed to be exposed to untrusted clients +# on the internet. It's just a protection layer against misuse of the instance. +# Still a read only replica exports by default all the administrative commands +# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve +# security of read only replicas using 'rename-command' to shadow all the +# administrative / dangerous commands. +replica-read-only yes + +# Replication SYNC strategy: disk or socket. +# +# New replicas and reconnecting replicas that are not able to continue the +# replication process just receiving differences, need to do what is called a +# "full synchronization". An RDB file is transmitted from the master to the +# replicas. +# +# The transmission can happen in two different ways: +# +# 1) Disk-backed: The Redis master creates a new process that writes the RDB +# file on disk. Later the file is transferred by the parent +# process to the replicas incrementally. +# 2) Diskless: The Redis master creates a new process that directly writes the +# RDB file to replica sockets, without touching the disk at all. +# +# With disk-backed replication, while the RDB file is generated, more replicas +# can be queued and served with the RDB file as soon as the current child +# producing the RDB file finishes its work. With diskless replication instead +# once the transfer starts, new replicas arriving will be queued and a new +# transfer will start when the current one terminates. +# +# When diskless replication is used, the master waits a configurable amount of +# time (in seconds) before starting the transfer in the hope that multiple +# replicas will arrive and the transfer can be parallelized. +# +# With slow disks and fast (large bandwidth) networks, diskless replication +# works better. +repl-diskless-sync yes + +# When diskless replication is enabled, it is possible to configure the delay +# the server waits in order to spawn the child that transfers the RDB via socket +# to the replicas. +# +# This is important since once the transfer starts, it is not possible to serve +# new replicas arriving, that will be queued for the next RDB transfer, so the +# server waits a delay in order to let more replicas arrive. +# +# The delay is specified in seconds, and by default is 5 seconds. To disable +# it entirely just set it to 0 seconds and the transfer will start ASAP. +repl-diskless-sync-delay 5 + +# When diskless replication is enabled with a delay, it is possible to let +# the replication start before the maximum delay is reached if the maximum +# number of replicas expected have connected. Default of 0 means that the +# maximum is not defined and Redis will wait the full delay. +repl-diskless-sync-max-replicas 0 + +# ----------------------------------------------------------------------------- +# WARNING: RDB diskless load is experimental. Since in this setup the replica +# does not immediately store an RDB on disk, it may cause data loss during +# failovers. RDB diskless load + Redis modules not handling I/O reads may also +# cause Redis to abort in case of I/O errors during the initial synchronization +# stage with the master. Use only if you know what you are doing. +# ----------------------------------------------------------------------------- +# +# Replica can load the RDB it reads from the replication link directly from the +# socket, or store the RDB to a file and read that file after it was completely +# received from the master. +# +# In many cases the disk is slower than the network, and storing and loading +# the RDB file may increase replication time (and even increase the master's +# Copy on Write memory and replica buffers). +# However, parsing the RDB file directly from the socket may mean that we have +# to flush the contents of the current database before the full rdb was +# received. For this reason we have the following options: +# +# "disabled" - Don't use diskless load (store the rdb file to the disk first) +# "on-empty-db" - Use diskless load only when it is completely safe. +# "swapdb" - Keep current db contents in RAM while parsing the data directly +# from the socket. Replicas in this mode can keep serving current +# data set while replication is in progress, except for cases where +# they can't recognize master as having a data set from same +# replication history. +# Note that this requires sufficient memory, if you don't have it, +# you risk an OOM kill. +repl-diskless-load disabled + +# Master send PINGs to its replicas in a predefined interval. It's possible to +# change this interval with the repl_ping_replica_period option. The default +# value is 10 seconds. +# +# repl-ping-replica-period 10 + +# The following option sets the replication timeout for: +# +# 1) Bulk transfer I/O during SYNC, from the point of view of replica. +# 2) Master timeout from the point of view of replicas (data, pings). +# 3) Replica timeout from the point of view of masters (REPLCONF ACK pings). +# +# It is important to make sure that this value is greater than the value +# specified for repl-ping-replica-period otherwise a timeout will be detected +# every time there is low traffic between the master and the replica. The default +# value is 60 seconds. +# +# repl-timeout 60 + +# Disable TCP_NODELAY on the replica socket after SYNC? +# +# If you select "yes" Redis will use a smaller number of TCP packets and +# less bandwidth to send data to replicas. But this can add a delay for +# the data to appear on the replica side, up to 40 milliseconds with +# Linux kernels using a default configuration. +# +# If you select "no" the delay for data to appear on the replica side will +# be reduced but more bandwidth will be used for replication. +# +# By default we optimize for low latency, but in very high traffic conditions +# or when the master and replicas are many hops away, turning this to "yes" may +# be a good idea. +repl-disable-tcp-nodelay no + +# Set the replication backlog size. The backlog is a buffer that accumulates +# replica data when replicas are disconnected for some time, so that when a +# replica wants to reconnect again, often a full resync is not needed, but a +# partial resync is enough, just passing the portion of data the replica +# missed while disconnected. +# +# The bigger the replication backlog, the longer the replica can endure the +# disconnect and later be able to perform a partial resynchronization. +# +# The backlog is only allocated if there is at least one replica connected. +# +# repl-backlog-size 1mb + +# After a master has no connected replicas for some time, the backlog will be +# freed. The following option configures the amount of seconds that need to +# elapse, starting from the time the last replica disconnected, for the backlog +# buffer to be freed. +# +# Note that replicas never free the backlog for timeout, since they may be +# promoted to masters later, and should be able to correctly "partially +# resynchronize" with other replicas: hence they should always accumulate backlog. +# +# A value of 0 means to never release the backlog. +# +# repl-backlog-ttl 3600 + +# The replica priority is an integer number published by Redis in the INFO +# output. It is used by Redis Sentinel in order to select a replica to promote +# into a master if the master is no longer working correctly. +# +# A replica with a low priority number is considered better for promotion, so +# for instance if there are three replicas with priority 10, 100, 25 Sentinel +# will pick the one with priority 10, that is the lowest. +# +# However a special priority of 0 marks the replica as not able to perform the +# role of master, so a replica with priority of 0 will never be selected by +# Redis Sentinel for promotion. +# +# By default the priority is 100. +replica-priority 100 + +# The propagation error behavior controls how Redis will behave when it is +# unable to handle a command being processed in the replication stream from a master +# or processed while reading from an AOF file. Errors that occur during propagation +# are unexpected, and can cause data inconsistency. However, there are edge cases +# in earlier versions of Redis where it was possible for the server to replicate or persist +# commands that would fail on future versions. For this reason the default behavior +# is to ignore such errors and continue processing commands. +# +# If an application wants to ensure there is no data divergence, this configuration +# should be set to 'panic' instead. The value can also be set to 'panic-on-replicas' +# to only panic when a replica encounters an error on the replication stream. One of +# these two panic values will become the default value in the future once there are +# sufficient safety mechanisms in place to prevent false positive crashes. +# +# propagation-error-behavior ignore + +# Replica ignore disk write errors controls the behavior of a replica when it is +# unable to persist a write command received from its master to disk. By default, +# this configuration is set to 'no' and will crash the replica in this condition. +# It is not recommended to change this default, however in order to be compatible +# with older versions of Redis this config can be toggled to 'yes' which will just +# log a warning and execute the write command it got from the master. +# +# replica-ignore-disk-write-errors no + +# ----------------------------------------------------------------------------- +# By default, Redis Sentinel includes all replicas in its reports. A replica +# can be excluded from Redis Sentinel's announcements. An unannounced replica +# will be ignored by the 'sentinel replicas ' command and won't be +# exposed to Redis Sentinel's clients. +# +# This option does not change the behavior of replica-priority. Even with +# replica-announced set to 'no', the replica can be promoted to master. To +# prevent this behavior, set replica-priority to 0. +# +# replica-announced yes + +# It is possible for a master to stop accepting writes if there are less than +# N replicas connected, having a lag less or equal than M seconds. +# +# The N replicas need to be in "online" state. +# +# The lag in seconds, that must be <= the specified value, is calculated from +# the last ping received from the replica, that is usually sent every second. +# +# This option does not GUARANTEE that N replicas will accept the write, but +# will limit the window of exposure for lost writes in case not enough replicas +# are available, to the specified number of seconds. +# +# For example to require at least 3 replicas with a lag <= 10 seconds use: +# +# min-replicas-to-write 3 +# min-replicas-max-lag 10 +# +# Setting one or the other to 0 disables the feature. +# +# By default min-replicas-to-write is set to 0 (feature disabled) and +# min-replicas-max-lag is set to 10. + +# A Redis master is able to list the address and port of the attached +# replicas in different ways. For example the "INFO replication" section +# offers this information, which is used, among other tools, by +# Redis Sentinel in order to discover replica instances. +# Another place where this info is available is in the output of the +# "ROLE" command of a master. +# +# The listed IP address and port normally reported by a replica is +# obtained in the following way: +# +# IP: The address is auto detected by checking the peer address +# of the socket used by the replica to connect with the master. +# +# Port: The port is communicated by the replica during the replication +# handshake, and is normally the port that the replica is using to +# listen for connections. +# +# However when port forwarding or Network Address Translation (NAT) is +# used, the replica may actually be reachable via different IP and port +# pairs. The following two options can be used by a replica in order to +# report to its master a specific set of IP and port, so that both INFO +# and ROLE will report those values. +# +# There is no need to use both the options if you need to override just +# the port or the IP address. +# +# replica-announce-ip 5.5.5.5 +# replica-announce-port 1234 + +############################### KEYS TRACKING ################################# + +# Redis implements server assisted support for client side caching of values. +# This is implemented using an invalidation table that remembers, using +# a radix key indexed by key name, what clients have which keys. In turn +# this is used in order to send invalidation messages to clients. Please +# check this page to understand more about the feature: +# +# https://redis.io/topics/client-side-caching +# +# When tracking is enabled for a client, all the read only queries are assumed +# to be cached: this will force Redis to store information in the invalidation +# table. When keys are modified, such information is flushed away, and +# invalidation messages are sent to the clients. However if the workload is +# heavily dominated by reads, Redis could use more and more memory in order +# to track the keys fetched by many clients. +# +# For this reason it is possible to configure a maximum fill value for the +# invalidation table. By default it is set to 1M of keys, and once this limit +# is reached, Redis will start to evict keys in the invalidation table +# even if they were not modified, just to reclaim memory: this will in turn +# force the clients to invalidate the cached values. Basically the table +# maximum size is a trade off between the memory you want to spend server +# side to track information about who cached what, and the ability of clients +# to retain cached objects in memory. +# +# If you set the value to 0, it means there are no limits, and Redis will +# retain as many keys as needed in the invalidation table. +# In the "stats" INFO section, you can find information about the number of +# keys in the invalidation table at every given moment. +# +# Note: when key tracking is used in broadcasting mode, no memory is used +# in the server side so this setting is useless. +# +# tracking-table-max-keys 1000000 + +################################## SECURITY ################################### + +# Warning: since Redis is pretty fast, an outside user can try up to +# 1 million passwords per second against a modern box. This means that you +# should use very strong passwords, otherwise they will be very easy to break. +# Note that because the password is really a shared secret between the client +# and the server, and should not be memorized by any human, the password +# can be easily a long string from /dev/urandom or whatever, so by using a +# long and unguessable password no brute force attack will be possible. + +# Redis ACL users are defined in the following format: +# +# user ... acl rules ... +# +# For example: +# +# user worker +@list +@connection ~jobs:* on >ffa9203c493aa99 +# +# The special username "default" is used for new connections. If this user +# has the "nopass" rule, then new connections will be immediately authenticated +# as the "default" user without the need of any password provided via the +# AUTH command. Otherwise if the "default" user is not flagged with "nopass" +# the connections will start in not authenticated state, and will require +# AUTH (or the HELLO command AUTH option) in order to be authenticated and +# start to work. +# +# The ACL rules that describe what a user can do are the following: +# +# on Enable the user: it is possible to authenticate as this user. +# off Disable the user: it's no longer possible to authenticate +# with this user, however the already authenticated connections +# will still work. +# skip-sanitize-payload RESTORE dump-payload sanitization is skipped. +# sanitize-payload RESTORE dump-payload is sanitized (default). +# + Allow the execution of that command. +# May be used with `|` for allowing subcommands (e.g "+config|get") +# - Disallow the execution of that command. +# May be used with `|` for blocking subcommands (e.g "-config|set") +# +@ Allow the execution of all the commands in such category +# with valid categories are like @admin, @set, @sortedset, ... +# and so forth, see the full list in the server.c file where +# the Redis command table is described and defined. +# The special category @all means all the commands, but currently +# present in the server, and that will be loaded in the future +# via modules. +# +|first-arg Allow a specific first argument of an otherwise +# disabled command. It is only supported on commands with +# no sub-commands, and is not allowed as negative form +# like -SELECT|1, only additive starting with "+". This +# feature is deprecated and may be removed in the future. +# allcommands Alias for +@all. Note that it implies the ability to execute +# all the future commands loaded via the modules system. +# nocommands Alias for -@all. +# ~ Add a pattern of keys that can be mentioned as part of +# commands. For instance ~* allows all the keys. The pattern +# is a glob-style pattern like the one of KEYS. +# It is possible to specify multiple patterns. +# %R~ Add key read pattern that specifies which keys can be read +# from. +# %W~ Add key write pattern that specifies which keys can be +# written to. +# allkeys Alias for ~* +# resetkeys Flush the list of allowed keys patterns. +# & Add a glob-style pattern of Pub/Sub channels that can be +# accessed by the user. It is possible to specify multiple channel +# patterns. +# allchannels Alias for &* +# resetchannels Flush the list of allowed channel patterns. +# > Add this password to the list of valid password for the user. +# For example >mypass will add "mypass" to the list. +# This directive clears the "nopass" flag (see later). +# < Remove this password from the list of valid passwords. +# nopass All the set passwords of the user are removed, and the user +# is flagged as requiring no password: it means that every +# password will work against this user. If this directive is +# used for the default user, every new connection will be +# immediately authenticated with the default user without +# any explicit AUTH command required. Note that the "resetpass" +# directive will clear this condition. +# resetpass Flush the list of allowed passwords. Moreover removes the +# "nopass" status. After "resetpass" the user has no associated +# passwords and there is no way to authenticate without adding +# some password (or setting it as "nopass" later). +# reset Performs the following actions: resetpass, resetkeys, off, +# -@all. The user returns to the same state it has immediately +# after its creation. +# () Create a new selector with the options specified within the +# parentheses and attach it to the user. Each option should be +# space separated. The first character must be ( and the last +# character must be ). +# clearselectors Remove all of the currently attached selectors. +# Note this does not change the "root" user permissions, +# which are the permissions directly applied onto the +# user (outside the parentheses). +# +# ACL rules can be specified in any order: for instance you can start with +# passwords, then flags, or key patterns. However note that the additive +# and subtractive rules will CHANGE MEANING depending on the ordering. +# For instance see the following example: +# +# user alice on +@all -DEBUG ~* >somepassword +# +# This will allow "alice" to use all the commands with the exception of the +# DEBUG command, since +@all added all the commands to the set of the commands +# alice can use, and later DEBUG was removed. However if we invert the order +# of two ACL rules the result will be different: +# +# user alice on -DEBUG +@all ~* >somepassword +# +# Now DEBUG was removed when alice had yet no commands in the set of allowed +# commands, later all the commands are added, so the user will be able to +# execute everything. +# +# Basically ACL rules are processed left-to-right. +# +# The following is a list of command categories and their meanings: +# * keyspace - Writing or reading from keys, databases, or their metadata +# in a type agnostic way. Includes DEL, RESTORE, DUMP, RENAME, EXISTS, DBSIZE, +# KEYS, EXPIRE, TTL, FLUSHALL, etc. Commands that may modify the keyspace, +# key or metadata will also have `write` category. Commands that only read +# the keyspace, key or metadata will have the `read` category. +# * read - Reading from keys (values or metadata). Note that commands that don't +# interact with keys, will not have either `read` or `write`. +# * write - Writing to keys (values or metadata) +# * admin - Administrative commands. Normal applications will never need to use +# these. Includes REPLICAOF, CONFIG, DEBUG, SAVE, MONITOR, ACL, SHUTDOWN, etc. +# * dangerous - Potentially dangerous (each should be considered with care for +# various reasons). This includes FLUSHALL, MIGRATE, RESTORE, SORT, KEYS, +# CLIENT, DEBUG, INFO, CONFIG, SAVE, REPLICAOF, etc. +# * connection - Commands affecting the connection or other connections. +# This includes AUTH, SELECT, COMMAND, CLIENT, ECHO, PING, etc. +# * blocking - Potentially blocking the connection until released by another +# command. +# * fast - Fast O(1) commands. May loop on the number of arguments, but not the +# number of elements in the key. +# * slow - All commands that are not Fast. +# * pubsub - PUBLISH / SUBSCRIBE related +# * transaction - WATCH / MULTI / EXEC related commands. +# * scripting - Scripting related. +# * set - Data type: sets related. +# * sortedset - Data type: zsets related. +# * list - Data type: lists related. +# * hash - Data type: hashes related. +# * string - Data type: strings related. +# * bitmap - Data type: bitmaps related. +# * hyperloglog - Data type: hyperloglog related. +# * geo - Data type: geo related. +# * stream - Data type: streams related. +# +# For more information about ACL configuration please refer to +# the Redis web site at https://redis.io/topics/acl + +# ACL LOG +# +# The ACL Log tracks failed commands and authentication events associated +# with ACLs. The ACL Log is useful to troubleshoot failed commands blocked +# by ACLs. The ACL Log is stored in memory. You can reclaim memory with +# ACL LOG RESET. Define the maximum entry length of the ACL Log below. +acllog-max-len 128 + +# Using an external ACL file +# +# Instead of configuring users here in this file, it is possible to use +# a stand-alone file just listing users. The two methods cannot be mixed: +# if you configure users here and at the same time you activate the external +# ACL file, the server will refuse to start. +# +# The format of the external ACL user file is exactly the same as the +# format that is used inside redis.conf to describe users. +# +# aclfile /etc/redis/users.acl + +# IMPORTANT NOTE: starting with Redis 6 "requirepass" is just a compatibility +# layer on top of the new ACL system. The option effect will be just setting +# the password for the default user. Clients will still authenticate using +# AUTH as usually, or more explicitly with AUTH default +# if they follow the new protocol: both will work. +# +# The requirepass is not compatible with aclfile option and the ACL LOAD +# command, these will cause requirepass to be ignored. +# +# requirepass foobared + +# New users are initialized with restrictive permissions by default, via the +# equivalent of this ACL rule 'off resetkeys -@all'. Starting with Redis 6.2, it +# is possible to manage access to Pub/Sub channels with ACL rules as well. The +# default Pub/Sub channels permission if new users is controlled by the +# acl-pubsub-default configuration directive, which accepts one of these values: +# +# allchannels: grants access to all Pub/Sub channels +# resetchannels: revokes access to all Pub/Sub channels +# +# From Redis 7.0, acl-pubsub-default defaults to 'resetchannels' permission. +# +# acl-pubsub-default resetchannels + +# Command renaming (DEPRECATED). +# +# ------------------------------------------------------------------------ +# WARNING: avoid using this option if possible. Instead use ACLs to remove +# commands from the default user, and put them only in some admin user you +# create for administrative purposes. +# ------------------------------------------------------------------------ +# +# It is possible to change the name of dangerous commands in a shared +# environment. For instance the CONFIG command may be renamed into something +# hard to guess so that it will still be available for internal-use tools +# but not available for general clients. +# +# Example: +# +# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52 +# +# It is also possible to completely kill a command by renaming it into +# an empty string: +# +# rename-command CONFIG "" +# +# Please note that changing the name of commands that are logged into the +# AOF file or transmitted to replicas may cause problems. + +################################### CLIENTS #################################### + +# Set the max number of connected clients at the same time. By default +# this limit is set to 10000 clients, however if the Redis server is not +# able to configure the process file limit to allow for the specified limit +# the max number of allowed clients is set to the current file limit +# minus 32 (as Redis reserves a few file descriptors for internal uses). +# +# Once the limit is reached Redis will close all the new connections sending +# an error 'max number of clients reached'. +# +# IMPORTANT: When Redis Cluster is used, the max number of connections is also +# shared with the cluster bus: every node in the cluster will use two +# connections, one incoming and another outgoing. It is important to size the +# limit accordingly in case of very large clusters. +# +# maxclients 10000 + +############################## MEMORY MANAGEMENT ################################ + +# Set a memory usage limit to the specified amount of bytes. +# When the memory limit is reached Redis will try to remove keys +# according to the eviction policy selected (see maxmemory-policy). +# +# If Redis can't remove keys according to the policy, or if the policy is +# set to 'noeviction', Redis will start to reply with errors to commands +# that would use more memory, like SET, LPUSH, and so on, and will continue +# to reply to read-only commands like GET. +# +# This option is usually useful when using Redis as an LRU or LFU cache, or to +# set a hard memory limit for an instance (using the 'noeviction' policy). +# +# WARNING: If you have replicas attached to an instance with maxmemory on, +# the size of the output buffers needed to feed the replicas are subtracted +# from the used memory count, so that network problems / resyncs will +# not trigger a loop where keys are evicted, and in turn the output +# buffer of replicas is full with DELs of keys evicted triggering the deletion +# of more keys, and so forth until the database is completely emptied. +# +# In short... if you have replicas attached it is suggested that you set a lower +# limit for maxmemory so that there is some free RAM on the system for replica +# output buffers (but this is not needed if the policy is 'noeviction'). +# +# maxmemory + +# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory +# is reached. You can select one from the following behaviors: +# +# volatile-lru -> Evict using approximated LRU, only keys with an expire set. +# allkeys-lru -> Evict any key using approximated LRU. +# volatile-lfu -> Evict using approximated LFU, only keys with an expire set. +# allkeys-lfu -> Evict any key using approximated LFU. +# volatile-random -> Remove a random key having an expire set. +# allkeys-random -> Remove a random key, any key. +# volatile-ttl -> Remove the key with the nearest expire time (minor TTL) +# noeviction -> Don't evict anything, just return an error on write operations. +# +# LRU means Least Recently Used +# LFU means Least Frequently Used +# +# Both LRU, LFU and volatile-ttl are implemented using approximated +# randomized algorithms. +# +# Note: with any of the above policies, when there are no suitable keys for +# eviction, Redis will return an error on write operations that require +# more memory. These are usually commands that create new keys, add data or +# modify existing keys. A few examples are: SET, INCR, HSET, LPUSH, SUNIONSTORE, +# SORT (due to the STORE argument), and EXEC (if the transaction includes any +# command that requires memory). +# +# The default is: +# +# maxmemory-policy noeviction + +# LRU, LFU and minimal TTL algorithms are not precise algorithms but approximated +# algorithms (in order to save memory), so you can tune it for speed or +# accuracy. By default Redis will check five keys and pick the one that was +# used least recently, you can change the sample size using the following +# configuration directive. +# +# The default of 5 produces good enough results. 10 Approximates very closely +# true LRU but costs more CPU. 3 is faster but not very accurate. +# +# maxmemory-samples 5 + +# Eviction processing is designed to function well with the default setting. +# If there is an unusually large amount of write traffic, this value may need to +# be increased. Decreasing this value may reduce latency at the risk of +# eviction processing effectiveness +# 0 = minimum latency, 10 = default, 100 = process without regard to latency +# +# maxmemory-eviction-tenacity 10 + +# Starting from Redis 5, by default a replica will ignore its maxmemory setting +# (unless it is promoted to master after a failover or manually). It means +# that the eviction of keys will be just handled by the master, sending the +# DEL commands to the replica as keys evict in the master side. +# +# This behavior ensures that masters and replicas stay consistent, and is usually +# what you want, however if your replica is writable, or you want the replica +# to have a different memory setting, and you are sure all the writes performed +# to the replica are idempotent, then you may change this default (but be sure +# to understand what you are doing). +# +# Note that since the replica by default does not evict, it may end using more +# memory than the one set via maxmemory (there are certain buffers that may +# be larger on the replica, or data structures may sometimes take more memory +# and so forth). So make sure you monitor your replicas and make sure they +# have enough memory to never hit a real out-of-memory condition before the +# master hits the configured maxmemory setting. +# +# replica-ignore-maxmemory yes + +# Redis reclaims expired keys in two ways: upon access when those keys are +# found to be expired, and also in background, in what is called the +# "active expire key". The key space is slowly and interactively scanned +# looking for expired keys to reclaim, so that it is possible to free memory +# of keys that are expired and will never be accessed again in a short time. +# +# The default effort of the expire cycle will try to avoid having more than +# ten percent of expired keys still in memory, and will try to avoid consuming +# more than 25% of total memory and to add latency to the system. However +# it is possible to increase the expire "effort" that is normally set to +# "1", to a greater value, up to the value "10". At its maximum value the +# system will use more CPU, longer cycles (and technically may introduce +# more latency), and will tolerate less already expired keys still present +# in the system. It's a tradeoff between memory, CPU and latency. +# +# active-expire-effort 1 + +############################# LAZY FREEING #################################### + +# Redis has two primitives to delete keys. One is called DEL and is a blocking +# deletion of the object. It means that the server stops processing new commands +# in order to reclaim all the memory associated with an object in a synchronous +# way. If the key deleted is associated with a small object, the time needed +# in order to execute the DEL command is very small and comparable to most other +# O(1) or O(log_N) commands in Redis. However if the key is associated with an +# aggregated value containing millions of elements, the server can block for +# a long time (even seconds) in order to complete the operation. +# +# For the above reasons Redis also offers non blocking deletion primitives +# such as UNLINK (non blocking DEL) and the ASYNC option of FLUSHALL and +# FLUSHDB commands, in order to reclaim memory in background. Those commands +# are executed in constant time. Another thread will incrementally free the +# object in the background as fast as possible. +# +# DEL, UNLINK and ASYNC option of FLUSHALL and FLUSHDB are user-controlled. +# It's up to the design of the application to understand when it is a good +# idea to use one or the other. However the Redis server sometimes has to +# delete keys or flush the whole database as a side effect of other operations. +# Specifically Redis deletes objects independently of a user call in the +# following scenarios: +# +# 1) On eviction, because of the maxmemory and maxmemory policy configurations, +# in order to make room for new data, without going over the specified +# memory limit. +# 2) Because of expire: when a key with an associated time to live (see the +# EXPIRE command) must be deleted from memory. +# 3) Because of a side effect of a command that stores data on a key that may +# already exist. For example the RENAME command may delete the old key +# content when it is replaced with another one. Similarly SUNIONSTORE +# or SORT with STORE option may delete existing keys. The SET command +# itself removes any old content of the specified key in order to replace +# it with the specified string. +# 4) During replication, when a replica performs a full resynchronization with +# its master, the content of the whole database is removed in order to +# load the RDB file just transferred. +# +# In all the above cases the default is to delete objects in a blocking way, +# like if DEL was called. However you can configure each case specifically +# in order to instead release memory in a non-blocking way like if UNLINK +# was called, using the following configuration directives. + +lazyfree-lazy-eviction no +lazyfree-lazy-expire no +lazyfree-lazy-server-del no +replica-lazy-flush no + +# It is also possible, for the case when to replace the user code DEL calls +# with UNLINK calls is not easy, to modify the default behavior of the DEL +# command to act exactly like UNLINK, using the following configuration +# directive: + +lazyfree-lazy-user-del no + +# FLUSHDB, FLUSHALL, SCRIPT FLUSH and FUNCTION FLUSH support both asynchronous and synchronous +# deletion, which can be controlled by passing the [SYNC|ASYNC] flags into the +# commands. When neither flag is passed, this directive will be used to determine +# if the data should be deleted asynchronously. + +lazyfree-lazy-user-flush no + +################################ THREADED I/O ################################# + +# Redis is mostly single threaded, however there are certain threaded +# operations such as UNLINK, slow I/O accesses and other things that are +# performed on side threads. +# +# Now it is also possible to handle Redis clients socket reads and writes +# in different I/O threads. Since especially writing is so slow, normally +# Redis users use pipelining in order to speed up the Redis performances per +# core, and spawn multiple instances in order to scale more. Using I/O +# threads it is possible to easily speedup two times Redis without resorting +# to pipelining nor sharding of the instance. +# +# By default threading is disabled, we suggest enabling it only in machines +# that have at least 4 or more cores, leaving at least one spare core. +# Using more than 8 threads is unlikely to help much. We also recommend using +# threaded I/O only if you actually have performance problems, with Redis +# instances being able to use a quite big percentage of CPU time, otherwise +# there is no point in using this feature. +# +# So for instance if you have a four cores boxes, try to use 2 or 3 I/O +# threads, if you have a 8 cores, try to use 6 threads. In order to +# enable I/O threads use the following configuration directive: +# +# io-threads 4 +# +# Setting io-threads to 1 will just use the main thread as usual. +# When I/O threads are enabled, we only use threads for writes, that is +# to thread the write(2) syscall and transfer the client buffers to the +# socket. However it is also possible to enable threading of reads and +# protocol parsing using the following configuration directive, by setting +# it to yes: +# +# io-threads-do-reads no +# +# Usually threading reads doesn't help much. +# +# NOTE 1: This configuration directive cannot be changed at runtime via +# CONFIG SET. Also, this feature currently does not work when SSL is +# enabled. +# +# NOTE 2: If you want to test the Redis speedup using redis-benchmark, make +# sure you also run the benchmark itself in threaded mode, using the +# --threads option to match the number of Redis threads, otherwise you'll not +# be able to notice the improvements. + +############################ KERNEL OOM CONTROL ############################## + +# On Linux, it is possible to hint the kernel OOM killer on what processes +# should be killed first when out of memory. +# +# Enabling this feature makes Redis actively control the oom_score_adj value +# for all its processes, depending on their role. The default scores will +# attempt to have background child processes killed before all others, and +# replicas killed before masters. +# +# Redis supports these options: +# +# no: Don't make changes to oom-score-adj (default). +# yes: Alias to "relative" see below. +# absolute: Values in oom-score-adj-values are written as is to the kernel. +# relative: Values are used relative to the initial value of oom_score_adj when +# the server starts and are then clamped to a range of -1000 to 1000. +# Because typically the initial value is 0, they will often match the +# absolute values. +oom-score-adj no + +# When oom-score-adj is used, this directive controls the specific values used +# for master, replica and background child processes. Values range -2000 to +# 2000 (higher means more likely to be killed). +# +# Unprivileged processes (not root, and without CAP_SYS_RESOURCE capabilities) +# can freely increase their value, but not decrease it below its initial +# settings. This means that setting oom-score-adj to "relative" and setting the +# oom-score-adj-values to positive values will always succeed. +oom-score-adj-values 0 200 800 + + +#################### KERNEL transparent hugepage CONTROL ###################### + +# Usually the kernel Transparent Huge Pages control is set to "madvise" or +# or "never" by default (/sys/kernel/mm/transparent_hugepage/enabled), in which +# case this config has no effect. On systems in which it is set to "always", +# redis will attempt to disable it specifically for the redis process in order +# to avoid latency problems specifically with fork(2) and CoW. +# If for some reason you prefer to keep it enabled, you can set this config to +# "no" and the kernel global to "always". + +disable-thp yes + +############################## APPEND ONLY MODE ############################### + +# By default Redis asynchronously dumps the dataset on disk. This mode is +# good enough in many applications, but an issue with the Redis process or +# a power outage may result into a few minutes of writes lost (depending on +# the configured save points). +# +# The Append Only File is an alternative persistence mode that provides +# much better durability. For instance using the default data fsync policy +# (see later in the config file) Redis can lose just one second of writes in a +# dramatic event like a server power outage, or a single write if something +# wrong with the Redis process itself happens, but the operating system is +# still running correctly. +# +# AOF and RDB persistence can be enabled at the same time without problems. +# If the AOF is enabled on startup Redis will load the AOF, that is the file +# with the better durability guarantees. +# +# Please check https://redis.io/topics/persistence for more information. + +appendonly no + +# The base name of the append only file. +# +# Redis 7 and newer use a set of append-only files to persist the dataset +# and changes applied to it. There are two basic types of files in use: +# +# - Base files, which are a snapshot representing the complete state of the +# dataset at the time the file was created. Base files can be either in +# the form of RDB (binary serialized) or AOF (textual commands). +# - Incremental files, which contain additional commands that were applied +# to the dataset following the previous file. +# +# In addition, manifest files are used to track the files and the order in +# which they were created and should be applied. +# +# Append-only file names are created by Redis following a specific pattern. +# The file name's prefix is based on the 'appendfilename' configuration +# parameter, followed by additional information about the sequence and type. +# +# For example, if appendfilename is set to appendonly.aof, the following file +# names could be derived: +# +# - appendonly.aof.1.base.rdb as a base file. +# - appendonly.aof.1.incr.aof, appendonly.aof.2.incr.aof as incremental files. +# - appendonly.aof.manifest as a manifest file. + +appendfilename "appendonly.aof" + +# For convenience, Redis stores all persistent append-only files in a dedicated +# directory. The name of the directory is determined by the appenddirname +# configuration parameter. + +appenddirname "appendonlydir" + +# The fsync() call tells the Operating System to actually write data on disk +# instead of waiting for more data in the output buffer. Some OS will really flush +# data on disk, some other OS will just try to do it ASAP. +# +# Redis supports three different modes: +# +# no: don't fsync, just let the OS flush the data when it wants. Faster. +# always: fsync after every write to the append only log. Slow, Safest. +# everysec: fsync only one time every second. Compromise. +# +# The default is "everysec", as that's usually the right compromise between +# speed and data safety. It's up to you to understand if you can relax this to +# "no" that will let the operating system flush the output buffer when +# it wants, for better performances (but if you can live with the idea of +# some data loss consider the default persistence mode that's snapshotting), +# or on the contrary, use "always" that's very slow but a bit safer than +# everysec. +# +# More details please check the following article: +# http://antirez.com/post/redis-persistence-demystified.html +# +# If unsure, use "everysec". + +# appendfsync always +appendfsync everysec +# appendfsync no + +# When the AOF fsync policy is set to always or everysec, and a background +# saving process (a background save or AOF log background rewriting) is +# performing a lot of I/O against the disk, in some Linux configurations +# Redis may block too long on the fsync() call. Note that there is no fix for +# this currently, as even performing fsync in a different thread will block +# our synchronous write(2) call. +# +# In order to mitigate this problem it's possible to use the following option +# that will prevent fsync() from being called in the main process while a +# BGSAVE or BGREWRITEAOF is in progress. +# +# This means that while another child is saving, the durability of Redis is +# the same as "appendfsync no". In practical terms, this means that it is +# possible to lose up to 30 seconds of log in the worst scenario (with the +# default Linux settings). +# +# If you have latency problems turn this to "yes". Otherwise leave it as +# "no" that is the safest pick from the point of view of durability. + +no-appendfsync-on-rewrite no + +# Automatic rewrite of the append only file. +# Redis is able to automatically rewrite the log file implicitly calling +# BGREWRITEAOF when the AOF log size grows by the specified percentage. +# +# This is how it works: Redis remembers the size of the AOF file after the +# latest rewrite (if no rewrite has happened since the restart, the size of +# the AOF at startup is used). +# +# This base size is compared to the current size. If the current size is +# bigger than the specified percentage, the rewrite is triggered. Also +# you need to specify a minimal size for the AOF file to be rewritten, this +# is useful to avoid rewriting the AOF file even if the percentage increase +# is reached but it is still pretty small. +# +# Specify a percentage of zero in order to disable the automatic AOF +# rewrite feature. + +auto-aof-rewrite-percentage 100 +auto-aof-rewrite-min-size 64mb + +# An AOF file may be found to be truncated at the end during the Redis +# startup process, when the AOF data gets loaded back into memory. +# This may happen when the system where Redis is running +# crashes, especially when an ext4 filesystem is mounted without the +# data=ordered option (however this can't happen when Redis itself +# crashes or aborts but the operating system still works correctly). +# +# Redis can either exit with an error when this happens, or load as much +# data as possible (the default now) and start if the AOF file is found +# to be truncated at the end. The following option controls this behavior. +# +# If aof-load-truncated is set to yes, a truncated AOF file is loaded and +# the Redis server starts emitting a log to inform the user of the event. +# Otherwise if the option is set to no, the server aborts with an error +# and refuses to start. When the option is set to no, the user requires +# to fix the AOF file using the "redis-check-aof" utility before to restart +# the server. +# +# Note that if the AOF file will be found to be corrupted in the middle +# the server will still exit with an error. This option only applies when +# Redis will try to read more data from the AOF file but not enough bytes +# will be found. +aof-load-truncated yes + +# Redis can create append-only base files in either RDB or AOF formats. Using +# the RDB format is always faster and more efficient, and disabling it is only +# supported for backward compatibility purposes. +aof-use-rdb-preamble yes + +# Redis supports recording timestamp annotations in the AOF to support restoring +# the data from a specific point-in-time. However, using this capability changes +# the AOF format in a way that may not be compatible with existing AOF parsers. +aof-timestamp-enabled no + +################################ SHUTDOWN ##################################### + +# Maximum time to wait for replicas when shutting down, in seconds. +# +# During shut down, a grace period allows any lagging replicas to catch up with +# the latest replication offset before the master exists. This period can +# prevent data loss, especially for deployments without configured disk backups. +# +# The 'shutdown-timeout' value is the grace period's duration in seconds. It is +# only applicable when the instance has replicas. To disable the feature, set +# the value to 0. +# +# shutdown-timeout 10 + +# When Redis receives a SIGINT or SIGTERM, shutdown is initiated and by default +# an RDB snapshot is written to disk in a blocking operation if save points are configured. +# The options used on signaled shutdown can include the following values: +# default: Saves RDB snapshot only if save points are configured. +# Waits for lagging replicas to catch up. +# save: Forces a DB saving operation even if no save points are configured. +# nosave: Prevents DB saving operation even if one or more save points are configured. +# now: Skips waiting for lagging replicas. +# force: Ignores any errors that would normally prevent the server from exiting. +# +# Any combination of values is allowed as long as "save" and "nosave" are not set simultaneously. +# Example: "nosave force now" +# +# shutdown-on-sigint default +# shutdown-on-sigterm default + +################ NON-DETERMINISTIC LONG BLOCKING COMMANDS ##################### + +# Maximum time in milliseconds for EVAL scripts, functions and in some cases +# modules' commands before Redis can start processing or rejecting other clients. +# +# If the maximum execution time is reached Redis will start to reply to most +# commands with a BUSY error. +# +# In this state Redis will only allow a handful of commands to be executed. +# For instance, SCRIPT KILL, FUNCTION KILL, SHUTDOWN NOSAVE and possibly some +# module specific 'allow-busy' commands. +# +# SCRIPT KILL and FUNCTION KILL will only be able to stop a script that did not +# yet call any write commands, so SHUTDOWN NOSAVE may be the only way to stop +# the server in the case a write command was already issued by the script when +# the user doesn't want to wait for the natural termination of the script. +# +# The default is 5 seconds. It is possible to set it to 0 or a negative value +# to disable this mechanism (uninterrupted execution). Note that in the past +# this config had a different name, which is now an alias, so both of these do +# the same: +# lua-time-limit 5000 +# busy-reply-threshold 5000 + +################################ REDIS CLUSTER ############################### + +# Normal Redis instances can't be part of a Redis Cluster; only nodes that are +# started as cluster nodes can. In order to start a Redis instance as a +# cluster node enable the cluster support uncommenting the following: +# +# cluster-enabled yes + +# Every cluster node has a cluster configuration file. This file is not +# intended to be edited by hand. It is created and updated by Redis nodes. +# Every Redis Cluster node requires a different cluster configuration file. +# Make sure that instances running in the same system do not have +# overlapping cluster configuration file names. +# +# cluster-config-file nodes-6379.conf + +# Cluster node timeout is the amount of milliseconds a node must be unreachable +# for it to be considered in failure state. +# Most other internal time limits are a multiple of the node timeout. +# +# cluster-node-timeout 15000 + +# The cluster port is the port that the cluster bus will listen for inbound connections on. When set +# to the default value, 0, it will be bound to the command port + 10000. Setting this value requires +# you to specify the cluster bus port when executing cluster meet. +# cluster-port 0 + +# A replica of a failing master will avoid to start a failover if its data +# looks too old. +# +# There is no simple way for a replica to actually have an exact measure of +# its "data age", so the following two checks are performed: +# +# 1) If there are multiple replicas able to failover, they exchange messages +# in order to try to give an advantage to the replica with the best +# replication offset (more data from the master processed). +# Replicas will try to get their rank by offset, and apply to the start +# of the failover a delay proportional to their rank. +# +# 2) Every single replica computes the time of the last interaction with +# its master. This can be the last ping or command received (if the master +# is still in the "connected" state), or the time that elapsed since the +# disconnection with the master (if the replication link is currently down). +# If the last interaction is too old, the replica will not try to failover +# at all. +# +# The point "2" can be tuned by user. Specifically a replica will not perform +# the failover if, since the last interaction with the master, the time +# elapsed is greater than: +# +# (node-timeout * cluster-replica-validity-factor) + repl-ping-replica-period +# +# So for example if node-timeout is 30 seconds, and the cluster-replica-validity-factor +# is 10, and assuming a default repl-ping-replica-period of 10 seconds, the +# replica will not try to failover if it was not able to talk with the master +# for longer than 310 seconds. +# +# A large cluster-replica-validity-factor may allow replicas with too old data to failover +# a master, while a too small value may prevent the cluster from being able to +# elect a replica at all. +# +# For maximum availability, it is possible to set the cluster-replica-validity-factor +# to a value of 0, which means, that replicas will always try to failover the +# master regardless of the last time they interacted with the master. +# (However they'll always try to apply a delay proportional to their +# offset rank). +# +# Zero is the only value able to guarantee that when all the partitions heal +# the cluster will always be able to continue. +# +# cluster-replica-validity-factor 10 + +# Cluster replicas are able to migrate to orphaned masters, that are masters +# that are left without working replicas. This improves the cluster ability +# to resist to failures as otherwise an orphaned master can't be failed over +# in case of failure if it has no working replicas. +# +# Replicas migrate to orphaned masters only if there are still at least a +# given number of other working replicas for their old master. This number +# is the "migration barrier". A migration barrier of 1 means that a replica +# will migrate only if there is at least 1 other working replica for its master +# and so forth. It usually reflects the number of replicas you want for every +# master in your cluster. +# +# Default is 1 (replicas migrate only if their masters remain with at least +# one replica). To disable migration just set it to a very large value or +# set cluster-allow-replica-migration to 'no'. +# A value of 0 can be set but is useful only for debugging and dangerous +# in production. +# +# cluster-migration-barrier 1 + +# Turning off this option allows to use less automatic cluster configuration. +# It both disables migration to orphaned masters and migration from masters +# that became empty. +# +# Default is 'yes' (allow automatic migrations). +# +# cluster-allow-replica-migration yes + +# By default Redis Cluster nodes stop accepting queries if they detect there +# is at least a hash slot uncovered (no available node is serving it). +# This way if the cluster is partially down (for example a range of hash slots +# are no longer covered) all the cluster becomes, eventually, unavailable. +# It automatically returns available as soon as all the slots are covered again. +# +# However sometimes you want the subset of the cluster which is working, +# to continue to accept queries for the part of the key space that is still +# covered. In order to do so, just set the cluster-require-full-coverage +# option to no. +# +# cluster-require-full-coverage yes + +# This option, when set to yes, prevents replicas from trying to failover its +# master during master failures. However the replica can still perform a +# manual failover, if forced to do so. +# +# This is useful in different scenarios, especially in the case of multiple +# data center operations, where we want one side to never be promoted if not +# in the case of a total DC failure. +# +# cluster-replica-no-failover no + +# This option, when set to yes, allows nodes to serve read traffic while the +# cluster is in a down state, as long as it believes it owns the slots. +# +# This is useful for two cases. The first case is for when an application +# doesn't require consistency of data during node failures or network partitions. +# One example of this is a cache, where as long as the node has the data it +# should be able to serve it. +# +# The second use case is for configurations that don't meet the recommended +# three shards but want to enable cluster mode and scale later. A +# master outage in a 1 or 2 shard configuration causes a read/write outage to the +# entire cluster without this option set, with it set there is only a write outage. +# Without a quorum of masters, slot ownership will not change automatically. +# +# cluster-allow-reads-when-down no + +# This option, when set to yes, allows nodes to serve pubsub shard traffic while +# the cluster is in a down state, as long as it believes it owns the slots. +# +# This is useful if the application would like to use the pubsub feature even when +# the cluster global stable state is not OK. If the application wants to make sure only +# one shard is serving a given channel, this feature should be kept as yes. +# +# cluster-allow-pubsubshard-when-down yes + +# Cluster link send buffer limit is the limit on the memory usage of an individual +# cluster bus link's send buffer in bytes. Cluster links would be freed if they exceed +# this limit. This is to primarily prevent send buffers from growing unbounded on links +# toward slow peers (E.g. PubSub messages being piled up). +# This limit is disabled by default. Enable this limit when 'mem_cluster_links' INFO field +# and/or 'send-buffer-allocated' entries in the 'CLUSTER LINKS` command output continuously increase. +# Minimum limit of 1gb is recommended so that cluster link buffer can fit in at least a single +# PubSub message by default. (client-query-buffer-limit default value is 1gb) +# +# cluster-link-sendbuf-limit 0 + +# Clusters can configure their announced hostname using this config. This is a common use case for +# applications that need to use TLS Server Name Indication (SNI) or dealing with DNS based +# routing. By default this value is only shown as additional metadata in the CLUSTER SLOTS +# command, but can be changed using 'cluster-preferred-endpoint-type' config. This value is +# communicated along the clusterbus to all nodes, setting it to an empty string will remove +# the hostname and also propagate the removal. +# +# cluster-announce-hostname "" + +# Clusters can advertise how clients should connect to them using either their IP address, +# a user defined hostname, or by declaring they have no endpoint. Which endpoint is +# shown as the preferred endpoint is set by using the cluster-preferred-endpoint-type +# config with values 'ip', 'hostname', or 'unknown-endpoint'. This value controls how +# the endpoint returned for MOVED/ASKING requests as well as the first field of CLUSTER SLOTS. +# If the preferred endpoint type is set to hostname, but no announced hostname is set, a '?' +# will be returned instead. +# +# When a cluster advertises itself as having an unknown endpoint, it's indicating that +# the server doesn't know how clients can reach the cluster. This can happen in certain +# networking situations where there are multiple possible routes to the node, and the +# server doesn't know which one the client took. In this case, the server is expecting +# the client to reach out on the same endpoint it used for making the last request, but use +# the port provided in the response. +# +# cluster-preferred-endpoint-type ip + +# In order to setup your cluster make sure to read the documentation +# available at https://redis.io web site. + +########################## CLUSTER DOCKER/NAT support ######################## + +# In certain deployments, Redis Cluster nodes address discovery fails, because +# addresses are NAT-ted or because ports are forwarded (the typical case is +# Docker and other containers). +# +# In order to make Redis Cluster working in such environments, a static +# configuration where each node knows its public address is needed. The +# following four options are used for this scope, and are: +# +# * cluster-announce-ip +# * cluster-announce-port +# * cluster-announce-tls-port +# * cluster-announce-bus-port +# +# Each instructs the node about its address, client ports (for connections +# without and with TLS) and cluster message bus port. The information is then +# published in the header of the bus packets so that other nodes will be able to +# correctly map the address of the node publishing the information. +# +# If cluster-tls is set to yes and cluster-announce-tls-port is omitted or set +# to zero, then cluster-announce-port refers to the TLS port. Note also that +# cluster-announce-tls-port has no effect if cluster-tls is set to no. +# +# If the above options are not used, the normal Redis Cluster auto-detection +# will be used instead. +# +# Note that when remapped, the bus port may not be at the fixed offset of +# clients port + 10000, so you can specify any port and bus-port depending +# on how they get remapped. If the bus-port is not set, a fixed offset of +# 10000 will be used as usual. +# +# Example: +# +# cluster-announce-ip 10.1.1.5 +# cluster-announce-tls-port 6379 +# cluster-announce-port 0 +# cluster-announce-bus-port 6380 + +################################## SLOW LOG ################################### + +# The Redis Slow Log is a system to log queries that exceeded a specified +# execution time. The execution time does not include the I/O operations +# like talking with the client, sending the reply and so forth, +# but just the time needed to actually execute the command (this is the only +# stage of command execution where the thread is blocked and can not serve +# other requests in the meantime). +# +# You can configure the slow log with two parameters: one tells Redis +# what is the execution time, in microseconds, to exceed in order for the +# command to get logged, and the other parameter is the length of the +# slow log. When a new command is logged the oldest one is removed from the +# queue of logged commands. + +# The following time is expressed in microseconds, so 1000000 is equivalent +# to one second. Note that a negative number disables the slow log, while +# a value of zero forces the logging of every command. +slowlog-log-slower-than 10000 + +# There is no limit to this length. Just be aware that it will consume memory. +# You can reclaim memory used by the slow log with SLOWLOG RESET. +slowlog-max-len 128 + +################################ LATENCY MONITOR ############################## + +# The Redis latency monitoring subsystem samples different operations +# at runtime in order to collect data related to possible sources of +# latency of a Redis instance. +# +# Via the LATENCY command this information is available to the user that can +# print graphs and obtain reports. +# +# The system only logs operations that were performed in a time equal or +# greater than the amount of milliseconds specified via the +# latency-monitor-threshold configuration directive. When its value is set +# to zero, the latency monitor is turned off. +# +# By default latency monitoring is disabled since it is mostly not needed +# if you don't have latency issues, and collecting data has a performance +# impact, that while very small, can be measured under big load. Latency +# monitoring can easily be enabled at runtime using the command +# "CONFIG SET latency-monitor-threshold " if needed. +latency-monitor-threshold 0 + +################################ LATENCY TRACKING ############################## + +# The Redis extended latency monitoring tracks the per command latencies and enables +# exporting the percentile distribution via the INFO latencystats command, +# and cumulative latency distributions (histograms) via the LATENCY command. +# +# By default, the extended latency monitoring is enabled since the overhead +# of keeping track of the command latency is very small. +# latency-tracking yes + +# By default the exported latency percentiles via the INFO latencystats command +# are the p50, p99, and p999. +# latency-tracking-info-percentiles 50 99 99.9 + +############################# EVENT NOTIFICATION ############################## + +# Redis can notify Pub/Sub clients about events happening in the key space. +# This feature is documented at https://redis.io/topics/notifications +# +# For instance if keyspace events notification is enabled, and a client +# performs a DEL operation on key "foo" stored in the Database 0, two +# messages will be published via Pub/Sub: +# +# PUBLISH __keyspace@0__:foo del +# PUBLISH __keyevent@0__:del foo +# +# It is possible to select the events that Redis will notify among a set +# of classes. Every class is identified by a single character: +# +# K Keyspace events, published with __keyspace@__ prefix. +# E Keyevent events, published with __keyevent@__ prefix. +# g Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ... +# $ String commands +# l List commands +# s Set commands +# h Hash commands +# z Sorted set commands +# x Expired events (events generated every time a key expires) +# e Evicted events (events generated when a key is evicted for maxmemory) +# n New key events (Note: not included in the 'A' class) +# t Stream commands +# d Module key type events +# m Key-miss events (Note: It is not included in the 'A' class) +# A Alias for g$lshzxetd, so that the "AKE" string means all the events +# (Except key-miss events which are excluded from 'A' due to their +# unique nature). +# +# The "notify-keyspace-events" takes as argument a string that is composed +# of zero or multiple characters. The empty string means that notifications +# are disabled. +# +# Example: to enable list and generic events, from the point of view of the +# event name, use: +# +# notify-keyspace-events Elg +# +# Example 2: to get the stream of the expired keys subscribing to channel +# name __keyevent@0__:expired use: +# +# notify-keyspace-events Ex +# +# By default all notifications are disabled because most users don't need +# this feature and the feature has some overhead. Note that if you don't +# specify at least one of K or E, no events will be delivered. +notify-keyspace-events "" + +############################### ADVANCED CONFIG ############################### + +# Hashes are encoded using a memory efficient data structure when they have a +# small number of entries, and the biggest entry does not exceed a given +# threshold. These thresholds can be configured using the following directives. +hash-max-listpack-entries 512 +hash-max-listpack-value 64 + +# Lists are also encoded in a special way to save a lot of space. +# The number of entries allowed per internal list node can be specified +# as a fixed maximum size or a maximum number of elements. +# For a fixed maximum size, use -5 through -1, meaning: +# -5: max size: 64 Kb <-- not recommended for normal workloads +# -4: max size: 32 Kb <-- not recommended +# -3: max size: 16 Kb <-- probably not recommended +# -2: max size: 8 Kb <-- good +# -1: max size: 4 Kb <-- good +# Positive numbers mean store up to _exactly_ that number of elements +# per list node. +# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size), +# but if your use case is unique, adjust the settings as necessary. +list-max-listpack-size -2 + +# Lists may also be compressed. +# Compress depth is the number of quicklist ziplist nodes from *each* side of +# the list to *exclude* from compression. The head and tail of the list +# are always uncompressed for fast push/pop operations. Settings are: +# 0: disable all list compression +# 1: depth 1 means "don't start compressing until after 1 node into the list, +# going from either the head or tail" +# So: [head]->node->node->...->node->[tail] +# [head], [tail] will always be uncompressed; inner nodes will compress. +# 2: [head]->[next]->node->node->...->node->[prev]->[tail] +# 2 here means: don't compress head or head->next or tail->prev or tail, +# but compress all nodes between them. +# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail] +# etc. +list-compress-depth 0 + +# Sets have a special encoding in just one case: when a set is composed +# of just strings that happen to be integers in radix 10 in the range +# of 64 bit signed integers. +# The following configuration setting sets the limit in the size of the +# set in order to use this special memory saving encoding. +set-max-intset-entries 512 + +# Similarly to hashes and lists, sorted sets are also specially encoded in +# order to save a lot of space. This encoding is only used when the length and +# elements of a sorted set are below the following limits: +zset-max-listpack-entries 128 +zset-max-listpack-value 64 + +# HyperLogLog sparse representation bytes limit. The limit includes the +# 16 bytes header. When an HyperLogLog using the sparse representation crosses +# this limit, it is converted into the dense representation. +# +# A value greater than 16000 is totally useless, since at that point the +# dense representation is more memory efficient. +# +# The suggested value is ~ 3000 in order to have the benefits of +# the space efficient encoding without slowing down too much PFADD, +# which is O(N) with the sparse encoding. The value can be raised to +# ~ 10000 when CPU is not a concern, but space is, and the data set is +# composed of many HyperLogLogs with cardinality in the 0 - 15000 range. +hll-sparse-max-bytes 3000 + +# Streams macro node max size / items. The stream data structure is a radix +# tree of big nodes that encode multiple items inside. Using this configuration +# it is possible to configure how big a single node can be in bytes, and the +# maximum number of items it may contain before switching to a new node when +# appending new stream entries. If any of the following settings are set to +# zero, the limit is ignored, so for instance it is possible to set just a +# max entries limit by setting max-bytes to 0 and max-entries to the desired +# value. +stream-node-max-bytes 4096 +stream-node-max-entries 100 + +# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in +# order to help rehashing the main Redis hash table (the one mapping top-level +# keys to values). The hash table implementation Redis uses (see dict.c) +# performs a lazy rehashing: the more operation you run into a hash table +# that is rehashing, the more rehashing "steps" are performed, so if the +# server is idle the rehashing is never complete and some more memory is used +# by the hash table. +# +# The default is to use this millisecond 10 times every second in order to +# actively rehash the main dictionaries, freeing memory when possible. +# +# If unsure: +# use "activerehashing no" if you have hard latency requirements and it is +# not a good thing in your environment that Redis can reply from time to time +# to queries with 2 milliseconds delay. +# +# use "activerehashing yes" if you don't have such hard requirements but +# want to free memory asap when possible. +activerehashing yes + +# The client output buffer limits can be used to force disconnection of clients +# that are not reading data from the server fast enough for some reason (a +# common reason is that a Pub/Sub client can't consume messages as fast as the +# publisher can produce them). +# +# The limit can be set differently for the three different classes of clients: +# +# normal -> normal clients including MONITOR clients +# replica -> replica clients +# pubsub -> clients subscribed to at least one pubsub channel or pattern +# +# The syntax of every client-output-buffer-limit directive is the following: +# +# client-output-buffer-limit +# +# A client is immediately disconnected once the hard limit is reached, or if +# the soft limit is reached and remains reached for the specified number of +# seconds (continuously). +# So for instance if the hard limit is 32 megabytes and the soft limit is +# 16 megabytes / 10 seconds, the client will get disconnected immediately +# if the size of the output buffers reach 32 megabytes, but will also get +# disconnected if the client reaches 16 megabytes and continuously overcomes +# the limit for 10 seconds. +# +# By default normal clients are not limited because they don't receive data +# without asking (in a push way), but just after a request, so only +# asynchronous clients may create a scenario where data is requested faster +# than it can read. +# +# Instead there is a default limit for pubsub and replica clients, since +# subscribers and replicas receive data in a push fashion. +# +# Note that it doesn't make sense to set the replica clients output buffer +# limit lower than the repl-backlog-size config (partial sync will succeed +# and then replica will get disconnected). +# Such a configuration is ignored (the size of repl-backlog-size will be used). +# This doesn't have memory consumption implications since the replica client +# will share the backlog buffers memory. +# +# Both the hard or the soft limit can be disabled by setting them to zero. +client-output-buffer-limit normal 0 0 0 +client-output-buffer-limit replica 256mb 64mb 60 +client-output-buffer-limit pubsub 32mb 8mb 60 + +# Client query buffers accumulate new commands. They are limited to a fixed +# amount by default in order to avoid that a protocol desynchronization (for +# instance due to a bug in the client) will lead to unbound memory usage in +# the query buffer. However you can configure it here if you have very special +# needs, such us huge multi/exec requests or alike. +# +# client-query-buffer-limit 1gb + +# In some scenarios client connections can hog up memory leading to OOM +# errors or data eviction. To avoid this we can cap the accumulated memory +# used by all client connections (all pubsub and normal clients). Once we +# reach that limit connections will be dropped by the server freeing up +# memory. The server will attempt to drop the connections using the most +# memory first. We call this mechanism "client eviction". +# +# Client eviction is configured using the maxmemory-clients setting as follows: +# 0 - client eviction is disabled (default) +# +# A memory value can be used for the client eviction threshold, +# for example: +# maxmemory-clients 1g +# +# A percentage value (between 1% and 100%) means the client eviction threshold +# is based on a percentage of the maxmemory setting. For example to set client +# eviction at 5% of maxmemory: +# maxmemory-clients 5% + +# In the Redis protocol, bulk requests, that are, elements representing single +# strings, are normally limited to 512 mb. However you can change this limit +# here, but must be 1mb or greater +# +# proto-max-bulk-len 512mb + +# Redis calls an internal function to perform many background tasks, like +# closing connections of clients in timeout, purging expired keys that are +# never requested, and so forth. +# +# Not all tasks are performed with the same frequency, but Redis checks for +# tasks to perform according to the specified "hz" value. +# +# By default "hz" is set to 10. Raising the value will use more CPU when +# Redis is idle, but at the same time will make Redis more responsive when +# there are many keys expiring at the same time, and timeouts may be +# handled with more precision. +# +# The range is between 1 and 500, however a value over 100 is usually not +# a good idea. Most users should use the default of 10 and raise this up to +# 100 only in environments where very low latency is required. +hz 10 + +# Normally it is useful to have an HZ value which is proportional to the +# number of clients connected. This is useful in order, for instance, to +# avoid too many clients are processed for each background task invocation +# in order to avoid latency spikes. +# +# Since the default HZ value by default is conservatively set to 10, Redis +# offers, and enables by default, the ability to use an adaptive HZ value +# which will temporarily raise when there are many connected clients. +# +# When dynamic HZ is enabled, the actual configured HZ will be used +# as a baseline, but multiples of the configured HZ value will be actually +# used as needed once more clients are connected. In this way an idle +# instance will use very little CPU time while a busy instance will be +# more responsive. +dynamic-hz yes + +# When a child rewrites the AOF file, if the following option is enabled +# the file will be fsync-ed every 4 MB of data generated. This is useful +# in order to commit the file to the disk more incrementally and avoid +# big latency spikes. +aof-rewrite-incremental-fsync yes + +# When redis saves RDB file, if the following option is enabled +# the file will be fsync-ed every 4 MB of data generated. This is useful +# in order to commit the file to the disk more incrementally and avoid +# big latency spikes. +rdb-save-incremental-fsync yes + +# Redis LFU eviction (see maxmemory setting) can be tuned. However it is a good +# idea to start with the default settings and only change them after investigating +# how to improve the performances and how the keys LFU change over time, which +# is possible to inspect via the OBJECT FREQ command. +# +# There are two tunable parameters in the Redis LFU implementation: the +# counter logarithm factor and the counter decay time. It is important to +# understand what the two parameters mean before changing them. +# +# The LFU counter is just 8 bits per key, it's maximum value is 255, so Redis +# uses a probabilistic increment with logarithmic behavior. Given the value +# of the old counter, when a key is accessed, the counter is incremented in +# this way: +# +# 1. A random number R between 0 and 1 is extracted. +# 2. A probability P is calculated as 1/(old_value*lfu_log_factor+1). +# 3. The counter is incremented only if R < P. +# +# The default lfu-log-factor is 10. This is a table of how the frequency +# counter changes with a different number of accesses with different +# logarithmic factors: +# +# +--------+------------+------------+------------+------------+------------+ +# | factor | 100 hits | 1000 hits | 100K hits | 1M hits | 10M hits | +# +--------+------------+------------+------------+------------+------------+ +# | 0 | 104 | 255 | 255 | 255 | 255 | +# +--------+------------+------------+------------+------------+------------+ +# | 1 | 18 | 49 | 255 | 255 | 255 | +# +--------+------------+------------+------------+------------+------------+ +# | 10 | 10 | 18 | 142 | 255 | 255 | +# +--------+------------+------------+------------+------------+------------+ +# | 100 | 8 | 11 | 49 | 143 | 255 | +# +--------+------------+------------+------------+------------+------------+ +# +# NOTE: The above table was obtained by running the following commands: +# +# redis-benchmark -n 1000000 incr foo +# redis-cli object freq foo +# +# NOTE 2: The counter initial value is 5 in order to give new objects a chance +# to accumulate hits. +# +# The counter decay time is the time, in minutes, that must elapse in order +# for the key counter to be divided by two (or decremented if it has a value +# less <= 10). +# +# The default value for the lfu-decay-time is 1. A special value of 0 means to +# decay the counter every time it happens to be scanned. +# +# lfu-log-factor 10 +# lfu-decay-time 1 + +########################### ACTIVE DEFRAGMENTATION ####################### +# +# What is active defragmentation? +# ------------------------------- +# +# Active (online) defragmentation allows a Redis server to compact the +# spaces left between small allocations and deallocations of data in memory, +# thus allowing to reclaim back memory. +# +# Fragmentation is a natural process that happens with every allocator (but +# less so with Jemalloc, fortunately) and certain workloads. Normally a server +# restart is needed in order to lower the fragmentation, or at least to flush +# away all the data and create it again. However thanks to this feature +# implemented by Oran Agra for Redis 4.0 this process can happen at runtime +# in a "hot" way, while the server is running. +# +# Basically when the fragmentation is over a certain level (see the +# configuration options below) Redis will start to create new copies of the +# values in contiguous memory regions by exploiting certain specific Jemalloc +# features (in order to understand if an allocation is causing fragmentation +# and to allocate it in a better place), and at the same time, will release the +# old copies of the data. This process, repeated incrementally for all the keys +# will cause the fragmentation to drop back to normal values. +# +# Important things to understand: +# +# 1. This feature is disabled by default, and only works if you compiled Redis +# to use the copy of Jemalloc we ship with the source code of Redis. +# This is the default with Linux builds. +# +# 2. You never need to enable this feature if you don't have fragmentation +# issues. +# +# 3. Once you experience fragmentation, you can enable this feature when +# needed with the command "CONFIG SET activedefrag yes". +# +# The configuration parameters are able to fine tune the behavior of the +# defragmentation process. If you are not sure about what they mean it is +# a good idea to leave the defaults untouched. + +# Active defragmentation is disabled by default +# activedefrag no + +# Minimum amount of fragmentation waste to start active defrag +# active-defrag-ignore-bytes 100mb + +# Minimum percentage of fragmentation to start active defrag +# active-defrag-threshold-lower 10 + +# Maximum percentage of fragmentation at which we use maximum effort +# active-defrag-threshold-upper 100 + +# Minimal effort for defrag in CPU percentage, to be used when the lower +# threshold is reached +# active-defrag-cycle-min 1 + +# Maximal effort for defrag in CPU percentage, to be used when the upper +# threshold is reached +# active-defrag-cycle-max 25 + +# Maximum number of set/hash/zset/list fields that will be processed from +# the main dictionary scan +# active-defrag-max-scan-fields 1000 + +# Jemalloc background thread for purging will be enabled by default +jemalloc-bg-thread yes + +# It is possible to pin different threads and processes of Redis to specific +# CPUs in your system, in order to maximize the performances of the server. +# This is useful both in order to pin different Redis threads in different +# CPUs, but also in order to make sure that multiple Redis instances running +# in the same host will be pinned to different CPUs. +# +# Normally you can do this using the "taskset" command, however it is also +# possible to this via Redis configuration directly, both in Linux and FreeBSD. +# +# You can pin the server/IO threads, bio threads, aof rewrite child process, and +# the bgsave child process. The syntax to specify the cpu list is the same as +# the taskset command: +# +# Set redis server/io threads to cpu affinity 0,2,4,6: +# server_cpulist 0-7:2 +# +# Set bio threads to cpu affinity 1,3: +# bio_cpulist 1,3 +# +# Set aof rewrite child process to cpu affinity 8,9,10,11: +# aof_rewrite_cpulist 8-11 +# +# Set bgsave child process to cpu affinity 1,10,11 +# bgsave_cpulist 1,10-11 + +# In some cases redis will emit warnings and even refuse to start if it detects +# that the system is in bad state, it is possible to suppress these warnings +# by setting the following config which takes a space delimited list of warnings +# to suppress +# +# ignore-warnings ARM64-COW-BUG \ No newline at end of file From 62d8a00cd07b10e1f5ba615c459aaa2cb797c09b Mon Sep 17 00:00:00 2001 From: CDE90 Date: Sun, 2 Oct 2022 16:46:52 +0100 Subject: [PATCH 0588/1001] Add redis 7 to the README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 37a64c7f..fc39c0da 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Redis 5](/database/redis/redis-5) * [Redis 6](/database/redis/redis-6) +* [Redis 7](/database/redis/redis-7) ### noSQL From f44cdfe32dbf62eeb6fcec68cb426370c67a0bd1 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sun, 2 Oct 2022 18:30:51 +0200 Subject: [PATCH 0589/1001] PhantomBot cleanup --- bots/twitch/phantombot/egg-phantom-bot.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bots/twitch/phantombot/egg-phantom-bot.json b/bots/twitch/phantombot/egg-phantom-bot.json index 49bc0c49..ede55fc3 100644 --- a/bots/twitch/phantombot/egg-phantom-bot.json +++ b/bots/twitch/phantombot/egg-phantom-bot.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-10-01T21:57:23+02:00", + "exported_at": "2022-10-02T18:28:42+02:00", "name": "PhantomBot", "author": "mail@wuffy.eu", "description": "PhantomBot is an actively developed open source interactive Twitch bot with a vibrant community that provides entertainment and moderation for your channel, allowing you to focus on what matters the most to you - your game and your viewers.", @@ -22,8 +22,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# PhantomBot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt -y --no-install-recommends install curl wget ca-certificates unzip\r\n\r\ncd \/tmp\r\n\r\n# Fetching latest github release\r\nif [ -z \"${RELEASE_VERSION}\" ] || [ \"${RELEASE_VERSION}\" == \"master\" ]; then\r\n echo -e \"Using latest Github Master version\"\r\n DOWNLOAD_URL=https:\/\/raw.githubusercontent.com\/PhantomBot\/nightly-build\/master\/PhantomBot-nightly-lin.zip\r\nelse\r\n if [ -z \"${RELEASE_VERSION}\" ] || [ \"${RELEASE_VERSION}\" == \"latest\" ]; then\r\n echo -e \"Using latest release version\"\r\n RELEASE_VERSION=$(curl -s \"https:\/\/api.github.com\/repos\/PhantomBot\/PhantomBot\/releases\/latest\" | grep -e '\"tag_name\"' | sed -E 's\/.*\"([^\"]+)\".*\/\\1\/' | sed 's\/^.\/\/')\r\n fi\r\n DOWNLOAD_URL=https:\/\/github.com\/PhantomBot\/PhantomBot\/releases\/download\/v${RELEASE_VERSION}\/PhantomBot-${RELEASE_VERSION}-lin.zip\r\n echo -e \"${DOWNLOAD_URL}\"\r\nfi\r\n\r\n# Download files\r\ncd \/mnt\/server\r\nwget ${DOWNLOAD_URL}\r\n\r\n# Unzip files and delete the archive\r\nunzip -o PhantomBot-*.zip\r\nrm PhantomBot-*.zip\r\n\r\n# Move unzipped files into the server folder and delete the folder \r\ncp -f -r .\/PhantomBot-*\/* \/mnt\/server\/\r\nrm -rf PhantomBot-*\/\r\n\r\n# Creating default config\r\nif [ ! -f \/mnt\/server\/config\/botlogin.txt ]; then\r\n echo -e \"Creating config\/botlogin.txt\"\r\n cat << EOF > \/mnt\/server\/config\/botlogin.txt\r\n #PhantomBot Configuration File\r\n #\r\n # Here is a list wiht all config values:\r\n # https:\/\/community.phantom.bot\/t\/settings-for-botlogin-txt\/78\r\n #\r\n apioauth=\r\n baseport=\r\n channel=\r\n oauth=\r\n owner=\r\n panelpassword=\r\n paneluser=\r\n user=\r\n youtubekey=\r\n discord_token=\r\nEOF\r\nfi", - "container": "debian:buster-slim", + "script": "#!\/bin\/bash\r\n# PhantomBot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt -y --no-install-recommends install curl wget ca-certificates unzip\r\n\r\ncd \/tmp\r\n\r\n# Fetching latest github release\r\nif [ -z \"${RELEASE_VERSION}\" ] || [ \"${RELEASE_VERSION}\" == \"master\" ]; then\r\n echo -e \"Using latest Github Master version\"\r\n DOWNLOAD_URL=https:\/\/raw.githubusercontent.com\/PhantomBot\/nightly-build\/master\/PhantomBot-nightly-lin.zip\r\nelse\r\n if [ -z \"${RELEASE_VERSION}\" ] || [ \"${RELEASE_VERSION}\" == \"latest\" ]; then\r\n echo -e \"Using latest release version\"\r\n RELEASE_VERSION=$(curl -s \"https:\/\/api.github.com\/repos\/PhantomBot\/PhantomBot\/releases\/latest\" | grep -e '\"tag_name\"' | sed -E 's\/.*\"([^\"]+)\".*\/\\1\/' | sed 's\/^.\/\/')\r\n fi\r\n DOWNLOAD_URL=https:\/\/github.com\/PhantomBot\/PhantomBot\/releases\/download\/v${RELEASE_VERSION}\/PhantomBot-${RELEASE_VERSION}-lin.zip\r\n echo -e \"${DOWNLOAD_URL}\"\r\nfi\r\n\r\n# Download files\r\ncd \/mnt\/server\r\nwget ${DOWNLOAD_URL} -O PhantomBot.zip\r\n\r\n# Unzip files and delete the archive\r\nunzip -o PhantomBot.zip\r\nrm PhantomBot.zip\r\n\r\n# Move unzipped files into the server folder and delete the folder \r\ncp -f -r .\/PhantomBot-*\/* \/mnt\/server\/\r\nrm -rf PhantomBot-*\/\r\n\r\n# Creating default config\r\nif [ ! -f \/mnt\/server\/config\/botlogin.txt ]; then\r\n echo -e \"Creating config\/botlogin.txt\"\r\n cat << EOF > \/mnt\/server\/config\/botlogin.txt\r\n #PhantomBot Configuration File\r\n #\r\n # Here is a list wiht all config values:\r\n # https:\/\/community.phantom.bot\/t\/settings-for-botlogin-txt\/78\r\n #\r\n apioauth=\r\n baseport=\r\n channel=\r\n oauth=\r\n owner=\r\n panelpassword=\r\n paneluser=\r\n user=\r\n youtubekey=\r\n discord_token=\r\nEOF\r\nfi\r\necho \"install finished\"", + "container": "debian:bullseye-slim", "entrypoint": "bash" } }, @@ -109,4 +109,4 @@ "field_type": "text" } ] -} +} \ No newline at end of file From 22d5c49138f8926f7a5df69e1a9478f98e822b1f Mon Sep 17 00:00:00 2001 From: wompmacho <56491202+wompmacho@users.noreply.github.com> Date: Tue, 4 Oct 2022 00:54:17 -0400 Subject: [PATCH 0590/1001] fix for parser https://github.com/parkervcp/eggs/issues/1887#issuecomment-1266383754 --- game_eggs/steamcmd_servers/craftopia/egg-craftopia.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json b/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json index afd4700f..d019795f 100644 --- a/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json +++ b/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-07-19T15:47:00+02:00", + "exported_at": "2022-10-04T00:48:30-04:00", "name": "Craftopia", "author": "info@goover.de", "description": "Craftopia is the brand new multiplayer survival action game made in Japan. We combined many features we find enjoyable, such as hunting, farming, hack-and-slash, building, automation to develop this game.", @@ -17,14 +17,14 @@ "file_denylist": [], "startup": ".\/Craftopia.x86_64", "config": { - "files": "{\r\n \"ServerSetting.ini\": {\r\n \"parser\": \"ini\",\r\n \"find\": {\r\n \"GameWorld.name=\": \"{{server.build.env.WORLD_NAME}}\",\r\n \"Host.port=\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"ServerSetting.ini\": {\r\n \"parser\": \"ini\",\r\n \"find\": {\r\n \"GameWorld.name\": \"{{server.build.env.WORLD_NAME}}\",\r\n \"Host.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"World is loaded!\"\r\n}", "logs": "{}", "stop": "^^C" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n ##\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n ##\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\nmv -f $HOME\/DefaultServerSetting.ini $HOME\/ServerSetting.ini", "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } @@ -61,4 +61,4 @@ "field_type": "text" } ] -} \ No newline at end of file +} From 631ff1d1e12b7bd28dfb9794cd1a8e6662a584cf Mon Sep 17 00:00:00 2001 From: Braastos Date: Wed, 5 Oct 2022 12:24:52 +0200 Subject: [PATCH 0591/1001] Added additional Variables Added Password variable, so a password could be easily used Added World Seed, so that creating a world with a specific world seed would be possible added NPCStream , to manage bandwidth usage --- .../vanilla/egg-terraria-vanilla.json | 64 +++++++++++++++---- 1 file changed, 50 insertions(+), 14 deletions(-) diff --git a/game_eggs/terraria/vanilla/egg-terraria-vanilla.json b/game_eggs/terraria/vanilla/egg-terraria-vanilla.json index fd32d73a..fa3ad39a 100644 --- a/game_eggs/terraria/vanilla/egg-terraria-vanilla.json +++ b/game_eggs/terraria/vanilla/egg-terraria-vanilla.json @@ -1,28 +1,28 @@ { "_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-01-22T05:44:42-05:00", + "exported_at": "2022-10-05T12:17:20+02:00", "name": "Terraria Vanilla", "author": "iamkubi@gmail.com", "description": "Dig, fight, explore, build! Nothing is impossible in this action-packed adventure game.", "features": null, - "images": [ - "ghcr.io\/parkervcp\/yolks:debian" - ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:debian": "ghcr.io\/parkervcp\/yolks:debian" + }, "file_denylist": [], "startup": ".\/TerrariaServer.bin.x86_64 -config serverconfig.txt", "config": { - "files": "{\r\n \"serverconfig.txt\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"worldpath\": \"\/home\/container\/saves\/Worlds\",\r\n \"worldname\": \"{{server.build.env.WORLD_NAME}}\",\r\n \"world\": \"\/home\/container\/saves\/Worlds\/{{server.build.env.WORLD_NAME}}.wld\",\r\n \"difficulty\": \"{{server.build.env.WORLD_DIFFICULTY}}\",\r\n \"autocreate\": \"{{server.build.env.WORLD_SIZE}}\",\r\n \"port\": \"{{server.build.default.port}}\",\r\n \"maxplayers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"motd\": \"{{server.build.env.SERVER_MOTD}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"serverconfig.txt\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"worldpath\": \"\/home\/container\/saves\/Worlds\",\r\n \"worldname\": \"{{server.build.env.WORLD_NAME}}\",\r\n \"world\": \"\/home\/container\/saves\/Worlds\/{{server.build.env.WORLD_NAME}}.wld\",\r\n \"difficulty\": \"{{server.build.env.WORLD_DIFFICULTY}}\",\r\n \"autocreate\": \"{{server.build.env.WORLD_SIZE}}\",\r\n \"port\": \"{{server.build.default.port}}\",\r\n \"maxplayers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"motd\": \"{{server.build.env.SERVER_MOTD}}\",\r\n \"seed\": \"{{server.build.env.WORLD_SEED}}\",\r\n \"password\": \"{{server.build.env.PASSWORD}}\",\r\n \"npcstream\": \"{{server.build.env.NPCSTREAM}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Type 'help' for a list of commands\"\r\n}", "logs": "{}", "stop": "exit" }, "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 unzip\r\n\r\nDOWNLOAD_LINK=invalid\r\n\r\nmkdir -p \/mnt\/server\/\r\ncd \/mnt\/server\/\r\n\r\nif [ \"${TERRARIA_VERSION}\" == \"latest\" ] || [ \"${TERRARIA_VERSION}\" == \"\" ] ; then\r\n DOWNLOAD_LINK=$(curl -sSL https:\/\/terraria.gamepedia.com\/Server#Downloads | grep '>Terraria Server ' | grep -Eoi '      ]+>' | grep -Eo 'href=\\\"[^\\\\\\\"]+\\\"' | grep -Eo '(http|https):\\\/\\\/[^\\\"]+' | tail -1 | cut -d'?' -f1)\r\nelse\r\n CLEAN_VERSION=$(echo ${TERRARIA_VERSION} | sed 's\/\\.\/\/g')\r\n echo -e \"Downloading terraria server files\"\r\n DOWNLOAD_LINK=$(curl -sSL https:\/\/terraria.gamepedia.com\/Server#Downloads | grep '>Terraria Server ' | grep -Eoi ']+>' | grep -Eo 'href=\\\"[^\\\\\\\"]+\\\"' | grep -Eo '(http|https):\\\/\\\/[^\\\"]+' | grep \"${CLEAN_VERSION}\" | cut -d'?' -f1)\r\nfi \r\n\r\n## this is a simple script to validate a download url actaully exists\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}; then\r\n echo -e \"link is valid.\"\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\nCLEAN_VERSION=$(echo ${DOWNLOAD_LINK##*\/} | cut -d'-' -f3 | cut -d'.' -f1)\r\n\r\necho -e \"running 'curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}'\" \r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho -e \"Unpacking server files\"\r\nunzip ${DOWNLOAD_LINK##*\/}\r\n\r\necho -e \"\"\r\ncp -R ${CLEAN_VERSION}\/Linux\/* .\/\r\nchmod +x TerrariaServer.bin.x86_64\r\n\r\necho -e \"Cleaning up extra files.\"\r\nrm -rf ${CLEAN_VERSION}\r\n\r\necho -e \"Generating config file\"\r\ncat < serverconfig.txt\r\nworldpath=\/home\/container\/saves\/Worlds\r\nworldname=default\r\nworld=\/home\/container\/saves\/Worlds\/default.wld\r\ndifficulty=3\r\nautocreate=1\r\nport=7777\r\nmaxplayers=8\r\nEOF\r\n\r\nmkdir -p \/mnt\/server\/saves\/Worlds\r\n\r\necho -e \"Install complete\"", + "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 unzip\r\n\r\nDOWNLOAD_LINK=invalid\r\n\r\nmkdir -p \/mnt\/server\/\r\ncd \/mnt\/server\/\r\n\r\nif [ \"${TERRARIA_VERSION}\" == \"latest\" ] || [ \"${TERRARIA_VERSION}\" == \"\" ] ; then\r\n DOWNLOAD_LINK=$(curl -sSL https:\/\/terraria.wiki.gg\/wiki\/Server#Downloads | grep '>Terraria Server ' | grep -Eoi ']+>' | grep -Eo 'href=\\\"[^\\\\\\\"]+\\\"' | grep -Eo '(http|https):\\\/\\\/[^\\\"]+' | tail -1 | cut -d'?' -f1)\r\nelse\r\n CLEAN_VERSION=$(echo ${TERRARIA_VERSION} | sed 's\/\\.\/\/g')\r\n echo -e \"Downloading terraria server files\"\r\n DOWNLOAD_LINK=$(curl -sSL https:\/\/terraria.wiki.gg\/wiki\/Server#Downloads | grep '>Terraria Server ' | grep -Eoi ']+>' | grep -Eo 'href=\\\"[^\\\\\\\"]+\\\"' | grep -Eo '(http|https):\\\/\\\/[^\\\"]+' | grep \"${CLEAN_VERSION}\" | cut -d'?' -f1)\r\nfi \r\n\r\n## this is a simple script to validate a download url actaully exists\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}; then\r\n echo -e \"link is valid.\"\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\nCLEAN_VERSION=$(echo ${DOWNLOAD_LINK##*\/} | cut -d'-' -f3 | cut -d'.' -f1)\r\n\r\necho -e \"running 'curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}'\" \r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho -e \"Unpacking server files\"\r\nunzip ${DOWNLOAD_LINK##*\/}\r\n\r\necho -e \"\"\r\ncp -R ${CLEAN_VERSION}\/Linux\/* .\/\r\nchmod +x TerrariaServer.bin.x86_64\r\n\r\necho -e \"Cleaning up extra files.\"\r\nrm -rf ${CLEAN_VERSION}\r\n\r\necho -e \"Generating config file\"\r\ncat < serverconfig.txt\r\nworldpath=\/home\/container\/saves\/Worlds\r\nworldname=default\r\nworld=\/home\/container\/saves\/Worlds\/default.wld\r\ndifficulty=3\r\nautocreate=1\r\nport=7777\r\nmaxplayers=8\r\nEOF\r\n\r\nmkdir -p \/mnt\/server\/saves\/Worlds\r\n\r\necho -e \"Install complete\"", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -30,12 +30,13 @@ "variables": [ { "name": "Terraria version", - "description": "the version of Terraria that is to be used.\r\n\r\nYou can use the full version number or the file number. (ex. 1.3.5.3 or 1353)\r\n\r\nGet version numbers here - https:\/\/terraria.gamepedia.com\/Server#Downloads", + "description": "the version of Terraria that is to be used.\r\n\r\nYou can use the full version number or the file number. (ex. 1.3.5.3 or 1353)\r\n\r\nGet version numbers here - https:\/\/terraria.wiki.gg\/wiki\/Server#Downloads", "env_variable": "TERRARIA_VERSION", "default_value": "latest", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" }, { "name": "World Name", @@ -44,7 +45,8 @@ "default_value": "world", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" }, { "name": "Max Players", @@ -53,7 +55,8 @@ "default_value": "8", "user_viewable": true, "user_editable": true, - "rules": "required|numeric|max:255" + "rules": "required|numeric|max:255", + "field_type": "text" }, { "name": "World Size", @@ -62,7 +65,8 @@ "default_value": "1", "user_viewable": true, "user_editable": true, - "rules": "required|numeric|in:1,2,3" + "rules": "required|numeric|in:1,2,3", + "field_type": "text" }, { "name": "Difficulty", @@ -71,7 +75,8 @@ "default_value": "3", "user_viewable": true, "user_editable": true, - "rules": "required|numeric|in:0,1,2,3" + "rules": "required|numeric|in:0,1,2,3", + "field_type": "text" }, { "name": "MOTD", @@ -80,7 +85,38 @@ "default_value": "Welcome!", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:128" + "rules": "required|string|max:128", + "field_type": "text" + }, + { + "name": "World Seed", + "description": "The Seed to use when creating the World", + "env_variable": "WORLD_SEED", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|max:20", + "field_type": "text" + }, + { + "name": "Password", + "description": "The password which should be used.", + "env_variable": "PASSWORD", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string", + "field_type": "text" + }, + { + "name": "NPCStream", + "description": "Reduces enemy skipping but increases bandwidth usage. The lower the number the less skipping will happen, but more data is sent. 0 is off.", + "env_variable": "NPCSTREAM", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "required|int|between:0,60", + "field_type": "text" } ] } From 1ff83ba2deccb34841fbcaea8304a5f4e06a3126 Mon Sep 17 00:00:00 2001 From: PsychoZander <62998704+PsychoZander@users.noreply.github.com> Date: Wed, 5 Oct 2022 13:00:10 +0100 Subject: [PATCH 0592/1001] Create Clusterio Egg --- .../factorio/clusterio/egg-clusterio.json | 116 ++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 game_eggs/factorio/clusterio/egg-clusterio.json diff --git a/game_eggs/factorio/clusterio/egg-clusterio.json b/game_eggs/factorio/clusterio/egg-clusterio.json new file mode 100644 index 00000000..e8f72876 --- /dev/null +++ b/game_eggs/factorio/clusterio/egg-clusterio.json @@ -0,0 +1,116 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2022-10-05T12:57:53+01:00", + "name": "Clusterio", + "author": "psychoalex@thevcbc.com", + "description": "a generic node.js egg\r\n\r\nThis will clone a git repo. it defaults to master if no branch is specified.\r\n\r\nInstalls the node_modules on install. If you set user_upload then I assume you know what you are doing.", + "features": null, + "docker_images": { + "ghcr.io\/parkervcp\/yolks:nodejs_17": "ghcr.io\/parkervcp\/yolks:nodejs_17", + "ghcr.io\/parkervcp\/yolks:nodejs_16": "ghcr.io\/parkervcp\/yolks:nodejs_16", + "ghcr.io\/parkervcp\/yolks:nodejs_15": "ghcr.io\/parkervcp\/yolks:nodejs_15", + "ghcr.io\/parkervcp\/yolks:nodejs_14": "ghcr.io\/parkervcp\/yolks:nodejs_14", + "ghcr.io\/parkervcp\/yolks:nodejs_12": "ghcr.io\/parkervcp\/yolks:nodejs_12" + }, + "file_denylist": [], + "startup": "exec .\/node_modules\/.bin\/clusterio{{SERVER_MODE}} run", + "config": { + "files": "{\r\n \"config-master.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"groups[0].fields.http_port\": \"{{server.build.default.port}}\",\r\n\t\t\t\"groups[0].fields.name\": \"{{server.build.env.CLUSTER_NAME}}\"\r\n }\r\n },\r\n\t\"config-slave.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"groups[0].fields.master_url\": \"{{server.build.env.MASTER_URL}}\",\r\n\t\t\t\"groups[0].fields.master_token\": \"{{server.build.env.MASTER_TOKEN}}\",\r\n\t\t\t\"groups[0].fields.public_address\": \"{{server.build.default.ip}}:{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Started\"\r\n}", + "logs": "{}", + "stop": "^c" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# Clusterio Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git curl jq file unzip make gcc g++ python python-dev libtool\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n echo -e \"assuming user knows what they are doing have a good day.\"\r\n exit 0\r\nfi\r\n\r\ncase \"${SERVER_MODE}\" in\r\n\r\n \"master\")\r\n echo -e \"Initialising Clustorio In Master mode\"\r\n npm init \"@clusterio\" --allow-install-as-root --mode \"${SERVER_MODE}\" --download-headless --log-level \"${LOG_LEVEL}\" --admin \"${ADMIN_STRING}\" --public-address \"${SERVER_IP}\":\"${SERVER_PORT}\" --plugins ${PLUGINS}\r\n\t;;\r\n\r\n \"slave\")\r\n echo -e \"Initialising Clustorio In Slave mode\"\r\n\tnpm init \"@clusterio\" --allow-install-as-root --mode \"${SERVER_MODE}\" --download-headless --log-level \"${LOG_LEVEL}\" --slave-name \"${SLAVE_NAME}\" --public-address \"${SERVER_IP}\":\"${SERVER_PORT}\" --master-url \"${MASTER_URL}\" --master-token \"${MASTER_TOKEN}\" --plugins ${PLUGINS}\r\n ;;\r\n \r\nesac\r\n\r\necho -e \"install complete\"\r\nexit 0", + "container": "node:14-buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Server Mode", + "description": "Set's the cluster operation mode of the server, can be either \"master\" or \"slave\".\r\n\r\nRequired on:\r\nAll", + "env_variable": "SERVER_MODE", + "default_value": "master", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:master,slave", + "field_type": "text" + }, + { + "name": "Log Level", + "description": "Options: \"none\", \"fatal\", \"error\", \"warn\", \"audit\", \"info\", \"verbose\"\r\n\r\nRequired on:\r\nAll", + "env_variable": "LOG_LEVEL", + "default_value": "info", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:none,fatal,error,warn,audit,info,verbose", + "field_type": "text" + }, + { + "name": "Server Admin", + "description": "Superadmin account name\r\n\r\nRequired on:\r\nMaster", + "env_variable": "ADMIN_STRING", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:64", + "field_type": "text" + }, + { + "name": "Slave Name", + "description": "Slave name in the Master Web UI\r\n\r\nRequired on:\r\nSlave", + "env_variable": "SLAVE_NAME", + "default_value": "Your Sub-Server", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|max:20", + "field_type": "text" + }, + { + "name": "Master URL", + "description": "Connection URL to the Master server, can be an internal address if you have allocated an additional internal port to the Master Server.\r\n\r\nRequired on:\r\nSlave", + "env_variable": "MASTER_URL", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|max:64", + "field_type": "text" + }, + { + "name": "Master Token", + "description": "Authentication token used to connect to the Master server, generated through the Master Web UI.\r\n\r\nRequired on:\r\nSlave", + "env_variable": "MASTER_TOKEN", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|max:256", + "field_type": "text" + }, + { + "name": "Plugins", + "description": "Clusterio Plugins to install, space separate list.\r\n\r\nExample:\r\n@clusterio\/plugin-subspace_storage @clusterio\/plugin-global_chat @clusterio\/plugin-research_sync @clusterio\/plugin-inventory_sync\r\n\r\nRequired on:\r\nAll", + "env_variable": "PLUGINS", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|max:512", + "field_type": "text" + }, + { + "name": "Cluster Name", + "description": "The Name of your Master server cluster.\r\n\r\nRequired:\r\nMaster", + "env_variable": "CLUSTER_NAME", + "default_value": "Your Cluster", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|max:20", + "field_type": "text" + } + ] +} From 586f1a42ef5756af9497fa32bf4a43f90996d63d Mon Sep 17 00:00:00 2001 From: PsychoZander <62998704+PsychoZander@users.noreply.github.com> Date: Wed, 5 Oct 2022 13:34:52 +0100 Subject: [PATCH 0593/1001] Create README.md --- game_eggs/factorio/clusterio/README.md | 47 ++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 game_eggs/factorio/clusterio/README.md diff --git a/game_eggs/factorio/clusterio/README.md b/game_eggs/factorio/clusterio/README.md new file mode 100644 index 00000000..6552882b --- /dev/null +++ b/game_eggs/factorio/clusterio/README.md @@ -0,0 +1,47 @@ +# Clusterio + +## Introduction + +Clusterio (https://github.com/clusterio/clusterio) is a clustered Factorio server manager that provides the tooling for implementing cross server interactions in Factorio. +It was previously best known for implementing cross server transfer and cloud storage of items via teleporter chests. +But this functionality has been pulled out of Clusterio into its own plugin for Clusterio named [Subspace Storage](https://github.com/clusterio/subspace_storage). + +By itself Clusterio doesn't change the gameplay in any way, you could even use Clusterio to manage completely vanilla Factorio servers. +Plugins do the work of modding in the visible changes into the game, see the [Plugins section](#plugins) for ready-made plugins you can install into a Clusterio cluster. + +## Features + +- Clustered Factorio server management allowing you manage the running of Factorio servers across a fleet of physical servers from both a web interface and a command line interface. + +- User list management for synchronizing in-game admins, whitelisted users, and bans to all the servers in the cluster. + +- Integrated support for exporting statistics for the whole cluster to Prometheus via a single metrics endpoint. + +- Extensive plugin support for adding your own cross server features to Factorio using Clusterio's communication backbone. + +## Setup + +Clusterio uses a Master/Slave system setup, with the Master server running the Web UI and controlling which Slaves run which Instances. + +The Master server runs a web server that needs to be reachable for cluster management by the user, and by the other nodes to manage them. + +The Slave server runs the factorio server, and will need any mods manually importing at this time, including the Factorio mods for the Clustorio Library(https://mods.factorio.com/mod/clusterio_lib) and Subspace Storage(https://mods.factorio.com/mod/subspace_storage). + +Both only require a single port each. + +Server Mode controls if the server is a master or slave, and each varaible is labeled as required for Master, Slave or All. Please ensure you fill in all required variables. + +Set up the master server first, and from there you can generate the Master URL and Master Token required for the slave servers to connect. + +Additional configuration options can be found in config-master.json and config-slave.json as relevant. + +Changes to the Cluster will only be written out to the database on a graceful stop. + +## Server Ports + +Clusterio requires a single port + +| Port | default | +|------------|------------| +| Master HTTP| 8081 | +| Slave Game | 34197 | From 642139e53956d9227020282dc0d4734f1765813f Mon Sep 17 00:00:00 2001 From: PsychoZander <62998704+PsychoZander@users.noreply.github.com> Date: Wed, 5 Oct 2022 13:36:26 +0100 Subject: [PATCH 0594/1001] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 37a64c7f..687f68c7 100644 --- a/README.md +++ b/README.md @@ -113,6 +113,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Vanilla](game_eggs/factorio/factorio) * [ModUpdate](game_eggs/factorio/factorio-modupdate) +* [Clusterio](game_eggs/factorio/clusterio) [Grand Theft Auto](game_eggs/gta) From 1d343ff3349164b1b29118d902e5cb44a65dee1b Mon Sep 17 00:00:00 2001 From: PsychoZander <62998704+PsychoZander@users.noreply.github.com> Date: Wed, 5 Oct 2022 14:44:43 +0100 Subject: [PATCH 0595/1001] Update README.md --- game_eggs/factorio/clusterio/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/game_eggs/factorio/clusterio/README.md b/game_eggs/factorio/clusterio/README.md index 6552882b..471f577d 100644 --- a/game_eggs/factorio/clusterio/README.md +++ b/game_eggs/factorio/clusterio/README.md @@ -1,5 +1,7 @@ # Clusterio +*A Note on terminology. The developers of Clustorio are using the rather outdated Master/Slave terms for Primary/Secondary or Management/Processing nodes. We will use them in this guide and egg to avoid confusion, but would prefer a more modern set of terminology.* + ## Introduction Clusterio (https://github.com/clusterio/clusterio) is a clustered Factorio server manager that provides the tooling for implementing cross server interactions in Factorio. From 64c21293a2186bf9a37bb692268d935da68b1661 Mon Sep 17 00:00:00 2001 From: PsychoZander <62998704+PsychoZander@users.noreply.github.com> Date: Wed, 5 Oct 2022 14:48:57 +0100 Subject: [PATCH 0596/1001] Update egg-clusterio.json --- game_eggs/factorio/clusterio/egg-clusterio.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/factorio/clusterio/egg-clusterio.json b/game_eggs/factorio/clusterio/egg-clusterio.json index e8f72876..1cd62107 100644 --- a/game_eggs/factorio/clusterio/egg-clusterio.json +++ b/game_eggs/factorio/clusterio/egg-clusterio.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-10-05T12:57:53+01:00", + "exported_at": "2022-10-05T14:47:36+01:00", "name": "Clusterio", "author": "psychoalex@thevcbc.com", "description": "a generic node.js egg\r\n\r\nThis will clone a git repo. it defaults to master if no branch is specified.\r\n\r\nInstalls the node_modules on install. If you set user_upload then I assume you know what you are doing.", @@ -19,7 +19,7 @@ "file_denylist": [], "startup": "exec .\/node_modules\/.bin\/clusterio{{SERVER_MODE}} run", "config": { - "files": "{\r\n \"config-master.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"groups[0].fields.http_port\": \"{{server.build.default.port}}\",\r\n\t\t\t\"groups[0].fields.name\": \"{{server.build.env.CLUSTER_NAME}}\"\r\n }\r\n },\r\n\t\"config-slave.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"groups[0].fields.master_url\": \"{{server.build.env.MASTER_URL}}\",\r\n\t\t\t\"groups[0].fields.master_token\": \"{{server.build.env.MASTER_TOKEN}}\",\r\n\t\t\t\"groups[0].fields.public_address\": \"{{server.build.default.ip}}:{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"config-master.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"groups[0].fields.http_port\": \"{{server.build.default.port}}\",\r\n \"groups[0].fields.name\": \"{{server.build.env.CLUSTER_NAME}}\"\r\n }\r\n },\r\n \"config-slave.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"groups[0].fields.master_url\": \"{{server.build.env.MASTER_URL}}\",\r\n \"groups[0].fields.master_token\": \"{{server.build.env.MASTER_TOKEN}}\",\r\n \"groups[0].fields.public_address\": \"{{server.build.default.ip}}:{{server.build.default.port}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Started\"\r\n}", "logs": "{}", "stop": "^c" @@ -34,7 +34,7 @@ "variables": [ { "name": "Server Mode", - "description": "Set's the cluster operation mode of the server, can be either \"master\" or \"slave\".\r\n\r\nRequired on:\r\nAll", + "description": "Set's the cluster operation mode of the server, can be either \"master\" or \"slave\". This is better thought of as Management or Gameserver nodes.\r\n\r\nRequired on:\r\nAll", "env_variable": "SERVER_MODE", "default_value": "master", "user_viewable": true, From 9470b13ad6fc031fffa82c853248bcb5b1d35364 Mon Sep 17 00:00:00 2001 From: PsychoZander <62998704+PsychoZander@users.noreply.github.com> Date: Wed, 5 Oct 2022 16:33:09 +0100 Subject: [PATCH 0597/1001] Update egg-clusterio.json --- game_eggs/factorio/clusterio/egg-clusterio.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/game_eggs/factorio/clusterio/egg-clusterio.json b/game_eggs/factorio/clusterio/egg-clusterio.json index 1cd62107..64b4b207 100644 --- a/game_eggs/factorio/clusterio/egg-clusterio.json +++ b/game_eggs/factorio/clusterio/egg-clusterio.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-10-05T14:47:36+01:00", + "exported_at": "2022-10-05T16:32:34+01:00", "name": "Clusterio", "author": "psychoalex@thevcbc.com", "description": "a generic node.js egg\r\n\r\nThis will clone a git repo. it defaults to master if no branch is specified.\r\n\r\nInstalls the node_modules on install. If you set user_upload then I assume you know what you are doing.", @@ -19,14 +19,14 @@ "file_denylist": [], "startup": "exec .\/node_modules\/.bin\/clusterio{{SERVER_MODE}} run", "config": { - "files": "{\r\n \"config-master.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"groups[0].fields.http_port\": \"{{server.build.default.port}}\",\r\n \"groups[0].fields.name\": \"{{server.build.env.CLUSTER_NAME}}\"\r\n }\r\n },\r\n \"config-slave.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"groups[0].fields.master_url\": \"{{server.build.env.MASTER_URL}}\",\r\n \"groups[0].fields.master_token\": \"{{server.build.env.MASTER_TOKEN}}\",\r\n \"groups[0].fields.public_address\": \"{{server.build.default.ip}}:{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"config-master.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"groups[0].fields.http_port\": \"{{server.build.default.port}}\",\r\n \"groups[0].fields.name\": \"{{server.build.env.CLUSTER_NAME}}\"\r\n }\r\n },\r\n \"config-slave.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"groups[0].fields.master_url\": \"{{server.build.env.MASTER_URL}}\",\r\n \"groups[0].fields.master_token\": \"{{server.build.env.MASTER_TOKEN}}\",\r\n \"groups[0].fields.public_address\": \"{{server.build.default.ip}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Started\"\r\n}", "logs": "{}", "stop": "^c" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Clusterio Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git curl jq file unzip make gcc g++ python python-dev libtool\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n echo -e \"assuming user knows what they are doing have a good day.\"\r\n exit 0\r\nfi\r\n\r\ncase \"${SERVER_MODE}\" in\r\n\r\n \"master\")\r\n echo -e \"Initialising Clustorio In Master mode\"\r\n npm init \"@clusterio\" --allow-install-as-root --mode \"${SERVER_MODE}\" --download-headless --log-level \"${LOG_LEVEL}\" --admin \"${ADMIN_STRING}\" --public-address \"${SERVER_IP}\":\"${SERVER_PORT}\" --plugins ${PLUGINS}\r\n\t;;\r\n\r\n \"slave\")\r\n echo -e \"Initialising Clustorio In Slave mode\"\r\n\tnpm init \"@clusterio\" --allow-install-as-root --mode \"${SERVER_MODE}\" --download-headless --log-level \"${LOG_LEVEL}\" --slave-name \"${SLAVE_NAME}\" --public-address \"${SERVER_IP}\":\"${SERVER_PORT}\" --master-url \"${MASTER_URL}\" --master-token \"${MASTER_TOKEN}\" --plugins ${PLUGINS}\r\n ;;\r\n \r\nesac\r\n\r\necho -e \"install complete\"\r\nexit 0", + "script": "#!\/bin\/bash\r\n# Clusterio Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git curl jq file unzip make gcc g++ python python-dev libtool\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n echo -e \"assuming user knows what they are doing have a good day.\"\r\n exit 0\r\nfi\r\n\r\ncase \"${SERVER_MODE}\" in\r\n\r\n \"master\")\r\n echo -e \"Initialising Clustorio In Master mode\"\r\n npm init \"@clusterio\" --allow-install-as-root --mode \"${SERVER_MODE}\" --download-headless --log-level \"${LOG_LEVEL}\" --admin \"${ADMIN_STRING}\" --public-address \"${SERVER_IP}\":\"${SERVER_PORT}\" --plugins ${PLUGINS}\r\n\t;;\r\n\r\n \"slave\")\r\n echo -e \"Initialising Clustorio In Slave mode\"\r\n\tnpm init \"@clusterio\" --allow-install-as-root --mode \"${SERVER_MODE}\" --download-headless --log-level \"${LOG_LEVEL}\" --slave-name \"${SLAVE_NAME}\" --public-address \"${SERVER_IP}\" --master-url \"${MASTER_URL}\" --master-token \"${MASTER_TOKEN}\" --plugins ${PLUGINS}\r\n ;;\r\n \r\nesac\r\n\r\necho -e \"install complete\"\r\nexit 0", "container": "node:14-buster-slim", "entrypoint": "bash" } @@ -74,7 +74,7 @@ }, { "name": "Master URL", - "description": "Connection URL to the Master server, can be an internal address if you have allocated an additional internal port to the Master Server.\r\n\r\nRequired on:\r\nSlave", + "description": "Connection URL to the Master server, can be an internal address if you have allocated an additional internal port to the Master Server.\r\nExample: http:\/\/yourip:yourport\r\nRequired on:\r\nSlave", "env_variable": "MASTER_URL", "default_value": "", "user_viewable": true, From acdc7a720716be22addccac533a9d66d51b00d51 Mon Sep 17 00:00:00 2001 From: PsychoZander <62998704+PsychoZander@users.noreply.github.com> Date: Wed, 5 Oct 2022 16:33:52 +0100 Subject: [PATCH 0598/1001] Update egg-clusterio.json --- game_eggs/factorio/clusterio/egg-clusterio.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/factorio/clusterio/egg-clusterio.json b/game_eggs/factorio/clusterio/egg-clusterio.json index 64b4b207..d6a40f84 100644 --- a/game_eggs/factorio/clusterio/egg-clusterio.json +++ b/game_eggs/factorio/clusterio/egg-clusterio.json @@ -4,10 +4,10 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-10-05T16:32:34+01:00", + "exported_at": "2022-10-05T16:33:36+01:00", "name": "Clusterio", "author": "psychoalex@thevcbc.com", - "description": "a generic node.js egg\r\n\r\nThis will clone a git repo. it defaults to master if no branch is specified.\r\n\r\nInstalls the node_modules on install. If you set user_upload then I assume you know what you are doing.", + "description": "Clusterio is a clustered Factorio server manager that provides the tooling for implementing cross server interactions in Factorio. It was previously best known for implementing cross server transfer and cloud storage of items via teleporter chests. But this functionality has been pulled out of Clusterio into its own plugin for Clusterio named Subspace Storage.\r\n\r\nBy itself Clusterio doesn't change the gameplay in any way, you could even use Clusterio to manage completely vanilla Factorio servers. Plugins do the work of modding in the visible changes into the game, see the Plugins section for ready-made plugins you can install into a Clusterio cluster.", "features": null, "docker_images": { "ghcr.io\/parkervcp\/yolks:nodejs_17": "ghcr.io\/parkervcp\/yolks:nodejs_17", From 0dd6ff7e43d7df351135eb96534bb0ecfe6b2357 Mon Sep 17 00:00:00 2001 From: PsychoZander <62998704+PsychoZander@users.noreply.github.com> Date: Wed, 5 Oct 2022 16:35:01 +0100 Subject: [PATCH 0599/1001] Update egg-clusterio.json --- game_eggs/factorio/clusterio/egg-clusterio.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/factorio/clusterio/egg-clusterio.json b/game_eggs/factorio/clusterio/egg-clusterio.json index d6a40f84..61e011fe 100644 --- a/game_eggs/factorio/clusterio/egg-clusterio.json +++ b/game_eggs/factorio/clusterio/egg-clusterio.json @@ -4,10 +4,10 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-10-05T16:33:36+01:00", + "exported_at": "2022-10-05T16:34:47+01:00", "name": "Clusterio", "author": "psychoalex@thevcbc.com", - "description": "Clusterio is a clustered Factorio server manager that provides the tooling for implementing cross server interactions in Factorio. It was previously best known for implementing cross server transfer and cloud storage of items via teleporter chests. But this functionality has been pulled out of Clusterio into its own plugin for Clusterio named Subspace Storage.\r\n\r\nBy itself Clusterio doesn't change the gameplay in any way, you could even use Clusterio to manage completely vanilla Factorio servers. Plugins do the work of modding in the visible changes into the game, see the Plugins section for ready-made plugins you can install into a Clusterio cluster.", + "description": "Clusterio is a clustered Factorio server manager that provides the tooling for implementing cross server interactions in Factorio. It was previously best known for implementing cross server transfer and cloud storage of items via teleporter chests. But this functionality has been pulled out of Clusterio into its own plugin for Clusterio named Subspace Storage.\r\n\r\nBy itself Clusterio doesn't change the gameplay in any way, you could even use Clusterio to manage completely vanilla Factorio servers. Plugins do the work of modding in the visible changes into the game, see the Plugins section for ready-made plugins you can install into a Clusterio cluster.\r\n\r\nA Note on terminology. The developers of Clustorio are using the rather outdated Master\/Slave terms for Primary\/Secondary or Management\/Processing nodes. We will use them in this guide and egg to avoid confusion, but would prefer a more modern set of terminology.", "features": null, "docker_images": { "ghcr.io\/parkervcp\/yolks:nodejs_17": "ghcr.io\/parkervcp\/yolks:nodejs_17", From 1871bf09d76d7ffddf591ffb44341eef3b2260e2 Mon Sep 17 00:00:00 2001 From: PsychoZander <62998704+PsychoZander@users.noreply.github.com> Date: Wed, 5 Oct 2022 16:38:14 +0100 Subject: [PATCH 0600/1001] Update egg-clusterio.json From bbcade3de2578c0eaeec1ae568d9d902bf3f0e9a Mon Sep 17 00:00:00 2001 From: RADICALAdrift <57268573+RADICALAdrift@users.noreply.github.com> Date: Wed, 5 Oct 2022 18:44:02 +0100 Subject: [PATCH 0601/1001] Update egg-clusterio.json Updated a couple of the Variables descriptions Namely "Master Token, Plugins, Cluster Name" with what i feel is better terminology for each description though the plugins description may be too much now i think about it --- game_eggs/factorio/clusterio/egg-clusterio.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/game_eggs/factorio/clusterio/egg-clusterio.json b/game_eggs/factorio/clusterio/egg-clusterio.json index 61e011fe..71761956 100644 --- a/game_eggs/factorio/clusterio/egg-clusterio.json +++ b/game_eggs/factorio/clusterio/egg-clusterio.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-10-05T16:34:47+01:00", + "exported_at": "2022-10-05T18:37:01-04:00", "name": "Clusterio", "author": "psychoalex@thevcbc.com", "description": "Clusterio is a clustered Factorio server manager that provides the tooling for implementing cross server interactions in Factorio. It was previously best known for implementing cross server transfer and cloud storage of items via teleporter chests. But this functionality has been pulled out of Clusterio into its own plugin for Clusterio named Subspace Storage.\r\n\r\nBy itself Clusterio doesn't change the gameplay in any way, you could even use Clusterio to manage completely vanilla Factorio servers. Plugins do the work of modding in the visible changes into the game, see the Plugins section for ready-made plugins you can install into a Clusterio cluster.\r\n\r\nA Note on terminology. The developers of Clustorio are using the rather outdated Master\/Slave terms for Primary\/Secondary or Management\/Processing nodes. We will use them in this guide and egg to avoid confusion, but would prefer a more modern set of terminology.", @@ -74,7 +74,7 @@ }, { "name": "Master URL", - "description": "Connection URL to the Master server, can be an internal address if you have allocated an additional internal port to the Master Server.\r\nExample: http:\/\/yourip:yourport\r\nRequired on:\r\nSlave", + "description": "Connection URL to the Master server, can be an internal address if you have allocated an additional internal port to the Master Server.\r\n\r\nExample: http:\/\/yourip:yourport\/\r\n\r\nRequired on:\r\nSlave", "env_variable": "MASTER_URL", "default_value": "", "user_viewable": true, @@ -84,7 +84,7 @@ }, { "name": "Master Token", - "description": "Authentication token used to connect to the Master server, generated through the Master Web UI.\r\n\r\nRequired on:\r\nSlave", + "description": "Authentication token used to connect to the Master server, Must be generated through the Master Web UI after setting up and logging into the Master Web UI using the admin auth token generated when setting up the Master.\r\n\r\nRequired on:\r\nSlave", "env_variable": "MASTER_TOKEN", "default_value": "", "user_viewable": true, @@ -94,7 +94,7 @@ }, { "name": "Plugins", - "description": "Clusterio Plugins to install, space separate list.\r\n\r\nExample:\r\n@clusterio\/plugin-subspace_storage @clusterio\/plugin-global_chat @clusterio\/plugin-research_sync @clusterio\/plugin-inventory_sync\r\n\r\nRequired on:\r\nAll", + "description": "Clusterio Plugins to install, space separate list.\r\n\r\nExample:\r\n@clusterio\/plugin-global_chat @clusterio\/plugin-research_sync @clusterio\/plugin-statistics_exporter @clusterio\/plugin-player_auth @clusterio\/plugin-inventory_sync @hornwitser\/server_select \r\nOptional Extras:\r\n@clusterio\/plugin-subspace_storage (requires the mod to be downloaded)\r\n\r\nRequired on:\r\nAll", "env_variable": "PLUGINS", "default_value": "", "user_viewable": true, @@ -104,7 +104,7 @@ }, { "name": "Cluster Name", - "description": "The Name of your Master server cluster.\r\n\r\nRequired:\r\nMaster", + "description": "The Name of your Cluster Master server.\r\n\r\nRequired:\r\nMaster", "env_variable": "CLUSTER_NAME", "default_value": "Your Cluster", "user_viewable": true, From 983780b2ecf656d253f4e3669dbe2c201af0f81e Mon Sep 17 00:00:00 2001 From: RADICALAdrift <57268573+RADICALAdrift@users.noreply.github.com> Date: Wed, 5 Oct 2022 19:09:24 +0100 Subject: [PATCH 0602/1001] Update egg-clusterio.json Plugins Variable description updated "Still a lot of text but makes more sense now" --- game_eggs/factorio/clusterio/egg-clusterio.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/factorio/clusterio/egg-clusterio.json b/game_eggs/factorio/clusterio/egg-clusterio.json index 71761956..76b5bdac 100644 --- a/game_eggs/factorio/clusterio/egg-clusterio.json +++ b/game_eggs/factorio/clusterio/egg-clusterio.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-10-05T18:37:01-04:00", + "exported_at": "2022-10-05T19:06:42-04:00", "name": "Clusterio", "author": "psychoalex@thevcbc.com", "description": "Clusterio is a clustered Factorio server manager that provides the tooling for implementing cross server interactions in Factorio. It was previously best known for implementing cross server transfer and cloud storage of items via teleporter chests. But this functionality has been pulled out of Clusterio into its own plugin for Clusterio named Subspace Storage.\r\n\r\nBy itself Clusterio doesn't change the gameplay in any way, you could even use Clusterio to manage completely vanilla Factorio servers. Plugins do the work of modding in the visible changes into the game, see the Plugins section for ready-made plugins you can install into a Clusterio cluster.\r\n\r\nA Note on terminology. The developers of Clustorio are using the rather outdated Master\/Slave terms for Primary\/Secondary or Management\/Processing nodes. We will use them in this guide and egg to avoid confusion, but would prefer a more modern set of terminology.", @@ -94,7 +94,7 @@ }, { "name": "Plugins", - "description": "Clusterio Plugins to install, space separate list.\r\n\r\nExample:\r\n@clusterio\/plugin-global_chat @clusterio\/plugin-research_sync @clusterio\/plugin-statistics_exporter @clusterio\/plugin-player_auth @clusterio\/plugin-inventory_sync @hornwitser\/server_select \r\nOptional Extras:\r\n@clusterio\/plugin-subspace_storage (requires the mod to be downloaded)\r\n\r\nRequired on:\r\nAll", + "description": "Clusterio Plugins to install, space separate list.\r\n\r\nExample:\r\n@clusterio\/plugin-global_chat\r\n@clusterio\/plugin-research_sync\r\n@clusterio\/plugin-statistics_exporter\r\n\r\nCurrent available clusterio plugins include:\r\n@clusterio\/plugin-global_chat\r\n@clusterio\/plugin-research_sync\r\n@clusterio\/plugin-statistics_exporter\r\n@clusterio\/plugin-subspace_storage (requires the mod to be installed on the slave)\r\n@clusterio\/plugin-player_auth\r\n@clusterio\/plugin-inventory_sync\r\n@hornwitser\/server_select\r\n\r\nRequired on:\r\nAll", "env_variable": "PLUGINS", "default_value": "", "user_viewable": true, From b32cadda81faa877465ab7ece909ac2bda02295a Mon Sep 17 00:00:00 2001 From: Jake McIlravey Date: Fri, 7 Oct 2022 05:25:24 -0400 Subject: [PATCH 0603/1001] Update minio to successfully mark as running (#1901) Guide is no longer the latest terminology in latest version of minio for the completion of startup. --- storage/minio/egg-minio-s3.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/minio/egg-minio-s3.json b/storage/minio/egg-minio-s3.json index 7358c5fb..3ccd660c 100644 --- a/storage/minio/egg-minio-s3.json +++ b/storage/minio/egg-minio-s3.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-07-08T16:16:10+02:00", + "exported_at": "2022-10-07T04:56:20-04:00", "name": "Minio S3", "author": "accounts@bofanodes.io", "description": "MinIO is a cloud storage server compatible with Amazon S3, released under Apache License v2. As an object store, MinIO can store unstructured data such as photos, videos, log files, backups and container images. The maximum size of an object is 5TB.", @@ -16,7 +16,7 @@ "startup": ".\/minio.sh", "config": { "files": "{}", - "startup": "{\r\n \"done\": \"guide\"\r\n}", + "startup": "{\r\n \"done\": \"guide\",\r\n \"done\": \"Documentation:\"\r\n}", "logs": "{}", "stop": "^C" }, From 5e9976b783642f2f5d628c98266441ce728fc96b Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Fri, 7 Oct 2022 16:56:02 +0200 Subject: [PATCH 0604/1001] fix config Craftopia --- .../craftopia/ServerSetting.ini | 86 +++++++++++++++++++ .../craftopia/egg-craftopia.json | 6 +- 2 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 game_eggs/steamcmd_servers/craftopia/ServerSetting.ini diff --git a/game_eggs/steamcmd_servers/craftopia/ServerSetting.ini b/game_eggs/steamcmd_servers/craftopia/ServerSetting.ini new file mode 100644 index 00000000..84dcb85d --- /dev/null +++ b/game_eggs/steamcmd_servers/craftopia/ServerSetting.ini @@ -0,0 +1,86 @@ + +; Game World Data Setting - name, difficulty, gameMode +; name : world name +; difficulty ： 0- Easy, 1- Normal(default), 2- Hard, 3- VeryHard +; gameMode ： 1- NormalWorld(default), 2- CreativeWorld_Build, 3- CreativeWorld_Play + +; Server Setting - port : used when not using steam lobby function +; maxPlayerNumber : maximum number of player can join into the server(1 ~ 127) +; usePassword : using server password(1- True / 0- False) +; serverPassword : setting server password up to 8 digit number pin + +; Graphics Setting - vSyncCount, maxFPS, grassBend, clothSimOption +; vSyncCount : vertical sync, 0- disable, 1- once per frame 2- per two frame +; maxFPS : max frames per second, set to -1 for unlimited fps +; grassBend : enable Grass Bend(1- True / 0- False) +; ClothSimOption : cloth simulation, 1- animate everybody's, 2- animate nobody's + +; Save Setting - autoSaveSec, autoSavePerHour +; autoSaveSec : autoSavePer ** second, to disable, set to -1 +; autoSavePerHour : enable autoSavePerHour(1- True / 0- False) +; savePath : relative path base on ServerSetting.ini folder or absolute path + +; Creative Mode Setting - +; quickCraft : crafting without checking item cost(1- True / 0- False) +; ageLevel : age Level of the game world, effect crafting recipe +; islandLevel : island level override, effect monster and dungeon level, set to -1 to disable override +; noDeath : player character would not dead(1- True / 0- False) +; noDamage : player character would not take damage(1- True / 0- False) +; noHunger : player character would not be hungry(1- True / 0- False) +; infinitStamina : player character has infinit stamina(1- True / 0- False) +; forceDayTime : game world day time override, 0 to 24, set to -1 to disable +; buildingIgnoreDamage : building would not take damage(1- True / 0- False) +; noBuild : player can not place new building(1- True / 0- False) + +; Creative Mode Player Status Override - apply at gameStart +; Level : override character level, set to 0 to disable +; Health : override character health, set to 0 to disable +; Mana : override character mana, set to 0 to disable +; Stamina : override character stamia, set to 0 to disable +; Money : override character money +; SkillPoint : override character skill point +; EnchantPoint : override character enchant point + +[GameWorld] +name=NoName +difficulty=1 +gameMode=1 + +[Host] +port=6587 +maxPlayerNumber=7 +usePassword=0 +serverPassword=00000000 +bindAddress=0.0.0.0 + +[Graphics] +vSyncCount=0 +maxFPS=60 +grassBend=0 +clothSimOption=2 + +[Save] +autoSaveSec=300 +autoSavePerHour=1 +savePath=DedicatedServerSave/ + +[CreativeModeSetting] +quickCraft=1 +ageLevel=7 +islandLevel=-1 +noDeath=1 +noDamage=1 +noHunger=1 +infinitStamina=1 +forceDayTime=-1 +buildingIgnoreDamage=0 +noBuild=0 + +[CreativeModePlStatus] +Level=0 +Health=0 +Mana=0 +Stamina=0 +Money=1000 +SkillPoint=0 +EnchantPoint=0 \ No newline at end of file diff --git a/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json b/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json index d019795f..5f0f23c5 100644 --- a/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json +++ b/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-10-04T00:48:30-04:00", + "exported_at": "2022-10-07T16:55:03+02:00", "name": "Craftopia", "author": "info@goover.de", "description": "Craftopia is the brand new multiplayer survival action game made in Japan. We combined many features we find enjoyable, such as hunting, farming, hack-and-slash, building, automation to develop this game.", @@ -24,7 +24,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n ##\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\nmv -f $HOME\/DefaultServerSetting.ini $HOME\/ServerSetting.ini", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n ##\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates wget\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\ncd \/mnt\/server\r\nFILE=\/mnt\/server\/ServerSetting.ini\r\nif [ -f \"$FILE\" ]; then\r\n echo \"Config file exist\"\r\nelse \r\n echo \"Config file does not exist, making one\"\r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/steamcmd_servers\/craftopia\/ServerSetting.ini -O \/mnt\/server\/ServerSetting.ini\r\nfi\r\n\r\necho \"install finished\"", "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } @@ -61,4 +61,4 @@ "field_type": "text" } ] -} +} \ No newline at end of file From 3766bc1480ca30319d32175c82d80ba6cbf0ac12 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Fri, 7 Oct 2022 17:09:55 +0200 Subject: [PATCH 0605/1001] move to curl downloading config file --- game_eggs/steamcmd_servers/craftopia/egg-craftopia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json b/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json index 5f0f23c5..6d16a070 100644 --- a/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json +++ b/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-10-07T16:55:03+02:00", + "exported_at": "2022-10-07T17:08:45+02:00", "name": "Craftopia", "author": "info@goover.de", "description": "Craftopia is the brand new multiplayer survival action game made in Japan. We combined many features we find enjoyable, such as hunting, farming, hack-and-slash, building, automation to develop this game.", @@ -24,7 +24,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n ##\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates wget\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\ncd \/mnt\/server\r\nFILE=\/mnt\/server\/ServerSetting.ini\r\nif [ -f \"$FILE\" ]; then\r\n echo \"Config file exist\"\r\nelse \r\n echo \"Config file does not exist, making one\"\r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/steamcmd_servers\/craftopia\/ServerSetting.ini -O \/mnt\/server\/ServerSetting.ini\r\nfi\r\n\r\necho \"install finished\"", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n ##\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\ncd \/mnt\/server\r\nFILE=\/mnt\/server\/ServerSetting.ini\r\nif [ -f \"$FILE\" ]; then\r\n echo \"Config file exist\"\r\nelse \r\n echo \"Config file does not exist, making one\"\r\n cd \/mnt\/server\r\n curl -sSL -o ServerSetting.ini https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/steamcmd_servers\/craftopia\/ServerSetting.ini\r\nfi\r\n\r\necho \"install finished\"", "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } From f87a02171b9575efaeb8a292d342a64a03bf8e7a Mon Sep 17 00:00:00 2001 From: devnote-dev Date: Sun, 9 Oct 2022 20:35:09 +0100 Subject: [PATCH 0606/1001] feat(generic): add dart-lang egg --- README.md | 1 + generic/dart/README.md | 22 +++++++ generic/dart/egg-dart-generic.json | 92 ++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+) create mode 100644 generic/dart/README.md create mode 100644 generic/dart/egg-dart-generic.json diff --git a/README.md b/README.md index 4a17396c..42099c99 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,7 @@ If you are reading this it looks like you are looking to add an egg to your serv ## [Generic Languages](/generic) +* [dart](/generic/dart/) * [deno](/generic/deno/) * [golang](/generic/golang/) * [java](/generic/java/) diff --git a/generic/dart/README.md b/generic/dart/README.md new file mode 100644 index 00000000..d4ca08c7 --- /dev/null +++ b/generic/dart/README.md @@ -0,0 +1,22 @@ +# dart generic + +This egg is designed to run any generic Dart application, allowing users to pull their own Dart discord bot from a Github repository. + +There is an option to allow a user to upload their own files to run a bot. + +The startup configs and commands may need changing to actually function properly. + +## Configuration + +The server will be stuck as `starting` until the egg Start Configuration is modified. You have to edit the text to match something your bot will print for Pterodactyl panel to detect it as running. +![image](https://user-images.githubusercontent.com/10975908/126516861-c5cb4630-9f25-405c-8199-97bf5ec15a7f.png) + +You can use arrays to have multiple different values when different bots are being used + +```json +{ + "done":[ + "change this text 1", + "change this text 2" + ] +} diff --git a/generic/dart/egg-dart-generic.json b/generic/dart/egg-dart-generic.json new file mode 100644 index 00000000..07daec89 --- /dev/null +++ b/generic/dart/egg-dart-generic.json @@ -0,0 +1,92 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2022-07-07T16:11:46-07:00", + "name": "dart generic", + "author": "alden@knoban.com", + "description": "A generic dart CLI egg.\r\n\r\nThis will clone a dart CLI application. it defaults to master if no branch is specified.\r\n\r\nInstalls the pubspec.yaml packages on run. If you set user_upload then I assume you know what you are doing.", + "features": null, + "docker_images": { + "ghcr.io/parkervcp/yolks:dart_2.17": "ghcr.io/parkervcp/yolks:dart_2.17" + }, + "file_denylist": [], + "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; dart pub get; dart run", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"change this part\"\r\n}", + "logs": "{}", + "stop": "^^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# Dart CLI Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git curl file unzip\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n echo -e \"assuming user knows what they are doing have a good day.\"\r\n exit 0\r\nfi\r\n\r\n## add git ending if it's not on the address\r\nif [[ ${GIT_ADDRESS} != *.git ]]; then\r\n GIT_ADDRESS=${GIT_ADDRESS}.git\r\nfi\r\n\r\nif [ -z \"${USERNAME}\" ] && [ -z \"${ACCESS_TOKEN}\" ]; then\r\n echo -e \"using anon api call\"\r\nelse\r\n GIT_ADDRESS=\"https:\/\/${USERNAME}:${ACCESS_TOKEN}@$(echo -e ${GIT_ADDRESS} | cut -d\/ -f3-)\"\r\nfi\r\n\r\n## pull git dart cli repo\r\nif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n echo -e \"\/mnt\/server directory is not empty.\"\r\n if [ -d .git ]; then\r\n echo -e \".git directory exists\"\r\n if [ -f .git\/config ]; then\r\n echo -e \"loading info from git config\"\r\n ORIGIN=$(git config --get remote.origin.url)\r\n else\r\n echo -e \"files found with no git config\"\r\n echo -e \"closing out without touching things to not break anything\"\r\n exit 10\r\n fi\r\n fi\r\n\r\n if [ \"${ORIGIN}\" == \"${GIT_ADDRESS}\" ]; then\r\n echo \"pulling latest from github\"\r\n git pull\r\n fi\r\nelse\r\n echo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n if [ -z ${BRANCH} ]; then\r\n echo -e \"cloning default branch\"\r\n git clone ${GIT_ADDRESS} .\r\n else\r\n echo -e \"cloning ${BRANCH}'\"\r\n git clone --single-branch --branch ${BRANCH} ${GIT_ADDRESS} .\r\n fi\r\n\r\nfi\r\n\r\necho -e \"install complete\"\r\nexit 0", + "container": "debian:bullseye-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Git Repo Address", + "description": "GitHub Repo to clone\r\n\r\nI.E. https:\/\/github.com\/kNoAPP\/repo_name", + "env_variable": "GIT_ADDRESS", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string", + "field_type": "text" + }, + { + "name": "Install Branch", + "description": "The branch of the bot to install.", + "env_variable": "BRANCH", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string", + "field_type": "text" + }, + { + "name": "User Uploaded Files", + "description": "Skip all the install stuff if you are letting a user upload files.\r\n\r\n0 = false (default)\r\n1 = true", + "env_variable": "USER_UPLOAD", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "required|boolean", + "field_type": "text" + }, + { + "name": "Auto Update", + "description": "Pull the latest files on startup when using a GitHub repo.", + "env_variable": "AUTO_UPDATE", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "required|boolean", + "field_type": "text" + }, + { + "name": "Git Username", + "description": "Username to auth with git.", + "env_variable": "USERNAME", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string", + "field_type": "text" + }, + { + "name": "Git Access Token", + "description": "Password to use with git.\r\n\r\nIt's best practice to use a Personal Access Token.\r\nhttps:\/\/github.com\/settings\/tokens\r\nhttps:\/\/gitlab.com\/-\/profile\/personal_access_tokens", + "env_variable": "ACCESS_TOKEN", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string", + "field_type": "text" + } + ] +} From 75c6192f98f4caa6358b92fb53a46fa6cf0c432f Mon Sep 17 00:00:00 2001 From: devnote-dev Date: Sun, 9 Oct 2022 20:40:10 +0100 Subject: [PATCH 0607/1001] feat(generic): update generics readme --- generic/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/generic/README.md b/generic/README.md index 24b04c8b..95fcd1e4 100644 --- a/generic/README.md +++ b/generic/README.md @@ -1,5 +1,10 @@ # Generic Language +### [Dart](dart) + +[dart](https://dart.dev/) +A generic dart egg + ### [Deno](deno) [deno](https://deno.land/) From 6bffd18833af1c6c0e9db97eeca8dcc5c46e4d57 Mon Sep 17 00:00:00 2001 From: Daniel Barton Date: Tue, 11 Oct 2022 16:24:56 +0800 Subject: [PATCH 0608/1001] Correct Vintage Story link in the README/index --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 42099c99..eefc9c31 100644 --- a/README.md +++ b/README.md @@ -278,7 +278,7 @@ If you are reading this it looks like you are looking to add an egg to your serv [Veloren](game_eggs/veloren) -[Vintage Story](game_eggs/vintage_story/vintage_story) +[Vintage Story](game_eggs/vintage_story) [Wine Generic](game_eggs/wine/generic) From 2710d8b6e5a4ece29c911876bd1f3f4272dbd60b Mon Sep 17 00:00:00 2001 From: Red-Thirten Date: Thu, 13 Oct 2022 00:35:38 -0700 Subject: [PATCH 0609/1001] Fix Network Quality & Autosave Interval Not Saving The default GameUserSettings.ini file created during the install did not include all the values that the server needs to see in the file. Therefore, the server would delete the file upon startup, rendering the Network Quality and Autosave Interval startup variables un-set and un-acknowledged. Adding these required values to the default file created upon installation resolves this issue, allowing these settings to be set properly. Existing servers will need to reinstall for this fix to go into effect. --- game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json index c9515b07..8e09ee53 100644 --- a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json +++ b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json @@ -1,5 +1,5 @@ { - "_comment": "Pterodactyl Satisfactory Egg ~ Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord ~ 2022-06-27", + "_comment": "Pterodactyl Satisfactory Egg ~ Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord ~ 2022-10-13", "meta": { "version": "PTDL_v2", "update_url": null @@ -23,7 +23,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\n# File: Pterodactyl Satisfactory Egg - egg-satisfactory.json\r\n# Authors: Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord\r\n# Date: 2022\/06\/27\r\n# License: MIT License\r\n\r\n## Download and install SteamCMD\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login anonymous +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) validate +exit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so\r\n\r\n## Satisfactory setup\r\n# Check for successful installation and make the core binary executable.\r\ncd \/mnt\/server\/Engine\/Binaries\/Linux\r\nif [[ ! -f UE4Server-Linux-Shipping ]]; then\r\n echo -e \"\\n\\nSteamCMD failed to install the Satisfactory Dedicated Server!\"\r\n echo -e \"\\tTry reinstalling the server again.\\n\"\r\n exit 1\r\nelse\r\n chmod +x UE4Server-Linux-Shipping\r\nfi\r\n\r\n# Make Config directory and default .ini files (since they are not initially present before first server start)\r\nmkdir -p \/mnt\/server\/FactoryGame\/Saved\/Config\/LinuxServer\/ && cd \"$_\"\r\n# Currently, this will delete & re-create certain .ini files during a re-install if they are already present.\r\n# While undesirable, this is required due to a current Pterodactyl ini config parser limitation.\r\n# When the patch to this limitation hits the production branch, this will be updated.\r\nrm -f Engine.ini Game.ini GameUserSettings.ini\r\n\r\necho -e '\\nCreating default \"Engine.ini\" configuration file...'\r\ncat > Engine.ini << EOF\r\n[\/Script\/FactoryGame.FGSaveSession]\r\nmNumRotatingAutosaves=${NUM_AUTOSAVES}\r\n\r\n[CrashReportClient]\r\nbImplicitSend=${UPLOAD_CRASH_REPORT}\r\n\r\n[\/Script\/OnlineSubsystemUtils.IpNetDriver]\r\nInitialConnectTimeout=${INIT_CONNECT_TIMEOUT}\r\nConnectionTimeout=${CONNECT_TIMEOUT}\r\nEOF\r\n\r\necho -e 'Creating default \"Game.ini\" configuration file...'\r\ncat > Game.ini << EOF\r\n[\/Script\/Engine.GameSession]\r\nMaxPlayers=${MAX_PLAYERS}\r\nEOF\r\n\r\necho -e 'Creating default \"GameUserSettings.ini\" configuration file...'\r\ncat > GameUserSettings.ini << EOF\r\n[\/Script\/FactoryGame.FGGameUserSettings]\r\nmIntValues=((\"FG.NetworkQuality\", ${NETWORK_QUALITY}))\r\nmFloatValues=((\"FG.AutosaveInterval\", ${AUTOSAVE_INTERVAL}))\r\nEOF\r\n\r\necho -e \"\\nSatisfactory Dedicated Server successfully installed!\\n\"", + "script": "#!\/bin\/bash\r\n\r\n# File: Pterodactyl Satisfactory Egg - egg-satisfactory.json\r\n# Authors: Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord\r\n# Date: 2022\/10\/13\r\n# License: MIT License\r\n\r\n## Download and install SteamCMD\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login anonymous +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) validate +exit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so\r\n\r\n## Satisfactory setup\r\n# Check for successful installation and make the core binary executable.\r\ncd \/mnt\/server\/Engine\/Binaries\/Linux\r\nif [[ ! -f UE4Server-Linux-Shipping ]]; then\r\n echo -e \"\\n\\nSteamCMD failed to install the Satisfactory Dedicated Server!\"\r\n echo -e \"\\tTry reinstalling the server again.\\n\"\r\n exit 1\r\nelse\r\n chmod +x UE4Server-Linux-Shipping\r\nfi\r\n\r\n# Make Config directory and default .ini files (since they are not initially present before first server start)\r\nmkdir -p \/mnt\/server\/FactoryGame\/Saved\/Config\/LinuxServer\/ && cd \"$_\"\r\n# Currently, this will delete & re-create certain .ini files during a re-install if they are already present.\r\n# While undesirable, this is required due to a current Pterodactyl ini config parser limitation.\r\n# When the patch to this limitation hits the production branch, this will be updated.\r\nrm -f Engine.ini Game.ini GameUserSettings.ini\r\n\r\necho -e '\\nCreating default \"Engine.ini\" configuration file...'\r\ncat > Engine.ini << EOF\r\n[\/Script\/FactoryGame.FGSaveSession]\r\nmNumRotatingAutosaves=${NUM_AUTOSAVES}\r\n\r\n[CrashReportClient]\r\nbImplicitSend=${UPLOAD_CRASH_REPORT}\r\n\r\n[\/Script\/OnlineSubsystemUtils.IpNetDriver]\r\nInitialConnectTimeout=${INIT_CONNECT_TIMEOUT}\r\nConnectionTimeout=${CONNECT_TIMEOUT}\r\nEOF\r\n\r\necho -e 'Creating default \"Game.ini\" configuration file...'\r\ncat > Game.ini << EOF\r\n[\/Script\/Engine.GameSession]\r\nMaxPlayers=${MAX_PLAYERS}\r\nEOF\r\n\r\necho -e 'Creating default \"GameUserSettings.ini\" configuration file...'\r\ncat > GameUserSettings.ini << EOF\r\n[\/Script\/FactoryGame.FGGameUserSettings]\r\nmIntValues=((\"FG.NetworkQuality\", ${NETWORK_QUALITY}))\r\nmFloatValues=((\"FG.AutosaveInterval\", ${AUTOSAVE_INTERVAL}))\r\nmAutoDetectSettingsHandled=False\r\nmPrimaryLanguage=\r\nCurrentFGGameUserSettingsVersion=0\r\nbUseVSync=False\r\nbUseDynamicResolution=False\r\nResolutionSizeX=1280\r\nResolutionSizeY=720\r\nLastUserConfirmedResolutionSizeX=1280\r\nLastUserConfirmedResolutionSizeY=720\r\nWindowPosX=-1\r\nWindowPosY=-1\r\nFullscreenMode=1\r\nLastConfirmedFullscreenMode=1\r\nPreferredFullscreenMode=1\r\nVersion=5\r\nAudioQualityLevel=0\r\nLastConfirmedAudioQualityLevel=0\r\nFrameRateLimit=0.000000\r\nDesiredScreenWidth=1280\r\nDesiredScreenHeight=720\r\nLastUserConfirmedDesiredScreenWidth=1280\r\nLastUserConfirmedDesiredScreenHeight=720\r\nLastRecommendedScreenWidth=-1.000000\r\nLastRecommendedScreenHeight=-1.000000\r\nLastCPUBenchmarkResult=-1.000000\r\nLastGPUBenchmarkResult=-1.000000\r\nLastGPUBenchmarkMultiplier=1.000000\r\nbUseHDRDisplayOutput=False\r\nHDRDisplayOutputNits=1000\r\n\r\n[ScalabilityGroups]\r\nsg.ResolutionQuality=100.000000\r\nsg.ViewDistanceQuality=3\r\nsg.AntiAliasingQuality=3\r\nsg.ShadowQuality=3\r\nsg.PostProcessQuality=3\r\nsg.TextureQuality=3\r\nsg.EffectsQuality=3\r\nsg.FoliageQuality=3\r\nsg.ShadingQuality=3\r\n\r\n[\/Script\/Engine.GameUserSettings]\r\nbUseDesiredScreenHeight=False\r\n\r\n\r\nEOF\r\n\r\necho -e \"\\nSatisfactory Dedicated Server successfully installed!\\n\"", "container": "ghcr.io\/pterodactyl\/installers:debian", "entrypoint": "\/bin\/bash" } From 2fcbcecee69109d7ecbaa6d515c12cb8b2b31084 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat, 15 Oct 2022 14:11:39 +0200 Subject: [PATCH 0610/1001] Update tshock --- game_eggs/terraria/tshock/egg-tshock.json | 45 ++++++++++++++--------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/game_eggs/terraria/tshock/egg-tshock.json b/game_eggs/terraria/tshock/egg-tshock.json index 0fed9f67..81b61959 100644 --- a/game_eggs/terraria/tshock/egg-tshock.json +++ b/game_eggs/terraria/tshock/egg-tshock.json @@ -1,18 +1,23 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v2", + "update_url": null }, - "exported_at": "2020-05-18T21:16:19-04:00", + "exported_at": "2022-10-15T14:09:35+02:00", "name": "tshock", "author": "parker@parkervcp.com", "description": "The t-shock modded terraria server.\r\n\r\nhttps:\/\/tshock.co\/", - "image": "quay.io\/pterodactyl\/core:mono", + "features": null, + "docker_images": { + "mono": "ghcr.io\/parkervcp\/yolks:mono_latest" + }, + "file_denylist": [], "startup": "mono TerrariaServer.exe -ip 0.0.0.0 -port {{SERVER_PORT}} -maxplayers {{MAX_PLAYERS}} -world {{WORLD_NAME}}.wld -autocreate {{WORLD_SIZE}}", "config": { - "files": "{\r\n \"tshock\/config.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {}\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Type 'help' for a list of commands\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"ServerLog.txt\"\r\n}", + "files": "{}", + "startup": "{\r\n \"done\": \"Type 'help' for a list of commands\"\r\n}", + "logs": "{}", "stop": "exit" }, "scripts": { @@ -28,36 +33,40 @@ "description": "The maximum number of players a server will hold.", "env_variable": "MAX_PLAYERS", "default_value": "8", - "user_viewable": 1, - "user_editable": 0, - "rules": "required|numeric|digits_between:1,3" + "user_viewable": true, + "user_editable": false, + "rules": "required|numeric|digits_between:1,3", + "field_type": "text" }, { "name": "World Size", "description": "Defines the worlds size. 3 sizes 1 (small), 2 (medium), 3 (large).", "env_variable": "WORLD_SIZE", "default_value": "1", - "user_viewable": 1, - "user_editable": 0, - "rules": "required|numeric|digits_between:1,3" + "user_viewable": true, + "user_editable": false, + "rules": "required|numeric|digits_between:1,3", + "field_type": "text" }, { "name": "World Name", "description": "The name for the world file.", "env_variable": "WORLD_NAME", "default_value": "world", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:20" + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20", + "field_type": "text" }, { "name": "Tshock Version", "description": "The version on tshock that will be installed. default is latest non-pre-release", "env_variable": "TSHOCK_VERSION", "default_value": "latest", - "user_viewable": 1, - "user_editable": 0, - "rules": "required|string|max:20" + "user_viewable": true, + "user_editable": false, + "rules": "required|string|max:20", + "field_type": "text" } ] } From 032a92ab34ee9e24dbfb8c3a2b1057a7a216ac7f Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 16 Oct 2022 08:19:46 +0200 Subject: [PATCH 0611/1001] Update egg-valheim-plus-mod.json --- .../valheim_plus/egg-valheim-plus-mod.json | 64 ++++++++++++------- 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/game_eggs/steamcmd_servers/valheim/valheim_plus/egg-valheim-plus-mod.json b/game_eggs/steamcmd_servers/valheim/valheim_plus/egg-valheim-plus-mod.json index c6168247..004cd499 100644 --- a/game_eggs/steamcmd_servers/valheim/valheim_plus/egg-valheim-plus-mod.json +++ b/game_eggs/steamcmd_servers/valheim/valheim_plus/egg-valheim-plus-mod.json @@ -1,21 +1,19 @@ { "_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-05-15T11:15:06+02:00", + "exported_at": "2022-10-16T08:17:39+02:00", "name": "Valheim Plus Mod", "author": "info@goover.de", "description": "A brutal exploration and survival game for 1-10 players, set in a procedurally-generated purgatory inspired by viking culture.", - "features": [ - "steam_disk_space" - ], - "images": [ - "ghcr.io\/parkervcp\/games:source" - ], + "features": null, + "docker_images": { + "ghcr.io\/parkervcp\/games:valheim": "ghcr.io\/parkervcp\/games:valheim" + }, "file_denylist": [], - "startup": "export DOORSTOP_ENABLE=TRUE; export DOORSTOP_INVOKE_DLL_PATH=.\/BepInEx\/core\/BepInEx.Preloader.dll; export DOORSTOP_CORLIB_OVERRIDE_PATH=.\/unstripped_corlib; export LD_LIBRARY_PATH=\".\/doorstop_libs:$LD_LIBRARY_PATH\"; export LD_PRELOAD=\"libdoorstop_x64.so:$LD_PRELOAD\"; export templdpath=$LD_LIBRARY_PATH; export LD_LIBRARY_PATH=\".\/linux64:$LD_LIBRARY_PATH\"; export SteamAppId=892970; export LD_LIBRARY_PATH=$templdpath; .\/valheim_server.x86_64 -nographics -batchmode -name \"{{SERVER_NAME}}\" -port {{SERVER_PORT}} -world \"{{WORLD}}\" -password \"{{PASSWORD}}\" -public ${PUBLIC} > >(sed -uE \"{{FILTER}}\") & trap \"{{STOP}}\" 15; wait $!", + "startup": "export DOORSTOP_ENABLE=TRUE; export DOORSTOP_INVOKE_DLL_PATH=.\/BepInEx\/core\/BepInEx.Preloader.dll; export DOORSTOP_CORLIB_OVERRIDE_PATH=.\/unstripped_corlib; export LD_LIBRARY_PATH=\".\/doorstop_libs:$LD_LIBRARY_PATH\"; export LD_PRELOAD=\"libdoorstop_x64.so:$LD_PRELOAD\"; export templdpath=$LD_LIBRARY_PATH; export LD_LIBRARY_PATH=\".\/linux64:$LD_LIBRARY_PATH\"; export SteamAppId=892970; export LD_LIBRARY_PATH=$templdpath; .\/valheim_server.x86_64 -nographics -batchmode -name \"{{SERVER_NAME}}\" -port {{SERVER_PORT}} -world \"{{WORLD}}\" -password \"{{PASSWORD}}\" -public ${PUBLIC} $( [[ ${ENABLE_CROSSPLAY} -eq 1 ]] && echo \" -crossplay \") > >(sed -uE \"{{FILTER}}\") & trap \"{{STOP}}\" 15; wait $!", "config": { "files": "{}", "startup": "{\r\n \"done\": \"DungeonDB Start\"\r\n}", @@ -24,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Valheim Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends --no-install-suggests install curl lib32gcc-s1 ca-certificates unzip jq wget\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\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\ncd \/mnt\/server\r\nwget -N $DOWNLOAD_LINK\r\nunzip -o $MATCH\r\nrm -fR $MATCH\r\n\r\nchmod u+x start_server_bepinex.sh", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n ##\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates jq wget\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\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\ncd \/mnt\/server\r\nwget -N $DOWNLOAD_LINK\r\nunzip -o $MATCH\r\nrm -fR $MATCH", "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } @@ -37,7 +35,8 @@ "default_value": "My Server", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:60" + "rules": "required|string|max:60", + "field_type": "text" }, { "name": "Server Password", @@ -46,7 +45,8 @@ "default_value": "secret", "user_viewable": true, "user_editable": true, - "rules": "required|string|min:5|max:20" + "rules": "required|string|min:5|max:20", + "field_type": "text" }, { "name": "World Name", @@ -55,7 +55,8 @@ "default_value": "Dedicated", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" }, { "name": "App ID", @@ -64,7 +65,8 @@ "default_value": "896660", "user_viewable": true, "user_editable": false, - "rules": "nullable|numeric" + "rules": "nullable|numeric", + "field_type": "text" }, { "name": "LD Library Path", @@ -73,7 +75,8 @@ "default_value": ".\/linux64", "user_viewable": false, "user_editable": false, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" }, { "name": "Auto Update", @@ -82,7 +85,8 @@ "default_value": "1", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|boolean", + "field_type": "text" }, { "name": "GITHUB_PACKAGE", @@ -91,7 +95,8 @@ "default_value": "valheimPlus\/ValheimPlus", "user_viewable": false, "user_editable": false, - "rules": "required|string|max:40" + "rules": "required|string|max:40", + "field_type": "text" }, { "name": "Version", @@ -100,7 +105,8 @@ "default_value": "latest", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" }, { "name": "MATCH", @@ -109,7 +115,8 @@ "default_value": "UnixServer.zip", "user_viewable": false, "user_editable": false, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" }, { "name": "Public Server", @@ -118,7 +125,8 @@ "default_value": "1", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" }, { "name": "Filter", @@ -127,7 +135,8 @@ "default_value": "\/^\\(Filename:.*Line:[[:space:]]+[[:digit:]]+\\)$\/d; \/^([[:space:]]+)?$\/d", "user_viewable": false, "user_editable": false, - "rules": "string" + "rules": "string", + "field_type": "text" }, { "name": "Shutdown Command", @@ -136,7 +145,18 @@ "default_value": "kill -2 $!; wait;", "user_viewable": false, "user_editable": false, - "rules": "required|string" + "rules": "required|string", + "field_type": "text" + }, + { + "name": "Enable Crossplay", + "description": "Enable crossplay support", + "env_variable": "ENABLE_CROSSPLAY", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "required|boolean", + "field_type": "text" } ] } \ No newline at end of file From 03b557bbf426e512b3934abe4fe939897cc14417 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 16 Oct 2022 08:35:22 +0200 Subject: [PATCH 0612/1001] Update README.md --- game_eggs/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/README.md b/game_eggs/README.md index b1e00b9a..8df939c9 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -10,9 +10,9 @@ * [BeamMP Server](beamng/beammp) * [KissMP](beamng/kissmp) -[ClassiCube](game_eggs/classicube) +[ClassiCube](classicube) -* [MCGalaxy](game_eggs/classicube/mcgalaxy) +* [MCGalaxy](classicube/mcgalaxy) [ET Legacy](enemy_territory/etlegacy) From 9d4843b3605eba1730a871d480cb2d646d965873 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 16 Oct 2022 09:23:18 +0200 Subject: [PATCH 0613/1001] update rising-world legacy --- .../rising_world/egg-rising-world-legacy.json | 114 ++++++++++++++++++ .../rising_world/egg-rising-world.json | 97 --------------- 2 files changed, 114 insertions(+), 97 deletions(-) create mode 100644 game_eggs/steamcmd_servers/rising_world/egg-rising-world-legacy.json delete mode 100644 game_eggs/steamcmd_servers/rising_world/egg-rising-world.json diff --git a/game_eggs/steamcmd_servers/rising_world/egg-rising-world-legacy.json b/game_eggs/steamcmd_servers/rising_world/egg-rising-world-legacy.json new file mode 100644 index 00000000..b6288eea --- /dev/null +++ b/game_eggs/steamcmd_servers/rising_world/egg-rising-world-legacy.json @@ -0,0 +1,114 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2022-10-16T09:21:36+02:00", + "name": "Rising World", + "author": "info@goover.de", + "description": "Rising World is a voxel based open-world sandbox game, featuring a procedurally generated world, playable in single and multi-player.", + "features": [ + "steam_disk_space" + ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:java_8": "ghcr.io\/parkervcp\/yolks:java_8" + }, + "file_denylist": [], + "startup": "java -Xmx{{SERVER_MEMORY}}M -jar server.jar +maxplayer={{MAX_PLAYERS}} +serverport={{SERVER_PORT}} +servername=\\\"{{SERVER_NAME}}\\\" +rconport {{RCON_PORT}}", + "config": { + "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"rcon_enabled\": \"true\",\r\n \"rcon_password\": \"{{server.build.env.RCON_PASSWORD}}\",\r\n \"server_password\": \"{{server.build.env.SERVER_PASSWORD}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"RISING WORLD SERVER STARTED\"\r\n}", + "logs": "{}", + "stop": "shutdown" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n ##\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", + "container": "ghcr.io\/parkervcp\/installers:debian", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Server Name", + "description": "Name of the server", + "env_variable": "SERVER_NAME", + "default_value": "Rising World Server", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:32", + "field_type": "text" + }, + { + "name": "Max Players", + "description": "Maximum player count for the server.", + "env_variable": "MAX_PLAYERS", + "default_value": "4", + "user_viewable": true, + "user_editable": false, + "rules": "required|integer|max:64", + "field_type": "text" + }, + { + "name": "RCON Port", + "description": "Overrides the default RCON Port", + "env_variable": "RCON_PORT", + "default_value": "4253", + "user_viewable": true, + "user_editable": false, + "rules": "required|string|max:20", + "field_type": "text" + }, + { + "name": "RCON Password", + "description": "", + "env_variable": "RCON_PASSWORD", + "default_value": "changeme", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20", + "field_type": "text" + }, + { + "name": "LD Library Path", + "description": "", + "env_variable": "LD_LIBRARY_PATH", + "default_value": ".\/linux64", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:20", + "field_type": "text" + }, + { + "name": "Server Password", + "description": "", + "env_variable": "SERVER_PASSWORD", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|max:20", + "field_type": "text" + }, + { + "name": "SRCDS_APPID", + "description": "", + "env_variable": "SRCDS_APPID", + "default_value": "339010", + "user_viewable": true, + "user_editable": false, + "rules": "required|string|max:20", + "field_type": "text" + }, + { + "name": "SRCDS_BETAID", + "description": "", + "env_variable": "SRCDS_BETAID", + "default_value": "legacy", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:20", + "field_type": "text" + } + ] +} \ No newline at end of file diff --git a/game_eggs/steamcmd_servers/rising_world/egg-rising-world.json b/game_eggs/steamcmd_servers/rising_world/egg-rising-world.json deleted file mode 100644 index c0943eb7..00000000 --- a/game_eggs/steamcmd_servers/rising_world/egg-rising-world.json +++ /dev/null @@ -1,97 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1", - "update_url": null - }, - "exported_at": "2021-03-11T16:01:09+01:00", - "name": "Rising World", - "author": "info@goover.de", - "description": "Rising World is a voxel based open-world sandbox game, featuring a procedurally generated world, playable in single and multi-player.", - "features": [ - "steam_disk_space" - ], - "images": [ - "quay.io\/pterodactyl\/core:java" - ], - "file_denylist": [], - "startup": "java -Xmx{{SERVER_MEMORY}}M -jar server.jar +maxplayer={{MAX_PLAYERS}} +serverport={{SERVER_PORT}} +servername=\\\"{{SERVER_NAME}}\\\" +rconport {{RCON_PORT}}", - "config": { - "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"rcon_enabled\": \"true\",\r\n \"rcon_password\": \"{{server.build.env.RCON_PASSWORD}}\",\r\n \"server_password\": \"{{server.build.env.SERVER_PASSWORD}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"RISING WORLD SERVER STARTED\"\r\n}", - "logs": "{}", - "stop": "shutdown" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\nmkdir -p \/mnt\/server\/linux64\r\ncp -v linux64\/steamclient.so ..\/linux64\/steamclient.so", - "container": "debian:buster-slim", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Server Name", - "description": "Name of the server", - "env_variable": "SERVER_NAME", - "default_value": "Rising World Server", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:32" - }, - { - "name": "Max Players", - "description": "Maximum player count for the server.", - "env_variable": "MAX_PLAYERS", - "default_value": "4", - "user_viewable": true, - "user_editable": false, - "rules": "required|integer|max:64" - }, - { - "name": "RCON Port", - "description": "Overrides the default RCON Port", - "env_variable": "RCON_PORT", - "default_value": "4253", - "user_viewable": true, - "user_editable": false, - "rules": "required|string|max:20" - }, - { - "name": "RCON Password", - "description": "", - "env_variable": "RCON_PASSWORD", - "default_value": "changeme", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:20" - }, - { - "name": "LD Library Path", - "description": "", - "env_variable": "LD_LIBRARY_PATH", - "default_value": ".\/linux64", - "user_viewable": false, - "user_editable": false, - "rules": "required|string|max:20" - }, - { - "name": "Server Password", - "description": "", - "env_variable": "SERVER_PASSWORD", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|string|max:20" - }, - { - "name": "SRCDS_APPID", - "description": "", - "env_variable": "SRCDS_APPID", - "default_value": "339010", - "user_viewable": true, - "user_editable": false, - "rules": "required|string|max:20" - } - ] -} From 274ea6b82a76dfe9bed19fb11cb95b9c45b05dc3 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 16 Oct 2022 09:29:28 +0200 Subject: [PATCH 0614/1001] update name --- .../steamcmd_servers/rising_world/egg-rising-world-legacy.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/rising_world/egg-rising-world-legacy.json b/game_eggs/steamcmd_servers/rising_world/egg-rising-world-legacy.json index b6288eea..1f3fdf6c 100644 --- a/game_eggs/steamcmd_servers/rising_world/egg-rising-world-legacy.json +++ b/game_eggs/steamcmd_servers/rising_world/egg-rising-world-legacy.json @@ -5,7 +5,7 @@ "update_url": null }, "exported_at": "2022-10-16T09:21:36+02:00", - "name": "Rising World", + "name": "Rising World Java Legacy", "author": "info@goover.de", "description": "Rising World is a voxel based open-world sandbox game, featuring a procedurally generated world, playable in single and multi-player.", "features": [ From 42e5f48f163302a9d5054cfaaa2ae59b87e4a010 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 16 Oct 2022 09:37:31 +0200 Subject: [PATCH 0615/1001] readd missing diskspace feature --- .../valheim/valheim_plus/egg-valheim-plus-mod.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/valheim/valheim_plus/egg-valheim-plus-mod.json b/game_eggs/steamcmd_servers/valheim/valheim_plus/egg-valheim-plus-mod.json index 004cd499..ee851234 100644 --- a/game_eggs/steamcmd_servers/valheim/valheim_plus/egg-valheim-plus-mod.json +++ b/game_eggs/steamcmd_servers/valheim/valheim_plus/egg-valheim-plus-mod.json @@ -8,7 +8,9 @@ "name": "Valheim Plus Mod", "author": "info@goover.de", "description": "A brutal exploration and survival game for 1-10 players, set in a procedurally-generated purgatory inspired by viking culture.", - "features": null, + "features": [ + "steam_disk_space" + ], "docker_images": { "ghcr.io\/parkervcp\/games:valheim": "ghcr.io\/parkervcp\/games:valheim" }, From d61e6b02e4ce4c3ab9abe114ceb1711c7dbd05a5 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 16 Oct 2022 10:51:21 +0200 Subject: [PATCH 0616/1001] add unity version --- game_eggs/README.md | 2 + game_eggs/steamcmd_servers/README.md | 4 +- .../rising_world/{ => legacy}/README.md | 2 +- .../{ => legacy}/egg-rising-world-legacy.json | 0 .../rising_world/unity/README.md | 18 +++ .../unity/egg-rising-world-unity.json | 144 ++++++++++++++++++ 6 files changed, 168 insertions(+), 2 deletions(-) rename game_eggs/steamcmd_servers/rising_world/{ => legacy}/README.md (94%) rename game_eggs/steamcmd_servers/rising_world/{ => legacy}/egg-rising-world-legacy.json (100%) create mode 100644 game_eggs/steamcmd_servers/rising_world/unity/README.md create mode 100644 game_eggs/steamcmd_servers/rising_world/unity/egg-rising-world-unity.json diff --git a/game_eggs/README.md b/game_eggs/README.md index b1e00b9a..1891fc25 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -137,6 +137,8 @@ * [Project Zomboid](steamcmd_servers/project_zomboid) * [Quake Live](steamcmd_servers/quake_live) * [Rising World](steamcmd_servers/rising_world) + * [Legacy Java](steamcmd_servers/rising_world/legacy) + * [Unity](steamcmd_servers/rising_world/unity) * [Risk Of Rain 2](steamcmd_servers/risk_of_rain_2) * [Rust](steamcmd_servers/rust) * [Autowipe](steamcmd_servers/rust/rust_autowipe) diff --git a/game_eggs/steamcmd_servers/README.md b/game_eggs/steamcmd_servers/README.md index c607f914..efdb10d9 100644 --- a/game_eggs/steamcmd_servers/README.md +++ b/game_eggs/steamcmd_servers/README.md @@ -126,7 +126,9 @@ This is a collection of servers that use SteamCMD to install. ## Rising World -[Rising World](rising_world) +* [Rising World](rising_world) + * [Legacy Java](rising_world/legacy) + * [Unity](rising_world/unity) ## Risk of Rain 2 diff --git a/game_eggs/steamcmd_servers/rising_world/README.md b/game_eggs/steamcmd_servers/rising_world/legacy/README.md similarity index 94% rename from game_eggs/steamcmd_servers/rising_world/README.md rename to game_eggs/steamcmd_servers/rising_world/legacy/README.md index f30a88ca..2553494f 100644 --- a/game_eggs/steamcmd_servers/rising_world/README.md +++ b/game_eggs/steamcmd_servers/rising_world/legacy/README.md @@ -1,4 +1,4 @@ -# Rising World +# Rising World Legacy Java Rising World is a voxel based open-world sandbox game, featuring a procedurally generated world, playable in single and multi-player. diff --git a/game_eggs/steamcmd_servers/rising_world/egg-rising-world-legacy.json b/game_eggs/steamcmd_servers/rising_world/legacy/egg-rising-world-legacy.json similarity index 100% rename from game_eggs/steamcmd_servers/rising_world/egg-rising-world-legacy.json rename to game_eggs/steamcmd_servers/rising_world/legacy/egg-rising-world-legacy.json diff --git a/game_eggs/steamcmd_servers/rising_world/unity/README.md b/game_eggs/steamcmd_servers/rising_world/unity/README.md new file mode 100644 index 00000000..43da49b6 --- /dev/null +++ b/game_eggs/steamcmd_servers/rising_world/unity/README.md @@ -0,0 +1,18 @@ +# Rising World Unity Version + +Rising World is a voxel based open-world sandbox game, featuring a procedurally generated world, playable in single and multi-player. + +## Server Ports + +Rising World requires up to 3 ports. + +* The RCON port is optional +* Game ports require both TCP and UDP +* The server port can be set in the server.properties file (see "Server_Port"). By default, the server uses port 4255 TCP and UDP. The query port (which is required for the server to show up in the server list) is always serverport-1 TCP (so when using the default server port, it's 4254 accordingly). + + +| Port | default | +|---------|---------------| +| Game | 4255 | +| RCON | 4253 | +| Query | 4254 | diff --git a/game_eggs/steamcmd_servers/rising_world/unity/egg-rising-world-unity.json b/game_eggs/steamcmd_servers/rising_world/unity/egg-rising-world-unity.json new file mode 100644 index 00000000..cc174ecb --- /dev/null +++ b/game_eggs/steamcmd_servers/rising_world/unity/egg-rising-world-unity.json @@ -0,0 +1,144 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2022-10-16T10:44:01+02:00", + "name": "Rising World Unity", + "author": "info@goover.de", + "description": "Rising World is a voxel based open-world sandbox game, featuring a procedurally generated world, playable in single and multi-player.", + "features": [ + "steam_disk_space" + ], + "docker_images": { + "ghcr.io\/parkervcp\/games:source": "ghcr.io\/parkervcp\/games:source" + }, + "file_denylist": [], + "startup": ".\/RisingWorldServer.x64 +Server_Port={{SERVER.PORT}}", + "config": { + "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"Server_Name=\": \"Server_Name={{server.build.env.SRV_NAME}}\",\r\n \"Server_Password=\": \"Server_Password={{server.build.env.SRV_PW}}\",\r\n \"Password=\": \"Password={{server.build.env.SRV_PW}}\",\r\n \"RCON_Enabled=\": \"RCON_Enabled={{server.build.env.RCON}}\",\r\n \"RCON_Password=\": \"RCON_Password={{server.build.env.RCON_PORT}}\",\r\n \"RCON_Port=\": \"RCON_Port={{server.build.env.RCON_PORT}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Dedicated server is ready!\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n ##\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\nif [ -f \"$HOME\/server.properties\" ]; then\r\n echo \"-----------------------------------------\"\r\n echo \"server.properties found.\"\r\n echo \"-----------------------------------------\"\r\nelse\r\n echo \"-----------------------------------------\"\r\n echo \"renaming server.example.properties\"\r\n echo \"-----------------------------------------\"\r\n mv \/mnt\/server\/server.example.properties \/mnt\/server\/server.properties\r\nfi\r\n\r\nrm -fR $HOME\/linux_screen.sh\r\nrm -fR $HOME\/linux_startscript.sh\r\n\r\necho \"-----------------------------------------\"\r\necho \"Installation completed...\"\r\necho \"-----------------------------------------\"", + "container": "ghcr.io\/parkervcp\/installers:debian", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "SRCDS_APPID", + "description": "", + "env_variable": "SRCDS_APPID", + "default_value": "339010", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:20", + "field_type": "text" + }, + { + "name": "SRCDS_BETAID", + "description": "", + "env_variable": "SRCDS_BETAID", + "default_value": "unity", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:20", + "field_type": "text" + }, + { + "name": "LD_LIBRARY_PATH", + "description": "", + "env_variable": "LD_LIBRARY_PATH", + "default_value": "\/linux64", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:20", + "field_type": "text" + }, + { + "name": "Server Name", + "description": "Server name (shows up in server list)", + "env_variable": "SRV_NAME", + "default_value": "Pterodactyl hosted Server", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:40", + "field_type": "text" + }, + { + "name": "Server Password", + "description": "Server password. If set, users are prompted to enter the pw to join the server. Leave blank for no pw", + "env_variable": "SRV_PW", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable", + "field_type": "text" + }, + { + "name": "Game Mode", + "description": "Default world game mode (only used when a new world is created). Either \"Survival\" or \"Creative\"", + "env_variable": "GAME_MODE", + "default_value": "Survival", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|in:,Survival,Creative", + "field_type": "text" + }, + { + "name": "World Name", + "description": "Name of the world which should be loaded (if it does not exist, it will be created)", + "env_variable": "WORLD_NAME", + "default_value": "myworld", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20", + "field_type": "text" + }, + { + "name": "[Advanced] Enable RCON", + "description": "Determines whether or not the RCON tool should be enabled", + "env_variable": "RCON", + "default_value": "false", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:true,false", + "field_type": "text" + }, + { + "name": "[Advanced] RCON Password", + "description": "Password required for RCON login. Min 6 characters (!)", + "env_variable": "RCON_PASS", + "default_value": "somepassword", + "user_viewable": true, + "user_editable": true, + "rules": "required|nullable|min:6", + "field_type": "text" + }, + { + "name": "[Advanced] RCON Port", + "description": "Port used to connect to RCON. Must be allocated to the server for RCON to work.", + "env_variable": "RCON_PORT", + "default_value": "4253", + "user_viewable": true, + "user_editable": false, + "rules": "required|integer|between:1024,65536", + "field_type": "text" + }, + { + "name": "Auto Update", + "description": "Update the server on start\/restart", + "env_variable": "AUTO_UPDATE", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "required|boolean", + "field_type": "text" + } + ] +} \ No newline at end of file From f924ec867a61e6f196a220e14253e0a918339f67 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 16 Oct 2022 10:54:04 +0200 Subject: [PATCH 0617/1001] fixed ports in readme --- game_eggs/steamcmd_servers/rising_world/unity/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/rising_world/unity/README.md b/game_eggs/steamcmd_servers/rising_world/unity/README.md index 43da49b6..e9f58202 100644 --- a/game_eggs/steamcmd_servers/rising_world/unity/README.md +++ b/game_eggs/steamcmd_servers/rising_world/unity/README.md @@ -14,5 +14,6 @@ Rising World requires up to 3 ports. | Port | default | |---------|---------------| | Game | 4255 | -| RCON | 4253 | | Query | 4254 | +| RCON | 4253 | + From 05a05f3862258da31baaca7f401da9e1ea84a404 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 16 Oct 2022 13:45:38 +0200 Subject: [PATCH 0618/1001] add nodejs 18 --- generic/nodejs/egg-node-js-generic.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/generic/nodejs/egg-node-js-generic.json b/generic/nodejs/egg-node-js-generic.json index fa063f12..4d525ceb 100644 --- a/generic/nodejs/egg-node-js-generic.json +++ b/generic/nodejs/egg-node-js-generic.json @@ -4,12 +4,13 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-07-25T14:13:08-04:00", + "exported_at": "2022-10-16T13:45:09+02:00", "name": "node.js generic", "author": "parker@parkervcp.com", "description": "a generic node.js egg\r\n\r\nThis will clone a git repo. it defaults to master if no branch is specified.\r\n\r\nInstalls the node_modules on install. If you set user_upload then I assume you know what you are doing.", "features": null, "docker_images": { + "ghcr.io\/parkervcp\/yolks:nodejs_18": "ghcr.io\/parkervcp\/yolks:nodejs_18", "ghcr.io\/parkervcp\/yolks:nodejs_17": "ghcr.io\/parkervcp\/yolks:nodejs_17", "ghcr.io\/parkervcp\/yolks:nodejs_16": "ghcr.io\/parkervcp\/yolks:nodejs_16", "ghcr.io\/parkervcp\/yolks:nodejs_15": "ghcr.io\/parkervcp\/yolks:nodejs_15", From 578bf30c5e928dff2c35d5efdb66c9bc304f2df5 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 16 Oct 2022 17:50:05 +0200 Subject: [PATCH 0619/1001] fixed wrong variable --- .../rising_world/unity/egg-rising-world-unity.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/rising_world/unity/egg-rising-world-unity.json b/game_eggs/steamcmd_servers/rising_world/unity/egg-rising-world-unity.json index cc174ecb..54be33ca 100644 --- a/game_eggs/steamcmd_servers/rising_world/unity/egg-rising-world-unity.json +++ b/game_eggs/steamcmd_servers/rising_world/unity/egg-rising-world-unity.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-10-16T10:44:01+02:00", + "exported_at": "2022-10-16T17:49:35+02:00", "name": "Rising World Unity", "author": "info@goover.de", "description": "Rising World is a voxel based open-world sandbox game, featuring a procedurally generated world, playable in single and multi-player.", @@ -17,7 +17,7 @@ "file_denylist": [], "startup": ".\/RisingWorldServer.x64 +Server_Port={{SERVER.PORT}}", "config": { - "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"Server_Name=\": \"Server_Name={{server.build.env.SRV_NAME}}\",\r\n \"Server_Password=\": \"Server_Password={{server.build.env.SRV_PW}}\",\r\n \"Password=\": \"Password={{server.build.env.SRV_PW}}\",\r\n \"RCON_Enabled=\": \"RCON_Enabled={{server.build.env.RCON}}\",\r\n \"RCON_Password=\": \"RCON_Password={{server.build.env.RCON_PORT}}\",\r\n \"RCON_Port=\": \"RCON_Port={{server.build.env.RCON_PORT}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"Server_Name=\": \"Server_Name={{server.build.env.SRV_NAME}}\",\r\n \"Server_Password=\": \"Server_Password={{server.build.env.SRV_PW}}\",\r\n \"Password=\": \"Password={{server.build.env.SRV_PW}}\",\r\n \"RCON_Enabled=\": \"RCON_Enabled={{server.build.env.RCON}}\",\r\n \"RCON_Password=\": \"RCON_Password={{server.build.env.RCON_PASS}}\",\r\n \"RCON_Port=\": \"RCON_Port={{server.build.env.RCON_PORT}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Dedicated server is ready!\"\r\n}", "logs": "{}", "stop": "^C" From 057433db56fe61e238ec6655ff4f5d78a31397be Mon Sep 17 00:00:00 2001 From: zoomiti Date: Mon, 17 Oct 2022 22:25:45 -0400 Subject: [PATCH 0620/1001] Added Yarr egg --- software/yarr/README.md | 17 ++++++++++++ software/yarr/egg-yarr.json | 52 +++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 software/yarr/README.md create mode 100644 software/yarr/egg-yarr.json diff --git a/software/yarr/README.md b/software/yarr/README.md new file mode 100644 index 00000000..c1745b14 --- /dev/null +++ b/software/yarr/README.md @@ -0,0 +1,17 @@ +# Yar + +## From their [Github](https://github.com/nkanaev/yarr) + +Host your own web based RSS feed aggregator `yarr`. + +## Server Ports + +Ports required to run the server in a table format. + +| Port | default | +|---------|---------| +| App | 7070 | + +### Notes + +7070 is the default port, but any port can be used. diff --git a/software/yarr/egg-yarr.json b/software/yarr/egg-yarr.json new file mode 100644 index 00000000..700b30a7 --- /dev/null +++ b/software/yarr/egg-yarr.json @@ -0,0 +1,52 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2022-10-17T22:24:46-04:00", + "name": "Yarr", + "author": "sotoluis90@gmail.com", + "description": "Yarr is a selfhosted feed aggregator", + "features": null, + "docker_images": { + "ghcr.io\/parkervcp\/yolks:debian": "ghcr.io\/parkervcp\/yolks:debian" + }, + "file_denylist": [], + "startup": "echo \"{{USERNAME}}:{{PASSWORD}} > .\/auth.conf && .\/yarr -addr 0.0.0.0:{{SERVER_PORT}} -auth-file=.\/auth.conf -db=.\/feed.sql", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"starting server\",\r\n \"userInteraction\": []\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "apt update\r\napt install -y git make gcc curl tar\r\n\r\ncd\r\n\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"amd64\" || echo \"arm64\")\r\n\r\necho ${ARCH}\r\n\r\ncurl -O https:\/\/dl.google.com\/go\/go1.19.2.linux-${ARCH}.tar.gz\r\nls\r\ntar xvf go1.19.2.linux-${ARCH}.tar.gz\r\n\r\nchown -R root:root .\/go\r\nmv go \/usr\/local\r\n\r\nexport GOPATH=$HOME\/work\r\nexport PATH=$PATH:\/usr\/local\/go\/bin:$GOPATH\/bin\r\n\r\ncd \/mnt\/server\r\n\r\nmkdir yarr_source\r\ngit clone https:\/\/github.com\/nkanaev\/yarr.git yarr_source\r\n\r\ncd yarr_source\r\n\r\nexport CGO_ENABLED=1\r\nsed -i -r \"s\/amd64\/$ARCH\/g\" makefile\r\n\r\nmake build_linux # -> _output\/linux\/yarr\r\n\r\ncp _output\/linux\/yarr ..\/yarr\r\ncd ..\/\r\n\r\nrm -rf yarr_source\r\n\r\ntouch auth.conf\r\n\r\nchmod +x yarr\r\n\r\necho \"Install complete\"", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Username", + "description": "The username used to log in to yarr", + "env_variable": "USERNAME", + "default_value": "username", + "user_viewable": false, + "user_editable": true, + "rules": "required|string|max:20|alpha_dash", + "field_type": "text" + }, + { + "name": "Password", + "description": "The password needed to log in to yarr", + "env_variable": "PASSWORD", + "default_value": "password", + "user_viewable": false, + "user_editable": true, + "rules": "required|string|max:20|alpha_dash", + "field_type": "text" + } + ] +} \ No newline at end of file From 64866aaa87072f349b0af5efb17714638d489bde Mon Sep 17 00:00:00 2001 From: zoomiti Date: Mon, 17 Oct 2022 22:32:49 -0400 Subject: [PATCH 0621/1001] Added Yarr to the main `README.md` --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 66aaf868..fbd8f9ca 100644 --- a/README.md +++ b/README.md @@ -341,6 +341,10 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Reposilite](/software/reposilite) +### Yarr + +* [yarr](/software/yarr) + ### 5e Tools * [5e Tools](/software/5e-tools) From 79d1d30ea73072f756e85ed738b72388520af1d0 Mon Sep 17 00:00:00 2001 From: zoomiti Date: Mon, 17 Oct 2022 23:39:49 -0400 Subject: [PATCH 0622/1001] Fixes Yarr egg startup command --- software/yarr/egg-yarr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/software/yarr/egg-yarr.json b/software/yarr/egg-yarr.json index 700b30a7..2a3d7083 100644 --- a/software/yarr/egg-yarr.json +++ b/software/yarr/egg-yarr.json @@ -13,7 +13,7 @@ "ghcr.io\/parkervcp\/yolks:debian": "ghcr.io\/parkervcp\/yolks:debian" }, "file_denylist": [], - "startup": "echo \"{{USERNAME}}:{{PASSWORD}} > .\/auth.conf && .\/yarr -addr 0.0.0.0:{{SERVER_PORT}} -auth-file=.\/auth.conf -db=.\/feed.sql", + "startup": "echo \"{{USERNAME}}:{{PASSWORD}}\" > .\/auth.conf && .\/yarr -addr 0.0.0.0:{{SERVER_PORT}} -auth-file=.\/auth.conf -db=.\/feed.sql", "config": { "files": "{}", "startup": "{\r\n \"done\": \"starting server\",\r\n \"userInteraction\": []\r\n}", @@ -49,4 +49,4 @@ "field_type": "text" } ] -} \ No newline at end of file +} From 959c9af068456468b71f47e2cd84e5910c34fc64 Mon Sep 17 00:00:00 2001 From: zoomiti Date: Mon, 17 Oct 2022 23:57:37 -0400 Subject: [PATCH 0623/1001] Removes unnecessary restrictions on username and password for Yarr egg --- software/yarr/egg-yarr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/software/yarr/egg-yarr.json b/software/yarr/egg-yarr.json index 2a3d7083..39141576 100644 --- a/software/yarr/egg-yarr.json +++ b/software/yarr/egg-yarr.json @@ -35,7 +35,7 @@ "default_value": "username", "user_viewable": false, "user_editable": true, - "rules": "required|string|max:20|alpha_dash", + "rules": "required|string|alpha_dash", "field_type": "text" }, { @@ -45,7 +45,7 @@ "default_value": "password", "user_viewable": false, "user_editable": true, - "rules": "required|string|max:20|alpha_dash", + "rules": "required|string|alpha_dash", "field_type": "text" } ] From 1b3c72d26ec04b5deeb0fe30b31719472b66f45d Mon Sep 17 00:00:00 2001 From: zoomiti Date: Tue, 18 Oct 2022 00:38:04 -0400 Subject: [PATCH 0624/1001] Improves auth variables for Yarr --- software/yarr/egg-yarr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/yarr/egg-yarr.json b/software/yarr/egg-yarr.json index 39141576..4add6370 100644 --- a/software/yarr/egg-yarr.json +++ b/software/yarr/egg-yarr.json @@ -13,7 +13,7 @@ "ghcr.io\/parkervcp\/yolks:debian": "ghcr.io\/parkervcp\/yolks:debian" }, "file_denylist": [], - "startup": "echo \"{{USERNAME}}:{{PASSWORD}}\" > .\/auth.conf && .\/yarr -addr 0.0.0.0:{{SERVER_PORT}} -auth-file=.\/auth.conf -db=.\/feed.sql", + "startup": ".\/yarr -addr 0.0.0.0:{{SERVER_PORT}} -auth=\"{{USERNAME}}:{{PASSWORD}}\" -db=.\/feed.sql", "config": { "files": "{}", "startup": "{\r\n \"done\": \"starting server\",\r\n \"userInteraction\": []\r\n}", From d72b21a9ba4c872103361ce5d1c073506db8a8cf Mon Sep 17 00:00:00 2001 From: cfouche3005 <51720655+cfouche3005@users.noreply.github.com> Date: Tue, 18 Oct 2022 21:14:48 +0200 Subject: [PATCH 0625/1001] FIx egg-curseforge-generic.json --- .../forge/curseforge-generic/egg-curseforge-generic.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json b/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json index b86afb49..5869dc1b 100644 --- a/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json +++ b/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json @@ -29,7 +29,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\nmkdir -p \/mnt\/server\r\n\r\nfunction install_required {\r\n apt update\r\n apt install -y curl jq unzip dos2unix\r\n}\r\n\r\nfunction get_download {\r\n # get json data to work with\r\n echo -e \"Curling the json for the modpack\"\r\n echo -e \"running: curl -sSLX GET https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID} -H 'Accept: application\/json' -H 'x-api-key: API_KEY'\"\r\n JSON_DATA=$(curl -ssLX GET https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID} -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\")\r\n\r\n # if no modpack version is set or is set to latest\r\n if [ -z ${MODPACK_VERSION} ] || [ \"${MODPACK_VERSION}\" = \"latest\" ]; then\r\n echo -e \"Getting latest download url\"\r\n # parse data to get the download url\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r \".data.mainFileId\")\r\n echo -e \"File ID is: ${FILE_ID}\"\r\n if [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .isServerPack\")\" == \"false\" ] && [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\" != \"null\" ]; then\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\r\n DOWNLOAD_URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files\/${FILE_ID}\/download-url | jq -r \".data\")\r\n else\r\n DOWNLOAD_URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files\/${FILE_ID}\/download-url | jq -r \".data\")\r\n fi\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n else\r\n echo -e \"Looking for download url for version ${MODPACK_VERSION}\"\r\n # parse files for version match\r\n FILES_JSON_DATA=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files)\r\n # get element number to get the exact location in the json\r\n FILES_JSON_ELEMENT=$(echo -e ${FILES_JSON_DATA} | jq --arg VERSION \"${MODPACK_VERSION}\" '.[] | select(.displayName) | .displayName | contains($VERSION)' | grep -n true | cut -f1 -d: | tail -1)\r\n # if there wasn't a match default to latest\r\n if [ ! -z ${FILES_JSON_ELEMENT} ]; then\r\n echo -e \"No matching version found\"\r\n echo -e \"defaulting to latest\"\r\n DOWNLOAD_URL=$(echo -e ${FILES_JSON_DATA} | jq --arg ELEMENT \"${FILES_JSON_ELEMENT}\" '.[$ELEMENT|tonumber-1] | .downloadUrl')\r\n else\r\n echo -e \"Version match found\"\r\n DOWNLOAD_URL=$(echo -e ${JSON_DATA} | jq -r .latestFiles[0].downloadUrl)\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n fi\r\n fi\r\n ## download modpack files\r\n cd \/mnt\/server\r\n echo \"Executing curl -L ${DOWNLOAD_URL} -o server.zip\"\r\n curl -L -g \"${DOWNLOAD_URL}\" -o server.zip\r\n unzip -o server.zip\r\n rm -rf server.zip\r\n}\r\n\r\nfunction unpack_zip {\r\n cd \/mnt\/server\r\n unzip -o server.zip\r\n}\r\n\r\nfunction forge_install {\r\n echo -e \"\\nInstalling forge server using the installer jar file.\\n\"\r\n if [ -f \/mnt\/server\/*installer.jar ]; then\r\n\t\tmv *installer.jar installer.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n else\r\n echo \"No forge installer found moving on.\"\r\n fi\r\n mv FTBServer.jar server.jar\r\n}\r\n\r\nfunction forge_cleanup {\r\n echo -e \"\\nDeleting installer jar file and cleaning up.\\n\"\r\n rm -rf *installer.jar\r\n if [ ! -f \/mnt\/server\/forge*universal.jar ]; then\r\n mv -v \/mnt\/server\/*\/* \/mnt\/server\/\r\n if [ ! -f \/mnt\/server\/*universal.jar ]; then\r\n mv forge*.jar server.jar\r\n else\r\n mv forge*universal.jar server.jar \r\n fi\r\n else\r\n mv forge*universal.jar server.jar\r\n fi\r\n}\r\n\r\nfunction json_download_prework {\r\n mkdir -p \/mnt\/server\/mods\r\n cd \/mnt\/server\/mods\r\n}\r\n\r\nfunction json_download_mods {\r\n MANIFEST=\/mnt\/server\/manifest.json\r\n for mod in $(jq -c '.files[]' ${MANIFEST} ); do\r\n projID=$(echo $mod | jq -r \".projectID\")\r\n fileID=$(echo $mod | jq -r \".fileID\")\r\n URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${projID}\/files\/${fileID}\/download-url jq -r \".data\")\r\n # this is saving everything as \/mnt\/server\/mods\/download\r\n echo \"Mod direct url: ${URL}\"\r\n curl -JLO \"${URL}\"\r\n done\r\n}\r\n\r\nfunction json_download_forge {\r\n cd \/mnt\/server\r\n FORGE=$(jq -r '.minecraft.modLoaders[0].id' \/mnt\/server\/manifest.json | cut -d '-' -f2)\r\n MCVER=$(jq -r '.minecraft.version' \/mnt\/server\/manifest.json)\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\"\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction json_download_overrides {\r\n if [ -d \/mnt\/server\/overrides ]; then\r\n mv \/mnt\/server\/overrides\/mods\/* \/mnt\/server\/mods\/\r\n rmdir \/mnt\/server\/overrides\/mods\r\n mv \/mnt\/server\/overrides\/* \/mnt\/server\r\n rmdir \/mnt\/server\/overrides\r\n fi\r\n}\r\n\r\nfunction cfg_download_forge {\r\n dos2unix settings.cfg # In case the pack was distributed with Windows-style line endings in the cfg file\r\n MCVER=`grep 'MCVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n FORGE=`grep 'FORGEVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n \r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n echo -e ${FORGE_VERSION}\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n PARSED_LINK=$(echo -e \"$FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\" | sed 's\/ \/\/g')\r\n\r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $PARSED_LINK\"\r\n curl -sSL $PARSED_LINK-installer.jar -o installer.jar\r\n curl -sSL $PARSED_LINK-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction ftb_install {\r\n chmod +x \/mnt\/server\/settings.sh \r\n . \/mnt\/server\/settings.sh \r\n curl https:\/\/s3.amazonaws.com\/Minecraft.Download\/versions\/${MCVER}\/minecraft_server.${MCVER}.jar -o ${JARFILE} \r\n curl https:\/\/libraries.minecraft.net\/${LAUNCHWRAPPER} -o \/mnt\/server\/libraries\/${LAUNCHWRAPPER}\r\n}\r\n\r\ninstall_required\r\nif [ ! -z ${MODPACK_ID} ] && [ ! \"${MODPACK_ID}\" = \"zip\" ]; then\r\n\tget_download\r\n\tunpack_zip\r\n rm -rf server.zip\r\nelse\r\n\tunpack_zip\r\nfi\r\n\r\nif [ -f \/mnt\/server\/manifest.json ]; then\r\n json_download_prework\r\n json_download_mods\r\n json_download_overrides\r\n json_download_forge\r\nelif [ -f \/mnt\/server\/settings.cfg ]; then\r\n cfg_download_forge\r\nelif [ -f \/mnt\/server\/version.json ]; then\r\n if [ \"$(cat \/mnt\/server\/version.json | jq -r '.packID | contains(\"FTB\")')\" == \"true\" ]; then\r\n ftb_install\r\n fi\r\nelse\r\n forge_install\r\n forge_cleanup\r\nfi\r\n\r\necho -e \"\\n\\nInstall completed succesfully, enjoy!\"", + "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\nmkdir -p \/mnt\/server\r\n\r\nfunction install_required {\r\n apt update\r\n apt install -y curl jq unzip dos2unix\r\n}\r\n\r\nfunction get_download {\r\n # get json data to work with\r\n echo -e \"Curling the json for the modpack\"\r\n echo -e \"running: curl -sSLX GET https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID} -H 'Accept: application\/json' -H 'x-api-key: API_KEY'\"\r\n JSON_DATA=$(curl -ssLX GET https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID} -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\")\r\n\r\n # if no modpack version is set or is set to latest\r\n if [ -z ${MODPACK_VERSION} ] + | [ \"${MODPACK_VERSION}\" = \"latest\" ]; then\r\n echo -e \"Getting latest download url\"\r\n # parse data to get the download url\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r \".data.mainFileId\")\r\n echo -e \"File ID is: ${FILE_ID}\"\r\n if [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .isServerPack\")\" == \"false\" ] && [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\" != \"null\" ]; then\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\r\n DOWNLOAD_URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files\/${FILE_ID}\/download-url | jq -r \".data\")\r\n else\r\n DOWNLOAD_URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files\/${FILE_ID}\/download-url | jq -r \".data\")\r\n fi\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n else\r\n echo -e \"Looking for download url for version ${MODPACK_VERSION}\"\r\n # parse files for version match\r\n FILES_JSON_DATA=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files)\r\n # get element number to get the exact location in the json\r\n FILES_JSON_ELEMENT=$(echo -e ${FILES_JSON_DATA} | jq --arg VERSION \"${MODPACK_VERSION}\" '.[] | select(.displayName) | .displayName | contains($VERSION)' | grep -n true | cut -f1 -d: | tail -1)\r\n # if there wasn't a match default to latest\r\n if [ ! -z ${FILES_JSON_ELEMENT} ]; then\r\n echo -e \"No matching version found\"\r\n echo -e \"defaulting to latest\"\r\n DOWNLOAD_URL=$(echo -e ${FILES_JSON_DATA} | jq --arg ELEMENT \"${FILES_JSON_ELEMENT}\" '.[$ELEMENT|tonumber-1] | .downloadUrl')\r\n else\r\n echo -e \"Version match found\"\r\n DOWNLOAD_URL=$(echo -e ${JSON_DATA} | jq -r .latestFiles[0].downloadUrl)\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n fi\r\n fi\r\n ## download modpack files\r\n cd \/mnt\/server\r\n echo \"Executing curl -L ${DOWNLOAD_URL} -o server.zip\"\r\n curl -L -g \"${DOWNLOAD_URL}\" -o server.zip\r\n unzip -o server.zip\r\n rm -rf server.zip\r\n}\r\n\r\nfunction unpack_zip {\r\n cd \/mnt\/server\r\n unzip -o server.zip\r\n}\r\n\r\nfunction forge_install {\r\n echo -e \"\\nInstalling forge server using the installer jar file.\\n\"\r\n if [ -f \/mnt\/server\/*installer.jar ]; then\r\n\t\tmv *installer.jar installer.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n else\r\n echo \"No forge installer found moving on.\"\r\n fi\r\n mv FTBServer.jar server.jar\r\n}\r\n\r\nfunction forge_cleanup {\r\n echo -e \"\\nDeleting installer jar file and cleaning up.\\n\"\r\n rm -rf *installer.jar\r\n if [ ! -f \/mnt\/server\/forge*universal.jar ]; then\r\n mv -v \/mnt\/server\/*\/* \/mnt\/server\/\r\n if [ ! -f \/mnt\/server\/*universal.jar ]; then\r\n mv forge*.jar server.jar\r\n else\r\n mv forge*universal.jar server.jar \r\n fi\r\n else\r\n mv forge*universal.jar server.jar\r\n fi\r\n}\r\n\r\nfunction json_download_prework {\r\n mkdir -p \/mnt\/server\/mods\r\n cd \/mnt\/server\/mods\r\n}\r\n\r\nfunction json_download_mods {\r\n MANIFEST=\/mnt\/server\/manifest.json\r\n for mod in $(jq -c '.files[]' ${MANIFEST} ); do\r\n projID=$(echo $mod | jq -r \".projectID\")\r\n fileID=$(echo $mod | jq -r \".fileID\")\r\n URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${projID}\/files\/${fileID}\/download-url | jq -r \".data\")\r\n # this is saving everything as \/mnt\/server\/mods\/download\r\n echo \"Mod direct url: ${URL}\"\r\n curl -JLO \"${URL}\"\r\n done\r\n}\r\n\r\nfunction json_download_forge {\r\n cd \/mnt\/server\r\n FORGE=$(jq -r '.minecraft.modLoaders[0].id' \/mnt\/server\/manifest.json | cut -d '-' -f2)\r\n MCVER=$(jq -r '.minecraft.version' \/mnt\/server\/manifest.json)\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\"\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction json_download_overrides {\r\n if [ -d \/mnt\/server\/overrides ]; then\r\n mv \/mnt\/server\/overrides\/mods\/* \/mnt\/server\/mods\/\r\n rmdir \/mnt\/server\/overrides\/mods\r\n mv \/mnt\/server\/overrides\/* \/mnt\/server\r\n rmdir \/mnt\/server\/overrides\r\n fi\r\n}\r\n\r\nfunction cfg_download_forge {\r\n dos2unix settings.cfg # In case the pack was distributed with Windows-style line endings in the cfg file\r\n MCVER=`grep 'MCVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n FORGE=`grep 'FORGEVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n \r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n echo -e ${FORGE_VERSION}\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n PARSED_LINK=$(echo -e \"$FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\" | sed 's\/ \/\/g')\r\n\r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $PARSED_LINK\"\r\n curl -sSL $PARSED_LINK-installer.jar -o installer.jar\r\n curl -sSL $PARSED_LINK-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction ftb_install {\r\n chmod +x \/mnt\/server\/settings.sh \r\n . \/mnt\/server\/settings.sh \r\n curl https:\/\/s3.amazonaws.com\/Minecraft.Download\/versions\/${MCVER}\/minecraft_server.${MCVER}.jar -o ${JARFILE} \r\n curl https:\/\/libraries.minecraft.net\/${LAUNCHWRAPPER} -o \/mnt\/server\/libraries\/${LAUNCHWRAPPER}\r\n}\r\n\r\ninstall_required\r\nif [ ! -z ${MODPACK_ID} ] && [ ! \"${MODPACK_ID}\" = \"zip\" ]; then\r\n\tget_download\r\n\tunpack_zip\r\n rm -rf server.zip\r\nelse\r\n\tunpack_zip\r\nfi\r\n\r\nif [ -f \/mnt\/server\/manifest.json ]; then\r\n json_download_prework\r\n json_download_mods\r\n json_download_overrides\r\n json_download_forge\r\nelif [ -f \/mnt\/server\/settings.cfg ]; then\r\n cfg_download_forge\r\nelif [ -f \/mnt\/server\/version.json ]; then\r\n if [ \"$(cat \/mnt\/server\/version.json | jq -r '.packID | contains(\"FTB\")')\" == \"true\" ]; then\r\n ftb_install\r\n fi\r\nelse\r\n forge_install\r\n forge_cleanup\r\nfi\r\n\r\necho -e \"\\n\\nInstall completed succesfully, enjoy!\"", "container": "openjdk:8-jdk-slim", "entrypoint": "bash" } @@ -66,4 +67,4 @@ "field_type": "text" } ] -} \ No newline at end of file +} From 1591b5d52bb3671db608885a4ba3060301873cc0 Mon Sep 17 00:00:00 2001 From: cfouche3005 <51720655+cfouche3005@users.noreply.github.com> Date: Tue, 18 Oct 2022 22:03:28 +0200 Subject: [PATCH 0626/1001] Update egg-curseforge-generic.json --- .../forge/curseforge-generic/egg-curseforge-generic.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json b/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json index 5869dc1b..f64e51eb 100644 --- a/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json +++ b/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-07-03T17:12:36-04:00", + "exported_at": "2022-10-18T22:00:46+02:00", "name": "Curseforge Generic", "author": "parker@parkervcp.com", "description": "A generic egg for a forge modpack", @@ -29,8 +29,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\nmkdir -p \/mnt\/server\r\n\r\nfunction install_required {\r\n apt update\r\n apt install -y curl jq unzip dos2unix\r\n}\r\n\r\nfunction get_download {\r\n # get json data to work with\r\n echo -e \"Curling the json for the modpack\"\r\n echo -e \"running: curl -sSLX GET https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID} -H 'Accept: application\/json' -H 'x-api-key: API_KEY'\"\r\n JSON_DATA=$(curl -ssLX GET https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID} -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\")\r\n\r\n # if no modpack version is set or is set to latest\r\n if [ -z ${MODPACK_VERSION} ] - | [ \"${MODPACK_VERSION}\" = \"latest\" ]; then\r\n echo -e \"Getting latest download url\"\r\n # parse data to get the download url\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r \".data.mainFileId\")\r\n echo -e \"File ID is: ${FILE_ID}\"\r\n if [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .isServerPack\")\" == \"false\" ] && [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\" != \"null\" ]; then\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\r\n DOWNLOAD_URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files\/${FILE_ID}\/download-url | jq -r \".data\")\r\n else\r\n DOWNLOAD_URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files\/${FILE_ID}\/download-url | jq -r \".data\")\r\n fi\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n else\r\n echo -e \"Looking for download url for version ${MODPACK_VERSION}\"\r\n # parse files for version match\r\n FILES_JSON_DATA=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files)\r\n # get element number to get the exact location in the json\r\n FILES_JSON_ELEMENT=$(echo -e ${FILES_JSON_DATA} | jq --arg VERSION \"${MODPACK_VERSION}\" '.[] | select(.displayName) | .displayName | contains($VERSION)' | grep -n true | cut -f1 -d: | tail -1)\r\n # if there wasn't a match default to latest\r\n if [ ! -z ${FILES_JSON_ELEMENT} ]; then\r\n echo -e \"No matching version found\"\r\n echo -e \"defaulting to latest\"\r\n DOWNLOAD_URL=$(echo -e ${FILES_JSON_DATA} | jq --arg ELEMENT \"${FILES_JSON_ELEMENT}\" '.[$ELEMENT|tonumber-1] | .downloadUrl')\r\n else\r\n echo -e \"Version match found\"\r\n DOWNLOAD_URL=$(echo -e ${JSON_DATA} | jq -r .latestFiles[0].downloadUrl)\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n fi\r\n fi\r\n ## download modpack files\r\n cd \/mnt\/server\r\n echo \"Executing curl -L ${DOWNLOAD_URL} -o server.zip\"\r\n curl -L -g \"${DOWNLOAD_URL}\" -o server.zip\r\n unzip -o server.zip\r\n rm -rf server.zip\r\n}\r\n\r\nfunction unpack_zip {\r\n cd \/mnt\/server\r\n unzip -o server.zip\r\n}\r\n\r\nfunction forge_install {\r\n echo -e \"\\nInstalling forge server using the installer jar file.\\n\"\r\n if [ -f \/mnt\/server\/*installer.jar ]; then\r\n\t\tmv *installer.jar installer.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n else\r\n echo \"No forge installer found moving on.\"\r\n fi\r\n mv FTBServer.jar server.jar\r\n}\r\n\r\nfunction forge_cleanup {\r\n echo -e \"\\nDeleting installer jar file and cleaning up.\\n\"\r\n rm -rf *installer.jar\r\n if [ ! -f \/mnt\/server\/forge*universal.jar ]; then\r\n mv -v \/mnt\/server\/*\/* \/mnt\/server\/\r\n if [ ! -f \/mnt\/server\/*universal.jar ]; then\r\n mv forge*.jar server.jar\r\n else\r\n mv forge*universal.jar server.jar \r\n fi\r\n else\r\n mv forge*universal.jar server.jar\r\n fi\r\n}\r\n\r\nfunction json_download_prework {\r\n mkdir -p \/mnt\/server\/mods\r\n cd \/mnt\/server\/mods\r\n}\r\n\r\nfunction json_download_mods {\r\n MANIFEST=\/mnt\/server\/manifest.json\r\n for mod in $(jq -c '.files[]' ${MANIFEST} ); do\r\n projID=$(echo $mod | jq -r \".projectID\")\r\n fileID=$(echo $mod | jq -r \".fileID\")\r\n URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${projID}\/files\/${fileID}\/download-url | jq -r \".data\")\r\n # this is saving everything as \/mnt\/server\/mods\/download\r\n echo \"Mod direct url: ${URL}\"\r\n curl -JLO \"${URL}\"\r\n done\r\n}\r\n\r\nfunction json_download_forge {\r\n cd \/mnt\/server\r\n FORGE=$(jq -r '.minecraft.modLoaders[0].id' \/mnt\/server\/manifest.json | cut -d '-' -f2)\r\n MCVER=$(jq -r '.minecraft.version' \/mnt\/server\/manifest.json)\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\"\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction json_download_overrides {\r\n if [ -d \/mnt\/server\/overrides ]; then\r\n mv \/mnt\/server\/overrides\/mods\/* \/mnt\/server\/mods\/\r\n rmdir \/mnt\/server\/overrides\/mods\r\n mv \/mnt\/server\/overrides\/* \/mnt\/server\r\n rmdir \/mnt\/server\/overrides\r\n fi\r\n}\r\n\r\nfunction cfg_download_forge {\r\n dos2unix settings.cfg # In case the pack was distributed with Windows-style line endings in the cfg file\r\n MCVER=`grep 'MCVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n FORGE=`grep 'FORGEVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n \r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n echo -e ${FORGE_VERSION}\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n PARSED_LINK=$(echo -e \"$FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\" | sed 's\/ \/\/g')\r\n\r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $PARSED_LINK\"\r\n curl -sSL $PARSED_LINK-installer.jar -o installer.jar\r\n curl -sSL $PARSED_LINK-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction ftb_install {\r\n chmod +x \/mnt\/server\/settings.sh \r\n . \/mnt\/server\/settings.sh \r\n curl https:\/\/s3.amazonaws.com\/Minecraft.Download\/versions\/${MCVER}\/minecraft_server.${MCVER}.jar -o ${JARFILE} \r\n curl https:\/\/libraries.minecraft.net\/${LAUNCHWRAPPER} -o \/mnt\/server\/libraries\/${LAUNCHWRAPPER}\r\n}\r\n\r\ninstall_required\r\nif [ ! -z ${MODPACK_ID} ] && [ ! \"${MODPACK_ID}\" = \"zip\" ]; then\r\n\tget_download\r\n\tunpack_zip\r\n rm -rf server.zip\r\nelse\r\n\tunpack_zip\r\nfi\r\n\r\nif [ -f \/mnt\/server\/manifest.json ]; then\r\n json_download_prework\r\n json_download_mods\r\n json_download_overrides\r\n json_download_forge\r\nelif [ -f \/mnt\/server\/settings.cfg ]; then\r\n cfg_download_forge\r\nelif [ -f \/mnt\/server\/version.json ]; then\r\n if [ \"$(cat \/mnt\/server\/version.json | jq -r '.packID | contains(\"FTB\")')\" == \"true\" ]; then\r\n ftb_install\r\n fi\r\nelse\r\n forge_install\r\n forge_cleanup\r\nfi\r\n\r\necho -e \"\\n\\nInstall completed succesfully, enjoy!\"", + "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\nmkdir -p \/mnt\/server\r\n\r\nfunction install_required {\r\n apt update\r\n apt install -y curl jq unzip dos2unix\r\n}\r\n\r\nfunction get_download {\r\n # get json data to work with\r\n echo -e \"Curling the json for the modpack\"\r\n echo -e \"running: curl -sSLX GET https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID} -H 'Accept: application\/json' -H 'x-api-key: API_KEY'\"\r\n JSON_DATA=$(curl -ssLX GET https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID} -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\")\r\n\r\n # if no modpack version is set or is set to latest\r\n if [ -z ${MODPACK_VERSION} ] || [ \"${MODPACK_VERSION}\" = \"latest\" ]; then\r\n echo -e \"Getting latest download url\"\r\n # parse data to get the download url\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r \".data.mainFileId\")\r\n echo -e \"File ID is: ${FILE_ID}\"\r\n if [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .isServerPack\")\" == \"false\" ] && [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\" != \"null\" ]; then\r\n FILE_ID=$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".data.latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\r\n DOWNLOAD_URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files\/${FILE_ID}\/download-url | jq -r \".data\")\r\n else\r\n DOWNLOAD_URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files\/${FILE_ID}\/download-url | jq -r \".data\")\r\n fi\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n else\r\n echo -e \"Looking for download url for version ${MODPACK_VERSION}\"\r\n # parse files for version match\r\n FILES_JSON_DATA=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${MODPACK_ID}\/files)\r\n # get element number to get the exact location in the json\r\n FILES_JSON_ELEMENT=$(echo -e ${FILES_JSON_DATA} | jq --arg VERSION \"${MODPACK_VERSION}\" '.[] | select(.displayName) | .displayName | contains($VERSION)' | grep -n true | cut -f1 -d: | tail -1)\r\n # if there wasn't a match default to latest\r\n if [ ! -z ${FILES_JSON_ELEMENT} ]; then\r\n echo -e \"No matching version found\"\r\n echo -e \"defaulting to latest\"\r\n DOWNLOAD_URL=$(echo -e ${FILES_JSON_DATA} | jq --arg ELEMENT \"${FILES_JSON_ELEMENT}\" '.[$ELEMENT|tonumber-1] | .downloadUrl')\r\n else\r\n echo -e \"Version match found\"\r\n DOWNLOAD_URL=$(echo -e ${JSON_DATA} | jq -r .latestFiles[0].downloadUrl)\r\n echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n fi\r\n fi\r\n ## download modpack files\r\n cd \/mnt\/server\r\n echo \"Executing curl -L ${DOWNLOAD_URL} -o server.zip\"\r\n curl -L -g \"${DOWNLOAD_URL}\" -o server.zip\r\n unzip -o server.zip\r\n rm -rf server.zip\r\n}\r\n\r\nfunction unpack_zip {\r\n cd \/mnt\/server\r\n unzip -o server.zip\r\n}\r\n\r\nfunction forge_install {\r\n echo -e \"\\nInstalling forge server using the installer jar file.\\n\"\r\n if [ -f \/mnt\/server\/*installer.jar ]; then\r\n\t\tmv *installer.jar installer.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n else\r\n echo \"No forge installer found moving on.\"\r\n fi\r\n mv FTBServer.jar server.jar\r\n}\r\n\r\nfunction forge_cleanup {\r\n echo -e \"\\nDeleting installer jar file and cleaning up.\\n\"\r\n rm -rf *installer.jar\r\n if [ ! -f \/mnt\/server\/forge*universal.jar ]; then\r\n mv -v \/mnt\/server\/*\/* \/mnt\/server\/\r\n if [ ! -f \/mnt\/server\/*universal.jar ]; then\r\n mv forge*.jar server.jar\r\n else\r\n mv forge*universal.jar server.jar \r\n fi\r\n else\r\n mv forge*universal.jar server.jar\r\n fi\r\n}\r\n\r\nfunction json_download_prework {\r\n mkdir -p \/mnt\/server\/mods\r\n cd \/mnt\/server\/mods\r\n}\r\n\r\nfunction json_download_mods {\r\n MANIFEST=\/mnt\/server\/manifest.json\r\n for mod in $(jq -c '.files[]' ${MANIFEST} ); do\r\n projID=$(echo $mod | jq -r \".projectID\")\r\n fileID=$(echo $mod | jq -r \".fileID\")\r\n URL=$(curl -sSL -H 'Accept: application\/json' -H \"x-api-key: ${API_KEY}\" https:\/\/api.curseforge.com\/v1\/mods\/${projID}\/files\/${fileID}\/download-url | jq -r \".data\")\r\n # this is saving everything as \/mnt\/server\/mods\/download\r\n echo \"Mod direct url: ${URL}\"\r\n curl -JLO \"${URL}\"\r\n done\r\n}\r\n\r\nfunction json_download_forge {\r\n cd \/mnt\/server\r\n FORGE=$(jq -r '.minecraft.modLoaders[0].id' \/mnt\/server\/manifest.json | cut -d '-' -f2)\r\n MCVER=$(jq -r '.minecraft.version' \/mnt\/server\/manifest.json)\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\"\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction json_download_overrides {\r\n if [ -d \/mnt\/server\/overrides ]; then\r\n mv \/mnt\/server\/overrides\/mods\/* \/mnt\/server\/mods\/\r\n rmdir \/mnt\/server\/overrides\/mods\r\n mv \/mnt\/server\/overrides\/* \/mnt\/server\r\n rmdir \/mnt\/server\/overrides\r\n fi\r\n}\r\n\r\nfunction cfg_download_forge {\r\n dos2unix settings.cfg # In case the pack was distributed with Windows-style line endings in the cfg file\r\n MCVER=`grep 'MCVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n FORGE=`grep 'FORGEVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n \r\n FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n echo -e ${FORGE_VERSION}\r\n FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n PARSED_LINK=$(echo -e \"$FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\" | sed 's\/ \/\/g')\r\n\r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -e \"Download link is $PARSED_LINK\"\r\n curl -sSL $PARSED_LINK-installer.jar -o installer.jar\r\n curl -sSL $PARSED_LINK-universal.jar -o universal.jar\r\n java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\nfunction ftb_install {\r\n chmod +x \/mnt\/server\/settings.sh \r\n . \/mnt\/server\/settings.sh \r\n curl https:\/\/s3.amazonaws.com\/Minecraft.Download\/versions\/${MCVER}\/minecraft_server.${MCVER}.jar -o ${JARFILE} \r\n curl https:\/\/libraries.minecraft.net\/${LAUNCHWRAPPER} -o \/mnt\/server\/libraries\/${LAUNCHWRAPPER}\r\n}\r\n\r\ninstall_required\r\nif [ ! -z ${MODPACK_ID} ] && [ ! \"${MODPACK_ID}\" = \"zip\" ]; then\r\n\tget_download\r\n\tunpack_zip\r\n rm -rf server.zip\r\nelse\r\n\tunpack_zip\r\nfi\r\n\r\nif [ -f \/mnt\/server\/manifest.json ]; then\r\n json_download_prework\r\n json_download_mods\r\n json_download_overrides\r\n json_download_forge\r\nelif [ -f \/mnt\/server\/settings.cfg ]; then\r\n cfg_download_forge\r\nelif [ -f \/mnt\/server\/version.json ]; then\r\n if [ \"$(cat \/mnt\/server\/version.json | jq -r '.packID | contains(\"FTB\")')\" == \"true\" ]; then\r\n ftb_install\r\n fi\r\nelse\r\n forge_install\r\n forge_cleanup\r\nfi\r\n\r\necho -e \"\\n\\nInstall completed succesfully, enjoy!\"", "container": "openjdk:8-jdk-slim", "entrypoint": "bash" } From 5b7691b1a350d9fb9c4d75989ae666cb51509375 Mon Sep 17 00:00:00 2001 From: cfouche3005 <51720655+cfouche3005@users.noreply.github.com> Date: Tue, 18 Oct 2022 22:23:08 +0200 Subject: [PATCH 0627/1001] Update egg-curseforge-generic.json 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 0628/1001] 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 0629/1001] 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 0630/1001] 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 0631/1001] 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 0632/1001] 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 0633/1001] 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 0634/1001] 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 0635/1001] 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 b910035224eeb9a79191ad90a7baaca12913d063 Mon Sep 17 00:00:00 2001 From: zoomiti Date: Wed, 19 Oct 2022 14:08:31 -0400 Subject: [PATCH 0636/1001] Removes default password in Yarr egg --- software/yarr/egg-yarr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/yarr/egg-yarr.json b/software/yarr/egg-yarr.json index 4add6370..65a478b6 100644 --- a/software/yarr/egg-yarr.json +++ b/software/yarr/egg-yarr.json @@ -42,7 +42,7 @@ "name": "Password", "description": "The password needed to log in to yarr", "env_variable": "PASSWORD", - "default_value": "password", + "default_value": "", "user_viewable": false, "user_editable": true, "rules": "required|string|alpha_dash", From dbab8eb8041f1b43219b2378737f8183c9d7d8cb Mon Sep 17 00:00:00 2001 From: zoomiti Date: Wed, 19 Oct 2022 14:39:33 -0400 Subject: [PATCH 0637/1001] Improves install script for Yarr egg Uses a docker container with go preinstalled Also uses build_default in the makefile to compile the correct version. --- software/yarr/egg-yarr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/software/yarr/egg-yarr.json b/software/yarr/egg-yarr.json index 65a478b6..9ad62431 100644 --- a/software/yarr/egg-yarr.json +++ b/software/yarr/egg-yarr.json @@ -22,8 +22,8 @@ }, "scripts": { "installation": { - "script": "apt update\r\napt install -y git make gcc curl tar\r\n\r\ncd\r\n\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"amd64\" || echo \"arm64\")\r\n\r\necho ${ARCH}\r\n\r\ncurl -O https:\/\/dl.google.com\/go\/go1.19.2.linux-${ARCH}.tar.gz\r\nls\r\ntar xvf go1.19.2.linux-${ARCH}.tar.gz\r\n\r\nchown -R root:root .\/go\r\nmv go \/usr\/local\r\n\r\nexport GOPATH=$HOME\/work\r\nexport PATH=$PATH:\/usr\/local\/go\/bin:$GOPATH\/bin\r\n\r\ncd \/mnt\/server\r\n\r\nmkdir yarr_source\r\ngit clone https:\/\/github.com\/nkanaev\/yarr.git yarr_source\r\n\r\ncd yarr_source\r\n\r\nexport CGO_ENABLED=1\r\nsed -i -r \"s\/amd64\/$ARCH\/g\" makefile\r\n\r\nmake build_linux # -> _output\/linux\/yarr\r\n\r\ncp _output\/linux\/yarr ..\/yarr\r\ncd ..\/\r\n\r\nrm -rf yarr_source\r\n\r\ntouch auth.conf\r\n\r\nchmod +x yarr\r\n\r\necho \"Install complete\"", - "container": "debian:buster-slim", + "script": "cd \/mnt\/server\r\n\r\nmkdir yarr_source\r\ngit clone https:\/\/github.com\/nkanaev\/yarr yarr_source\r\n\r\ncd yarr_source\r\n\r\nmake build_default # -> _output\/yarr\r\n\r\ncp _output\/yarr ..\/yarr\r\ncd ..\/\r\n\r\nrm -rf yarr_source\r\n\r\nchmod +x yarr\r\n\r\necho \"Install complete\"", + "container": "golang:1.19.2-bullseye", "entrypoint": "bash" } }, From e7c6bf06b2f87fe0e358ce6fe69fbed4cd8a13a1 Mon Sep 17 00:00:00 2001 From: zoomiti Date: Wed, 19 Oct 2022 14:59:07 -0400 Subject: [PATCH 0638/1001] Fixes User viewability of login variables for Yarr egg --- software/yarr/egg-yarr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/software/yarr/egg-yarr.json b/software/yarr/egg-yarr.json index 9ad62431..fdb5836b 100644 --- a/software/yarr/egg-yarr.json +++ b/software/yarr/egg-yarr.json @@ -33,7 +33,7 @@ "description": "The username used to log in to yarr", "env_variable": "USERNAME", "default_value": "username", - "user_viewable": false, + "user_viewable": true, "user_editable": true, "rules": "required|string|alpha_dash", "field_type": "text" @@ -43,7 +43,7 @@ "description": "The password needed to log in to yarr", "env_variable": "PASSWORD", "default_value": "", - "user_viewable": false, + "user_viewable": true, "user_editable": true, "rules": "required|string|alpha_dash", "field_type": "text" From 49ea7d77acd3ec224b1335cf2666bd9e7a7fe05d Mon Sep 17 00:00:00 2001 From: Bad <87938689+yesBad@users.noreply.github.com> Date: Thu, 20 Oct 2022 21:26:45 +0300 Subject: [PATCH 0639/1001] [Satisfactory] Fix README Typo (#1923) 'tweeks' to 'tweaks' --- game_eggs/steamcmd_servers/satisfactory/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/satisfactory/README.md b/game_eggs/steamcmd_servers/satisfactory/README.md index 22ffcc41..df04e1d2 100644 --- a/game_eggs/steamcmd_servers/satisfactory/README.md +++ b/game_eggs/steamcmd_servers/satisfactory/README.md @@ -105,7 +105,7 @@ ___ | Processor | Recent x86/64 (AMD/Intel) processor. No 32 bit or ARM support. | Favours higher single-core performance over multiple cores. | | RAM | 10240-12288 MiB | 16384-24576 MiB (especially for 4 players or large save files) | | Storage | 5 GB | 7-10 GB (or more, depending on save size or frequency) | -| Network | 0.512 Mbit/s | 1-5 Mbit/s ([may require server *and* client config tweeks](https://satisfactory.fandom.com/wiki/Multiplayer#Temporary_lag_solution)) | +| Network | 0.512 Mbit/s | 1-5 Mbit/s ([may require server *and* client config tweaks](https://satisfactory.fandom.com/wiki/Multiplayer#Temporary_lag_solution)) | | Host OS | Most stable Linux OS branches should work | Using the latest kernel version for your installed OS can prevent some edge-case installation/boot issues. | | Game Ownership | Not required to start. | Required to fully "initialize" (see [Server Initialization](#server-initialization) below) | From 25b50c328bb11fdad7775a00f570585a44431833 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat, 22 Oct 2022 11:27:06 +0200 Subject: [PATCH 0640/1001] Changes --- game_eggs/veloren/README.md | 6 ++++++ game_eggs/veloren/egg-veloren.json | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/game_eggs/veloren/README.md b/game_eggs/veloren/README.md index df3bdcd6..668a38c4 100644 --- a/game_eggs/veloren/README.md +++ b/game_eggs/veloren/README.md @@ -8,6 +8,12 @@ Veloren is fully open-source, licensed under GPL 3. It uses original graphics, m ## Server Ports +**Due to there new config file you have to set the game port manual in the config file!!** + +`/home/container/userdata/server/server_config/settings.ron` +- Line 4: `address: "[::]:14004",` -> ` address: "[::]:",` +- Line 7: `address: "0.0.0.0:14004",`-> `address: "0.0.0.0:",` + Ports required to run the server in a table format. | Port | default | diff --git a/game_eggs/veloren/egg-veloren.json b/game_eggs/veloren/egg-veloren.json index 7b90e24c..56940ee9 100644 --- a/game_eggs/veloren/egg-veloren.json +++ b/game_eggs/veloren/egg-veloren.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-09-30T19:32:46+02:00", + "exported_at": "2022-10-22T11:26:09+02:00", "name": "Veloren", "author": "parker@parkervcp.com", "description": "Veloren is a multiplayer voxel RPG written in Rust. It is inspired by games such as Cube World, Legend of Zelda: Breath of the Wild, Dwarf Fortress and Minecraft.", @@ -15,14 +15,14 @@ "file_denylist": [], "startup": ".\/veloren-server-cli", "config": { - "files": "{\r\n \"userdata\/server\/server_config\/settings.ron\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \" address\": \" address: \\\"0.0.0.0:{{server.build.default.port}}\\\",\",\r\n \" metrics_address\": \" metrics_address: \\\"0.0.0.0:{{server.build.env.METRICS_PORT}}\\\",\",\r\n \" server_name\": \" server_name: \\\"{{server.build.env.SERVER_NAME}}\\\",\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"userdata\/server\/server_config\/settings.ron\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \" metrics_address\": \" metrics_address: \\\"0.0.0.0:{{server.build.env.METRICS_PORT}}\\\",\",\r\n \" server_name\": \" server_name: \\\"{{server.build.env.SERVER_NAME}}\\\",\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Server is ready to accept connections\"\r\n}", "logs": "{}", "stop": "shutdown graceful 10" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl wget unzip git jq\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/veloren\/veloren\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/veloren\/veloren\/releases\")\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"linux-x86_64\" || echo \"linux-aarch64\")\r\nPART=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"-linux-x86_64-\" || echo \"-linux-aarch64-\")\r\nMATCH_AND_SPACES=$(echo \"weekly\" && echo ${PART} && echo ${RELEASE_DATE})\r\nMATCH=$(echo ${MATCH_AND_SPACES} | sed 's\/ \/\/g')\r\n\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"weekly\" ]; then\r\n echo -e \"weekly\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i \"${ARCH}\" | tail -n 1)\r\nelif [ \"${VERSION}\" == \"nightly\" ]; then\r\n echo -e \"nightly\"\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"nightly\" '.[] | select(.tag_name==\"nightly\") | .assets[].browser_download_url' | grep -i \"${ARCH}\" | tail -n 1)\r\nelif [ \"${VERSION}\" == \"dated_weekly\" ]; then\r\n echo -e ${MATCH} \r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i \"${MATCH}\")\r\nelse\r\n echo -e \"something went wrong\"\r\nfi\r\n\r\necho -e \"download url: ${DOWNLOAD_URL}\"\r\nwget ${DOWNLOAD_URL} -O files.zip\r\n\r\nunzip -o files.zip\r\nrm files.zip\r\n\r\nchmod +x veloren-server-cli\r\n\r\n## generate config because there is no better way to get it.\r\nmkdir -p \/mnt\/server\/userdata\/server\/server_config\/\r\nif [ ! -f \/mnt\/server\/userdata\/server\/server_config\/settings.ron ]; then\r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/veloren\/settings.ron \/mnt\/server\/userdata\/server\/server_config\/settings.ron\r\n echo \"config file pulled\"\r\nfi\r\n\r\necho -e \"install complete\"", + "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl wget unzip git jq\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/veloren\/veloren\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/veloren\/veloren\/releases\")\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"linux-x86_64\" || echo \"linux-aarch64\")\r\nPART=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"-linux-x86_64-\" || echo \"-linux-aarch64-\")\r\nMATCH_AND_SPACES=$(echo \"weekly\" && echo ${PART} && echo ${RELEASE_DATE})\r\nMATCH=$(echo ${MATCH_AND_SPACES} | sed 's\/ \/\/g')\r\n\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"weekly\" ]; then\r\n echo -e \"weekly\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i \"${ARCH}\" | tail -n 1)\r\nelif [ \"${VERSION}\" == \"nightly\" ]; then\r\n echo -e \"nightly\"\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"nightly\" '.[] | select(.tag_name==\"nightly\") | .assets[].browser_download_url' | grep -i \"${ARCH}\" | tail -n 1)\r\nelif [ \"${VERSION}\" == \"dated_weekly\" ]; then\r\n echo -e ${MATCH} \r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i \"${MATCH}\")\r\nelse\r\n echo -e \"something went wrong\"\r\nfi\r\n\r\necho -e \"download url: ${DOWNLOAD_URL}\"\r\nwget ${DOWNLOAD_URL} -O files.zip\r\n\r\nunzip -o files.zip\r\nrm files.zip\r\n\r\nchmod +x veloren-server-cli\r\n\r\n## generate config because there is no better way to get it.\r\nmkdir -p \/mnt\/server\/userdata\/server\/server_config\/\r\nif [ ! -f \/mnt\/server\/userdata\/server\/server_config\/settings.ron ]; then\r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/veloren\/settings.ron \/tmp\/settings.ron\r\n sed \"s\/14004\/${SERVER_PORT}\/g\" \/tmp\/settings.ron > \/mnt\/server\/userdata\/server\/server_config\/settings.ron\r\n rm \/tmp\/settings.ron\r\n echo \"config file pulled\"\r\nfi\r\n\r\necho -e \"install complete\"", "container": "debian:bullseye-slim", "entrypoint": "bash" } @@ -42,7 +42,7 @@ "name": "Weekly specific build date", "description": "The date of the weekly version you want. \r\nOnly used if Version is set to dated_weekly!\r\nhttps:\/\/github.com\/veloren\/veloren\/releases\r\n\r\nEverything after the x86_64 but not the first -\r\nand not the .zip extention\r\n\r\nexample:\r\n2022-08-31T08_26 or 2022-09-26T13_34", "env_variable": "RELEASE_DATE", - "default_value": "2022-09-26T13_34", + "default_value": "2022-10-19T22_03", "user_viewable": true, "user_editable": true, "rules": "nullable|string|max:40", @@ -52,7 +52,7 @@ "name": "Server name", "description": "The name your server will be displaying", "env_variable": "SERVER_NAME", - "default_value": "A ptero hosted server", + "default_value": "A pterodactyl hosted server", "user_viewable": true, "user_editable": true, "rules": "required|string|max:64", From e5b9f524f147da62c52bd346c415fd931a05ba3e Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat, 22 Oct 2022 11:45:23 +0200 Subject: [PATCH 0641/1001] fix download as there latest branch in not weekly but nightly --- game_eggs/veloren/egg-veloren.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/veloren/egg-veloren.json b/game_eggs/veloren/egg-veloren.json index 56940ee9..f57630a9 100644 --- a/game_eggs/veloren/egg-veloren.json +++ b/game_eggs/veloren/egg-veloren.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-10-22T11:26:09+02:00", + "exported_at": "2022-10-22T11:44:17+02:00", "name": "Veloren", "author": "parker@parkervcp.com", "description": "Veloren is a multiplayer voxel RPG written in Rust. It is inspired by games such as Cube World, Legend of Zelda: Breath of the Wild, Dwarf Fortress and Minecraft.", @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl wget unzip git jq\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/veloren\/veloren\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/veloren\/veloren\/releases\")\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"linux-x86_64\" || echo \"linux-aarch64\")\r\nPART=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"-linux-x86_64-\" || echo \"-linux-aarch64-\")\r\nMATCH_AND_SPACES=$(echo \"weekly\" && echo ${PART} && echo ${RELEASE_DATE})\r\nMATCH=$(echo ${MATCH_AND_SPACES} | sed 's\/ \/\/g')\r\n\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"weekly\" ]; then\r\n echo -e \"weekly\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i \"${ARCH}\" | tail -n 1)\r\nelif [ \"${VERSION}\" == \"nightly\" ]; then\r\n echo -e \"nightly\"\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"nightly\" '.[] | select(.tag_name==\"nightly\") | .assets[].browser_download_url' | grep -i \"${ARCH}\" | tail -n 1)\r\nelif [ \"${VERSION}\" == \"dated_weekly\" ]; then\r\n echo -e ${MATCH} \r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i \"${MATCH}\")\r\nelse\r\n echo -e \"something went wrong\"\r\nfi\r\n\r\necho -e \"download url: ${DOWNLOAD_URL}\"\r\nwget ${DOWNLOAD_URL} -O files.zip\r\n\r\nunzip -o files.zip\r\nrm files.zip\r\n\r\nchmod +x veloren-server-cli\r\n\r\n## generate config because there is no better way to get it.\r\nmkdir -p \/mnt\/server\/userdata\/server\/server_config\/\r\nif [ ! -f \/mnt\/server\/userdata\/server\/server_config\/settings.ron ]; then\r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/veloren\/settings.ron \/tmp\/settings.ron\r\n sed \"s\/14004\/${SERVER_PORT}\/g\" \/tmp\/settings.ron > \/mnt\/server\/userdata\/server\/server_config\/settings.ron\r\n rm \/tmp\/settings.ron\r\n echo \"config file pulled\"\r\nfi\r\n\r\necho -e \"install complete\"", + "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl wget unzip git jq\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/veloren\/veloren\/releases\")\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"linux-x86_64\" || echo \"linux-aarch64\")\r\nPART=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"-linux-x86_64-\" || echo \"-linux-aarch64-\")\r\nMATCH_AND_SPACES=$(echo \"weekly\" && echo ${PART} && echo ${RELEASE_DATE})\r\nMATCH=$(echo ${MATCH_AND_SPACES} | sed 's\/ \/\/g')\r\n\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"weekly\" ]; then\r\n echo -e \"weekly\"\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"weekly\" '.[] | select(.tag_name==\"weekly\") | .assets[].browser_download_url' | grep -i \"${ARCH}\" | tail -n 1)\r\nelif [ \"${VERSION}\" == \"nightly\" ]; then\r\n echo -e \"nightly\"\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"nightly\" '.[] | select(.tag_name==\"nightly\") | .assets[].browser_download_url' | grep -i \"${ARCH}\" | tail -n 1)\r\nelif [ \"${VERSION}\" == \"dated_weekly\" ]; then\r\n echo -e ${MATCH} \r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"weekly\" '.[] | select(.tag_name==\"weekly\") | .assets[].browser_download_url' | grep -i \"${MATCH}\")\r\nelse\r\n echo -e \"something went wrong\"\r\nfi\r\n\r\necho -e \"download url: ${DOWNLOAD_URL}\"\r\nwget ${DOWNLOAD_URL} -O files.zip\r\n\r\nunzip -o files.zip\r\nrm files.zip\r\n\r\nchmod +x veloren-server-cli\r\n\r\n## generate config because there is no better way to get it.\r\nmkdir -p \/mnt\/server\/userdata\/server\/server_config\/\r\nif [ ! -f \/mnt\/server\/userdata\/server\/server_config\/settings.ron ]; then\r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/veloren\/settings.ron \/tmp\/settings.ron\r\n sed \"s\/14004\/${SERVER_PORT}\/g\" \/tmp\/settings.ron > \/mnt\/server\/userdata\/server\/server_config\/settings.ron\r\n rm \/tmp\/settings.ron\r\n echo \"config file pulled\"\r\nfi\r\n\r\necho -e \"install complete\"", "container": "debian:bullseye-slim", "entrypoint": "bash" } From 3b623fee9838acf5ea7204122612c9c1cb86a02a Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 23 Oct 2022 08:49:46 +0200 Subject: [PATCH 0642/1001] add missinf main readme --- game_eggs/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/game_eggs/README.md b/game_eggs/README.md index 1891fc25..0cb17399 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -174,6 +174,7 @@ * [Vanilla](terraria/vanilla) [Tycoon Games](tycoon_games) + * [OpenRCT2](tycoon_games/openrct2) * [OpenTTD](tycoon_games/openttd) From 48aeb684a930e97aa0848fce844522e8b4fbd5ea Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 23 Oct 2022 09:34:30 +0200 Subject: [PATCH 0643/1001] add missing parsing --- .../rising_world/unity/egg-rising-world-unity.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/rising_world/unity/egg-rising-world-unity.json b/game_eggs/steamcmd_servers/rising_world/unity/egg-rising-world-unity.json index 54be33ca..f3fb09ab 100644 --- a/game_eggs/steamcmd_servers/rising_world/unity/egg-rising-world-unity.json +++ b/game_eggs/steamcmd_servers/rising_world/unity/egg-rising-world-unity.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-10-16T17:49:35+02:00", + "exported_at": "2022-10-23T09:33:48+02:00", "name": "Rising World Unity", "author": "info@goover.de", "description": "Rising World is a voxel based open-world sandbox game, featuring a procedurally generated world, playable in single and multi-player.", @@ -17,7 +17,7 @@ "file_denylist": [], "startup": ".\/RisingWorldServer.x64 +Server_Port={{SERVER.PORT}}", "config": { - "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"Server_Name=\": \"Server_Name={{server.build.env.SRV_NAME}}\",\r\n \"Server_Password=\": \"Server_Password={{server.build.env.SRV_PW}}\",\r\n \"Password=\": \"Password={{server.build.env.SRV_PW}}\",\r\n \"RCON_Enabled=\": \"RCON_Enabled={{server.build.env.RCON}}\",\r\n \"RCON_Password=\": \"RCON_Password={{server.build.env.RCON_PASS}}\",\r\n \"RCON_Port=\": \"RCON_Port={{server.build.env.RCON_PORT}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"Server_Name=\": \"Server_Name={{server.build.env.SRV_NAME}}\",\r\n \"Server_Password=\": \"Server_Password={{server.build.env.SRV_PW}}\",\r\n \"Password=\": \"Password={{server.build.env.SRV_PW}}\",\r\n \"World_GameMode=\": \"World_GameMode={{server.build.env.GAME_MODE}}\",\r\n \"World_Name=\": \"World_Name={{server.build.env.WORLD_NAME}}\",\r\n \"RCON_Enabled=\": \"RCON_Enabled={{server.build.env.RCON}}\",\r\n \"RCON_Password=\": \"RCON_Password={{server.build.env.RCON_PASS}}\",\r\n \"RCON_Port=\": \"RCON_Port={{server.build.env.RCON_PORT}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Dedicated server is ready!\"\r\n}", "logs": "{}", "stop": "^C" From d605163dae4adcf1915116f7b9021ae4e39ba966 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 23 Oct 2022 12:45:32 +0200 Subject: [PATCH 0644/1001] Update egg-conan-exiles.json --- .../conan_exiles/egg-conan-exiles.json | 69 ++++++++++++++----- 1 file changed, 52 insertions(+), 17 deletions(-) diff --git a/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json b/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json index 4618f5ba..de149705 100644 --- a/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json +++ b/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json @@ -1,31 +1,31 @@ { "_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-01-20T12:47:23-05:00", + "exported_at": "2022-10-23T12:44:51+02:00", "name": "Conan Exiles", "author": "brycea@terrahost.cloud", "description": "Conan Exiles is an open-world survival game set in the brutal lands of Conan the Barbarian. Survive in a savage world, build your kingdom, and dominate your enemies in brutal combat and epic warfare.", "features": [ "steam_disk_space" ], - "images": [ - "quay.io\/parkervcp\/pterodactyl-images:debian_wine-5" - ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:wine_staging": "ghcr.io\/parkervcp\/yolks:wine_staging" + }, "file_denylist": [], - "startup": "xvfb-run --auto-servernum wine \/home\/container\/ConanSandboxServer.exe -console -log -Port={{SERVER_PORT}} -QueryPort={{QUERY_PORT}}", + "startup": "export WINEDEBUG=-all; xvfb-run --auto-servernum wine \/home\/container\/ConanSandboxServer.exe ConanSandbox?listen?PVPEnabled={{PVP}}?Port={{SERVER_PORT}}?QueryPort={{QUERY_PORT}} -ServerName=\"{{SRV_NAME}}\" -ServerPassword={{SRV_PW}} -console -log", "config": { "files": "{}", - "startup": "{\r\n \"done\":\"Started SourceServerQueries\"\r\n}", + "startup": "{\r\n \"done\": \"Started SourceServerQueries\"\r\n}", "logs": "{}", "stop": "^C" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +@sSteamCmdForcePlatformType windows +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", - "container": "debian:buster-slim", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n ##\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, @@ -35,18 +35,20 @@ "description": "The ID corresponding to the game to download.", "env_variable": "SRCDS_APPID", "default_value": "443030", - "user_viewable": true, + "user_viewable": false, "user_editable": false, - "rules": "required|numeric|digits_between:1,7" + "rules": "required|numeric|digits_between:1,7", + "field_type": "text" }, { "name": "XVFB Enable", - "description": "1 or 0", + "description": "MUST BE 1", "env_variable": "XVFB", "default_value": "1", "user_viewable": false, "user_editable": false, - "rules": "required|numeric|min:0|max:1" + "rules": "required|numeric|min:0|max:1", + "field_type": "text" }, { "name": "Windows install variable", @@ -55,7 +57,8 @@ "default_value": "1", "user_viewable": false, "user_editable": false, - "rules": "required|boolean" + "rules": "required|boolean", + "field_type": "text" }, { "name": "Auto Update", @@ -64,7 +67,8 @@ "default_value": "1", "user_viewable": true, "user_editable": true, - "rules": "required|boolean" + "rules": "required|boolean", + "field_type": "text" }, { "name": "Query Port", @@ -73,7 +77,38 @@ "default_value": "27015", "user_viewable": true, "user_editable": false, - "rules": "required|numeric|max:65535" + "rules": "required|numeric|max:65535", + "field_type": "text" + }, + { + "name": "Server Name", + "description": "", + "env_variable": "SRV_NAME", + "default_value": "Pterodactyl hosted Server", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:40", + "field_type": "text" + }, + { + "name": "Server Password", + "description": "", + "env_variable": "SRV_PW", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string", + "field_type": "text" + }, + { + "name": "PvP Enabled", + "description": "", + "env_variable": "PVP", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "required|boolean", + "field_type": "text" } ] -} +} \ No newline at end of file From 9e0733004b34dccb3bddc8cec22a0e3045b04d46 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 23 Oct 2022 13:01:39 +0200 Subject: [PATCH 0645/1001] Update egg-conan-exiles.json --- .../steamcmd_servers/conan_exiles/egg-conan-exiles.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json b/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json index de149705..6a9607bf 100644 --- a/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json +++ b/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-10-23T12:44:51+02:00", + "exported_at": "2022-10-23T13:01:15+02:00", "name": "Conan Exiles", "author": "brycea@terrahost.cloud", "description": "Conan Exiles is an open-world survival game set in the brutal lands of Conan the Barbarian. Survive in a savage world, build your kingdom, and dominate your enemies in brutal combat and epic warfare.", @@ -12,7 +12,7 @@ "steam_disk_space" ], "docker_images": { - "ghcr.io\/parkervcp\/yolks:wine_staging": "ghcr.io\/parkervcp\/yolks:wine_staging" + "Wine_staging": "ghcr.io\/parkervcp\/yolks:wine_staging" }, "file_denylist": [], "startup": "export WINEDEBUG=-all; xvfb-run --auto-servernum wine \/home\/container\/ConanSandboxServer.exe ConanSandbox?listen?PVPEnabled={{PVP}}?Port={{SERVER_PORT}}?QueryPort={{QUERY_PORT}} -ServerName=\"{{SRV_NAME}}\" -ServerPassword={{SRV_PW}} -console -log", @@ -37,7 +37,7 @@ "default_value": "443030", "user_viewable": false, "user_editable": false, - "rules": "required|numeric|digits_between:1,7", + "rules": "required|string|max:7", "field_type": "text" }, { From 15f7205a0bedfdb0261eb69291d4e58a422a4633 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 23 Oct 2022 13:05:17 +0200 Subject: [PATCH 0646/1001] Update egg-conan-exiles.json --- game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json b/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json index 6a9607bf..b3ff6e04 100644 --- a/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json +++ b/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-10-23T13:01:15+02:00", + "exported_at": "2022-10-23T13:05:02+02:00", "name": "Conan Exiles", "author": "brycea@terrahost.cloud", "description": "Conan Exiles is an open-world survival game set in the brutal lands of Conan the Barbarian. Survive in a savage world, build your kingdom, and dominate your enemies in brutal combat and epic warfare.", @@ -24,7 +24,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n ##\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n ##\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\n#apt -y update\r\n#apt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } From 229c540735ae48b86ea8531bb376dad408b510c0 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 23 Oct 2022 13:08:31 +0200 Subject: [PATCH 0647/1001] Update egg-conan-exiles.json --- game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json b/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json index b3ff6e04..3b043f51 100644 --- a/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json +++ b/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-10-23T13:05:02+02:00", + "exported_at": "2022-10-23T13:08:22+02:00", "name": "Conan Exiles", "author": "brycea@terrahost.cloud", "description": "Conan Exiles is an open-world survival game set in the brutal lands of Conan the Barbarian. Survive in a savage world, build your kingdom, and dominate your enemies in brutal combat and epic warfare.", @@ -24,7 +24,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n ##\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\n#apt -y update\r\n#apt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n ##\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\n#apt -y update\r\n#apt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## add below your custom commands if needed\r\n\r\n## install end\r\necho \"-----------------------------------------\"\r\necho \"Installation completed...\"\r\necho \"-----------------------------------------\"", "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } From a0d9f6bcb39b0ba1a66d353c3fe7b36a1a86c2cd Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 23 Oct 2022 13:09:40 +0200 Subject: [PATCH 0648/1001] add "install completed" --- scripts/steamcmd_installer.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/steamcmd_installer.sh b/scripts/steamcmd_installer.sh index c03a2bc0..984e62d0 100644 --- a/scripts/steamcmd_installer.sh +++ b/scripts/steamcmd_installer.sh @@ -55,3 +55,10 @@ cp -v linux32/steamclient.so ../.steam/sdk32/steamclient.so ## set up 64 bit libraries mkdir -p /mnt/server/.steam/sdk64 cp -v linux64/steamclient.so ../.steam/sdk64/steamclient.so + +## add below your custom commands if needed + +## install end +echo "-----------------------------------------" +echo "Installation completed..." +echo "-----------------------------------------" From e40bb6b0e7fa0bfc392730f7f77aae387768f1f2 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 23 Oct 2022 14:08:05 +0200 Subject: [PATCH 0649/1001] add Solace Crafting --- README.md | 1 + game_eggs/README.md | 1 + game_eggs/steamcmd_servers/README.md | 4 + .../solace_crafting/README.md | 14 +++ .../solace_crafting/egg-solace-crafting.json | 92 +++++++++++++++++++ 5 files changed, 112 insertions(+) create mode 100644 game_eggs/steamcmd_servers/solace_crafting/README.md create mode 100644 game_eggs/steamcmd_servers/solace_crafting/egg-solace-crafting.json diff --git a/README.md b/README.md index 4117c4c6..65f75eeb 100644 --- a/README.md +++ b/README.md @@ -241,6 +241,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Autowipe](game_eggs/steamcmd_servers/rust/rust_autowipe) * [Staging](game_eggs/steamcmd_servers/rust/rust_staging) * [Satisfactory](game_eggs/steamcmd_servers/satisfactory) +* [Solace Crafting](game_eggs/steamcmd_servers/solace_crafting) * [SCP: Secret Laboratory](game_eggs/steamcmd_servers/scpsl) * [dedicated](game_eggs/steamcmd_servers/scpsl/dedicated) * [exiled](game_eggs/steamcmd_servers/scpsl/exiled) diff --git a/game_eggs/README.md b/game_eggs/README.md index 0bb91b7c..96eaf8e4 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -144,6 +144,7 @@ * [Autowipe](steamcmd_servers/rust/rust_autowipe) * [Staging](steamcmd_servers/rust/rust_staging) * [Satisfactory](steamcmd_servers/satisfactory) +* [Solace Crafting](steamcmd_servers/solace_crafting) * [SCP: Secret Laboratory](steamcmd_servers/scpsl) * [Dedicated](steamcmd_servers/scpsl/dedicated) * [Exiled](steamcmd_servers/scpsl/exiled) diff --git a/game_eggs/steamcmd_servers/README.md b/game_eggs/steamcmd_servers/README.md index 1b1c72c0..d2a93853 100644 --- a/game_eggs/steamcmd_servers/README.md +++ b/game_eggs/steamcmd_servers/README.md @@ -151,6 +151,10 @@ This is a collection of servers that use SteamCMD to install. * [exiled](scpsl/exiled) * [multiadmin](scpsl/multiadmin) +## Solace Crafting + +[Solace Crafting](solace_crafting) + ## Soldat [Soldat](soldat) diff --git a/game_eggs/steamcmd_servers/solace_crafting/README.md b/game_eggs/steamcmd_servers/solace_crafting/README.md new file mode 100644 index 00000000..169a9ac6 --- /dev/null +++ b/game_eggs/steamcmd_servers/solace_crafting/README.md @@ -0,0 +1,14 @@ +### Solace Crafting + +Open-world fantasy survival role-playing game. Limitless distance-based difficulty with player-created fast travel, modular building and city management. + +### Server Ports + +| Port | default | +|-------|---------| +| Game | 27015 | +| Query | 27016 | + +### SteamGuard + +To start this Server, Steam Login is needed diff --git a/game_eggs/steamcmd_servers/solace_crafting/egg-solace-crafting.json b/game_eggs/steamcmd_servers/solace_crafting/egg-solace-crafting.json new file mode 100644 index 00000000..606fea85 --- /dev/null +++ b/game_eggs/steamcmd_servers/solace_crafting/egg-solace-crafting.json @@ -0,0 +1,92 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2022-10-23T14:05:03+02:00", + "name": "Solace Crafting", + "author": "info@goover.de", + "description": "Open-world fantasy survival RPG. Borderless distance-based difficulty with player built fast-travel, modular-building, and town management.", + "features": null, + "docker_images": { + "ghcr.io\/parkervcp\/games:source": "ghcr.io\/parkervcp\/games:source" + }, + "file_denylist": [], + "startup": ".\/Solace\\ Crafting.x86_64", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \" server started . (True)\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n ##\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## add below your custom commands if needed\r\n\r\n\r\nmkdir -p \"$HOME\/.config\/unity3d\/Big Kitty Games\/Solace Crafting\"\r\n\r\ncat < \"$HOME\/.config\/unity3d\/Big Kitty Games\/Solace Crafting\/servercfg.dat\"\r\n{\r\n \"name\": \"Solace Crafting Server\",\r\n \"description\": \"\",\r\n \"port\": 27015,\r\n \"steamQueryPort\": 27016,\r\n \"isPrivate\": false,\r\n \"password\": \"\",\r\n \"requireSteamID\": true,\r\n \"maxPlayers\": 12,\r\n \"allowAdmin\": false,\r\n \"adminPassword\": \"password\",\r\n \"allowModerator\": false,\r\n \"moderatorPassword\": \"password\",\r\n \"worldSaveToUse\": \"MultiplayerWorld\",\r\n \"autoRestart\": 0\r\n}\r\nEOT\r\n\r\n## install end\r\necho \"-----------------------------------------\"\r\necho \"Installation completed...\"\r\necho \"-----------------------------------------\"", + "container": "ghcr.io\/parkervcp\/installers:debian", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "SRCDS_APPID", + "description": "", + "env_variable": "SRCDS_APPID", + "default_value": "670260", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:20", + "field_type": "text" + }, + { + "name": "SRCDS_BETAID", + "description": "", + "env_variable": "SRCDS_BETAID", + "default_value": "dedicatedserver", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:50", + "field_type": "text" + }, + { + "name": "Auto Update", + "description": "", + "env_variable": "AUTO_UPDATE", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20", + "field_type": "text" + }, + { + "name": "STEAM_USER", + "description": "", + "env_variable": "STEAM_USER", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "max:200", + "field_type": "text" + }, + { + "name": "STEAM_PASS", + "description": "", + "env_variable": "STEAM_PASS", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "max:50", + "field_type": "text" + }, + { + "name": "Steam Auth", + "description": "", + "env_variable": "STEAM_AUTH", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20", + "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 0650/1001] 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", From a1a3585ab100e2e4061bf3f55cccb46a16f4e4bf Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Mon, 24 Oct 2022 19:09:39 +0200 Subject: [PATCH 0651/1001] latest fix --- game_eggs/veloren/egg-veloren.json | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/game_eggs/veloren/egg-veloren.json b/game_eggs/veloren/egg-veloren.json index f57630a9..339034cc 100644 --- a/game_eggs/veloren/egg-veloren.json +++ b/game_eggs/veloren/egg-veloren.json @@ -4,13 +4,13 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-10-22T11:44:17+02:00", + "exported_at": "2022-10-24T19:08:31+02:00", "name": "Veloren", "author": "parker@parkervcp.com", "description": "Veloren is a multiplayer voxel RPG written in Rust. It is inspired by games such as Cube World, Legend of Zelda: Breath of the Wild, Dwarf Fortress and Minecraft.", "features": null, "docker_images": { - "DEBIAN": "ghcr.io\/parkervcp\/yolks:debian" + "Debian": "ghcr.io\/parkervcp\/yolks:debian" }, "file_denylist": [], "startup": ".\/veloren-server-cli", @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl wget unzip git jq\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/veloren\/veloren\/releases\")\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"linux-x86_64\" || echo \"linux-aarch64\")\r\nPART=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"-linux-x86_64-\" || echo \"-linux-aarch64-\")\r\nMATCH_AND_SPACES=$(echo \"weekly\" && echo ${PART} && echo ${RELEASE_DATE})\r\nMATCH=$(echo ${MATCH_AND_SPACES} | sed 's\/ \/\/g')\r\n\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"weekly\" ]; then\r\n echo -e \"weekly\"\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"weekly\" '.[] | select(.tag_name==\"weekly\") | .assets[].browser_download_url' | grep -i \"${ARCH}\" | tail -n 1)\r\nelif [ \"${VERSION}\" == \"nightly\" ]; then\r\n echo -e \"nightly\"\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"nightly\" '.[] | select(.tag_name==\"nightly\") | .assets[].browser_download_url' | grep -i \"${ARCH}\" | tail -n 1)\r\nelif [ \"${VERSION}\" == \"dated_weekly\" ]; then\r\n echo -e ${MATCH} \r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"weekly\" '.[] | select(.tag_name==\"weekly\") | .assets[].browser_download_url' | grep -i \"${MATCH}\")\r\nelse\r\n echo -e \"something went wrong\"\r\nfi\r\n\r\necho -e \"download url: ${DOWNLOAD_URL}\"\r\nwget ${DOWNLOAD_URL} -O files.zip\r\n\r\nunzip -o files.zip\r\nrm files.zip\r\n\r\nchmod +x veloren-server-cli\r\n\r\n## generate config because there is no better way to get it.\r\nmkdir -p \/mnt\/server\/userdata\/server\/server_config\/\r\nif [ ! -f \/mnt\/server\/userdata\/server\/server_config\/settings.ron ]; then\r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/veloren\/settings.ron \/tmp\/settings.ron\r\n sed \"s\/14004\/${SERVER_PORT}\/g\" \/tmp\/settings.ron > \/mnt\/server\/userdata\/server\/server_config\/settings.ron\r\n rm \/tmp\/settings.ron\r\n echo \"config file pulled\"\r\nfi\r\n\r\necho -e \"install complete\"", + "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl wget unzip git jq\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"x86_64\" || echo \"aarch64\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"weekly\" ]; then\r\n echo -e \"weekly\"\r\n DOWNLOAD_URL=https:\/\/download.veloren.net\/latest\/linux\/${ARCH}\/weekly\r\nelif [ \"${VERSION}\" == \"nightly\" ]; then\r\n echo -e \"nightly\"\r\n DOWNLOAD_URL=https:\/\/download.veloren.net\/latest\/linux\/${ARCH}\/nightly\r\nelse\r\n echo -e \"something went wrong\"\r\nfi\r\n\r\necho -e \"download url: ${DOWNLOAD_URL}\"\r\nwget ${DOWNLOAD_URL} -O files.zip\r\n\r\nunzip -o files.zip\r\nrm files.zip\r\n\r\nchmod +x veloren-server-cli\r\n\r\n## generate config because there is no better way to get it.\r\nmkdir -p \/mnt\/server\/userdata\/server\/server_config\/\r\nif [ ! -f \/mnt\/server\/userdata\/server\/server_config\/settings.ron ]; then\r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/veloren\/settings.ron -O \/tmp\/settings.ron\r\n sed \"s\/14004\/${SERVER_PORT}\/g\" \/tmp\/settings.ron > \/mnt\/server\/userdata\/server\/server_config\/settings.ron\r\n rm \/tmp\/settings.ron\r\n echo \"config file pulled\"\r\nfi\r\n\r\necho \"-----------------------------------------\"\r\necho \"Installation completed...\"\r\necho \"-----------------------------------------\"", "container": "debian:bullseye-slim", "entrypoint": "bash" } @@ -30,22 +30,12 @@ "variables": [ { "name": "Version", - "description": "weekly = download the latest weekly build,\r\nnightly = download the latestes nightly build,\r\ndated_weekly = download specific weekly build for that set the Weekly specific build date.", + "description": "weekly = download the latest weekly build.\r\nnightly = download the latest nightly build.", "env_variable": "VERSION", "default_value": "weekly", "user_viewable": true, "user_editable": true, - "rules": "required|string|in:weekly,nightly,dated_weekly", - "field_type": "text" - }, - { - "name": "Weekly specific build date", - "description": "The date of the weekly version you want. \r\nOnly used if Version is set to dated_weekly!\r\nhttps:\/\/github.com\/veloren\/veloren\/releases\r\n\r\nEverything after the x86_64 but not the first -\r\nand not the .zip extention\r\n\r\nexample:\r\n2022-08-31T08_26 or 2022-09-26T13_34", - "env_variable": "RELEASE_DATE", - "default_value": "2022-10-19T22_03", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|string|max:40", + "rules": "required|string|in:weekly,nightly", "field_type": "text" }, { From 46d3fbf22339ed34c6d9025ef15c865cfa5f31c8 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Mon, 24 Oct 2022 19:21:01 +0200 Subject: [PATCH 0652/1001] Update egg-java.json --- generic/java/egg-java.json | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/generic/java/egg-java.json b/generic/java/egg-java.json index baef14f3..d3b9c845 100644 --- a/generic/java/egg-java.json +++ b/generic/java/egg-java.json @@ -1,19 +1,24 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1", + "version": "PTDL_v2", "update_url": null }, - "exported_at": "2021-07-21T18:23:17+03:00", + "exported_at": "2022-10-24T19:20:23+02:00", "name": "Generic Java", "author": "sneaky@sneakyhub.com", "description": "Creates a container that runs java.", "features": null, - "images": [ - "ghcr.io\/parkervcp\/yolks:java_8", - "ghcr.io\/parkervcp\/yolks:java_11", - "ghcr.io\/parkervcp\/yolks:java_16" - ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:java_7": "ghcr.io\/parkervcp\/yolks:java_7", + "ghcr.io\/parkervcp\/yolks:java_8": "ghcr.io\/parkervcp\/yolks:java_8", + "ghcr.io\/parkervcp\/yolks:java_9": "ghcr.io\/parkervcp\/yolks:java_9", + "ghcr.io\/parkervcp\/yolks:java_11": "ghcr.io\/parkervcp\/yolks:java_11", + "ghcr.io\/parkervcp\/yolks:java_14": "ghcr.io\/parkervcp\/yolks:java_14", + "ghcr.io\/parkervcp\/yolks:java_16": "ghcr.io\/parkervcp\/yolks:java_16", + "ghcr.io\/parkervcp\/yolks:java_17": "ghcr.io\/parkervcp\/yolks:java_17", + "ghcr.io\/parkervcp\/yolks:java_19": "ghcr.io\/parkervcp\/yolks:java_19" + }, "file_denylist": [], "startup": "java -Dterminal.jline=false -Dterminal.ansi=true -jar {{JARFILE}}", "config": { @@ -25,7 +30,7 @@ "scripts": { "installation": { "script": "#!\/bin\/bash\r\n# Java Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=java\r\n\r\napt update\r\napt install -y curl jq\r\n\r\ncd \/mnt\/server", - "container": "debian:buster-slim", + "container": "ghcr.io\/parkervcp\/yolks:debian", "entrypoint": "bash" } }, @@ -37,7 +42,8 @@ "default_value": "sneakyhub.jar", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" } ] } \ No newline at end of file From cb22823a2fc967b7c7334a850a91d38f53fc3417 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Mon, 24 Oct 2022 19:25:57 +0200 Subject: [PATCH 0653/1001] fix wget download config file --- game_eggs/veloren/egg-veloren.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/veloren/egg-veloren.json b/game_eggs/veloren/egg-veloren.json index 339034cc..ea69264a 100644 --- a/game_eggs/veloren/egg-veloren.json +++ b/game_eggs/veloren/egg-veloren.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-10-24T19:08:31+02:00", + "exported_at": "2022-10-24T19:25:32+02:00", "name": "Veloren", "author": "parker@parkervcp.com", "description": "Veloren is a multiplayer voxel RPG written in Rust. It is inspired by games such as Cube World, Legend of Zelda: Breath of the Wild, Dwarf Fortress and Minecraft.", @@ -59,4 +59,4 @@ "field_type": "text" } ] -} \ No newline at end of file +} From 350f922aa46755be36058ba0fbbae0dbfb56958e Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Mon, 24 Oct 2022 19:54:37 +0200 Subject: [PATCH 0654/1001] fix images --- generic/java/egg-java.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/generic/java/egg-java.json b/generic/java/egg-java.json index d3b9c845..fa06aadf 100644 --- a/generic/java/egg-java.json +++ b/generic/java/egg-java.json @@ -10,11 +10,8 @@ "description": "Creates a container that runs java.", "features": null, "docker_images": { - "ghcr.io\/parkervcp\/yolks:java_7": "ghcr.io\/parkervcp\/yolks:java_7", "ghcr.io\/parkervcp\/yolks:java_8": "ghcr.io\/parkervcp\/yolks:java_8", - "ghcr.io\/parkervcp\/yolks:java_9": "ghcr.io\/parkervcp\/yolks:java_9", "ghcr.io\/parkervcp\/yolks:java_11": "ghcr.io\/parkervcp\/yolks:java_11", - "ghcr.io\/parkervcp\/yolks:java_14": "ghcr.io\/parkervcp\/yolks:java_14", "ghcr.io\/parkervcp\/yolks:java_16": "ghcr.io\/parkervcp\/yolks:java_16", "ghcr.io\/parkervcp\/yolks:java_17": "ghcr.io\/parkervcp\/yolks:java_17", "ghcr.io\/parkervcp\/yolks:java_19": "ghcr.io\/parkervcp\/yolks:java_19" From fc525a513e48febe81fff13993f528b6e65be7c1 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Mon, 24 Oct 2022 20:12:55 +0200 Subject: [PATCH 0655/1001] Update egg-solace-crafting.json --- .../solace_crafting/egg-solace-crafting.json | 44 +------------------ 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/game_eggs/steamcmd_servers/solace_crafting/egg-solace-crafting.json b/game_eggs/steamcmd_servers/solace_crafting/egg-solace-crafting.json index 606fea85..d60353e0 100644 --- a/game_eggs/steamcmd_servers/solace_crafting/egg-solace-crafting.json +++ b/game_eggs/steamcmd_servers/solace_crafting/egg-solace-crafting.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-10-23T14:05:03+02:00", + "exported_at": "2022-10-24T20:12:31+02:00", "name": "Solace Crafting", "author": "info@goover.de", "description": "Open-world fantasy survival RPG. Borderless distance-based difficulty with player built fast-travel, modular-building, and town management.", @@ -32,22 +32,12 @@ "name": "SRCDS_APPID", "description": "", "env_variable": "SRCDS_APPID", - "default_value": "670260", + "default_value": "1086950", "user_viewable": false, "user_editable": false, "rules": "required|string|max:20", "field_type": "text" }, - { - "name": "SRCDS_BETAID", - "description": "", - "env_variable": "SRCDS_BETAID", - "default_value": "dedicatedserver", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:50", - "field_type": "text" - }, { "name": "Auto Update", "description": "", @@ -57,36 +47,6 @@ "user_editable": true, "rules": "required|string|max:20", "field_type": "text" - }, - { - "name": "STEAM_USER", - "description": "", - "env_variable": "STEAM_USER", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "max:200", - "field_type": "text" - }, - { - "name": "STEAM_PASS", - "description": "", - "env_variable": "STEAM_PASS", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "max:50", - "field_type": "text" - }, - { - "name": "Steam Auth", - "description": "", - "env_variable": "STEAM_AUTH", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:20", - "field_type": "text" } ] } \ No newline at end of file From 88cb986e33a86fd52f2dae620b170f4d66e2d427 Mon Sep 17 00:00:00 2001 From: zoomiti Date: Mon, 24 Oct 2022 14:34:12 -0400 Subject: [PATCH 0656/1001] Adds #!/bin/bash to Yarr egg install script --- software/yarr/egg-yarr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/yarr/egg-yarr.json b/software/yarr/egg-yarr.json index fdb5836b..db155f9c 100644 --- a/software/yarr/egg-yarr.json +++ b/software/yarr/egg-yarr.json @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "cd \/mnt\/server\r\n\r\nmkdir yarr_source\r\ngit clone https:\/\/github.com\/nkanaev\/yarr yarr_source\r\n\r\ncd yarr_source\r\n\r\nmake build_default # -> _output\/yarr\r\n\r\ncp _output\/yarr ..\/yarr\r\ncd ..\/\r\n\r\nrm -rf yarr_source\r\n\r\nchmod +x yarr\r\n\r\necho \"Install complete\"", + "script": "#!\/bin\/bash\r\n\r\ncd \/mnt\/server\r\n\r\nmkdir yarr_source\r\ngit clone https:\/\/github.com\/nkanaev\/yarr yarr_source\r\n\r\ncd yarr_source\r\n\r\nmake build_default # -> _output\/yarr\r\n\r\ncp _output\/yarr ..\/yarr\r\ncd ..\/\r\n\r\nrm -rf yarr_source\r\n\r\nchmod +x yarr\r\n\r\necho \"Install complete\"", "container": "golang:1.19.2-bullseye", "entrypoint": "bash" } From 94561fd95ec67cf08d6fc20954bb584a186d92e0 Mon Sep 17 00:00:00 2001 From: zoomiti Date: Mon, 24 Oct 2022 16:49:04 -0400 Subject: [PATCH 0657/1001] Removes userInteraction in Yarr egg --- software/yarr/egg-yarr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/yarr/egg-yarr.json b/software/yarr/egg-yarr.json index db155f9c..4130fd9e 100644 --- a/software/yarr/egg-yarr.json +++ b/software/yarr/egg-yarr.json @@ -16,7 +16,7 @@ "startup": ".\/yarr -addr 0.0.0.0:{{SERVER_PORT}} -auth=\"{{USERNAME}}:{{PASSWORD}}\" -db=.\/feed.sql", "config": { "files": "{}", - "startup": "{\r\n \"done\": \"starting server\",\r\n \"userInteraction\": []\r\n}", + "startup": "{\r\n \"done\": \"starting server\"\r\n}", "logs": "{}", "stop": "^C" }, From 4c8df8d1927b7b719e255fefd1fd15b7d242c6ae Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Tue, 25 Oct 2022 15:30:46 +0200 Subject: [PATCH 0658/1001] remove SteamGuard --- game_eggs/steamcmd_servers/solace_crafting/README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/game_eggs/steamcmd_servers/solace_crafting/README.md b/game_eggs/steamcmd_servers/solace_crafting/README.md index 169a9ac6..ba4a0b92 100644 --- a/game_eggs/steamcmd_servers/solace_crafting/README.md +++ b/game_eggs/steamcmd_servers/solace_crafting/README.md @@ -8,7 +8,3 @@ Open-world fantasy survival role-playing game. Limitless distance-based difficul |-------|---------| | Game | 27015 | | Query | 27016 | - -### SteamGuard - -To start this Server, Steam Login is needed From 1ede54845fd999b8c9f0648c6f53c7689327a89f Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Tue, 25 Oct 2022 17:14:01 +0200 Subject: [PATCH 0659/1001] update terraria vanilla to allways pull latest --- game_eggs/terraria/vanilla/egg-terraria-vanilla.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/terraria/vanilla/egg-terraria-vanilla.json b/game_eggs/terraria/vanilla/egg-terraria-vanilla.json index fa3ad39a..933d8835 100644 --- a/game_eggs/terraria/vanilla/egg-terraria-vanilla.json +++ b/game_eggs/terraria/vanilla/egg-terraria-vanilla.json @@ -4,13 +4,13 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-10-05T12:17:20+02:00", + "exported_at": "2022-10-23T19:12:56+02:00", "name": "Terraria Vanilla", "author": "iamkubi@gmail.com", "description": "Dig, fight, explore, build! Nothing is impossible in this action-packed adventure game.", "features": null, "docker_images": { - "ghcr.io\/parkervcp\/yolks:debian": "ghcr.io\/parkervcp\/yolks:debian" + "Debian": "ghcr.io\/parkervcp\/yolks:debian" }, "file_denylist": [], "startup": ".\/TerrariaServer.bin.x86_64 -config serverconfig.txt", @@ -22,7 +22,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 unzip\r\n\r\nDOWNLOAD_LINK=invalid\r\n\r\nmkdir -p \/mnt\/server\/\r\ncd \/mnt\/server\/\r\n\r\nif [ \"${TERRARIA_VERSION}\" == \"latest\" ] || [ \"${TERRARIA_VERSION}\" == \"\" ] ; then\r\n DOWNLOAD_LINK=$(curl -sSL https:\/\/terraria.wiki.gg\/wiki\/Server#Downloads | grep '>Terraria Server ' | grep -Eoi ']+>' | grep -Eo 'href=\\\"[^\\\\\\\"]+\\\"' | grep -Eo '(http|https):\\\/\\\/[^\\\"]+' | tail -1 | cut -d'?' -f1)\r\nelse\r\n CLEAN_VERSION=$(echo ${TERRARIA_VERSION} | sed 's\/\\.\/\/g')\r\n echo -e \"Downloading terraria server files\"\r\n DOWNLOAD_LINK=$(curl -sSL https:\/\/terraria.wiki.gg\/wiki\/Server#Downloads | grep '>Terraria Server ' | grep -Eoi ']+>' | grep -Eo 'href=\\\"[^\\\\\\\"]+\\\"' | grep -Eo '(http|https):\\\/\\\/[^\\\"]+' | grep \"${CLEAN_VERSION}\" | cut -d'?' -f1)\r\nfi \r\n\r\n## this is a simple script to validate a download url actaully exists\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}; then\r\n echo -e \"link is valid.\"\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\nCLEAN_VERSION=$(echo ${DOWNLOAD_LINK##*\/} | cut -d'-' -f3 | cut -d'.' -f1)\r\n\r\necho -e \"running 'curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}'\" \r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho -e \"Unpacking server files\"\r\nunzip ${DOWNLOAD_LINK##*\/}\r\n\r\necho -e \"\"\r\ncp -R ${CLEAN_VERSION}\/Linux\/* .\/\r\nchmod +x TerrariaServer.bin.x86_64\r\n\r\necho -e \"Cleaning up extra files.\"\r\nrm -rf ${CLEAN_VERSION}\r\n\r\necho -e \"Generating config file\"\r\ncat < serverconfig.txt\r\nworldpath=\/home\/container\/saves\/Worlds\r\nworldname=default\r\nworld=\/home\/container\/saves\/Worlds\/default.wld\r\ndifficulty=3\r\nautocreate=1\r\nport=7777\r\nmaxplayers=8\r\nEOF\r\n\r\nmkdir -p \/mnt\/server\/saves\/Worlds\r\n\r\necho -e \"Install complete\"", + "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 unzip jq\r\n\r\nDOWNLOAD_LINK=invalid\r\n\r\nmkdir -p \/mnt\/server\/\r\ncd \/mnt\/server\/\r\n\r\nif [ \"${TERRARIA_VERSION}\" == \"latest\" ] || [ \"${TERRARIA_VERSION}\" == \"\" ] ; then\r\n V=$(curl -s https:\/\/terraria.org\/api\/get\/dedicated-servers-names | jq -r .[] | head -1)\r\n DOWNLOAD_LINK=\"https:\/\/terraria.org\/api\/download\/pc-dedicated-server\/${V}\"\r\nelse\r\n CLEAN_VERSION=$(echo ${TERRARIA_VERSION} | sed 's\/\\.\/\/g')\r\n echo -e \"Downloading terraria server files\"\r\n DOWNLOAD_LINK=$(curl -sSL https:\/\/terraria.wiki.gg\/wiki\/Server#Downloads | grep '>Terraria Server ' | grep -Eoi ']+>' | grep -Eo 'href=\\\"[^\\\\\\\"]+\\\"' | grep -Eo '(http|https):\\\/\\\/[^\\\"]+' | grep \"${CLEAN_VERSION}\" | cut -d'?' -f1)\r\nfi \r\n\r\n## this is a simple script to validate a download url actaully exists\r\necho ${DOWNLOAD_LINK}\r\n\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}; then\r\n echo -e \"link is valid.\"\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\nCLEAN_VERSION=$(echo ${DOWNLOAD_LINK##*\/} | cut -d'-' -f3 | cut -d'.' -f1)\r\n\r\n\r\necho -e \"running 'curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}'\" \r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho -e \"Unpacking server files\"\r\nunzip ${DOWNLOAD_LINK##*\/}\r\n\r\necho -e \"\"\r\ncp -R ${CLEAN_VERSION}\/Linux\/* .\/\r\nchmod +x TerrariaServer.bin.x86_64\r\n\r\necho -e \"Cleaning up extra files.\"\r\nrm -rf ${CLEAN_VERSION}\r\n\r\necho -e \"Generating config file\"\r\ncat < serverconfig.txt\r\nworldpath=\/home\/container\/saves\/Worlds\r\nworldname=default\r\nworld=\/home\/container\/saves\/Worlds\/default.wld\r\ndifficulty=3\r\nautocreate=1\r\nport=7777\r\nmaxplayers=8\r\nEOF\r\n\r\nmkdir -p \/mnt\/server\/saves\/Worlds\r\n\r\necho -e \"Install complete\"", "container": "debian:buster-slim", "entrypoint": "bash" } From 778f87f7a19fcc3e5c775763ab6d39ff18ee8554 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Tue, 25 Oct 2022 18:12:46 +0200 Subject: [PATCH 0660/1001] use the -sSL flag curl --- game_eggs/terraria/vanilla/egg-terraria-vanilla.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/terraria/vanilla/egg-terraria-vanilla.json b/game_eggs/terraria/vanilla/egg-terraria-vanilla.json index 933d8835..5f4ff357 100644 --- a/game_eggs/terraria/vanilla/egg-terraria-vanilla.json +++ b/game_eggs/terraria/vanilla/egg-terraria-vanilla.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-10-23T19:12:56+02:00", + "exported_at": "2022-10-25T18:12:06+02:00", "name": "Terraria Vanilla", "author": "iamkubi@gmail.com", "description": "Dig, fight, explore, build! Nothing is impossible in this action-packed adventure game.", @@ -22,7 +22,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 unzip jq\r\n\r\nDOWNLOAD_LINK=invalid\r\n\r\nmkdir -p \/mnt\/server\/\r\ncd \/mnt\/server\/\r\n\r\nif [ \"${TERRARIA_VERSION}\" == \"latest\" ] || [ \"${TERRARIA_VERSION}\" == \"\" ] ; then\r\n V=$(curl -s https:\/\/terraria.org\/api\/get\/dedicated-servers-names | jq -r .[] | head -1)\r\n DOWNLOAD_LINK=\"https:\/\/terraria.org\/api\/download\/pc-dedicated-server\/${V}\"\r\nelse\r\n CLEAN_VERSION=$(echo ${TERRARIA_VERSION} | sed 's\/\\.\/\/g')\r\n echo -e \"Downloading terraria server files\"\r\n DOWNLOAD_LINK=$(curl -sSL https:\/\/terraria.wiki.gg\/wiki\/Server#Downloads | grep '>Terraria Server ' | grep -Eoi ']+>' | grep -Eo 'href=\\\"[^\\\\\\\"]+\\\"' | grep -Eo '(http|https):\\\/\\\/[^\\\"]+' | grep \"${CLEAN_VERSION}\" | cut -d'?' -f1)\r\nfi \r\n\r\n## this is a simple script to validate a download url actaully exists\r\necho ${DOWNLOAD_LINK}\r\n\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}; then\r\n echo -e \"link is valid.\"\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\nCLEAN_VERSION=$(echo ${DOWNLOAD_LINK##*\/} | cut -d'-' -f3 | cut -d'.' -f1)\r\n\r\n\r\necho -e \"running 'curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}'\" \r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho -e \"Unpacking server files\"\r\nunzip ${DOWNLOAD_LINK##*\/}\r\n\r\necho -e \"\"\r\ncp -R ${CLEAN_VERSION}\/Linux\/* .\/\r\nchmod +x TerrariaServer.bin.x86_64\r\n\r\necho -e \"Cleaning up extra files.\"\r\nrm -rf ${CLEAN_VERSION}\r\n\r\necho -e \"Generating config file\"\r\ncat < serverconfig.txt\r\nworldpath=\/home\/container\/saves\/Worlds\r\nworldname=default\r\nworld=\/home\/container\/saves\/Worlds\/default.wld\r\ndifficulty=3\r\nautocreate=1\r\nport=7777\r\nmaxplayers=8\r\nEOF\r\n\r\nmkdir -p \/mnt\/server\/saves\/Worlds\r\n\r\necho -e \"Install complete\"", + "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 unzip jq\r\n\r\nDOWNLOAD_LINK=invalid\r\n\r\nmkdir -p \/mnt\/server\/\r\ncd \/mnt\/server\/\r\n\r\nif [ \"${TERRARIA_VERSION}\" == \"latest\" ] || [ \"${TERRARIA_VERSION}\" == \"\" ] ; then\r\n V=$(curl -sSL https:\/\/terraria.org\/api\/get\/dedicated-servers-names | jq -r .[] | head -1)\r\n DOWNLOAD_LINK=\"https:\/\/terraria.org\/api\/download\/pc-dedicated-server\/${V}\"\r\nelse\r\n CLEAN_VERSION=$(echo ${TERRARIA_VERSION} | sed 's\/\\.\/\/g')\r\n echo -e \"Downloading terraria server files\"\r\n DOWNLOAD_LINK=$(curl -sSL https:\/\/terraria.wiki.gg\/wiki\/Server#Downloads | grep '>Terraria Server ' | grep -Eoi ']+>' | grep -Eo 'href=\\\"[^\\\\\\\"]+\\\"' | grep -Eo '(http|https):\\\/\\\/[^\\\"]+' | grep \"${CLEAN_VERSION}\" | cut -d'?' -f1)\r\nfi \r\n\r\n## this is a simple script to validate a download url actaully exists\r\necho ${DOWNLOAD_LINK}\r\n\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}; then\r\n echo -e \"link is valid.\"\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\nCLEAN_VERSION=$(echo ${DOWNLOAD_LINK##*\/} | cut -d'-' -f3 | cut -d'.' -f1)\r\n\r\n\r\necho -e \"running 'curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}'\" \r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho -e \"Unpacking server files\"\r\nunzip ${DOWNLOAD_LINK##*\/}\r\n\r\necho -e \"\"\r\ncp -R ${CLEAN_VERSION}\/Linux\/* .\/\r\nchmod +x TerrariaServer.bin.x86_64\r\n\r\necho -e \"Cleaning up extra files.\"\r\nrm -rf ${CLEAN_VERSION}\r\n\r\necho -e \"Generating config file\"\r\ncat < serverconfig.txt\r\nworldpath=\/home\/container\/saves\/Worlds\r\nworldname=default\r\nworld=\/home\/container\/saves\/Worlds\/default.wld\r\ndifficulty=3\r\nautocreate=1\r\nport=7777\r\nmaxplayers=8\r\nEOF\r\n\r\nmkdir -p \/mnt\/server\/saves\/Worlds\r\n\r\necho -e \"Install complete\"", "container": "debian:buster-slim", "entrypoint": "bash" } From 86ec63512ad85239a979d8ce0214931c4a73406f Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Wed, 26 Oct 2022 17:04:21 +0200 Subject: [PATCH 0661/1001] Update LeagueSandbox_Egg.json --- .../leaguesandbox/LeagueSandbox_Egg.json | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/game_eggs/leaguesandbox/LeagueSandbox_Egg.json b/game_eggs/leaguesandbox/LeagueSandbox_Egg.json index 73ce9a95..1825e3f1 100644 --- a/game_eggs/leaguesandbox/LeagueSandbox_Egg.json +++ b/game_eggs/leaguesandbox/LeagueSandbox_Egg.json @@ -1,14 +1,19 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1" + "version": "PTDL_v2", + "update_url": null }, - "exported_at": "2020-11-10T17:07:44-05:00", + "exported_at": "2022-07-20T18:39:16+02:00", "name": "LeagueSandbox", "author": "domi@imagine.team", "description": "A simple egg to run LeagueSandbox server in pterodactyl", - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_dotnet", - "startup": ".\/GameServerConsole", + "features": null, + "docker_images": { + "ghcr.io\/parkervcp\/yolks:dotnet_6": "ghcr.io\/parkervcp\/yolks:dotnet_6" + }, + "file_denylist": [], + "startup": ".\/GameServerConsole --port {{SERVER_PORT}}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Game is ready.\"\r\n}", @@ -17,20 +22,10 @@ }, "scripts": { "installation": { - "script": "apk update && apk add git\r\ngit clone $GIT_URL\r\nrm .git -rf\r\ncd GameServer\r\ngit submodule init\r\ngit submodule update\r\ndotnet build .\r\ncp -r GameServerConsole\/bin\/Debug\/netcoreapp3.0\/* \/mnt\/server\/\r\ncp -r Content \/mnt\/server\/Content", - "container": "mcr.microsoft.com\/dotnet\/sdk:5.0", + "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y zip unzip jq curl wget git\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\ngit clone https:\/\/github.com\/LeagueSandbox\/GameServer.git\r\nrm .git -rf\r\n\r\ncd GameServer\/\r\n\r\ngit submodule init\r\ngit submodule update\r\n\r\n#wget https:\/\/packages.microsoft.com\/config\/debian\/11\/packages-microsoft-prod.deb -O packages-microsoft-prod.deb\r\n#dpkg -i packages-microsoft-prod.deb\r\n#rm packages-microsoft-prod.deb\r\n#apt-get update\r\n#apt-get install -y apt-transport-https\r\n#apt-get update\r\n#apt-get install -y dotnet-sdk-5.0\r\n\r\ndotnet build .\r\ncp -r GameServerConsole\/bin\/Debug\/net6.0\/* \/mnt\/server\/\r\ncp -r Content \/mnt\/server\/Content\r\necho \"done\"", + "container": "bitnami\/dotnet-sdk:6-debian-11", "entrypoint": "bash" } }, - "variables": [ - { - "name": "Git Url", - "description": "This is where the install script will clone the server files from", - "env_variable": "GIT_URL", - "default_value": "https:\/\/github.com\/LeagueSandbox\/GameServer", - "user_viewable": true, - "user_editable": false, - "rules": "required|string|max:90|url" - } - ] -} \ No newline at end of file + "variables": [] +} From 7c6c6f799023c299fb8aa797e1ded50d3e27b75f Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Wed, 26 Oct 2022 18:04:08 +0200 Subject: [PATCH 0662/1001] update readme + remove comments in install script --- game_eggs/leaguesandbox/LeagueSandbox_Egg.json | 6 +++--- game_eggs/leaguesandbox/README.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/game_eggs/leaguesandbox/LeagueSandbox_Egg.json b/game_eggs/leaguesandbox/LeagueSandbox_Egg.json index 1825e3f1..fcd88e23 100644 --- a/game_eggs/leaguesandbox/LeagueSandbox_Egg.json +++ b/game_eggs/leaguesandbox/LeagueSandbox_Egg.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-07-20T18:39:16+02:00", + "exported_at": "2022-10-26T17:21:51+02:00", "name": "LeagueSandbox", "author": "domi@imagine.team", "description": "A simple egg to run LeagueSandbox server in pterodactyl", @@ -22,10 +22,10 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y zip unzip jq curl wget git\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\ngit clone https:\/\/github.com\/LeagueSandbox\/GameServer.git\r\nrm .git -rf\r\n\r\ncd GameServer\/\r\n\r\ngit submodule init\r\ngit submodule update\r\n\r\n#wget https:\/\/packages.microsoft.com\/config\/debian\/11\/packages-microsoft-prod.deb -O packages-microsoft-prod.deb\r\n#dpkg -i packages-microsoft-prod.deb\r\n#rm packages-microsoft-prod.deb\r\n#apt-get update\r\n#apt-get install -y apt-transport-https\r\n#apt-get update\r\n#apt-get install -y dotnet-sdk-5.0\r\n\r\ndotnet build .\r\ncp -r GameServerConsole\/bin\/Debug\/net6.0\/* \/mnt\/server\/\r\ncp -r Content \/mnt\/server\/Content\r\necho \"done\"", + "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y zip unzip jq curl wget git\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\ngit clone https:\/\/github.com\/LeagueSandbox\/GameServer.git\r\nrm .git -rf\r\n\r\ncd GameServer\/\r\n\r\ngit submodule init\r\ngit submodule update\r\n\r\ndotnet build .\r\ncp -r GameServerConsole\/bin\/Debug\/net6.0\/* \/mnt\/server\/\r\ncp -r Content \/mnt\/server\/Content\r\necho \"done\"", "container": "bitnami\/dotnet-sdk:6-debian-11", "entrypoint": "bash" } }, "variables": [] -} +} \ No newline at end of file diff --git a/game_eggs/leaguesandbox/README.md b/game_eggs/leaguesandbox/README.md index 136badf3..59540580 100644 --- a/game_eggs/leaguesandbox/README.md +++ b/game_eggs/leaguesandbox/README.md @@ -1,6 +1,6 @@ # League Sandbox -## From their [Github](https://github.com/LeagueSandbox/leaguesandbox.github.io) +## From their [Github](https://github.com/LeagueSandbox/GameServer) [![Build status](https://ci.appveyor.com/api/projects/status/7olahkndcs3r295p/branch/indev?svg=true)](https://ci.appveyor.com/project/MythicManiac/gameserver/branch/indev) [![Build Status](https://travis-ci.org/LeagueSandbox/GameServer.svg?branch=indev)](https://travis-ci.org/LeagueSandbox/GameServer) From 75f8f46d49afa50481cdc42dbaa0d4f6cb806da7 Mon Sep 17 00:00:00 2001 From: Lucas Pearson <33225009+delphyinium@users.noreply.github.com> Date: Wed, 26 Oct 2022 13:24:40 -0400 Subject: [PATCH 0663/1001] Update Stormworks JSON Changed image from yolks:wine_latest to yolks:wine-staging. --- .../stormworks/egg-stormworks--build-and-rescue.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json b/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json index e8907e4d..4dc3aac5 100644 --- a/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json +++ b/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json @@ -12,7 +12,7 @@ "steam_disk_space" ], "images": [ - "ghcr.io\/parkervcp\/yolks:wine_latest" + "ghcr.io\/parkervcp\/yolks:wine_staging" ], "file_denylist": [], "startup": "xvfb-run wine server64.exe +server_dir \/home\/container", @@ -49,4 +49,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From a1584cb310c2023454e9282722270f22ba7ca596 Mon Sep 17 00:00:00 2001 From: Lucas Pearson <33225009+delphyinium@users.noreply.github.com> Date: Wed, 26 Oct 2022 13:46:13 -0400 Subject: [PATCH 0664/1001] Update README to address console output Update the console output section to address the fixed infinite output, and misreported TPS. --- game_eggs/steamcmd_servers/stormworks/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/stormworks/README.md b/game_eggs/steamcmd_servers/stormworks/README.md index 08ce0833..968f2558 100644 --- a/game_eggs/steamcmd_servers/stormworks/README.md +++ b/game_eggs/steamcmd_servers/stormworks/README.md @@ -20,4 +20,4 @@ Stormworks requires 3 consecutive ports in order to run. The default ports are ## Console output -The Stormworks server will constantly output updates to the server console when run under Wine. Natively this results in text that updates in place, however there is no way to disable or limit the frequency of this output. A [feature request](http://mcro.org/issues/view_issue/21739) was filed with the developer in hopes of improving the Linux support however it was rejected without comment. At this time there is no known solution. +Due to the move to the wine staging branch, the console will no longer spit out updates infinitely. It will remain consistant, and update according to player-count, vehicles loaded, etc. However, there is one thing to note. It seems that the console will misreport TPS, always appearing at a steady 60-64. Ignore this reading. If you wish to check your server TPS, join your server and press the backquote/tilda key (`/~). From 19baf2745898fc9c3eaf0fb2ec6bb50d3e30a4e7 Mon Sep 17 00:00:00 2001 From: Lucas Pearson <33225009+delphyinium@users.noreply.github.com> Date: Wed, 26 Oct 2022 14:09:58 -0400 Subject: [PATCH 0665/1001] Delete egg-stormworks--build-and-rescue.json --- .../egg-stormworks--build-and-rescue.json | 52 ------------------- 1 file changed, 52 deletions(-) delete mode 100644 game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json diff --git a/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json b/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json deleted file mode 100644 index 4dc3aac5..00000000 --- a/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1", - "update_url": null - }, - "exported_at": "2022-05-29T05:37:19+02:00", - "name": "Stormworks: Build and Rescue", - "author": "iamkubi@gmail.com", - "description": "Join a world where you design, create and pilot your own air sea rescue service. Release your inner hero as you battle fierce storms out at sea to rescue those in need.", - "features": [ - "steam_disk_space" - ], - "images": [ - "ghcr.io\/parkervcp\/yolks:wine_staging" - ], - "file_denylist": [], - "startup": "xvfb-run wine server64.exe +server_dir \/home\/container", - "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"Server: ready to spawn for peer\"\r\n}", - "logs": "{}", - "stop": "^C" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n ##\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", - "container": "ghcr.io\/parkervcp\/installers:debian", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "SRCDS_APPID", - "description": "Steam App ID", - "env_variable": "SRCDS_APPID", - "default_value": "1247090", - "user_viewable": false, - "user_editable": false, - "rules": "required|string|max:20" - }, - { - "name": "WINDOWS_INSTALL", - "description": "", - "env_variable": "WINDOWS_INSTALL", - "default_value": "1", - "user_viewable": false, - "user_editable": false, - "rules": "required|string|max:20" - } - ] -} From 5fff985abe411bce27f755f15c68bf6041f6c88f Mon Sep 17 00:00:00 2001 From: Lucas Pearson <33225009+delphyinium@users.noreply.github.com> Date: Wed, 26 Oct 2022 14:10:56 -0400 Subject: [PATCH 0666/1001] Update Stormworks.json --- .../egg-stormworks--build-and-rescue.json | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json diff --git a/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json b/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json new file mode 100644 index 00000000..c3c12384 --- /dev/null +++ b/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json @@ -0,0 +1,54 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2022-10-26T12:10:19-06:00", + "name": "Stormworks: Build and Rescue", + "author": "iamkubi@gmail.com", + "description": "Join a world where you design, create and pilot your own air sea rescue service. Release your inner hero as you battle fierce storms out at sea to rescue those in need.", + "features": [ + "steam_disk_space" + ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:wine_staging": "ghcr.io\/parkervcp\/yolks:wine_staging" + }, + "file_denylist": [], + "startup": "xvfb-run wine server64.exe +server_dir \/home\/container\/server_data", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Server: ready to spawn for peer\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n ##\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", + "container": "ghcr.io\/parkervcp\/installers:debian", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "SRCDS_APPID", + "description": "Steam App ID", + "env_variable": "SRCDS_APPID", + "default_value": "1247090", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:20", + "field_type": "text" + }, + { + "name": "WINDOWS_INSTALL", + "description": "", + "env_variable": "WINDOWS_INSTALL", + "default_value": "1", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:20", + "field_type": "text" + } + ] +} \ No newline at end of file From 4c972fe1d31b5a64171b8aa1a5a6dae0821b7cb8 Mon Sep 17 00:00:00 2001 From: Lucas Pearson <33225009+delphyinium@users.noreply.github.com> Date: Wed, 26 Oct 2022 16:57:20 -0400 Subject: [PATCH 0667/1001] Update Stormworks.JSON Fixed changes mentioned in PR. --- .../egg-stormworks--build-and-rescue.json | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json b/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json index c3c12384..9d9a2be1 100644 --- a/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json +++ b/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-10-26T12:10:19-06:00", + "exported_at": "2022-10-26T14:56:05-06:00", "name": "Stormworks: Build and Rescue", "author": "iamkubi@gmail.com", "description": "Join a world where you design, create and pilot your own air sea rescue service. Release your inner hero as you battle fierce storms out at sea to rescue those in need.", @@ -24,7 +24,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n ##\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n ##\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\n# apt -y update\r\n# apt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## installation end\r\necho \"-----------------------------------------\"\r\necho \"Installation completed...\"\r\necho \"-----------------------------------------\"", "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } @@ -49,6 +49,16 @@ "user_editable": false, "rules": "required|string|max:20", "field_type": "text" + }, + { + "name": "AUTO_UPDATE", + "description": "This will auto-update SteamCMD on boot.\r\n0 is disabled, 1 is enabled.", + "env_variable": "AUTO_UPDATE", + "default_value": "0", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:20", + "field_type": "text" } ] -} \ No newline at end of file +} From 0b44f41b57b9587f06d832a82132b096947a4237 Mon Sep 17 00:00:00 2001 From: Thomas Selwyn <37274951+TASelwyn@users.noreply.github.com> Date: Wed, 26 Oct 2022 20:26:25 -0400 Subject: [PATCH 0668/1001] Updated the README with new information, cleaned up the wiki links and removed the unnecessary tickrate option. It's not recommended to change; therefore why are we talking bout it? --- game_eggs/steamcmd_servers/pavlov_vr/README.md | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/game_eggs/steamcmd_servers/pavlov_vr/README.md b/game_eggs/steamcmd_servers/pavlov_vr/README.md index b8730b09..38ca0eb1 100644 --- a/game_eggs/steamcmd_servers/pavlov_vr/README.md +++ b/game_eggs/steamcmd_servers/pavlov_vr/README.md @@ -1,27 +1,26 @@ # Pavlov VR -Pavlov VR is a multiplayer shooter in VR with heavy focus on community features. Realistic reloading features and fast paced combat as part of the core experience. +Pavlov VR is a multiplayer shooter in VR with heavy focus on community features. Realistic reloading features and fast-paced combat as part of the core experience. ## Recommended server settings ### Minimum RAM -This server requires about 2048M to run. A 3.2 GHz core will support approximately 24 players. Since Pavlov VR is single threaded, faster clockspeeds will mean higher performance. - -### Tickrate - -For stable results, please use a minimum of 50 and a maximum of 120. +This server requires about 2048M to run. A 3.2 GHz core will support approximately 24 players. Since Pavlov VR is single threaded, faster clock-speeds will mean higher performance. ### Multiple Servers on the same host -If you are running multiple servers and have set additional ports (see ) then you need to allow access to the defined port plus the port 400 higher. So if you use 7000 as your port, then UDP 7000 and 7400 need to be open. +If you are running multiple servers and have set additional ports (see [Running multiple servers](http://wiki.pavlov-vr.com/index.php?title=Dedicated_server#Running_multiple_servers_on_one_host)) then you need to allow access to the defined port plus the port 400 higher. So if you use 7000 as your port, then UDP 7000 and 7400 need to be open. -For additional help, please see the following - ### Steam Workshop When downloading a large map from the steam workshop make sure your node has enough RAM assigned to store the map files in its tmpfs! This requires you to modify your wings configuration to have the tmpfs_size value increased. +Additionally, due to the way Pavlov stores workshop maps in the temp directory, the only way to persistently keep workshop maps is to create a mount for /tmp/workshop. For assistance with mounts, please visit the following link - [Using Mounts Pterodactyl](https://pterodactyl.io/guides/mounts.html) + +For additional help, please see the following - [Dedicated Server Wiki](http://wiki.pavlov-vr.com/index.php?title=Dedicated_server) + ## Server Ports | Port | default | From 47667923a298100545832474b8464f8b935104a0 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Thu, 27 Oct 2022 13:23:59 +0200 Subject: [PATCH 0669/1001] add correct author to Minedustry egg --- game_eggs/mindustry/egg-mindustry.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/mindustry/egg-mindustry.json b/game_eggs/mindustry/egg-mindustry.json index 00e44bea..2538ebce 100644 --- a/game_eggs/mindustry/egg-mindustry.json +++ b/game_eggs/mindustry/egg-mindustry.json @@ -5,7 +5,7 @@ }, "exported_at": "2020-07-22T18:01:10+02:00", "name": "Mindustry", - "author": "unknown@unknown.com", + "author": "sir3lit@gmail.com", "description": "Mindustry is a hybrid tower-defense sandbox factory game. Create elaborate supply chains of conveyor belts to feed ammo into your turrets, produce materials to use for building, and defend your structures from waves of enemies.", "image": "ghcr.io\/pterodactyl\/yolks:java_11", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar server-release.jar config port {{SERVER_PORT}},config name {{SERVER_NAME}},host {{MAPNAME}}", From 66646983813612c6dc1b97b8108ddd27bfac61a3 Mon Sep 17 00:00:00 2001 From: Lucas Pearson <33225009+delphyinium@users.noreply.github.com> Date: Thu, 27 Oct 2022 22:07:31 -0400 Subject: [PATCH 0670/1001] fix stormworks.json --- .../stormworks/egg-stormworks--build-and-rescue.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json b/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json index 9d9a2be1..1c11cbf1 100644 --- a/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json +++ b/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-10-26T14:56:05-06:00", + "exported_at": "2022-10-27T20:06:01-06:00", "name": "Stormworks: Build and Rescue", "author": "iamkubi@gmail.com", "description": "Join a world where you design, create and pilot your own air sea rescue service. Release your inner hero as you battle fierce storms out at sea to rescue those in need.", @@ -12,7 +12,7 @@ "steam_disk_space" ], "docker_images": { - "ghcr.io\/parkervcp\/yolks:wine_staging": "ghcr.io\/parkervcp\/yolks:wine_staging" + "wine_staging": "ghcr.io\/parkervcp\/yolks:wine_staging" }, "file_denylist": [], "startup": "xvfb-run wine server64.exe +server_dir \/home\/container\/server_data", @@ -57,7 +57,7 @@ "default_value": "0", "user_viewable": false, "user_editable": false, - "rules": "required|string|max:20", + "rules": "required|boolean", "field_type": "text" } ] From 664d6a715bafb1211e098eb4843f3fc8e9575d77 Mon Sep 17 00:00:00 2001 From: PsychoZander <62998704+PsychoZander@users.noreply.github.com> Date: Fri, 28 Oct 2022 15:13:23 +0100 Subject: [PATCH 0671/1001] Update game_eggs readme with Clusterio link. --- game_eggs/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/game_eggs/README.md b/game_eggs/README.md index dab7140f..8a219a13 100644 --- a/game_eggs/README.md +++ b/game_eggs/README.md @@ -20,6 +20,7 @@ * [Vanilla](factorio/factorio) * [ModUpdate](factorio/factorio-modupdate) +* [Clusterio](game_eggs/factorio/clusterio) [FTL: Tachyon](ftl/tachyon) From 0066e4ab008968c3958c711f5e5182bf874db26e Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat, 29 Oct 2022 13:15:01 +0200 Subject: [PATCH 0672/1001] Update and rename beammp.json to egg-beam-m-p-servers.json --- game_eggs/beamng/beammp/beammp.json | 95 --------------- .../beamng/beammp/egg-beam-m-p-servers.json | 112 ++++++++++++++++++ 2 files changed, 112 insertions(+), 95 deletions(-) delete mode 100644 game_eggs/beamng/beammp/beammp.json create mode 100644 game_eggs/beamng/beammp/egg-beam-m-p-servers.json diff --git a/game_eggs/beamng/beammp/beammp.json b/game_eggs/beamng/beammp/beammp.json deleted file mode 100644 index 40eb5fd4..00000000 --- a/game_eggs/beamng/beammp/beammp.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1", - "update_url": null - }, - "exported_at": "2021-12-22T09:10:34+00:00", - "name": "BeamMP Servers", - "author": "noah@noahserver.online", - "description": "This is the server for the multiplayer mod BeamMP for the game BeamNG.drive. The server is the point through which all clients communicate. You can write lua mods for the server, detailed instructions on the BeamMP Wiki.", - "features": null, - "images": [ - "ghcr.io\/parkervcp\/yolks:debian" - ], - "file_denylist": [], - "startup": ".\/BeamMP-Server", - "config": { - "files": "{\r\n \"ServerConfig.toml\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"Name =\": \"Name = \\\"{{env.NAME}}\\\"\",\r\n \"Port =\": \"Port = {{server.build.default.port}}\",\r\n \"AuthKey =\": \"AuthKey = \\\"{{env.AUTHKEY}}\\\"\",\r\n \"Private =\": \"Private = {{env.PRIVATE}}\",\r\n \"MaxPlayers =\": \"MaxPlayers = {{server.build.env.MAX_PLAYERS}}\",\r\n \"Description =\": \"Description = \\\"{{env.NAME}}\\\"\",\r\n \"MaxCars =\": \"MaxCars = {{env.MAX_CARS}}\",\r\n \"Map =\": \"Map = \\\"{{env.MAP}}\\\"\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"[INFO] Vehicle data network online\"\r\n}", - "logs": "{}", - "stop": "^C" - }, - "scripts": { - "installation": { - "script": "#Create the server directory\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\n#Remove any old versions\r\nrm -f BeamMP-Server\r\n\r\n#Check for latest release & download URLs\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/BeamMP\/BeamMP-Server\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/BeamMP\/BeamMP-Server\/releases\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n echo -e \"Using latest BeamMP server version\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i Server-linux)\r\nelse\r\n echo -e \"Chosen version :${VERSION}. Verifying version from releases\"\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 -i Server-linux)\r\n else\r\n echo -e \"No valid versions found. Defaulting to the latest release\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\n#Download the BeamMP server binary\r\necho -e \"Running curl -sSL ${DOWNLOAD_URL} -o BeamMP-Server\"\r\ncurl -L ${DOWNLOAD_URL} -o BeamMP-Server\r\nchmod +x BeamMP-Server\r\n\r\n#Create a default configuration file\r\necho \"[HTTP]\r\n# Recommended to keep enabled. With SSL the server will serve https and requires valid key and cert files\r\nUseSSL = true\r\n# Enables the internal HTTP server\r\nHTTPServerEnabled = false\r\nSSLKeyPath = \\\".\/.ssl\/HttpServer\/key.pem\\\"\r\nHTTPServerPort = 8080\r\nSSLCertPath = \\\".\/.ssl\/HttpServer\/cert.pem\\\"\r\n\r\n[General]\r\n# If SendErrors is `true`, the server will send helpful info about crashes and other issues back to the BeamMP developers. This info may include your config, who is on your server at the time of the error, and similar general information. This kind of data is vital in helping us diagnose and fix issues faster. This has no impact on server performance. You can opt-out of this system by setting this to `false`\r\nSendErrorsShowMessage = true\r\nName = \\\"BeamMP Server\\\"\r\nPort = 30814\r\nResourceFolder = \\\"Resources\\\"\r\n# AuthKey has to be filled out in order to run the server\r\nAuthKey = \\\"\\\"\r\nPrivate = true\r\nMaxPlayers = 10\r\nDebug = false\r\nDescription = \\\"BeamMP Default Description\\\"\r\nMaxCars = 1\r\nMap = \\\"\/levels\/gridmap_v2\/info.json\\\"\r\n# You can turn on\/off the SendErrors message you get on startup here\r\nSendErrors = true\" > ServerConfig.toml", - "container": "ghcr.io\/parkervcp\/installers:debian", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Server Name", - "description": "The name of your server. This is what appears on the server list.", - "env_variable": "NAME", - "default_value": "BeamMP Server", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:64" - }, - { - "name": "BeamMP Server Version", - "description": "The BeamMP server version to be installed. Latest or invalid versions will default to latest. See all available versions at https:\/\/github.com\/BeamMP\/BeamMP-Server\/releases", - "env_variable": "VERSION", - "default_value": "latest", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:8" - }, - { - "name": "Authentication Key", - "description": "The authentication key for your server. A key can be obtained from the BeamMP keymaster at https:\/\/beamng-mp.com\/k\/dashboard", - "env_variable": "AUTHKEY", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:64" - }, - { - "name": "Max Players", - "description": "The maximum number of players allowed on the server.", - "env_variable": "MAX_PLAYERS", - "default_value": "6", - "user_viewable": true, - "user_editable": true, - "rules": "required|integer|max:100" - }, - { - "name": "Private", - "description": "Should the server be private?", - "env_variable": "PRIVATE", - "default_value": "false", - "user_viewable": true, - "user_editable": true, - "rules": "required|string" - }, - { - "name": "Max Cars", - "description": "The maximum number of cars allowed to be spawned per player.", - "env_variable": "MAX_CARS", - "default_value": "1", - "user_viewable": true, - "user_editable": true, - "rules": "required|integer|max:4" - }, - { - "name": "Map", - "description": "The map for your server. Stock maps are listed below.\r\n\r\n\/levels\/gridmap_v2\/info.json\r\n\/levels\/automation_test_track\/info.json\r\n\/levels\/east_coast_usa\/info.json\r\n\/levels\/hirochi_raceway\/info.json\r\n\/levels\/italy\/info.json\r\n\/levels\/jungle_rock_island\/info.json\r\n\/levels\/industrial\/info.json\r\n\/levels\/small_island\/info.json\r\n\/levels\/smallgrid\/info.json\r\n\/levels\/utah\/info.json\r\n\/levels\/west_coast_usa\/info.json\r\n\/levels\/driver_training\/info.json\r\n\/levels\/derby\/info.json", - "env_variable": "MAP", - "default_value": "\/levels\/gridmap_v2\/info.json", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:64" - } - ] -} \ No newline at end of file diff --git a/game_eggs/beamng/beammp/egg-beam-m-p-servers.json b/game_eggs/beamng/beammp/egg-beam-m-p-servers.json new file mode 100644 index 00000000..565775d3 --- /dev/null +++ b/game_eggs/beamng/beammp/egg-beam-m-p-servers.json @@ -0,0 +1,112 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2022-10-29T13:13:41+02:00", + "name": "BeamMP Servers", + "author": "noah@noahserver.online", + "description": "This is the server for the multiplayer mod BeamMP for the game BeamNG.drive. The server is the point through which all clients communicate. You can write lua mods for the server, detailed instructions on the BeamMP Wiki.", + "features": null, + "docker_images": { + "Debian": "ghcr.io\/parkervcp\/yolks:debian" + }, + "file_denylist": [], + "startup": ".\/BeamMP-Server", + "config": { + "files": "{\r\n \"ServerConfig.toml\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"Name =\": \"Name = \\\"{{env.NAME}}\\\"\",\r\n \"Port =\": \"Port = {{server.build.default.port}}\",\r\n \"AuthKey =\": \"AuthKey = \\\"{{env.AUTHKEY}}\\\"\",\r\n \"Private =\": \"Private = {{env.PRIVATE}}\",\r\n \"MaxPlayers =\": \"MaxPlayers = {{server.build.env.MAX_PLAYERS}}\",\r\n \"Description =\": \"Description = \\\"{{env.NAME}}\\\"\",\r\n \"MaxCars =\": \"MaxCars = {{env.MAX_CARS}}\",\r\n \"Map =\": \"Map = \\\"{{env.MAP}}\\\"\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"[INFO] Vehicle data network online\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n#Create the server directory\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\n#Remove any old versions\r\nrm -f BeamMP-Server\r\n\r\n#Check for latest release & download URLs\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/BeamMP\/BeamMP-Server\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/BeamMP\/BeamMP-Server\/releases\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n echo -e \"Using latest BeamMP server version\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i \"${MATCH}\")\r\nelse\r\n echo -e \"Chosen version :${VERSION}. Verifying version from releases\"\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 -i \"${MATCH}\")\r\n else\r\n echo -e \"No valid versions found. Defaulting to the latest release\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i Server-linux)\r\n fi\r\nfi\r\n\r\n#Download the BeamMP server binary\r\necho -e \"Running curl -sSL ${DOWNLOAD_URL} -o BeamMP-Server\"\r\ncurl -L ${DOWNLOAD_URL} -o BeamMP-Server\r\nchmod +x BeamMP-Server\r\n\r\n#Create a default configuration file\r\necho \"[HTTP]\r\n# Recommended to keep enabled. With SSL the server will serve https and requires valid key and cert files\r\nUseSSL = true\r\n# Enables the internal HTTP server\r\nHTTPServerEnabled = false\r\nSSLKeyPath = \\\".\/.ssl\/HttpServer\/key.pem\\\"\r\nHTTPServerPort = 8080\r\nSSLCertPath = \\\".\/.ssl\/HttpServer\/cert.pem\\\"\r\n\r\n[General]\r\n# If SendErrors is `true`, the server will send helpful info about crashes and other issues back to the BeamMP developers. This info may include your config, who is on your server at the time of the error, and similar general information. This kind of data is vital in helping us diagnose and fix issues faster. This has no impact on server performance. You can opt-out of this system by setting this to `false`\r\nSendErrorsShowMessage = true\r\nName = \\\"BeamMP Server\\\"\r\nPort = 30814\r\nResourceFolder = \\\"Resources\\\"\r\n# AuthKey has to be filled out in order to run the server\r\nAuthKey = \\\"\\\"\r\nPrivate = true\r\nMaxPlayers = 10\r\nDebug = false\r\nDescription = \\\"BeamMP Default Description\\\"\r\nMaxCars = 1\r\nMap = \\\"\/levels\/gridmap_v2\/info.json\\\"\r\n# You can turn on\/off the SendErrors message you get on startup here\r\nSendErrors = true\" > ServerConfig.toml\r\n\r\necho \"-----------------------------------------\"\r\necho \"Installation completed...\"\r\necho \"-----------------------------------------\"", + "container": "ghcr.io\/parkervcp\/installers:debian", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Server Name", + "description": "The name of your server. This is what appears on the server list.", + "env_variable": "NAME", + "default_value": "BeamMP Server", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:64", + "field_type": "text" + }, + { + "name": "BeamMP Server Version", + "description": "The BeamMP server version to be installed. Latest or invalid versions will default to latest. See all available versions at https:\/\/github.com\/BeamMP\/BeamMP-Server\/releases\r\n\r\nexample: v3.1.0 or v2.2.0 or latest", + "env_variable": "VERSION", + "default_value": "latest", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:8", + "field_type": "text" + }, + { + "name": "Authentication Key", + "description": "The authentication key for your server. A key can be obtained from the BeamMP keymaster at https:\/\/beamng-mp.com\/k\/dashboard", + "env_variable": "AUTHKEY", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:64", + "field_type": "text" + }, + { + "name": "Max Players", + "description": "The maximum number of players allowed on the server.", + "env_variable": "MAX_PLAYERS", + "default_value": "6", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|max:100", + "field_type": "text" + }, + { + "name": "Private", + "description": "Should the server be private?", + "env_variable": "PRIVATE", + "default_value": "false", + "user_viewable": true, + "user_editable": true, + "rules": "required|string", + "field_type": "text" + }, + { + "name": "Max Cars", + "description": "The maximum number of cars allowed to be spawned per player.", + "env_variable": "MAX_CARS", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "required|integer|max:4", + "field_type": "text" + }, + { + "name": "Map", + "description": "The map for your server. Stock maps are listed below.\r\n\r\n\/levels\/gridmap_v2\/info.json\r\n\/levels\/automation_test_track\/info.json\r\n\/levels\/east_coast_usa\/info.json\r\n\/levels\/hirochi_raceway\/info.json\r\n\/levels\/italy\/info.json\r\n\/levels\/jungle_rock_island\/info.json\r\n\/levels\/industrial\/info.json\r\n\/levels\/small_island\/info.json\r\n\/levels\/smallgrid\/info.json\r\n\/levels\/utah\/info.json\r\n\/levels\/west_coast_usa\/info.json\r\n\/levels\/driver_training\/info.json\r\n\/levels\/derby\/info.json", + "env_variable": "MAP", + "default_value": "\/levels\/gridmap_v2\/info.json", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:64", + "field_type": "text" + }, + { + "name": "Match", + "description": "The match we have to do on there github package.\r\n\r\nCurrently the have a special build for debian 11, what is the docker image we use.\r\nGo to https:\/\/github.com\/BeamMP\/BeamMP-Server\/releases if the version you want has a asset \"BeamMP-Server-debian11\" then select \"BeamMP-Server-debian11\" if not then \"BeamMP-Server-linux\"", + "env_variable": "MATCH", + "default_value": "BeamMP-Server-debian11", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:BeamMP-Server-debian11,BeamMP-Server-linux", + "field_type": "text" + } + ] +} From 595836500f37e4ac419babc07d0c4f78099be419 Mon Sep 17 00:00:00 2001 From: MAXOUXAX <24844231+MAXOUXAX@users.noreply.github.com> Date: Sat, 29 Oct 2022 14:45:19 +0200 Subject: [PATCH 0673/1001] fix: mongodb config file is now automatically enabling access control by default --- database/nosql/mongodb/egg-mongo-d-b6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/nosql/mongodb/egg-mongo-d-b6.json b/database/nosql/mongodb/egg-mongo-d-b6.json index 388adcc9..b14c473a 100644 --- a/database/nosql/mongodb/egg-mongo-d-b6.json +++ b/database/nosql/mongodb/egg-mongo-d-b6.json @@ -15,7 +15,7 @@ "file_denylist": [], "startup": "mongod --fork --dbpath \/home\/container\/mongodb\/ --port ${SERVER_PORT} --bind_ip 0.0.0.0 --logpath \/home\/container\/logs\/mongo.log -f \/home\/container\/mongod.conf; until nc -z -v -w5 127.0.0.1 ${SERVER_PORT}; do echo 'Waiting for mongodb connection...'; sleep 5; done; mongosh --username ${MONGO_USER} --password ${MONGO_USER_PASS} --host 127.0.0.1:${SERVER_PORT} && mongosh --eval \"db.getSiblingDB('admin').shutdownServer()\" 127.0.0.1:${SERVER_PORT}", "config": { - "files": "{}", + "files": "{\r\n \"mongod.conf\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"#security:\": \"security: \\r\\n authorization: \\\"enabled\\\"\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"child process started successfully\"\r\n}", "logs": "{}", "stop": "exit" From 0df96b7d45f54065371e4fce4d50107026126aec Mon Sep 17 00:00:00 2001 From: MAXOUXAX <24844231+MAXOUXAX@users.noreply.github.com> Date: Sat, 29 Oct 2022 14:49:02 +0200 Subject: [PATCH 0674/1001] chore: changed MongoDB case --- README.md | 2 +- database/nosql/mongodb/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a41f8b73..0e87aada 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ If you are reading this it looks like you are looking to add an egg to your serv ### noSQL -* [mongoDB](/database/nosql/mongodb) +* [MongoDB](/database/nosql/mongodb) ### SQL Databases diff --git a/database/nosql/mongodb/README.md b/database/nosql/mongodb/README.md index b72a3a7d..9ae29218 100644 --- a/database/nosql/mongodb/README.md +++ b/database/nosql/mongodb/README.md @@ -1,4 +1,4 @@ -# mongoDB +# MongoDB ## From their [Website](https://www.mongodb.com/) From 04dcb56d9b0cc8b586e0a91e8850f91bce9bd065 Mon Sep 17 00:00:00 2001 From: MAXOUXAX <24844231+MAXOUXAX@users.noreply.github.com> Date: Sat, 29 Oct 2022 15:01:47 +0200 Subject: [PATCH 0675/1001] docs: updated MongoDB readme to add some notes about security --- database/nosql/mongodb/README.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/database/nosql/mongodb/README.md b/database/nosql/mongodb/README.md index 9ae29218..931de79b 100644 --- a/database/nosql/mongodb/README.md +++ b/database/nosql/mongodb/README.md @@ -8,6 +8,25 @@ MongoDB is a general purpose, document-based, distributed database built for mod To disable the message about free monitoring you can run `db.disableFreeMonitoring()`. +## Security + +By default, MongoDB **does not enforce access control**, meaning that even if you set an admin username and password in the settings of your Pterodactyl server, **anyone will be able to connect to the database without authentication**, and perform any operation. + +> :warning: This is why we recommend to expose your MongoDB database only to your local network, if possible + +### Notes specific to the MongoDB 6 egg + +The [MongoDB 6 egg](./egg-mongo-d-b6.json) enables access control by default in the `mongod.conf` file, meaning that even if people will be able to connect to your database as guests, [they will not be able to perform any operation, apart from nonhazardous commands](https://dba.stackexchange.com/a/292175) + +### :warning: If you know what you are doing, and you really want to disable access control, you can do so by editing the `mongod.conf` file + +```yaml +security: + authorization: "disabled" +``` + +> To learn more about MongoDB security, you can read the [MongoDB Security Checklist](https://www.mongodb.com/docs/manual/administration/security-checklist/#security-checklist) + ## Minimum RAM warning MongoDB requires approximately 1GB of RAM per 100.000 assets. If the system has to start swapping memory to disk, this will have a severely negative impact on performance, and should be avoided. From aacf078812ed50566024e1fa022006043aa2360b Mon Sep 17 00:00:00 2001 From: MAXOUXAX <24844231+MAXOUXAX@users.noreply.github.com> Date: Sat, 29 Oct 2022 15:13:01 +0200 Subject: [PATCH 0676/1001] docs: improved readability for MongoDB readme --- database/nosql/mongodb/README.md | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/database/nosql/mongodb/README.md b/database/nosql/mongodb/README.md index 931de79b..4dcf9797 100644 --- a/database/nosql/mongodb/README.md +++ b/database/nosql/mongodb/README.md @@ -14,19 +14,30 @@ By default, MongoDB **does not enforce access control**, meaning that even if yo > :warning: This is why we recommend to expose your MongoDB database only to your local network, if possible +### Enabling authentication + +To enable authentification, you need to edit the following lines to your `mongod.conf` file: + +```yaml +security: + authorization: "enabled" +``` + +> :closed_lock_with_key: To learn more about MongoDB security, you can read the [MongoDB Security Checklist](https://www.mongodb.com/docs/manual/administration/security-checklist/#security-checklist) + ### Notes specific to the MongoDB 6 egg -The [MongoDB 6 egg](./egg-mongo-d-b6.json) enables access control by default in the `mongod.conf` file, meaning that even if people will be able to connect to your database as guests, [they will not be able to perform any operation, apart from nonhazardous commands](https://dba.stackexchange.com/a/292175) +**The [MongoDB 6 egg](./egg-mongo-d-b6.json) enables access control by default** in the `mongod.conf` file, meaning that even if people will be able to connect to your database as guests, [they will not be able to perform any operation, apart from nonhazardous commands](https://dba.stackexchange.com/a/292175) -### :warning: If you know what you are doing, and you really want to disable access control, you can do so by editing the `mongod.conf` file +### Disabling authentication + +**If you know what you are doing** and want to explicitly disable access control, you can edit the following lines to your `mongod.conf` file: ```yaml security: authorization: "disabled" ``` -> To learn more about MongoDB security, you can read the [MongoDB Security Checklist](https://www.mongodb.com/docs/manual/administration/security-checklist/#security-checklist) - ## Minimum RAM warning MongoDB requires approximately 1GB of RAM per 100.000 assets. If the system has to start swapping memory to disk, this will have a severely negative impact on performance, and should be avoided. From 24146cfed886bcfd7277b389aada2404ec52107f Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Mon, 31 Oct 2022 16:28:50 +0100 Subject: [PATCH 0677/1001] update forge --- .../java/forge/forge/egg-forge-enhanced.json | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json b/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json index 0f173522..14bcf0d0 100644 --- a/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json +++ b/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json @@ -1,10 +1,10 @@ { "_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-06-11T19:29:34-04:00", + "exported_at": "2022-10-31T16:27:58+01:00", "name": "Forge Enhanced", "author": "parker@parkervcp.com", "description": "Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.", @@ -13,12 +13,12 @@ "java_version", "pid_limit" ], - "images": [ - "ghcr.io\/pterodactyl\/yolks:java_17", - "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_8" - ], + "docker_images": { + "Java 17": "ghcr.io\/pterodactyl\/yolks:java_17", + "Java 16": "ghcr.io\/pterodactyl\/yolks:java_16", + "Java 11": "ghcr.io\/pterodactyl\/yolks:java_11", + "Java 8": "ghcr.io\/pterodactyl\/yolks:java_8" + }, "file_denylist": [], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true $( [[ ! -f unix_args.txt ]] && printf %s \"-jar {{SERVER_JARFILE}}\" || printf %s \"@unix_args.txt\" )", "config": { @@ -29,7 +29,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nif [[ ! -d \/mnt\/server ]]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n# Remove spaces from the version number to avoid issues with curl\r\nFORGE_VERSION=\"$(echo \"$FORGE_VERSION\" | tr -d ' ')\"\r\nMC_VERSION=\"$(echo \"$MC_VERSION\" | tr -d ' ')\"\r\n\r\nif [[ ! -z ${FORGE_VERSION} ]]; then\r\n DOWNLOAD_LINK=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/${FORGE_VERSION}\/forge-${FORGE_VERSION}\r\n FORGE_JAR=forge-${FORGE_VERSION}*.jar\r\nelse\r\n JSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\n if [[ \"${MC_VERSION}\" == \"latest\" ]] || [[ \"${MC_VERSION}\" == \"\" ]]; then\r\n echo -e \"getting latest version of forge.\"\r\n MC_VERSION=$(echo -e ${JSON_DATA} | jq -r '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains(\"latest\")) | split(\"-\")[0]' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)\r\n BUILD_TYPE=latest\r\n fi\r\n\r\n if [[ \"${BUILD_TYPE}\" != \"recommended\" ]] && [[ \"${BUILD_TYPE}\" != \"latest\" ]]; then\r\n BUILD_TYPE=recommended\r\n fi\r\n\r\n echo -e \"minecraft version: ${MC_VERSION}\"\r\n echo -e \"build type: ${BUILD_TYPE}\"\r\n\r\n ## some variables for getting versions and things\r\n FILE_SITE=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n ## locating the forge version\r\n if [[ \"${VERSION_KEY}\" == \"\" ]] && [[ \"${BUILD_TYPE}\" == \"recommended\" ]]; then\r\n echo -e \"dropping back to latest from recommended due to there not being a recommended version of forge for the mc version requested.\"\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"latest\"))')\r\n fi\r\n\r\n ## Error if the mc version set wasn't valid.\r\n if [ \"${VERSION_KEY}\" == \"\" ] || [ \"${VERSION_KEY}\" == \"null\" ]; then\r\n echo -e \"The install failed because there is no valid version of forge for the version of minecraft selected.\"\r\n exit 1\r\n fi\r\n\r\n FORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\n if [[ \"${MC_VERSION}\" == \"1.7.10\" ]] || [[ \"${MC_VERSION}\" == \"1.8.9\" ]]; then\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}.jar\r\n if [[ \"${MC_VERSION}\" == \"1.7.10\" ]]; then\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}-universal.jar\r\n fi\r\n else\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}.jar\r\n fi\r\nfi\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version ${FORGE_VERSION}\"\r\necho -e \"Download link is ${DOWNLOAD_LINK}\"\r\n\r\nif [[ ! -z \"${DOWNLOAD_LINK}\" ]]; then\r\n if curl -sSL --output \/dev\/null --head --fail ${DOWNLOAD_LINK}-installer.jar; then\r\n echo -e \"installer jar download link is valid.\"\r\n else\r\n echo -e \"link is invalid. Exiting now\"\r\n exit 2\r\n fi\r\nelse\r\n echo -e \"no download link provided. Exiting now\"\r\n exit 3\r\nfi\r\n\r\ncurl -sSL -o installer.jar ${DOWNLOAD_LINK}-installer.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [[ ! -f .\/installer.jar ]]; then\r\n echo \"!!! Error downloading forge version ${FORGE_VERSION} !!!\"\r\n exit\r\nfi\r\n\r\nfunction unix_args {\r\n echo -e \"Detected Forge 1.17 or newer version. Setting up forge unix args.\"\r\n ln -sf libraries\/net\/minecraftforge\/forge\/*\/unix_args.txt unix_args.txt\r\n}\r\n\r\n# Delete args to support downgrading\/upgrading\r\nrm -rf libraries\/net\/minecraftforge\/forge\r\nrm unix_args.txt\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer || { echo -e \"install failed using Forge version ${FORGE_VERSION} and Minecraft version ${MINECRAFT_VERSION}\"; exit 4; }\r\n\r\n# Check if we need a symlink for 1.17+ Forge JPMS args\r\nif [[ $MC_VERSION =~ ^1\\.(17|18|19|20|21|22|23) || $FORGE_VERSION =~ ^1\\.(17|18|19|20|21|22|23) ]]; then\r\n unix_args\r\n\r\n# Check if someone has set MC to latest but overwrote it with older Forge version, otherwise we would have false positives\r\nelif [[ $MC_VERSION == \"latest\" && $FORGE_VERSION =~ ^1\\.(17|18|19|20|21|22|23) ]]; then\r\n unix_args\r\nelse\r\n # For versions below 1.17 that ship with jar\r\n mv $FORGE_JAR $SERVER_JARFILE\r\nfi\r\n\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar", + "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nif [[ ! -d \/mnt\/server ]]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n# Remove spaces from the version number to avoid issues with curl\r\nFORGE_VERSION=\"$(echo \"$FORGE_VERSION\" | tr -d ' ')\"\r\nMC_VERSION=\"$(echo \"$MC_VERSION\" | tr -d ' ')\"\r\n\r\nif [[ ! -z ${FORGE_VERSION} ]]; then\r\n DOWNLOAD_LINK=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/${FORGE_VERSION}\/forge-${FORGE_VERSION}\r\n FORGE_JAR=forge-${FORGE_VERSION}*.jar\r\nelse\r\n JSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\n if [[ \"${MC_VERSION}\" == \"latest\" ]] || [[ \"${MC_VERSION}\" == \"\" ]]; then\r\n echo -e \"getting latest version of forge.\"\r\n MC_VERSION=$(echo -e ${JSON_DATA} | jq -r '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains(\"latest\")) | split(\"-\")[0]' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)\r\n BUILD_TYPE=latest\r\n fi\r\n\r\n if [[ \"${BUILD_TYPE}\" != \"recommended\" ]] && [[ \"${BUILD_TYPE}\" != \"latest\" ]]; then\r\n BUILD_TYPE=recommended\r\n fi\r\n\r\n echo -e \"minecraft version: ${MC_VERSION}\"\r\n echo -e \"build type: ${BUILD_TYPE}\"\r\n\r\n ## some variables for getting versions and things\r\n FILE_SITE=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n ## locating the forge version\r\n if [[ \"${VERSION_KEY}\" == \"\" ]] && [[ \"${BUILD_TYPE}\" == \"recommended\" ]]; then\r\n echo -e \"dropping back to latest from recommended due to there not being a recommended version of forge for the mc version requested.\"\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"latest\"))')\r\n fi\r\n\r\n ## Error if the mc version set wasn't valid.\r\n if [ \"${VERSION_KEY}\" == \"\" ] || [ \"${VERSION_KEY}\" == \"null\" ]; then\r\n echo -e \"The install failed because there is no valid version of forge for the version of minecraft selected.\"\r\n exit 1\r\n fi\r\n\r\n FORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\n if [[ \"${MC_VERSION}\" == \"1.7.10\" ]] || [[ \"${MC_VERSION}\" == \"1.8.9\" ]]; then\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}.jar\r\n if [[ \"${MC_VERSION}\" == \"1.7.10\" ]]; then\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}-universal.jar\r\n fi\r\n else\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}.jar\r\n fi\r\nfi\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version ${FORGE_VERSION}\"\r\necho -e \"Download link is ${DOWNLOAD_LINK}\"\r\n\r\nif [[ ! -z \"${DOWNLOAD_LINK}\" ]]; then\r\n if curl -sSL --output \/dev\/null --head --fail ${DOWNLOAD_LINK}-installer.jar; then\r\n echo -e \"installer jar download link is valid.\"\r\n else\r\n echo -e \"link is invalid. Exiting now\"\r\n exit 2\r\n fi\r\nelse\r\n echo -e \"no download link provided. Exiting now\"\r\n exit 3\r\nfi\r\n\r\ncurl -sSL -o installer.jar ${DOWNLOAD_LINK}-installer.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [[ ! -f .\/installer.jar ]]; then\r\n echo \"!!! Error downloading forge version ${FORGE_VERSION} !!!\"\r\n exit\r\nfi\r\n\r\nfunction unix_args {\r\n echo -e \"Detected Forge 1.17 or newer version. Setting up forge unix args.\"\r\n ln -sf libraries\/net\/minecraftforge\/forge\/*\/unix_args.txt unix_args.txt\r\n}\r\n\r\n# Delete args to support downgrading\/upgrading\r\nrm -rf libraries\/net\/minecraftforge\/forge\r\nrm unix_args.txt\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer || { echo -e \"install failed using Forge version ${FORGE_VERSION} and Minecraft version ${MINECRAFT_VERSION}\"; exit 4; }\r\n\r\n# Check if we need a symlink for 1.17+ Forge JPMS args\r\nif [[ $MC_VERSION =~ ^1\\.(17|18|19|20|21|22|23) || $FORGE_VERSION =~ ^1\\.(17|18|19|20|21|22|23) ]]; then\r\n unix_args\r\n\r\n# Check if someone has set MC to latest but overwrote it with older Forge version, otherwise we would have false positives\r\nelif [[ $MC_VERSION == \"latest\" && $FORGE_VERSION =~ ^1\\.(17|18|19|20|21|22|23) ]]; then\r\n unix_args\r\nelse\r\n # For versions below 1.17 that ship with jar\r\n mv $FORGE_JAR $SERVER_JARFILE\r\nfi\r\n\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar\r\n\r\necho \"-----------------------------------------\"\r\necho \"Installation completed...\"\r\necho \"-----------------------------------------\"", "container": "openjdk:8-jdk-slim", "entrypoint": "bash" } @@ -42,7 +42,8 @@ "default_value": "server.jar", "user_viewable": true, "user_editable": true, - "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" + "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/", + "field_type": "text" }, { "name": "Minecraft Version", @@ -51,7 +52,8 @@ "default_value": "latest", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:9" + "rules": "required|string|max:9", + "field_type": "text" }, { "name": "Build Type", @@ -60,7 +62,8 @@ "default_value": "recommended", "user_viewable": true, "user_editable": true, - "rules": "required|string|in:recommended,latest" + "rules": "required|string|in:recommended,latest", + "field_type": "text" }, { "name": "Forge Version", @@ -69,7 +72,8 @@ "default_value": "", "user_viewable": true, "user_editable": true, - "rules": "nullable|string|max:25" + "rules": "nullable|string|max:32", + "field_type": "text" } ] -} \ No newline at end of file +} From f94c6e4bbf07c841b9a3b24548574268568f644c Mon Sep 17 00:00:00 2001 From: MAXOUXAX <24844231+MAXOUXAX@users.noreply.github.com> Date: Mon, 31 Oct 2022 18:26:27 +0100 Subject: [PATCH 0678/1001] chore: changed exported_at property --- database/nosql/mongodb/egg-mongo-d-b6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/nosql/mongodb/egg-mongo-d-b6.json b/database/nosql/mongodb/egg-mongo-d-b6.json index b14c473a..96c8e9b7 100644 --- a/database/nosql/mongodb/egg-mongo-d-b6.json +++ b/database/nosql/mongodb/egg-mongo-d-b6.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-09-27T08:58:45-04:00", + "exported_at": "2022-10-31T17:26:13+00:00", "name": "MongoDB 6", "author": "parker@parkervcp.com", "description": "MongoDB is a general purpose, document-based, distributed database built for modern application developers and for my butt era.", From 33330cdff802cc7800eadaba58dae3e2f7440b0e Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Tue, 1 Nov 2022 13:42:11 +0100 Subject: [PATCH 0679/1001] link stock eggs to panel repo --- stock_eggs/minecraft/README.md | 11 ++ stock_eggs/minecraft/egg-bungeecord.json | 51 ------ stock_eggs/minecraft/egg-forge-minecraft.json | 67 -------- stock_eggs/minecraft/egg-paper.json | 69 -------- .../minecraft/egg-sponge--sponge-vanilla.json | 45 ----- .../minecraft/egg-vanilla-minecraft.json | 51 ------ stock_eggs/rust/README.md | 2 + stock_eggs/rust/egg-rust.json | 162 ------------------ stock_eggs/source-engine/README.md | 12 ++ .../egg-ark--survival-evolved.json | 117 ------------- ...egg-counter--strike--global-offensive.json | 54 ------ .../egg-custom-source-engine-game.json | 54 ------ stock_eggs/source-engine/egg-garrys-mod.json | 121 ------------- stock_eggs/source-engine/egg-insurgency.json | 54 ------ .../source-engine/egg-team-fortress2.json | 54 ------ stock_eggs/voice-servers/README.md | 3 + .../voice-servers/egg-mumble-server.json | 45 ----- .../voice-servers/egg-teamspeak3-server.json | 58 ------- 18 files changed, 28 insertions(+), 1002 deletions(-) delete mode 100644 stock_eggs/minecraft/egg-bungeecord.json delete mode 100644 stock_eggs/minecraft/egg-forge-minecraft.json delete mode 100644 stock_eggs/minecraft/egg-paper.json delete mode 100644 stock_eggs/minecraft/egg-sponge--sponge-vanilla.json delete mode 100644 stock_eggs/minecraft/egg-vanilla-minecraft.json delete mode 100644 stock_eggs/rust/egg-rust.json delete mode 100644 stock_eggs/source-engine/egg-ark--survival-evolved.json delete mode 100644 stock_eggs/source-engine/egg-counter--strike--global-offensive.json delete mode 100644 stock_eggs/source-engine/egg-custom-source-engine-game.json delete mode 100644 stock_eggs/source-engine/egg-garrys-mod.json delete mode 100644 stock_eggs/source-engine/egg-insurgency.json delete mode 100644 stock_eggs/source-engine/egg-team-fortress2.json delete mode 100644 stock_eggs/voice-servers/egg-mumble-server.json delete mode 100644 stock_eggs/voice-servers/egg-teamspeak3-server.json diff --git a/stock_eggs/minecraft/README.md b/stock_eggs/minecraft/README.md index f4a61dec..cb7eb8e2 100644 --- a/stock_eggs/minecraft/README.md +++ b/stock_eggs/minecraft/README.md @@ -2,6 +2,17 @@ All the default minecraft things +[Click here to download bungeecord](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/minecraft/egg-bungeecord.json) + +[Click here to download forge](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/minecraft/egg-forge-minecraft.json) + +[Click here to download paper](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/minecraft/egg-paper.json) + +[Click here to download sponge vanilla](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/minecraft/egg-sponge--sponge-vanilla.json) + +[Click here to download vanilla](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/minecraft/egg-vanilla-minecraft.json) + + ## Server Ports The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. diff --git a/stock_eggs/minecraft/egg-bungeecord.json b/stock_eggs/minecraft/egg-bungeecord.json deleted file mode 100644 index 370b3ec4..00000000 --- a/stock_eggs/minecraft/egg-bungeecord.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2021-11-29T23:22:26+00:00", - "name": "Bungeecord", - "author": "support@pterodactyl.io", - "description": "For a long time, Minecraft server owners have had a dream that encompasses a free, easy, and reliable way to connect multiple Minecraft servers together. BungeeCord is the answer to said dream. Whether you are a small server wishing to string multiple game-modes together, or the owner of the ShotBow Network, BungeeCord is the ideal solution for you. With the help of BungeeCord, you will be able to unlock your community's full potential.", - "image": "quay.io\/pterodactyl\/core:java", - "images": [ - "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_17" - ], - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", - "config": { - "files": "{\r\n \"config.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"listeners[0].query_enabled\": true,\r\n \"listeners[0].query_port\": \"{{server.build.default.port}}\",\r\n \"listeners[0].host\": \"0.0.0.0:{{server.build.default.port}}\",\r\n \"servers.*.address\": {\r\n \"regex:^(127\\\\.0\\\\.0\\\\.1|localhost)(:\\\\d{1,5})?$\": \"{{config.docker.interface}}$2\"\r\n }\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Listening on \",\r\n \"userInteraction\": [\r\n \"Listening on \/0.0.0.0:25577\"\r\n ]\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"proxy.log.0\"\r\n}", - "stop": "end" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n# Bungeecord Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl\r\n\r\ncd \/mnt\/server\r\n\r\nif [ -z \"${BUNGEE_VERSION}\" ] || [ \"${BUNGEE_VERSION}\" == \"latest\" ]; then\r\n BUNGEE_VERSION=\"lastStableBuild\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/ci.md-5.net\/job\/BungeeCord\/${BUNGEE_VERSION}\/artifact\/bootstrap\/target\/BungeeCord.jar", - "container": "debian:buster-slim", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Bungeecord Version", - "description": "The version of Bungeecord to download and use.", - "env_variable": "BUNGEE_VERSION", - "default_value": "latest", - "user_viewable": true, - "user_editable": true, - "rules": "required|alpha_num|between:1,6" - }, - { - "name": "Bungeecord Jar File", - "description": "The name of the Jarfile to use when running Bungeecord.", - "env_variable": "SERVER_JARFILE", - "default_value": "bungeecord.jar", - "user_viewable": true, - "user_editable": true, - "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" - } - ] -} diff --git a/stock_eggs/minecraft/egg-forge-minecraft.json b/stock_eggs/minecraft/egg-forge-minecraft.json deleted file mode 100644 index f547310d..00000000 --- a/stock_eggs/minecraft/egg-forge-minecraft.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2020-10-19T23:22:28+00:00", - "name": "Forge Minecraft", - "author": "support@pterodactyl.io", - "description": "Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.", - "image": "quay.io\/pterodactyl\/core:java", - "images": [ - "quay.io\/pterodactyl\/core:java", - "quay.io\/pterodactyl\/core:java-11" - ], - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", - "config": { - "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"enable-query\": \"true\",\r\n \"server-port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \")! For help, type \",\r\n \"userInteraction\": [\r\n \"Go to eula.txt for more info.\"\r\n ]\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", - "stop": "stop" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\n#Go into main direction\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\nif [ ! -z ${FORGE_VERSION} ]; then\r\n DOWNLOAD_LINK=https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/${FORGE_VERSION}\/forge-${FORGE_VERSION}\r\nelse\r\n JSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\n if [ \"${MC_VERSION}\" == \"latest\" ] || [ \"${MC_VERSION}\" == \"\" ] ; then\r\n echo -e \"getting latest recommended version of forge.\"\r\n MC_VERSION=$(echo -e ${JSON_DATA} | jq -r '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains(\"recommended\")) | split(\"-\")[0]' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)\r\n \tBUILD_TYPE=recommended\r\n fi\r\n\r\n if [ \"${BUILD_TYPE}\" != \"recommended\" ] && [ \"${BUILD_TYPE}\" != \"latest\" ]; then\r\n BUILD_TYPE=recommended\r\n fi\r\n\r\n echo -e \"minecraft version: ${MC_VERSION}\"\r\n echo -e \"build type: ${BUILD_TYPE}\"\r\n\r\n ## some variables for getting versions and things\r\n FILE_SITE=$(echo -e ${JSON_DATA} | jq -r '.homepage' | sed \"s\/http:\/https:\/g\")\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n ## locating the forge version\r\n if [ \"${VERSION_KEY}\" == \"\" ] && [ \"${BUILD_TYPE}\" == \"recommended\" ]; then\r\n echo -e \"dropping back to latest from recommended due to there not being a recommended version of forge for the mc version requested.\"\r\n VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"recommended\"))')\r\n fi\r\n\r\n ## Error if the mc version set wasn't valid.\r\n if [ \"${VERSION_KEY}\" == \"\" ] || [ \"${VERSION_KEY}\" == \"null\" ]; then\r\n \techo -e \"The install failed because there is no valid version of forge for the version on minecraft selected.\"\r\n \texit 1\r\n fi\r\n\r\n FORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\n if [ \"${MC_VERSION}\" == \"1.7.10\" ] || [ \"${MC_VERSION}\" == \"1.8.9\" ]; then\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}.jar\r\n if [ \"${MC_VERSION}\" == \"1.7.10\" ]; then\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}-universal.jar\r\n fi\r\n else\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\n FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}.jar\r\n fi\r\nfi\r\n\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version ${FORGE_VERSION}\"\r\necho -e \"Download link is ${DOWNLOAD_LINK}\"\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-installer.jar; then\r\n echo -e \"installer jar download link is valid.\"\r\n else\r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nelse\r\n echo -e \"no download link closing out\"\r\n exit 3\r\nfi\r\n\r\ncurl -s -o installer.jar -sS ${DOWNLOAD_LINK}-installer.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ]; then\r\n echo \"!!! Error by downloading forge version ${FORGE_VERSION} !!!\"\r\n exit\r\nfi\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n\r\nmv $FORGE_JAR $SERVER_JARFILE\r\n\r\n#Deleting installer.jar\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar", - "container": "openjdk:8-jdk-slim", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Server Jar File", - "description": "The name of the Jarfile to use when running Forge Mod.", - "env_variable": "SERVER_JARFILE", - "default_value": "server.jar", - "user_viewable": true, - "user_editable": true, - "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" - }, - { - "name": "Forge version", - "description": "The version of minecraft you want to install for.\r\n\r\nLeaving latest will install the latest recommended version.", - "env_variable": "MC_VERSION", - "default_value": "latest", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:9" - }, - { - "name": "Build Type", - "description": "The type of server jar to download from forge.\r\n\r\nValid types are \"recommended\" and \"latest\".", - "env_variable": "BUILD_TYPE", - "default_value": "recommended", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:20" - }, - { - "name": "Forge Version", - "description": "Gets an exact version.\r\n\r\nEx. 1.15.2-31.2.4\r\n\r\nOverrides MC_VERSION and BUILD_TYPE. If it fails to download the server files it will fail to install.", - "env_variable": "FORGE_VERSION", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:20" - } - ] -} \ No newline at end of file diff --git a/stock_eggs/minecraft/egg-paper.json b/stock_eggs/minecraft/egg-paper.json deleted file mode 100644 index 7c310fbc..00000000 --- a/stock_eggs/minecraft/egg-paper.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2021-11-29T23:26:07+00:00", - "name": "Paper", - "author": "parker@pterodactyl.io", - "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", - "image": "quay.io\/pterodactyl\/core:java-11", - "images": [ - "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_17" - ], - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", - "config": { - "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \")! For help, type \",\r\n \"userInteraction\": [\r\n \"Go to eula.txt for more info.\"\r\n ]\r\n}", - "logs": "{}", - "stop": "stop" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n echo -e \"using supplied download url\"\r\n DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n VER_EXISTS=`curl -s https:\/\/papermc.io\/api\/v1\/paper | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | IN($VERSION)' | grep true`\r\n LATEST_PAPER_VERSION=`curl -s https:\/\/papermc.io\/api\/v1\/paper | jq -r '.versions' | jq -r '.[0]'`\r\n \r\n if [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n else\r\n echo -e \"Using the latest paper version\"\r\n MINECRAFT_VERSION=${LATEST_PAPER_VERSION}\r\n fi\r\n \r\n BUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v1\/paper\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all[] | IN($BUILD)' | grep true`\r\n LATEST_PAPER_BUILD=`curl -s https:\/\/papermc.io\/api\/v1\/paper\/${MINECRAFT_VERSION} | jq -r '.builds.latest'`\r\n \r\n if [ \"${BUILD_EXISTS}\" == \"true\" ] || [ ${BUILD_NUMBER} == \"latest\" ]; then\r\n echo -e \"Build is valid. Using version ${BUILD_NUMBER}\"\r\n else\r\n echo -e \"Using the latest paper build\"\r\n BUILD_NUMBER=${LATEST_PAPER_BUILD}\r\n fi\r\n \r\n echo \"Version being downloaded\"\r\n echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n echo -e \"Build: ${BUILD_NUMBER}\"\r\n DOWNLOAD_URL=https:\/\/papermc.io\/api\/v1\/paper\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download \r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n mv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"Downloading MC server.properties\"\r\n curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", - "container": "debian:buster-slim", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Minecraft Version", - "description": "The version of minecraft to download. \r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.", - "env_variable": "MINECRAFT_VERSION", - "default_value": "latest", - "user_viewable": true, - "user_editable": false, - "rules": "nullable|string|max:20" - }, - { - "name": "Server Jar File", - "description": "The name of the server jarfile to run the server with.", - "env_variable": "SERVER_JARFILE", - "default_value": "server.jar", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:20" - }, - { - "name": "Download Path", - "description": "A URL to use to download a server.jar rather than the ones in the install script. This is not user viewable.", - "env_variable": "DL_PATH", - "default_value": "", - "user_viewable": false, - "user_editable": false, - "rules": "nullable|string" - }, - { - "name": "Build Number", - "description": "The build number for the paper release.\r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.", - "env_variable": "BUILD_NUMBER", - "default_value": "latest", - "user_viewable": true, - "user_editable": false, - "rules": "required|string|max:20" - } - ] -} diff --git a/stock_eggs/minecraft/egg-sponge--sponge-vanilla.json b/stock_eggs/minecraft/egg-sponge--sponge-vanilla.json deleted file mode 100644 index cf1a9396..00000000 --- a/stock_eggs/minecraft/egg-sponge--sponge-vanilla.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2020-10-19T23:26:54+00:00", - "name": "Sponge (SpongeVanilla)", - "author": "support@pterodactyl.io", - "description": "SpongeVanilla is the SpongeAPI implementation for Vanilla Minecraft.", - "image": "quay.io\/pterodactyl\/core:java-glibc", - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", - "config": { - "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"enable-query\": \"true\",\r\n \"server-port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \")! For help, type \",\r\n \"userInteraction\": [\r\n \"Go to eula.txt for more info.\"\r\n ]\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", - "stop": "stop" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n# Sponge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt update\r\napt install -y curl\r\n\r\ncd \/mnt\/server\r\n\r\ncurl -sSL \"https:\/\/repo.spongepowered.org\/maven\/org\/spongepowered\/spongevanilla\/${SPONGE_VERSION}\/spongevanilla-${SPONGE_VERSION}.jar\" -o ${SERVER_JARFILE}", - "container": "debian:buster-slim", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Sponge Version", - "description": "The version of SpongeVanilla to download and use.", - "env_variable": "SPONGE_VERSION", - "default_value": "1.11.2-6.1.0-BETA-21", - "user_viewable": true, - "user_editable": false, - "rules": "required|regex:\/^([a-zA-Z0-9.\\-_]+)$\/" - }, - { - "name": "Server Jar File", - "description": "The name of the Jarfile to use when running SpongeVanilla.", - "env_variable": "SERVER_JARFILE", - "default_value": "server.jar", - "user_viewable": true, - "user_editable": true, - "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" - } - ] -} \ No newline at end of file diff --git a/stock_eggs/minecraft/egg-vanilla-minecraft.json b/stock_eggs/minecraft/egg-vanilla-minecraft.json deleted file mode 100644 index 61643ad3..00000000 --- a/stock_eggs/minecraft/egg-vanilla-minecraft.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2021-11-29T23:04:17+00:00", - "name": "Vanilla Minecraft", - "author": "support@pterodactyl.io", - "description": "Minecraft is a game about placing blocks and going on adventures. Explore randomly generated worlds and build amazing things from the simplest of homes to the grandest of castles. Play in Creative Mode with unlimited resources or mine deep in Survival Mode, crafting weapons and armor to fend off dangerous mobs. Do all this alone or with friends.", - "image": "quay.io\/pterodactyl\/core:java", - "images": [ - "ghcr.io\/pterodactyl\/yolks:java_8", - "ghcr.io\/pterodactyl\/yolks:java_11", - "ghcr.io\/pterodactyl\/yolks:java_16", - "ghcr.io\/pterodactyl\/yolks:java_17" - ], - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", - "config": { - "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"enable-query\": \"true\",\r\n \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \")! For help, type \",\r\n \"userInteraction\": [\r\n \"Go to eula.txt for more info.\"\r\n ]\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", - "stop": "stop" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n# Vanilla MC Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y jq curl\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nLATEST_VERSION=`curl https:\/\/launchermeta.mojang.com\/mc\/game\/version_manifest.json | jq -r '.latest.release'`\r\n\r\necho -e \"latest version is $LATEST_VERSION\"\r\n\r\nif [ -z \"$VANILLA_VERSION\" ] || [ \"$VANILLA_VERSION\" == \"latest\" ]; then\r\n MANIFEST_URL=$(curl -sSL https:\/\/launchermeta.mojang.com\/mc\/game\/version_manifest.json | jq --arg VERSION $LATEST_VERSION -r '.versions | .[] | select(.id== $VERSION )|.url')\r\nelse\r\n MANIFEST_URL=$(curl -sSL https:\/\/launchermeta.mojang.com\/mc\/game\/version_manifest.json | jq --arg VERSION $VANILLA_VERSION -r '.versions | .[] | select(.id== $VERSION )|.url')\r\nfi\r\n\r\nDOWNLOAD_URL=$(curl ${MANIFEST_URL} | jq .downloads.server | jq -r '. | .url')\r\n\r\necho -e \"running: curl -o ${SERVER_JARFILE} $DOWNLOAD_URL\"\r\ncurl -o ${SERVER_JARFILE} $DOWNLOAD_URL\r\n\r\necho -e \"Install Complete\"", - "container": "debian:buster-slim", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Server Jar File", - "description": "The name of the server jarfile to run the server with.", - "env_variable": "SERVER_JARFILE", - "default_value": "server.jar", - "user_viewable": true, - "user_editable": true, - "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" - }, - { - "name": "Server Version", - "description": "The version of Minecraft Vanilla to install. Use \"latest\" to install the latest version.", - "env_variable": "VANILLA_VERSION", - "default_value": "latest", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|between:3,15" - } - ] -} diff --git a/stock_eggs/rust/README.md b/stock_eggs/rust/README.md index 57ad10ea..9e7a6de4 100644 --- a/stock_eggs/rust/README.md +++ b/stock_eggs/rust/README.md @@ -1,5 +1,7 @@ # Rust +[Click here to download](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/rust/egg-rust.json) + The only aim in Rust is to survive. To do this you will need to overcome struggles such as hunger, thirst and cold. Build a fire. Build a shelter. Kill animals for meat. Protect yourself from other players, and kill them for meat. Create alliances with other players and form a town. Do whatever it takes to survive. ## Minimum RAM warning diff --git a/stock_eggs/rust/egg-rust.json b/stock_eggs/rust/egg-rust.json deleted file mode 100644 index 67e7f046..00000000 --- a/stock_eggs/rust/egg-rust.json +++ /dev/null @@ -1,162 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2020-10-20T00:03:09+00:00", - "name": "Rust", - "author": "support@pterodactyl.io", - "description": "The only aim in Rust is to survive. To do this you will need to overcome struggles such as hunger, thirst and cold. Build a fire. Build a shelter. Kill animals for meat. Protect yourself from other players, and kill them for meat. Create alliances with other players and form a town. Do whatever it takes to survive.", - "image": "quay.io\/pterodactyl\/core:rust", - "startup": ".\/RustDedicated -batchmode +server.port {{SERVER_PORT}} +server.identity \"rust\" +rcon.port {{RCON_PORT}} +rcon.web true +server.hostname \\\"{{HOSTNAME}}\\\" +server.level \\\"{{LEVEL}}\\\" +server.description \\\"{{DESCRIPTION}}\\\" +server.url \\\"{{SERVER_URL}}\\\" +server.headerimage \\\"{{SERVER_IMG}}\\\" +server.logoimage \\\"{{SERVER_LOGO}}\\\" +server.worldsize \\\"{{WORLD_SIZE}}\\\" +server.seed \\\"{{WORLD_SEED}}\\\" +server.maxplayers {{MAX_PLAYERS}} +rcon.password \\\"{{RCON_PASS}}\\\" +server.saveinterval {{SAVEINTERVAL}} +app.port {{APP_PORT}}{{ADDITIONAL_ARGS}}", - "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"Server startup complete\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"latest.log\"\r\n}", - "stop": "quit" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\nSRCDS_APPID=258550\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", - "container": "debian:buster-slim", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Server Name", - "description": "The name of your server in the public server list.", - "env_variable": "HOSTNAME", - "default_value": "A Rust Server", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:40" - }, - { - "name": "OxideMod", - "description": "Set whether you want the server to use and auto update OxideMod or not. Valid options are \"1\" for true and \"0\" for false.", - "env_variable": "OXIDE", - "default_value": "0", - "user_viewable": true, - "user_editable": true, - "rules": "required|boolean" - }, - { - "name": "Level", - "description": "The world file for Rust to use.", - "env_variable": "LEVEL", - "default_value": "Procedural Map", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:20" - }, - { - "name": "Description", - "description": "The description under your server title. Commonly used for rules & info. Use \\n for newlines.", - "env_variable": "DESCRIPTION", - "default_value": "Powered by Pterodactyl", - "user_viewable": true, - "user_editable": true, - "rules": "required|string" - }, - { - "name": "URL", - "description": "The URL for your server. This is what comes up when clicking the \"Visit Website\" button.", - "env_variable": "SERVER_URL", - "default_value": "http:\/\/pterodactyl.io", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|url" - }, - { - "name": "World Size", - "description": "The world size for a procedural map.", - "env_variable": "WORLD_SIZE", - "default_value": "3000", - "user_viewable": true, - "user_editable": true, - "rules": "required|integer" - }, - { - "name": "World Seed", - "description": "The seed for a procedural map.", - "env_variable": "WORLD_SEED", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|string" - }, - { - "name": "Max Players", - "description": "The maximum amount of players allowed in the server at once.", - "env_variable": "MAX_PLAYERS", - "default_value": "40", - "user_viewable": true, - "user_editable": true, - "rules": "required|integer" - }, - { - "name": "Server Image", - "description": "The header image for the top of your server listing.", - "env_variable": "SERVER_IMG", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|url" - }, - { - "name": "Server Logo", - "description": "The circular server logo for the Rust+ app.", - "env_variable": "SERVER_LOGO", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|url" - }, - { - "name": "RCON Port", - "description": "Port for RCON connections.", - "env_variable": "RCON_PORT", - "default_value": "28016", - "user_viewable": true, - "user_editable": false, - "rules": "required|integer" - }, - { - "name": "RCON Password", - "description": "RCON access password.", - "env_variable": "RCON_PASS", - "default_value": "CHANGEME", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:64" - }, - { - "name": "Save Interval", - "description": "Sets the server\u2019s auto-save interval in seconds.", - "env_variable": "SAVEINTERVAL", - "default_value": "60", - "user_viewable": true, - "user_editable": true, - "rules": "required|integer" - }, - { - "name": "Additional Arguments", - "description": "Add additional startup parameters to the server.", - "env_variable": "ADDITIONAL_ARGS", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|string" - }, - { - "name": "App Port", - "description": "Port for the Rust+ App. -1 to disable.", - "env_variable": "APP_PORT", - "default_value": "28082", - "user_viewable": true, - "user_editable": false, - "rules": "required|integer" - } - ] -} diff --git a/stock_eggs/source-engine/README.md b/stock_eggs/source-engine/README.md index 40bc2803..ee07b6b6 100644 --- a/stock_eggs/source-engine/README.md +++ b/stock_eggs/source-engine/README.md @@ -11,6 +11,8 @@ The default steam query port is 27015 ## ARK Survival Evolved +[Click here to download](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/source-engine/egg-ark--survival-evolved.json) + ### Port Requirements The ARK server requires 4 ports minimum. @@ -26,6 +28,8 @@ Please note the server may not show up on steam game server lists due to this re ## Counter Strike: Global Offensive +[Click here to download](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/source-engine/egg-counter--strike--global-offensive.json) + Counter-Strike: Global Offensive (CS: GO) expands upon the team-based action gameplay that it pioneered when it was launched 19 years ago. CS: GO features new maps, characters, weapons, and game modes, and delivers updated versions of the classic CS content (de_dust2, etc.). ### Port Requirements @@ -36,6 +40,8 @@ Counter-Strike: Global Offensive (CS: GO) expands upon the team-based action gam ## Custom Source Engine Game +[Click here to download](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/source-engine/egg-custom-source-engine-game.json) + This is a generic one size fit's all egg that supports srcds game servers. This is not for games like Counter Strike 1.6 which is an HLDS title. See [HLDS server](game_eggs/steamcmd_servers/hlds_server) @@ -48,6 +54,8 @@ This is not for games like Counter Strike 1.6 which is an HLDS title. See [HLDS ## Garry's Mod +[Click here to download](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/source-engine/egg-garrys-mod.json) + Garry's Mod is a physics sandbox. There aren't any predefined aims or goals. We give you the tools and leave you to play. ### Port Requirements @@ -58,6 +66,8 @@ Garry's Mod is a physics sandbox. There aren't any predefined aims or goals. We ## Insurgency +[Click here to download](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/source-engine/egg-insurgency.json) + Take to the streets for intense close quarters combat, where a team's survival depends upon securing crucial strongholds and destroying enemy supply in this multiplayer and cooperative Source Engine based experience. ### Port Requirements @@ -68,6 +78,8 @@ Take to the streets for intense close quarters combat, where a team's survival d ## Team Fortress 2 +[Click here to download](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/source-engine/egg-team-fortress2.json) + Nine distinct classes provide a broad range of tactical abilities and personalities. Constantly updated with new game modes, maps, equipment and, most importantly, hats! ### Port Requirements diff --git a/stock_eggs/source-engine/egg-ark--survival-evolved.json b/stock_eggs/source-engine/egg-ark--survival-evolved.json deleted file mode 100644 index 627a384a..00000000 --- a/stock_eggs/source-engine/egg-ark--survival-evolved.json +++ /dev/null @@ -1,117 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2020-10-19T23:29:06+00:00", - "name": "Ark: Survival Evolved", - "author": "dev@shepper.fr", - "description": "As a man or woman stranded, naked, freezing, and starving on the unforgiving shores of a mysterious island called ARK, use your skill and cunning to kill or tame and ride the plethora of leviathan dinosaurs and other primeval creatures roaming the land. Hunt, harvest resources, craft items, grow crops, research technologies, and build shelters to withstand the elements and store valuables, all while teaming up with (or preying upon) hundreds of other players to survive, dominate... and escape! \u2014 Gamepedia: ARK", - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_source", - "startup": "rmv() { echo -e \"stoppping server\"; rcon -a 127.0.0.1:${RCON_PORT} -p ${ARK_ADMIN_PASSWORD} -c saveworld && rcon -a 127.0.0.1:${RCON_PORT} -p ${ARK_ADMIN_PASSWORD} -c DoExit; }; trap rmv 15; cd ShooterGame\/Binaries\/Linux && .\/ShooterGameServer {{SERVER_MAP}}?listen?SessionName=\"{{SESSION_NAME}}\"?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?Port={{SERVER_PORT}}?RCONPort={{RCON_PORT}}?QueryPort={{QUERY_PORT}}?RCONEnabled={{ENABLE_RCON}}$( [ \"$BATTLE_EYE\" == \"0\" ] || printf %s '?-NoBattlEye' ) -server -log & until echo \"waiting for rcon connection...\"; rcon -a 127.0.0.1:${RCON_PORT} -p ${ARK_ADMIN_PASSWORD}; do sleep 5; done", - "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"Waiting commands for 127.0.0.1:\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", - "stop": "^C" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends --no-install-suggests install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\n\r\nmkdir -p \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\n\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## create a symbolic link for loading mods\r\ncd \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\nln -sf ..\/..\/..\/..\/..\/Steam\/steamapps steamapps\r\ncd \/mnt\/server", - "container": "debian:buster-slim", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Server Password", - "description": "If specified, players must provide this password to join the server.", - "env_variable": "ARK_PASSWORD", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|alpha_dash|between:1,100" - }, - { - "name": "Admin Password", - "description": "If specified, players must provide this password (via the in-game console) to gain access to administrator commands on the server.", - "env_variable": "ARK_ADMIN_PASSWORD", - "default_value": "PleaseChangeMe", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|alpha_dash|between:1,100" - }, - { - "name": "Server Map", - "description": "Available Maps: TheIsland, TheCenter, Ragnarok, ScorchedEarth_P, Aberration_P, Extinction, Valguero_P, Genesis", - "env_variable": "SERVER_MAP", - "default_value": "TheIsland", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:20" - }, - { - "name": "App ID", - "description": "ARK steam app id for auto updates. Leave blank to avoid auto update.", - "env_variable": "SRCDS_APPID", - "default_value": "376030", - "user_viewable": true, - "user_editable": false, - "rules": "nullable|numeric" - }, - { - "name": "Server Name", - "description": "ARK server name", - "env_variable": "SESSION_NAME", - "default_value": "A Pterodactyl Hosted ARK Server", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:128" - }, - { - "name": "Use Rcon", - "description": "Enable or disable rcon system. (true or false)\r\n\r\nDefault True for the console to work.", - "env_variable": "ENABLE_RCON", - "default_value": "True", - "user_viewable": true, - "user_editable": false, - "rules": "required|string|in:True,False" - }, - { - "name": "Rcon Port", - "description": "ARK rcon port used by rcon tools.", - "env_variable": "RCON_PORT", - "default_value": "27020", - "user_viewable": true, - "user_editable": true, - "rules": "required|numeric" - }, - { - "name": "Query Port", - "description": "ARK query port used by steam server browser and ark client server browser.", - "env_variable": "QUERY_PORT", - "default_value": "27015", - "user_viewable": true, - "user_editable": true, - "rules": "required|numeric" - }, - { - "name": "Auto-update server", - "description": "This is to enable auto-updating for servers.\r\n\r\nDefault is 0. Set to 1 to update", - "env_variable": "AUTO_UPDATE", - "default_value": "0", - "user_viewable": true, - "user_editable": true, - "rules": "required|boolean" - }, - { - "name": "Ballte Eye", - "description": "Enable BattleEye\r\n\r\n0 to disable\r\n1 to enable\r\n\r\ndefault=\"1\"", - "env_variable": "BATTLE_EYE", - "default_value": "1", - "user_viewable": true, - "user_editable": true, - "rules": "required|boolean" - } - ] -} \ No newline at end of file diff --git a/stock_eggs/source-engine/egg-counter--strike--global-offensive.json b/stock_eggs/source-engine/egg-counter--strike--global-offensive.json deleted file mode 100644 index b093aa79..00000000 --- a/stock_eggs/source-engine/egg-counter--strike--global-offensive.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2020-10-19T23:29:57+00:00", - "name": "Counter-Strike: Global Offensive", - "author": "support@pterodactyl.io", - "description": "Counter-Strike: Global Offensive is a multiplayer first-person shooter video game developed by Hidden Path Entertainment and Valve Corporation.", - "image": "quay.io\/pterodactyl\/core:source", - "startup": ".\/srcds_run -game csgo -console -port {{SERVER_PORT}} +ip 0.0.0.0 +map {{SRCDS_MAP}} -strictportbind -norestart +sv_setsteamaccount {{STEAM_ACC}}", - "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"Connection to Steam servers successful\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", - "stop": "quit" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", - "container": "ubuntu:18.04", - "entrypoint": "bash" - } - }, - "variables": [ - { - "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": "Steam Account Token", - "description": "The Steam Account Token required for the server to be displayed publicly.", - "env_variable": "STEAM_ACC", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|alpha_num|size:32" - }, - { - "name": "Source AppID", - "description": "Required for game to update on server restart. Do not modify this.", - "env_variable": "SRCDS_APPID", - "default_value": "740", - "user_viewable": false, - "user_editable": false, - "rules": "required|string|max:20" - } - ] -} \ No newline at end of file diff --git a/stock_eggs/source-engine/egg-custom-source-engine-game.json b/stock_eggs/source-engine/egg-custom-source-engine-game.json deleted file mode 100644 index fd6fe014..00000000 --- a/stock_eggs/source-engine/egg-custom-source-engine-game.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2020-10-19T23:33:52+00:00", - "name": "Custom Source Engine Game", - "author": "support@pterodactyl.io", - "description": "This option allows modifying the startup arguments and other details to run a custom SRCDS based game on the panel.", - "image": "quay.io\/pterodactyl\/core:source", - "startup": ".\/srcds_run -game {{SRCDS_GAME}} -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart", - "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"gameserver Steam ID\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", - "stop": "quit" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id ffound here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# EXTRA_FLAGS - when a server has extra glas for things like beta installs or updates.\r\n#\r\n##\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", - "container": "debian:buster-slim", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Game ID", - "description": "The ID corresponding to the game to download and run using SRCDS.", - "env_variable": "SRCDS_APPID", - "default_value": "", - "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 SRCDS.", - "env_variable": "SRCDS_GAME", - "default_value": "", - "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": "", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|alpha_dash" - } - ] -} \ No newline at end of file diff --git a/stock_eggs/source-engine/egg-garrys-mod.json b/stock_eggs/source-engine/egg-garrys-mod.json deleted file mode 100644 index 8ff1c43c..00000000 --- a/stock_eggs/source-engine/egg-garrys-mod.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1", - "update_url": null - }, - "exported_at": "2021-09-13T01:38:39+02:00", - "name": "Garrys Mod", - "author": "support@pterodactyl.io", - "description": "Garrys Mod, is a sandbox physics game created by Garry Newman, and developed by his company, Facepunch Studios.", - "features": null, - "images": [ - "ghcr.io\/pterodactyl\/games:source" - ], - "file_denylist": [], - "startup": ".\/srcds_run -game garrysmod -console -port {{SERVER_PORT}} +ip 0.0.0.0 +host_workshop_collection {{WORKSHOP_ID}} +map {{SRCDS_MAP}} +gamemode {{GAMEMODE}} -strictportbind -norestart +sv_setsteamaccount {{STEAM_ACC}} +maxplayers {{MAX_PLAYERS}} -tickrate {{TICKRATE}} $( [ \"$LUA_REFRESH\" == \"1\" ] || printf %s '-disableluarefresh' )", - "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"gameserver Steam ID\"\r\n}", - "logs": "{}", - "stop": "quit" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} -beta ${SRCDS_BETAID} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n# Creating needed default files for the game\r\ncd \/mnt\/server\/garrysmod\/lua\/autorun\/server\r\necho '\r\n-- Docs: https:\/\/wiki.garrysmod.com\/page\/resource\/AddWorkshop\r\n-- Place the ID of the workshop addon you want to be downloaded to people who join your server, not the collection ID\r\n-- Use https:\/\/beta.configcreator.com\/create\/gmod\/resources.lua to easily create a list based on your collection ID\r\n\r\nresource.AddWorkshop( \"\" )\r\n' > workshop.lua\r\n\r\ncd \/mnt\/server\/garrysmod\/cfg\r\necho '\r\n\/\/ Please do not set RCon in here, use the startup parameters.\r\n\r\nhostname\t\t\"New Gmod Server\"\r\nsv_password\t\t\"\"\r\nsv_loadingurl \"\"\r\nsv_downloadurl \"\"\r\n\r\n\/\/ Steam Server List Settings\r\n\/\/ sv_location \"eu\"\r\nsv_region \"255\"\r\nsv_lan \"0\"\r\nsv_max_queries_sec_global \"30000\"\r\nsv_max_queries_window \"45\"\r\nsv_max_queries_sec \"5\"\r\n\r\n\/\/ Server Limits\r\nsbox_maxprops\t\t100\r\nsbox_maxragdolls\t5\r\nsbox_maxnpcs\t\t10\r\nsbox_maxballoons\t10\r\nsbox_maxeffects\t\t10\r\nsbox_maxdynamite\t10\r\nsbox_maxlamps\t\t10\r\nsbox_maxthrusters\t10\r\nsbox_maxwheels\t\t10\r\nsbox_maxhoverballs\t10\r\nsbox_maxvehicles\t20\r\nsbox_maxbuttons\t\t10\r\nsbox_maxsents\t\t20\r\nsbox_maxemitters\t5\r\nsbox_godmode\t\t0\r\nsbox_noclip\t\t 0\r\n\r\n\/\/ Network Settings - Please keep these set to default.\r\n\r\nsv_minrate\t\t75000\r\nsv_maxrate\t\t0\r\ngmod_physiterations\t2\r\nnet_splitpacket_maxrate\t45000\r\ndecalfrequency\t\t12 \r\n\r\n\/\/ Execute Ban Files - Please do not edit\r\nexec banned_ip.cfg \r\nexec banned_user.cfg \r\n\r\n\/\/ Add custom lines under here\r\n' > server.cfg", - "container": "ghcr.io\/pterodactyl\/installers:debian", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Map", - "description": "The default map for the server.", - "env_variable": "SRCDS_MAP", - "default_value": "gm_flatgrass", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|alpha_dash" - }, - { - "name": "Steam Account Token", - "description": "The Steam Account Token required for the server to be displayed publicly.", - "env_variable": "STEAM_ACC", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|string|alpha_num|size:32" - }, - { - "name": "Source AppID", - "description": "Required for game to update on server restart. Do not modify this.", - "env_variable": "SRCDS_APPID", - "default_value": "4020", - "user_viewable": false, - "user_editable": false, - "rules": "required|string|max:20" - }, - { - "name": "Workshop ID", - "description": "The ID of your workshop collection (the numbers at the end of the URL)", - "env_variable": "WORKSHOP_ID", - "default_value": "", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|integer" - }, - { - "name": "Gamemode", - "description": "The gamemode of your server.", - "env_variable": "GAMEMODE", - "default_value": "sandbox", - "user_viewable": true, - "user_editable": true, - "rules": "required|string" - }, - { - "name": "Max Players", - "description": "The maximum amount of players allowed on your game server.", - "env_variable": "MAX_PLAYERS", - "default_value": "32", - "user_viewable": true, - "user_editable": true, - "rules": "required|integer|max:128" - }, - { - "name": "Tickrate", - "description": "The tickrate defines how fast the server will update each entities location.", - "env_variable": "TICKRATE", - "default_value": "22", - "user_viewable": true, - "user_editable": true, - "rules": "required|integer|max:100" - }, - { - "name": "Lua Refresh", - "description": "0 = disable Lua refresh,\r\n1 = enable Lua refresh", - "env_variable": "LUA_REFRESH", - "default_value": "0", - "user_viewable": true, - "user_editable": true, - "rules": "required|boolean" - }, - { - "name": "Beta", - "description": "Determines which server version should be used. | NONE = stable release | x86-64 = 64Bit beta.", - "env_variable": "SRCDS_BETAID", - "default_value": "NONE", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:10" - }, - { - "name": "Validate Serverfiles", - "description": "Should be enabled once after changing the server version.\r\n0 = disable validating serverfiles,\r\n1 = enable validating serverfiles", - "env_variable": "VALIDATE", - "default_value": "0", - "user_viewable": true, - "user_editable": true, - "rules": "required|boolean" - } ] -} diff --git a/stock_eggs/source-engine/egg-insurgency.json b/stock_eggs/source-engine/egg-insurgency.json deleted file mode 100644 index 2d078334..00000000 --- a/stock_eggs/source-engine/egg-insurgency.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2020-10-27T02:39:14+00:00", - "name": "Insurgency", - "author": "support@pterodactyl.io", - "description": "Take to the streets for intense close quarters combat, where a team's survival depends upon securing crucial strongholds and destroying enemy supply in this multiplayer and cooperative Source Engine based experience.", - "image": "quay.io\/pterodactyl\/core:source", - "startup": ".\/srcds_run -game {{SRCDS_GAME}} -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart -workshop -secure", - "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"gameserver Steam ID\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", - "stop": "quit" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id ffound here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# EXTRA_FLAGS - when a server has extra glas for things like beta installs or updates.\r\n#\r\n##\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", - "container": "debian:buster-slim", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Game ID", - "description": "The ID corresponding to the game to download and run using SRCDS.", - "env_variable": "SRCDS_APPID", - "default_value": "237410", - "user_viewable": true, - "user_editable": false, - "rules": "required|regex:\/^(237410)$\/" - }, - { - "name": "Game Name", - "description": "The name corresponding to the game to download and run using SRCDS.", - "env_variable": "SRCDS_GAME", - "default_value": "insurgency", - "user_viewable": true, - "user_editable": false, - "rules": "required|regex:\/^(insurgency)$\/" - }, - { - "name": "Default Map", - "description": "The default map to use when starting the server.", - "env_variable": "SRCDS_MAP", - "default_value": "sinjar", - "user_viewable": true, - "user_editable": true, - "rules": "required|regex:\/^(\\w{1,20})$\/" - } - ] -} \ No newline at end of file diff --git a/stock_eggs/source-engine/egg-team-fortress2.json b/stock_eggs/source-engine/egg-team-fortress2.json deleted file mode 100644 index 8b619642..00000000 --- a/stock_eggs/source-engine/egg-team-fortress2.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2020-10-19T23:36:44+00:00", - "name": "Team Fortress 2", - "author": "support@pterodactyl.io", - "description": "Team Fortress 2 is a team-based first-person shooter multiplayer video game developed and published by Valve Corporation. It is the sequel to the 1996 mod Team Fortress for Quake and its 1999 remake.", - "image": "quay.io\/pterodactyl\/core:source", - "startup": ".\/srcds_run -game {{SRCDS_GAME}} -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart", - "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"gameserver Steam ID\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", - "stop": "quit" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id ffound here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# EXTRA_FLAGS - when a server has extra glas for things like beta installs or updates.\r\n#\r\n##\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", - "container": "debian:buster-slim", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Game ID", - "description": "The ID corresponding to the game to download and run using SRCDS.", - "env_variable": "SRCDS_APPID", - "default_value": "232250", - "user_viewable": true, - "user_editable": false, - "rules": "required|regex:\/^(232250)$\/" - }, - { - "name": "Game Name", - "description": "The name corresponding to the game to download and run using SRCDS.", - "env_variable": "SRCDS_GAME", - "default_value": "tf", - "user_viewable": true, - "user_editable": false, - "rules": "required|regex:\/^(tf)$\/" - }, - { - "name": "Default Map", - "description": "The default map to use when starting the server.", - "env_variable": "SRCDS_MAP", - "default_value": "cp_dustbowl", - "user_viewable": true, - "user_editable": true, - "rules": "required|regex:\/^(\\w{1,20})$\/" - } - ] -} \ No newline at end of file diff --git a/stock_eggs/voice-servers/README.md b/stock_eggs/voice-servers/README.md index 665395ea..3bcdffb9 100644 --- a/stock_eggs/voice-servers/README.md +++ b/stock_eggs/voice-servers/README.md @@ -1,6 +1,7 @@ # Voice Servers ## Mumble +[Click here to download](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/voice-servers/egg-mumble-server.json) Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming. @@ -14,6 +15,8 @@ Mumble only requires a single port to run. The default is 64738 ## Teamspeak 3 +[Click here to download](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/voice-servers/egg-teamspeak3-server.json) + Use crystal clear sound to communicate with your team mates cross-platform with military-grade security, lag-free performance & unparalleled reliability and uptime. ### Required Server Ports diff --git a/stock_eggs/voice-servers/egg-mumble-server.json b/stock_eggs/voice-servers/egg-mumble-server.json deleted file mode 100644 index e9215ca9..00000000 --- a/stock_eggs/voice-servers/egg-mumble-server.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2020-10-20T00:22:14+00:00", - "name": "Mumble Server", - "author": "support@pterodactyl.io", - "description": "Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming.", - "image": "quay.io\/pterodactyl\/core:glibc", - "startup": ".\/murmur.x86 -fg", - "config": { - "files": "{\"murmur.ini\":{\"parser\": \"ini\", \"find\":{\"logfile\": \"murmur.log\", \"port\": \"{{server.build.default.port}}\", \"host\": \"0.0.0.0\", \"users\": \"{{server.build.env.MAX_USERS}}\"}}}", - "startup": "{\"done\": \"Server listening on\", \"userInteraction\": [ \"Generating new server certificate\"]}", - "logs": "{\"custom\": true, \"location\": \"logs\/murmur.log\"}", - "stop": "^C" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n# Mumble Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nGITHUB_PACKAGE=mumble-voip\/mumble\r\nMATCH=murmur-static\r\n\r\napt update\r\napt install -y tar curl jq\r\n\r\nif [ ! -d \/mnt\/server\/ ]; then\r\n mkdir \/mnt\/server\/\r\nfi\r\n\r\ncd \/tmp\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 -m 1 -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 -m 1 -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\ncurl -L ${DOWNLOAD_LINK} -o mumble-server.tar.bz2\r\n\r\ntar -xjvf mumble-server.tar.bz2\r\ncp -r murmur-static_x86-*\/* \/mnt\/server", - "container": "debian:buster-slim", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Maximum Users", - "description": "Maximum concurrent users on the mumble server.", - "env_variable": "MAX_USERS", - "default_value": "100", - "user_viewable": true, - "user_editable": false, - "rules": "required|numeric|digits_between:1,5" - }, - { - "name": "Server Version", - "description": "Version of Mumble Server to download and use.", - "env_variable": "MUMBLE_VERSION", - "default_value": "1.3.1", - "user_viewable": true, - "user_editable": true, - "rules": "required|regex:\/^([0-9_\\.-]{5,8})$\/" - } - ] -} \ No newline at end of file diff --git a/stock_eggs/voice-servers/egg-teamspeak3-server.json b/stock_eggs/voice-servers/egg-teamspeak3-server.json deleted file mode 100644 index 6dfb4184..00000000 --- a/stock_eggs/voice-servers/egg-teamspeak3-server.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1", - "update_url": null - }, - "exported_at": "2021-04-27T20:49:27+01:00", - "name": "Teamspeak3 Server", - "author": "support@pterodactyl.io", - "description": "VoIP software designed with security in mind, featuring crystal clear voice quality, endless customization options, and scalability up to thousands of simultaneous users.", - "features": null, - "images": [ - "quay.io\/parkervcp\/pterodactyl-images:base_debian" - ], - "startup": ".\/ts3server default_voice_port={{SERVER_PORT}} query_port={{SERVER_QUERY}} filetransfer_ip=0.0.0.0 filetransfer_port={{FILE_TRANSFER}} license_accepted=1", - "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"listening on 0.0.0.0:\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/ts3.log\"\r\n}", - "stop": "^C" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n# TS3 Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y tar curl jq bzip2\r\n\r\nif [ -z ${TS_VERSION} ] || [ ${TS_VERSION} == latest ]; then\r\n TS_VERSION=$(curl -sSL https:\/\/teamspeak.com\/versions\/server.json | jq -r '.linux.x86_64.version')\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"getting files from http:\/\/files.teamspeak-services.com\/releases\/server\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2\"\r\ncurl -L http:\/\/files.teamspeak-services.com\/releases\/server\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2 | tar -xvj --strip-components=1", - "container": "debian:buster-slim", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Server Version", - "description": "The version of Teamspeak 3 to use when running the server.", - "env_variable": "TS_VERSION", - "default_value": "latest", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|max:6" - }, - { - "name": "File Transfer Port", - "description": "The Teamspeak file transfer port", - "env_variable": "FILE_TRANSFER", - "default_value": "30033", - "user_viewable": true, - "user_editable": false, - "rules": "required|integer|between:1,65535" - }, - { - "name": "Server Query Port", - "description": "Teamspeak's Server Query Port", - "env_variable": "SERVER_QUERY", - "default_value": "10011", - "user_viewable": true, - "user_editable": false, - "rules": "required|integer|between:1,65535" - } - ] -} From 6c35a959666e855787982339b777ca43806b90b3 Mon Sep 17 00:00:00 2001 From: Dimitris Kafetzis <39215021+Dkafetzis@users.noreply.github.com> Date: Tue, 1 Nov 2022 21:07:59 +0200 Subject: [PATCH 0680/1001] [V Rising] Change the console key to backtick from tilde (#1939) I don't know whether this was true in previous versions of the sever, but currently the key to open the admin console within the game is the backtick key, not tilde. I suggest we reflect that in the readme to avoid confusion. --- game_eggs/steamcmd_servers/v_rising/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/v_rising/README.md b/game_eggs/steamcmd_servers/v_rising/README.md index 5045e67e..2263aeab 100644 --- a/game_eggs/steamcmd_servers/v_rising/README.md +++ b/game_eggs/steamcmd_servers/v_rising/README.md @@ -89,7 +89,7 @@ Standardized game settings can be applied via the "Game Settings Preset" startup #### Becoming an Administrator -To become an administrator in the game you will first need to open the `adminlist.txt` file under `~/VRisingServer_Data/StreamingAssets/Settings/` and add your [steamID64](https://steamid.io/) (one steamID64 per line). This can be done without restarting your server. To become an administrator in the game you need to enable the console in the options menu, bring it down with `~` and authenticate using the `adminauth` console command. Once an administrator you can use a number of administrative commands like `banuser`, `bancharacter`, `banned`, `unban` and `kick`. +To become an administrator in the game you will first need to open the `adminlist.txt` file under `~/VRisingServer_Data/StreamingAssets/Settings/` and add your [steamID64](https://steamid.io/) (one steamID64 per line). This can be done without restarting your server. To become an administrator in the game you need to enable the console in the options menu, bring it down with `` ` `` and authenticate using the `adminauth` console command. Once an administrator you can use a number of administrative commands like `banuser`, `bancharacter`, `banned`, `unban` and `kick`. If you ban users through the in-game console the server will automatically modify the `banlist.txt` file, but you can also modify this manually (one steamID64 per line). From e0b6a5e8f0bdf920ec2c7851a44e01962f983ed1 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Wed, 2 Nov 2022 08:41:13 +0100 Subject: [PATCH 0681/1001] stock eggs links --- stock_eggs/minecraft/README.md | 13 ++----------- stock_eggs/rust/README.md | 2 +- stock_eggs/source-engine/README.md | 10 ++-------- stock_eggs/voice-servers/README.md | 5 ++--- 4 files changed, 7 insertions(+), 23 deletions(-) diff --git a/stock_eggs/minecraft/README.md b/stock_eggs/minecraft/README.md index cb7eb8e2..4e0654a9 100644 --- a/stock_eggs/minecraft/README.md +++ b/stock_eggs/minecraft/README.md @@ -1,18 +1,9 @@ # Minecraft +[Click here to go to the download page](https://github.com/pterodactyl/panel/tree/1.0-develop/database/Seeders/eggs/minecraft) + All the default minecraft things -[Click here to download bungeecord](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/minecraft/egg-bungeecord.json) - -[Click here to download forge](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/minecraft/egg-forge-minecraft.json) - -[Click here to download paper](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/minecraft/egg-paper.json) - -[Click here to download sponge vanilla](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/minecraft/egg-sponge--sponge-vanilla.json) - -[Click here to download vanilla](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/minecraft/egg-vanilla-minecraft.json) - - ## Server Ports The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. diff --git a/stock_eggs/rust/README.md b/stock_eggs/rust/README.md index 9e7a6de4..da38e57a 100644 --- a/stock_eggs/rust/README.md +++ b/stock_eggs/rust/README.md @@ -1,6 +1,6 @@ # Rust -[Click here to download](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/rust/egg-rust.json) +[Click here to go to the download page](https://github.com/pterodactyl/panel/tree/1.0-develop/database/Seeders/eggs/rust) The only aim in Rust is to survive. To do this you will need to overcome struggles such as hunger, thirst and cold. Build a fire. Build a shelter. Kill animals for meat. Protect yourself from other players, and kill them for meat. Create alliances with other players and form a town. Do whatever it takes to survive. diff --git a/stock_eggs/source-engine/README.md b/stock_eggs/source-engine/README.md index ee07b6b6..5d8ff1ea 100644 --- a/stock_eggs/source-engine/README.md +++ b/stock_eggs/source-engine/README.md @@ -1,5 +1,7 @@ # Source-Engine +[Click here to go to the download page](https://github.com/pterodactyl/panel/tree/1.0-develop/database/Seeders/eggs/source-engine) + The Source Dedicated Server or SRCDS is a tool that runs the server component of a Source game without the client component. In other words, it simulates the game without drawing it. This also covers games that are installed using the steamcmd utility. @@ -11,7 +13,6 @@ The default steam query port is 27015 ## ARK Survival Evolved -[Click here to download](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/source-engine/egg-ark--survival-evolved.json) ### Port Requirements @@ -28,8 +29,6 @@ Please note the server may not show up on steam game server lists due to this re ## Counter Strike: Global Offensive -[Click here to download](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/source-engine/egg-counter--strike--global-offensive.json) - Counter-Strike: Global Offensive (CS: GO) expands upon the team-based action gameplay that it pioneered when it was launched 19 years ago. CS: GO features new maps, characters, weapons, and game modes, and delivers updated versions of the classic CS content (de_dust2, etc.). ### Port Requirements @@ -40,7 +39,6 @@ Counter-Strike: Global Offensive (CS: GO) expands upon the team-based action gam ## Custom Source Engine Game -[Click here to download](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/source-engine/egg-custom-source-engine-game.json) This is a generic one size fit's all egg that supports srcds game servers. @@ -54,7 +52,6 @@ This is not for games like Counter Strike 1.6 which is an HLDS title. See [HLDS ## Garry's Mod -[Click here to download](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/source-engine/egg-garrys-mod.json) Garry's Mod is a physics sandbox. There aren't any predefined aims or goals. We give you the tools and leave you to play. @@ -66,7 +63,6 @@ Garry's Mod is a physics sandbox. There aren't any predefined aims or goals. We ## Insurgency -[Click here to download](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/source-engine/egg-insurgency.json) Take to the streets for intense close quarters combat, where a team's survival depends upon securing crucial strongholds and destroying enemy supply in this multiplayer and cooperative Source Engine based experience. @@ -78,8 +74,6 @@ Take to the streets for intense close quarters combat, where a team's survival d ## Team Fortress 2 -[Click here to download](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/source-engine/egg-team-fortress2.json) - Nine distinct classes provide a broad range of tactical abilities and personalities. Constantly updated with new game modes, maps, equipment and, most importantly, hats! ### Port Requirements diff --git a/stock_eggs/voice-servers/README.md b/stock_eggs/voice-servers/README.md index 3bcdffb9..757dc72c 100644 --- a/stock_eggs/voice-servers/README.md +++ b/stock_eggs/voice-servers/README.md @@ -1,7 +1,8 @@ # Voice Servers +[Click here to go to the download page](https://github.com/pterodactyl/panel/tree/1.0-develop/database/Seeders/eggs/voice-servers) + ## Mumble -[Click here to download](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/voice-servers/egg-mumble-server.json) Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming. @@ -15,8 +16,6 @@ Mumble only requires a single port to run. The default is 64738 ## Teamspeak 3 -[Click here to download](https://raw.githubusercontent.com/pterodactyl/panel/1.0-develop/database/Seeders/eggs/voice-servers/egg-teamspeak3-server.json) - Use crystal clear sound to communicate with your team mates cross-platform with military-grade security, lag-free performance & unparalleled reliability and uptime. ### Required Server Ports From f06d360bb4d682016adfc8927ca9d9652c65c64b Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Fri, 4 Nov 2022 12:47:13 +0100 Subject: [PATCH 0682/1001] Update egg-sinusbot.json --- bots/discord/sinusbot/egg-sinusbot.json | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/bots/discord/sinusbot/egg-sinusbot.json b/bots/discord/sinusbot/egg-sinusbot.json index a2417e16..00e5f239 100644 --- a/bots/discord/sinusbot/egg-sinusbot.json +++ b/bots/discord/sinusbot/egg-sinusbot.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-10-01T12:31:15+02:00", + "exported_at": "2022-11-04T12:46:17+01:00", "name": "Sinusbot", "author": "support@pterodactyl.io", "description": "Musicbot for Discord and Teamspeak.", @@ -22,8 +22,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Sinusbot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install ca-certificates bzip2 wget tar curl jq\r\napt -q clean all\r\n\r\n#Create needed directories\r\nmkdir -p \/mnt\/server\/TeamSpeak3-Client-linux_amd64\/plugins\r\nmkdir \/mnt\/server\/youtube-dlp\r\n\r\ncd \/mnt\/server\r\n\r\n#Download Sinusbot\r\nwget -qO - https:\/\/www.sinusbot.com\/dl\/sinusbot.current.tar.bz2 | tar xj\r\n\r\n#Download Latest TeamSpeak Client\r\nTS_VERSION=$(curl https:\/\/teamspeak.com\/versions\/client.json | jq -r '.linux.x86_64.version')\r\nTS_DL_LINK=$(curl https:\/\/teamspeak.com\/versions\/client.json | jq -r '.linux.x86_64.mirrors.\"teamspeak.com\"')\r\n\r\necho -e \"downloading teamspeak version ${TS_VERSION}\"\r\necho -e \"running 'wget ${TS_DL_LINK}'\"\r\n\r\nwget ${TS_DL_LINK}\r\n\r\n# Install TeamSpeak Client\r\nchmod 0755 TeamSpeak3-Client-linux_amd64*.run\r\n.\/TeamSpeak3-Client-linux_amd64*.run --tar xfv -C TeamSpeak3-Client-linux_amd64\r\n\r\n## Cleaning up \r\n\r\nrm TeamSpeak3-Client-linux_amd64*.run\r\n# Remove glx-integration lib\r\nrm TeamSpeak3-Client-linux_amd64\/xcbglintegrations\/libqxcb-glx-integration.so\r\n\r\n#Install Sinusbot\r\nchmod +x sinusbot\r\ncp config.ini.dist config.ini\r\nsed -i \"s|^TS3Path.*|TS3Path = \\\"\/home\/container\/TeamSpeak3-Client-linux_amd64\/ts3client_linux_amd64\\\"|g\" config.ini\r\necho 'YoutubeDLPath = \"\/home\/container\/youtube-dlp\/youtube-dlp\"' >> config.ini\r\n\r\n#Install Sinusbot plugin\r\ncp plugin\/libsoundbot_plugin.so TeamSpeak3-Client-linux_amd64\/plugins\r\n\r\n#Download youtube-dlp\r\ncd \/mnt\/server\/youtube-dlp\r\nwget https:\/\/github.com\/yt-dlp\/yt-dlp\/releases\/latest\/download\/yt-dlp -O youtube-dlp\r\nchmod a+rx youtube-dlp\r\n\r\necho \"install finished\"", - "container": "ubuntu:18.04", + "script": "#!\/bin\/bash\r\n# Sinusbot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install ca-certificates bzip2 wget tar curl jq\r\napt -q clean all\r\n\r\n#Create needed directories\r\nmkdir -p \/mnt\/server\/TeamSpeak3-Client-linux_amd64\/plugins\r\nmkdir \/mnt\/server\/youtube-dlp\r\n\r\ncd \/mnt\/server\r\n\r\n#Download Sinusbot\r\n\r\nif [ \"${PRE_RELEASE}\" == \"1\" ]; then\r\necho \"pre\"\r\nDOWNLOAD_URL=$(curl -sSL https:\/\/forum.sinusbot.com\/threads\/upcoming-changes.8659\/ | grep -Eo \"(http|https):\/\/[a-zA-Z0-9.\/?=_-]*\" | sort -u | grep pre\/)\r\nwget -qO - ${DOWNLOAD_URL} | tar xj \r\nelse\r\necho \"release\"\r\nwget -qO - https:\/\/www.sinusbot.com\/dl\/sinusbot.current.tar.bz2 | tar xj\r\nfi\r\n\r\n#Download Latest TeamSpeak Client\r\nTS_VERSION=$(curl https:\/\/teamspeak.com\/versions\/client.json | jq -r '.linux.x86_64.version')\r\nTS_DL_LINK=$(curl https:\/\/teamspeak.com\/versions\/client.json | jq -r '.linux.x86_64.mirrors.\"teamspeak.com\"')\r\n\r\necho -e \"downloading teamspeak version ${TS_VERSION}\"\r\necho -e \"running 'wget ${TS_DL_LINK}'\"\r\n\r\nwget ${TS_DL_LINK}\r\n\r\n# Install TeamSpeak Client\r\nchmod 0755 TeamSpeak3-Client-linux_amd64*.run\r\n.\/TeamSpeak3-Client-linux_amd64*.run --tar xfv -C TeamSpeak3-Client-linux_amd64\r\n\r\n## Cleaning up \r\n\r\nrm TeamSpeak3-Client-linux_amd64*.run\r\n# Remove glx-integration lib\r\nrm TeamSpeak3-Client-linux_amd64\/xcbglintegrations\/libqxcb-glx-integration.so\r\n\r\n#Install Sinusbot\r\nchmod +x sinusbot\r\ncp config.ini.dist config.ini\r\nsed -i \"s|^TS3Path.*|TS3Path = \\\"\/home\/container\/TeamSpeak3-Client-linux_amd64\/ts3client_linux_amd64\\\"|g\" config.ini\r\necho 'YoutubeDLPath = \"\/home\/container\/youtube-dlp\/youtube-dlp\"' >> config.ini\r\n\r\n#Install Sinusbot plugin\r\ncp plugin\/libsoundbot_plugin.so TeamSpeak3-Client-linux_amd64\/plugins\r\n\r\n#Download youtube-dlp\r\ncd \/mnt\/server\/youtube-dlp\r\nwget https:\/\/github.com\/yt-dlp\/yt-dlp\/releases\/latest\/download\/yt-dlp -O youtube-dlp\r\nchmod a+rx youtube-dlp\r\n\r\necho \"-----------------------------------------\"\r\necho \"Installation completed...\"\r\necho \"-----------------------------------------\"", + "container": "debian:bullseye-slim", "entrypoint": "bash" } }, @@ -37,6 +37,16 @@ "user_editable": true, "rules": "required|string|max:20", "field_type": "text" + }, + { + "name": "Pre release", + "description": "Download the pre-release version?", + "env_variable": "PRE_RELEASE", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "required|boolean", + "field_type": "text" } ] -} \ No newline at end of file +} From 19ee54a574a19c409e09024a30eff3aeea13ad99 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Fri, 4 Nov 2022 19:30:30 +0100 Subject: [PATCH 0683/1001] add rethinkdb --- README.md | 1 + database/README.md | 4 ++ database/nosql/rethinkdb/README.md | 21 +++++++ database/nosql/rethinkdb/egg-rethinkdb.json | 62 +++++++++++++++++++++ 4 files changed, 88 insertions(+) create mode 100644 database/nosql/rethinkdb/README.md create mode 100644 database/nosql/rethinkdb/egg-rethinkdb.json diff --git a/README.md b/README.md index 0e87aada..0fdb648b 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,7 @@ If you are reading this it looks like you are looking to add an egg to your serv ### noSQL * [MongoDB](/database/nosql/mongodb) +* [rethinkdb](/database/nosql/rethinkdb) ### SQL Databases diff --git a/database/README.md b/database/README.md index a3021c4d..4aacc28e 100644 --- a/database/README.md +++ b/database/README.md @@ -12,6 +12,10 @@ https://www.mongodb.com/ +### [rethinkdb](nosql/rethinkdb) + + https://rethinkdb.com/ + ## SQL Databases ### [mariadb](sql/mariadb) diff --git a/database/nosql/rethinkdb/README.md b/database/nosql/rethinkdb/README.md new file mode 100644 index 00000000..ad118909 --- /dev/null +++ b/database/nosql/rethinkdb/README.md @@ -0,0 +1,21 @@ +# Rethinkdb + +## [Website](https://rethinkdb.com/) + +The open-source database for the realtime web +## Notes + +- The web dashboard by default is disabled (remove the ` --no-http-admin` flag from startup to enable). +- It defaults bind to 0.0.0.0 what is all interfaces so it is public availble. +- On first start a admin pasword is randomly generated. + + +### Server Ports + +Ports required to run the server in a table format. + +| Port | default | +|---------|---------| +| cluster | 25567 | +| driver | 25568 | +| http | 25569 | \ No newline at end of file diff --git a/database/nosql/rethinkdb/egg-rethinkdb.json b/database/nosql/rethinkdb/egg-rethinkdb.json new file mode 100644 index 00000000..567d52b2 --- /dev/null +++ b/database/nosql/rethinkdb/egg-rethinkdb.json @@ -0,0 +1,62 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v2", + "update_url": null + }, + "exported_at": "2022-11-04T19:18:22+01:00", + "name": "rethinkdb", + "author": "josdekurk@gmail.com", + "description": "The open-source database for the realtime web", + "features": null, + "docker_images": { + "Debian": "ghcr.io\/parkervcp\/yolks:debian" + }, + "file_denylist": [], + "startup": ".\/rethinkdb --bind 0.0.0.0 --cluster-port {{SERVER_PORT}} --driver-port {{DRIVER_PORT}} --http-port {{HTTP_PORT}} --initial-password auto --no-http-admin", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Server ready\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y wget tar binutils xz-utils\r\n\r\nARCH=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"amd64\" || echo \"arm64\")\r\n\r\nmkdir -p \/mnt\/server\r\n\r\ncd \/tmp\r\nwget https:\/\/download.rethinkdb.com\/repository\/debian-bullseye\/pool\/r\/rethinkdb\/rethinkdb_${VERSION}~0bullseye_${ARCH}.deb -O rethinkdb.deb\r\n\r\nar xv rethinkdb.deb\r\n\r\ntar xvf data.tar.xz\r\n\r\nmv \/tmp\/usr\/bin\/rethinkdb \/mnt\/server\r\n\r\necho \"-----------------------------------------\"\r\necho \"Installation completed...\"\r\necho \"-----------------------------------------\"", + "container": "debian:bullseye-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Version", + "description": "", + "env_variable": "VERSION", + "default_value": "2.4.2", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20", + "field_type": "text" + }, + { + "name": "Driver port", + "description": "", + "env_variable": "DRIVER_PORT", + "default_value": "25568", + "user_viewable": true, + "user_editable": false, + "rules": "required|string|max:10", + "field_type": "text" + }, + { + "name": "Http port", + "description": "", + "env_variable": "HTTP_PORT", + "default_value": "25569", + "user_viewable": true, + "user_editable": false, + "rules": "required|string|max:10", + "field_type": "text" + } + ] +} \ No newline at end of file From 22c2d005c9fb97f6e819b5c05afd0589d374d777 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 5 Nov 2022 06:39:27 +0100 Subject: [PATCH 0684/1001] Update egg-space-engineers.json --- .../space_engineers/egg-space-engineers.json | 73 +++++++++++++------ 1 file changed, 49 insertions(+), 24 deletions(-) diff --git a/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json b/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json index c0cac4fa..63b5cd35 100644 --- a/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json +++ b/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json @@ -1,21 +1,21 @@ { "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", "meta": { - "version": "PTDL_v1", + "version": "PTDL_v2", "update_url": null }, - "exported_at": "2021-09-15T18:24:11-04:00", + "exported_at": "2022-11-05T06:38:25+01:00", "name": "Space Engineers", "author": "tueye@tuworld.de", "description": "Space Engineers is a voxel-based sandbox game set in space and on planets.", "features": [ "steam_disk_space" ], - "images": [ - "quay.io\/parkervcp\/pterodactyl-images:debian_wine-5" - ], + "docker_images": { + "ghcr.io\/parkervcp\/yolks:wine_staging": "ghcr.io\/parkervcp\/yolks:wine_staging" + }, "file_denylist": [], - "startup": "cd \/home\/container\/DedicatedServer64\/; wine \/home\/container\/DedicatedServer64\/SpaceEngineersDedicated.exe -path Z:\\\\home\\\\container\\\\config -noconsole -ignorelastsession", + "startup": "winetricks sound=disabled; export WINEARCH=\"win64\"; export WINEDEBUG=-all; export WINEDLLOVERRIDES=\"mscoree=n,b;mshtml=n,b\"; wine \/home\/container\/DedicatedServer64\/SpaceEngineersDedicated.exe -path Z:\\\\home\\\\container\\\\config -noconsole -ignorelastsession", "config": { "files": "{\r\n \"config\/SpaceEngineers-Dedicated.cfg\": {\r\n \"parser\": \"xml\",\r\n \"find\": {\r\n \"MyConfigDedicated.SessionSettings.GameMode\": \"{{server.build.env.SERVER_MODE}}\",\r\n \"MyConfigDedicated.SessionSettings.MaxPlayers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"MyConfigDedicated.SessionSettings.AutoSaveInMinutes\": \"{{server.build.env.SAVE_INTERVAL}}\",\r\n \"MyConfigDedicated.SessionSettings.EnableSaving\": \"{{server.build.env.SAVE_ENABLED}}\",\r\n \"MyConfigDedicated.LoadWorld\": \"Z:\\\\home\\\\container\\\\config\\\\Saves\\\\{{server.build.env.WORLD_NAME}}\\\\Sandbox.sbc\",\r\n \"MyConfigDedicated.ServerPort\": \"{{server.build.default.port}}\",\r\n \"MyConfigDedicated.SteamPort\": \"{{server.build.env.STEAM_PORT}}\",\r\n \"MyConfigDedicated.ServerName\": \"{{server.build.env.SERVER_NAME}}\",\r\n \"MyConfigDedicated.WorldName\": \"{{server.build.env.WORLD_NAME}}\",\r\n \"MyConfigDedicated.ServerDescription\": \"{{server.build.env.SERVER_DESC}}\",\r\n \"MyConfigDedicated.RemoteApiEnabled\": \"{{server.build.env.REMOTEAPI_ENABLE}}\",\r\n \"MyConfigDedicated.RemoteApiPort\": \"{{server.build.env.REMOTEAPI_PORT}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Game ready...\"\r\n}", @@ -24,8 +24,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n## Define variables\r\ndlurl=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/steamcmd_servers\/space_engineers\"\r\nexport HOME=\/mnt\/server\r\n\r\n## Install dependencies\r\ndpkg --add-architecture i386\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates libsdl2-2.0-0:i386 cabextract\r\napt install -y --install-recommends wine wine64 xvfb\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\r\ncd \/mnt\/server\/steamcmd\r\n\r\nchown -R root:root \/mnt\r\n\r\n## Install game using steamcmd\r\n.\/steamcmd.sh +login anonymous +@sSteamCmdForcePlatformType windows +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit\r\n\r\n## set up 32 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## Create world and config\r\nmkdir -p $HOME\/config\/Saves\r\nif [ ! -d $HOME\/config\/Saves\/World ]\r\nthen\r\n curl $dlurl\/World.zip -o \/tmp\/World.zip\r\n unzip \/tmp\/World.zip -d $HOME\/config\/Saves\/\r\nfi\r\nif [ ! -f $HOME\/config\/SpaceEngineers-Dedicated.cfg ]; then curl $dlurl\/SpaceEngineers-Dedicated.cfg -o $HOME\/config\/SpaceEngineers-Dedicated.cfg; fi\r\n\r\n## Install WineTricks\r\nexport DISPLAY=:0.0\r\nexport WINEPREFIX=$HOME\/.wine\r\nrm -r $HOME\/.wine\r\nrm -r $HOME\/.cache\r\nmkdir -p $HOME\/.wine\r\nmkdir \/tmp\/winetricks\r\ncurl https:\/\/raw.githubusercontent.com\/Winetricks\/winetricks\/master\/src\/winetricks -o \/tmp\/winetricks\/winetricks\r\nchmod +x \/tmp\/winetricks\/winetricks\r\nXvfb :0 -screen 0 1024x768x16 &\r\nenv WINEDLLOVERRIDES=\"mscoree=d;mshtml=d\" wineboot --init --force \/nogui\r\nenv \/tmp\/winetricks\/winetricks -q vcrun2017 \r\nenv \/tmp\/winetricks\/winetricks -q vcrun2013 \r\nenv \/tmp\/winetricks\/winetricks -q sound=disabled \r\nenv \/tmp\/winetricks\/winetricks -q corefonts\r\nenv \/tmp\/winetricks\/winetricks -q --force dotnet48", - "container": "debian:buster-slim", + "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n## Define variables\r\ndlurl=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/steamcmd_servers\/space_engineers\"\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## Create world and config\r\nmkdir -p $HOME\/config\/Saves\r\nif [ ! -d $HOME\/config\/Saves\/World ]\r\nthen\r\n curl $dlurl\/World.zip -o \/tmp\/World.zip\r\n unzip \/tmp\/World.zip -d $HOME\/config\/Saves\/\r\nfi\r\nif [ ! -f $HOME\/config\/SpaceEngineers-Dedicated.cfg ]; then curl $dlurl\/SpaceEngineers-Dedicated.cfg -o $HOME\/config\/SpaceEngineers-Dedicated.cfg; fi", + "container": "debian:bullseye-slim", "entrypoint": "bash" } }, @@ -37,7 +37,8 @@ "default_value": "298740", "user_viewable": false, "user_editable": false, - "rules": "required|numeric|digits_between:1,6" + "rules": "required|numeric|digits_between:1,6", + "field_type": "text" }, { "name": "Server Name", @@ -46,7 +47,8 @@ "default_value": "Pterodactyl Space Engineer Server", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:64" + "rules": "required|string|max:64", + "field_type": "text" }, { "name": "World Name", @@ -55,7 +57,8 @@ "default_value": "World", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20" + "rules": "required|string|max:20", + "field_type": "text" }, { "name": "Server Description", @@ -64,7 +67,8 @@ "default_value": "Pterodactyl Space Engineer Server", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:200" + "rules": "required|string|max:200", + "field_type": "text" }, { "name": "Game Mode", @@ -73,7 +77,8 @@ "default_value": "Survival", "user_viewable": true, "user_editable": true, - "rules": "required|string|in:Survival,Creative" + "rules": "required|string|in:Survival,Creative", + "field_type": "text" }, { "name": "Maximum Players", @@ -82,7 +87,8 @@ "default_value": "4", "user_viewable": true, "user_editable": true, - "rules": "required|numeric|digits_between:1,3" + "rules": "required|numeric|digits_between:1,3", + "field_type": "text" }, { "name": "Enable Saving", @@ -91,7 +97,8 @@ "default_value": "true", "user_viewable": true, "user_editable": true, - "rules": "required|string|in:true,false" + "rules": "required|string|in:true,false", + "field_type": "text" }, { "name": "Auto Save Interval", @@ -100,7 +107,8 @@ "default_value": "5", "user_viewable": true, "user_editable": true, - "rules": "required|numeric|digits_between:1,3" + "rules": "required|numeric|digits_between:1,3", + "field_type": "text" }, { "name": "Steam Port", @@ -109,7 +117,8 @@ "default_value": "8766", "user_viewable": true, "user_editable": true, - "rules": "required|numeric|max:65535" + "rules": "required|numeric|max:65535", + "field_type": "text" }, { "name": "Enable Remote Api", @@ -118,7 +127,8 @@ "default_value": "false", "user_viewable": true, "user_editable": true, - "rules": "required|string|in:true,false" + "rules": "required|string|in:true,false", + "field_type": "text" }, { "name": "Remote Api Port", @@ -127,7 +137,8 @@ "default_value": "8081", "user_viewable": true, "user_editable": true, - "rules": "required|numeric|max:65535" + "rules": "required|numeric|max:65535", + "field_type": "text" }, { "name": "WINEARCH", @@ -136,7 +147,8 @@ "default_value": "win64", "user_viewable": false, "user_editable": false, - "rules": "required|string|in:win32,win64" + "rules": "required|string|in:win32,win64", + "field_type": "text" }, { "name": "WINEPREFIX", @@ -145,7 +157,8 @@ "default_value": "\/home\/container\/.wine", "user_viewable": false, "user_editable": false, - "rules": "required|string|max:64" + "rules": "required|string|max:64", + "field_type": "text" }, { "name": "WINEDEBUG", @@ -154,7 +167,8 @@ "default_value": "-all", "user_viewable": false, "user_editable": false, - "rules": "nullable|string|max:20" + "rules": "nullable|string|max:20", + "field_type": "text" }, { "name": "Windows Install", @@ -163,7 +177,18 @@ "default_value": "1", "user_viewable": false, "user_editable": false, - "rules": "required|string|in:1" + "rules": "required|string|in:1", + "field_type": "text" + }, + { + "name": "WINETRICKS_RUN", + "description": "", + "env_variable": "WINETRICKS_RUN", + "default_value": "vcrun2013 vcrun2017 corefonts dotnet48", + "user_viewable": false, + "user_editable": false, + "rules": "required|string", + "field_type": "text" } ] -} +} \ No newline at end of file From c73f2f287227d1cbc3587a4fbe7ee9fa00753096 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 5 Nov 2022 08:18:01 +0100 Subject: [PATCH 0685/1001] add install end and updated max player --- .../space_engineers/egg-space-engineers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json b/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json index 63b5cd35..0f354de4 100644 --- a/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json +++ b/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-11-05T06:38:25+01:00", + "exported_at": "2022-11-05T08:17:16+01:00", "name": "Space Engineers", "author": "tueye@tuworld.de", "description": "Space Engineers is a voxel-based sandbox game set in space and on planets.", @@ -24,7 +24,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n## Define variables\r\ndlurl=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/steamcmd_servers\/space_engineers\"\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## Create world and config\r\nmkdir -p $HOME\/config\/Saves\r\nif [ ! -d $HOME\/config\/Saves\/World ]\r\nthen\r\n curl $dlurl\/World.zip -o \/tmp\/World.zip\r\n unzip \/tmp\/World.zip -d $HOME\/config\/Saves\/\r\nfi\r\nif [ ! -f $HOME\/config\/SpaceEngineers-Dedicated.cfg ]; then curl $dlurl\/SpaceEngineers-Dedicated.cfg -o $HOME\/config\/SpaceEngineers-Dedicated.cfg; fi", + "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n## Define variables\r\ndlurl=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/steamcmd_servers\/space_engineers\"\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\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\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## Create world and config\r\nmkdir -p $HOME\/config\/Saves\r\nif [ ! -d $HOME\/config\/Saves\/World ]\r\nthen\r\n curl $dlurl\/World.zip -o \/tmp\/World.zip\r\n unzip \/tmp\/World.zip -d $HOME\/config\/Saves\/\r\nfi\r\nif [ ! -f $HOME\/config\/SpaceEngineers-Dedicated.cfg ]; then curl $dlurl\/SpaceEngineers-Dedicated.cfg -o $HOME\/config\/SpaceEngineers-Dedicated.cfg; fi\r\n\r\n## install end\r\necho \"-----------------------------------------\"\r\necho \"Installation completed...\"\r\necho \"-----------------------------------------\"", "container": "debian:bullseye-slim", "entrypoint": "bash" } @@ -87,7 +87,7 @@ "default_value": "4", "user_viewable": true, "user_editable": true, - "rules": "required|numeric|digits_between:1,3", + "rules": "required|numeric|digits_between:1,16", "field_type": "text" }, { From fea8dbfd6e9c4a13fcdf1b376ccbfa7bc8cf8b4c Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 5 Nov 2022 08:33:53 +0100 Subject: [PATCH 0686/1001] add Auto update variable --- .../space_engineers/egg-space-engineers.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json b/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json index 0f354de4..eee7ad21 100644 --- a/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json +++ b/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-11-05T08:17:16+01:00", + "exported_at": "2022-11-05T08:33:11+01:00", "name": "Space Engineers", "author": "tueye@tuworld.de", "description": "Space Engineers is a voxel-based sandbox game set in space and on planets.", @@ -189,6 +189,16 @@ "user_editable": false, "rules": "required|string", "field_type": "text" + }, + { + "name": "Auto Update", + "description": "", + "env_variable": "AUTO_UPDATE", + "default_value": "1", + "user_viewable": true, + "user_editable": true, + "rules": "required|boolean", + "field_type": "text" } ] } \ No newline at end of file From 9e253685f268a1b112f259ee2c3c4d99484cb8eb Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 5 Nov 2022 09:52:44 +0100 Subject: [PATCH 0687/1001] move startup variable to Variables --- .../space_engineers/egg-space-engineers.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json b/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json index eee7ad21..9e21e4ab 100644 --- a/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json +++ b/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-11-05T08:33:11+01:00", + "exported_at": "2022-11-05T09:51:58+01:00", "name": "Space Engineers", "author": "tueye@tuworld.de", "description": "Space Engineers is a voxel-based sandbox game set in space and on planets.", @@ -199,6 +199,16 @@ "user_editable": true, "rules": "required|boolean", "field_type": "text" + }, + { + "name": "WINEDLLOVERRIDES", + "description": "", + "env_variable": "WINEDLLOVERRIDES", + "default_value": "mscoree=n,b;mshtml=n,b", + "user_viewable": false, + "user_editable": false, + "rules": "required|string", + "field_type": "text" } ] } \ No newline at end of file From 1b33a61d78c7e4937eac492a68704750a2f061be Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 5 Nov 2022 10:25:03 +0100 Subject: [PATCH 0688/1001] update config to latest --- .../SpaceEngineers-Dedicated.cfg | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/game_eggs/steamcmd_servers/space_engineers/SpaceEngineers-Dedicated.cfg b/game_eggs/steamcmd_servers/space_engineers/SpaceEngineers-Dedicated.cfg index 1679bc81..0567afa0 100644 --- a/game_eggs/steamcmd_servers/space_engineers/SpaceEngineers-Dedicated.cfg +++ b/game_eggs/steamcmd_servers/space_engineers/SpaceEngineers-Dedicated.cfg @@ -10,6 +10,7 @@ PUBLIC 4 56 + 32 5 0 0 @@ -122,8 +123,21 @@ 99 false true + false + 0 + 0 + 0 + true + false + 1 + true + 1 + false + 5 + false + true - C:\Users\USERNAME\AppData\Roaming\SpaceEngineersDedicated\Saves\World + C:\Users\USERNAME\AppData\Roaming\SpaceEngineersDedicated\Saves\World\Sandbox.sbc 0.0.0.0 8766 27016 @@ -131,7 +145,7 @@ 0 - + World World false false @@ -149,10 +163,10 @@ - O+61kcmfFdESpxZr3sQdYQ== + cIflzwuTl3iy1jYulTRNgw== - false - fw8j74YGyC9HnbVWwuyRSA== + true + jrVRQIvlBI8OSsuzwZNzVw== 8080 30 @@ -164,4 +178,8 @@ steam false + true + 30 + 0.5 + 60 \ No newline at end of file From f17f42d8e55530166502e313746930b7e960f4f8 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 5 Nov 2022 10:27:38 +0100 Subject: [PATCH 0689/1001] fixed startup --- .../steamcmd_servers/space_engineers/egg-space-engineers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json b/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json index 9e21e4ab..43e9d65e 100644 --- a/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json +++ b/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json @@ -4,7 +4,7 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2022-11-05T09:51:58+01:00", + "exported_at": "2022-11-05T10:26:56+01:00", "name": "Space Engineers", "author": "tueye@tuworld.de", "description": "Space Engineers is a voxel-based sandbox game set in space and on planets.", @@ -15,7 +15,7 @@ "ghcr.io\/parkervcp\/yolks:wine_staging": "ghcr.io\/parkervcp\/yolks:wine_staging" }, "file_denylist": [], - "startup": "winetricks sound=disabled; export WINEARCH=\"win64\"; export WINEDEBUG=-all; export WINEDLLOVERRIDES=\"mscoree=n,b;mshtml=n,b\"; wine \/home\/container\/DedicatedServer64\/SpaceEngineersDedicated.exe -path Z:\\\\home\\\\container\\\\config -noconsole -ignorelastsession", + "startup": "winetricks sound=disabled; wine \/home\/container\/DedicatedServer64\/SpaceEngineersDedicated.exe -path Z:\\\\home\\\\container\\\\config -noconsole -ignorelastsession", "config": { "files": "{\r\n \"config\/SpaceEngineers-Dedicated.cfg\": {\r\n \"parser\": \"xml\",\r\n \"find\": {\r\n \"MyConfigDedicated.SessionSettings.GameMode\": \"{{server.build.env.SERVER_MODE}}\",\r\n \"MyConfigDedicated.SessionSettings.MaxPlayers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"MyConfigDedicated.SessionSettings.AutoSaveInMinutes\": \"{{server.build.env.SAVE_INTERVAL}}\",\r\n \"MyConfigDedicated.SessionSettings.EnableSaving\": \"{{server.build.env.SAVE_ENABLED}}\",\r\n \"MyConfigDedicated.LoadWorld\": \"Z:\\\\home\\\\container\\\\config\\\\Saves\\\\{{server.build.env.WORLD_NAME}}\\\\Sandbox.sbc\",\r\n \"MyConfigDedicated.ServerPort\": \"{{server.build.default.port}}\",\r\n \"MyConfigDedicated.SteamPort\": \"{{server.build.env.STEAM_PORT}}\",\r\n \"MyConfigDedicated.ServerName\": \"{{server.build.env.SERVER_NAME}}\",\r\n \"MyConfigDedicated.WorldName\": \"{{server.build.env.WORLD_NAME}}\",\r\n \"MyConfigDedicated.ServerDescription\": \"{{server.build.env.SERVER_DESC}}\",\r\n \"MyConfigDedicated.RemoteApiEnabled\": \"{{server.build.env.REMOTEAPI_ENABLE}}\",\r\n \"MyConfigDedicated.RemoteApiPort\": \"{{server.build.env.REMOTEAPI_PORT}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Game ready...\"\r\n}", From b459dc28855559ebf8a9ed84504ea8124e075bd8 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 5 Nov 2022 10:35:05 +0100 Subject: [PATCH 0690/1001] small fix --- .../space_engineers/SpaceEngineers-Dedicated.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game_eggs/steamcmd_servers/space_engineers/SpaceEngineers-Dedicated.cfg b/game_eggs/steamcmd_servers/space_engineers/SpaceEngineers-Dedicated.cfg index 0567afa0..2c5b4bdf 100644 --- a/game_eggs/steamcmd_servers/space_engineers/SpaceEngineers-Dedicated.cfg +++ b/game_eggs/steamcmd_servers/space_engineers/SpaceEngineers-Dedicated.cfg @@ -145,7 +145,7 @@ 0 - World + /> World false false @@ -165,7 +165,7 @@ cIflzwuTl3iy1jYulTRNgw== - true + false jrVRQIvlBI8OSsuzwZNzVw== 8080 From bb8b591315a643dec47d31f8adddfea0f666dc3b Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 5 Nov 2022 10:49:12 +0100 Subject: [PATCH 0691/1001] Update World.zip to latest --- .../space_engineers/World.zip | Bin 1859124 -> 2061634 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/game_eggs/steamcmd_servers/space_engineers/World.zip b/game_eggs/steamcmd_servers/space_engineers/World.zip index 4925919a1a02c3dc43d9b48c78810571e8e5efba..5801d549cea12cda4ea9318b871541f5ceee58d2 100644 GIT binary patch delta 1966853 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
      ZgSS{o|s}Dn4n4=Zyd}iK$i3Gn@0-NIkICf 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