From 2180299d63cfb1df9f404d08fe9943111fc02f5e Mon Sep 17 00:00:00 2001 From: gOOvER Date: Wed, 1 Jan 2020 11:56:08 +0100 Subject: [PATCH 01/19] SCPSL Dedicated Server Egg --- steamcmd_servers/scpsl/README.md | 20 +++++++++++++++ steamcmd_servers/scpsl/egg-scpsl.json | 36 +++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 steamcmd_servers/scpsl/README.md create mode 100644 steamcmd_servers/scpsl/egg-scpsl.json diff --git a/steamcmd_servers/scpsl/README.md b/steamcmd_servers/scpsl/README.md new file mode 100644 index 00000000..65aff1f2 --- /dev/null +++ b/steamcmd_servers/scpsl/README.md @@ -0,0 +1,20 @@ +# SCP: Secret Laboratory +### 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. + +### Minimum RAM warning +Minimum required memory to run the server: 3096 MB + + +### 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. diff --git a/steamcmd_servers/scpsl/egg-scpsl.json b/steamcmd_servers/scpsl/egg-scpsl.json new file mode 100644 index 00000000..7ea23c90 --- /dev/null +++ b/steamcmd_servers/scpsl/egg-scpsl.json @@ -0,0 +1,36 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2020-01-01T11:55:32+01:00", + "name": "SCP:SL", + "author": "info@goover.de", + "description": "Egg for SCP: Secret Laboratory Dedicated Linux Server", + "image": "quay.io\/parkervcp\/pterodactyl-images:debian_mono-5-complete", + "startup": ".\/LocalAdmin {{SERVER_PORT}}", + "config": { + "files": "{\r\n \"config_gameplay.txt\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"server_ip\": \"0.0.0.0\",\r\n \"forward_ports\": \"false\"\r\n }\r\n }\r\n}", + "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" + }, + "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\n#echo 'gamedir_for_configs: true' >> \/mnt\/server\/hoster_policy.txt\r\n#chmod +x \/mnt\/server\/hoster_policy.txt\r\n\r\n#URL=$(curl https:\/\/api.github.com\/repos\/Grover-c13\/MultiAdmin\/releases\/latest | grep browser_download_url | cut -d '\"' -f 4)\r\n#wget -P \/mnt\/server\/ $URL\r\n#chmod +x \/mnt\/server\/MultiAdmin.exe\r\n\r\n#SmodVersion=$(curl https:\/\/api.github.com\/repos\/Grover-c13\/Smod2\/releases\/latest | grep tag_name | cut -d '\"' -f 4)\r\n#AssemblyURL=\"https:\/\/github.com\/Grover-c13\/Smod2\/releases\/download\/${SmodVersion}\/Assembly-CSharp.dll\"\r\n#SmodURL=\"https:\/\/github.com\/Grover-c13\/Smod2\/releases\/download\/${SmodVersion}\/Smod2.dll\"\r\n#wget -O \/mnt\/server\/SCPSL_Data\/Managed\/Smod2.dll $SmodURL\r\n#wget -O \/mnt\/server\/SCPSL_Data\/Managed\/Assembly-CSharp.dll $AssemblyURL\r\n#chmod +x \/mnt\/server\/SCPSL_Data\/Managed\/Smod2.dll\r\n#chmod +x \/mnt\/server\/SCPSL_Data\/Managed\/Assembly-CSharp.dll", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "SRCDS_APPID", + "description": "", + "env_variable": "SRCDS_APPID", + "default_value": "996560", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|string|max:20" + } + ] +} \ No newline at end of file From d2d35d671643d3d4cd86c63a385f05946d262d5b Mon Sep 17 00:00:00 2001 From: gOOvER Date: Wed, 1 Jan 2020 12:02:04 +0100 Subject: [PATCH 02/19] Update README.md --- steamcmd_servers/scpsl/README.md | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/steamcmd_servers/scpsl/README.md b/steamcmd_servers/scpsl/README.md index 65aff1f2..832a5dd4 100644 --- a/steamcmd_servers/scpsl/README.md +++ b/steamcmd_servers/scpsl/README.md @@ -1,10 +1,8 @@ # SCP: Secret Laboratory -### 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. +SCP: Secret Laboratory Dedicated Linux Server AddID: [996560](https://steamdb.info/app/996560/) + +This Server is NOT compatible with ServerMod2 or MultiAdmin -### 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 required memory to run the server: 3096 MB @@ -15,6 +13,19 @@ Ports required to run the server in a table format. | Port | default | |---------|---------| -| Game | 25565 | +| Game | 7777 | + +### 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. + +#### 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 4701bc4b952cd43a49af8b92d28c4c7678d36848 Mon Sep 17 00:00:00 2001 From: gOOvER Date: Wed, 1 Jan 2020 12:04:22 +0100 Subject: [PATCH 03/19] Update README.md --- steamcmd_servers/scpsl/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/steamcmd_servers/scpsl/README.md b/steamcmd_servers/scpsl/README.md index 832a5dd4..60411e1b 100644 --- a/steamcmd_servers/scpsl/README.md +++ b/steamcmd_servers/scpsl/README.md @@ -19,7 +19,7 @@ Ports required to run the server in a table format. The server must be verified to be visible in the Server Browser. -Before requesting verification make sure your server follows the Verified Server Rules. +Before requesting verification make sure your server follows the [Verified Server Rules](https://scpslgame.com/Verified_server_rules.pdf). #### Requesting Verification Once ready send an email to server.verification@scpslgame.com with the following info: From d25ab80f3f488bda6acad9ca11e53cc9428361d9 Mon Sep 17 00:00:00 2001 From: gOOvER Date: Mon, 6 Jan 2020 09:37:15 +0100 Subject: [PATCH 04/19] Updated Readme --- README.md | 5 +++-- steamcmd_servers/README.md | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5942be30..4a444e52 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ If you are submitting PR's try and keep names and titles the same. If you are reading this it looks like you are looking to add an egg to your server. -1. Download any of the json files located in the folders below. +1. Download any of the json files located in the folders below. 1. 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 @@ -26,7 +26,7 @@ If you are reading this it looks like you are looking to add an egg to your serv ## Bot Eggs -[Discord](/bots/discord/) +[Discord](/bots/discord/) * [ATL Bot](/bots/discord/atlbot/) Node JS * [Bastion](/bots/discord/bastion/) * [discord.js](bots/discord/discord.js/) Node JS generic @@ -94,6 +94,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Onset](/steamcmd_servers/onset) * [PixARK](/steamcmd_servers/pixark/) * [Rust Staging Branch](/steamcmd_servers/rust_staging/) +* [SCP: Secret Laboratory](/steamcmd_servers/scpsl/) * [Starbound](/steamcmd_servers/starbound) * [Sven Co-op](/steamcmd_servers/svencoop) * [Squad](/steamcmd_servers/squad/) diff --git a/steamcmd_servers/README.md b/steamcmd_servers/README.md index 0d3285d9..3ca7e76d 100644 --- a/steamcmd_servers/README.md +++ b/steamcmd_servers/README.md @@ -34,6 +34,9 @@ This is a collection of servers that use steamcmd to install. ## Rust Staging [rust staging](rust_staging/) +## SCP: Secret Laboratory +[SCP: Secret Laboratory](/scpsl/) + ## Squad [squad](squad/) From ef8de3b766a748879da427dc5c004b6f78a9f863 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sat, 18 Jan 2020 18:15:07 -0500 Subject: [PATCH 05/19] update unturned This is a new unturned egg that uses a generic image to run the server. It still uses the rocketmod files for the workable console but also doesn't need mono to run. --- README.md | 5 +- steamcmd_servers/README.md | 7 +++ steamcmd_servers/unturned/rocketmod/README.md | 4 +- .../unturned/unturned}/README.md | 7 +-- .../unturned/unturned/egg-unturned.json | 63 +++++++++++++++++++ unturned/rocketmod/egg-rocketmod.json | 54 ---------------- 6 files changed, 78 insertions(+), 62 deletions(-) rename {unturned/rocketmod => steamcmd_servers/unturned/unturned}/README.md (84%) create mode 100644 steamcmd_servers/unturned/unturned/egg-unturned.json delete mode 100644 unturned/rocketmod/egg-rocketmod.json diff --git a/README.md b/README.md index e3b4005c..ffa46401 100644 --- a/README.md +++ b/README.md @@ -98,11 +98,10 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Starbound](/steamcmd_servers/starbound) * [Sven Co-op](/steamcmd_servers/svencoop) * [Squad](/steamcmd_servers/squad/) +* [Tower Unite](/unreal_engine/tower_unite/) * [Unturned](/unturned/) * [RocketMod](/unturned/rocketmod/) - -[Unreal Engine](/unreal_engine) -* [Tower Unite](/unreal_engine/tower_unite/) + * [Unturned](/unturned/unturned/) [Terraria](/terraria/) * [tmodloader](/terraria/tmodloader) diff --git a/steamcmd_servers/README.md b/steamcmd_servers/README.md index 0d3285d9..4c500d3d 100644 --- a/steamcmd_servers/README.md +++ b/steamcmd_servers/README.md @@ -42,3 +42,10 @@ This is a collection of servers that use steamcmd to install. ## Sven coop [svencoop](svencoop) + +## Tower Unite +[Tower Unite](tower_unite) + +## Unturned + * [RocketMod](rocketmod) + * [Unturned](unturned) \ No newline at end of file diff --git a/steamcmd_servers/unturned/rocketmod/README.md b/steamcmd_servers/unturned/rocketmod/README.md index b4386da3..d2ad1551 100644 --- a/steamcmd_servers/unturned/rocketmod/README.md +++ b/steamcmd_servers/unturned/rocketmod/README.md @@ -1,4 +1,4 @@ -# Unturned +# Unturned - RocketMod Steam Description You're one of the few not yet turned zombie. Keeping it that way will be a challenge. @@ -6,6 +6,8 @@ You're one of the few not yet turned zombie. Keeping it that way will be a chall - 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. +Unturned 3 implementation of the RocketMod — .NET Game Server Plugin Framework + ### Server Ports Rocketmod requires 2 ports to run properly. game port (default 8907) diff --git a/unturned/rocketmod/README.md b/steamcmd_servers/unturned/unturned/README.md similarity index 84% rename from unturned/rocketmod/README.md rename to steamcmd_servers/unturned/unturned/README.md index b4386da3..209522f2 100644 --- a/unturned/rocketmod/README.md +++ b/steamcmd_servers/unturned/unturned/README.md @@ -8,10 +8,9 @@ You're one of the few not yet turned zombie. Keeping it that way will be a chall ### Server Ports Rocketmod requires 2 ports to run properly. -game port (default 8907) -game +1 (default 8908) | Port | default | |---------|---------| -| Game | 8907 | -| Game +1 | 8908 | \ No newline at end of file +| Game | 27015 | +| Game +1 | 27016 | +| Game +2 | 27017 | \ No newline at end of file diff --git a/steamcmd_servers/unturned/unturned/egg-unturned.json b/steamcmd_servers/unturned/unturned/egg-unturned.json new file mode 100644 index 00000000..ca38ecfc --- /dev/null +++ b/steamcmd_servers/unturned/unturned/egg-unturned.json @@ -0,0 +1,63 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2020-01-18T18:06:35-05:00", + "name": "Unturned", + "author": "parker@parkervcp.com", + "description": "The RocketMod server mod for Unturned.", + "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", + "startup": "wget https:\/\/github.com\/RocketMod\/Rocket.Unturned\/releases\/download\/4.9.3.0\/Rocket.Unturned.zip && unzip -o Rocket.Unturned.zip && .\/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}", + "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\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} +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 \/mnt\/server\/.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 \/mnt\/server\/.steam\/sdk64\/steamclient.so\r\n\r\n## Specific to Unturned\r\ncp -v linux64\/steamclient.so \/mnt\/server\/Unturned_Headless_Data\/Plugins\/x86_64\/steamclient.so", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Steam App ID", + "description": "Steam App ID require for install and startup update", + "env_variable": "SRCDS_APPID", + "default_value": "1110390", + "user_viewable": 0, + "user_editable": 0, + "rules": "required|string|max:20" + }, + { + "name": "ld lib path", + "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, + "rules": "required|string" + }, + { + "name": "Steam User", + "description": "Should be left blank for anon user", + "env_variable": "STEAM_USER", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "nullable|string" + }, + { + "name": "Steam Password", + "description": "", + "env_variable": "STEAM_PASS", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "nullable|string" + } + ] +} \ No newline at end of file diff --git a/unturned/rocketmod/egg-rocketmod.json b/unturned/rocketmod/egg-rocketmod.json deleted file mode 100644 index acaf657f..00000000 --- a/unturned/rocketmod/egg-rocketmod.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": "2018-04-27T21:30:05+00:00", - "name": "RocketMod", - "author": "isaac@isaacs.site", - "description": "The RocketMod server mod for Unturned.", - "image": "registry.gitlab.com\/tenten8401\/pterodactyl-unturned", - "startup": "mono RocketLauncher.exe unturned", - "config": { - "files": "{\r\n \"Servers\/unturned\/Server\/Commands.dat\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"Port\": \"Port {{server.build.default.port}}\"\r\n }\r\n}\r\n}", - "startup": "{\r\n \"done\": \"Loading level: 100%\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"latest.log\"\r\n}", - "stop": "shutdown" - }, - "scripts": { - "installation": { - "script": "apt 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\/steam\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steam\r\ncd \/mnt\/server\/steam\r\n\r\nchown -R root:root \/mnt\r\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +@sSteamCmdForcePlatformBitness 32 +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update 304930 +quit\r\n\r\nmkdir -p \/mnt\/server\/Servers\/unturned\/Server\r\necho \"Port 27015\" > \/mnt\/server\/Servers\/unturned\/Server\/Commands.dat\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", - "container": "ubuntu:16.04", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Steam User", - "description": "A Steam username with Unturned on the account.", - "env_variable": "STEAM_USER", - "default_value": "anonymous", - "user_viewable": 0, - "user_editable": 0, - "rules": "required|string" - }, - { - "name": "Steam Password", - "description": "Steam User Password", - "env_variable": "STEAM_PASS", - "default_value": "", - "user_viewable": 0, - "user_editable": 0, - "rules": "nullable|string" - }, - { - "name": "Steam Auth Code", - "description": "Steam Auth Code only when you're using Steam Auth", - "env_variable": "STEAM_AUTH", - "default_value": "", - "user_viewable": 0, - "user_editable": 0, - "rules": "nullable|string" - } - ] -} \ No newline at end of file From b948d2f18de64eaa3759ca1dcda4b1ff3b7e7348 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 24 Jan 2020 09:01:45 -0500 Subject: [PATCH 06/19] change pocketmine image --- minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json b/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json index 8d752d82..8f0f3877 100644 --- a/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json +++ b/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json @@ -3,11 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-01-02T00:07:42-05:00", + "exported_at": "2020-01-24T08:59:24-05: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 :)", - "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu", + "image": "quay.io\/parkervcp\/pterodactyl-images:base_ubuntu", "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}", From c9d46bd966332ade1ad0175040902cbac4c25e87 Mon Sep 17 00:00:00 2001 From: gOOvER Date: Wed, 29 Jan 2020 19:50:01 +0100 Subject: [PATCH 07/19] Fixed Server Started Message --- steamcmd_servers/scpsl/egg-scpsl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/steamcmd_servers/scpsl/egg-scpsl.json b/steamcmd_servers/scpsl/egg-scpsl.json index 7ea23c90..73ee4e68 100644 --- a/steamcmd_servers/scpsl/egg-scpsl.json +++ b/steamcmd_servers/scpsl/egg-scpsl.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-01-01T11:55:32+01:00", + "exported_at": "2020-01-29T19:49:19+01:00", "name": "SCP:SL", "author": "info@goover.de", "description": "Egg for SCP: Secret Laboratory Dedicated Linux Server", @@ -11,7 +11,7 @@ "startup": ".\/LocalAdmin {{SERVER_PORT}}", "config": { "files": "{\r\n \"config_gameplay.txt\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"server_ip\": \"0.0.0.0\",\r\n \"forward_ports\": \"false\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Waiting for players\",\r\n \"userInteraction\": []\r\n}", + "startup": "{\r\n \"done\": \"Nickname of is now \",\r\n \"userInteraction\": []\r\n}", "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "^C" }, From d4cd86e01684c0e9f47658be8c07e6244b03f6b6 Mon Sep 17 00:00:00 2001 From: gOOvER Date: Wed, 29 Jan 2020 19:54:52 +0100 Subject: [PATCH 08/19] reverted last Fix. No chnage in Server --- steamcmd_servers/scpsl/egg-scpsl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/steamcmd_servers/scpsl/egg-scpsl.json b/steamcmd_servers/scpsl/egg-scpsl.json index 73ee4e68..fff58d92 100644 --- a/steamcmd_servers/scpsl/egg-scpsl.json +++ b/steamcmd_servers/scpsl/egg-scpsl.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-01-29T19:49:19+01:00", + "exported_at": "2020-01-29T19:54:33+01:00", "name": "SCP:SL", "author": "info@goover.de", "description": "Egg for SCP: Secret Laboratory Dedicated Linux Server", @@ -11,7 +11,7 @@ "startup": ".\/LocalAdmin {{SERVER_PORT}}", "config": { "files": "{\r\n \"config_gameplay.txt\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"server_ip\": \"0.0.0.0\",\r\n \"forward_ports\": \"false\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Nickname of is now \",\r\n \"userInteraction\": []\r\n}", + "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" }, From e38bc2aeed341fba299ed9361dd599a3f3e09cfe Mon Sep 17 00:00:00 2001 From: gOOvER Date: Thu, 30 Jan 2020 15:44:18 +0100 Subject: [PATCH 09/19] Renamed folder, because its also possible to use gamefiles as Server --- steamcmd_servers/{scpsl => scpsl-dedicated}/README.md | 0 steamcmd_servers/{scpsl => scpsl-dedicated}/egg-scpsl.json | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename steamcmd_servers/{scpsl => scpsl-dedicated}/README.md (100%) rename steamcmd_servers/{scpsl => scpsl-dedicated}/egg-scpsl.json (100%) diff --git a/steamcmd_servers/scpsl/README.md b/steamcmd_servers/scpsl-dedicated/README.md similarity index 100% rename from steamcmd_servers/scpsl/README.md rename to steamcmd_servers/scpsl-dedicated/README.md diff --git a/steamcmd_servers/scpsl/egg-scpsl.json b/steamcmd_servers/scpsl-dedicated/egg-scpsl.json similarity index 100% rename from steamcmd_servers/scpsl/egg-scpsl.json rename to steamcmd_servers/scpsl-dedicated/egg-scpsl.json From ed82d0f497732012ba80e6eaf44b0087a1134116 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Thu, 30 Jan 2020 20:48:28 -0500 Subject: [PATCH 10/19] update openttd Update install script to use wget instead of curl. Remove server password variable. Remove admin password variable. resolves #419 --- .../openttd/egg-open-t-t-d-server.json | 26 +++---------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/tycoon_games/openttd/egg-open-t-t-d-server.json b/tycoon_games/openttd/egg-open-t-t-d-server.json index 834d51c7..89b5bb1b 100644 --- a/tycoon_games/openttd/egg-open-t-t-d-server.json +++ b/tycoon_games/openttd/egg-open-t-t-d-server.json @@ -3,22 +3,22 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-04-09T22:59:20-04:00", + "exported_at": "2020-01-30T20:47:45-05:00", "name": "OpenTTD Server", "author": "admin@justmyrandomstuff.com", "description": "OpenTTD is an open source simulation game based upon the popular Microprose game \"Transport Tycoon Deluxe\", written by Chris Sawyer. It attempts to mimic the original game as closely as possible while extending it with new features.\r\n\r\nOpenTTD is modelled after the original Transport Tycoon game by Chris Sawyer and enhances the game experience dramatically. Many features were inspired by TTDPatch while others are original.", "image": "quay.io\/parkervcp\/pterodactyl-images:base_ubuntu", "startup": ".\/openttd -D", "config": { - "files": "{\r\n \"openttd.cfg\": {\r\n \"parser\": \"ini\",\r\n \"find\": {\r\n \"network.server_port\": \"{{server.build.default.port}}\",\r\n \"network.server_name\": \"{{server.build.env.srv_name}}\",\r\n \"network.server_password\": \"{{server.build.env.srv_pass}}\",\r\n \"network.lan_internet\": 0,\r\n \"network.server_advertise\": \"{{server.build.env.srv_advertise}}\",\r\n \"network.admin_password\": \"{{server.build.env.srv_adminpass}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"openttd.cfg\": {\r\n \"parser\": \"ini\",\r\n \"find\": {\r\n \"network.server_port\": \"{{server.build.default.port}}\",\r\n \"network.server_name\": \"{{server.build.env.srv_name}}\",\r\n \"network.lan_internet\": 0,\r\n \"network.server_advertise\": \"{{server.build.env.srv_advertise}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"[net] Map generated, starting game\",\r\n \"userInteraction\": []\r\n}", "logs": "{\r\n \"custom\": false,\r\n \"location\": \"latest.log\"\r\n}", "stop": "exit" }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n\r\napk add --no-cache curl binutils xz\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"getting file from: https:\/\/proxy.binaries.openttd.org\/openttd-releases\/${OPENTTD_VERSION}\/openttd-${OPENTTD_VERSION}-linux-ubuntu-bionic-amd64.deb\"\r\n\r\ncurl -LSs https:\/\/proxy.binaries.openttd.org\/openttd-releases\/${OPENTTD_VERSION}\/openttd-${OPENTTD_VERSION}-linux-ubuntu-bionic-amd64.deb -o openttd.deb\r\n\r\nar -x openttd.deb\r\n\r\ntar -xvf data.tar.xz\r\n\r\nmv usr\/share\/games\/openttd\/* .\/\r\n\r\nmv usr\/games\/openttd .\/\r\n\r\nchmod +x openttd\r\n\r\ncurl -LSs https:\/\/binaries.openttd.org\/extra\/opengfx\/${OPENGFX_VERSION}\/opengfx-${OPENGFX_VERSION}-all.zip -o opengfx.zip\r\n\r\nunzip opengfx.zip \r\n\r\ntar --strip-components=1 -C baseset\/ -xvf opengfx*.tar\r\n\r\nrm open*zip open*tar open*gz debian-binary open*deb\r\n\r\n[ -f \/home\/container\/openttd.cfg ] || curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/openttd\/openttd\/openttd.cfg > openttd.cfg", - "container": "alpine:3.9", + "script": "#!\/bin\/ash\r\n\r\napk add --no-cache wget binutils xz\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"getting file from: https:\/\/proxy.binaries.openttd.org\/openttd-releases\/${OPENTTD_VERSION}\/openttd-${OPENTTD_VERSION}-linux-ubuntu-bionic-amd64.deb\"\r\n\r\nwget https:\/\/proxy.binaries.openttd.org\/openttd-releases\/${OPENTTD_VERSION}\/openttd-${OPENTTD_VERSION}-linux-ubuntu-bionic-amd64.deb -O openttd.deb\r\n\r\nar -x openttd.deb\r\n\r\ntar -xvf data.tar.xz\r\n\r\nmv usr\/share\/games\/openttd\/* .\/\r\n\r\nmv usr\/games\/openttd .\/\r\n\r\nchmod +x openttd\r\n\r\nwget https:\/\/binaries.openttd.org\/extra\/opengfx\/${OPENGFX_VERSION}\/opengfx-${OPENGFX_VERSION}-all.zip -O opengfx.zip\r\n\r\nunzip opengfx.zip \r\n\r\ntar --strip-components=1 -C baseset\/ -xvf opengfx*.tar\r\n\r\nrm open*zip open*tar open*gz debian-binary open*deb\r\n\r\n[ -f \/home\/container\/openttd.cfg ] || curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/tycoon_games\/openttd\/openttd.cfg > openttd.cfg", + "container": "alpine:3.10", "entrypoint": "ash" } }, @@ -32,15 +32,6 @@ "user_editable": 1, "rules": "required|string|max:20" }, - { - "name": "Server Password", - "description": "The password required to join the server", - "env_variable": "srv_pass", - "default_value": "", - "user_viewable": 1, - "user_editable": 1, - "rules": "nullable|string|max:20" - }, { "name": "Show in masterlist?", "description": "Show the server in the serverlist on the client, true or false", @@ -50,15 +41,6 @@ "user_editable": 1, "rules": "required|string|max:5" }, - { - "name": "Admin Password", - "description": "Password to access admin controls in-game", - "env_variable": "srv_adminpass", - "default_value": "", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:20" - }, { "name": "OpenTTD Version", "description": "The version of OpenTTD i.e. 1.9.1", From 1c92b6f11fbdd4dd3591a343a627a93edcbe65ea Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sat, 1 Feb 2020 21:37:44 -0500 Subject: [PATCH 11/19] update discordjs egg --- .../discord.js/egg-discord-js-generic.json | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/bots/discord/discord.js/egg-discord-js-generic.json b/bots/discord/discord.js/egg-discord-js-generic.json index 9ea8f656..6d16fcf6 100644 --- a/bots/discord/discord.js/egg-discord-js-generic.json +++ b/bots/discord/discord.js/egg-discord-js-generic.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-06-16T11:06:52-04:00", + "exported_at": "2020-02-01T21:36:43-05: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.", - "image": "quay.io\/parkervcp\/pterodactyl-images:bot_discordjs", - "startup": "`if [[ -d .git ]] && [[ ${AUTO_UPDATE} == \"1\" ]]; then git pull; fi && \/usr\/local\/bin\/npm install --production && \/usr\/local\/bin\/node \/home\/container\/index.js`", + "image": "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-10", + "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi && \/usr\/local\/bin\/npm install --production && \/usr\/local\/bin\/node \/home\/container\/{{BOT_JS_FILE}}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"change this part\"\r\n}", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#\/bin\/ash\r\n\r\napk add --no-cache git make gcc g++ python\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"working on installing a discord.js bot from ${INSTALL_REPO}\"\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n\techo -e \"assuming user knows what they are doing have a good day.\"\r\n\texit 0\r\nelse\r\n\tif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n\t\techo -e \"\/mnt\/server directory is not empty.\"\r\n\t if [ -d .git ]; then\r\n\t\t\techo -e \".git directory exists\" \r\n\t\t\tif [ -f .git\/config ]; then\r\n\t\t\t\techo -e \"loading info from git config\"\r\n\t\t\t\tORIGIN=$(git config --get remote.origin.url)\r\n\t\t\telse\r\n\t\t\t\techo -e \"files found with no git config\"\r\n\t\t\t\techo -e \"closing out without touching things to not break anything\"\r\n\t\t\t\texit 10\r\n\t\t\tfi\r\n\t\tfi\r\n\t\tif [ \"${ORIGIN}\" == \"${INSTALL_REPO}\" ]; then\r\n\t\t\techo \"pulling latest from github\"\r\n\t\t\tgit pull \r\n\t\t\techo -e \"updating local npm modules\"\r\n\t\t\t\/usr\/local\/bin\/npm install --production\r\n\t\tfi\r\n\telse\r\n \techo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n\t\tif [ -z ${INSTALL_BRANCH} ]; then\r\n\t\t\techo -e \"assuming master branch\"\r\n\t\t\tINSTALL_BRANCH=master\r\n\t\tfi\r\n \r\n\t\techo -e \"running 'git clone --single-branch --branch ${INSTALL_BRANCH} ${INSTALL_REPO} .'\"\r\n\t\tgit clone --single-branch --branch ${INSTALL_BRANCH} ${INSTALL_REPO} .\r\n\t\techo -e \"install npm modules locally\"\r\n\t\t\/usr\/local\/bin\/npm install --production\r\n\tfi\r\nfi \r\n\r\necho -e \"install complete\"\r\nexit 0", + "script": "#\/bin\/ash\r\n\r\napk add --no-cache git make gcc g++ python\r\n\r\ncd \/mnt\/server\r\n\r\nif [[ ! ${INSTALL_REPO} = *\\.git ]]; then\r\n INSTALL_REPO=$(echo -e ${INSTALL_REPO} | sed 's:\/*$::')\r\n INSTALL_REPO=\"${INSTALL_REPO}.git\"\r\nfi\r\n\r\necho -e \"working on installing a discord.js bot from ${INSTALL_REPO}\"\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n\techo -e \"assuming user knows what they are doing have a good day.\"\r\n\texit 0\r\nelse\r\n\tif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n\t\techo -e \"\/mnt\/server directory is not empty.\"\r\n\t if [ -d .git ]; then\r\n\t\t\techo -e \".git directory exists\" \r\n\t\t\tif [ -f .git\/config ]; then\r\n\t\t\t\techo -e \"loading info from git config\"\r\n\t\t\t\tORIGIN=$(git config --get remote.origin.url)\r\n\t\t\telse\r\n\t\t\t\techo -e \"files found with no git config\"\r\n\t\t\t\techo -e \"closing out without touching things to not break anything\"\r\n\t\t\t\texit 10\r\n\t\t\tfi\r\n\t\tfi\r\n\t\tif [ \"${ORIGIN}\" == \"${INSTALL_REPO}\" ]; then\r\n\t\t\techo \"pulling latest from github\"\r\n\t\t\tgit pull \r\n\t\t\techo -e \"updating local npm modules\"\r\n\t\t\t\/usr\/local\/bin\/npm install --production\r\n\t\tfi\r\n\telse\r\n \techo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n\t\tif [ -z ${INSTALL_BRANCH} ]; then\r\n\t\t\techo -e \"assuming master branch\"\r\n\t\t\tINSTALL_BRANCH=master\r\n\t\tfi\r\n \r\n\t\techo -e \"running 'git clone --single-branch --branch ${INSTALL_BRANCH} ${INSTALL_REPO} .'\"\r\n\t\tgit clone --single-branch --branch ${INSTALL_BRANCH} ${INSTALL_REPO} .\r\n\t\techo -e \"install npm modules locally\"\r\n\t\t\/usr\/local\/bin\/npm install --production\r\n\tfi\r\nfi \r\n\r\necho -e \"install complete\"\r\nexit 0", "container": "node:10-alpine", "entrypoint": "ash" } @@ -58,6 +58,15 @@ "user_viewable": 1, "user_editable": 1, "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": 1, + "user_editable": 1, + "rules": "required|string" } ] } \ No newline at end of file From d8feef569c20523c1be266590a11b87ecc4bde2d Mon Sep 17 00:00:00 2001 From: Rustypredator Date: Sat, 27 Jul 2019 21:57:14 +0200 Subject: [PATCH 12/19] Add Starmade Egg --- starmade/egg-starmade.json | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 starmade/egg-starmade.json diff --git a/starmade/egg-starmade.json b/starmade/egg-starmade.json new file mode 100644 index 00000000..3a20b6e8 --- /dev/null +++ b/starmade/egg-starmade.json @@ -0,0 +1,36 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-07-14T13:03:01+02:00", + "name": "starmade", + "author": "contact@hunters-tavern.de", + "description": "starmade", + "image": "quay.io\/pterodactyl\/core:java", + "startup": "java -Xms128m -Xmx{{SERVER_MEMORY}}m -jar {{SERVER_JARFILE}} -server -port:{{SERVER_PORT}}", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"SenableGameState(1)\"\r\n}", + "logs": "{}", + "stop": "\/shutdown 0" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/ash\r\n# starmade Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk update\r\napk add curl\r\n\r\ncd \/mnt\/server\r\n\r\nwget -O starter.jar http:\/\/files.star-made.org\/StarMade-Starter.jar\r\n\r\njava -jar starter.jar -nogui\r\n\r\nmv .\/StarMade\/* .\/\r\nrm -r .\/StarMade", + "container": "openjdk:13-ea-27-jdk-alpine3.9", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Server Jarfile", + "description": "", + "env_variable": "SERVER_JARFILE", + "default_value": "StarMade.jar", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:64" + } + ] +} From 4098777c5f57ee3b71778a23a9652a70fc94390e Mon Sep 17 00:00:00 2001 From: Rustypredator Date: Sat, 27 Jul 2019 21:57:55 +0200 Subject: [PATCH 13/19] Add Readme for Starmade --- starmade/README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 starmade/README.md diff --git a/starmade/README.md b/starmade/README.md new file mode 100644 index 00000000..33583884 --- /dev/null +++ b/starmade/README.md @@ -0,0 +1,10 @@ +# Starmade 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 +Ports required to run the server + +| Port | default | +|---------|---------| +| Game | 4242 | From 724acbd39cf1f223686bd2dc19d6d412a60e9e04 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sat, 1 Feb 2020 21:52:30 -0500 Subject: [PATCH 14/19] update starmade update starmade location update core readme --- README.md | 8 +++++--- starmade/{ => starmade}/README.md | 0 starmade/{ => starmade}/egg-starmade.json | 0 3 files changed, 5 insertions(+), 3 deletions(-) rename starmade/{ => starmade}/README.md (100%) rename starmade/{ => starmade}/egg-starmade.json (100%) diff --git a/README.md b/README.md index ffa46401..ab882ace 100644 --- a/README.md +++ b/README.md @@ -78,8 +78,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [TyphoonLimbo](/minecraft_proxy/typhoonlimbo/) * [Velocity](/minecraft_proxy/velocity/) -[Tycoon Games](/tycoon_games/) -* [OpenTTD](/tycoon_games/openttd/) +[Starmade](/starmade/starmade/) [steamcmd servers](/steamcmd_servers/) These eggs use steamcmd to install * [7 Days to Die](/steamcmd_servers/7_days_to_die/) @@ -107,4 +106,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [tmodloader](/terraria/tmodloader) * [tshock](/terraria/tshock/) -[Xonotic](/xonotic/xonotic/) +[Tycoon Games](/tycoon_games/) +* [OpenTTD](/tycoon_games/openttd/) + +[Xonotic](/xonotic/xonotic/) \ No newline at end of file diff --git a/starmade/README.md b/starmade/starmade/README.md similarity index 100% rename from starmade/README.md rename to starmade/starmade/README.md diff --git a/starmade/egg-starmade.json b/starmade/starmade/egg-starmade.json similarity index 100% rename from starmade/egg-starmade.json rename to starmade/starmade/egg-starmade.json From 9ad7616f266b57cab7823dd0df44c059ca07be5b Mon Sep 17 00:00:00 2001 From: KungRaseri Date: Thu, 6 Feb 2020 10:34:58 -0700 Subject: [PATCH 15/19] added steam_webApiKey Added `steam_webApiKey` to the variables and startup command. --- gta/fivem/egg-five-m.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gta/fivem/egg-five-m.json b/gta/fivem/egg-five-m.json index 8d9baef5..6aa4b4b0 100644 --- a/gta/fivem/egg-five-m.json +++ b/gta/fivem/egg-five-m.json @@ -8,7 +8,7 @@ "author": "parker@parkervcp.com", "description": "A new FiveM egg for the latest builds due to recent changes in FiveM", "image": "quay.io\/parkervcp\/pterodactyl-images:base_alpine", - "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 sv_maxplayers {{MAX_PLAYERS}} +exec server.cfg", + "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}} +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 \"sv_maxclients\": \"sv_maxclients {{server.build.env.MAX_PLAYERS}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"succeeded. Welcome!\"\r\n}", @@ -32,6 +32,15 @@ "user_editable": 1, "rules": "required|string|max:32" }, + { + "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": 1, + "user_editable": 1, + "rules": "required|string" + }, { "name": "Max Players", "description": "Set the fivem max play count", @@ -69,4 +78,4 @@ "rules": "string|nullable" } ] -} \ No newline at end of file +} From 5e7659dcb64dfa2224a3bbf9826af948457a0729 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sat, 8 Feb 2020 09:08:00 -0500 Subject: [PATCH 16/19] Fix main readme links --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3db13067..10b72c1a 100644 --- a/README.md +++ b/README.md @@ -98,10 +98,10 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Starbound](/steamcmd_servers/starbound) * [Sven Co-op](/steamcmd_servers/svencoop) * [Squad](/steamcmd_servers/squad/) -* [Tower Unite](/unreal_engine/tower_unite/) -* [Unturned](/unturned/) - * [RocketMod](/unturned/rocketmod/) - * [Unturned](/unturned/unturned/) +* [Tower Unite](/steamcmd_servers/tower_unite/) +* [Unturned](/steamcmd_servers/unturned/) + * [RocketMod](/steamcmd_servers/unturned/rocketmod/) + * [Unturned](/steamcmd_servers/unturned/unturned/) [Terraria](/terraria/) * [tmodloader](/terraria/tmodloader) From 93a70766173ab3fca274d8c72bee34b2e5664919 Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Mon, 10 Feb 2020 04:06:11 -0500 Subject: [PATCH 17/19] Spelling fix Fixed spelling.... Unless `somf` was intended... --- .github/ISSUE_TEMPLATE/request.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/request.md b/.github/ISSUE_TEMPLATE/request.md index 0de43824..1590d3a8 100644 --- a/.github/ISSUE_TEMPLATE/request.md +++ b/.github/ISSUE_TEMPLATE/request.md @@ -14,6 +14,6 @@ Does this expand an already existing service: Y/N Link to game: (Ex. minecraft.net/factorio.com/etc) -Links for server downloads: This needs to be an official link and not one that is hosted on somf forum page or a personal github page. +Links for server downloads: This needs to be an official link and not one that is hosted on some forum page or a personal github page. -Links for install steps/docs: \ No newline at end of file +Links for install steps/docs: From a07af6fa55bcb72fe5257993b90d724b3baa7a10 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Wed, 19 Feb 2020 21:51:29 -0500 Subject: [PATCH 18/19] update altv default variable update build variable default values update description to match new values --- gta/altv/egg-alt--v.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gta/altv/egg-alt--v.json b/gta/altv/egg-alt--v.json index f1a31b78..944fdd7d 100644 --- a/gta/altv/egg-alt--v.json +++ b/gta/altv/egg-alt--v.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-01-02T15:11:11-05:00", + "exported_at": "2020-02-19T21:48:36-05:00", "name": "alt:V", "author": "parker@parkervcp.com", "description": "alt:V Multiplayer a third-party multiplayer modification for Grand Theft Auto: V", @@ -34,9 +34,9 @@ }, { "name": "Which alt:V build to download", - "description": "The supported versions are alpha, beta, stable (default).\r\n\r\nIf you don't know what you are doing leave it on stable", + "description": "The supported versions are release, rc, dev (default: release).\r\n\r\nIf you don't know what you are doing leave it on stable", "env_variable": "BUILD", - "default_value": "stable", + "default_value": "release", "user_viewable": 1, "user_editable": 1, "rules": "required|string|max:20" From b17e60e3845557673ad7bfa44c04872d39c80ddd Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Fri, 21 Feb 2020 13:02:40 -0500 Subject: [PATCH 19/19] update jmusic bot fixes the install script. --- bots/discord/jmusicbot/egg-j-music-bot.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bots/discord/jmusicbot/egg-j-music-bot.json b/bots/discord/jmusicbot/egg-j-music-bot.json index 1fb7b94e..99cce2a7 100644 --- a/bots/discord/jmusicbot/egg-j-music-bot.json +++ b/bots/discord/jmusicbot/egg-j-music-bot.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-05-08T07:52:52-04:00", + "exported_at": "2020-02-21T13:00:39-05:00", "name": "JMusicBot", "author": "parker@parkervcp.com", "description": "A Discord music bot that's easy to set up and run yourself!", @@ -17,9 +17,9 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\napk add --no-cache curl\r\n\r\nget_latest_release() {\r\n curl --silent \"https:\/\/api.github.com\/repos\/$1\/releases\/latest\" |\r\n grep '\"tag_name\":' |\r\n sed -E 's\/.*\"([^\"]+)\".*\/\\1\/'\r\n}\r\n\r\nPACKAGE=\"jagrosh\/MusicBot\"\r\nVERSION=`get_latest_release \"${PACKAGE}\"`\r\necho \"Latest version=${VERSION}\"\r\n\r\ncd \/mnt\/server\r\n\r\ncurl -Lo JMusicBot.jar https:\/\/github.com\/jagrosh\/MusicBot\/releases\/download\/${VERSION}\/JMusicBot-${VERSION}.jar\r\n\r\nif [ -f config.txt ]; then\r\n echo -e \"config found\"\r\nelse\r\n echo -e \"config not found getting default\"\r\n curl -Lo config.txt https:\/\/github.com\/jagrosh\/MusicBot\/releases\/download\/${VERSION}\/config.txt\r\nfi\r\n\r\necho \"Job's Done\"", - "container": "alpine:3.9", - "entrypoint": "ash" + "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, VERSION and MATCH (match is to match the filename in some way)\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\nMATCH=\"All\"\r\n\r\nif [ -z \"${GITHUB_USER}\" ] && [ -z \"${GITHUB_OAUTH_TOKEN}\" ] ; then\r\n echo -e \"using anon api call\"\r\nelse\r\n echo -e \"user and oauth token set\"\r\n alias curl='curl -u ${GITHUB_USER}:${GITHUB_OAUTH_TOKEN} '\r\nfi\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\n CONFIG_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i config)\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 latest release\"\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\n CONFIG_LINK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH})\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 found\"\r\nelse\r\n echo -e \"config not found getting default\"\r\n curl -Lo config.txt ${CONFIG_LINK}\r\nfi\r\n\r\necho \"Job's Done\"", + "container": "debian:buster-slim", + "entrypoint": "\/bin\/bash" } }, "variables": [