From 524cf0857564edda36a3fce36cb653a97b7fa681 Mon Sep 17 00:00:00 2001 From: Exonical Date: Thu, 1 Mar 2018 08:34:22 -0500 Subject: [PATCH 001/393] Add 7 Days to Die --- 7DTD/7DaysToDie/egg-7-days-to-die.json | 54 ++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 7DTD/7DaysToDie/egg-7-days-to-die.json diff --git a/7DTD/7DaysToDie/egg-7-days-to-die.json b/7DTD/7DaysToDie/egg-7-days-to-die.json new file mode 100644 index 00000000..c8c7da0e --- /dev/null +++ b/7DTD/7DaysToDie/egg-7-days-to-die.json @@ -0,0 +1,54 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-03-01T08:34:00-05:00", + "name": "7 Days to Die", + "author": "brycea@rapidnetworks.org", + "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.", + "image": "quay.io\/exonical\/7-days-to-die", + "startup": ".\/startserver.sh -configfile=serverconfig.xml -nographics -logfile 7DaysToDie_Data\/output_log.txt $@", + "config": { + "files": "{\r\n \"serverconfig.xml\": {\r\n \"parser\": \"xml\",\r\n \"find\": {\r\n \"ServerPort\": \"{{server.build.default.port}}\",\r\n \"ServerName\": \"{{server.build.env.HOSTNAME}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"\",\r\n \"userInteraction\": []\r\n}", + "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "apt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\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\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 320850 +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so", + "container": "ubuntu:16.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Steam Username", + "description": "", + "env_variable": "steam_user", + "default_value": "anonymous", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:50" + }, + { + "name": "Steam Password", + "description": "", + "env_variable": "steam_pass", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" + }, + { + "name": "Hostname", + "description": "Name of the server that appears publicly.", + "env_variable": "HOSTNAME", + "default_value": "My Server", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:64" + } + ] +} \ No newline at end of file From 80db4392301e50d4201895cfc88e75afba8359c2 Mon Sep 17 00:00:00 2001 From: Exonical Date: Thu, 1 Mar 2018 08:36:08 -0500 Subject: [PATCH 002/393] Update --- 7DTD/7DaysToDie/egg-7-days-to-die.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/7DTD/7DaysToDie/egg-7-days-to-die.json b/7DTD/7DaysToDie/egg-7-days-to-die.json index c8c7da0e..cdf66f73 100644 --- a/7DTD/7DaysToDie/egg-7-days-to-die.json +++ b/7DTD/7DaysToDie/egg-7-days-to-die.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-03-01T08:34:00-05:00", + "exported_at": "2018-03-01T08:35:50-05:00", "name": "7 Days to Die", "author": "brycea@rapidnetworks.org", "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.", @@ -12,12 +12,12 @@ "config": { "files": "{\r\n \"serverconfig.xml\": {\r\n \"parser\": \"xml\",\r\n \"find\": {\r\n \"ServerPort\": \"{{server.build.default.port}}\",\r\n \"ServerName\": \"{{server.build.env.HOSTNAME}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "^C" }, "scripts": { "installation": { - "script": "apt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\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\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 320850 +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so", + "script": "apt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\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\nchown -R root:root \/mnt\r\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login ${steam_user} ${steam_pass} +force_install_dir \/mnt\/server +app_update 320850 +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so", "container": "ubuntu:16.04", "entrypoint": "bash" } From 90dd064aaaf2d2871dda47726391ad8979383f80 Mon Sep 17 00:00:00 2001 From: Exonical Date: Thu, 1 Mar 2018 17:26:52 -0500 Subject: [PATCH 003/393] Update --- 7DTD/7DaysToDie/egg-7-days-to-die.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/7DTD/7DaysToDie/egg-7-days-to-die.json b/7DTD/7DaysToDie/egg-7-days-to-die.json index cdf66f73..05037330 100644 --- a/7DTD/7DaysToDie/egg-7-days-to-die.json +++ b/7DTD/7DaysToDie/egg-7-days-to-die.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-03-01T08:35:50-05:00", + "exported_at": "2018-03-01T17:26:17-05:00", "name": "7 Days to Die", "author": "brycea@rapidnetworks.org", "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.", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "apt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\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\nchown -R root:root \/mnt\r\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login ${steam_user} ${steam_pass} +force_install_dir \/mnt\/server +app_update 320850 +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so", + "script": "apt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\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\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\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so", "container": "ubuntu:16.04", "entrypoint": "bash" } From d0f79e117fb3f0e0c530583d6023d2ec698be759 Mon Sep 17 00:00:00 2001 From: Daave Date: Sat, 24 Mar 2018 09:53:38 +0000 Subject: [PATCH 004/393] Added arma 3 egg --- RVR4/egg-arma3.json | 108 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 RVR4/egg-arma3.json diff --git a/RVR4/egg-arma3.json b/RVR4/egg-arma3.json new file mode 100644 index 00000000..11380156 --- /dev/null +++ b/RVR4/egg-arma3.json @@ -0,0 +1,108 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-03-24T09:51:46+00:00", + "name": "Arma 3", + "author": "daave@aaathats3as.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.", + "image": "quay.io\/daave\/containers:rvr4", + "startup": ".\/arma3server -netlog -ip=0.0.0.0 -port={{SERVER_PORT}} -cfg={{CFG}} -config={{CONFIG}} {{CUSTOM}} -mod=\"{{MODS}}\" -serverMod=\"{{SERVERMODS}}\"", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Connected to Steam servers\",\r\n \"userInteraction\": []\r\n}", + "logs": "{\r\n \"custom\": true,\r\n \"location\": \"latest.log\"\r\n}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/ash\r\n# steamcmd: Installation Script\r\n# \r\napk update\r\napk add tar curl\r\n\r\ncd \/tmp\r\n\r\ncurl -sSLO http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" && mkdir -p \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\nmkdir -p \/mnt\/server\/server\/logs\r\ntouch mnt\/server\/latest.log\r\ntar -xzvf steamcmd_linux.tar.gz -C \/mnt\/server\/steamcmd", + "container": "alpine:3.4", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Update Server", + "description": "Set to 1 to update the server, otherwise keep at 0", + "env_variable": "UPDATE", + "default_value": "0", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|boolean" + }, + { + "name": "Game App ID", + "description": "Steam CMD App ID.", + "env_variable": "APP_ID", + "default_value": "233780", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|alpha_dash|between:1,100" + }, + { + "name": "Config CFG", + "description": "Config CFG", + "env_variable": "CFG", + "default_value": "cfg.cfg", + "user_viewable": 1, + "user_editable": 1, + "rules": "string" + }, + { + "name": "Config", + "description": "Config", + "env_variable": "CONFIG", + "default_value": "config.cfg", + "user_viewable": 1, + "user_editable": 1, + "rules": "string" + }, + { + "name": "Custom Command Line Option.", + "description": "Put -autoinit or related things in here :)", + "env_variable": "CUSTOM", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "string" + }, + { + "name": "SERVERMODS", + "description": "This is where you put the files that go along with the -serverMods startup option.", + "env_variable": "SERVERMODS", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "string" + }, + { + "name": "Mods", + "description": "This is where you put mods that go along with the -mods startup option", + "env_variable": "MODS", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "string" + }, + { + "name": "Steam User", + "description": "Admin only", + "env_variable": "STEAM_USER", + "default_value": "", + "user_viewable": 0, + "user_editable": 0, + "rules": "required|string" + }, + { + "name": "STEAM_PASS", + "description": "STEAM_PASS", + "env_variable": "STEAM_PASS", + "default_value": "", + "user_viewable": 0, + "user_editable": 0, + "rules": "required|string" + } + ] +} From 47dc12e52fe308984175de929c8ee830ad721883 Mon Sep 17 00:00:00 2001 From: Daave Date: Sun, 25 Mar 2018 14:45:24 +0100 Subject: [PATCH 005/393] added arma 3 to the readme --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 75ec01cd..6aca4ff4 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,10 @@ The [SA:MP](https://www.sa-mp.com/) GTA San Andreas dedicated server #### factorio The [Factorio](https://factorio.com/) dedicated server +### RVR4 +#### Arma 3 +The [Arma 3](https://arma3.com/) dedicated server + ### Terraria #### tShock The [tShock](https://tshock.co) modded server. From a1fc07e9ce55a38017bf3cac26c5bdbf9450b3f2 Mon Sep 17 00:00:00 2001 From: Daave Date: Tue, 27 Mar 2018 14:59:32 +0100 Subject: [PATCH 006/393] Moving egg --- RVR4/egg-arma3.json | 108 -------------------------------------------- 1 file changed, 108 deletions(-) delete mode 100644 RVR4/egg-arma3.json diff --git a/RVR4/egg-arma3.json b/RVR4/egg-arma3.json deleted file mode 100644 index 11380156..00000000 --- a/RVR4/egg-arma3.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2018-03-24T09:51:46+00:00", - "name": "Arma 3", - "author": "daave@aaathats3as.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.", - "image": "quay.io\/daave\/containers:rvr4", - "startup": ".\/arma3server -netlog -ip=0.0.0.0 -port={{SERVER_PORT}} -cfg={{CFG}} -config={{CONFIG}} {{CUSTOM}} -mod=\"{{MODS}}\" -serverMod=\"{{SERVERMODS}}\"", - "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"Connected to Steam servers\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"latest.log\"\r\n}", - "stop": "^C" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/ash\r\n# steamcmd: Installation Script\r\n# \r\napk update\r\napk add tar curl\r\n\r\ncd \/tmp\r\n\r\ncurl -sSLO http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" && mkdir -p \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\nmkdir -p \/mnt\/server\/server\/logs\r\ntouch mnt\/server\/latest.log\r\ntar -xzvf steamcmd_linux.tar.gz -C \/mnt\/server\/steamcmd", - "container": "alpine:3.4", - "entrypoint": "ash" - } - }, - "variables": [ - { - "name": "Update Server", - "description": "Set to 1 to update the server, otherwise keep at 0", - "env_variable": "UPDATE", - "default_value": "0", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|boolean" - }, - { - "name": "Game App ID", - "description": "Steam CMD App ID.", - "env_variable": "APP_ID", - "default_value": "233780", - "user_viewable": 1, - "user_editable": 0, - "rules": "required|alpha_dash|between:1,100" - }, - { - "name": "Config CFG", - "description": "Config CFG", - "env_variable": "CFG", - "default_value": "cfg.cfg", - "user_viewable": 1, - "user_editable": 1, - "rules": "string" - }, - { - "name": "Config", - "description": "Config", - "env_variable": "CONFIG", - "default_value": "config.cfg", - "user_viewable": 1, - "user_editable": 1, - "rules": "string" - }, - { - "name": "Custom Command Line Option.", - "description": "Put -autoinit or related things in here :)", - "env_variable": "CUSTOM", - "default_value": "", - "user_viewable": 1, - "user_editable": 1, - "rules": "string" - }, - { - "name": "SERVERMODS", - "description": "This is where you put the files that go along with the -serverMods startup option.", - "env_variable": "SERVERMODS", - "default_value": "", - "user_viewable": 1, - "user_editable": 1, - "rules": "string" - }, - { - "name": "Mods", - "description": "This is where you put mods that go along with the -mods startup option", - "env_variable": "MODS", - "default_value": "", - "user_viewable": 1, - "user_editable": 1, - "rules": "string" - }, - { - "name": "Steam User", - "description": "Admin only", - "env_variable": "STEAM_USER", - "default_value": "", - "user_viewable": 0, - "user_editable": 0, - "rules": "required|string" - }, - { - "name": "STEAM_PASS", - "description": "STEAM_PASS", - "env_variable": "STEAM_PASS", - "default_value": "", - "user_viewable": 0, - "user_editable": 0, - "rules": "required|string" - } - ] -} From a028a8f0e6ec7378ca393822e3f1d30f4801ed8c Mon Sep 17 00:00:00 2001 From: Daave Date: Tue, 27 Mar 2018 15:00:02 +0100 Subject: [PATCH 007/393] Updated egg and moved it to follow file structure --- RVR4/Arma 3/egg-arma3.json | 108 +++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 RVR4/Arma 3/egg-arma3.json diff --git a/RVR4/Arma 3/egg-arma3.json b/RVR4/Arma 3/egg-arma3.json new file mode 100644 index 00000000..81652c0d --- /dev/null +++ b/RVR4/Arma 3/egg-arma3.json @@ -0,0 +1,108 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-03-27T14:57:10+01:00", + "name": "Arma 3", + "author": "daave@aaathats3as.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.", + "image": "quay.io\/daave\/containers:rvr4", + "startup": ".\/arma3server -netlog -ip=0.0.0.0 -port={{SERVER_PORT}} -cfg={{CFG}} -config={{CONFIG}} {{CUSTOM}} -mod=\"{{MODS}}\" -serverMod=\"{{SERVERMODS}}\"", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Connected to Steam servers\",\r\n \"userInteraction\": []\r\n}", + "logs": "{\r\n \"custom\": true,\r\n \"location\": \"latest.log\"\r\n}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/ash\r\n# steamcmd: Installation Script\r\n# \r\napk update\r\napk add tar curl\r\n\r\ncd \/tmp\r\n\r\ncurl -sSLO http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" && mkdir -p \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\nmkdir -p \/mnt\/server\/server\/logs\r\ntouch mnt\/server\/latest.log\r\ntar -xzvf steamcmd_linux.tar.gz -C \/mnt\/server\/steamcmd", + "container": "alpine:3.4", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Update Server", + "description": "Set to 1 to update the server, otherwise keep at 0", + "env_variable": "UPDATE", + "default_value": "0", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|boolean" + }, + { + "name": "Game App ID", + "description": "Steam CMD App ID.", + "env_variable": "APP_ID", + "default_value": "233780", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|alpha_dash|between:1,100" + }, + { + "name": "Config CFG", + "description": "Config CFG", + "env_variable": "CFG", + "default_value": "cfg.cfg", + "user_viewable": 1, + "user_editable": 1, + "rules": "string|nullable" + }, + { + "name": "Config", + "description": "Config", + "env_variable": "CONFIG", + "default_value": "config.cfg", + "user_viewable": 1, + "user_editable": 1, + "rules": "string|nullable" + }, + { + "name": "Custom Command Line Option.", + "description": "Put -autoinit or related things in here :)", + "env_variable": "CUSTOM", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "string|nullable" + }, + { + "name": "SERVERMODS", + "description": "This is where you put the files that go along with the -serverMods startup option.", + "env_variable": "SERVERMODS", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "string|nullable" + }, + { + "name": "Mods", + "description": "This is where you put mods that go along with the -mods startup option", + "env_variable": "MODS", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "string|nullable" + }, + { + "name": "Steam User", + "description": "Admin only", + "env_variable": "STEAM_USER", + "default_value": "", + "user_viewable": 0, + "user_editable": 0, + "rules": "required|string" + }, + { + "name": "STEAM_PASS", + "description": "STEAM_PASS", + "env_variable": "STEAM_PASS", + "default_value": "", + "user_viewable": 0, + "user_editable": 0, + "rules": "required|string" + } + ] +} From 0ae7134395a1bb1a5872a8b8c0777f5dda01e1e2 Mon Sep 17 00:00:00 2001 From: Exonical Date: Sun, 8 Apr 2018 03:02:16 -0400 Subject: [PATCH 008/393] Add Hurtworld --- Hurtworld/hurtworld/egg-hurtworld.json | 63 ++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 Hurtworld/hurtworld/egg-hurtworld.json diff --git a/Hurtworld/hurtworld/egg-hurtworld.json b/Hurtworld/hurtworld/egg-hurtworld.json new file mode 100644 index 00000000..9e1d5fb6 --- /dev/null +++ b/Hurtworld/hurtworld/egg-hurtworld.json @@ -0,0 +1,63 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-04-08T03:01:49-04:00", + "name": "Hurtworld", + "author": "brycea@rapidnetworks.org", + "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\/exonical\/pterodactyl-hurtworld:hurtworld", + "startup": ".\/Hurtworld.x86_64 -batchmode -nographics -exec \"host {{SERVER_PORT}};queryport {{QUERY_PORT}};maxplayers {{MAX_PLAYERS}};servername {{HOSTNAME}}\" -logfile output.txt", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Mono config path = '\/home\/container\/Hurtworld_Data\/Mono\/etc'\",\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# Hurtworld 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 ${SERVER_APPID} +quit\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": "Game ID", + "description": "The ID corresponding to the game to download and run using SRCDS.", + "env_variable": "SERVER_APPID", + "default_value": "405100", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|regex:\/^(405100)$\/" + }, + { + "name": "Query Port", + "description": "Server Query Default Port", + "env_variable": "QUERY_PORT", + "default_value": "12881", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|string" + }, + { + "name": "Max Players", + "description": "Max players allowed on the server at one time.", + "env_variable": "MAX_PLAYERS", + "default_value": "60", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:60" + }, + { + "name": "Server Name", + "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, + "rules": "required|string|max:50" + } + ] +} \ No newline at end of file From bad745d5ce45b284c4cc921b2522eefc3d2aa6e6 Mon Sep 17 00:00:00 2001 From: Exonical Date: Sun, 8 Apr 2018 03:03:42 -0400 Subject: [PATCH 009/393] Remove Hurtworld --- Hurtworld/hurtworld/egg-hurtworld.json | 63 -------------------------- 1 file changed, 63 deletions(-) delete mode 100644 Hurtworld/hurtworld/egg-hurtworld.json diff --git a/Hurtworld/hurtworld/egg-hurtworld.json b/Hurtworld/hurtworld/egg-hurtworld.json deleted file mode 100644 index 9e1d5fb6..00000000 --- a/Hurtworld/hurtworld/egg-hurtworld.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2018-04-08T03:01:49-04:00", - "name": "Hurtworld", - "author": "brycea@rapidnetworks.org", - "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\/exonical\/pterodactyl-hurtworld:hurtworld", - "startup": ".\/Hurtworld.x86_64 -batchmode -nographics -exec \"host {{SERVER_PORT}};queryport {{QUERY_PORT}};maxplayers {{MAX_PLAYERS}};servername {{HOSTNAME}}\" -logfile output.txt", - "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"Mono config path = '\/home\/container\/Hurtworld_Data\/Mono\/etc'\",\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# Hurtworld 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 ${SERVER_APPID} +quit\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": "Game ID", - "description": "The ID corresponding to the game to download and run using SRCDS.", - "env_variable": "SERVER_APPID", - "default_value": "405100", - "user_viewable": 1, - "user_editable": 0, - "rules": "required|regex:\/^(405100)$\/" - }, - { - "name": "Query Port", - "description": "Server Query Default Port", - "env_variable": "QUERY_PORT", - "default_value": "12881", - "user_viewable": 1, - "user_editable": 0, - "rules": "required|string" - }, - { - "name": "Max Players", - "description": "Max players allowed on the server at one time.", - "env_variable": "MAX_PLAYERS", - "default_value": "60", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:60" - }, - { - "name": "Server Name", - "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, - "rules": "required|string|max:50" - } - ] -} \ No newline at end of file From 8ad7356e070cdf7cc4fb7e539689bda3981b6c07 Mon Sep 17 00:00:00 2001 From: Exonical Date: Sun, 8 Apr 2018 03:04:15 -0400 Subject: [PATCH 010/393] Add Hurtworld remove 7DTD --- 7DTD/7DaysToDie/egg-7-days-to-die.json | 54 ---------------------- Hurtworld/hurtworld/egg-hurtworld.json | 63 ++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 54 deletions(-) delete mode 100644 7DTD/7DaysToDie/egg-7-days-to-die.json create mode 100644 Hurtworld/hurtworld/egg-hurtworld.json diff --git a/7DTD/7DaysToDie/egg-7-days-to-die.json b/7DTD/7DaysToDie/egg-7-days-to-die.json deleted file mode 100644 index 05037330..00000000 --- a/7DTD/7DaysToDie/egg-7-days-to-die.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-03-01T17:26:17-05:00", - "name": "7 Days to Die", - "author": "brycea@rapidnetworks.org", - "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.", - "image": "quay.io\/exonical\/7-days-to-die", - "startup": ".\/startserver.sh -configfile=serverconfig.xml -nographics -logfile 7DaysToDie_Data\/output_log.txt $@", - "config": { - "files": "{\r\n \"serverconfig.xml\": {\r\n \"parser\": \"xml\",\r\n \"find\": {\r\n \"ServerPort\": \"{{server.build.default.port}}\",\r\n \"ServerName\": \"{{server.build.env.HOSTNAME}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", - "stop": "^C" - }, - "scripts": { - "installation": { - "script": "apt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\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\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\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so", - "container": "ubuntu:16.04", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Steam Username", - "description": "", - "env_variable": "steam_user", - "default_value": "anonymous", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:50" - }, - { - "name": "Steam Password", - "description": "", - "env_variable": "steam_pass", - "default_value": "", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:20" - }, - { - "name": "Hostname", - "description": "Name of the server that appears publicly.", - "env_variable": "HOSTNAME", - "default_value": "My Server", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:64" - } - ] -} \ No newline at end of file diff --git a/Hurtworld/hurtworld/egg-hurtworld.json b/Hurtworld/hurtworld/egg-hurtworld.json new file mode 100644 index 00000000..9e1d5fb6 --- /dev/null +++ b/Hurtworld/hurtworld/egg-hurtworld.json @@ -0,0 +1,63 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-04-08T03:01:49-04:00", + "name": "Hurtworld", + "author": "brycea@rapidnetworks.org", + "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\/exonical\/pterodactyl-hurtworld:hurtworld", + "startup": ".\/Hurtworld.x86_64 -batchmode -nographics -exec \"host {{SERVER_PORT}};queryport {{QUERY_PORT}};maxplayers {{MAX_PLAYERS}};servername {{HOSTNAME}}\" -logfile output.txt", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Mono config path = '\/home\/container\/Hurtworld_Data\/Mono\/etc'\",\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# Hurtworld 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 ${SERVER_APPID} +quit\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": "Game ID", + "description": "The ID corresponding to the game to download and run using SRCDS.", + "env_variable": "SERVER_APPID", + "default_value": "405100", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|regex:\/^(405100)$\/" + }, + { + "name": "Query Port", + "description": "Server Query Default Port", + "env_variable": "QUERY_PORT", + "default_value": "12881", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|string" + }, + { + "name": "Max Players", + "description": "Max players allowed on the server at one time.", + "env_variable": "MAX_PLAYERS", + "default_value": "60", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:60" + }, + { + "name": "Server Name", + "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, + "rules": "required|string|max:50" + } + ] +} \ No newline at end of file From 52236d24eacb82831ecd7449a80d4380a5d235f0 Mon Sep 17 00:00:00 2001 From: Exonical Date: Sun, 8 Apr 2018 03:10:12 -0400 Subject: [PATCH 011/393] Update Start Detection --- Hurtworld/hurtworld/egg-hurtworld.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hurtworld/hurtworld/egg-hurtworld.json b/Hurtworld/hurtworld/egg-hurtworld.json index 9e1d5fb6..0899152f 100644 --- a/Hurtworld/hurtworld/egg-hurtworld.json +++ b/Hurtworld/hurtworld/egg-hurtworld.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-04-08T03:01:49-04:00", + "exported_at": "2018-04-08T03:09:47-04:00", "name": "Hurtworld", "author": "brycea@rapidnetworks.org", "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.", @@ -11,7 +11,7 @@ "startup": ".\/Hurtworld.x86_64 -batchmode -nographics -exec \"host {{SERVER_PORT}};queryport {{QUERY_PORT}};maxplayers {{MAX_PLAYERS}};servername {{HOSTNAME}}\" -logfile output.txt", "config": { "files": "{}", - "startup": "{\r\n \"done\": \"Mono config path = '\/home\/container\/Hurtworld_Data\/Mono\/etc'\",\r\n \"userInteraction\": []\r\n}", + "startup": "{\r\n \"done\": \"Found path: \/home\/container\/Hurtworld.x86_64\",\r\n \"userInteraction\": []\r\n}", "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "^C" }, From 2180a8db08760da306aa4ee5c44c87878d1ebeb5 Mon Sep 17 00:00:00 2001 From: Daave Date: Sat, 21 Apr 2018 23:01:04 +0100 Subject: [PATCH 012/393] Changed variables and updated image. --- RVR4/Arma 3/egg-arma3.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/RVR4/Arma 3/egg-arma3.json b/RVR4/Arma 3/egg-arma3.json index 81652c0d..191f9e87 100644 --- a/RVR4/Arma 3/egg-arma3.json +++ b/RVR4/Arma 3/egg-arma3.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-03-27T14:57:10+01:00", + "exported_at": "2018-04-21T23:00:00+01:00", "name": "Arma 3", "author": "daave@aaathats3as.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.", @@ -25,7 +25,7 @@ "variables": [ { "name": "Update Server", - "description": "Set to 1 to update the server, otherwise keep at 0", + "description": "Set this to `1` to update the server, otherwise, keep at `0`.", "env_variable": "UPDATE", "default_value": "0", "user_viewable": 1, @@ -93,7 +93,7 @@ "default_value": "", "user_viewable": 0, "user_editable": 0, - "rules": "required|string" + "rules": "nullable|string" }, { "name": "STEAM_PASS", @@ -102,7 +102,7 @@ "default_value": "", "user_viewable": 0, "user_editable": 0, - "rules": "required|string" + "rules": "nullable|string" } ] } From f8cb9d364035ea2cdc4849907074db0a9c9a0362 Mon Sep 17 00:00:00 2001 From: Daave Date: Sat, 21 Apr 2018 23:02:08 +0100 Subject: [PATCH 013/393] Initial install bit --- RVR4/Arma 3/egg-arma3.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RVR4/Arma 3/egg-arma3.json b/RVR4/Arma 3/egg-arma3.json index 191f9e87..ddff3f2a 100644 --- a/RVR4/Arma 3/egg-arma3.json +++ b/RVR4/Arma 3/egg-arma3.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-04-21T23:00:00+01:00", + "exported_at": "2018-04-21T23:01:51+01:00", "name": "Arma 3", "author": "daave@aaathats3as.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.", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# steamcmd: Installation Script\r\n# \r\napk update\r\napk add tar curl\r\n\r\ncd \/tmp\r\n\r\ncurl -sSLO http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" && mkdir -p \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\nmkdir -p \/mnt\/server\/server\/logs\r\ntouch mnt\/server\/latest.log\r\ntar -xzvf steamcmd_linux.tar.gz -C \/mnt\/server\/steamcmd", + "script": "#!\/bin\/ash\r\n# steamcmd: Installation Script\r\n# \r\napk update\r\napk add tar curl\r\n\r\ncd \/tmp\r\n\r\ncurl -sSLO http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" && mkdir -p \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\nmkdir -p \/mnt\/server\/server\/logs\r\ntouch mnt\/server\/latest.log\r\ntar -xzvf steamcmd_linux.tar.gz -C \/mnt\/server\/steamcmd\r\n\/mnt\/server\/steamcmd\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} +force_install_dir \/home\/container\/server +app_update ${APP_ID} validate +quit", "container": "alpine:3.4", "entrypoint": "ash" } From 5b53d828e0a34b03ac0bcbbac5c7a7663c34cecd Mon Sep 17 00:00:00 2001 From: Exonical Date: Mon, 14 May 2018 02:11:07 -0400 Subject: [PATCH 014/393] update container --- Hurtworld/hurtworld/egg-hurtworld.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hurtworld/hurtworld/egg-hurtworld.json b/Hurtworld/hurtworld/egg-hurtworld.json index 0899152f..1e83a89b 100644 --- a/Hurtworld/hurtworld/egg-hurtworld.json +++ b/Hurtworld/hurtworld/egg-hurtworld.json @@ -7,7 +7,7 @@ "name": "Hurtworld", "author": "brycea@rapidnetworks.org", "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\/exonical\/pterodactyl-hurtworld:hurtworld", + "image": "quay.io\/exonical\/pterodactyl-containers:hurtworld", "startup": ".\/Hurtworld.x86_64 -batchmode -nographics -exec \"host {{SERVER_PORT}};queryport {{QUERY_PORT}};maxplayers {{MAX_PLAYERS}};servername {{HOSTNAME}}\" -logfile output.txt", "config": { "files": "{}", @@ -60,4 +60,4 @@ "rules": "required|string|max:50" } ] -} \ No newline at end of file +} From 41297f72e253b9ef4e2fb7fb04fee53190655663 Mon Sep 17 00:00:00 2001 From: Exonical Date: Sat, 2 Jun 2018 17:08:12 -0400 Subject: [PATCH 015/393] Add Egg --- .../conanexiles/egg-conan-exiles.json | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 Conan Exiles/conanexiles/egg-conan-exiles.json diff --git a/Conan Exiles/conanexiles/egg-conan-exiles.json b/Conan Exiles/conanexiles/egg-conan-exiles.json new file mode 100644 index 00000000..5c86b48c --- /dev/null +++ b/Conan Exiles/conanexiles/egg-conan-exiles.json @@ -0,0 +1,36 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-06-02T17:05:28-04:00", + "name": "Conan Exiles", + "author": "brycea@rapidnetworks.org", + "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\/exonical\/pterodactyl-containers:conanexiles", + "startup": "wine ConanSandboxServer.exe -log", + "config": { + "files": "{}", + "startup": "{}", + "logs": "{}", + "stop": "^C" + }, + "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\r\n# Get First-Time Setup Configuration Files\r\necho \"#!\/bin\/sh\r\nexport WINEARCH=win64\r\nexport WINEPREFIX=\/mnt\/server\/.wine64\r\nxvfb-run --auto-servernum --server-args='-screen 0 640x480x24:32'\r\nwine \/mnt\/server\/SpaceEngineersDedicated.exe -console\" > \/mnt\/server\/start_se.sh\r\nchmod +x \/mnt\/server\/start_se.sh", + "container": "ubuntu:18.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Game ID", + "description": "The ID corresponding to the game to download.", + "env_variable": "APPID", + "default_value": "443030", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|numeric|digits_between:1,6" + } + ] +} \ No newline at end of file From 5c4a91a8b416ae2bb5242038cfedcfb105c993e5 Mon Sep 17 00:00:00 2001 From: Exonical Date: Sat, 2 Jun 2018 17:16:46 -0400 Subject: [PATCH 016/393] remove Hurtworld for 1st PR --- Hurtworld/hurtworld/egg-hurtworld.json | 63 -------------------------- 1 file changed, 63 deletions(-) delete mode 100644 Hurtworld/hurtworld/egg-hurtworld.json diff --git a/Hurtworld/hurtworld/egg-hurtworld.json b/Hurtworld/hurtworld/egg-hurtworld.json deleted file mode 100644 index 1e83a89b..00000000 --- a/Hurtworld/hurtworld/egg-hurtworld.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2018-04-08T03:09:47-04:00", - "name": "Hurtworld", - "author": "brycea@rapidnetworks.org", - "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\/exonical\/pterodactyl-containers:hurtworld", - "startup": ".\/Hurtworld.x86_64 -batchmode -nographics -exec \"host {{SERVER_PORT}};queryport {{QUERY_PORT}};maxplayers {{MAX_PLAYERS}};servername {{HOSTNAME}}\" -logfile output.txt", - "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"Found path: \/home\/container\/Hurtworld.x86_64\",\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# Hurtworld 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 ${SERVER_APPID} +quit\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": "Game ID", - "description": "The ID corresponding to the game to download and run using SRCDS.", - "env_variable": "SERVER_APPID", - "default_value": "405100", - "user_viewable": 1, - "user_editable": 0, - "rules": "required|regex:\/^(405100)$\/" - }, - { - "name": "Query Port", - "description": "Server Query Default Port", - "env_variable": "QUERY_PORT", - "default_value": "12881", - "user_viewable": 1, - "user_editable": 0, - "rules": "required|string" - }, - { - "name": "Max Players", - "description": "Max players allowed on the server at one time.", - "env_variable": "MAX_PLAYERS", - "default_value": "60", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:60" - }, - { - "name": "Server Name", - "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, - "rules": "required|string|max:50" - } - ] -} From f66b572a89b06a4eb5de54157127875ddaf5861e Mon Sep 17 00:00:00 2001 From: Daave Date: Sun, 17 Jun 2018 00:42:23 +0100 Subject: [PATCH 017/393] Changed installation script --- RVR4/Arma 3/egg-arma3.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/RVR4/Arma 3/egg-arma3.json b/RVR4/Arma 3/egg-arma3.json index ddff3f2a..648b262d 100644 --- a/RVR4/Arma 3/egg-arma3.json +++ b/RVR4/Arma 3/egg-arma3.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-04-21T23:01:51+01:00", + "exported_at": "2018-06-17T00:41:46+01:00", "name": "Arma 3", "author": "daave@aaathats3as.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.", @@ -17,9 +17,9 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# steamcmd: Installation Script\r\n# \r\napk update\r\napk add tar curl\r\n\r\ncd \/tmp\r\n\r\ncurl -sSLO http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" && mkdir -p \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\nmkdir -p \/mnt\/server\/server\/logs\r\ntouch mnt\/server\/latest.log\r\ntar -xzvf steamcmd_linux.tar.gz -C \/mnt\/server\/steamcmd\r\n\/mnt\/server\/steamcmd\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} +force_install_dir \/home\/container\/server +app_update ${APP_ID} validate +quit", - "container": "alpine:3.4", - "entrypoint": "ash" + "script": "#!\/bin\/bash\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl\r\napt -y --no-install-recommends install lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSLO http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd \/mnt\/server\/logs\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\n\r\ntouch \/mnt\/server\/latest.log\r\nchown -R root:root \/mnt\r\n\r\ntar -xzvf \/tmp\/steamcmd_linux.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\nexport HOME=\/mnt\/server\r\n\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} +force_install_dir \/mnt\/server +app_update ${APP_ID} validate +quit", + "container": "ubuntu:18.04", + "entrypoint": "bash" } }, "variables": [ @@ -105,4 +105,4 @@ "rules": "nullable|string" } ] -} +} \ No newline at end of file From 0e1cc0b8570ffa228bb22d0cc2ee08698257a834 Mon Sep 17 00:00:00 2001 From: Shirobaka Date: Fri, 14 Sep 2018 11:09:32 +0200 Subject: [PATCH 018/393] Create egg-multi-theft-auto.json --- gta/mtasa/egg-multi-theft-auto.json | 36 +++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 gta/mtasa/egg-multi-theft-auto.json diff --git a/gta/mtasa/egg-multi-theft-auto.json b/gta/mtasa/egg-multi-theft-auto.json new file mode 100644 index 00000000..fe7c56db --- /dev/null +++ b/gta/mtasa/egg-multi-theft-auto.json @@ -0,0 +1,36 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-09-14T11:08:12+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\/bl4ckspr4y\/pterodactyl-images:mtasa", + "startup": ".\/mta-server64 --port {{SERVER_PORT}} --httpport {{SERVER_WEBPORT}}", + "config": { + "files": null, + "startup": "{\r\n \"done\": \"Server started and is ready to accept connections\"\r\n}", + "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "stop": "shutdown" + }, + "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 -sSL -o multitheftauto_linux_x64.tar.gz https:\/\/linux.mtasa.com\/dl\/multitheftauto_linux_x64.tar.gz\r\ncurl -sSL -o mta-baseconfig.tar.gz https:\/\/linux.mtasa.com\/dl\/baseconfig.tar.gz\r\ncurl -sSL -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 -C \/mnt\/server\/\r\ncp -r \/mnt\/server\/multitheftauto_linux_x64\/* \/mnt\/server\r\nrm -rf \/mnt\/server\/multitheftauto_linux_x64\/\r\n\r\nmkdir -p \/mnt\/server\/mods\/deathmatch\/resources\r\nunzip -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 -C \/mnt\/server-conf\r\ncp -r \/mnt\/server-conf\/baseconfig\/* \/mnt\/server\/mods\/deathmatch\r\nrm -rf \/mnt\/server-conf\r\n\r\nchown -R root:root \/mnt\r\n\r\nexport HOME=\/mnt\/server", + "container": "ubuntu:16.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "SERVER_WEBPORT", + "description": "The http port for web resource", + "env_variable": "SERVER_WEBPORT", + "default_value": "22005", + "user_viewable": 0, + "user_editable": 0, + "rules": "required|numeric" + } + ] +} From bdc142db5db6f28a0554bcc81cee008c27328cb0 Mon Sep 17 00:00:00 2001 From: Shirobaka Date: Fri, 14 Sep 2018 11:12:03 +0200 Subject: [PATCH 019/393] Create README.md --- gta/mtasa/README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 gta/mtasa/README.md diff --git a/gta/mtasa/README.md b/gta/mtasa/README.md new file mode 100644 index 00000000..67d13a8f --- /dev/null +++ b/gta/mtasa/README.md @@ -0,0 +1,2 @@ +# Multi Theft Auto +[Multi Theft Auto](https://mtasa.com/) is a Open Source Grand Theft Auto: San Andreas Multiplayer modification. From a45b82639c89225b0bd26a3b1bb867733acc81a9 Mon Sep 17 00:00:00 2001 From: Shirobaka Date: Fri, 14 Sep 2018 11:13:41 +0200 Subject: [PATCH 020/393] Update README.md --- gta/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gta/README.md b/gta/README.md index e5cd3d17..0106aa42 100644 --- a/gta/README.md +++ b/gta/README.md @@ -12,3 +12,6 @@ RAGE Multiplayer is an multiplayer modification for Grand Theft Auto V that is a [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/) +What more could you want? Multi Theft Auto provides the best online Grand Theft Auto experience there is. Read on to find out more. From a7f0559e32672af94add1c6fb6d61cbade935870 Mon Sep 17 00:00:00 2001 From: Shirobaka Date: Sat, 15 Sep 2018 19:46:36 +0200 Subject: [PATCH 021/393] Update README.md --- gta/mtasa/README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gta/mtasa/README.md b/gta/mtasa/README.md index 67d13a8f..ed5c0ff2 100644 --- a/gta/mtasa/README.md +++ b/gta/mtasa/README.md @@ -1,2 +1,14 @@ # Multi Theft Auto [Multi Theft Auto](https://mtasa.com/) is a Open Source Grand Theft Auto: San Andreas Multiplayer modification. + +### Server Ports + +Multi Theft Auto requires 3 ports. + +| Port | Default | +-------|---------- +| Game | 22003 | +| http | 22005 | +| ASE | 22126 | + +The ASE port is required to announce the server to the mta server list, this port is always the Game port (22003) +123. From dc2b93dbe992c3ff217d77011a31cbc2b7ca28db Mon Sep 17 00:00:00 2001 From: Shirobaka Date: Mon, 17 Sep 2018 21:23:34 +0200 Subject: [PATCH 022/393] Update egg-multi-theft-auto.json --- gta/mtasa/egg-multi-theft-auto.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gta/mtasa/egg-multi-theft-auto.json b/gta/mtasa/egg-multi-theft-auto.json index fe7c56db..1aeb6286 100644 --- a/gta/mtasa/egg-multi-theft-auto.json +++ b/gta/mtasa/egg-multi-theft-auto.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-09-14T11:08:12+02:00", + "exported_at": "2018-09-17T21:21:50+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\/bl4ckspr4y\/pterodactyl-images:mtasa", "startup": ".\/mta-server64 --port {{SERVER_PORT}} --httpport {{SERVER_WEBPORT}}", "config": { - "files": null, + "files": "{}", "startup": "{\r\n \"done\": \"Server started and is ready to accept connections\"\r\n}", "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "shutdown" @@ -30,7 +30,7 @@ "default_value": "22005", "user_viewable": 0, "user_editable": 0, - "rules": "required|numeric" + "rules": "required|numeric|min:22005|max:22205" } ] } From 824425e018c138c79b17065f4de0e91ece5e6c61 Mon Sep 17 00:00:00 2001 From: Shirobaka Date: Sat, 22 Sep 2018 08:43:30 +0200 Subject: [PATCH 023/393] Update egg-multi-theft-auto.json removed min and max for SERVER_WEBPORT custom variable --- gta/mtasa/egg-multi-theft-auto.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gta/mtasa/egg-multi-theft-auto.json b/gta/mtasa/egg-multi-theft-auto.json index 1aeb6286..94184d22 100644 --- a/gta/mtasa/egg-multi-theft-auto.json +++ b/gta/mtasa/egg-multi-theft-auto.json @@ -30,7 +30,7 @@ "default_value": "22005", "user_viewable": 0, "user_editable": 0, - "rules": "required|numeric|min:22005|max:22205" + "rules": "required|numeric" } ] } From 8285fd57557fc2dbeb20b676d3fa7271b619a3d3 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 28 Sep 2018 15:10:39 -0400 Subject: [PATCH 024/393] Change to mc category folders --- README.md | 20 +++++++++---------- {minecraft_pe => minecraft_bedrock}/README.md | 0 .../bedrock/README.md | 0 .../bedrock/egg-vanilla-bedrock.json | 0 .../nukkit/egg-nukkit.json | 0 .../nukkit/nukkit.yml | 0 .../nukkit/server.properties | 0 .../pocketmine_mp/egg-pocketmine-m-p.json | 0 .../pocketmine_mp/server.properties | 0 {minecraft => minecraft_java}/README.md | 0 .../forge-enhanced/egg-forge--enhanced.json | 0 .../forge/forge-generic/README.md | 0 .../forge-generic/egg-forge-generic.json | 0 .../feed-the-beast/egg-feed-the-beast.json | 0 .../ftb-revelation/egg-f-t-b-revelation.json | 0 .../spigot/paper-spigot/egg-paper-spigot.json | 0 .../spigot-enhanced/egg-spigot--enhanced.json | 0 .../spigot/taco-spigot/egg-taco-spigot.json | 0 .../technic/blightfall/egg-blightfall.json | 0 .../technic/hexxit/egg-hexxit.json | 0 .../tekkit-legends/egg-tekkit-legends.json | 0 21 files changed, 10 insertions(+), 10 deletions(-) rename {minecraft_pe => minecraft_bedrock}/README.md (100%) rename {minecraft_pe => minecraft_bedrock}/bedrock/README.md (100%) rename {minecraft_pe => minecraft_bedrock}/bedrock/egg-vanilla-bedrock.json (100%) rename {minecraft_pe => minecraft_bedrock}/nukkit/egg-nukkit.json (100%) rename {minecraft_pe => minecraft_bedrock}/nukkit/nukkit.yml (100%) rename {minecraft_pe => minecraft_bedrock}/nukkit/server.properties (100%) rename {minecraft_pe => minecraft_bedrock}/pocketmine_mp/egg-pocketmine-m-p.json (100%) rename {minecraft_pe => minecraft_bedrock}/pocketmine_mp/server.properties (100%) rename {minecraft => minecraft_java}/README.md (100%) rename {minecraft => minecraft_java}/forge/forge-enhanced/egg-forge--enhanced.json (100%) rename {minecraft => minecraft_java}/forge/forge-generic/README.md (100%) rename {minecraft => minecraft_java}/forge/forge-generic/egg-forge-generic.json (100%) rename {minecraft => minecraft_java}/ftb/feed-the-beast/egg-feed-the-beast.json (100%) rename {minecraft => minecraft_java}/ftb/ftb-revelation/egg-f-t-b-revelation.json (100%) rename {minecraft => minecraft_java}/spigot/paper-spigot/egg-paper-spigot.json (100%) rename {minecraft => minecraft_java}/spigot/spigot-enhanced/egg-spigot--enhanced.json (100%) rename {minecraft => minecraft_java}/spigot/taco-spigot/egg-taco-spigot.json (100%) rename {minecraft => minecraft_java}/technic/blightfall/egg-blightfall.json (100%) rename {minecraft => minecraft_java}/technic/hexxit/egg-hexxit.json (100%) rename {minecraft => minecraft_java}/technic/tekkit-legends/egg-tekkit-legends.json (100%) diff --git a/README.md b/README.md index 2f48469d..9936e836 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ If you are submitting PR's try and keep names and titles the same. ## Bot Eggs [Discord](/bots/discord/) -* [ATL Bot](/bots/discord/atlbot) NodeJS +* [ATL Bot](/bots/discord/atlbot) Node JS * [parkertron](/bots/discord/parkertron/) Golang * [pixel-bot](/bots/discord/pixelbot/) Python * [Sinusbot](/bots/discord/sinusbot/) @@ -27,16 +27,16 @@ If you are submitting PR's try and keep names and titles the same. * [FiveM](/gta/fivem/) * [RageMP](/gta/ragemp/) -[Minecraft](/minecraft/) -* [Forge](/minecraft/forge/) -* [Feed The Beast](/minecraft/ftb/) -* [Spigot](/minecraft/spigot/) -* [Technic](/minecraft/technic/) +[Minecraft](/minecraft_java/) +* [Forge](/minecraft_java/forge/) +* [Feed The Beast](/minecraft_java/ftb/) +* [Spigot](/minecraft_java/spigot/) +* [Technic](/minecraft_java/technic/) -[MinecraftPE](/minecraft_pe/) -* [Bedrock](/minecraft_pe/bedrock/) -* [Nukkit](/minecraft_pe/nukkit/) -* [PocketMine MP](/minecraft_pe/pocketmine_mp/) +[MinecraftPE](/minecraft_bedrock/) +* [Bedrock](/minecraft_bedrock/bedrock/) +* [Nukkit](/minecraft_bedrock/nukkit/) +* [PocketMine MP](/minecraft_bedrock/pocketmine_mp/) [Minecraft Proxies](/minecraft_proxy/) * [Waterfall](/minecraft_proxy/waterfall/) diff --git a/minecraft_pe/README.md b/minecraft_bedrock/README.md similarity index 100% rename from minecraft_pe/README.md rename to minecraft_bedrock/README.md diff --git a/minecraft_pe/bedrock/README.md b/minecraft_bedrock/bedrock/README.md similarity index 100% rename from minecraft_pe/bedrock/README.md rename to minecraft_bedrock/bedrock/README.md diff --git a/minecraft_pe/bedrock/egg-vanilla-bedrock.json b/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json similarity index 100% rename from minecraft_pe/bedrock/egg-vanilla-bedrock.json rename to minecraft_bedrock/bedrock/egg-vanilla-bedrock.json diff --git a/minecraft_pe/nukkit/egg-nukkit.json b/minecraft_bedrock/nukkit/egg-nukkit.json similarity index 100% rename from minecraft_pe/nukkit/egg-nukkit.json rename to minecraft_bedrock/nukkit/egg-nukkit.json diff --git a/minecraft_pe/nukkit/nukkit.yml b/minecraft_bedrock/nukkit/nukkit.yml similarity index 100% rename from minecraft_pe/nukkit/nukkit.yml rename to minecraft_bedrock/nukkit/nukkit.yml diff --git a/minecraft_pe/nukkit/server.properties b/minecraft_bedrock/nukkit/server.properties similarity index 100% rename from minecraft_pe/nukkit/server.properties rename to minecraft_bedrock/nukkit/server.properties diff --git a/minecraft_pe/pocketmine_mp/egg-pocketmine-m-p.json b/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json similarity index 100% rename from minecraft_pe/pocketmine_mp/egg-pocketmine-m-p.json rename to minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json diff --git a/minecraft_pe/pocketmine_mp/server.properties b/minecraft_bedrock/pocketmine_mp/server.properties similarity index 100% rename from minecraft_pe/pocketmine_mp/server.properties rename to minecraft_bedrock/pocketmine_mp/server.properties diff --git a/minecraft/README.md b/minecraft_java/README.md similarity index 100% rename from minecraft/README.md rename to minecraft_java/README.md diff --git a/minecraft/forge/forge-enhanced/egg-forge--enhanced.json b/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json similarity index 100% rename from minecraft/forge/forge-enhanced/egg-forge--enhanced.json rename to minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json diff --git a/minecraft/forge/forge-generic/README.md b/minecraft_java/forge/forge-generic/README.md similarity index 100% rename from minecraft/forge/forge-generic/README.md rename to minecraft_java/forge/forge-generic/README.md diff --git a/minecraft/forge/forge-generic/egg-forge-generic.json b/minecraft_java/forge/forge-generic/egg-forge-generic.json similarity index 100% rename from minecraft/forge/forge-generic/egg-forge-generic.json rename to minecraft_java/forge/forge-generic/egg-forge-generic.json diff --git a/minecraft/ftb/feed-the-beast/egg-feed-the-beast.json b/minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json similarity index 100% rename from minecraft/ftb/feed-the-beast/egg-feed-the-beast.json rename to minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json diff --git a/minecraft/ftb/ftb-revelation/egg-f-t-b-revelation.json b/minecraft_java/ftb/ftb-revelation/egg-f-t-b-revelation.json similarity index 100% rename from minecraft/ftb/ftb-revelation/egg-f-t-b-revelation.json rename to minecraft_java/ftb/ftb-revelation/egg-f-t-b-revelation.json diff --git a/minecraft/spigot/paper-spigot/egg-paper-spigot.json b/minecraft_java/spigot/paper-spigot/egg-paper-spigot.json similarity index 100% rename from minecraft/spigot/paper-spigot/egg-paper-spigot.json rename to minecraft_java/spigot/paper-spigot/egg-paper-spigot.json diff --git a/minecraft/spigot/spigot-enhanced/egg-spigot--enhanced.json b/minecraft_java/spigot/spigot-enhanced/egg-spigot--enhanced.json similarity index 100% rename from minecraft/spigot/spigot-enhanced/egg-spigot--enhanced.json rename to minecraft_java/spigot/spigot-enhanced/egg-spigot--enhanced.json diff --git a/minecraft/spigot/taco-spigot/egg-taco-spigot.json b/minecraft_java/spigot/taco-spigot/egg-taco-spigot.json similarity index 100% rename from minecraft/spigot/taco-spigot/egg-taco-spigot.json rename to minecraft_java/spigot/taco-spigot/egg-taco-spigot.json diff --git a/minecraft/technic/blightfall/egg-blightfall.json b/minecraft_java/technic/blightfall/egg-blightfall.json similarity index 100% rename from minecraft/technic/blightfall/egg-blightfall.json rename to minecraft_java/technic/blightfall/egg-blightfall.json diff --git a/minecraft/technic/hexxit/egg-hexxit.json b/minecraft_java/technic/hexxit/egg-hexxit.json similarity index 100% rename from minecraft/technic/hexxit/egg-hexxit.json rename to minecraft_java/technic/hexxit/egg-hexxit.json diff --git a/minecraft/technic/tekkit-legends/egg-tekkit-legends.json b/minecraft_java/technic/tekkit-legends/egg-tekkit-legends.json similarity index 100% rename from minecraft/technic/tekkit-legends/egg-tekkit-legends.json rename to minecraft_java/technic/tekkit-legends/egg-tekkit-legends.json From 5c6eb33666bf213774b3f040270bcfd66a638282 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 28 Sep 2018 15:12:32 -0400 Subject: [PATCH 025/393] missed a part. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9936e836..1bcbc69c 100644 --- a/README.md +++ b/README.md @@ -27,13 +27,13 @@ If you are submitting PR's try and keep names and titles the same. * [FiveM](/gta/fivem/) * [RageMP](/gta/ragemp/) -[Minecraft](/minecraft_java/) +[Minecraft Java](/minecraft_java/) * [Forge](/minecraft_java/forge/) * [Feed The Beast](/minecraft_java/ftb/) * [Spigot](/minecraft_java/spigot/) * [Technic](/minecraft_java/technic/) -[MinecraftPE](/minecraft_bedrock/) +[Minecraft Bedrock](/minecraft_bedrock/) * [Bedrock](/minecraft_bedrock/bedrock/) * [Nukkit](/minecraft_bedrock/nukkit/) * [PocketMine MP](/minecraft_bedrock/pocketmine_mp/) From ac0d6aff236128382dd491522314e19cee21f55d Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 5 Oct 2018 23:25:39 -0400 Subject: [PATCH 026/393] adding tModLoader --- terraria/tmodloader/README.md | 19 +++++++ terraria/tmodloader/egg-t-modloader.json | 72 ++++++++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 terraria/tmodloader/README.md create mode 100644 terraria/tmodloader/egg-t-modloader.json diff --git a/terraria/tmodloader/README.md b/terraria/tmodloader/README.md new file mode 100644 index 00000000..be139132 --- /dev/null +++ b/terraria/tmodloader/README.md @@ -0,0 +1,19 @@ +# tModLoader +### From their [GitHub](https://github.com/blushiemagic/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 +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 +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 +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. diff --git a/terraria/tmodloader/egg-t-modloader.json b/terraria/tmodloader/egg-t-modloader.json new file mode 100644 index 00000000..6b670fd6 --- /dev/null +++ b/terraria/tmodloader/egg-t-modloader.json @@ -0,0 +1,72 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-10-05T23:24:16-04: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+.", + "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu", + "startup": ".\/tModLoaderServer.bin.x86_64 -ip 0.0.0.0 -port {{SERVER_PORT}} -maxplayers {{MAX_PLAYERS}} -world {{WORLD_NAME}}.wld -autocreate {{WORLD_SIZE}}", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Type 'help' for a list of commands\",\r\n \"userInteraction\": []\r\n}", + "logs": "{}", + "stop": "exit" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/ash\r\n# Vanilla T-shock Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\ncd \/mnt\/server\r\n\r\necho -e \"Downloading tModloader\"\r\nwget https:\/\/github.com\/blushiemagic\/tModLoader\/releases\/download\/${TMODLOADER_VERSION}\/tModLoader.Linux.${TMODLOADER_VERSION}.zip\r\n\r\necho -e \"Unpacking mod loader files\"\r\nunzip tModLoader.Linux.${TMODLOADER_VERSION}.zip\r\n\r\nCLEAN_VERSION=$(echo ${TERRARIA_VERSION} | sed 's\/\\.\/\/g')\r\n\r\necho -e \"Downloading terraria server files\"\r\nwget http:\/\/terraria.org\/server\/terraria-server-${CLEAN_VERSION}.zip\r\n\r\necho -e \"Unpacking server files\"\r\nunzip terraria-server-$(echo ${CLEAN_VERSION} | sed 's\/\\.\/\/g').zip\r\ncp -R ${CLEAN_VERSION}\/Linux\/* .\/\r\n\r\necho -e \"Cleaning up extra files.\"\r\nrm -rf ${CLEAN_VERSION}\r\n\r\nchmod +x .\/tModLoaderServer.bin.x86_64", + "container": "alpine:3.8", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "tModloader Version", + "description": "The version of tModloader that is to be used.", + "env_variable": "TMODLOADER_VERSION", + "default_value": "v0.10.1.5", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" + }, + { + "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", + "env_variable": "TERRARIA_VERSION", + "default_value": "1.3.5.3", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" + }, + { + "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" + }, + { + "name": "Max Players", + "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" + }, + { + "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": 1, + "rules": "required|numeric|digits_between:1,3" + } + ] +} \ No newline at end of file From d5deff886c425382913531d533b03e6d09c8d321 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 5 Oct 2018 23:26:52 -0400 Subject: [PATCH 027/393] updating readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 1bcbc69c..6a70c313 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,9 @@ If you are submitting PR's try and keep names and titles the same. * [PixARK](/source_servers/pixark/) [Squad](/squad/) + [Terraria](/terraria/) +* [tmodloader](/terraria/tmodloader) * [tshock](/terraria/tshock/) [Unturned](/unturned/) From ae65d3594af2b529da75cf2cb5631f0193c491fd Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sat, 6 Oct 2018 20:27:57 -0400 Subject: [PATCH 028/393] Adding Don't Starve Resolves #82 --- README.md | 2 + dont_starve/dont_starve/README.md | 20 +++++++++ dont_starve/dont_starve/egg-don-t-starve.json | 45 +++++++++++++++++++ 3 files changed, 67 insertions(+) create mode 100644 dont_starve/dont_starve/README.md create mode 100644 dont_starve/dont_starve/egg-don-t-starve.json diff --git a/README.md b/README.md index 6a70c313..d62063f6 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,8 @@ If you are submitting PR's try and keep names and titles the same. ## Game Eggs +[Don't Starve](/dont_starve/dont_starve) + [Factorio](/factorio/factorio/) [Grand Theft Auto](/gta/) * [FiveM](/gta/fivem/) diff --git a/dont_starve/dont_starve/README.md b/dont_starve/dont_starve/README.md new file mode 100644 index 00000000..37c701d3 --- /dev/null +++ b/dont_starve/dont_starve/README.md @@ -0,0 +1,20 @@ +# 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. + +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 required memory to run the server is around 512mb for a single user.. + + +### Server Ports +Don't Starve Together only requires a single port to run. The default is 7777 + +| Port | default | +|---------|---------| +| Game | 10998 | + +#### Mods/Plugins may require ports to be added to the server. diff --git a/dont_starve/dont_starve/egg-don-t-starve.json b/dont_starve/dont_starve/egg-don-t-starve.json new file mode 100644 index 00000000..e5c44d3f --- /dev/null +++ b/dont_starve/dont_starve/egg-don-t-starve.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-10-06T20:21:42-04:00", + "name": "Don't Starve", + "author": "parker@parkervcp.com", + "description": "Don\u2019t Starve is an uncompromising wilderness survival game full of science and magic.", + "image": "quay.io\/parkervcp\/pterodactyl-images:source", + "startup": "'cd bin && .\/dontstarve_dedicated_server_nullrenderer -bind_ip 0.0.0.0 -port {{SERVER_PORT}} -console -persistent_storage_root \/home\/container\/DoNotStarveTogether -conf_dir config -cluster server -players {{MAX_PLAYERS}}'", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Setting breakpad minidump AppID\",\r\n \"userInteraction\": []\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# Don't Starve 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\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 343050 +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\nmkdir -p ~\/DoNotStarveTogether\/config\/server\/\r\necho \"${SERVER_TOKEN}\" >> ~\/DoNotStarveTogether\/config\/server\/cluster_token.txt", + "container": "ubuntu:18.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Max Players", + "description": "Set the maximum number of players that will be allowed to join the game. This option overrides the [GAMEPLAY] \/ max_players setting in cluster.ini.", + "env_variable": "MAX_PLAYERS", + "default_value": "4", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|integer|between:1,31" + }, + { + "name": "Server Token", + "description": "Required to run a public server. This needs to be generated from in game.", + "env_variable": "SERVER_TOKEN", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:64" + } + ] +} \ No newline at end of file From 329a4c9e00c7c6329fa98dc1d1e8158bc6aa6d63 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sat, 6 Oct 2018 20:30:09 -0400 Subject: [PATCH 029/393] adding example server readme --- example/README.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 example/README.md diff --git a/example/README.md b/example/README.md new file mode 100644 index 00000000..94d7f62b --- /dev/null +++ b/example/README.md @@ -0,0 +1,20 @@ +# 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. + +### Minimum RAM warning +Minimum required memory to run the server. + + +### 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. From 65113f2f9a420bd58619ebe1f97e173aa4c2b9c7 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 7 Oct 2018 00:26:18 -0400 Subject: [PATCH 030/393] f you 7 days to die Gets rid of the need to have a specific 7dtd image to run the game. --- .../7_days_to_die/egg-7-days-to-die.json | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/source_servers/7_days_to_die/egg-7-days-to-die.json b/source_servers/7_days_to_die/egg-7-days-to-die.json index ba47d705..4eccc5a4 100644 --- a/source_servers/7_days_to_die/egg-7-days-to-die.json +++ b/source_servers/7_days_to_die/egg-7-days-to-die.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-07-07T19:23:03-04:00", + "exported_at": "2018-10-07T00:04:07-04:00", "name": "7 Days To Die", "author": "kristoffer.norman@bahnhof.se", "description": "7 days to die server", - "image": "quay.io\/parkervcp\/pterodactyl-images:7daystodie", - "startup": "-ServerPort=${{SERVER_PORT}} -ServerMaxPlayerCount=${{MAX_PLAYERS}} -GameDifficulty=${{GAME_DIFFICULTY}} -ControlPanelEnabled=false -TelnetEnabled=true -TelnetPort=8081", + "image": "quay.io\/parkervcp\/pterodactyl-images:source", + "startup": "'.\/7DaysToDieServer.x86_64 -configfile=serverconfig.xml -quit -batchmode -nographics -dedicated -ServerPort=26900 -ServerMaxPlayerCount=8 -GameDifficulty=1 -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": "{}", + "files": "{\r\n \"serverconfig.xml\": {\r\n \"parser\": \"xml\",\r\n \"find\": {\r\n \"ServerPort\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", "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}", "stop": "shutdown" @@ -40,6 +40,15 @@ "user_viewable": 1, "user_editable": 1, "rules": "required|integer|between:0,5" + }, + { + "name": "Source AppID", + "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, + "rules": "required|string|max:20" } ] } \ No newline at end of file From 4ac3720e57705d481f946c0ec00cf8ea507a2b96 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 7 Oct 2018 10:03:23 -0400 Subject: [PATCH 031/393] updated tModloader Resolves #84 --- terraria/tmodloader/egg-t-modloader.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terraria/tmodloader/egg-t-modloader.json b/terraria/tmodloader/egg-t-modloader.json index 6b670fd6..ba2316b1 100644 --- a/terraria/tmodloader/egg-t-modloader.json +++ b/terraria/tmodloader/egg-t-modloader.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-10-05T23:24:16-04:00", + "exported_at": "2018-10-07T10:01:51-04: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+.", "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu", - "startup": ".\/tModLoaderServer.bin.x86_64 -ip 0.0.0.0 -port {{SERVER_PORT}} -maxplayers {{MAX_PLAYERS}} -world {{WORLD_NAME}}.wld -autocreate {{WORLD_SIZE}}", + "startup": ".\/tModLoaderServer.bin.x86_64 -ip 0.0.0.0 -port ${SERVER_PORT} -maxplayers ${MAX_PLAYERS} -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}", From bffeb754d11de4b5b526d7215f9182e74b758d00 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 7 Oct 2018 18:17:08 -0400 Subject: [PATCH 032/393] Adding ARMA 3 This PR adds an ARMA 3 egg. --- arma/arma3/README.md | 20 ++++++++++++++++++++ {RVR4/Arma 3 => arma/arma3}/egg-arma3.json | 6 +++--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 arma/arma3/README.md rename {RVR4/Arma 3 => arma/arma3}/egg-arma3.json (93%) diff --git a/arma/arma3/README.md b/arma/arma3/README.md new file mode 100644 index 00000000..c5807390 --- /dev/null +++ b/arma/arma3/README.md @@ -0,0 +1,20 @@ +# Example Server Name +### From their [Site](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. + +### Minimum RAM warning +This server requires about 2048m to run properly. ARMA 3 is more CPU intensive though. + +### Additional settings +Additional server flags can be found [here](https://community.bistudio.com/wiki/Arma_3_Startup_Parameters). +This can help is you see the server using to many cores/threads on the server. + +### Server Ports +Ports required to run the server in a table format. + +| Port | default | +|---------|---------| +| Game | 2302-2304 | +| BattleEye | 2344-2345 | + +#### Mods/Plugins may require ports to be added to the server. diff --git a/RVR4/Arma 3/egg-arma3.json b/arma/arma3/egg-arma3.json similarity index 93% rename from RVR4/Arma 3/egg-arma3.json rename to arma/arma3/egg-arma3.json index 648b262d..dbbbe67b 100644 --- a/RVR4/Arma 3/egg-arma3.json +++ b/arma/arma3/egg-arma3.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-06-17T00:41:46+01:00", + "exported_at": "2018-10-07T18:03:58-04:00", "name": "Arma 3", "author": "daave@aaathats3as.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.", - "image": "quay.io\/daave\/containers:rvr4", - "startup": ".\/arma3server -netlog -ip=0.0.0.0 -port={{SERVER_PORT}} -cfg={{CFG}} -config={{CONFIG}} {{CUSTOM}} -mod=\"{{MODS}}\" -serverMod=\"{{SERVERMODS}}\"", + "image": "quay.io\/parkervcp\/pterodactyl-images:source", + "startup": ".\/arma3server -ip=0.0.0.0 -port={{SERVER_PORT}} -cfg={{CFG}} -config={{CONFIG}} {{CUSTOM}} -mod=\"{{MODS}}\" -serverMod=\"{{SERVERMODS}}\" -maxMem={{SERVER_MEMORY}}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Connected to Steam servers\",\r\n \"userInteraction\": []\r\n}", From 10c7c479c26e95f741a6274199686d943b411541 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 16 Oct 2018 13:08:52 -0400 Subject: [PATCH 033/393] updating arma 3 Removed max memory setting that was causing a crash. Resolves some issues. --- arma/arma3/egg-arma3.json | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/arma/arma3/egg-arma3.json b/arma/arma3/egg-arma3.json index dbbbe67b..d24a072a 100644 --- a/arma/arma3/egg-arma3.json +++ b/arma/arma3/egg-arma3.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-10-07T18:03:58-04:00", + "exported_at": "2018-10-16T13:07:23-04:00", "name": "Arma 3", "author": "daave@aaathats3as.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.", "image": "quay.io\/parkervcp\/pterodactyl-images:source", - "startup": ".\/arma3server -ip=0.0.0.0 -port={{SERVER_PORT}} -cfg={{CFG}} -config={{CONFIG}} {{CUSTOM}} -mod=\"{{MODS}}\" -serverMod=\"{{SERVERMODS}}\" -maxMem={{SERVER_MEMORY}}", + "startup": ".\/arma3server -ip=0.0.0.0 -port={{SERVER_PORT}} -cfg={{CFG}} -config={{CONFIG}} {{CUSTOM}} -mod=\"{{MODS}}\" -serverMod=\"{{SERVERMODS}}\"", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Connected to Steam servers\",\r\n \"userInteraction\": []\r\n}", @@ -23,15 +23,6 @@ } }, "variables": [ - { - "name": "Update Server", - "description": "Set this to `1` to update the server, otherwise, keep at `0`.", - "env_variable": "UPDATE", - "default_value": "0", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|boolean" - }, { "name": "Game App ID", "description": "Steam CMD App ID.", From 060d39f485d52a053c2f514b637056756d7671ef Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 17 Oct 2018 21:12:36 -0400 Subject: [PATCH 034/393] updated bedrock version bedrock 1.7.0.13 is the latest bedrock version to be released. --- minecraft_bedrock/bedrock/egg-vanilla-bedrock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json b/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json index cdd90647..2e468a2a 100644 --- a/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json +++ b/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-09-13T12:06:06-04:00", + "exported_at": "2018-10-17T21:11:34-04: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\".", @@ -34,7 +34,7 @@ }, { "name": "ld lib path", - "description": "This is required to run the server properly.", + "description": "Dumb reasons to need this", "env_variable": "LD_LIBRARY_PATH", "default_value": ".", "user_viewable": 0, From eee5001cf473f865b1717c1ada4863b8eaa3ff4a Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 23 Oct 2018 10:21:12 -0400 Subject: [PATCH 035/393] fixing 7dtd startup variables Forgot to have replaceable variables in the startup command. --- source_servers/7_days_to_die/egg-7-days-to-die.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source_servers/7_days_to_die/egg-7-days-to-die.json b/source_servers/7_days_to_die/egg-7-days-to-die.json index 4eccc5a4..302d65d7 100644 --- a/source_servers/7_days_to_die/egg-7-days-to-die.json +++ b/source_servers/7_days_to_die/egg-7-days-to-die.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-10-07T00:04:07-04:00", + "exported_at": "2018-10-23T10:20:04-04:00", "name": "7 Days To Die", "author": "kristoffer.norman@bahnhof.se", "description": "7 days to die server", "image": "quay.io\/parkervcp\/pterodactyl-images:source", - "startup": "'.\/7DaysToDieServer.x86_64 -configfile=serverconfig.xml -quit -batchmode -nographics -dedicated -ServerPort=26900 -ServerMaxPlayerCount=8 -GameDifficulty=1 -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 \"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": "{\r\n \"serverconfig.xml\": {\r\n \"parser\": \"xml\",\r\n \"find\": {\r\n \"ServerPort\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Connected with 7DTD server\",\r\n \"userInteraction\": []\r\n}", From befbca066b502e71dd5f8742bef30b89097056af Mon Sep 17 00:00:00 2001 From: kamcio96 Date: Thu, 25 Oct 2018 23:44:45 +0200 Subject: [PATCH 036/393] Update paper dl link --- minecraft_java/spigot/paper-spigot/egg-paper-spigot.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft_java/spigot/paper-spigot/egg-paper-spigot.json b/minecraft_java/spigot/paper-spigot/egg-paper-spigot.json index 335a36fc..6a07218b 100644 --- a/minecraft_java/spigot/paper-spigot/egg-paper-spigot.json +++ b/minecraft_java/spigot/paper-spigot/egg-paper-spigot.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Paper Spigot 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\nif [ -z \"${DL_VERSION}\" ] || [ \"${DL_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=\"lastSuccessfulBuild\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/ci.destroystokyo.com\/job\/Paper\/${DL_VERSION}\/artifact\/paperclip.jar", + "script": "#!\/bin\/ash\r\n# Paper Spigot 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\nif [ -z \"${DL_VERSION}\" ] || [ \"${DL_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=\"lastSuccessfulBuild\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/papermc.io\/ci\/job\/Paper\/${DL_VERSION}\/artifact\/paperclip.jar", "container": "alpine:3.4", "entrypoint": "ash" } From aae9d18a50ccb10bb62ab8770234c377569cf7b2 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 26 Oct 2018 09:33:06 -0400 Subject: [PATCH 037/393] Adding starbound Adding a Starbound egg to the server. Needs to be tested first. --- README.md | 3 +- source_servers/starbound/README.md | 12 +++++ source_servers/starbound/egg-starbound.json | 54 +++++++++++++++++++++ 3 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 source_servers/starbound/README.md create mode 100644 source_servers/starbound/egg-starbound.json diff --git a/README.md b/README.md index 0ae8ab66..718055b9 100644 --- a/README.md +++ b/README.md @@ -48,9 +48,10 @@ If you are submitting PR's try and keep names and titles the same. [Mount & Blade Warband](/mb_warband/) -[Source](/source_servers/) +[Source](/source_servers/) These eggs use steamcmd to install * [7 Days to Die](/source_servers/7_days_to_die/) * [PixARK](/source_servers/pixark/) +* [Starbound](/source_servers/starbound) [Squad](/squad/) diff --git a/source_servers/starbound/README.md b/source_servers/starbound/README.md new file mode 100644 index 00000000..4329884b --- /dev/null +++ b/source_servers/starbound/README.md @@ -0,0 +1,12 @@ +# Starbound +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 + +game ports (default 21025 ) + +| Port | default | +|---------|---------| +| Game | 21025 | \ No newline at end of file diff --git a/source_servers/starbound/egg-starbound.json b/source_servers/starbound/egg-starbound.json new file mode 100644 index 00000000..133fdb28 --- /dev/null +++ b/source_servers/starbound/egg-starbound.json @@ -0,0 +1,54 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-08-14T10:11:29-05:00", + "name": "Starbound", + "author": "hostmaster@watefallnetwork.net", + "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.", + "image": "quay.io\/pterodactyl\/core:source", + "startup": ".\/starbound_server", + "config": { + "files": "{\r\n \"storage\/starbound_server.config\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"gameServerPort\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Starting UniverseServer\",\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# 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 ${STEAM_USER} ${STEAM_PASS} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} validate +quit\r\n\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\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\nmkdir \/mnt\/server\/storage\r\n\r\ncat <> \/mnt\/server\/storage\/starbound_server.config\r\n{\r\n \"allowAdminCommands\" : true,\r\n \"allowAdminCommandsFromAnyone\" : false,\r\n \"allowAnonymousConnections\" : true,\r\n \"allowAssetsMismatch\" : true,\r\n \"anonymousConnectionsAreAdmin\" : false,\r\n \"bannedIPs\" : [],\r\n \"bannedUuids\" : [],\r\n \"checkAssetsDigest\" : false,\r\n \"clearPlayerFiles\" : false,\r\n \"clearUniverseFiles\" : false,\r\n \"clientIPJoinable\" : false,\r\n \"clientP2PJoinable\" : true,\r\n \"configurationVersion\" : {\r\n \"basic\" : 2,\r\n \"server\" : 4\r\n },\r\n \"crafting\" : {\r\n \"filterHaveMaterials\" : false\r\n },\r\n \"gameServerBind\" : \"::\",\r\n \"gameServerPort\" : 21025,\r\n \"interactiveHighlight\" : true,\r\n \"inventory\" : {\r\n \"pickupToActionBar\" : true\r\n },\r\n \"maxPlayers\" : 8,\r\n \"maxTeamSize\" : 4,\r\n \"monochromeLighting\" : false,\r\n \"playerBackupFileCount\" : 3,\r\n \"queryServerBind\" : \"::\",\r\n \"queryServerPort\" : 21025,\r\n \"rconServerBind\" : \"::\",\r\n \"rconServerPassword\" : \"\",\r\n \"rconServerPort\" : 21026,\r\n \"rconServerTimeout\" : 1000,\r\n \"runQueryServer\" : false,\r\n \"runRconServer\" : false,\r\n \"safeScripts\" : true,\r\n \"scriptInstructionLimit\" : 10000000,\r\n \"scriptInstructionMeasureInterval\" : 10000,\r\n \"scriptProfilingEnabled\" : false,\r\n \"scriptRecursionLimit\" : 100,\r\n \"serverFidelity\" : \"automatic\",\r\n \"serverName\" : \"A Starbound Server\",\r\n \"serverOverrideAssetsDigest\" : null,\r\n \"serverUsers\" : {\r\n },\r\n \"tutorialMessages\" : true\r\n}\r\nEOF", + "container": "ubuntu:16.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Steam User", + "description": "Admin only", + "env_variable": "STEAM_USER", + "default_value": "", + "user_viewable": 0, + "user_editable": 0, + "rules": "nullable|string" + }, + { + "name": "Steam Password", + "description": "Steam User Password", + "env_variable": "STEAM_PASS", + "default_value": "", + "user_viewable": 0, + "user_editable": 0, + "rules": "nullable|string" + }, + { + "name": "Game ID", + "description": "The ID corresponding to the game to download and run using SRCDS.", + "env_variable": "SRCDS_APPID", + "default_value": "211820", + "user_viewable": 1, + "user_editable": 0, + "rules": "string" + } + ] +} \ No newline at end of file From d2338ec03bfac01caee60c24584b94211dffe1d5 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 26 Oct 2018 23:44:58 -0400 Subject: [PATCH 038/393] update for arma readme bohemia moved the battleye ports --- arma/arma3/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arma/arma3/README.md b/arma/arma3/README.md index c5807390..9bd5392a 100644 --- a/arma/arma3/README.md +++ b/arma/arma3/README.md @@ -14,7 +14,7 @@ Ports required to run the server in a table format. | Port | default | |---------|---------| -| Game | 2302-2304 | +| Game | 2302-2306 | | BattleEye | 2344-2345 | #### Mods/Plugins may require ports to be added to the server. From 9992fbb04c47535e62b67bf7f9b730a2bb649145 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sat, 27 Oct 2018 09:59:29 -0400 Subject: [PATCH 039/393] Fix php downloads for pocketmine Switch to using last successful build and the ubuntu image to run the server. --- minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json b/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json index 48e49fc7..a79c6fe3 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": "2018-07-03T15:36:00-04:00", + "exported_at": "2018-10-27T09:58:26-04: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\/pterodactyl\/core:glibc", + "image": "quay.io\/parkervcp\/pterodactyl-images: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}", @@ -17,8 +17,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n\r\napk add --no-cache curl\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"\\n downloading latest pocketmine MP build\"\r\ncurl -sSL -o PocketMine-MP.phar https:\/\/jenkins.pmmp.io\/job\/PocketMine-MP\/Stable\/artifact\/PocketMine-MP.phar\r\n\r\necho -e \"\\n downloading latest php7 build from pocketmine\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-7.2-Aggregate\/6\/artifact\/PHP-7.2-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\/Minecraft%20PE\/PocketmineMP\/server.properties > server.properties\r\necho -e \"\\n unpacking php7 binaries\"\r\ntar -xzvf php.binary.tar.gz\r\necho -e \"\\n removing pvp7 packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.tx banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs", - "container": "alpine:3.7", + "script": "#!\/bin\/ash\r\n\r\napk add --no-cache curl\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"\\n downloading latest pocketmine MP build\"\r\ncurl -sSL -o PocketMine-MP.phar https:\/\/jenkins.pmmp.io\/job\/PocketMine-MP\/Stable\/artifact\/PocketMine-MP.phar\r\n\r\necho -e \"\\n downloading latest php7 build from pocketmine\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-7.2-Linux-x86_64\/lastSuccessfulBuild\/artifact\/PHP_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\/Minecraft%20PE\/PocketmineMP\/server.properties > server.properties\r\necho -e \"\\n unpacking php7 binaries\"\r\ntar -xzvf php.binary.tar.gz\r\necho -e \"\\n removing pvp7 packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.tx banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs", + "container": "alpine:3.8", "entrypoint": "ash" } }, From 03cec424f683280261a53fd8026752210c742d32 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sat, 27 Oct 2018 22:56:10 -0400 Subject: [PATCH 040/393] adding version selections for pocketmine You can now specify build number for pocketmine. "latest" will default to the last stable release. --- .../pocketmine_mp/egg-pocketmine-m-p.json | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json b/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json index a79c6fe3..a113083b 100644 --- a/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json +++ b/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-10-27T09:58:26-04:00", + "exported_at": "2018-10-27T22:53:48-04: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 :)", @@ -17,10 +17,20 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n\r\napk add --no-cache curl\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"\\n downloading latest pocketmine MP build\"\r\ncurl -sSL -o PocketMine-MP.phar https:\/\/jenkins.pmmp.io\/job\/PocketMine-MP\/Stable\/artifact\/PocketMine-MP.phar\r\n\r\necho -e \"\\n downloading latest php7 build from pocketmine\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-7.2-Linux-x86_64\/lastSuccessfulBuild\/artifact\/PHP_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\/Minecraft%20PE\/PocketmineMP\/server.properties > server.properties\r\necho -e \"\\n unpacking php7 binaries\"\r\ntar -xzvf php.binary.tar.gz\r\necho -e \"\\n removing pvp7 packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.tx banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs", + "script": "#!\/bin\/ash\r\n\r\napk add --no-cache curl\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"\\n downloading pocketmine MP build ${PMMP_VERSION}\"\r\nif [ -z \"$PMMP_VERSION\" ] || [ \"$PMMP_VERSION\" == \"latest\" ]; then\r\n curl -sSL -o PocketMine-MP.phar https:\/\/jenkins.pmmp.io\/job\/PocketMine-MP\/Stable\/artifact\/PocketMine-MP.phar\r\nelse \r\n curl -sSL -o PocketMine-MP.phar https:\/\/jenkins.pmmp.io\/job\/PocketMine-MP\/${PMMP_VERSION}\/artifact\/PocketMine-MP.phar\r\nfi\r\n\r\necho -e \"\\n downloading latest php7 build from pocketmine\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-7.2-Linux-x86_64\/lastSuccessfulBuild\/artifact\/PHP_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\/Minecraft%20PE\/PocketmineMP\/server.properties > server.properties\r\necho -e \"\\n unpacking php7 binaries\"\r\ntar -xzvf php.binary.tar.gz\r\necho -e \"\\n removing pvp7 packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.tx banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs", "container": "alpine:3.8", "entrypoint": "ash" } }, - "variables": [] + "variables": [ + { + "name": "PocketmineMP Version", + "description": "The build to pull and install. (Ex. 1604)\r\n\r\nThis is the build number on https:\/\/jenkins.pmmp.io", + "env_variable": "PMMP_VERSION", + "default_value": "latest", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" + } + ] } \ No newline at end of file From 6948db83239fd0a8be6f3f2ca4ffbb6d8d3ea3e2 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sat, 27 Oct 2018 23:03:25 -0400 Subject: [PATCH 041/393] better version selection for vanilla bedrock Changing to grabbing the download url from the minecraft bedrock download page directly. --- minecraft_bedrock/bedrock/egg-vanilla-bedrock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json b/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json index 2e468a2a..342f14e1 100644 --- a/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json +++ b/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-10-17T21:11:34-04:00", + "exported_at": "2018-10-27T23:02:35-04: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\".", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n\r\napk add --no-cache zip unzip wget\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Downloading files from https:\/\/minecraft.azureedge.net\/bin-linux\/bedrock-server-$BEDROCK_VERSION.zip\"\r\nwget https:\/\/minecraft.azureedge.net\/bin-linux\/bedrock-server-$BEDROCK_VERSION.zip\r\n\r\necho -e \"Unpacking server files\"\r\nunzip bedrock-server-$BEDROCK_VERSION.zip\r\n\r\necho -e \"Done\"", + "script": "#!\/bin\/ash\r\n\r\napk add --no-cache zip unzip wget\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Downloading files from https:\/\/minecraft.azureedge.net\/bin-linux\/bedrock-server-$BEDROCK_VERSION.zip\"\r\n\r\nif [ -z \"${BEDROCK_VERSION}\" ] || [ \"${BEDROCK_VERSION}\" == \"latest\" ]; then\r\n echo -e \"\\n Downloading latest Bedrock server\"\r\n DOWNLOAD_URL=$(curl https:\/\/minecraft.net\/en-us\/download\/server\/bedrock\/ | grep azureedge | grep linux | grep -Eo \"(http|https):\/\/[a-zA-Z0-9.\/?=_-]*\")\r\n BEDROCK_VERSION=$(echo ${DOWNLOAD_URL} | cut -d\"\/\" -f5)\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\nwget ${DOWNLOAD_URL}\r\n\r\necho -e \"Unpacking server files\"\r\nunzip bedrock-server-$BEDROCK_VERSION.zip\r\n\r\necho -e \"Done\"", "container": "alpine:3.8", "entrypoint": "ash" } @@ -25,9 +25,9 @@ "variables": [ { "name": "Bedrock Version", - "description": "The version of bedrock", + "description": "The version of bedrock. (Ex. 1.7.0.13)\r\n\r\nDefault version is latest.", "env_variable": "BEDROCK_VERSION", - "default_value": "1.6.1.0", + "default_value": "latest", "user_viewable": 1, "user_editable": 1, "rules": "required|string|max:20" From 34976a79e1c16fef14c4c6f420d51faf2af4ef2d Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sat, 27 Oct 2018 23:25:26 -0400 Subject: [PATCH 042/393] bedrock zip download and unpack fix Fixed an issue where the files wouldn't extract properly. --- minecraft_bedrock/bedrock/egg-vanilla-bedrock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json b/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json index 342f14e1..07ea5915 100644 --- a/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json +++ b/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-10-27T23:02:35-04:00", + "exported_at": "2018-10-27T23:25:09-04: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\".", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n\r\napk add --no-cache zip unzip wget\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Downloading files from https:\/\/minecraft.azureedge.net\/bin-linux\/bedrock-server-$BEDROCK_VERSION.zip\"\r\n\r\nif [ -z \"${BEDROCK_VERSION}\" ] || [ \"${BEDROCK_VERSION}\" == \"latest\" ]; then\r\n echo -e \"\\n Downloading latest Bedrock server\"\r\n DOWNLOAD_URL=$(curl https:\/\/minecraft.net\/en-us\/download\/server\/bedrock\/ | grep azureedge | grep linux | grep -Eo \"(http|https):\/\/[a-zA-Z0-9.\/?=_-]*\")\r\n BEDROCK_VERSION=$(echo ${DOWNLOAD_URL} | cut -d\"\/\" -f5)\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\nwget ${DOWNLOAD_URL}\r\n\r\necho -e \"Unpacking server files\"\r\nunzip bedrock-server-$BEDROCK_VERSION.zip\r\n\r\necho -e \"Done\"", + "script": "#!\/bin\/ash\r\n\r\napk add --no-cache zip unzip wget curl\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Downloading files from https:\/\/minecraft.azureedge.net\/bin-linux\/bedrock-server-$BEDROCK_VERSION.zip\"\r\n\r\nif [ -z \"${BEDROCK_VERSION}\" ] || [ \"${BEDROCK_VERSION}\" == \"latest\" ]; then\r\n echo -e \"\\n Downloading latest Bedrock server\"\r\n DOWNLOAD_URL=$(curl https:\/\/minecraft.net\/en-us\/download\/server\/bedrock\/ | grep azureedge | grep linux | grep -Eo \"(http|https):\/\/[a-zA-Z0-9.\/?=_-]*\")\r\n BEDROCK_ZIP=$(echo ${DOWNLOAD_URL} | cut -d\"\/\" -f5)\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\n BEDROCK_ZIP=$(echo ${DOWNLOAD_URL} | cut -d\"\/\" -f5)\r\nfi\r\n\r\nwget ${DOWNLOAD_URL}\r\n\r\necho -e \"Unpacking server files\"\r\nunzip -o $BEDROCK_ZIP\r\n\r\necho -e \"Cleaning up after installing\"\r\nrm $BEDROCK_ZIP\r\n\r\necho -e \"Done\"", "container": "alpine:3.8", "entrypoint": "ash" } From ce5adacc163045545bc19717756401637b73360b Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sat, 27 Oct 2018 23:30:30 -0400 Subject: [PATCH 043/393] updated bedrock start config Changed the startup config to match the new release. --- minecraft_bedrock/bedrock/egg-vanilla-bedrock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json b/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json index 07ea5915..16f4bc70 100644 --- a/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json +++ b/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-10-27T23:25:09-04:00", + "exported_at": "2018-10-27T23:29:53-04: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\".", @@ -11,7 +11,7 @@ "startup": ".\/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 }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Listening on IPv4 port\"\r\n}", + "startup": "{\r\n \"done\": \"Server started\"\r\n}", "logs": "{}", "stop": "stop" }, From 7def6aaf3ae8f2b0e2ef13c81e89a09c5ef3f3b9 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 28 Oct 2018 12:26:36 -0400 Subject: [PATCH 044/393] SinusBot fix changed to download teamspeak client instead of server release. Updated version variable to correct teamspeak version. --- bots/discord/sinusbot/egg-sinusbot.json | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/bots/discord/sinusbot/egg-sinusbot.json b/bots/discord/sinusbot/egg-sinusbot.json index c89460ae..4e122bad 100644 --- a/bots/discord/sinusbot/egg-sinusbot.json +++ b/bots/discord/sinusbot/egg-sinusbot.json @@ -3,9 +3,9 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-07-10T00:15:54-04:00", + "exported_at": "2018-10-28T12:24:35-04:00", "name": "Sinusbot", - "author": "ki2007@damw.eu", + "author": "support@pterodactyl.io", "description": "Musicbot for Discord and Teamspeak.", "image": "quay.io\/parkervcp\/pterodactyl-images:sinusbot", "startup": ".\/sinusbot --override-password=\"${OVERRIDE_PASSWORD}\"", @@ -17,7 +17,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\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#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#cp scripts scripts_org\r\n\r\n#Install Sinusbot plugin\r\ncp plugin\/libsoundbot_plugin.so TeamSpeak3-Client-linux_amd64\/plugins\r\n\r\n#Download TeamSpeak Client\r\nwget -q `curl https:\/\/www.teamspeak.com\/en\/downloads#client | grep Client-linux_amd64 | grep option | grep 4Net | cut -d'\"' -f2`\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\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#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\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#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#cp scripts scripts_org\r\n\r\n#Install Sinusbot plugin\r\ncp plugin\/libsoundbot_plugin.so TeamSpeak3-Client-linux_amd64\/plugins\r\n\r\n#Download TeamSpeak Client\r\nwget http:\/\/dl.4players.de\/ts\/releases\/${TS_VERSION}\/TeamSpeak3-Client-linux_amd64-${TS_VERSION}.run\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\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#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", "container": "ubuntu:18.04", "entrypoint": "bash" } @@ -31,6 +31,15 @@ "user_viewable": 1, "user_editable": 1, "rules": "required|string|max:20" + }, + { + "name": "Teamspeak version", + "description": "What version of teamspeak client to download", + "env_variable": "TS_VERSION", + "default_value": "3.2.2", + "user_viewable": 0, + "user_editable": 0, + "rules": "required|string|max:20" } ] } \ No newline at end of file From 3f95dc5398cced53b24bcd3ffd1cbb30409b6271 Mon Sep 17 00:00:00 2001 From: SheppeR Date: Mon, 29 Oct 2018 21:29:58 +0100 Subject: [PATCH 045/393] ARK egg for vanilla or moded server --- source_servers/ark_survival_evolved/README.md | 12 ++++ .../egg-ark--survival-evolved.json | 63 +++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 source_servers/ark_survival_evolved/README.md create mode 100644 source_servers/ark_survival_evolved/egg-ark--survival-evolved.json diff --git a/source_servers/ark_survival_evolved/README.md b/source_servers/ark_survival_evolved/README.md new file mode 100644 index 00000000..1546d680 --- /dev/null +++ b/source_servers/ark_survival_evolved/README.md @@ -0,0 +1,12 @@ +# Ark: Survival Evolved +Steam Description : +As a man or woman stranded naked, freezing and starving on the shores of a mysterious island called ARK, you must hunt, harvest resources, craft items, grow crops, research technologies, and build shelters to withstand the elements. Use your cunning and resources to kill or tame & breed the leviathan dinosaurs and other primeval creatures roaming the land, and team up with or prey on hundreds of other players to survive, dominate... and escape! + +### Server Ports + +| Port | default | +|-------|---------| +| Game | 7777 | +| Query | 27015 | +| Raw UDP | 7778 | +| RCON | 27020 | diff --git a/source_servers/ark_survival_evolved/egg-ark--survival-evolved.json b/source_servers/ark_survival_evolved/egg-ark--survival-evolved.json new file mode 100644 index 00000000..bc1b7ca6 --- /dev/null +++ b/source_servers/ark_survival_evolved/egg-ark--survival-evolved.json @@ -0,0 +1,63 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-10-29T20:51:32+01:00", + "name": "Ark: Survival Evolved", + "author": "support@pterodactyl.io", + "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\/pterodactyl\/core:source", + "startup": "'cd ShooterGame\/Binaries\/Linux && .\/ShooterGameServer TheIsland?listen?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?Port={{SERVER_PORT}}?MaxPlayers={{SERVER_MAX_PLAYERS}}'", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Setting breakpad minidump AppID = 346110\",\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# ARK: 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\nmkdir -p \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\n\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\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\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 376030 +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\ncd \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\n\r\nln -sf ..\/..\/..\/..\/..\/Steam\/steamapps steamapps\r\n\r\ncd \/mnt\/server", + "container": "ubuntu:16.04", + "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": 1, + "user_editable": 1, + "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": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "nullable|alpha_dash|between:1,100" + }, + { + "name": "Maximum Players", + "description": "Specifies the maximum number of players that can play on the server simultaneously.", + "env_variable": "SERVER_MAX_PLAYERS", + "default_value": "20", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|numeric|digits_between:1,4" + }, + { + "name": "App ID", + "description": "ARK App ID", + "env_variable": "SRCDS_APPID", + "default_value": "376030", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|numeric" + } + ] +} \ No newline at end of file From d3cf48e81d4ee854ba3724df2d0830f265b123bd Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 30 Oct 2018 23:17:21 -0400 Subject: [PATCH 046/393] Adding the bastion discord bot --- bots/discord/README.md | 4 +++ bots/discord/bastion/egg-bastion.json | 45 +++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 bots/discord/bastion/egg-bastion.json diff --git a/bots/discord/README.md b/bots/discord/README.md index 164249aa..06cfbb6e 100644 --- a/bots/discord/README.md +++ b/bots/discord/README.md @@ -6,6 +6,10 @@ [ATLauncher/discord-bot](https://github.com/ATLauncher/discord-bot) Their github has all the info you need +#### Bastion +[TheBastionBot/Bastion](https://github.com/TheBastionBot/Bastion) +Give awesome perks to your Discord server! + #### parkertron [parkervcp/parkertron](https://github.com/parkervcp/parkertron) The bot that runs as the pterodactyl `@Support Bot` diff --git a/bots/discord/bastion/egg-bastion.json b/bots/discord/bastion/egg-bastion.json new file mode 100644 index 00000000..282f334c --- /dev/null +++ b/bots/discord/bastion/egg-bastion.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-10-30T23:15:12-04:00", + "name": "Bastion", + "author": "parker@parkervcp.com", + "description": "Bastion is an all-in-one multipurpose Discord bot that can do a whole bunch of things and its features are expanding daily. Bastion does everything most people will ever need it to do. Check out some feature highlights below to get a peek into the vast feature list of Bastion. And if you think Bastion lacks some feature, please send a suggestion and we will add it to Bastion as soon as possible.", + "image": "quay.io\/parkervcp\/pterodactyl-images:bot_bastion", + "startup": "node bastion.js", + "config": { + "files": "{\r\n \"settings\/credentials.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"botId\": \"{{server.build.env.BOT_ID}}\",\r\n \"token\": \"{{server.build.env.BOT_TOKEN}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"I'm ready to roll!\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/ash\r\n# Bastion Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## Install Requirements\r\napk --no-cache add python g++ make git\r\n\r\n## Move to install folder\r\ncd \/mnt\/server\/\r\n\r\n## Clone repo\r\ngit clone -b stable -q --depth 1 https:\/\/github.com\/TheBastionBot\/Bastion.git .\/\r\n\r\n## Install node_modules\r\nnpm install --only=production\r\n\r\n## Move config files.\r\nmv settings\/credentials_example.json settings\/credentials.json\r\nmv settings\/config_example.json settings\/config.json", + "container": "node:8-alpine", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Bot ID", + "description": "The Bot ID you get from https:\/\/discordapp.com\/developers\/applications\/", + "env_variable": "BOT_ID", + "default_value": "GETABOTID", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:32" + }, + { + "name": "Bot Token", + "description": "The Bot ID you get from https:\/\/discordapp.com\/developers\/applications\/", + "env_variable": "BOT_TOKEN", + "default_value": "GETABOTTOKEN", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:64" + } + ] +} \ No newline at end of file From fc2818d8e4f1fba05330fbc9999b15d88d40a86d Mon Sep 17 00:00:00 2001 From: Arraying Date: Wed, 31 Oct 2018 18:31:30 +0100 Subject: [PATCH 047/393] Added legacy PaperSpigot --- minecraft_java/spigot/paper-legacy/README.md | 3 ++ .../spigot/paper-legacy/paper-legacy.json | 45 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 minecraft_java/spigot/paper-legacy/README.md create mode 100644 minecraft_java/spigot/paper-legacy/paper-legacy.json diff --git a/minecraft_java/spigot/paper-legacy/README.md b/minecraft_java/spigot/paper-legacy/README.md new file mode 100644 index 00000000..efd0b68f --- /dev/null +++ b/minecraft_java/spigot/paper-legacy/README.md @@ -0,0 +1,3 @@ +# Legacy PaperSpigot + +This egg will support the 1.8.8 -> 1.12.2 builds of PaperSpigot. \ No newline at end of file diff --git a/minecraft_java/spigot/paper-legacy/paper-legacy.json b/minecraft_java/spigot/paper-legacy/paper-legacy.json new file mode 100644 index 00000000..bfc8eab4 --- /dev/null +++ b/minecraft_java/spigot/paper-legacy/paper-legacy.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-03-10T00:30:35-06:00", + "name": "Paper Spigot (Legacy)", + "author": "arraying1337@gmail.com", + "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", + "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\/ash\r\n# Paper Spigot 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\nif [ -z \"${DL_VERSION}\" ] || [ \"${DL_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=\"lastSuccessfulBuild\"\r\nfi\r\n\r\nif [ \"${DL_VERSION}\" == \"443\" ]; then\r\n DL_NAME=\"Paperclip\"\r\nelse\r\n DL_NAME=\"paperclip\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/papermc.io\/ci\/job\/Paper\/${DL_VERSION}\/artifact\/${DL_NAME}.jar", + "container": "alpine:3.4", + "entrypoint": "ash" + } + }, + "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": 1, + "user_editable": 1, + "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" + }, + { + "name": "PaperSpigot Version", + "description": "The version of PaperSpigot to download, Use \"latest\" for latest.", + "env_variable": "DL_VERSION", + "default_value": "latest", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|between:3,7" + } + ] +} \ No newline at end of file From 3d2d36d036a3c07cdf66978329db8cea64fe7bac Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 31 Oct 2018 14:44:50 -0400 Subject: [PATCH 048/393] fix paper spigot download link Updated to the latest download link. --- minecraft_java/spigot/paper-spigot/egg-paper-spigot.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/minecraft_java/spigot/paper-spigot/egg-paper-spigot.json b/minecraft_java/spigot/paper-spigot/egg-paper-spigot.json index 6a07218b..f483aa8a 100644 --- a/minecraft_java/spigot/paper-spigot/egg-paper-spigot.json +++ b/minecraft_java/spigot/paper-spigot/egg-paper-spigot.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-03-10T00:30:35-06:00", + "exported_at": "2018-10-31T14:43:53-04:00", "name": "Paper Spigot", "author": "hostmaster@waterfallgaming.net", "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", @@ -17,8 +17,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Paper Spigot 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\nif [ -z \"${DL_VERSION}\" ] || [ \"${DL_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=\"lastSuccessfulBuild\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/papermc.io\/ci\/job\/Paper\/${DL_VERSION}\/artifact\/paperclip.jar", - "container": "alpine:3.4", + "script": "#!\/bin\/ash\r\n# Paper Spigot 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\nif [ -z \"${DL_VERSION}\" ] || [ \"${DL_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=\"lastSuccessfulBuild\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/papermc.io\/ci\/job\/Paper-1.13\/${DL_VERSION}\/artifact\/paperclip.jar", + "container": "alpine:3.8", "entrypoint": "ash" } }, @@ -42,4 +42,4 @@ "rules": "required|string|between:3,7" } ] -} +} \ No newline at end of file From 20efd5298ec6c34e0026dfbbcbf6f8f2b1f37856 Mon Sep 17 00:00:00 2001 From: Arraying Date: Thu, 1 Nov 2018 11:46:50 +0100 Subject: [PATCH 049/393] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 718055b9..da59648e 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,8 @@ If you are submitting PR's try and keep names and titles the same. [Minecraft Java](/minecraft_java/) * [Forge](/minecraft_java/forge/) * [Feed The Beast](/minecraft_java/ftb/) -* [Spigot](/minecraft_java/spigot/) +* [Spigot](/minecraft_java/spigot/) +* [PaperSpigot (Legacy)](/minecraft_java/spigot/paper-legacy) * [Technic](/minecraft_java/technic/) [Minecraft Bedrock](/minecraft_bedrock/) From 292e6020a50ad1e7bfad4cc7129a2c890d12fdbd Mon Sep 17 00:00:00 2001 From: Isaac A <6174343+tenten8401@users.noreply.github.com> Date: Fri, 2 Nov 2018 14:09:44 -0400 Subject: [PATCH 050/393] Change Unturned to use GitLab registry Moving the egg to GitLab from Docker Hub because the builds are much faster and it's more integrated with the project. --- unturned/rocketmod/egg-rocketmod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unturned/rocketmod/egg-rocketmod.json b/unturned/rocketmod/egg-rocketmod.json index 8a406e96..6392ad6f 100644 --- a/unturned/rocketmod/egg-rocketmod.json +++ b/unturned/rocketmod/egg-rocketmod.json @@ -7,7 +7,7 @@ "name": "RocketMod", "author": "isaac@isaacs.site", "description": "The RocketMod server mod for Unturned.", - "image": "tenten8401\/pterodactyl-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}", From 00cd9c4b02842553bbf4d72ccbd64eadf9dfc8a0 Mon Sep 17 00:00:00 2001 From: Oreo Oreoniv <28255085+zKoz210@users.noreply.github.com> Date: Sat, 3 Nov 2018 17:36:43 +0300 Subject: [PATCH 051/393] Fixed server.properties link --- 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 a113083b..fa4bca0a 100644 --- a/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json +++ b/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n\r\napk add --no-cache curl\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"\\n downloading pocketmine MP build ${PMMP_VERSION}\"\r\nif [ -z \"$PMMP_VERSION\" ] || [ \"$PMMP_VERSION\" == \"latest\" ]; then\r\n curl -sSL -o PocketMine-MP.phar https:\/\/jenkins.pmmp.io\/job\/PocketMine-MP\/Stable\/artifact\/PocketMine-MP.phar\r\nelse \r\n curl -sSL -o PocketMine-MP.phar https:\/\/jenkins.pmmp.io\/job\/PocketMine-MP\/${PMMP_VERSION}\/artifact\/PocketMine-MP.phar\r\nfi\r\n\r\necho -e \"\\n downloading latest php7 build from pocketmine\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-7.2-Linux-x86_64\/lastSuccessfulBuild\/artifact\/PHP_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\/Minecraft%20PE\/PocketmineMP\/server.properties > server.properties\r\necho -e \"\\n unpacking php7 binaries\"\r\ntar -xzvf php.binary.tar.gz\r\necho -e \"\\n removing pvp7 packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.tx banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs", + "script": "#!\/bin\/ash\r\n\r\napk add --no-cache curl\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"\\n downloading pocketmine MP build ${PMMP_VERSION}\"\r\nif [ -z \"$PMMP_VERSION\" ] || [ \"$PMMP_VERSION\" == \"latest\" ]; then\r\n curl -sSL -o PocketMine-MP.phar https:\/\/jenkins.pmmp.io\/job\/PocketMine-MP\/Stable\/artifact\/PocketMine-MP.phar\r\nelse \r\n curl -sSL -o PocketMine-MP.phar https:\/\/jenkins.pmmp.io\/job\/PocketMine-MP\/${PMMP_VERSION}\/artifact\/PocketMine-MP.phar\r\nfi\r\n\r\necho -e \"\\n downloading latest php7 build from pocketmine\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-7.2-Linux-x86_64\/lastSuccessfulBuild\/artifact\/PHP_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\/minecraft_bedrock\/pocketmine_mp\/server.properties > server.properties\r\necho -e \"\\n unpacking php7 binaries\"\r\ntar -xzvf php.binary.tar.gz\r\necho -e \"\\n removing pvp7 packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.tx banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs", "container": "alpine:3.8", "entrypoint": "ash" } @@ -33,4 +33,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From d256aa3fa68f5887630e8299abf317d92a736425 Mon Sep 17 00:00:00 2001 From: SheppeR Date: Mon, 5 Nov 2018 08:38:58 +0100 Subject: [PATCH 052/393] Update egg-ark--survival-evolved.json --- .../ark_survival_evolved/egg-ark--survival-evolved.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source_servers/ark_survival_evolved/egg-ark--survival-evolved.json b/source_servers/ark_survival_evolved/egg-ark--survival-evolved.json index bc1b7ca6..7742f4d4 100644 --- a/source_servers/ark_survival_evolved/egg-ark--survival-evolved.json +++ b/source_servers/ark_survival_evolved/egg-ark--survival-evolved.json @@ -5,7 +5,7 @@ }, "exported_at": "2018-10-29T20:51:32+01:00", "name": "Ark: Survival Evolved", - "author": "support@pterodactyl.io", + "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\/pterodactyl\/core:source", "startup": "'cd ShooterGame\/Binaries\/Linux && .\/ShooterGameServer TheIsland?listen?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?Port={{SERVER_PORT}}?MaxPlayers={{SERVER_MAX_PLAYERS}}'", @@ -60,4 +60,4 @@ "rules": "required|numeric" } ] -} \ No newline at end of file +} From 74bd062dd0adfb7fbdaf725a49b3c8f5e85628b9 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Mon, 5 Nov 2018 18:16:04 -0500 Subject: [PATCH 053/393] Updated FiveM README. --- gta/fivem/README.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gta/fivem/README.md b/gta/fivem/README.md index fa08bb2a..9cb6573f 100644 --- a/gta/fivem/README.md +++ b/gta/fivem/README.md @@ -1,3 +1,14 @@ # FiveM -The [FiveM](https://fivem.net/) GTA 5 dedicated server + +### 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. + +### Install notes - Only installs latest version versions are not selectable. + +### Server Ports +Ports required to run the server in a table format. + +| Port | default | +|---------|---------| +| Game | 30210 | From ce79a7fa4cd98885363568246190ffcc3164a423 Mon Sep 17 00:00:00 2001 From: SheppeR Date: Wed, 7 Nov 2018 23:51:28 +0100 Subject: [PATCH 054/393] Update source_servers/ark_survival_evolved/egg-ark--survival-evolved.json Add missing startup arguments --- .../egg-ark--survival-evolved.json | 53 +++++++++++++++++-- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/source_servers/ark_survival_evolved/egg-ark--survival-evolved.json b/source_servers/ark_survival_evolved/egg-ark--survival-evolved.json index 7742f4d4..1b041627 100644 --- a/source_servers/ark_survival_evolved/egg-ark--survival-evolved.json +++ b/source_servers/ark_survival_evolved/egg-ark--survival-evolved.json @@ -8,7 +8,7 @@ "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\/pterodactyl\/core:source", - "startup": "'cd ShooterGame\/Binaries\/Linux && .\/ShooterGameServer TheIsland?listen?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?Port={{SERVER_PORT}}?MaxPlayers={{SERVER_MAX_PLAYERS}}'", + "startup": "'cd ShooterGame\/Binaries\/Linux && .\/ShooterGameServer TheIsland?listen?SessionName={{SESSION_NAME}}?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?Port={{SERVER_PORT}}?MaxPlayers={{SERVER_MAX_PLAYERS}}?RCONPort={{RCON_PORT}}?QueryPort={{QUERY_PORT}}?RCONEnabled={{ENABLE_RCON}} -server -log'", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Setting breakpad minidump AppID = 346110\",\r\n \"userInteraction\": []\r\n}", @@ -23,6 +23,15 @@ } }, "variables": [ + { + "name": "Server Name", + "description": "ARK server name", + "env_variable": "SESSION_NAME", + "default_value": "ARK SERVER", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:128" + }, { "name": "Server Password", "description": "If specified, players must provide this password to join the server.", @@ -39,7 +48,43 @@ "default_value": "", "user_viewable": 1, "user_editable": 1, - "rules": "nullable|alpha_dash|between:1,100" + "rules": "nullable|alpha_dash|between:1,100" + }, + { + "name": "Server Port", + "description": "ARK server port used by client.", + "env_variable": "SERVER_PORT", + "default_value": "7777", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|numeric" + }, + { + "name": "Use Rcon", + "description": "Enable or disable rcon system.", + "env_variable": "ENABLE_RCON", + "default_value": "false", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|boolean" + }, + { + "name": "Rcon Port", + "description": "ARK rcon port used by rcon tools.", + "env_variable": "RCON_PORT", + "default_value": "27020", + "user_viewable": 1, + "user_editable": 1, + "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": 1, + "user_editable": 1, + "rules": "required|numeric" }, { "name": "Maximum Players", @@ -52,12 +97,12 @@ }, { "name": "App ID", - "description": "ARK 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": 1, "user_editable": 0, - "rules": "required|numeric" + "rules": "nullable|numeric" } ] } From 7e85a5441826fbcb734267de9885cc1c5b5f002b Mon Sep 17 00:00:00 2001 From: Budman17r Date: Fri, 9 Nov 2018 00:08:50 -0600 Subject: [PATCH 055/393] Readding the server map variable --- .../egg-ark--survival-evolved.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/source_servers/ark_survival_evolved/egg-ark--survival-evolved.json b/source_servers/ark_survival_evolved/egg-ark--survival-evolved.json index 7742f4d4..e13216a6 100644 --- a/source_servers/ark_survival_evolved/egg-ark--survival-evolved.json +++ b/source_servers/ark_survival_evolved/egg-ark--survival-evolved.json @@ -8,7 +8,7 @@ "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\/pterodactyl\/core:source", - "startup": "'cd ShooterGame\/Binaries\/Linux && .\/ShooterGameServer TheIsland?listen?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?Port={{SERVER_PORT}}?MaxPlayers={{SERVER_MAX_PLAYERS}}'", + "startup": "'cd ShooterGame\/Binaries\/Linux && .\/ShooterGameServer {{SERVER_MAP}}?listen?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?Port={{SERVER_PORT}}?MaxPlayers={{SERVER_MAX_PLAYERS}}'", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Setting breakpad minidump AppID = 346110\",\r\n \"userInteraction\": []\r\n}", @@ -58,6 +58,15 @@ "user_viewable": 1, "user_editable": 0, "rules": "required|numeric" + }, + { + "name": "Server Map", + "description": "Available Maps: TheIsland, TheCenter, Ragnarok, ScorchedEarth_P, Aberration_P, Extinction", + "env_variable": "SERVER_MAP", + "default_value": "TheIsland", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" } ] } From 0c7a9d8c77a50f5458e77873b3ecf57aaf507d6a Mon Sep 17 00:00:00 2001 From: SheppeR Date: Sat, 10 Nov 2018 06:57:55 +0100 Subject: [PATCH 056/393] Fix ... Fix import error Fix space in server name Fix console output --- .../egg-ark--survival-evolved.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/source_servers/ark_survival_evolved/egg-ark--survival-evolved.json b/source_servers/ark_survival_evolved/egg-ark--survival-evolved.json index c9594c36..1017fefb 100644 --- a/source_servers/ark_survival_evolved/egg-ark--survival-evolved.json +++ b/source_servers/ark_survival_evolved/egg-ark--survival-evolved.json @@ -8,7 +8,7 @@ "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\/pterodactyl\/core:source", - "startup": "'cd ShooterGame\/Binaries\/Linux && .\/ShooterGameServer {{SERVER_MAP}}?listen?SessionName={{SESSION_NAME}}?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?Port={{SERVER_PORT}}?MaxPlayers={{SERVER_MAX_PLAYERS}}?RCONPort={{RCON_PORT}}?QueryPort={{QUERY_PORT}}?RCONEnabled={{ENABLE_RCON}} -server -log'", + "startup": "\"cd ShooterGame\/Binaries\/Linux && .\/ShooterGameServer {{SERVER_MAP}}?listen?SessionName='{{SESSION_NAME}}'?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?Port={{PORT}}?MaxPlayers={{SERVER_MAX_PLAYERS}}?RCONPort={{RCON_PORT}}?QueryPort={{QUERY_PORT}}?RCONEnabled={{ENABLE_RCON}} -server -log\"", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Setting breakpad minidump AppID = 346110\",\r\n \"userInteraction\": []\r\n}", @@ -23,7 +23,7 @@ } }, "variables": [ - { + { "name": "Server Name", "description": "ARK server name", "env_variable": "SESSION_NAME", @@ -50,24 +50,24 @@ "user_editable": 1, "rules": "nullable|alpha_dash|between:1,100" }, - { + { "name": "Server Port", "description": "ARK server port used by client.", - "env_variable": "SERVER_PORT", + "env_variable": "PORT", "default_value": "7777", "user_viewable": 1, "user_editable": 1, "rules": "required|numeric" }, - { + { "name": "Use Rcon", - "description": "Enable or disable rcon system.", + "description": "Enable or disable rcon system. (true or false)", "env_variable": "ENABLE_RCON", "default_value": "false", "user_viewable": 1, "user_editable": 1, - "rules": "required|boolean" - }, + "rules": "required|string|max:5" + }, { "name": "Rcon Port", "description": "ARK rcon port used by rcon tools.", @@ -77,7 +77,7 @@ "user_editable": 1, "rules": "required|numeric" }, - { + { "name": "Query Port", "description": "ARK query port used by steam server browser and ark client server browser.", "env_variable": "QUERY_PORT", From f18aeef8b67edb3a77cbdd044d3b1c76a869b4cd Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Sun, 11 Nov 2018 21:39:07 -0500 Subject: [PATCH 057/393] Bad parker Parker changed minecraft paths on git, failed to upload wget for the files. --- minecraft_bedrock/nukkit/egg-nukkit.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/minecraft_bedrock/nukkit/egg-nukkit.json b/minecraft_bedrock/nukkit/egg-nukkit.json index a7a0aea4..a521fa24 100644 --- a/minecraft_bedrock/nukkit/egg-nukkit.json +++ b/minecraft_bedrock/nukkit/egg-nukkit.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-05-13T20:03:45+00:00", + "exported_at": "2018-11-11T21:38:05-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\/", @@ -17,7 +17,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:\/\/ci.nukkitx.com\/job\/NukkitX\/job\/master\/lastSuccessfulBuild\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nelse\r\n wget https:\/\/ci.nukkitx.com\/job\/nukkit\/${NUKKIT_VERSION}\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nfi\r\n\r\nwget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/Minecraft%20PE\/nukkit\/nukkit.yml\r\n\r\nwget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/Minecraft%20PE\/nukkit\/server.properties", + "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.nukkitx.com\/job\/NukkitX\/job\/master\/lastSuccessfulBuild\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nelse\r\n wget https:\/\/ci.nukkitx.com\/job\/nukkit\/${NUKKIT_VERSION}\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nfi\r\n\r\nwget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_bedrock\/nukkit\/nukkit.yml\r\n\r\nwget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_bedrock\/nukkit\/server.properties", "container": "alpine:3.7", "entrypoint": "ash" } @@ -51,4 +51,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From 08a4c409fa89331f9970855fd9e2d4267f77db49 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Sun, 11 Nov 2018 23:33:58 -0500 Subject: [PATCH 058/393] Correct nukkit download links Nukkit changed their jenkins install, causing 404 when installing. --- minecraft_bedrock/nukkit/egg-nukkit.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_bedrock/nukkit/egg-nukkit.json b/minecraft_bedrock/nukkit/egg-nukkit.json index a521fa24..4c3b34bb 100644 --- a/minecraft_bedrock/nukkit/egg-nukkit.json +++ b/minecraft_bedrock/nukkit/egg-nukkit.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-11-11T21:38:05-05:00", + "exported_at": "2018-11-11T23:32:59-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\/", @@ -17,7 +17,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:\/\/ci.nukkitx.com\/job\/NukkitX\/job\/master\/lastSuccessfulBuild\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nelse\r\n wget https:\/\/ci.nukkitx.com\/job\/nukkit\/${NUKKIT_VERSION}\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nfi\r\n\r\nwget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_bedrock\/nukkit\/nukkit.yml\r\n\r\nwget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_bedrock\/nukkit\/server.properties", + "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.nukkitx.com\/job\/NukkitX\/job\/Nukkit\/job\/master\/lastSuccessfulBuild\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nelse\r\n wget https:\/\/ci.nukkitx.com\/job\/NukkitX\/job\/Nukkit\/job\/master\/${NUKKIT_VERSION}\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nfi\r\n\r\nwget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_bedrock\/nukkit\/nukkit.yml\r\n\r\nwget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_bedrock\/nukkit\/server.properties", "container": "alpine:3.7", "entrypoint": "ash" } From 3fc9da953bcdf7111ad1638d61fcd3e3ac944610 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Sun, 18 Nov 2018 22:57:02 -0500 Subject: [PATCH 059/393] Correct download Corrected the conf.json download --- gta/ragemp/egg-rage--m-p.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gta/ragemp/egg-rage--m-p.json b/gta/ragemp/egg-rage--m-p.json index 039a0e7a..7aa0d931 100644 --- a/gta/ragemp/egg-rage--m-p.json +++ b/gta/ragemp/egg-rage--m-p.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-06-03T00:48:50-04:00", + "exported_at": "2018-11-18T22:56:21-05:00", "name": "Rage.MP", "author": "noreply.waypointhosting@gmail.com", "description": "https:\/\/rage.mp\/\r\n\r\nThis server requires 2 ports to be added for the server. the main port and the next (port+1) as ports for the server.", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "apt update\r\napt -y install curl tar libstdc++6\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading rage.mp\"\r\ncurl -sSL -o ragemp-srv.tar.gz https:\/\/cdn.rage.mp\/lin\/ragemp-srv.tar.gz\r\n\r\ntar -xzvf ragemp-srv.tar.gz --strip 1 -C \/mnt\/server\r\n\r\nrm ragemp-srv.tar.gz\r\n\r\nchmod +x .\/server\r\n\r\nif [ -e conf.json ]; then\r\n echo \"server config file exists\"\r\nelse\r\n echo \"Downloading default rage.mp config\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/GTA\/RageMP\/conf.json >> conf.json\r\nfi\r\n\r\necho \"install complete\"\r\n\r\nexit 0", + "script": "apt update\r\napt -y install curl tar libstdc++6\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading rage.mp\"\r\ncurl -sSL -o ragemp-srv.tar.gz https:\/\/cdn.rage.mp\/lin\/ragemp-srv.tar.gz\r\n\r\ntar -xzvf ragemp-srv.tar.gz --strip 1 -C \/mnt\/server\r\n\r\nrm ragemp-srv.tar.gz\r\n\r\nchmod +x .\/server\r\n\r\nif [ -e conf.json ]; then\r\n echo \"server config file exists\"\r\nelse\r\n echo \"Downloading default rage.mp config\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/gta\/ragemp\/conf.json >> conf.json\r\nfi\r\n\r\necho \"install complete\"\r\n\r\nexit 0", "container": "ubuntu:16.04", "entrypoint": "bash" } @@ -51,4 +51,4 @@ "rules": "required|boolean" } ] -} \ No newline at end of file +} From a3ed32f2bef186eaa12a6fa3759a9d8e46bbfb32 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sat, 24 Nov 2018 16:13:32 -0800 Subject: [PATCH 060/393] update to use nodejs 10 Using a new NodeJS 10 image for the server Uses NodeJS 10 for the install script. Adds git during the install. --- bots/discord/atlbot/bot/egg-a-t-l-bot.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bots/discord/atlbot/bot/egg-a-t-l-bot.json b/bots/discord/atlbot/bot/egg-a-t-l-bot.json index 9a830410..4016e490 100644 --- a/bots/discord/atlbot/bot/egg-a-t-l-bot.json +++ b/bots/discord/atlbot/bot/egg-a-t-l-bot.json @@ -3,11 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-22T13:32:44-05:00", + "exported_at": "2018-11-24T19:11:07-05:00", "name": "ATLBot", "author": "jfeldt19@gmail.com", "description": "ATLbot in ptero\r\n\r\nhttps:\/\/github.com\/ATLauncher\/discord-bot\/", - "image": "quay.io\/parkervcp\/pterodactyl-images:nodejs", + "image": "quay.io\/parkervcp\/pterodactyl-images:alpine_nodejs-10", "startup": "npm run start", "config": { "files": "{\r\n \"config\/config.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"client_token\": \"{{server.build.env.CLIENT_TOKEN}}\"\r\n }\r\n }\r\n}", @@ -17,8 +17,8 @@ }, "scripts": { "installation": { - "script": "apk add --no-cache openssl\r\n\r\ncd \/mnt\/server\r\n\r\nwget https:\/\/github.com\/ATLauncher\/discord-bot\/archive\/master.zip\r\n\r\nunzip master.zip\r\n\r\nrm master.zip\r\n\r\nmv discord-bot-master\/* .\/\r\n\r\nmv config\/config.json.example config\/config.json\r\n\r\n\/usr\/local\/bin\/npm install --production\r\n\r\n\/usr\/local\/bin\/npm run build\r\n\r\nrm -r discord-bot-master\/\r\nrm Dockerfile\r\nrm CONTRIBUTING.md\r\nrm README.md\r\nrm \/config\/.gitignore\r\nrm CODE_OF_CONDUCT.md", - "container": "node:8.9-alpine", + "script": "apk add --no-cache openssl git\r\n\r\ncd \/mnt\/server\r\n\r\nwget https:\/\/github.com\/ATLauncher\/discord-bot\/archive\/master.zip\r\n\r\nunzip master.zip\r\n\r\nrm master.zip\r\n\r\nmv discord-bot-master\/* .\/\r\n\r\nmv config\/config.json.example config\/config.json\r\n\r\n\/usr\/local\/bin\/npm install --production\r\n\r\n\/usr\/local\/bin\/npm run build", + "container": "node:10-alpine", "entrypoint": "ash" } }, From cc26e6455cb9d46b4d52dee60a323b20c3246b75 Mon Sep 17 00:00:00 2001 From: antonand03 Date: Mon, 26 Nov 2018 13:25:13 +0100 Subject: [PATCH 061/393] Server announce by default Changed it to make the life easier for normal people. --- gta/ragemp/conf.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gta/ragemp/conf.json b/gta/ragemp/conf.json index 8787335b..8ee83ffd 100644 --- a/gta/ragemp/conf.json +++ b/gta/ragemp/conf.json @@ -1,9 +1,9 @@ { - "announce": false, + "announce": true, "bind": "0.0.0.0", "gamemode": "freeroam", "name": "RAGE:MP Unofficial server", "maxplayers": 100, "port": 26011, "streamdistance": 500 -} \ No newline at end of file +} From 0ac9bf9f0518798e10890c106180b2c669e26ebe Mon Sep 17 00:00:00 2001 From: antonand03 Date: Mon, 26 Nov 2018 16:58:58 +0100 Subject: [PATCH 062/393] Fixed announce to match config --- gta/ragemp/egg-rage--m-p.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gta/ragemp/egg-rage--m-p.json b/gta/ragemp/egg-rage--m-p.json index 7aa0d931..4e9b11bc 100644 --- a/gta/ragemp/egg-rage--m-p.json +++ b/gta/ragemp/egg-rage--m-p.json @@ -45,7 +45,7 @@ "name": "Announce", "description": "Announce to the master server so people can see you in their server browser.", "env_variable": "ANNOUNCE", - "default_value": "false", + "default_value": "true", "user_viewable": 1, "user_editable": 1, "rules": "required|boolean" From 6b1a8fb02aca05c10a5e4a171acb153bb570dba5 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Fri, 7 Dec 2018 01:07:24 -0500 Subject: [PATCH 063/393] Added OpenTTD Added OpenTTD --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index da59648e..5604fbe7 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,8 @@ If you are submitting PR's try and keep names and titles the same. [Mount & Blade Warband](/mb_warband/) +[OpenTTD](/openttd/) + [Source](/source_servers/) These eggs use steamcmd to install * [7 Days to Die](/source_servers/7_days_to_die/) * [PixARK](/source_servers/pixark/) From 6346912b46756bfdc0837df3cbdfd908a7c61ac2 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Fri, 7 Dec 2018 01:11:29 -0500 Subject: [PATCH 064/393] Added Config --- openttd/openttd.cfg | 466 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 466 insertions(+) create mode 100644 openttd/openttd.cfg diff --git a/openttd/openttd.cfg b/openttd/openttd.cfg new file mode 100644 index 00000000..79c6f26c --- /dev/null +++ b/openttd/openttd.cfg @@ -0,0 +1,466 @@ +[misc] +display_opt = SHOW_TOWN_NAMES|SHOW_STATION_NAMES|SHOW_SIGNS|FULL_ANIMATION|FULL_DETAIL|WAYPOINTS|SHOW_COMPETITOR_SIGNS +fullscreen = false +support8bpp = no +graphicsset = +soundsset = +musicset = +videodriver = +musicdriver = +sounddriver = +blitter = +language = english.lng +resolution = 640,480 +screenshot_format = +savegame_format = +rightclick_emulate = false +small_font = +medium_font = +large_font = +mono_font = +small_size = 0 +medium_size = 0 +large_size = 0 +mono_size = 0 +small_aa = false +medium_aa = false +large_aa = false +mono_aa = false +sprite_cache_size_px = 128 +player_face = 0 +transparency_options = 0 +transparency_locks = 0 +invisibility_options = 0 +keyboard = +keyboard_caps = +last_newgrf_count = 0 +gui_zoom = 2 + +[difficulty] +max_no_competitors = 0 +number_towns = 2 +industry_density = 5 +max_loan = 300000 +initial_interest = 2 +vehicle_costs = 0 +competitor_speed = 2 +vehicle_breakdowns = 1 +subsidy_multiplier = 2 +construction_cost = 0 +terrain_type = 1 +quantity_sea_lakes = 0 +economy = false +line_reverse_mode = false +disasters = false +town_council_tolerance = 0 + +[game_creation] +town_name = english +landscape = temperate +snow_line_height = 15 +starting_year = 1950 +land_generator = 1 +oil_refinery_limit = 32 +tgen_smoothness = 1 +variety = 0 +generation_seed = 3410929700 +tree_placer = 2 +heightmap_rotation = 0 +se_flat_world_height = 1 +map_x = 8 +map_y = 8 +water_borders = 15 +custom_town_number = 1 +custom_sea_level = 2 +min_river_length = 16 +river_route_random = 5 +amount_of_rivers = 2 + +[vehicle] +road_side = right +train_acceleration_model = 1 +roadveh_acceleration_model = 1 +train_slope_steepness = 3 +roadveh_slope_steepness = 7 +max_train_length = 7 +smoke_amount = 1 +never_expire_vehicles = false +max_trains = 500 +max_roadveh = 500 +max_aircraft = 200 +max_ships = 300 +wagon_speed_limits = true +disable_elrails = false +freight_trains = 1 +plane_speed = 4 +dynamic_engines = true +plane_crashes = 2 +extend_vehicle_life = 0 +servint_ispercent = false +servint_trains = 150 +servint_roadveh = 150 +servint_ships = 360 +servint_aircraft = 100 + +[construction] +max_heightlevel = 30 +build_on_slopes = true +command_pause_level = 1 +terraform_per_64k_frames = 4194304 +terraform_frame_burst = 4096 +clear_per_64k_frames = 4194304 +clear_frame_burst = 4096 +tree_per_64k_frames = 4194304 +tree_frame_burst = 4096 +autoslope = true +extra_dynamite = true +max_bridge_length = 64 +max_bridge_height = 12 +max_tunnel_length = 64 +train_signal_side = 1 +road_stop_on_town_road = true +road_stop_on_competitor_road = true +raw_industry_construction = 0 +industry_platform = 1 +freeform_edges = true +extra_tree_placement = 2 + +[station] +never_expire_airports = false +station_spread = 12 +modified_catchment = true +adjacent_stations = true +distant_join_stations = true + +[economy] +town_layout = 0 +allow_town_roads = true +found_town = 0 +allow_town_level_crossings = true +station_noise_level = false +inflation = true +multiple_industry_per_town = false +bribe = true +exclusive_rights = true +fund_buildings = true +fund_roads = true +give_money = true +smooth_economy = true +allow_shares = false +feeder_payment_share = 75 +town_growth_rate = 2 +larger_towns = 4 +initial_city_size = 2 +mod_road_rebuild = true +dist_local_authority = 20 +town_noise_population[0] = 800 +town_noise_population[1] = 2000 +town_noise_population[2] = 4000 +infrastructure_maintenance = false + +[linkgraph] +recalc_interval = 4 +recalc_time = 16 +distribution_pax = 0 +distribution_mail = 0 +distribution_armoured = 0 +distribution_default = 0 +accuracy = 16 +demand_distance = 100 +demand_size = 100 +short_path_saturation = 80 + +[pf] +forbid_90_deg = false +roadveh_queue = true +pathfinder_for_trains = 2 +pathfinder_for_roadvehs = 2 +pathfinder_for_ships = 2 +reverse_at_signals = false +wait_oneway_signal = 15 +wait_twoway_signal = 41 +wait_for_pbs_path = 30 +reserve_paths = false +path_backoff_interval = 20 +opf.pf_maxlength = 4096 +opf.pf_maxdepth = 48 +npf.npf_max_search_nodes = 10000 +npf.npf_rail_firstred_penalty = 1000 +npf.npf_rail_firstred_exit_penalty = 10000 +npf.npf_rail_lastred_penalty = 1000 +npf.npf_rail_station_penalty = 100 +npf.npf_rail_slope_penalty = 100 +npf.npf_rail_curve_penalty = 100 +npf.npf_rail_depot_reverse_penalty = 5000 +npf.npf_rail_pbs_cross_penalty = 300 +npf.npf_rail_pbs_signal_back_penalty = 1500 +npf.npf_buoy_penalty = 200 +npf.npf_water_curve_penalty = 100 +npf.npf_road_curve_penalty = 100 +npf.npf_crossing_penalty = 300 +npf.npf_road_drive_through_penalty = 800 +npf.npf_road_dt_occupied_penalty = 800 +npf.npf_road_bay_occupied_penalty = 1500 +npf.maximum_go_to_depot_penalty = 2000 +yapf.disable_node_optimization = false +yapf.max_search_nodes = 10000 +yapf.rail_firstred_twoway_eol = false +yapf.rail_firstred_penalty = 1000 +yapf.rail_firstred_exit_penalty = 10000 +yapf.rail_lastred_penalty = 1000 +yapf.rail_lastred_exit_penalty = 10000 +yapf.rail_station_penalty = 1000 +yapf.rail_slope_penalty = 200 +yapf.rail_curve45_penalty = 100 +yapf.rail_curve90_penalty = 600 +yapf.rail_depot_reverse_penalty = 5000 +yapf.rail_crossing_penalty = 300 +yapf.rail_look_ahead_max_signals = 10 +yapf.rail_look_ahead_signal_p0 = 500 +yapf.rail_look_ahead_signal_p1 = -100 +yapf.rail_look_ahead_signal_p2 = 5 +yapf.rail_pbs_cross_penalty = 300 +yapf.rail_pbs_station_penalty = 800 +yapf.rail_pbs_signal_back_penalty = 1500 +yapf.rail_doubleslip_penalty = 100 +yapf.rail_longer_platform_penalty = 800 +yapf.rail_longer_platform_per_tile_penalty = 0 +yapf.rail_shorter_platform_penalty = 4000 +yapf.rail_shorter_platform_per_tile_penalty = 0 +yapf.road_slope_penalty = 200 +yapf.road_curve_penalty = 100 +yapf.road_crossing_penalty = 300 +yapf.road_stop_penalty = 800 +yapf.road_stop_occupied_penalty = 800 +yapf.road_stop_bay_occupied_penalty = 1500 +yapf.maximum_go_to_depot_penalty = 2000 + +[order] +no_servicing_if_no_breakdowns = true +improved_load = true +selectgoods = true +serviceathelipad = true +gradual_loading = true + +[script] +settings_profile = easy +script_max_opcode_till_suspend = 10000 + +[ai] +ai_in_multiplayer = true +ai_disable_veh_train = false +ai_disable_veh_roadveh = false +ai_disable_veh_aircraft = false +ai_disable_veh_ship = false + +[locale] +currency = GBP +units_velocity = metric +units_power = metric +units_weight = metric +units_volume = metric +units_force = si +units_height = metric +digit_group_separator = +digit_group_separator_currency = +digit_decimal_separator = + +[gui] +autosave = monthly +threaded_saves = true +date_format_in_default_names = long +show_finances = true +auto_scrolling = 0 +reverse_scroll = false +smooth_scroll = false +left_mouse_btn_scrolling = false +right_mouse_wnd_close = false +measure_tooltip = true +errmsg_duration = 5 +hover_delay_ms = 250 +osk_activation = double +toolbar_pos = 1 +statusbar_pos = 1 +window_snap_radius = 10 +window_soft_limit = 20 +zoom_min = 0 +zoom_max = 5 +population_in_label = true +link_terraform_toolbar = false +smallmap_land_colour = 0 +liveries = 2 +prefer_teamchat = false +scrollwheel_scrolling = 0 +scrollwheel_multiplier = 5 +pause_on_newgame = false +advanced_vehicle_list = 1 +timetable_in_ticks = false +timetable_arrival_departure = true +quick_goto = false +loading_indicators = 1 +default_rail_type = 0 +enable_signal_gui = true +coloured_news_year = 2000 +drag_signals_density = 4 +drag_signals_fixed_distance = false +semaphore_build_before = 1950 +vehicle_income_warn = true +order_review_system = 2 +lost_vehicle_warn = true +disable_unsuitable_building = true +new_nonstop = false +stop_location = 2 +keep_all_autosave = false +autosave_on_exit = false +max_num_autosaves = 16 +auto_euro = true +news_message_timeout = 2 +show_track_reservation = false +default_signal_type = 1 +cycle_signal_types = 2 +station_numtracks = 1 +station_platlength = 5 +station_dragdrop = true +station_show_coverage = false +persistent_buildingtools = true +expenses_layout = false +station_gui_group_order = 0 +station_gui_sort_by = 0 +station_gui_sort_order = 0 +missing_strings_threshold = 25 +graph_line_thickness = 3 +show_date_in_logs = false +settings_restriction_mode = 0 +developer = 1 +newgrf_developer_tools = false +ai_developer_tools = false +scenario_developer = false +newgrf_show_old_versions = false +newgrf_default_palette = 1 +console_backlog_timeout = 100 +console_backlog_length = 100 +network_chat_box_width_pct = 40 +network_chat_box_height = 25 +network_chat_timeout = 20 + +[sound] +news_ticker = true +news_full = true +new_year = true +confirm = true +click_beep = true +disaster = true +vehicle = true +ambient = true + +[music] +playlist = 0 +music_vol = 127 +effect_vol = 127 +custom_1 = 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +custom_2 = 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +playing = false +shuffle = false + +[news_display] +arrival_player = full +arrival_other = summarized +accident = full +company_info = full +open = summarized +close = summarized +economy = full +production_player = summarized +production_other = off +production_nobody = off +advice = full +new_vehicles = full +acceptance = full +subsidies = summarized +general = full + +[network] +commands_per_frame = 2 +max_commands_in_queue = 16 +bytes_per_frame = 8 +bytes_per_frame_burst = 256 +max_init_time = 100 +max_join_time = 500 +max_download_time = 1000 +max_password_time = 2000 +max_lag_time = 500 +pause_on_join = true +server_port = +server_admin_port = 3977 +server_admin_chat = true +server_advertise = true +lan_internet = 0 +client_name = +server_password = +rcon_password = +admin_password = +default_company_pass = +server_name = +connect_to_ip = +network_id = +autoclean_companies = false +autoclean_unprotected = 12 +autoclean_protected = 36 +autoclean_novehicles = 0 +max_companies = 15 +max_clients = 25 +max_spectators = 15 +restart_game_year = 0 +min_active_clients = 0 +server_lang = ANY +reload_cfg = false +last_host = +last_port = 0 +no_http_content_downloads = false + +[currency] +rate = 1 +separator = . +to_euro = 0 +prefix = "" +suffix = " credits" + +[company] +engine_renew = false +engine_renew_months = 6 +engine_renew_money = 100000 +renew_keep_length = false + +[server_bind_addresses] + +[servers] + +[bans] + +[ai_players] +none = start_date=730 +none = start_date=730 +none = start_date=730 +none = start_date=730 +none = start_date=730 +none = start_date=730 +none = start_date=730 +none = start_date=730 +none = start_date=730 +none = start_date=730 +none = start_date=730 +none = start_date=730 +none = start_date=730 +none = start_date=730 +none = start_date=730 + +[game_scripts] +none = + +[version] +version_string = 1.8.0 +version_number = 18086D62 + +[newgrf] + +[newgrf-static] From f700a962760f9f48e7b36cbb655af81e499f209f Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Fri, 7 Dec 2018 01:15:53 -0500 Subject: [PATCH 065/393] Create README.md --- openttd/README.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 openttd/README.md diff --git a/openttd/README.md b/openttd/README.md new file mode 100644 index 00000000..72b1155a --- /dev/null +++ b/openttd/README.md @@ -0,0 +1,8 @@ +# OpenTTD + +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 + +## Server Ports + +OpenTTD requires one port to play, Defualt port is 3979 \ +Other ports can be added for rcon, but needs to be reflected in the openttd.cfg From ddee8ae6838eb55f2d5a4f5320d42deb3c6a0334 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Fri, 7 Dec 2018 01:17:21 -0500 Subject: [PATCH 066/393] Update README.md --- openttd/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openttd/README.md b/openttd/README.md index 72b1155a..924db1fe 100644 --- a/openttd/README.md +++ b/openttd/README.md @@ -4,5 +4,6 @@ OpenTTD is a business simulation game in which players try to earn money via tra ## Server Ports -OpenTTD requires one port to play, Defualt port is 3979 \ -Other ports can be added for rcon, but needs to be reflected in the openttd.cfg +| Port | Default | +|---------|---------| +| Game | 3797 | From 0f4748e6a06a441a776e9f68d6432e361e0ad20c Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Fri, 7 Dec 2018 01:17:29 -0500 Subject: [PATCH 067/393] Update README.md --- openttd/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openttd/README.md b/openttd/README.md index 924db1fe..335379d6 100644 --- a/openttd/README.md +++ b/openttd/README.md @@ -2,7 +2,7 @@ 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 -## Server Ports +## Server Port | Port | Default | |---------|---------| From 95b173d355edcdfa02f23ecc8cb6e2c9289ab4e1 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Fri, 7 Dec 2018 01:17:48 -0500 Subject: [PATCH 068/393] Update README.md --- openttd/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openttd/README.md b/openttd/README.md index 335379d6..7d6d7ffb 100644 --- a/openttd/README.md +++ b/openttd/README.md @@ -1,4 +1,4 @@ -# OpenTTD +# 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 5e31d321d1911b0478b81e9f4ee0babd6a0d8fb7 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Fri, 7 Dec 2018 01:21:26 -0500 Subject: [PATCH 069/393] Add files via upload --- openttd/egg-open-t-t-d-server.json | 63 ++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 openttd/egg-open-t-t-d-server.json diff --git a/openttd/egg-open-t-t-d-server.json b/openttd/egg-open-t-t-d-server.json new file mode 100644 index 00000000..e39343a7 --- /dev/null +++ b/openttd/egg-open-t-t-d-server.json @@ -0,0 +1,63 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-12-07T01:20:53-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": "areyouscared\/ptero:openttd", + "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}", + "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\napt -y update\r\napt -y --no-install-recommends install wget tar unzip ca-certificates curl\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n## Download game\r\nwget https:\/\/binaries.openttd.org\/releases\/1.8.0\/openttd-1.8.0-linux-generic-amd64.tar.gz \r\ntar xf \/mnt\/server\/openttd-1.8.0-linux-generic-amd64.tar.gz\r\nmv openttd-1.8.0-linux-generic-amd64\/* .\r\nchmod +x openttd\r\n\r\n## Get opensoruce gfx\r\ncd \/mnt\/server\r\nwget https:\/\/binaries.openttd.org\/extra\/opengfx\/0.5.2\/opengfx-0.5.2-all.zip\r\nunzip opengfx-0.5.2-all.zip\r\ntar -xvf opengfx-0.5.2.tar\r\ncd opengfx-0.5.2\r\nmv -t \/mnt\/server\/baseset ogfx1_base.grf ogfxc_arctic.grf ogfxe_extra.grf ogfxh_tropical.grf ogfxi_logos.grf ogfxt_toyland.grf opengfx.obg\r\n\r\n## Remove excess files\r\ncd \/mnt\/server\r\nrm opengfx-0.5.2-all.zip opengfx-0.5.2.tar openttd-1.8.0-linux-generic-amd64.tar.gz\r\nrm -r opengfx-0.5.2-all openttd-1.8.0-linux-generic-amd64\r\ncurl https:\/\/justmyrandomstuff.com\/img\/nFBT6S7.cfg >> openttd.cfg", + "container": "ubuntu:18.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Server Name", + "description": "The name shown in the serverlist", + "env_variable": "srv_name", + "default_value": "OpenTTD Server", + "user_viewable": 1, + "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", + "env_variable": "srv_advertise", + "default_value": "true", + "user_viewable": 1, + "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" + } + ] +} \ No newline at end of file From ca46b4e860852d4e30bbf124b2b8bd0ceee7bb81 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Fri, 7 Dec 2018 01:23:22 -0500 Subject: [PATCH 070/393] Update egg-open-t-t-d-server.json --- openttd/egg-open-t-t-d-server.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openttd/egg-open-t-t-d-server.json b/openttd/egg-open-t-t-d-server.json index e39343a7..d213ce4b 100644 --- a/openttd/egg-open-t-t-d-server.json +++ b/openttd/egg-open-t-t-d-server.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\napt -y update\r\napt -y --no-install-recommends install wget tar unzip ca-certificates curl\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n## Download game\r\nwget https:\/\/binaries.openttd.org\/releases\/1.8.0\/openttd-1.8.0-linux-generic-amd64.tar.gz \r\ntar xf \/mnt\/server\/openttd-1.8.0-linux-generic-amd64.tar.gz\r\nmv openttd-1.8.0-linux-generic-amd64\/* .\r\nchmod +x openttd\r\n\r\n## Get opensoruce gfx\r\ncd \/mnt\/server\r\nwget https:\/\/binaries.openttd.org\/extra\/opengfx\/0.5.2\/opengfx-0.5.2-all.zip\r\nunzip opengfx-0.5.2-all.zip\r\ntar -xvf opengfx-0.5.2.tar\r\ncd opengfx-0.5.2\r\nmv -t \/mnt\/server\/baseset ogfx1_base.grf ogfxc_arctic.grf ogfxe_extra.grf ogfxh_tropical.grf ogfxi_logos.grf ogfxt_toyland.grf opengfx.obg\r\n\r\n## Remove excess files\r\ncd \/mnt\/server\r\nrm opengfx-0.5.2-all.zip opengfx-0.5.2.tar openttd-1.8.0-linux-generic-amd64.tar.gz\r\nrm -r opengfx-0.5.2-all openttd-1.8.0-linux-generic-amd64\r\ncurl https:\/\/justmyrandomstuff.com\/img\/nFBT6S7.cfg >> openttd.cfg", + "script": "#!\/bin\/ash\r\napt -y update\r\napt -y --no-install-recommends install wget tar unzip ca-certificates curl\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n## Download game\r\nwget https:\/\/binaries.openttd.org\/releases\/1.8.0\/openttd-1.8.0-linux-generic-amd64.tar.gz \r\ntar xf \/mnt\/server\/openttd-1.8.0-linux-generic-amd64.tar.gz\r\nmv openttd-1.8.0-linux-generic-amd64\/* .\r\nchmod +x openttd\r\n\r\n## Get opensoruce gfx\r\ncd \/mnt\/server\r\nwget https:\/\/binaries.openttd.org\/extra\/opengfx\/0.5.2\/opengfx-0.5.2-all.zip\r\nunzip opengfx-0.5.2-all.zip\r\ntar -xvf opengfx-0.5.2.tar\r\ncd opengfx-0.5.2\r\nmv -t \/mnt\/server\/baseset ogfx1_base.grf ogfxc_arctic.grf ogfxe_extra.grf ogfxh_tropical.grf ogfxi_logos.grf ogfxt_toyland.grf opengfx.obg\r\n\r\n## Remove excess files\r\ncd \/mnt\/server\r\nrm opengfx-0.5.2-all.zip opengfx-0.5.2.tar openttd-1.8.0-linux-generic-amd64.tar.gz\r\nrm -r opengfx-0.5.2-all openttd-1.8.0-linux-generic-amd64\r\ncurl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/openttd\/egg-open-t-t-d-server.json >> openttd.cfg", "container": "ubuntu:18.04", "entrypoint": "bash" } @@ -60,4 +60,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From 06392e4b776d0d08a2544b446537837814e6a1d2 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Fri, 7 Dec 2018 01:24:11 -0500 Subject: [PATCH 071/393] Delete egg-open-t-t-d-server.json --- openttd/egg-open-t-t-d-server.json | 63 ------------------------------ 1 file changed, 63 deletions(-) delete mode 100644 openttd/egg-open-t-t-d-server.json diff --git a/openttd/egg-open-t-t-d-server.json b/openttd/egg-open-t-t-d-server.json deleted file mode 100644 index d213ce4b..00000000 --- a/openttd/egg-open-t-t-d-server.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2018-12-07T01:20:53-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": "areyouscared\/ptero:openttd", - "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}", - "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\napt -y update\r\napt -y --no-install-recommends install wget tar unzip ca-certificates curl\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n## Download game\r\nwget https:\/\/binaries.openttd.org\/releases\/1.8.0\/openttd-1.8.0-linux-generic-amd64.tar.gz \r\ntar xf \/mnt\/server\/openttd-1.8.0-linux-generic-amd64.tar.gz\r\nmv openttd-1.8.0-linux-generic-amd64\/* .\r\nchmod +x openttd\r\n\r\n## Get opensoruce gfx\r\ncd \/mnt\/server\r\nwget https:\/\/binaries.openttd.org\/extra\/opengfx\/0.5.2\/opengfx-0.5.2-all.zip\r\nunzip opengfx-0.5.2-all.zip\r\ntar -xvf opengfx-0.5.2.tar\r\ncd opengfx-0.5.2\r\nmv -t \/mnt\/server\/baseset ogfx1_base.grf ogfxc_arctic.grf ogfxe_extra.grf ogfxh_tropical.grf ogfxi_logos.grf ogfxt_toyland.grf opengfx.obg\r\n\r\n## Remove excess files\r\ncd \/mnt\/server\r\nrm opengfx-0.5.2-all.zip opengfx-0.5.2.tar openttd-1.8.0-linux-generic-amd64.tar.gz\r\nrm -r opengfx-0.5.2-all openttd-1.8.0-linux-generic-amd64\r\ncurl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/openttd\/egg-open-t-t-d-server.json >> openttd.cfg", - "container": "ubuntu:18.04", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Server Name", - "description": "The name shown in the serverlist", - "env_variable": "srv_name", - "default_value": "OpenTTD Server", - "user_viewable": 1, - "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", - "env_variable": "srv_advertise", - "default_value": "true", - "user_viewable": 1, - "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" - } - ] -} From dc491d5a8768fabdb56031324df25ef3f88083b8 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Fri, 7 Dec 2018 01:24:50 -0500 Subject: [PATCH 072/393] Create egg-open-t-t-d-server --- openttd/egg-open-t-t-d-server | 63 +++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 openttd/egg-open-t-t-d-server diff --git a/openttd/egg-open-t-t-d-server b/openttd/egg-open-t-t-d-server new file mode 100644 index 00000000..71ca350c --- /dev/null +++ b/openttd/egg-open-t-t-d-server @@ -0,0 +1,63 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-12-07T01:23:04-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": "areyouscared\/ptero:openttd", + "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}", + "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\napt -y update\r\napt -y --no-install-recommends install wget tar unzip ca-certificates curl\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n## Download game\r\nwget https:\/\/binaries.openttd.org\/releases\/1.8.0\/openttd-1.8.0-linux-generic-amd64.tar.gz \r\ntar xf \/mnt\/server\/openttd-1.8.0-linux-generic-amd64.tar.gz\r\nmv openttd-1.8.0-linux-generic-amd64\/* .\r\nchmod +x openttd\r\n\r\n## Get opensoruce gfx\r\ncd \/mnt\/server\r\nwget https:\/\/binaries.openttd.org\/extra\/opengfx\/0.5.2\/opengfx-0.5.2-all.zip\r\nunzip opengfx-0.5.2-all.zip\r\ntar -xvf opengfx-0.5.2.tar\r\ncd opengfx-0.5.2\r\nmv -t \/mnt\/server\/baseset ogfx1_base.grf ogfxc_arctic.grf ogfxe_extra.grf ogfxh_tropical.grf ogfxi_logos.grf ogfxt_toyland.grf opengfx.obg\r\n\r\n## Remove excess files\r\ncd \/mnt\/server\r\nrm opengfx-0.5.2-all.zip opengfx-0.5.2.tar openttd-1.8.0-linux-generic-amd64.tar.gz\r\nrm -r opengfx-0.5.2-all openttd-1.8.0-linux-generic-amd64\r\ncurl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/openttd\/egg-open-t-t-d-server.json >> openttd.cfg", + "container": "ubuntu:18.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Server Name", + "description": "The name shown in the serverlist", + "env_variable": "srv_name", + "default_value": "OpenTTD Server", + "user_viewable": 1, + "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", + "env_variable": "srv_advertise", + "default_value": "true", + "user_viewable": 1, + "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" + } + ] +} From 4ca066ed685bb8443a7749333089a8f52b0e163e Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Fri, 7 Dec 2018 01:27:26 -0500 Subject: [PATCH 073/393] Fixed pulling of config Corrected config name --- openttd/egg-open-t-t-d-server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openttd/egg-open-t-t-d-server b/openttd/egg-open-t-t-d-server index 71ca350c..bf5b0eb7 100644 --- a/openttd/egg-open-t-t-d-server +++ b/openttd/egg-open-t-t-d-server @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\napt -y update\r\napt -y --no-install-recommends install wget tar unzip ca-certificates curl\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n## Download game\r\nwget https:\/\/binaries.openttd.org\/releases\/1.8.0\/openttd-1.8.0-linux-generic-amd64.tar.gz \r\ntar xf \/mnt\/server\/openttd-1.8.0-linux-generic-amd64.tar.gz\r\nmv openttd-1.8.0-linux-generic-amd64\/* .\r\nchmod +x openttd\r\n\r\n## Get opensoruce gfx\r\ncd \/mnt\/server\r\nwget https:\/\/binaries.openttd.org\/extra\/opengfx\/0.5.2\/opengfx-0.5.2-all.zip\r\nunzip opengfx-0.5.2-all.zip\r\ntar -xvf opengfx-0.5.2.tar\r\ncd opengfx-0.5.2\r\nmv -t \/mnt\/server\/baseset ogfx1_base.grf ogfxc_arctic.grf ogfxe_extra.grf ogfxh_tropical.grf ogfxi_logos.grf ogfxt_toyland.grf opengfx.obg\r\n\r\n## Remove excess files\r\ncd \/mnt\/server\r\nrm opengfx-0.5.2-all.zip opengfx-0.5.2.tar openttd-1.8.0-linux-generic-amd64.tar.gz\r\nrm -r opengfx-0.5.2-all openttd-1.8.0-linux-generic-amd64\r\ncurl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/openttd\/egg-open-t-t-d-server.json >> openttd.cfg", + "script": "#!\/bin\/ash\r\napt -y update\r\napt -y --no-install-recommends install wget tar unzip ca-certificates curl\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n## Download game\r\nwget https:\/\/binaries.openttd.org\/releases\/1.8.0\/openttd-1.8.0-linux-generic-amd64.tar.gz \r\ntar xf \/mnt\/server\/openttd-1.8.0-linux-generic-amd64.tar.gz\r\nmv openttd-1.8.0-linux-generic-amd64\/* .\r\nchmod +x openttd\r\n\r\n## Get opensoruce gfx\r\ncd \/mnt\/server\r\nwget https:\/\/binaries.openttd.org\/extra\/opengfx\/0.5.2\/opengfx-0.5.2-all.zip\r\nunzip opengfx-0.5.2-all.zip\r\ntar -xvf opengfx-0.5.2.tar\r\ncd opengfx-0.5.2\r\nmv -t \/mnt\/server\/baseset ogfx1_base.grf ogfxc_arctic.grf ogfxe_extra.grf ogfxh_tropical.grf ogfxi_logos.grf ogfxt_toyland.grf opengfx.obg\r\n\r\n## Remove excess files\r\ncd \/mnt\/server\r\nrm opengfx-0.5.2-all.zip opengfx-0.5.2.tar openttd-1.8.0-linux-generic-amd64.tar.gz\r\nrm -r opengfx-0.5.2-all openttd-1.8.0-linux-generic-amd64\r\ncurl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/openttd\/openttd.cfg >> openttd.cfg", "container": "ubuntu:18.04", "entrypoint": "bash" } From d6154431cb2ed3d26c973ae4305ba6e3007a32d8 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Sat, 8 Dec 2018 22:29:03 -0500 Subject: [PATCH 074/393] Rename egg-open-t-t-d-server to egg-open-t-t-d-server.json --- openttd/{egg-open-t-t-d-server => egg-open-t-t-d-server.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename openttd/{egg-open-t-t-d-server => egg-open-t-t-d-server.json} (100%) diff --git a/openttd/egg-open-t-t-d-server b/openttd/egg-open-t-t-d-server.json similarity index 100% rename from openttd/egg-open-t-t-d-server rename to openttd/egg-open-t-t-d-server.json From e19eaf2155557081dd101dc0e7e260901a8a9437 Mon Sep 17 00:00:00 2001 From: Exonical Date: Thu, 1 Mar 2018 08:34:22 -0500 Subject: [PATCH 075/393] Add 7 Days to Die --- 7DTD/7DaysToDie/egg-7-days-to-die.json | 54 ++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 7DTD/7DaysToDie/egg-7-days-to-die.json diff --git a/7DTD/7DaysToDie/egg-7-days-to-die.json b/7DTD/7DaysToDie/egg-7-days-to-die.json new file mode 100644 index 00000000..c8c7da0e --- /dev/null +++ b/7DTD/7DaysToDie/egg-7-days-to-die.json @@ -0,0 +1,54 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-03-01T08:34:00-05:00", + "name": "7 Days to Die", + "author": "brycea@rapidnetworks.org", + "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.", + "image": "quay.io\/exonical\/7-days-to-die", + "startup": ".\/startserver.sh -configfile=serverconfig.xml -nographics -logfile 7DaysToDie_Data\/output_log.txt $@", + "config": { + "files": "{\r\n \"serverconfig.xml\": {\r\n \"parser\": \"xml\",\r\n \"find\": {\r\n \"ServerPort\": \"{{server.build.default.port}}\",\r\n \"ServerName\": \"{{server.build.env.HOSTNAME}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"\",\r\n \"userInteraction\": []\r\n}", + "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "apt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\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\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 320850 +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so", + "container": "ubuntu:16.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Steam Username", + "description": "", + "env_variable": "steam_user", + "default_value": "anonymous", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:50" + }, + { + "name": "Steam Password", + "description": "", + "env_variable": "steam_pass", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" + }, + { + "name": "Hostname", + "description": "Name of the server that appears publicly.", + "env_variable": "HOSTNAME", + "default_value": "My Server", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:64" + } + ] +} \ No newline at end of file From 52008cd7617dc637aa7ff931abc296d73724e266 Mon Sep 17 00:00:00 2001 From: Exonical Date: Thu, 1 Mar 2018 08:36:08 -0500 Subject: [PATCH 076/393] Update --- 7DTD/7DaysToDie/egg-7-days-to-die.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/7DTD/7DaysToDie/egg-7-days-to-die.json b/7DTD/7DaysToDie/egg-7-days-to-die.json index c8c7da0e..cdf66f73 100644 --- a/7DTD/7DaysToDie/egg-7-days-to-die.json +++ b/7DTD/7DaysToDie/egg-7-days-to-die.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-03-01T08:34:00-05:00", + "exported_at": "2018-03-01T08:35:50-05:00", "name": "7 Days to Die", "author": "brycea@rapidnetworks.org", "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.", @@ -12,12 +12,12 @@ "config": { "files": "{\r\n \"serverconfig.xml\": {\r\n \"parser\": \"xml\",\r\n \"find\": {\r\n \"ServerPort\": \"{{server.build.default.port}}\",\r\n \"ServerName\": \"{{server.build.env.HOSTNAME}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "^C" }, "scripts": { "installation": { - "script": "apt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\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\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 320850 +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so", + "script": "apt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\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\nchown -R root:root \/mnt\r\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login ${steam_user} ${steam_pass} +force_install_dir \/mnt\/server +app_update 320850 +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so", "container": "ubuntu:16.04", "entrypoint": "bash" } From ea689911942a5a83b65f6d6301a5437c075b5177 Mon Sep 17 00:00:00 2001 From: Exonical Date: Thu, 1 Mar 2018 17:26:52 -0500 Subject: [PATCH 077/393] Update --- 7DTD/7DaysToDie/egg-7-days-to-die.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/7DTD/7DaysToDie/egg-7-days-to-die.json b/7DTD/7DaysToDie/egg-7-days-to-die.json index cdf66f73..05037330 100644 --- a/7DTD/7DaysToDie/egg-7-days-to-die.json +++ b/7DTD/7DaysToDie/egg-7-days-to-die.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-03-01T08:35:50-05:00", + "exported_at": "2018-03-01T17:26:17-05:00", "name": "7 Days to Die", "author": "brycea@rapidnetworks.org", "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.", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "apt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\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\nchown -R root:root \/mnt\r\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login ${steam_user} ${steam_pass} +force_install_dir \/mnt\/server +app_update 320850 +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so", + "script": "apt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\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\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\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so", "container": "ubuntu:16.04", "entrypoint": "bash" } From 1374dce40dd49eb884685e56988d14e08292be60 Mon Sep 17 00:00:00 2001 From: Exonical Date: Sun, 8 Apr 2018 03:02:16 -0400 Subject: [PATCH 078/393] Add Hurtworld --- Hurtworld/hurtworld/egg-hurtworld.json | 63 ++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 Hurtworld/hurtworld/egg-hurtworld.json diff --git a/Hurtworld/hurtworld/egg-hurtworld.json b/Hurtworld/hurtworld/egg-hurtworld.json new file mode 100644 index 00000000..9e1d5fb6 --- /dev/null +++ b/Hurtworld/hurtworld/egg-hurtworld.json @@ -0,0 +1,63 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-04-08T03:01:49-04:00", + "name": "Hurtworld", + "author": "brycea@rapidnetworks.org", + "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\/exonical\/pterodactyl-hurtworld:hurtworld", + "startup": ".\/Hurtworld.x86_64 -batchmode -nographics -exec \"host {{SERVER_PORT}};queryport {{QUERY_PORT}};maxplayers {{MAX_PLAYERS}};servername {{HOSTNAME}}\" -logfile output.txt", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Mono config path = '\/home\/container\/Hurtworld_Data\/Mono\/etc'\",\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# Hurtworld 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 ${SERVER_APPID} +quit\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": "Game ID", + "description": "The ID corresponding to the game to download and run using SRCDS.", + "env_variable": "SERVER_APPID", + "default_value": "405100", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|regex:\/^(405100)$\/" + }, + { + "name": "Query Port", + "description": "Server Query Default Port", + "env_variable": "QUERY_PORT", + "default_value": "12881", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|string" + }, + { + "name": "Max Players", + "description": "Max players allowed on the server at one time.", + "env_variable": "MAX_PLAYERS", + "default_value": "60", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:60" + }, + { + "name": "Server Name", + "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, + "rules": "required|string|max:50" + } + ] +} \ No newline at end of file From 331704a2619ad8a9c76fe6b270e1880027099929 Mon Sep 17 00:00:00 2001 From: Exonical Date: Sun, 8 Apr 2018 03:03:42 -0400 Subject: [PATCH 079/393] Remove Hurtworld --- Hurtworld/hurtworld/egg-hurtworld.json | 63 -------------------------- 1 file changed, 63 deletions(-) delete mode 100644 Hurtworld/hurtworld/egg-hurtworld.json diff --git a/Hurtworld/hurtworld/egg-hurtworld.json b/Hurtworld/hurtworld/egg-hurtworld.json deleted file mode 100644 index 9e1d5fb6..00000000 --- a/Hurtworld/hurtworld/egg-hurtworld.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2018-04-08T03:01:49-04:00", - "name": "Hurtworld", - "author": "brycea@rapidnetworks.org", - "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\/exonical\/pterodactyl-hurtworld:hurtworld", - "startup": ".\/Hurtworld.x86_64 -batchmode -nographics -exec \"host {{SERVER_PORT}};queryport {{QUERY_PORT}};maxplayers {{MAX_PLAYERS}};servername {{HOSTNAME}}\" -logfile output.txt", - "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"Mono config path = '\/home\/container\/Hurtworld_Data\/Mono\/etc'\",\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# Hurtworld 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 ${SERVER_APPID} +quit\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": "Game ID", - "description": "The ID corresponding to the game to download and run using SRCDS.", - "env_variable": "SERVER_APPID", - "default_value": "405100", - "user_viewable": 1, - "user_editable": 0, - "rules": "required|regex:\/^(405100)$\/" - }, - { - "name": "Query Port", - "description": "Server Query Default Port", - "env_variable": "QUERY_PORT", - "default_value": "12881", - "user_viewable": 1, - "user_editable": 0, - "rules": "required|string" - }, - { - "name": "Max Players", - "description": "Max players allowed on the server at one time.", - "env_variable": "MAX_PLAYERS", - "default_value": "60", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:60" - }, - { - "name": "Server Name", - "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, - "rules": "required|string|max:50" - } - ] -} \ No newline at end of file From cfb54e22ceeda4640e1a4e7277d00fdb7ada2998 Mon Sep 17 00:00:00 2001 From: Exonical Date: Sun, 8 Apr 2018 03:04:15 -0400 Subject: [PATCH 080/393] Add Hurtworld remove 7DTD --- 7DTD/7DaysToDie/egg-7-days-to-die.json | 54 ---------------------- Hurtworld/hurtworld/egg-hurtworld.json | 63 ++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 54 deletions(-) delete mode 100644 7DTD/7DaysToDie/egg-7-days-to-die.json create mode 100644 Hurtworld/hurtworld/egg-hurtworld.json diff --git a/7DTD/7DaysToDie/egg-7-days-to-die.json b/7DTD/7DaysToDie/egg-7-days-to-die.json deleted file mode 100644 index 05037330..00000000 --- a/7DTD/7DaysToDie/egg-7-days-to-die.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-03-01T17:26:17-05:00", - "name": "7 Days to Die", - "author": "brycea@rapidnetworks.org", - "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.", - "image": "quay.io\/exonical\/7-days-to-die", - "startup": ".\/startserver.sh -configfile=serverconfig.xml -nographics -logfile 7DaysToDie_Data\/output_log.txt $@", - "config": { - "files": "{\r\n \"serverconfig.xml\": {\r\n \"parser\": \"xml\",\r\n \"find\": {\r\n \"ServerPort\": \"{{server.build.default.port}}\",\r\n \"ServerName\": \"{{server.build.env.HOSTNAME}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", - "stop": "^C" - }, - "scripts": { - "installation": { - "script": "apt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\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\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\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so", - "container": "ubuntu:16.04", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Steam Username", - "description": "", - "env_variable": "steam_user", - "default_value": "anonymous", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:50" - }, - { - "name": "Steam Password", - "description": "", - "env_variable": "steam_pass", - "default_value": "", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:20" - }, - { - "name": "Hostname", - "description": "Name of the server that appears publicly.", - "env_variable": "HOSTNAME", - "default_value": "My Server", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:64" - } - ] -} \ No newline at end of file diff --git a/Hurtworld/hurtworld/egg-hurtworld.json b/Hurtworld/hurtworld/egg-hurtworld.json new file mode 100644 index 00000000..9e1d5fb6 --- /dev/null +++ b/Hurtworld/hurtworld/egg-hurtworld.json @@ -0,0 +1,63 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-04-08T03:01:49-04:00", + "name": "Hurtworld", + "author": "brycea@rapidnetworks.org", + "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\/exonical\/pterodactyl-hurtworld:hurtworld", + "startup": ".\/Hurtworld.x86_64 -batchmode -nographics -exec \"host {{SERVER_PORT}};queryport {{QUERY_PORT}};maxplayers {{MAX_PLAYERS}};servername {{HOSTNAME}}\" -logfile output.txt", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Mono config path = '\/home\/container\/Hurtworld_Data\/Mono\/etc'\",\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# Hurtworld 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 ${SERVER_APPID} +quit\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": "Game ID", + "description": "The ID corresponding to the game to download and run using SRCDS.", + "env_variable": "SERVER_APPID", + "default_value": "405100", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|regex:\/^(405100)$\/" + }, + { + "name": "Query Port", + "description": "Server Query Default Port", + "env_variable": "QUERY_PORT", + "default_value": "12881", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|string" + }, + { + "name": "Max Players", + "description": "Max players allowed on the server at one time.", + "env_variable": "MAX_PLAYERS", + "default_value": "60", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:60" + }, + { + "name": "Server Name", + "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, + "rules": "required|string|max:50" + } + ] +} \ No newline at end of file From 03208bd3886d087af6c6183f66b67ba2189d1a6f Mon Sep 17 00:00:00 2001 From: Exonical Date: Sun, 8 Apr 2018 03:10:12 -0400 Subject: [PATCH 081/393] Update Start Detection --- Hurtworld/hurtworld/egg-hurtworld.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hurtworld/hurtworld/egg-hurtworld.json b/Hurtworld/hurtworld/egg-hurtworld.json index 9e1d5fb6..0899152f 100644 --- a/Hurtworld/hurtworld/egg-hurtworld.json +++ b/Hurtworld/hurtworld/egg-hurtworld.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-04-08T03:01:49-04:00", + "exported_at": "2018-04-08T03:09:47-04:00", "name": "Hurtworld", "author": "brycea@rapidnetworks.org", "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.", @@ -11,7 +11,7 @@ "startup": ".\/Hurtworld.x86_64 -batchmode -nographics -exec \"host {{SERVER_PORT}};queryport {{QUERY_PORT}};maxplayers {{MAX_PLAYERS}};servername {{HOSTNAME}}\" -logfile output.txt", "config": { "files": "{}", - "startup": "{\r\n \"done\": \"Mono config path = '\/home\/container\/Hurtworld_Data\/Mono\/etc'\",\r\n \"userInteraction\": []\r\n}", + "startup": "{\r\n \"done\": \"Found path: \/home\/container\/Hurtworld.x86_64\",\r\n \"userInteraction\": []\r\n}", "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "^C" }, From 1c40a2cb4de31e9affd9aa4167697767cfac1fa5 Mon Sep 17 00:00:00 2001 From: Exonical Date: Mon, 14 May 2018 02:11:07 -0400 Subject: [PATCH 082/393] update container --- Hurtworld/hurtworld/egg-hurtworld.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hurtworld/hurtworld/egg-hurtworld.json b/Hurtworld/hurtworld/egg-hurtworld.json index 0899152f..1e83a89b 100644 --- a/Hurtworld/hurtworld/egg-hurtworld.json +++ b/Hurtworld/hurtworld/egg-hurtworld.json @@ -7,7 +7,7 @@ "name": "Hurtworld", "author": "brycea@rapidnetworks.org", "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\/exonical\/pterodactyl-hurtworld:hurtworld", + "image": "quay.io\/exonical\/pterodactyl-containers:hurtworld", "startup": ".\/Hurtworld.x86_64 -batchmode -nographics -exec \"host {{SERVER_PORT}};queryport {{QUERY_PORT}};maxplayers {{MAX_PLAYERS}};servername {{HOSTNAME}}\" -logfile output.txt", "config": { "files": "{}", @@ -60,4 +60,4 @@ "rules": "required|string|max:50" } ] -} \ No newline at end of file +} From 98603cf26a56bf025c49d6511f968d61231f7677 Mon Sep 17 00:00:00 2001 From: Exonical Date: Sat, 2 Jun 2018 17:08:12 -0400 Subject: [PATCH 083/393] Add Egg --- .../conanexiles/egg-conan-exiles.json | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 Conan Exiles/conanexiles/egg-conan-exiles.json diff --git a/Conan Exiles/conanexiles/egg-conan-exiles.json b/Conan Exiles/conanexiles/egg-conan-exiles.json new file mode 100644 index 00000000..5c86b48c --- /dev/null +++ b/Conan Exiles/conanexiles/egg-conan-exiles.json @@ -0,0 +1,36 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-06-02T17:05:28-04:00", + "name": "Conan Exiles", + "author": "brycea@rapidnetworks.org", + "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\/exonical\/pterodactyl-containers:conanexiles", + "startup": "wine ConanSandboxServer.exe -log", + "config": { + "files": "{}", + "startup": "{}", + "logs": "{}", + "stop": "^C" + }, + "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\r\n# Get First-Time Setup Configuration Files\r\necho \"#!\/bin\/sh\r\nexport WINEARCH=win64\r\nexport WINEPREFIX=\/mnt\/server\/.wine64\r\nxvfb-run --auto-servernum --server-args='-screen 0 640x480x24:32'\r\nwine \/mnt\/server\/SpaceEngineersDedicated.exe -console\" > \/mnt\/server\/start_se.sh\r\nchmod +x \/mnt\/server\/start_se.sh", + "container": "ubuntu:18.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Game ID", + "description": "The ID corresponding to the game to download.", + "env_variable": "APPID", + "default_value": "443030", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|numeric|digits_between:1,6" + } + ] +} \ No newline at end of file From e5bb99a68f733c36f02bb5d9c063d8442ce2a5b0 Mon Sep 17 00:00:00 2001 From: Exonical Date: Sat, 2 Jun 2018 17:16:46 -0400 Subject: [PATCH 084/393] remove Hurtworld for 1st PR --- Hurtworld/hurtworld/egg-hurtworld.json | 63 -------------------------- 1 file changed, 63 deletions(-) delete mode 100644 Hurtworld/hurtworld/egg-hurtworld.json diff --git a/Hurtworld/hurtworld/egg-hurtworld.json b/Hurtworld/hurtworld/egg-hurtworld.json deleted file mode 100644 index 1e83a89b..00000000 --- a/Hurtworld/hurtworld/egg-hurtworld.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2018-04-08T03:09:47-04:00", - "name": "Hurtworld", - "author": "brycea@rapidnetworks.org", - "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\/exonical\/pterodactyl-containers:hurtworld", - "startup": ".\/Hurtworld.x86_64 -batchmode -nographics -exec \"host {{SERVER_PORT}};queryport {{QUERY_PORT}};maxplayers {{MAX_PLAYERS}};servername {{HOSTNAME}}\" -logfile output.txt", - "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"Found path: \/home\/container\/Hurtworld.x86_64\",\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# Hurtworld 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 ${SERVER_APPID} +quit\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": "Game ID", - "description": "The ID corresponding to the game to download and run using SRCDS.", - "env_variable": "SERVER_APPID", - "default_value": "405100", - "user_viewable": 1, - "user_editable": 0, - "rules": "required|regex:\/^(405100)$\/" - }, - { - "name": "Query Port", - "description": "Server Query Default Port", - "env_variable": "QUERY_PORT", - "default_value": "12881", - "user_viewable": 1, - "user_editable": 0, - "rules": "required|string" - }, - { - "name": "Max Players", - "description": "Max players allowed on the server at one time.", - "env_variable": "MAX_PLAYERS", - "default_value": "60", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:60" - }, - { - "name": "Server Name", - "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, - "rules": "required|string|max:50" - } - ] -} From 6c75e86c760c1d78dced26d8d70626f99088cb89 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 25 Dec 2018 20:29:05 -0500 Subject: [PATCH 085/393] rebase and update to add conan exiles --- README.md | 3 ++ conan_exiles/conan_exiles/README.md | 19 ++++++++++ .../conan_exiles}/egg-conan-exiles.json | 0 conanexiles/egg-conan-exiles.json | 36 +++++++++++++++++++ 4 files changed, 58 insertions(+) create mode 100644 conan_exiles/conan_exiles/README.md rename {Conan Exiles/conanexiles => conan_exiles/conan_exiles}/egg-conan-exiles.json (100%) create mode 100644 conanexiles/egg-conan-exiles.json diff --git a/README.md b/README.md index da59648e..ff2e8907 100644 --- a/README.md +++ b/README.md @@ -25,9 +25,12 @@ If you are submitting PR's try and keep names and titles the same. [Arma](/arma/) * [Arma 3](/arma/arma3/) +[Conan Exiles](/conan_exiles/conan_exiles) + [Don't Starve](/dont_starve/dont_starve) [Factorio](/factorio/factorio/) + [Grand Theft Auto](/gta/) * [FiveM](/gta/fivem/) * [RageMP](/gta/ragemp/) diff --git a/conan_exiles/conan_exiles/README.md b/conan_exiles/conan_exiles/README.md new file mode 100644 index 00000000..9196c4e0 --- /dev/null +++ b/conan_exiles/conan_exiles/README.md @@ -0,0 +1,19 @@ +### From their [Site](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. + +### Minimum RAM warning +This server requires about 2048m to run properly. ARMA 3 is more CPU intensive though. + +### Additional settings +Additional server flags can be found [here](https://community.bistudio.com/wiki/Arma_3_Startup_Parameters). +This can help is you see the server using to many cores/threads on the server. + +### Server Ports +Ports required to run the server in a table format. + +| Port | default | +|---------|---------| +| Game | 7777 | +| Steam Query | 27015 | + +#### Mods/Plugins may require ports to be added to the server. diff --git a/Conan Exiles/conanexiles/egg-conan-exiles.json b/conan_exiles/conan_exiles/egg-conan-exiles.json similarity index 100% rename from Conan Exiles/conanexiles/egg-conan-exiles.json rename to conan_exiles/conan_exiles/egg-conan-exiles.json diff --git a/conanexiles/egg-conan-exiles.json b/conanexiles/egg-conan-exiles.json new file mode 100644 index 00000000..5c86b48c --- /dev/null +++ b/conanexiles/egg-conan-exiles.json @@ -0,0 +1,36 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-06-02T17:05:28-04:00", + "name": "Conan Exiles", + "author": "brycea@rapidnetworks.org", + "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\/exonical\/pterodactyl-containers:conanexiles", + "startup": "wine ConanSandboxServer.exe -log", + "config": { + "files": "{}", + "startup": "{}", + "logs": "{}", + "stop": "^C" + }, + "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\r\n# Get First-Time Setup Configuration Files\r\necho \"#!\/bin\/sh\r\nexport WINEARCH=win64\r\nexport WINEPREFIX=\/mnt\/server\/.wine64\r\nxvfb-run --auto-servernum --server-args='-screen 0 640x480x24:32'\r\nwine \/mnt\/server\/SpaceEngineersDedicated.exe -console\" > \/mnt\/server\/start_se.sh\r\nchmod +x \/mnt\/server\/start_se.sh", + "container": "ubuntu:18.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Game ID", + "description": "The ID corresponding to the game to download.", + "env_variable": "APPID", + "default_value": "443030", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|numeric|digits_between:1,6" + } + ] +} \ No newline at end of file From b2e1374c27a95c20ca57ca6a95a18255cbf0335f Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 25 Dec 2018 20:29:34 -0500 Subject: [PATCH 086/393] removing old folders --- .../conanexiles/egg-conan-exiles.json | 36 ------------------- conan_exiles/conan_exiles/README.md | 8 ++--- 2 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 Conan Exiles/conanexiles/egg-conan-exiles.json diff --git a/Conan Exiles/conanexiles/egg-conan-exiles.json b/Conan Exiles/conanexiles/egg-conan-exiles.json deleted file mode 100644 index 5c86b48c..00000000 --- a/Conan Exiles/conanexiles/egg-conan-exiles.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2018-06-02T17:05:28-04:00", - "name": "Conan Exiles", - "author": "brycea@rapidnetworks.org", - "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\/exonical\/pterodactyl-containers:conanexiles", - "startup": "wine ConanSandboxServer.exe -log", - "config": { - "files": "{}", - "startup": "{}", - "logs": "{}", - "stop": "^C" - }, - "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\r\n# Get First-Time Setup Configuration Files\r\necho \"#!\/bin\/sh\r\nexport WINEARCH=win64\r\nexport WINEPREFIX=\/mnt\/server\/.wine64\r\nxvfb-run --auto-servernum --server-args='-screen 0 640x480x24:32'\r\nwine \/mnt\/server\/SpaceEngineersDedicated.exe -console\" > \/mnt\/server\/start_se.sh\r\nchmod +x \/mnt\/server\/start_se.sh", - "container": "ubuntu:18.04", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Game ID", - "description": "The ID corresponding to the game to download.", - "env_variable": "APPID", - "default_value": "443030", - "user_viewable": 1, - "user_editable": 0, - "rules": "required|numeric|digits_between:1,6" - } - ] -} \ No newline at end of file diff --git a/conan_exiles/conan_exiles/README.md b/conan_exiles/conan_exiles/README.md index 9196c4e0..c490ffdd 100644 --- a/conan_exiles/conan_exiles/README.md +++ b/conan_exiles/conan_exiles/README.md @@ -2,11 +2,7 @@ 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. ### Minimum RAM warning -This server requires about 2048m to run properly. ARMA 3 is more CPU intensive though. - -### Additional settings -Additional server flags can be found [here](https://community.bistudio.com/wiki/Arma_3_Startup_Parameters). -This can help is you see the server using to many cores/threads on the server. +This server requires about 4096m to run properly. ### Server Ports Ports required to run the server in a table format. @@ -16,4 +12,4 @@ Ports required to run the server in a table format. | Game | 7777 | | Steam Query | 27015 | -#### Mods/Plugins may require ports to be added to the server. +### 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 From 655f18d4beebc2712b2fdd66388ac16acf284d52 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 25 Dec 2018 20:32:06 -0500 Subject: [PATCH 087/393] add conan exiles --- conanexiles/egg-conan-exiles.json | 36 ------------------------------- 1 file changed, 36 deletions(-) delete mode 100644 conanexiles/egg-conan-exiles.json diff --git a/conanexiles/egg-conan-exiles.json b/conanexiles/egg-conan-exiles.json deleted file mode 100644 index 5c86b48c..00000000 --- a/conanexiles/egg-conan-exiles.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2018-06-02T17:05:28-04:00", - "name": "Conan Exiles", - "author": "brycea@rapidnetworks.org", - "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\/exonical\/pterodactyl-containers:conanexiles", - "startup": "wine ConanSandboxServer.exe -log", - "config": { - "files": "{}", - "startup": "{}", - "logs": "{}", - "stop": "^C" - }, - "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\r\n# Get First-Time Setup Configuration Files\r\necho \"#!\/bin\/sh\r\nexport WINEARCH=win64\r\nexport WINEPREFIX=\/mnt\/server\/.wine64\r\nxvfb-run --auto-servernum --server-args='-screen 0 640x480x24:32'\r\nwine \/mnt\/server\/SpaceEngineersDedicated.exe -console\" > \/mnt\/server\/start_se.sh\r\nchmod +x \/mnt\/server\/start_se.sh", - "container": "ubuntu:18.04", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Game ID", - "description": "The ID corresponding to the game to download.", - "env_variable": "APPID", - "default_value": "443030", - "user_viewable": 1, - "user_editable": 0, - "rules": "required|numeric|digits_between:1,6" - } - ] -} \ No newline at end of file From 1349d2f8b8e8d4ed9705a27d1facccd600a03042 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 25 Dec 2018 20:35:16 -0500 Subject: [PATCH 088/393] Change Conan server to use generic wine image. --- conan_exiles/conan_exiles/egg-conan-exiles.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conan_exiles/conan_exiles/egg-conan-exiles.json b/conan_exiles/conan_exiles/egg-conan-exiles.json index 5c86b48c..d0ddf3c0 100644 --- a/conan_exiles/conan_exiles/egg-conan-exiles.json +++ b/conan_exiles/conan_exiles/egg-conan-exiles.json @@ -3,11 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-06-02T17:05:28-04:00", + "exported_at": "2018-12-25T20:34:11-05:00", "name": "Conan Exiles", "author": "brycea@rapidnetworks.org", "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\/exonical\/pterodactyl-containers:conanexiles", + "image": "quay.io\/parkervcp\/pterodactyl-images:wine-source", "startup": "wine ConanSandboxServer.exe -log", "config": { "files": "{}", From 376587332fdb60fdbf8aee5ab191dac33fbb1ca6 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 25 Dec 2018 20:36:46 -0500 Subject: [PATCH 089/393] organizing folders --- {mb_warband => mount_and_blade/warband}/README.md | 0 {mb_warband => mount_and_blade/warband}/egg-m--b-warband.json | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {mb_warband => mount_and_blade/warband}/README.md (100%) rename {mb_warband => mount_and_blade/warband}/egg-m--b-warband.json (100%) diff --git a/mb_warband/README.md b/mount_and_blade/warband/README.md similarity index 100% rename from mb_warband/README.md rename to mount_and_blade/warband/README.md diff --git a/mb_warband/egg-m--b-warband.json b/mount_and_blade/warband/egg-m--b-warband.json similarity index 100% rename from mb_warband/egg-m--b-warband.json rename to mount_and_blade/warband/egg-m--b-warband.json From b5c7dfa04f6828d096e14457bebc90d513fcb2dd Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 25 Dec 2018 20:37:10 -0500 Subject: [PATCH 090/393] Update Install script now uses `alpine:3.8` Container uses base_ubuntu --- openttd/egg-open-t-t-d-server.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openttd/egg-open-t-t-d-server.json b/openttd/egg-open-t-t-d-server.json index bf5b0eb7..2b7bb77c 100644 --- a/openttd/egg-open-t-t-d-server.json +++ b/openttd/egg-open-t-t-d-server.json @@ -3,11 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-12-07T01:23:04-05:00", + "exported_at": "2018-12-25T20:36:01-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": "areyouscared\/ptero:openttd", + "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}", @@ -17,9 +17,9 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\napt -y update\r\napt -y --no-install-recommends install wget tar unzip ca-certificates curl\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n## Download game\r\nwget https:\/\/binaries.openttd.org\/releases\/1.8.0\/openttd-1.8.0-linux-generic-amd64.tar.gz \r\ntar xf \/mnt\/server\/openttd-1.8.0-linux-generic-amd64.tar.gz\r\nmv openttd-1.8.0-linux-generic-amd64\/* .\r\nchmod +x openttd\r\n\r\n## Get opensoruce gfx\r\ncd \/mnt\/server\r\nwget https:\/\/binaries.openttd.org\/extra\/opengfx\/0.5.2\/opengfx-0.5.2-all.zip\r\nunzip opengfx-0.5.2-all.zip\r\ntar -xvf opengfx-0.5.2.tar\r\ncd opengfx-0.5.2\r\nmv -t \/mnt\/server\/baseset ogfx1_base.grf ogfxc_arctic.grf ogfxe_extra.grf ogfxh_tropical.grf ogfxi_logos.grf ogfxt_toyland.grf opengfx.obg\r\n\r\n## Remove excess files\r\ncd \/mnt\/server\r\nrm opengfx-0.5.2-all.zip opengfx-0.5.2.tar openttd-1.8.0-linux-generic-amd64.tar.gz\r\nrm -r opengfx-0.5.2-all openttd-1.8.0-linux-generic-amd64\r\ncurl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/openttd\/openttd.cfg >> openttd.cfg", - "container": "ubuntu:18.04", - "entrypoint": "bash" + "script": "apk add --no-cache sdl-dev fontconfig curl\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\ncurl -LSs https:\/\/binaries.openttd.org\/releases\/1.8.0\/openttd-1.8.0-linux-generic-amd64.tar.gz -o openttd.tar.gz\r\n\r\ntar --strip-components=1 -xzvf openttd.tar.gz \r\n\r\nchmod +x openttd\r\n\r\ncurl -LSs https:\/\/binaries.openttd.org\/extra\/opengfx\/0.5.2\/opengfx-0.5.2-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\r\n\r\ncurl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/openttd\/openttd\/openttd.cfg > openttd.cfg", + "container": "alpine:3.8", + "entrypoint": "ash" } }, "variables": [ From 44f5c6b2e8b8f23efadf7ac736fcddfdc02bbc22 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 25 Dec 2018 20:41:08 -0500 Subject: [PATCH 091/393] Update README.md --- openttd/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openttd/README.md b/openttd/README.md index 7d6d7ffb..90f44417 100644 --- a/openttd/README.md +++ b/openttd/README.md @@ -2,8 +2,9 @@ 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 -## Server Port +## Server Ports | Port | Default | |---------|---------| | Game | 3797 | +| Admin | 3977 | From 3d8f56d0eed6fe55b23db8613e4cb7727eafc09a Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 25 Dec 2018 20:56:11 -0500 Subject: [PATCH 092/393] Rename openttd/README.md to openttd/openttd/README.md --- openttd/{ => openttd}/README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename openttd/{ => openttd}/README.md (100%) diff --git a/openttd/README.md b/openttd/openttd/README.md similarity index 100% rename from openttd/README.md rename to openttd/openttd/README.md From cfae59f99aa94251171ed3683943ec09024029c4 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 25 Dec 2018 20:56:25 -0500 Subject: [PATCH 093/393] Rename openttd/egg-open-t-t-d-server.json to openttd/openttd/egg-open-t-t-d-server.json --- openttd/{ => openttd}/egg-open-t-t-d-server.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename openttd/{ => openttd}/egg-open-t-t-d-server.json (100%) diff --git a/openttd/egg-open-t-t-d-server.json b/openttd/openttd/egg-open-t-t-d-server.json similarity index 100% rename from openttd/egg-open-t-t-d-server.json rename to openttd/openttd/egg-open-t-t-d-server.json From 014f845f1348f8d6096bfc791e385dd63df29b6f Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 25 Dec 2018 20:56:47 -0500 Subject: [PATCH 094/393] Rename openttd/openttd.cfg to openttd/openttd/openttd.cfg --- openttd/{ => openttd}/openttd.cfg | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename openttd/{ => openttd}/openttd.cfg (100%) diff --git a/openttd/openttd.cfg b/openttd/openttd/openttd.cfg similarity index 100% rename from openttd/openttd.cfg rename to openttd/openttd/openttd.cfg From 79eeb026deda8be5e5f0de3a922f32c2150b2ec0 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 25 Dec 2018 21:15:28 -0500 Subject: [PATCH 095/393] delete package-lock.json Allows `npm install` to run without a error --- bots/discord/atlbot/bot/egg-a-t-l-bot.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bots/discord/atlbot/bot/egg-a-t-l-bot.json b/bots/discord/atlbot/bot/egg-a-t-l-bot.json index 4016e490..e45efa89 100644 --- a/bots/discord/atlbot/bot/egg-a-t-l-bot.json +++ b/bots/discord/atlbot/bot/egg-a-t-l-bot.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-11-24T19:11:07-05:00", + "exported_at": "2018-12-25T21:12:00-05:00", "name": "ATLBot", "author": "jfeldt19@gmail.com", "description": "ATLbot in ptero\r\n\r\nhttps:\/\/github.com\/ATLauncher\/discord-bot\/", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "apk add --no-cache openssl git\r\n\r\ncd \/mnt\/server\r\n\r\nwget https:\/\/github.com\/ATLauncher\/discord-bot\/archive\/master.zip\r\n\r\nunzip master.zip\r\n\r\nrm master.zip\r\n\r\nmv discord-bot-master\/* .\/\r\n\r\nmv config\/config.json.example config\/config.json\r\n\r\n\/usr\/local\/bin\/npm install --production\r\n\r\n\/usr\/local\/bin\/npm run build", + "script": "apk add --no-cache openssl git\r\n\r\ncd \/mnt\/server\r\n\r\nwget https:\/\/github.com\/ATLauncher\/discord-bot\/archive\/master.zip\r\n\r\nunzip master.zip\r\n\r\nrm master.zip\r\n\r\nmv discord-bot-master\/* .\/\r\n\r\nmv config\/config.json.example config\/config.json\r\n\r\nrm package-lock.json\r\nnpm install\r\n\r\nrm -r discord-bot-master\/\r\nrm Dockerfile\r\nrm CONTRIBUTING.md\r\nrm README.md\r\nrm \/config\/.gitignore\r\nrm CODE_OF_CONDUCT.md", "container": "node:10-alpine", "entrypoint": "ash" } @@ -33,4 +33,4 @@ "rules": "required|string|max:75" } ] -} \ No newline at end of file +} From 4144cc8aeeaf6630bf9c81fcde62bb0ee90826ab Mon Sep 17 00:00:00 2001 From: smcfreak Date: Wed, 2 Jan 2019 04:16:22 +0100 Subject: [PATCH 096/393] Created Egg for Rust Staging Branch --- rust-staging/egg-rust-staging.json | 135 +++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 rust-staging/egg-rust-staging.json diff --git a/rust-staging/egg-rust-staging.json b/rust-staging/egg-rust-staging.json new file mode 100644 index 00000000..7e6bc806 --- /dev/null +++ b/rust-staging/egg-rust-staging.json @@ -0,0 +1,135 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-01-21T16:58:36-06:00", + "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.", + "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.worldsize \\\"{{WORLD_SIZE}}\\\" +server.seed \\\"{{WORLD_SEED}}\\\" +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}", + "stop": "quit" + }, + "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\n\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\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 258550 -beta staging +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so", + "container": "ubuntu:16.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Server Name", + "description": "The name of your server in the public server list.", + "env_variable": "HOSTNAME", + "default_value": "A Rust Staging Server", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:40" + }, + { + "name": "Level", + "description": "The world file for Rust to use.", + "env_variable": "LEVEL", + "default_value": "Procedural Map", + "user_viewable": 1, + "user_editable": 1, + "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": 1, + "user_editable": 1, + "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": 1, + "user_editable": 1, + "rules": "nullable|url" + }, + { + "name": "World Size", + "description": "The world size for a procedural map.", + "env_variable": "WORLD_SIZE", + "default_value": "3000", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|integer" + }, + { + "name": "World Seed", + "description": "The seed for a procedural map.", + "env_variable": "WORLD_SEED", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "nullable|string" + }, + { + "name": "Max Players", + "description": "The maximum amount of players allowed in the server at once.", + "env_variable": "MAX_PLAYERS", + "default_value": "50", + "user_viewable": 1, + "user_editable": 1, + "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": 1, + "user_editable": 1, + "rules": "nullable|url" + }, + { + "name": "RCON Port", + "description": "Port for RCON connections.", + "env_variable": "RCON_PORT", + "default_value": "28016", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|integer" + }, + { + "name": "RCON Password", + "description": "RCON access password.", + "env_variable": "RCON_PASS", + "default_value": "CHANGEME", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:64" + }, + { + "name": "Save Interval", + "description": "Sets the server’s auto-save interval in seconds.", + "env_variable": "SAVEINTERVAL", + "default_value": "60", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|integer" + }, + { + "name": "Additional Arguments", + "description": "Add additional startup parameters to the server.", + "env_variable": "ADDITIONAL_ARGS", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "nullable|string" + } + ] +} From 8b37b38ccd44e887f8b875b725b215644fc23524 Mon Sep 17 00:00:00 2001 From: smcfreak Date: Wed, 2 Jan 2019 04:21:54 +0100 Subject: [PATCH 097/393] Updated new egg --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a239a9a6..355c5216 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,8 @@ If you are submitting PR's try and keep names and titles the same. [OpenTTD](/openttd/) +[Rust Staging Branch](/rust-staging/) + [Source](/source_servers/) These eggs use steamcmd to install * [7 Days to Die](/source_servers/7_days_to_die/) * [PixARK](/source_servers/pixark/) From aae2f53a75cbf083bf288acd77d1643e8646e38a Mon Sep 17 00:00:00 2001 From: smcfreak Date: Wed, 2 Jan 2019 04:46:58 +0100 Subject: [PATCH 098/393] Added missing README --- rust-staging/README.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 rust-staging/README.md diff --git a/rust-staging/README.md b/rust-staging/README.md new file mode 100644 index 00000000..7b577286 --- /dev/null +++ b/rust-staging/README.md @@ -0,0 +1,23 @@ +### 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 +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 +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 +Ports required to run the server. + +| Port | default | +|---------|---------| +| Game and Quary | 28015 UDP | +| RCON | 28016 TCP | + +### Information about server updates can be found [here](https://steamdb.info/app/258550/depots/?branch=staging) From 674677c34e8f59c1a2142a12c1f8eb215da802e9 Mon Sep 17 00:00:00 2001 From: Matthww Date: Wed, 2 Jan 2019 14:14:18 +0100 Subject: [PATCH 099/393] Bastion V7 update --- bots/discord/bastion/egg-bastion.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bots/discord/bastion/egg-bastion.json b/bots/discord/bastion/egg-bastion.json index 282f334c..53e44319 100644 --- a/bots/discord/bastion/egg-bastion.json +++ b/bots/discord/bastion/egg-bastion.json @@ -3,21 +3,21 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-10-30T23:15:12-04:00", + "exported_at": "2019-01-02T13:13:37+00:00", "name": "Bastion", "author": "parker@parkervcp.com", "description": "Bastion is an all-in-one multipurpose Discord bot that can do a whole bunch of things and its features are expanding daily. Bastion does everything most people will ever need it to do. Check out some feature highlights below to get a peek into the vast feature list of Bastion. And if you think Bastion lacks some feature, please send a suggestion and we will add it to Bastion as soon as possible.", "image": "quay.io\/parkervcp\/pterodactyl-images:bot_bastion", "startup": "node bastion.js", "config": { - "files": "{\r\n \"settings\/credentials.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"botId\": \"{{server.build.env.BOT_ID}}\",\r\n \"token\": \"{{server.build.env.BOT_TOKEN}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"settings\/credentials.yaml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"botId\": \"{{server.build.env.BOT_ID}}\",\r\n \"token\": \"{{server.build.env.BOT_TOKEN}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"I'm ready to roll!\"\r\n}", "logs": "{}", "stop": "^C" }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Bastion Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## Install Requirements\r\napk --no-cache add python g++ make git\r\n\r\n## Move to install folder\r\ncd \/mnt\/server\/\r\n\r\n## Clone repo\r\ngit clone -b stable -q --depth 1 https:\/\/github.com\/TheBastionBot\/Bastion.git .\/\r\n\r\n## Install node_modules\r\nnpm install --only=production\r\n\r\n## Move config files.\r\nmv settings\/credentials_example.json settings\/credentials.json\r\nmv settings\/config_example.json settings\/config.json", + "script": "#!\/bin\/ash\r\n# Bastion Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## Install Requirements\r\napk --no-cache add python g++ make git\r\n\r\n## Move to install folder\r\ncd \/mnt\/server\/\r\n\r\n## Clone repo\r\ngit clone -b stable -q --depth 1 https:\/\/github.com\/TheBastionBot\/Bastion.git .\/\r\n\r\n## Install node_modules\r\nnpm install --only=production\r\n\r\n## Move config files.\r\nmv settings\/credentials.example.yaml settings\/credentials.yaml\r\nmv settings\/configurations.example.yaml settings\/configurations.yaml", "container": "node:8-alpine", "entrypoint": "ash" } @@ -42,4 +42,4 @@ "rules": "required|string|max:64" } ] -} \ No newline at end of file +} From 9899d42504ceccb5ee92cf6aa898648acf9bcb13 Mon Sep 17 00:00:00 2001 From: Matthww Date: Wed, 2 Jan 2019 14:39:17 +0100 Subject: [PATCH 100/393] Bastion V7 Update --- bots/discord/bastion/egg-bastion.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bots/discord/bastion/egg-bastion.json b/bots/discord/bastion/egg-bastion.json index 53e44319..6d440bbb 100644 --- a/bots/discord/bastion/egg-bastion.json +++ b/bots/discord/bastion/egg-bastion.json @@ -8,7 +8,7 @@ "author": "parker@parkervcp.com", "description": "Bastion is an all-in-one multipurpose Discord bot that can do a whole bunch of things and its features are expanding daily. Bastion does everything most people will ever need it to do. Check out some feature highlights below to get a peek into the vast feature list of Bastion. And if you think Bastion lacks some feature, please send a suggestion and we will add it to Bastion as soon as possible.", "image": "quay.io\/parkervcp\/pterodactyl-images:bot_bastion", - "startup": "node bastion.js", + "startup": "node -r ./utils/globals.js .", "config": { "files": "{\r\n \"settings\/credentials.yaml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"botId\": \"{{server.build.env.BOT_ID}}\",\r\n \"token\": \"{{server.build.env.BOT_TOKEN}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"I'm ready to roll!\"\r\n}", From 8f94fd75e918ab619a5b414401fab7ff38a56c38 Mon Sep 17 00:00:00 2001 From: Niek Candaele Date: Mon, 7 Jan 2019 18:13:32 +0100 Subject: [PATCH 101/393] Fix a typo --- source_servers/7_days_to_die/egg-7-days-to-die.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source_servers/7_days_to_die/egg-7-days-to-die.json b/source_servers/7_days_to_die/egg-7-days-to-die.json index 302d65d7..5f5f7c0b 100644 --- a/source_servers/7_days_to_die/egg-7-days-to-die.json +++ b/source_servers/7_days_to_die/egg-7-days-to-die.json @@ -8,7 +8,7 @@ "author": "kristoffer.norman@bahnhof.se", "description": "7 days to die server", "image": "quay.io\/parkervcp\/pterodactyl-images:source", - "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": "{\r\n \"serverconfig.xml\": {\r\n \"parser\": \"xml\",\r\n \"find\": {\r\n \"ServerPort\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Connected with 7DTD server\",\r\n \"userInteraction\": []\r\n}", @@ -51,4 +51,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From 71c3ada7a1e207ff728131d7983a409bd7c67f8c Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 8 Jan 2019 20:33:46 -0500 Subject: [PATCH 102/393] Change stream user variables to be required. This fixes #131 --- arma/arma3/egg-arma3.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arma/arma3/egg-arma3.json b/arma/arma3/egg-arma3.json index d24a072a..a0b1966a 100644 --- a/arma/arma3/egg-arma3.json +++ b/arma/arma3/egg-arma3.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-10-16T13:07:23-04:00", + "exported_at": "2019-01-08T20:30:59-05:00", "name": "Arma 3", "author": "daave@aaathats3as.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.", @@ -84,7 +84,7 @@ "default_value": "", "user_viewable": 0, "user_editable": 0, - "rules": "nullable|string" + "rules": "required|string" }, { "name": "STEAM_PASS", @@ -93,7 +93,7 @@ "default_value": "", "user_viewable": 0, "user_editable": 0, - "rules": "nullable|string" + "rules": "required|string" } ] } \ No newline at end of file From bcdd45b3790f529020126f6eaad168ad6531324d Mon Sep 17 00:00:00 2001 From: NgLoader Date: Fri, 11 Jan 2019 00:46:01 +0100 Subject: [PATCH 103/393] Added JTS3ServerMod bot --- README.md | 3 ++ bots/teamspeak3/README.md | 7 ++++ .../jts3servermod/egg-j-t-s3-server-mod.json | 36 +++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 bots/teamspeak3/README.md create mode 100644 bots/teamspeak3/jts3servermod/egg-j-t-s3-server-mod.json diff --git a/README.md b/README.md index a239a9a6..44950369 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,9 @@ If you are submitting PR's try and keep names and titles the same. * [pixel-bot](/bots/discord/pixelbot/) Python * [Sinusbot](/bots/discord/sinusbot/) +[TeamSpeak3](bots/teamspeak3) +* [JTS3ServerMod](/bots/teamspeak3/jts3servermod/) + ## Game Eggs [Arma](/arma/) diff --git a/bots/teamspeak3/README.md b/bots/teamspeak3/README.md new file mode 100644 index 00000000..f430ca9f --- /dev/null +++ b/bots/teamspeak3/README.md @@ -0,0 +1,7 @@ +# 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 diff --git a/bots/teamspeak3/jts3servermod/egg-j-t-s3-server-mod.json b/bots/teamspeak3/jts3servermod/egg-j-t-s3-server-mod.json new file mode 100644 index 00000000..53dd924a --- /dev/null +++ b/bots/teamspeak3/jts3servermod/egg-j-t-s3-server-mod.json @@ -0,0 +1,36 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-01-11T00:40:33+01: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", + "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}", + "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.10", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Version", + "description": "", + "env_variable": "SERVER_VERSION", + "default_value": "latest", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" + } + ] +} \ No newline at end of file From afedf60942b7bb5c2673009f63401df6e6833d62 Mon Sep 17 00:00:00 2001 From: NgLoader Date: Fri, 11 Jan 2019 03:13:54 +0100 Subject: [PATCH 104/393] Revert "Added JTS3ServerMod bot" This reverts commit bcdd45b3790f529020126f6eaad168ad6531324d. --- README.md | 3 -- bots/teamspeak3/README.md | 7 ---- .../jts3servermod/egg-j-t-s3-server-mod.json | 36 ------------------- 3 files changed, 46 deletions(-) delete mode 100644 bots/teamspeak3/README.md delete mode 100644 bots/teamspeak3/jts3servermod/egg-j-t-s3-server-mod.json diff --git a/README.md b/README.md index 44950369..a239a9a6 100644 --- a/README.md +++ b/README.md @@ -20,9 +20,6 @@ If you are submitting PR's try and keep names and titles the same. * [pixel-bot](/bots/discord/pixelbot/) Python * [Sinusbot](/bots/discord/sinusbot/) -[TeamSpeak3](bots/teamspeak3) -* [JTS3ServerMod](/bots/teamspeak3/jts3servermod/) - ## Game Eggs [Arma](/arma/) diff --git a/bots/teamspeak3/README.md b/bots/teamspeak3/README.md deleted file mode 100644 index f430ca9f..00000000 --- a/bots/teamspeak3/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# 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 diff --git a/bots/teamspeak3/jts3servermod/egg-j-t-s3-server-mod.json b/bots/teamspeak3/jts3servermod/egg-j-t-s3-server-mod.json deleted file mode 100644 index 53dd924a..00000000 --- a/bots/teamspeak3/jts3servermod/egg-j-t-s3-server-mod.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2019-01-11T00:40:33+01: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", - "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}", - "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.10", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Version", - "description": "", - "env_variable": "SERVER_VERSION", - "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:20" - } - ] -} \ No newline at end of file From 4e87bfc8864fb80f329ffc09fa799b58b64d143d Mon Sep 17 00:00:00 2001 From: NgLoader Date: Fri, 11 Jan 2019 03:17:50 +0100 Subject: [PATCH 105/393] Added steam auth for starbound --- source_servers/starbound/egg-starbound.json | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/source_servers/starbound/egg-starbound.json b/source_servers/starbound/egg-starbound.json index 133fdb28..39dcccc8 100644 --- a/source_servers/starbound/egg-starbound.json +++ b/source_servers/starbound/egg-starbound.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# SRCDS Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} validate +quit\r\n\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\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\nmkdir \/mnt\/server\/storage\r\n\r\ncat <> \/mnt\/server\/storage\/starbound_server.config\r\n{\r\n \"allowAdminCommands\" : true,\r\n \"allowAdminCommandsFromAnyone\" : false,\r\n \"allowAnonymousConnections\" : true,\r\n \"allowAssetsMismatch\" : true,\r\n \"anonymousConnectionsAreAdmin\" : false,\r\n \"bannedIPs\" : [],\r\n \"bannedUuids\" : [],\r\n \"checkAssetsDigest\" : false,\r\n \"clearPlayerFiles\" : false,\r\n \"clearUniverseFiles\" : false,\r\n \"clientIPJoinable\" : false,\r\n \"clientP2PJoinable\" : true,\r\n \"configurationVersion\" : {\r\n \"basic\" : 2,\r\n \"server\" : 4\r\n },\r\n \"crafting\" : {\r\n \"filterHaveMaterials\" : false\r\n },\r\n \"gameServerBind\" : \"::\",\r\n \"gameServerPort\" : 21025,\r\n \"interactiveHighlight\" : true,\r\n \"inventory\" : {\r\n \"pickupToActionBar\" : true\r\n },\r\n \"maxPlayers\" : 8,\r\n \"maxTeamSize\" : 4,\r\n \"monochromeLighting\" : false,\r\n \"playerBackupFileCount\" : 3,\r\n \"queryServerBind\" : \"::\",\r\n \"queryServerPort\" : 21025,\r\n \"rconServerBind\" : \"::\",\r\n \"rconServerPassword\" : \"\",\r\n \"rconServerPort\" : 21026,\r\n \"rconServerTimeout\" : 1000,\r\n \"runQueryServer\" : false,\r\n \"runRconServer\" : false,\r\n \"safeScripts\" : true,\r\n \"scriptInstructionLimit\" : 10000000,\r\n \"scriptInstructionMeasureInterval\" : 10000,\r\n \"scriptProfilingEnabled\" : false,\r\n \"scriptRecursionLimit\" : 100,\r\n \"serverFidelity\" : \"automatic\",\r\n \"serverName\" : \"A Starbound Server\",\r\n \"serverOverrideAssetsDigest\" : null,\r\n \"serverUsers\" : {\r\n },\r\n \"tutorialMessages\" : true\r\n}\r\nEOF", + "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 ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} validate +quit\r\n\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\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\nmkdir \/mnt\/server\/storage\r\n\r\ncat <> \/mnt\/server\/storage\/starbound_server.config\r\n{\r\n \"allowAdminCommands\" : true,\r\n \"allowAdminCommandsFromAnyone\" : false,\r\n \"allowAnonymousConnections\" : true,\r\n \"allowAssetsMismatch\" : true,\r\n \"anonymousConnectionsAreAdmin\" : false,\r\n \"bannedIPs\" : [],\r\n \"bannedUuids\" : [],\r\n \"checkAssetsDigest\" : false,\r\n \"clearPlayerFiles\" : false,\r\n \"clearUniverseFiles\" : false,\r\n \"clientIPJoinable\" : false,\r\n \"clientP2PJoinable\" : true,\r\n \"configurationVersion\" : {\r\n \"basic\" : 2,\r\n \"server\" : 4\r\n },\r\n \"crafting\" : {\r\n \"filterHaveMaterials\" : false\r\n },\r\n \"gameServerBind\" : \"::\",\r\n \"gameServerPort\" : 21025,\r\n \"interactiveHighlight\" : true,\r\n \"inventory\" : {\r\n \"pickupToActionBar\" : true\r\n },\r\n \"maxPlayers\" : 8,\r\n \"maxTeamSize\" : 4,\r\n \"monochromeLighting\" : false,\r\n \"playerBackupFileCount\" : 3,\r\n \"queryServerBind\" : \"::\",\r\n \"queryServerPort\" : 21025,\r\n \"rconServerBind\" : \"::\",\r\n \"rconServerPassword\" : \"\",\r\n \"rconServerPort\" : 21026,\r\n \"rconServerTimeout\" : 1000,\r\n \"runQueryServer\" : false,\r\n \"runRconServer\" : false,\r\n \"safeScripts\" : true,\r\n \"scriptInstructionLimit\" : 10000000,\r\n \"scriptInstructionMeasureInterval\" : 10000,\r\n \"scriptProfilingEnabled\" : false,\r\n \"scriptRecursionLimit\" : 100,\r\n \"serverFidelity\" : \"automatic\",\r\n \"serverName\" : \"A Starbound Server\",\r\n \"serverOverrideAssetsDigest\" : null,\r\n \"serverUsers\" : {\r\n },\r\n \"tutorialMessages\" : true\r\n}\r\nEOF", "container": "ubuntu:16.04", "entrypoint": "bash" } @@ -25,17 +25,26 @@ "variables": [ { "name": "Steam User", - "description": "Admin only", + "description": "A Steam username with Starbound 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 Password", - "description": "Steam User Password", - "env_variable": "STEAM_PASS", + "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, From 7255164c461c3c4d3a4987b3ceda98d25cc8cd79 Mon Sep 17 00:00:00 2001 From: smcfreak Date: Fri, 11 Jan 2019 14:48:10 +0100 Subject: [PATCH 106/393] moved into source_servers as requested --- {rust-staging => source_servers/rust-staging}/README.md | 0 .../rust-staging}/egg-rust-staging.json | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {rust-staging => source_servers/rust-staging}/README.md (100%) rename {rust-staging => source_servers/rust-staging}/egg-rust-staging.json (100%) diff --git a/rust-staging/README.md b/source_servers/rust-staging/README.md similarity index 100% rename from rust-staging/README.md rename to source_servers/rust-staging/README.md diff --git a/rust-staging/egg-rust-staging.json b/source_servers/rust-staging/egg-rust-staging.json similarity index 100% rename from rust-staging/egg-rust-staging.json rename to source_servers/rust-staging/egg-rust-staging.json From 982e7fc00bca7bcd268bfcf13a4a6c5475dc74d0 Mon Sep 17 00:00:00 2001 From: Cristi Date: Fri, 11 Jan 2019 14:52:38 +0100 Subject: [PATCH 107/393] updated main README accordingly --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 355c5216..e01851f0 100644 --- a/README.md +++ b/README.md @@ -54,11 +54,10 @@ If you are submitting PR's try and keep names and titles the same. [OpenTTD](/openttd/) -[Rust Staging Branch](/rust-staging/) - [Source](/source_servers/) These eggs use steamcmd to install * [7 Days to Die](/source_servers/7_days_to_die/) * [PixARK](/source_servers/pixark/) +* [Rust Staging Branch](/source_servers/rust-staging/) * [Starbound](/source_servers/starbound) [Squad](/squad/) From c28a62d96d4f6f7543d189d2eb97840bdbdbe057 Mon Sep 17 00:00:00 2001 From: NgLoader Date: Fri, 11 Jan 2019 17:20:33 +0100 Subject: [PATCH 108/393] Added steam auth for rocketmod --- unturned/rocketmod/egg-rocketmod.json | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/unturned/rocketmod/egg-rocketmod.json b/unturned/rocketmod/egg-rocketmod.json index 6392ad6f..acaf657f 100644 --- a/unturned/rocketmod/egg-rocketmod.json +++ b/unturned/rocketmod/egg-rocketmod.json @@ -17,29 +17,38 @@ }, "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}\" +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", + "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": "Account Name", - "description": "A Steam username w\/ Unturned on the account.", + "name": "Steam User", + "description": "A Steam username with Unturned on the account.", "env_variable": "STEAM_USER", - "default_value": "", + "default_value": "anonymous", "user_viewable": 0, "user_editable": 0, - "rules": "required" + "rules": "required|string" }, { - "name": "Account Password", - "description": "The password for the Steam account.", + "name": "Steam Password", + "description": "Steam User Password", "env_variable": "STEAM_PASS", "default_value": "", "user_viewable": 0, "user_editable": 0, - "rules": "required" + "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 883205f16727bef5a57e28738f0503f5b73b6af4 Mon Sep 17 00:00:00 2001 From: NgLoader Date: Fri, 11 Jan 2019 17:21:36 +0100 Subject: [PATCH 109/393] Added steam auth for arma3 --- arma/arma3/egg-arma3.json | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/arma/arma3/egg-arma3.json b/arma/arma3/egg-arma3.json index a0b1966a..ff845ce6 100644 --- a/arma/arma3/egg-arma3.json +++ b/arma/arma3/egg-arma3.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-01-08T20:30:59-05:00", + "exported_at": "2018-10-16T13:07:23-04:00", "name": "Arma 3", "author": "daave@aaathats3as.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.", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl\r\napt -y --no-install-recommends install lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSLO http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd \/mnt\/server\/logs\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\n\r\ntouch \/mnt\/server\/latest.log\r\nchown -R root:root \/mnt\r\n\r\ntar -xzvf \/tmp\/steamcmd_linux.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\nexport HOME=\/mnt\/server\r\n\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} +force_install_dir \/mnt\/server +app_update ${APP_ID} validate +quit", + "script": "#!\/bin\/bash\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl\r\napt -y --no-install-recommends install lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSLO http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd \/mnt\/server\/logs\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\n\r\ntouch \/mnt\/server\/latest.log\r\nchown -R root:root \/mnt\r\n\r\ntar -xzvf \/tmp\/steamcmd_linux.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\nexport HOME=\/mnt\/server\r\n\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${APP_ID} validate +quit", "container": "ubuntu:18.04", "entrypoint": "bash" } @@ -79,21 +79,30 @@ }, { "name": "Steam User", - "description": "Admin only", + "description": "A Steam username with Arma3 on the account.", "env_variable": "STEAM_USER", - "default_value": "", + "default_value": "anonymous", "user_viewable": 0, "user_editable": 0, "rules": "required|string" }, { - "name": "STEAM_PASS", - "description": "STEAM_PASS", + "name": "Steam Password", + "description": "Steam User Password", "env_variable": "STEAM_PASS", "default_value": "", "user_viewable": 0, "user_editable": 0, - "rules": "required|string" + "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 65cddbc8afc6c79a09691adbd3324e185de1307e Mon Sep 17 00:00:00 2001 From: NgLoader Date: Fri, 11 Jan 2019 17:37:42 +0100 Subject: [PATCH 110/393] Added JTS3ServerMod --- README.md | 3 ++ bots/teamspeak3/README.md | 7 ++++ .../jts3servermod/egg-j-t-s3-server-mod.json | 36 +++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 bots/teamspeak3/README.md create mode 100644 bots/teamspeak3/jts3servermod/egg-j-t-s3-server-mod.json diff --git a/README.md b/README.md index e01851f0..83cb19bf 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,9 @@ If you are submitting PR's try and keep names and titles the same. * [pixel-bot](/bots/discord/pixelbot/) Python * [Sinusbot](/bots/discord/sinusbot/) +[TeamSpeak3](bots/teamspeak3) +* [JTS3ServerMod](/bots/teamspeak3/jts3servermod/) + ## Game Eggs [Arma](/arma/) diff --git a/bots/teamspeak3/README.md b/bots/teamspeak3/README.md new file mode 100644 index 00000000..f430ca9f --- /dev/null +++ b/bots/teamspeak3/README.md @@ -0,0 +1,7 @@ +# 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 diff --git a/bots/teamspeak3/jts3servermod/egg-j-t-s3-server-mod.json b/bots/teamspeak3/jts3servermod/egg-j-t-s3-server-mod.json new file mode 100644 index 00000000..c6094ad2 --- /dev/null +++ b/bots/teamspeak3/jts3servermod/egg-j-t-s3-server-mod.json @@ -0,0 +1,36 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-01-11T00:40:33+01: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", + "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}", + "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.10", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Version", + "description": "", + "env_variable": "SERVER_VERSION", + "default_value": "latest", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" + } + ] +} \ No newline at end of file From 548d6ae144bcec8237932e057ff0886d1cc38a5d Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Thu, 24 Jan 2019 14:55:28 -0500 Subject: [PATCH 111/393] Update FiveM folder location search. --- .gitignore | 1 + gta/fivem/egg-five-m.json | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..ccc9fd93 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.DS_Store \ No newline at end of file diff --git a/gta/fivem/egg-five-m.json b/gta/fivem/egg-five-m.json index d86b1fdb..99e725ef 100644 --- a/gta/fivem/egg-five-m.json +++ b/gta/fivem/egg-five-m.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-07-17T10:59:42-04:00", + "exported_at": "2019-01-24T14:53:35-05:00", "name": "FiveM", "author": "parker@parkervcp.com", "description": "A new FiveM egg for the latest builds due to recent changes in FiveM", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash \r\n\r\napk add openssl tar xz curl wget git --no-cache\r\n\r\ncd \/mnt\/server\r\n\r\nmkdir resources\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\ncd \/mnt\/server\r\n\r\necho \"Downloading the latest fivem server files\"\r\nlatest_fivem_url=`curl https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/ | tail -4 | head -1 | cut -d'\"' -f2`\r\n\r\necho -e \"pulling files from https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${latest_fivem_url}fx.tar.xz\"\r\nwget https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${latest_fivem_url}fx.tar.xz\r\n\r\necho \"Extracting fivem files\"\r\n\r\ntar xf fx.tar.xz\r\n\r\nrm -rf fx.tar.xz 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\/gta\/fivem\/server.cfg >> server.cfg\r\nfi\r\n\r\nmkdir logs\/\r\n\r\necho \"install complete\"", + "script": "#!\/bin\/ash \r\n\r\napk add openssl tar xz curl wget git --no-cache\r\n\r\ncd \/mnt\/server\r\n\r\nmkdir resources\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\ncd \/mnt\/server\r\n\r\necho \"Downloading the latest fivem server files\"\r\nlatest_fivem_url=`https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/ | grep -Eo 'href=\".*\/\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | grep -Ev 'Parent|revoked' | sort -n | tail -n -1`\r\n\r\necho -e \"pulling files from https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${latest_fivem_url}fx.tar.xz\"\r\nwget https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${latest_fivem_url}fx.tar.xz\r\n\r\necho \"Extracting fivem files\"\r\n\r\ntar xf fx.tar.xz\r\n\r\nrm -rf fx.tar.xz 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\/gta\/fivem\/server.cfg >> server.cfg\r\nfi\r\n\r\nmkdir logs\/\r\n\r\necho \"install complete\"", "container": "alpine:3.7", "entrypoint": "ash" } @@ -39,7 +39,7 @@ "default_value": "30", "user_viewable": 1, "user_editable": 0, - "rules": "required|integer|between:1,32" + "rules": "required|integer|between:1,31" }, { "name": "Server Hostname", @@ -51,4 +51,4 @@ "rules": "required|string" } ] -} +} \ No newline at end of file From 3e1cb6b13332290fd14cf247456b5b50f001d326 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Thu, 24 Jan 2019 15:44:47 -0500 Subject: [PATCH 112/393] update for fivem version matching. --- gta/fivem/egg-five-m.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gta/fivem/egg-five-m.json b/gta/fivem/egg-five-m.json index 99e725ef..adc1fa20 100644 --- a/gta/fivem/egg-five-m.json +++ b/gta/fivem/egg-five-m.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-01-24T14:53:35-05:00", + "exported_at": "2019-01-24T15:43:59-05:00", "name": "FiveM", "author": "parker@parkervcp.com", "description": "A new FiveM egg for the latest builds due to recent changes in FiveM", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash \r\n\r\napk add openssl tar xz curl wget git --no-cache\r\n\r\ncd \/mnt\/server\r\n\r\nmkdir resources\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\ncd \/mnt\/server\r\n\r\necho \"Downloading the latest fivem server files\"\r\nlatest_fivem_url=`https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/ | grep -Eo 'href=\".*\/\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | grep -Ev 'Parent|revoked' | sort -n | tail -n -1`\r\n\r\necho -e \"pulling files from https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${latest_fivem_url}fx.tar.xz\"\r\nwget https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${latest_fivem_url}fx.tar.xz\r\n\r\necho \"Extracting fivem files\"\r\n\r\ntar xf fx.tar.xz\r\n\r\nrm -rf fx.tar.xz 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\/gta\/fivem\/server.cfg >> server.cfg\r\nfi\r\n\r\nmkdir logs\/\r\n\r\necho \"install complete\"", + "script": "#!\/bin\/ash \r\n\r\napk add openssl tar xz curl wget git --no-cache\r\n\r\ncd \/mnt\/server\r\n\r\nmkdir resources\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\ncd \/mnt\/server\r\n\r\necho \"Downloading the latest fivem server files\"\r\nlatest_fivem_url=`curl https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/ | grep -Eo 'href=\".*\/\"' | grep -Eo '\".*\"' | grep -Eo 'href=\".*\/\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g'`\r\n\r\necho -e \"pulling files from https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${latest_fivem_url}fx.tar.xz\"\r\nwget https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${latest_fivem_url}fx.tar.xz\r\n\r\necho \"Extracting fivem files\"\r\n\r\ntar xf fx.tar.xz\r\n\r\nrm -rf fx.tar.xz 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\/gta\/fivem\/server.cfg >> server.cfg\r\nfi\r\n\r\nmkdir logs\/\r\n\r\necho \"install complete\"", "container": "alpine:3.7", "entrypoint": "ash" } From 67adf86614af42c6a0591e0bdca44a948f9d2ba7 Mon Sep 17 00:00:00 2001 From: Shirobaka Date: Fri, 1 Feb 2019 13:27:42 +0100 Subject: [PATCH 113/393] Update egg-multi-theft-auto.json - Console fix (Thanks to StrixG) - Variable SERVER_WEBPORT is now viewable for users. --- gta/mtasa/egg-multi-theft-auto.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gta/mtasa/egg-multi-theft-auto.json b/gta/mtasa/egg-multi-theft-auto.json index 94184d22..117ac602 100644 --- a/gta/mtasa/egg-multi-theft-auto.json +++ b/gta/mtasa/egg-multi-theft-auto.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-09-17T21:21:50+02:00", + "exported_at": "2019-02-01T13:25:30+01: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\/bl4ckspr4y\/pterodactyl-images:mtasa", - "startup": ".\/mta-server64 --port {{SERVER_PORT}} --httpport {{SERVER_WEBPORT}}", + "startup": ".\/mta-server64 --port {{SERVER_PORT}} --httpport {{SERVER_WEBPORT}} -n", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Server started and is ready to accept connections\"\r\n}", @@ -28,7 +28,7 @@ "description": "The http port for web resource", "env_variable": "SERVER_WEBPORT", "default_value": "22005", - "user_viewable": 0, + "user_viewable": 1, "user_editable": 0, "rules": "required|numeric" } From ac32b394de15763dd4332e412b96bdc3b15d3ccf Mon Sep 17 00:00:00 2001 From: Arnaud Lier Date: Sat, 2 Feb 2019 14:49:27 +0100 Subject: [PATCH 114/393] Change outdated docker image --- minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json b/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json index c4d2d08b..05e9a8cf 100644 --- a/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json +++ b/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json @@ -18,7 +18,7 @@ "scripts": { "installation": { "script": "#!\/bin\/ash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk update\r\napk add curl\r\n\r\nif [ -z \"$MC_VERSION\" ] || [ \"$MC_VERSION\" == \"latest\" ]; then\r\n INSTALLER_JAR=$(curl -sl http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/ | grep -A50 Recommended | grep installer.jar | grep -Eo \"(http|https):\/\/[a-zA-Z0-9.\/?=_-]*\" | tail -1)\r\n UNIVERSAL_JAR=$(curl -sl http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/ | grep -A50 Recommended | grep universal.jar | grep -Eo \"(http|https):\/\/[a-zA-Z0-9.\/?=_-]*\" | tail -1)\r\nelse\r\n INSTALLER_JAR=$(curl -sl http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index_$MC_VERSION.html | grep -A50 Recommended | grep installer.jar | grep -Eo \"(http|https):\/\/[a-zA-Z0-9.\/?=_-]*\" | tail -1)\r\n UNIVERSAL_JAR=$(curl -sl http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index_$MC_VERSION.html | grep -A50 Recommended | grep universal.jar | grep -Eo \"(http|https):\/\/[a-zA-Z0-9.\/?=_-]*\" | tail -1)\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"getting installer from $INSTALLER_JAR\"\r\ncurl -Sl $INSTALLER_JAR -o installer.jar\r\n\r\necho -e \"getting universal jar from $UNIVERSAL_JAR\"\r\ncurl -Sl $UNIVERSAL_JAR -o server.jar\r\n\r\njava -jar installer.jar --installServer\r\nrm -rf installer.jar\r\n\r\necho \"Install complete\"", - "container": "frolvlad\/alpine-oraclejdk8:cleaned", + "container": "openjdk:8-alpine", "entrypoint": "ash" } }, @@ -42,4 +42,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From 8de302594c4f2b734ffb533c8e4a83f549848e21 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sat, 2 Feb 2019 08:52:13 -0500 Subject: [PATCH 115/393] fix other oraclejdk image in the repo --- minecraft_java/forge/forge-generic/egg-forge-generic.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft_java/forge/forge-generic/egg-forge-generic.json b/minecraft_java/forge/forge-generic/egg-forge-generic.json index 1f6dd88b..27d769e0 100644 --- a/minecraft_java/forge/forge-generic/egg-forge-generic.json +++ b/minecraft_java/forge/forge-generic/egg-forge-generic.json @@ -18,7 +18,7 @@ "scripts": { "installation": { "script": "#!\/bin\/ash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk update\r\napk add curl\r\n\r\nBASE_URL=${MODPACK_URL}\/files\r\n\r\nif [ -z \"${MODPACK_VERSION}\" ] || [ \"${MODPACK_VERSION}\" == \"latest\" ]; then\r\n ID=`curl -sl ${BASE_URL} | grep -i -A9 'title=\"release\"' | grep -m 1 -i -o 'href=\".*\"' | cut -d \"\/\" -f5 | sed s\/\\\"\/\/g`\r\n echo \"ID: ${ID}\"\r\nelse \r\n ID=`curl -sl ${BASE_URL} | grep -i -A9 \"${MODPACK_VERSION}\" | grep -m 1 -oE 'href=\"[^\\\"]+\"' | cut -d \"\/\" -f5 | grep -oE [0-9]+`\r\n echo \"ID: ${ID}\"\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n\r\nSECONDURL=${BASE_URL}\/${ID}\r\necho \"SECONDURL: ${SECONDURL}\"\r\n\r\nGOOD_ID=`curl -sl ${SECONDURL} | grep -i server | grep -Eo 'href=\"[^\\\"]+\"' | grep -o -E \"[0-9]+\" | tail -1`\r\necho \"GOOD_ID: ${GOOD_ID}\"\r\n\r\nDL_URL=${BASE_URL}\/${GOOD_ID}\/download\r\necho \"Download_URL: ${DL_URL}\"\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Executing curl -L ${DL_URL} -o server.zip\"\r\ncurl -L ${DL_URL} -o server.zip\r\n\r\nunzip server.zip\r\n\r\nrm -rf server.zip\r\n\r\necho -e \"\\nInstalling forge server usint the installer jar file.\\n\"\r\njava -jar *installer.jar --installServer\r\n\r\necho -e \"\\nDeleting installer jar file and cleaning up.\\n\"\r\nrm -rf *installer.jar\r\n\r\nmv *universal.jar server.jar", - "container": "frolvlad\/alpine-oraclejdk8:cleaned", + "container": "openjdk:8-alpine", "entrypoint": "ash" } }, From f1070ffd7148b5ca09be8fb0d193170b7d300330 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 5 Feb 2019 15:08:21 -0500 Subject: [PATCH 116/393] Update to latest Alpine --- openttd/openttd/egg-open-t-t-d-server.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openttd/openttd/egg-open-t-t-d-server.json b/openttd/openttd/egg-open-t-t-d-server.json index 2b7bb77c..146b10a1 100644 --- a/openttd/openttd/egg-open-t-t-d-server.json +++ b/openttd/openttd/egg-open-t-t-d-server.json @@ -18,7 +18,7 @@ "scripts": { "installation": { "script": "apk add --no-cache sdl-dev fontconfig curl\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\ncurl -LSs https:\/\/binaries.openttd.org\/releases\/1.8.0\/openttd-1.8.0-linux-generic-amd64.tar.gz -o openttd.tar.gz\r\n\r\ntar --strip-components=1 -xzvf openttd.tar.gz \r\n\r\nchmod +x openttd\r\n\r\ncurl -LSs https:\/\/binaries.openttd.org\/extra\/opengfx\/0.5.2\/opengfx-0.5.2-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\r\n\r\ncurl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/openttd\/openttd\/openttd.cfg > openttd.cfg", - "container": "alpine:3.8", + "container": "alpine:3.9", "entrypoint": "ash" } }, From 167e4b405057919a20346fab79b1c59d58a3529a Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 5 Feb 2019 15:08:57 -0500 Subject: [PATCH 117/393] Update to latest Alpine --- bots/discord/parkertron/egg-parkertron.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bots/discord/parkertron/egg-parkertron.json b/bots/discord/parkertron/egg-parkertron.json index 908a36fe..c8ebd07b 100644 --- a/bots/discord/parkertron/egg-parkertron.json +++ b/bots/discord/parkertron/egg-parkertron.json @@ -18,9 +18,9 @@ "scripts": { "installation": { "script": "#!\/bin\/ash\r\n# parkertron 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\ncd\r\n\r\nmkdir -p go\/bin go\/src\r\n\r\napk add --no-cache --update go git curl lua-stdlib lua musl-dev g++ libc-dev tesseract-ocr tesseract-ocr-dev\r\n\r\necho \"installing dep for golang dependancies\"\r\n\r\ncurl https:\/\/raw.githubusercontent.com\/golang\/dep\/master\/install.sh | sh\r\n\r\ncd go\/src\/\r\n\r\necho \"pulling the parkertron pterodactyl branch\"\r\n\r\ngit clone https:\/\/github.com\/parkervcp\/parkertron.git\r\n\r\ncd parkertron\/\r\n\r\ndep ensure\r\n\r\necho \"building parkertron\"\r\n\r\ngo build \r\n\r\necho \"build complete copying parkertron and example configs over\"\r\n\r\ncp parkertron \/mnt\/server\/\r\n\r\nif [ -d \"$DIRECTORY\" ]; then\r\n echo \"Files exist already\"\r\nelse\r\n cp -r configs\/ \/mnt\/server\/\r\nfi\r\n\r\necho \"Install complete. If you watched this. Congrats.\"", - "container": "alpine:3.7", + "container": "alpine:3.9", "entrypoint": "ash" } }, "variables": [] -} \ No newline at end of file +} From 19f518a89aedf7e8ad98c9cae5ab54dbd41ead24 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 5 Feb 2019 15:09:55 -0500 Subject: [PATCH 118/393] Update to latest Alpine --- gta/fivem/egg-five-m.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gta/fivem/egg-five-m.json b/gta/fivem/egg-five-m.json index adc1fa20..828ff999 100644 --- a/gta/fivem/egg-five-m.json +++ b/gta/fivem/egg-five-m.json @@ -18,7 +18,7 @@ "scripts": { "installation": { "script": "#!\/bin\/ash \r\n\r\napk add openssl tar xz curl wget git --no-cache\r\n\r\ncd \/mnt\/server\r\n\r\nmkdir resources\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\ncd \/mnt\/server\r\n\r\necho \"Downloading the latest fivem server files\"\r\nlatest_fivem_url=`curl https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/ | grep -Eo 'href=\".*\/\"' | grep -Eo '\".*\"' | grep -Eo 'href=\".*\/\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g'`\r\n\r\necho -e \"pulling files from https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${latest_fivem_url}fx.tar.xz\"\r\nwget https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${latest_fivem_url}fx.tar.xz\r\n\r\necho \"Extracting fivem files\"\r\n\r\ntar xf fx.tar.xz\r\n\r\nrm -rf fx.tar.xz 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\/gta\/fivem\/server.cfg >> server.cfg\r\nfi\r\n\r\nmkdir logs\/\r\n\r\necho \"install complete\"", - "container": "alpine:3.7", + "container": "alpine:3.9", "entrypoint": "ash" } }, @@ -51,4 +51,4 @@ "rules": "required|string" } ] -} \ No newline at end of file +} From 1872f71d2dbfb1307f0fea6db1935df99457f094 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 5 Feb 2019 15:10:28 -0500 Subject: [PATCH 119/393] Update to latest Alpine --- minecraft_bedrock/bedrock/egg-vanilla-bedrock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json b/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json index 16f4bc70..9033faa9 100644 --- a/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json +++ b/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json @@ -18,7 +18,7 @@ "scripts": { "installation": { "script": "#!\/bin\/ash\r\n\r\napk add --no-cache zip unzip wget curl\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Downloading files from https:\/\/minecraft.azureedge.net\/bin-linux\/bedrock-server-$BEDROCK_VERSION.zip\"\r\n\r\nif [ -z \"${BEDROCK_VERSION}\" ] || [ \"${BEDROCK_VERSION}\" == \"latest\" ]; then\r\n echo -e \"\\n Downloading latest Bedrock server\"\r\n DOWNLOAD_URL=$(curl https:\/\/minecraft.net\/en-us\/download\/server\/bedrock\/ | grep azureedge | grep linux | grep -Eo \"(http|https):\/\/[a-zA-Z0-9.\/?=_-]*\")\r\n BEDROCK_ZIP=$(echo ${DOWNLOAD_URL} | cut -d\"\/\" -f5)\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\n BEDROCK_ZIP=$(echo ${DOWNLOAD_URL} | cut -d\"\/\" -f5)\r\nfi\r\n\r\nwget ${DOWNLOAD_URL}\r\n\r\necho -e \"Unpacking server files\"\r\nunzip -o $BEDROCK_ZIP\r\n\r\necho -e \"Cleaning up after installing\"\r\nrm $BEDROCK_ZIP\r\n\r\necho -e \"Done\"", - "container": "alpine:3.8", + "container": "alpine:3.9", "entrypoint": "ash" } }, @@ -42,4 +42,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From 179717cf4a53abb6e4527a3cccf18935ff0e94a7 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 5 Feb 2019 15:10:42 -0500 Subject: [PATCH 120/393] Update to latest Alpine --- minecraft_bedrock/nukkit/egg-nukkit.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft_bedrock/nukkit/egg-nukkit.json b/minecraft_bedrock/nukkit/egg-nukkit.json index 4c3b34bb..5dedc848 100644 --- a/minecraft_bedrock/nukkit/egg-nukkit.json +++ b/minecraft_bedrock/nukkit/egg-nukkit.json @@ -18,7 +18,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:\/\/ci.nukkitx.com\/job\/NukkitX\/job\/Nukkit\/job\/master\/lastSuccessfulBuild\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nelse\r\n wget https:\/\/ci.nukkitx.com\/job\/NukkitX\/job\/Nukkit\/job\/master\/${NUKKIT_VERSION}\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nfi\r\n\r\nwget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_bedrock\/nukkit\/nukkit.yml\r\n\r\nwget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_bedrock\/nukkit\/server.properties", - "container": "alpine:3.7", + "container": "alpine:3.9", "entrypoint": "ash" } }, From 972d312058525ae68955b44f1765a549aaa57cae Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 5 Feb 2019 15:10:55 -0500 Subject: [PATCH 121/393] Update to latest Alpine --- minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json b/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json index fa4bca0a..613abb26 100644 --- a/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json +++ b/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json @@ -18,7 +18,7 @@ "scripts": { "installation": { "script": "#!\/bin\/ash\r\n\r\napk add --no-cache curl\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"\\n downloading pocketmine MP build ${PMMP_VERSION}\"\r\nif [ -z \"$PMMP_VERSION\" ] || [ \"$PMMP_VERSION\" == \"latest\" ]; then\r\n curl -sSL -o PocketMine-MP.phar https:\/\/jenkins.pmmp.io\/job\/PocketMine-MP\/Stable\/artifact\/PocketMine-MP.phar\r\nelse \r\n curl -sSL -o PocketMine-MP.phar https:\/\/jenkins.pmmp.io\/job\/PocketMine-MP\/${PMMP_VERSION}\/artifact\/PocketMine-MP.phar\r\nfi\r\n\r\necho -e \"\\n downloading latest php7 build from pocketmine\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-7.2-Linux-x86_64\/lastSuccessfulBuild\/artifact\/PHP_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\/minecraft_bedrock\/pocketmine_mp\/server.properties > server.properties\r\necho -e \"\\n unpacking php7 binaries\"\r\ntar -xzvf php.binary.tar.gz\r\necho -e \"\\n removing pvp7 packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.tx banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs", - "container": "alpine:3.8", + "container": "alpine:3.9", "entrypoint": "ash" } }, From 56851445bf3c0fd27642f4427f45cc6196496325 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 5 Feb 2019 15:11:20 -0500 Subject: [PATCH 122/393] Update to latest Alpine --- minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json b/minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json index 289ba61c..e84cdd79 100644 --- a/minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json +++ b/minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json @@ -18,7 +18,7 @@ "scripts": { "installation": { "script": "#!\/bin\/ash\r\n# Generic FTB Server Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# MODPACK_VERSION = version of the modpack, set in variables\r\n# i.e MODPACK_VERSION=1.5.0\r\n# MODPACK_URL = url base of the pack, set in variables, hardcoded\r\n# i.e https:\/\/www.feed-the-beast.com\/projects\/ftb-revelation\/files\r\n# MODPACK_URL=ftb-revelation\r\n\r\napk add curl --no-cache\r\n\r\n## Correcting for bad variables\r\nGETPACK=$(echo ${MODPACK_URL} | cut -d \"\/\" -f 5 )\r\necho -e \"\\n The pack being downloaded is $GETPACK \\n\"\r\n\r\n## Getting the Base URL\r\nBASEURL=https:\/\/www.feed-the-beast.com\/projects\/${GETPACK}\/files\r\necho \"The base URL is ${BASEURL}\"\r\n\r\n## This is meant to get the pack ID that is unique and not exactly clear \r\n\r\n\r\nif [ -z \"${MODPACK_VERSION}\" ] || [ \"${MODPACK_VERSION}\" == \"latest\" ]; then\r\n ID=`curl -sl ${BASEURL} | grep -i -A9 'title=\"release\"' | grep -i -o 'href=\".*\"' | cut -d \"\/\" -f5 | sed s\/\\\"\/\/g`\r\n echo \"ID: ${ID}\"\r\nelse \r\n ID=`curl -sl ${BASEURL} | grep -i -A9 \"${MODPACK_VERSION}\" | grep -m1 -oE 'href=\"[^\\\"]+\"' | cut -d \"\/\" -f5 | grep -oE [0-9]+`\r\n echo \"ID: ${ID}\"\r\nfi\r\n\r\nSECONDURL=${BASEURL}\/${ID}\r\necho \"SECONDURL: ${SECONDURL}\"\r\n\r\nGOOD_ID=`curl -sl ${SECONDURL} | grep -i server | grep -Eo 'href=\"[^\\\"]+\"' | grep -o -E \"[0-9]+\" | tail -1`\r\necho \"GOOD_ID: ${GOOD_ID}\"\r\n\r\nDL_URL=${BASEURL}\/${GOOD_ID}\/download\r\necho \"Download_URL: ${DL_URL}\"\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Executing curl -L ${DL_URL} -o $GETPACK.zip\"\r\ncurl -L ${DL_URL} -o $GETPACK.zip\r\n\r\nunzip ${GETPACK}.zip\r\n\r\nrm -rf ${GETPACK}.zip\r\n\r\necho \"Running FTBInstall.sh\"\r\n\r\nsh .\/FTBInstall.sh", - "container": "alpine:3.7", + "container": "alpine:3.9", "entrypoint": "ash" } }, @@ -78,4 +78,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From a87182c57ac89c866304e9e1c870130fa267a7e5 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 5 Feb 2019 15:11:37 -0500 Subject: [PATCH 123/393] Update to latest Alpine --- minecraft_java/ftb/ftb-revelation/egg-f-t-b-revelation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft_java/ftb/ftb-revelation/egg-f-t-b-revelation.json b/minecraft_java/ftb/ftb-revelation/egg-f-t-b-revelation.json index bcc73a2f..ba408d36 100644 --- a/minecraft_java/ftb/ftb-revelation/egg-f-t-b-revelation.json +++ b/minecraft_java/ftb/ftb-revelation/egg-f-t-b-revelation.json @@ -18,7 +18,7 @@ "scripts": { "installation": { "script": "#!\/bin\/ash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk update\r\napk add curl --no-cache\r\n\r\nBASEURL=https:\/\/www.feed-the-beast.com\/projects\/ftb-revelation\/files\r\nPATTERN=\"(projects\\\/ftb-revelation\\\/files\\\/\\d{7,})\"\r\nID=`curl -sl ${BASEURL}| grep -A2 ${MODPACK_VERSION} | grep -oE \"${PATTERN}\"`\r\nSECONDURL=https:\/\/www.feed-the-beast.com\/${ID}\r\nGOOD_ID=`curl -sl ${SECONDURL} | grep -B2 Server_${MODPACK_VERSION}.zip | grep -oE \"${PATTERN}\"`\r\n\r\nDL_URL=https:\/\/www.feed-the-beast.com\/${GOOD_ID}\/download\r\n\r\ncd \/mnt\/server\r\n\r\ncurl -L ${DL_URL} -o ftbrevelations-${MODPACK_VERSION}.zip\r\n\r\nunzip ftbrevelations-${MODPACK_VERSION}.zip\r\n\r\nrm -rf ftbrevelations-${MODPACK_VERSION}.zip\r\n\r\nsh .\/FTBInstall.sh", - "container": "alpine:3.7", + "container": "alpine:3.9", "entrypoint": "ash" } }, From 0b2779d9f8498e0b0ef7016e0d8534971d511fee Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 5 Feb 2019 15:11:49 -0500 Subject: [PATCH 124/393] Update to latest Alpine --- minecraft_java/spigot/paper-legacy/paper-legacy.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_java/spigot/paper-legacy/paper-legacy.json b/minecraft_java/spigot/paper-legacy/paper-legacy.json index bfc8eab4..9c439efa 100644 --- a/minecraft_java/spigot/paper-legacy/paper-legacy.json +++ b/minecraft_java/spigot/paper-legacy/paper-legacy.json @@ -18,7 +18,7 @@ "scripts": { "installation": { "script": "#!\/bin\/ash\r\n# Paper Spigot 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\nif [ -z \"${DL_VERSION}\" ] || [ \"${DL_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=\"lastSuccessfulBuild\"\r\nfi\r\n\r\nif [ \"${DL_VERSION}\" == \"443\" ]; then\r\n DL_NAME=\"Paperclip\"\r\nelse\r\n DL_NAME=\"paperclip\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/papermc.io\/ci\/job\/Paper\/${DL_VERSION}\/artifact\/${DL_NAME}.jar", - "container": "alpine:3.4", + "container": "alpine:3.9", "entrypoint": "ash" } }, @@ -42,4 +42,4 @@ "rules": "required|string|between:3,7" } ] -} \ No newline at end of file +} From 7ececadfc879d2714c4ad75bd1f2497dee3bf69a Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 5 Feb 2019 15:12:01 -0500 Subject: [PATCH 125/393] Update to latest Alpine --- minecraft_java/spigot/paper-spigot/egg-paper-spigot.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_java/spigot/paper-spigot/egg-paper-spigot.json b/minecraft_java/spigot/paper-spigot/egg-paper-spigot.json index f483aa8a..ad778924 100644 --- a/minecraft_java/spigot/paper-spigot/egg-paper-spigot.json +++ b/minecraft_java/spigot/paper-spigot/egg-paper-spigot.json @@ -18,7 +18,7 @@ "scripts": { "installation": { "script": "#!\/bin\/ash\r\n# Paper Spigot 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\nif [ -z \"${DL_VERSION}\" ] || [ \"${DL_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=\"lastSuccessfulBuild\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/papermc.io\/ci\/job\/Paper-1.13\/${DL_VERSION}\/artifact\/paperclip.jar", - "container": "alpine:3.8", + "container": "alpine:3.9", "entrypoint": "ash" } }, @@ -42,4 +42,4 @@ "rules": "required|string|between:3,7" } ] -} \ No newline at end of file +} From 895581d673139de73408d68a55b0db3052c81c76 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 5 Feb 2019 15:12:13 -0500 Subject: [PATCH 126/393] Update to latest Alpine --- .../spigot/spigot-enhanced/egg-spigot--enhanced.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_java/spigot/spigot-enhanced/egg-spigot--enhanced.json b/minecraft_java/spigot/spigot-enhanced/egg-spigot--enhanced.json index a55ee430..2f178d80 100644 --- a/minecraft_java/spigot/spigot-enhanced/egg-spigot--enhanced.json +++ b/minecraft_java/spigot/spigot-enhanced/egg-spigot--enhanced.json @@ -18,7 +18,7 @@ "scripts": { "installation": { "script": "#!\/bin\/ash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n apk update\r\n apk add curl\r\n\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 apk add --no-cache curl git openjdk8 openssl\r\n \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 mv BuildTools.jar \/srv\/\r\n\r\n java -jar BuildTools.jar --rev ${SPIGOT_VERSION}\r\n\r\n mv spigot-*.jar \/mnt\/server\/${SERVER_JARFILE}\r\nfi", - "container": "alpine:3.7", + "container": "alpine:3.9", "entrypoint": "ash" } }, @@ -51,4 +51,4 @@ "rules": "nullable|string" } ] -} \ No newline at end of file +} From 463f867c2a6b0dd929761599a02247d7faca4f52 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 5 Feb 2019 15:12:25 -0500 Subject: [PATCH 127/393] Update to latest Alpine --- minecraft_java/spigot/taco-spigot/egg-taco-spigot.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft_java/spigot/taco-spigot/egg-taco-spigot.json b/minecraft_java/spigot/taco-spigot/egg-taco-spigot.json index 1b226a51..aff41987 100644 --- a/minecraft_java/spigot/taco-spigot/egg-taco-spigot.json +++ b/minecraft_java/spigot/taco-spigot/egg-taco-spigot.json @@ -18,7 +18,7 @@ "scripts": { "installation": { "script": "#!\/bin\/ash\r\n# Taco Spigot 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\nif [ -z \"${DL_VERSION}\" ] || [ \"${DL_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=\"lastSuccessfulBuild\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/ci.techcable.net\/job\/TacoSpigot\/${DL_VERSION}\/artifact\/build\/TacoSpigot.jar", - "container": "alpine:3.4", + "container": "alpine:3.9", "entrypoint": "ash" } }, From 2c261bc5c3535ab7314346ea45656b9780abecaa Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 5 Feb 2019 15:12:55 -0500 Subject: [PATCH 128/393] Update to latest Alpine --- minecraft_java/technic/blightfall/egg-blightfall.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft_java/technic/blightfall/egg-blightfall.json b/minecraft_java/technic/blightfall/egg-blightfall.json index b8ffd98a..2fd18f10 100644 --- a/minecraft_java/technic/blightfall/egg-blightfall.json +++ b/minecraft_java/technic/blightfall/egg-blightfall.json @@ -18,7 +18,7 @@ "scripts": { "installation": { "script": "#!\/bin\/ash\r\n# Forge 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\ncurl -sS http:\/\/servers.technicpack.net\/Technic\/servers\/blightfall\/Blightfall_Server_v$MODPACK_VERSION.zip -o Blightfall_$MODPACK_VERSION.zip\r\n\r\nunzip Blightfall_$MODPACK_VERSION.zip\r\n\r\nrm -rf Blightfall_$MODPACK_VERSION.zip", - "container": "alpine:3.7", + "container": "alpine:3.9", "entrypoint": "ash" } }, From d88516824ddd415ee24c61eec3295b0daa1b3ee6 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 5 Feb 2019 15:13:06 -0500 Subject: [PATCH 129/393] Update to latest Alpine --- minecraft_java/technic/hexxit/egg-hexxit.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft_java/technic/hexxit/egg-hexxit.json b/minecraft_java/technic/hexxit/egg-hexxit.json index 4b6b01d0..2617acb5 100644 --- a/minecraft_java/technic/hexxit/egg-hexxit.json +++ b/minecraft_java/technic/hexxit/egg-hexxit.json @@ -18,7 +18,7 @@ "scripts": { "installation": { "script": "#!\/bin\/ash\r\n# Forge 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\ncurl -sS http:\/\/servers.technicpack.net\/Technic\/servers\/hexxit\/Hexxit_Server_v$MODPACK_VERSION.zip -o Hexxit_$MODPACK_VERSION.zip\r\n\r\nunzip Hexxit_$MODPACK_VERSION.zip\r\n\r\nrm -rf Hexxit_$MODPACK_VERSION.zip", - "container": "alpine:3.7", + "container": "alpine:3.9", "entrypoint": "ash" } }, From f9d8a90272e5e0840c5454b0abf51f1ad695324a Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 5 Feb 2019 15:13:18 -0500 Subject: [PATCH 130/393] Update to latest Alpine --- minecraft_java/technic/tekkit-legends/egg-tekkit-legends.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft_java/technic/tekkit-legends/egg-tekkit-legends.json b/minecraft_java/technic/tekkit-legends/egg-tekkit-legends.json index 7e328f26..0180f3be 100644 --- a/minecraft_java/technic/tekkit-legends/egg-tekkit-legends.json +++ b/minecraft_java/technic/tekkit-legends/egg-tekkit-legends.json @@ -18,7 +18,7 @@ "scripts": { "installation": { "script": "#!\/bin\/ash\r\n# Forge 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\nhttp:\/\/servers.technicpack.net\/Technic\/servers\/tekkit-legends\/Tekkit_Legends_Server_v1.1.1.zip\r\ncurl -sS http:\/\/servers.technicpack.net\/Technic\/servers\/tekkit-legends\/Tekkit_Legends_Server_v$MODPACK_VERSION.zip -o TekkitLegends_$MODPACK_VERSION.zip\r\n\r\nunzip TekkitLegends_$MODPACK_VERSION.zip\r\n\r\nrm -rf TekkitLegends_$MODPACK_VERSION.zip", - "container": "alpine:3.7", + "container": "alpine:3.9", "entrypoint": "ash" } }, From 076405af8c21caa410a3ac07e852b3dac218607f Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 5 Feb 2019 15:13:32 -0500 Subject: [PATCH 131/393] Update to latest Alpine --- minecraft_proxy/waterfall/egg-waterfall.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_proxy/waterfall/egg-waterfall.json b/minecraft_proxy/waterfall/egg-waterfall.json index 2adcdee6..cf4800f5 100644 --- a/minecraft_proxy/waterfall/egg-waterfall.json +++ b/minecraft_proxy/waterfall/egg-waterfall.json @@ -18,7 +18,7 @@ "scripts": { "installation": { "script": "#!\/bin\/ash\r\n# Waterfall 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\nif [ -z \"${WATERFALL_VERSION}\" ] || [ \"${WATERFALL_VERSION}\" == \"latest\" ]; then\r\n WATERFALL_VERSION=\"lastStableBuild\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/papermc.io\/ci\/job\/Waterfall\/${WATERFALL_VERSION}\/artifact\/Waterfall-Proxy\/bootstrap\/target\/Waterfall.jar", - "container": "alpine:3.4", + "container": "alpine:3.9", "entrypoint": "ash" } }, @@ -42,4 +42,4 @@ "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" } ] -} \ No newline at end of file +} From 28ee57301f6846e543eac6e909efb198cbfe71c0 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 5 Feb 2019 15:14:29 -0500 Subject: [PATCH 132/393] Update to latest Alpine --- terraria/tmodloader/egg-t-modloader.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terraria/tmodloader/egg-t-modloader.json b/terraria/tmodloader/egg-t-modloader.json index ba2316b1..20847d38 100644 --- a/terraria/tmodloader/egg-t-modloader.json +++ b/terraria/tmodloader/egg-t-modloader.json @@ -18,7 +18,7 @@ "scripts": { "installation": { "script": "#!\/bin\/ash\r\n# Vanilla T-shock Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\ncd \/mnt\/server\r\n\r\necho -e \"Downloading tModloader\"\r\nwget https:\/\/github.com\/blushiemagic\/tModLoader\/releases\/download\/${TMODLOADER_VERSION}\/tModLoader.Linux.${TMODLOADER_VERSION}.zip\r\n\r\necho -e \"Unpacking mod loader files\"\r\nunzip tModLoader.Linux.${TMODLOADER_VERSION}.zip\r\n\r\nCLEAN_VERSION=$(echo ${TERRARIA_VERSION} | sed 's\/\\.\/\/g')\r\n\r\necho -e \"Downloading terraria server files\"\r\nwget http:\/\/terraria.org\/server\/terraria-server-${CLEAN_VERSION}.zip\r\n\r\necho -e \"Unpacking server files\"\r\nunzip terraria-server-$(echo ${CLEAN_VERSION} | sed 's\/\\.\/\/g').zip\r\ncp -R ${CLEAN_VERSION}\/Linux\/* .\/\r\n\r\necho -e \"Cleaning up extra files.\"\r\nrm -rf ${CLEAN_VERSION}\r\n\r\nchmod +x .\/tModLoaderServer.bin.x86_64", - "container": "alpine:3.8", + "container": "alpine:3.9", "entrypoint": "ash" } }, @@ -69,4 +69,4 @@ "rules": "required|numeric|digits_between:1,3" } ] -} \ No newline at end of file +} From 24d75dab516432e51879780753ff3189e81ff4a8 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 5 Feb 2019 15:14:43 -0500 Subject: [PATCH 133/393] Update to latest Alpine --- terraria/tshock/egg-tshock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terraria/tshock/egg-tshock.json b/terraria/tshock/egg-tshock.json index 99a0348f..a13bf77f 100644 --- a/terraria/tshock/egg-tshock.json +++ b/terraria/tshock/egg-tshock.json @@ -18,7 +18,7 @@ "scripts": { "installation": { "script": "#!\/bin\/ash\r\n# Vanilla T-shock Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\ncd \/mnt\/server\r\n\r\necho -e \"Downloading and installing ${TSHOCK_VERSION}\"\r\n\r\necho -e \"running wget https:\/\/github.com\/Pryaxis\/TShock\/releases\/download\/v${TSHOCK_VERSION}\/tshock_${TSHOCK_VERSION}.zip\"\r\nwget https:\/\/github.com\/Pryaxis\/TShock\/releases\/download\/v${TSHOCK_VERSION}\/tshock_${TSHOCK_VERSION}.zip\r\n\r\nunzip tshock_${TSHOCK_VERSION}.zip", - "container": "alpine:3.7", + "container": "alpine:3.9", "entrypoint": "ash" } }, @@ -60,4 +60,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From 30abe9c06f207bbbdbd52855a56e185dda018365 Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Tue, 5 Feb 2019 15:15:46 -0500 Subject: [PATCH 134/393] Update to latest Alpine --- xonotic/xonotic/egg-xonotic.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xonotic/xonotic/egg-xonotic.json b/xonotic/xonotic/egg-xonotic.json index 82892145..4fa357c9 100644 --- a/xonotic/xonotic/egg-xonotic.json +++ b/xonotic/xonotic/egg-xonotic.json @@ -18,7 +18,7 @@ "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.7", + "container": "alpine:3.9", "entrypoint": "ash" } }, From cf24cae039ffe8cf80261a69fb9aa7e14bd29249 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 5 Feb 2019 22:47:32 -0500 Subject: [PATCH 135/393] Update PR Template --- .../pull_request_template.md | 20 ------------------- .github/pull_request_template.md | 20 +++++++++++++++++++ 2 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 .github/PULL_REQUEST_TEMPLATE/pull_request_template.md create mode 100644 .github/pull_request_template.md diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md deleted file mode 100644 index 93074704..00000000 --- a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md +++ /dev/null @@ -1,20 +0,0 @@ -### All Submissions: - -* [ ] Have you followed the guidelines in our Contributing document? -* [ ] Have you checked to ensure there aren't other open [Pull Requests](../../pulls) for the same update/change? - - - -### New Feature Submissions: - -1. [ ] Does your submission pass tests (server is connectable)? - -### Changes to Egg Features: - -* [ ] Have you added an explanation of what your changes do and why you'd like us to include them? -* [ ] Have you tested your Egg changes? - -### Changes to README: - -* [ ] Have you added the server to the main README.md? -* [ ] Have you added a unique README.md for the server you are adding? \ No newline at end of file diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 00000000..e70890ce --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,20 @@ +### All Submissions: + +* [ ] Have you followed the guidelines in our Contributing document? +* [ ] Have you checked to ensure there aren't other open [Pull Requests](../../pulls) for the same update/change? + + + +### New Server Submissions: + +1. [ ] Does your submission pass tests (server is connectable)? +2. [ ] Does your server use a custom docker image? + * [ ] Have you tried to use a generic image? + * [ ] Did you PR the nesessary 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? \ No newline at end of file From f9f40db6dfc9b7084b838fd74af5a7f19115a79b Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 5 Feb 2019 22:51:49 -0500 Subject: [PATCH 136/393] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index e01851f0..c76b25f2 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,8 @@ If you are submitting PR's try and keep names and titles the same. ## Please read the CONTRIBUTING.md before submitting PRs +If you submit a PR without filling out the template I will deny it. This is for all PR's moving forward (after Feb 5th, 2019) + ## Bot Eggs [Discord](/bots/discord/) From 18e8e9924c24de64bd3971823c234cb82f08376b Mon Sep 17 00:00:00 2001 From: AlienSteel Date: Wed, 6 Feb 2019 16:39:59 +0100 Subject: [PATCH 137/393] Update README.md Corrected a typo --- minecraft_bedrock/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_bedrock/README.md b/minecraft_bedrock/README.md index 65ff989d..5dd20afa 100644 --- a/minecraft_bedrock/README.md +++ b/minecraft_bedrock/README.md @@ -9,5 +9,5 @@ The official Minecraft Bedrock (Formerly Minecraft Pocket Edition) server. Nukkit is a Nuclear-Powered Server Software For Minecraft: Pocket Edition #### PocketMine MP -[PockletMine MP](https://github.com/pmmp/PocketMine-MP) -A server software for Minecraft: Bedrock Edition in PHP \ No newline at end of file +[PocketMine MP](https://github.com/pmmp/PocketMine-MP) +A server software for Minecraft: Bedrock Edition in PHP From e417bacfed00f7005db61fb08a0c9878b158fdab Mon Sep 17 00:00:00 2001 From: NgLoader Date: Fri, 8 Feb 2019 01:58:27 +0100 Subject: [PATCH 138/393] Added build number support --- .../forge/forge-enhanced/egg-forge--enhanced.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json b/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json index 05e9a8cf..fc85e270 100644 --- a/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json +++ b/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json @@ -3,8 +3,8 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-08-02T16:56:12-04:00", - "name": "Forge-Enhanced", + "exported_at": "2019-02-04T20:22:22+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.", "image": "quay.io\/pterodactyl\/core:java", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk update\r\napk add curl\r\n\r\nif [ -z \"$MC_VERSION\" ] || [ \"$MC_VERSION\" == \"latest\" ]; then\r\n INSTALLER_JAR=$(curl -sl http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/ | grep -A50 Recommended | grep installer.jar | grep -Eo \"(http|https):\/\/[a-zA-Z0-9.\/?=_-]*\" | tail -1)\r\n UNIVERSAL_JAR=$(curl -sl http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/ | grep -A50 Recommended | grep universal.jar | grep -Eo \"(http|https):\/\/[a-zA-Z0-9.\/?=_-]*\" | tail -1)\r\nelse\r\n INSTALLER_JAR=$(curl -sl http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index_$MC_VERSION.html | grep -A50 Recommended | grep installer.jar | grep -Eo \"(http|https):\/\/[a-zA-Z0-9.\/?=_-]*\" | tail -1)\r\n UNIVERSAL_JAR=$(curl -sl http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index_$MC_VERSION.html | grep -A50 Recommended | grep universal.jar | grep -Eo \"(http|https):\/\/[a-zA-Z0-9.\/?=_-]*\" | tail -1)\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"getting installer from $INSTALLER_JAR\"\r\ncurl -Sl $INSTALLER_JAR -o installer.jar\r\n\r\necho -e \"getting universal jar from $UNIVERSAL_JAR\"\r\ncurl -Sl $UNIVERSAL_JAR -o server.jar\r\n\r\njava -jar installer.jar --installServer\r\nrm -rf installer.jar\r\n\r\necho \"Install complete\"", + "script": "#!\/bin\/ash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk update\r\napk add curl\r\n\r\nif [ -z \"$MC_VERSION\" ] || [ \"$MC_VERSION\" == \"latest\" ]; then\r\n FORGE_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/ | grep -A1 Latest | grep -o -e '[1]\\.[0-9][0-9]\\?\\.\\?[0-9]\\?[0-9] - [0-9][0-9]\\.[0-9][0-9]\\.[0-9]\\?[0-9]\\.[0-9][0-9][0-9][0-9]' | sed 's\/ \/\/g')\r\nelse if [[ ! $FORGE_VERSION = *\"-\"* ]]; then\r\n FORGE_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index_$MC_VERSION.html | grep -A1 Latest | grep -o -e '[1]\\.[0-9][0-9]\\?\\.\\?[0-9]\\?[0-9] - [0-9][0-9]\\.[0-9][0-9]\\.[0-9]\\?[0-9]\\.[0-9][0-9][0-9][0-9]' | sed 's\/ \/\/g')\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Downloading forge version \\\"$FORGE_VERSION\\\"\\n\"\r\ncurl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\ncurl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -o $SERVER_JARFILE\r\n\r\nif [ ! -f .\/installer.jar ]; then\r\n echo \"!!! Invalide forge version \\\"$FORGE_VERSION\\\" !!!\\n\"\r\nfi\r\n\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer\r\n\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar", "container": "openjdk:8-alpine", "entrypoint": "ash" } @@ -33,8 +33,8 @@ "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" }, { - "name": "Forge Version", - "description": "The version of minecraft you want to download forge for.\r\n\r\nExample 1.7.10", + "name": "Forge version", + "description": "The version of forge that you want to run.\r\nExamples:\r\n- 1.12.2\r\n- 1.12.2-14.23.5.2810", "env_variable": "MC_VERSION", "default_value": "latest", "user_viewable": 1, @@ -42,4 +42,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From afd856192a0fef116b5bee74d252c7da8e1ec1fd Mon Sep 17 00:00:00 2001 From: NgLoader Date: Fri, 8 Feb 2019 01:59:13 +0100 Subject: [PATCH 139/393] Added Tower Unit --- README.md | 5 +- unreal_engine/tower_unit/README.md | 11 ++++ unreal_engine/tower_unit/egg-tower-unit.json | 63 ++++++++++++++++++++ 3 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 unreal_engine/tower_unit/README.md create mode 100644 unreal_engine/tower_unit/egg-tower-unit.json diff --git a/README.md b/README.md index c76b25f2..9847b83a 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,6 @@ If you are submitting PR's try and keep names and titles the same. ## Please read the CONTRIBUTING.md before submitting PRs -If you submit a PR without filling out the template I will deny it. This is for all PR's moving forward (after Feb 5th, 2019) - ## Bot Eggs [Discord](/bots/discord/) @@ -62,6 +60,9 @@ If you submit a PR without filling out the template I will deny it. This is for * [Rust Staging Branch](/source_servers/rust-staging/) * [Starbound](/source_servers/starbound) +[Unreal Engine](/unreal_engine) +* [Tower Unit](/unreal_engine/tower_unit/) + [Squad](/squad/) [Terraria](/terraria/) diff --git a/unreal_engine/tower_unit/README.md b/unreal_engine/tower_unit/README.md new file mode 100644 index 00000000..956a333d --- /dev/null +++ b/unreal_engine/tower_unit/README.md @@ -0,0 +1,11 @@ +# Tower Unit +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 +Tower Unit requires a single port to be oepened + +| Port | default | +|---------|---------| +| Game | 7778 | +| Query | 27016 | \ No newline at end of file diff --git a/unreal_engine/tower_unit/egg-tower-unit.json b/unreal_engine/tower_unit/egg-tower-unit.json new file mode 100644 index 00000000..f0e710a7 --- /dev/null +++ b/unreal_engine/tower_unit/egg-tower-unit.json @@ -0,0 +1,63 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-02-08T01:46:57+01:00", + "name": "Tower Unit", + "author": "teamwuffy@gmail.com", + "description": "Tower Unit\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", + "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}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# Tower Unit 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", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Steam Login Token", + "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, + "rules": "required|string|max:100" + }, + { + "name": "Steam Admin ID", + "description": "Note that your admin id is only a number!", + "env_variable": "STEAM_ADMIN_ID", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|integer|max:76561202255233023" + }, + { + "name": "Server Title", + "description": "", + "env_variable": "SERVER_TITLE", + "default_value": "Tower Unite Server", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:512" + }, + { + "name": "Max Players", + "description": "", + "env_variable": "SERVER_MAX_PLAYER", + "default_value": "40", + "user_viewable": 0, + "user_editable": 0, + "rules": "required|integer|max:512" + } + ] +} \ No newline at end of file From dfb2e17e42cac57ec85cd03f1892c273c027e5ed Mon Sep 17 00:00:00 2001 From: NgLoader Date: Sun, 10 Feb 2019 23:01:59 +0100 Subject: [PATCH 140/393] Fixed installing script --- .../forge/forge-enhanced/egg-forge--enhanced.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json b/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json index fc85e270..5dc61c0a 100644 --- a/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json +++ b/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-02-04T20:22:22+01:00", + "exported_at": "2019-02-10T22:57:27+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.", @@ -17,9 +17,9 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk update\r\napk add curl\r\n\r\nif [ -z \"$MC_VERSION\" ] || [ \"$MC_VERSION\" == \"latest\" ]; then\r\n FORGE_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/ | grep -A1 Latest | grep -o -e '[1]\\.[0-9][0-9]\\?\\.\\?[0-9]\\?[0-9] - [0-9][0-9]\\.[0-9][0-9]\\.[0-9]\\?[0-9]\\.[0-9][0-9][0-9][0-9]' | sed 's\/ \/\/g')\r\nelse if [[ ! $FORGE_VERSION = *\"-\"* ]]; then\r\n FORGE_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index_$MC_VERSION.html | grep -A1 Latest | grep -o -e '[1]\\.[0-9][0-9]\\?\\.\\?[0-9]\\?[0-9] - [0-9][0-9]\\.[0-9][0-9]\\.[0-9]\\?[0-9]\\.[0-9][0-9][0-9][0-9]' | sed 's\/ \/\/g')\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Downloading forge version \\\"$FORGE_VERSION\\\"\\n\"\r\ncurl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\ncurl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -o $SERVER_JARFILE\r\n\r\nif [ ! -f .\/installer.jar ]; then\r\n echo \"!!! Invalide forge version \\\"$FORGE_VERSION\\\" !!!\\n\"\r\nfi\r\n\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer\r\n\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar", - "container": "openjdk:8-alpine", - "entrypoint": "ash" + "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl\r\n\r\n#Fetching version\r\nif [ -z \"$MC_VERSION\" ] || [ \"$MC_VERSION\" == \"latest\" ]; then\r\n echo \"Fetching latest\"\r\n MC_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index.html | grep -A 2 \"Latest\" | awk NF=NF RS= OFS=\" \" | grep -o -e '[1]\\.[0-9][0-9]\\?\\.\\?[0-9]\\?[0-9] - [0-9][0-9]\\.[0-9][0-9]\\.[0-9]\\?[0-9]\\.[0-9][0-9][0-9][0-9]' | sed 's\/ \/\/g')\r\nelif [[ ! \"$MC_VERSION\" =~ - ]]; then\r\n echo \"Fetching latest from version $MC_VERSION\"\r\n MC_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index_$MC_VERSION.html | grep -A 2 \"Latest\" | awk NF=NF RS= OFS=\" \" | grep -o -e '[1]\\.[0-9][0-9]\\?\\.\\?[0-9]\\?[0-9] - [0-9][0-9]\\.[0-9][0-9]\\.[0-9]\\?[0-9]\\.[0-9][0-9][0-9][0-9]' | sed 's\/ \/\/g')\r\nfi\r\n\r\n#Checking if forge version valid\r\nif [[ ! \"$MC_VERSION\" =~ [0-9]?[0-9]?\\.[0-9]?[0-9]?\\.?[0-9]?[0-9]-[0-9]?[0-9]\\.[0-9]?[0-9]\\.[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]?[0-9] ]]; then\r\n echo \"!!! Invalid forge version \\\"$MC_VERSION\\\" !!!\"\r\n exit\r\nfi\r\n\r\n#Go into main direction\r\ncd \/mnt\/server\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 \\\"$MC_VERSION\\\"\"\r\ncurl -o installer.jar -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$MC_VERSION\/forge-$MC_VERSION-installer.jar\r\ncurl -o $SERVER_JARFILE -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$MC_VERSION\/forge-$MC_VERSION-universal.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ] || [ ! -f .\/$SERVER_JARFILE ]; then\r\n echo \"!!! Error by downloading forge version \\\"$MC_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\r\n\r\n#Deleting installer.jar\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar", + "container": "openjdk:8", + "entrypoint": "bash" } }, "variables": [ @@ -39,7 +39,7 @@ "default_value": "latest", "user_viewable": 1, "user_editable": 1, - "rules": "required|string|max:20" + "rules": "required|string|max:22" } ] } \ No newline at end of file From 601527cd15510f3d544ce5b6440eb7d84a68146e Mon Sep 17 00:00:00 2001 From: NgLoader Date: Tue, 12 Feb 2019 20:08:01 +0100 Subject: [PATCH 141/393] Changed regex Thanks to @parkervcp --- minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json b/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json index 5dc61c0a..5391775a 100644 --- a/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json +++ b/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json @@ -17,7 +17,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\r\n\r\n#Fetching version\r\nif [ -z \"$MC_VERSION\" ] || [ \"$MC_VERSION\" == \"latest\" ]; then\r\n echo \"Fetching latest\"\r\n MC_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index.html | grep -A 2 \"Latest\" | awk NF=NF RS= OFS=\" \" | grep -o -e '[1]\\.[0-9][0-9]\\?\\.\\?[0-9]\\?[0-9] - [0-9][0-9]\\.[0-9][0-9]\\.[0-9]\\?[0-9]\\.[0-9][0-9][0-9][0-9]' | sed 's\/ \/\/g')\r\nelif [[ ! \"$MC_VERSION\" =~ - ]]; then\r\n echo \"Fetching latest from version $MC_VERSION\"\r\n MC_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index_$MC_VERSION.html | grep -A 2 \"Latest\" | awk NF=NF RS= OFS=\" \" | grep -o -e '[1]\\.[0-9][0-9]\\?\\.\\?[0-9]\\?[0-9] - [0-9][0-9]\\.[0-9][0-9]\\.[0-9]\\?[0-9]\\.[0-9][0-9][0-9][0-9]' | sed 's\/ \/\/g')\r\nfi\r\n\r\n#Checking if forge version valid\r\nif [[ ! \"$MC_VERSION\" =~ [0-9]?[0-9]?\\.[0-9]?[0-9]?\\.?[0-9]?[0-9]-[0-9]?[0-9]\\.[0-9]?[0-9]\\.[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]?[0-9] ]]; then\r\n echo \"!!! Invalid forge version \\\"$MC_VERSION\\\" !!!\"\r\n exit\r\nfi\r\n\r\n#Go into main direction\r\ncd \/mnt\/server\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 \\\"$MC_VERSION\\\"\"\r\ncurl -o installer.jar -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$MC_VERSION\/forge-$MC_VERSION-installer.jar\r\ncurl -o $SERVER_JARFILE -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$MC_VERSION\/forge-$MC_VERSION-universal.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ] || [ ! -f .\/$SERVER_JARFILE ]; then\r\n echo \"!!! Error by downloading forge version \\\"$MC_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\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\r\n\r\n#Fetching version\r\nif [ -z \"$MC_VERSION\" ] || [ \"$MC_VERSION\" == \"latest\" ]; then\r\n echo \"Fetching latest\"\r\n MC_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index.html | grep -A 2 \"Latest\" | awk NF=NF RS= OFS=\" \" | grep -o -e '[1].[0-9]*.[0-9]* - [0-9]*.[0-9]*.[0-9]*.[0-9]*' | sed 's\/ \/\/g')\r\nelif [[ ! \"$MC_VERSION\" =~ - ]]; then\r\n echo \"Fetching latest from version $MC_VERSION\"\r\n MC_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index_$MC_VERSION.html | grep -A 2 \"Latest\" | awk NF=NF RS= OFS=\" \" | grep -o -e '[1].[0-9]*.[0-9]* - [0-9]*.[0-9]*.[0-9]*.[0-9]*' | sed 's\/ \/\/g')\r\nfi\r\n\r\n#Checking if forge version valid\r\nif [[ ! \"$MC_VERSION\" =~ [1].[0-9]*.[0-9]*-[0-9]*.[0-9]*.[0-9]*.[0-9]* ]]; then\r\n echo \"!!! Invalid forge version \\\"$MC_VERSION\\\" !!!\"\r\n exit\r\nfi\r\n\r\n#Go into main direction\r\ncd \/mnt\/server\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 \\\"$MC_VERSION\\\"\"\r\ncurl -o installer.jar -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$MC_VERSION\/forge-$MC_VERSION-installer.jar\r\ncurl -o $SERVER_JARFILE -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$MC_VERSION\/forge-$MC_VERSION-universal.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ] || [ ! -f .\/$SERVER_JARFILE ]; then\r\n echo \"!!! Error by downloading forge version \\\"$MC_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\r\n\r\n#Deleting installer.jar\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar", "container": "openjdk:8", "entrypoint": "bash" } From 6658affb85298a2bc9df3413452a6ff8de00a2a7 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 17 Feb 2019 12:35:39 -0500 Subject: [PATCH 142/393] update parkertron egg to use the new image --- bots/discord/parkertron/egg-parkertron.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bots/discord/parkertron/egg-parkertron.json b/bots/discord/parkertron/egg-parkertron.json index c8ebd07b..8be2cbec 100644 --- a/bots/discord/parkertron/egg-parkertron.json +++ b/bots/discord/parkertron/egg-parkertron.json @@ -3,11 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-07-24T00:13:01-04:00", + "exported_at": "2019-02-17T12:34:32-05:00", "name": "parkertron", "author": "parker@parkervcp.com", "description": "The stupid chatbot parkertron by Parkervcp.\r\n\r\nhttps:\/\/github.com\/parkervcp\/parkertron", - "image": "quay.io\/parkervcp\/pterodactyl-images:parkertron", + "image": "quay.io\/parkervcp\/pterodactyl-images:bot_parkertron", "startup": ".\/parkertron", "config": { "files": "{}", @@ -17,10 +17,10 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# parkertron 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\ncd\r\n\r\nmkdir -p go\/bin go\/src\r\n\r\napk add --no-cache --update go git curl lua-stdlib lua musl-dev g++ libc-dev tesseract-ocr tesseract-ocr-dev\r\n\r\necho \"installing dep for golang dependancies\"\r\n\r\ncurl https:\/\/raw.githubusercontent.com\/golang\/dep\/master\/install.sh | sh\r\n\r\ncd go\/src\/\r\n\r\necho \"pulling the parkertron pterodactyl branch\"\r\n\r\ngit clone https:\/\/github.com\/parkervcp\/parkertron.git\r\n\r\ncd parkertron\/\r\n\r\ndep ensure\r\n\r\necho \"building parkertron\"\r\n\r\ngo build \r\n\r\necho \"build complete copying parkertron and example configs over\"\r\n\r\ncp parkertron \/mnt\/server\/\r\n\r\nif [ -d \"$DIRECTORY\" ]; then\r\n echo \"Files exist already\"\r\nelse\r\n cp -r configs\/ \/mnt\/server\/\r\nfi\r\n\r\necho \"Install complete. If you watched this. Congrats.\"", - "container": "alpine:3.9", + "script": "#!\/bin\/ash\r\n# parkertron 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\ncd\r\n\r\napk add --no-cache --update git curl lua-stdlib lua musl-dev g++ libc-dev tesseract-ocr tesseract-ocr-dev\r\n\r\necho \"pulling the parkertron pterodactyl branch\"\r\n\r\ngit clone https:\/\/github.com\/parkervcp\/parkertron.git\r\n\r\ncd parkertron\/\r\n\r\necho \"building parkertron\"\r\n\r\ngo build \r\n\r\necho \"build complete copying parkertron and example configs over\"\r\n\r\ncp parkertron \/mnt\/server\/\r\n\r\nif [ -d \"$DIRECTORY\" ]; then\r\n echo \"Files exist already\"\r\nelse\r\n cp configs\/ \/mnt\/server\/\r\nfi\r\n\r\necho \"Install complete. If you watched this. Congrats.\"", + "container": "golang:1.11-alpine", "entrypoint": "ash" } }, "variables": [] -} +} \ No newline at end of file From fe184c90300a0adef0fab32798a78fbffc23bcda Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 20 Feb 2019 15:39:31 -0500 Subject: [PATCH 143/393] Separate Paper from Spigot Moved paper to it's own folder. Removed legacy and paper standalone eggs. Merged eggs into a single egg. --- minecraft_java/paper/egg-paper.json | 54 +++++++++++++++++++ minecraft_java/spigot/paper-legacy/README.md | 3 -- .../spigot/paper-legacy/paper-legacy.json | 45 ---------------- .../spigot/paper-spigot/egg-paper-spigot.json | 45 ---------------- 4 files changed, 54 insertions(+), 93 deletions(-) create mode 100644 minecraft_java/paper/egg-paper.json delete mode 100644 minecraft_java/spigot/paper-legacy/README.md delete mode 100644 minecraft_java/spigot/paper-legacy/paper-legacy.json delete mode 100644 minecraft_java/spigot/paper-spigot/egg-paper-spigot.json diff --git a/minecraft_java/paper/egg-paper.json b/minecraft_java/paper/egg-paper.json new file mode 100644 index 00000000..1e102fff --- /dev/null +++ b/minecraft_java/paper/egg-paper.json @@ -0,0 +1,54 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-02-20T15:35:38-05: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", + "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": "{}", + "stop": "stop" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/ash\r\n# Paper Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache --update curl jq\r\n\r\ncd \/mnt\/server\r\n\r\nif [ -z $MINECRAFT_VERSION ] || [ $MINECRAFT_VERSION == \"latest\" ]; then\r\n $MC_VERSION=$(curl https:\/\/launchermeta.mojang.com\/mc\/game\/version_manifest.json | jq -r '.latest.release' | grep -o [0-9]*.[0-9]* | head -1)\r\n if [ -z \"${DL_VERSION}\" ] || [ \"${DL_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=\"lastSuccessfulBuild\"\r\n curl -o ${SERVER_JARFILE} https:\/\/papermc.io\/ci\/job\/Paper-1.13\/${DL_VERSION}\/artifact\/paperclip.jar\r\n fi\r\nelif [ $LEGACY_VERSION == \"legacy\" ]; then\r\n if [ -z \"${DL_VERSION}\" ] || [ \"${DL_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=\"lastSuccessfulBuild\"\r\n fi\r\n\r\n if [ \"${DL_VERSION}\" == \"443\" ]; then\r\n DL_NAME=\"Paperclip\"\r\n else\r\n DL_NAME=\"paperclip\"\r\n fi\r\n\r\n curl -o ${SERVER_JARFILE} https:\/\/papermc.io\/ci\/job\/Paper\/${DL_VERSION}\/artifact\/${DL_NAME}.jar\r\nfi", + "container": "alpine:3.8", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Minecraft Version", + "description": "The version of minecraft to download. \r\nFrom 1.13 and forward paper is making individual folders for major MC versions\r\n\r\n1.13 and then legacy are the only things supported. leave blank for latest.", + "env_variable": "MINECRAFT_VERSION", + "default_value": "latest", + "user_viewable": 0, + "user_editable": 0, + "rules": "nullable|string|max:20" + }, + { + "name": "Build Number", + "description": "The Paper build number. Ex 513\r\n\r\nDefault is \"latest\" which will grab the \"last sucessful build\" from the site. Leave blank for \"latest\"", + "env_variable": "BUILD_VERSION", + "default_value": "latest", + "user_viewable": 1, + "user_editable": 1, + "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": 1, + "user_editable": 1, + "rules": "required|string|max:20" + } + ] +} \ No newline at end of file diff --git a/minecraft_java/spigot/paper-legacy/README.md b/minecraft_java/spigot/paper-legacy/README.md deleted file mode 100644 index efd0b68f..00000000 --- a/minecraft_java/spigot/paper-legacy/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Legacy PaperSpigot - -This egg will support the 1.8.8 -> 1.12.2 builds of PaperSpigot. \ No newline at end of file diff --git a/minecraft_java/spigot/paper-legacy/paper-legacy.json b/minecraft_java/spigot/paper-legacy/paper-legacy.json deleted file mode 100644 index 9c439efa..00000000 --- a/minecraft_java/spigot/paper-legacy/paper-legacy.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": "2018-03-10T00:30:35-06:00", - "name": "Paper Spigot (Legacy)", - "author": "arraying1337@gmail.com", - "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", - "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\/ash\r\n# Paper Spigot 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\nif [ -z \"${DL_VERSION}\" ] || [ \"${DL_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=\"lastSuccessfulBuild\"\r\nfi\r\n\r\nif [ \"${DL_VERSION}\" == \"443\" ]; then\r\n DL_NAME=\"Paperclip\"\r\nelse\r\n DL_NAME=\"paperclip\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/papermc.io\/ci\/job\/Paper\/${DL_VERSION}\/artifact\/${DL_NAME}.jar", - "container": "alpine:3.9", - "entrypoint": "ash" - } - }, - "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": 1, - "user_editable": 1, - "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" - }, - { - "name": "PaperSpigot Version", - "description": "The version of PaperSpigot to download, Use \"latest\" for latest.", - "env_variable": "DL_VERSION", - "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|between:3,7" - } - ] -} diff --git a/minecraft_java/spigot/paper-spigot/egg-paper-spigot.json b/minecraft_java/spigot/paper-spigot/egg-paper-spigot.json deleted file mode 100644 index ad778924..00000000 --- a/minecraft_java/spigot/paper-spigot/egg-paper-spigot.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": "2018-10-31T14:43:53-04:00", - "name": "Paper Spigot", - "author": "hostmaster@waterfallgaming.net", - "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", - "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\/ash\r\n# Paper Spigot 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\nif [ -z \"${DL_VERSION}\" ] || [ \"${DL_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=\"lastSuccessfulBuild\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/papermc.io\/ci\/job\/Paper-1.13\/${DL_VERSION}\/artifact\/paperclip.jar", - "container": "alpine:3.9", - "entrypoint": "ash" - } - }, - "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": 1, - "user_editable": 1, - "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" - }, - { - "name": "PaperSpigot Version", - "description": "The version of PaperSpigot to download, Use \"latest\" for latest.", - "env_variable": "DL_VERSION", - "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|between:3,7" - } - ] -} From 2ee5856eee28c455a0e625b4b40f1641c98b81bf Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 20 Feb 2019 16:47:11 -0500 Subject: [PATCH 144/393] update fivem start config --- gta/fivem/egg-five-m.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gta/fivem/egg-five-m.json b/gta/fivem/egg-five-m.json index 828ff999..af2cc673 100644 --- a/gta/fivem/egg-five-m.json +++ b/gta/fivem/egg-five-m.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-01-24T15:43:59-05:00", + "exported_at": "2019-02-20T16:46:04-05:00", "name": "FiveM", "author": "parker@parkervcp.com", "description": "A new FiveM egg for the latest builds due to recent changes in FiveM", @@ -11,7 +11,7 @@ "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", "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\": \"Server license key authentication succeeded. Welcome!\"\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" }, @@ -51,4 +51,4 @@ "rules": "required|string" } ] -} +} \ No newline at end of file From 18c9f5a9608822fe22b8ec20e859a3ef43100ea6 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Thu, 21 Feb 2019 09:40:28 -0500 Subject: [PATCH 145/393] Adding short guide on importing eggs Resolves #162 --- README.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c76b25f2..2b75a4b4 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,20 @@ With that I am also accepting PR's for new service and also updates to the curre If you are submitting PR's try and keep names and titles the same. +## How to import an egg -# You must restart your daemon after importing an egg. +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. 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 jaon file you save earlier +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. +6. Restart the daemon on your node before creating a server using the new egg(s). + +# You must restart your daemon after importing an egg ## Please read the CONTRIBUTING.md before submitting PRs From e4a956a3e7153f99991c54440febc29e2c9c2cff Mon Sep 17 00:00:00 2001 From: Arnaud Lier Date: Thu, 21 Feb 2019 15:48:48 +0100 Subject: [PATCH 146/393] Typo fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2b75a4b4..5ed24c56 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ If you are reading this it looks like you are looking to add an egg to your serv 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 -4. Browse to the jaon file you save earlier +4. Browse to the json file you saved earlier 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. 6. Restart the daemon on your node before creating a server using the new egg(s). From dc3e61cad21aaba68631c9b2a9314ec65a8a838b Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 26 Feb 2019 21:02:57 -0500 Subject: [PATCH 147/393] Fix Factorio version number matching grep is a fickle beast. Fixed the world creation for now the example json world setup stuff is broken. --- factorio/factorio/egg-factorio.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/factorio/factorio/egg-factorio.json b/factorio/factorio/egg-factorio.json index afad8fb2..c637bdf4 100644 --- a/factorio/factorio/egg-factorio.json +++ b/factorio/factorio/egg-factorio.json @@ -3,21 +3,21 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-07-29T02:28:44-04:00", + "exported_at": "2019-02-26T21:01:31-05:00", "name": "Factorio", "author": "parker@parkervcp.com", "description": "The vanilla Factorio server.\r\n\r\nhttps:\/\/www.factorio.com\/", - "image": "quay.io\/pterodactyl\/core:glibc", + "image": "quay.io\/parkervcp\/pterodactyl-images:glibc", "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 \"game_password\": \"{{server.build.env.SERVER_PASS}}\",\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 IP ADDR\",\r\n \"userInteraction\": []\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}", "stop": "\/quit" }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Factorio Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache curl tar xz jq\r\n\r\nlatest_stable=`curl -sL https:\/\/updater.factorio.com\/get-available-versions | jq -r '.[\"core-linux_headless64\"] | .[] | .[\"stable\"] | select(. != null)'`\r\nlatest_experimental=`curl -sL https:\/\/www.factorio.com\/download-headless\/experimental | grep -m 1 -o -E '([0-9]\\.[0-9][0-9]\\.[0-9][0-9] | [0-9]\\.[0-9][0-9]\\.[0-9])'`\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\necho -e \"\\n running 'curl -sL https:\/\/www.factorio.com\/get-download\/${DL_VERSION}\/headless\/linux64 -o factorio-${DL_VERSION}.tar.gz' \\n\"\r\n\r\ncd \/mnt\/server\r\n\r\ncurl -sL https:\/\/www.factorio.com\/get-download\/${DL_VERSION}\/headless\/linux64 -o factorio-${DL_VERSION}.tar.gz\r\n\r\ntar -xf factorio-${DL_VERSION}.tar.gz --strip-components=1 -C \/mnt\/server\r\n\r\nrm factorio-${DL_VERSION}.tar.gz\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} --map-settings data\/map-settings.json --map-gen-settings data\/map-gen-settings.json\r\n chmod o+w ${SAVE_NAME}.zip\r\nfi", + "script": "#!\/bin\/ash\r\n# Factorio Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache curl tar xz jq\r\n\r\nlatest_stable=`curl -sL https:\/\/updater.factorio.com\/get-available-versions | jq -r '.[\"core-linux_headless64\"] | .[] | .[\"stable\"] | select(. != null)'`\r\nlatest_experimental=`curl -sL https:\/\/www.factorio.com\/download-headless\/experimental | grep -m 1 -o -E '([0-9]\\.[0-9]*\\.[0-9]*)'`\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\necho -e \"\\n running 'curl -sL https:\/\/www.factorio.com\/get-download\/${DL_VERSION}\/headless\/linux64 -o factorio-${DL_VERSION}.tar.gz' \\n\"\r\n\r\ncd \/mnt\/server\r\n\r\ncurl -sL https:\/\/www.factorio.com\/get-download\/${DL_VERSION}\/headless\/linux64 -o factorio-${DL_VERSION}.tar.gz\r\n\r\ntar -xf factorio-${DL_VERSION}.tar.gz --strip-components=1 -C \/mnt\/server\r\n\r\nrm factorio-${DL_VERSION}.tar.gz\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", "container": "frolvlad\/alpine-glibc", "entrypoint": "ash" } @@ -120,7 +120,7 @@ "default_value": "", "user_viewable": 1, "user_editable": 1, - "rules": "required|string|max:30" + "rules": "nullable|string|max:30" } ] -} +} \ No newline at end of file From bf71b96e0129a5217bc631df1c1321802a2dd2a6 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 27 Feb 2019 13:05:05 -0500 Subject: [PATCH 148/393] Adding MC server.properties This is to fix the issue of needing to restart MC a few times to get the port to take effect. --- minecraft_java/server.properties | 38 ++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 minecraft_java/server.properties diff --git a/minecraft_java/server.properties b/minecraft_java/server.properties new file mode 100644 index 00000000..7c30d610 --- /dev/null +++ b/minecraft_java/server.properties @@ -0,0 +1,38 @@ +#Minecraft server properties +#(File Modification Datestamp) +generator-settings= +op-permission-level=4 +allow-nether=true +enforce-whitelist=false +level-name=world +enable-query=false +allow-flight=false +prevent-proxy-connections=false +server-port=25565 +max-world-size=29999984 +level-type=DEFAULT +enable-rcon=false +level-seed= +force-gamemode=false +server-ip= +network-compression-threshold=256 +max-build-height=256 +spawn-npcs=true +white-list=false +spawn-animals=true +hardcore=false +snooper-enabled=true +resource-pack-sha1= +online-mode=true +resource-pack= +pvp=true +difficulty=1 +enable-command-block=false +gamemode=0 +player-idle-timeout=0 +max-players=20 +max-tick-time=60000 +spawn-monsters=true +view-distance=10 +generate-structures=true +motd=A Minecraft Server From 4c7e111842a8f2e9097b07613684d483fef962ea Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 27 Feb 2019 15:22:25 -0500 Subject: [PATCH 149/393] Update paper egg to use parchment API --- minecraft_java/paper/egg-paper.json | 37 ++++++++++++++++++----------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/minecraft_java/paper/egg-paper.json b/minecraft_java/paper/egg-paper.json index 1e102fff..e93d55e4 100644 --- a/minecraft_java/paper/egg-paper.json +++ b/minecraft_java/paper/egg-paper.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-02-20T15:35:38-05:00", + "exported_at": "2019-02-27T15:21:19-05:00", "name": "Paper", "author": "parker@pterodactyl.io", "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", @@ -17,28 +17,19 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Paper Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache --update curl jq\r\n\r\ncd \/mnt\/server\r\n\r\nif [ -z $MINECRAFT_VERSION ] || [ $MINECRAFT_VERSION == \"latest\" ]; then\r\n $MC_VERSION=$(curl https:\/\/launchermeta.mojang.com\/mc\/game\/version_manifest.json | jq -r '.latest.release' | grep -o [0-9]*.[0-9]* | head -1)\r\n if [ -z \"${DL_VERSION}\" ] || [ \"${DL_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=\"lastSuccessfulBuild\"\r\n curl -o ${SERVER_JARFILE} https:\/\/papermc.io\/ci\/job\/Paper-1.13\/${DL_VERSION}\/artifact\/paperclip.jar\r\n fi\r\nelif [ $LEGACY_VERSION == \"legacy\" ]; then\r\n if [ -z \"${DL_VERSION}\" ] || [ \"${DL_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=\"lastSuccessfulBuild\"\r\n fi\r\n\r\n if [ \"${DL_VERSION}\" == \"443\" ]; then\r\n DL_NAME=\"Paperclip\"\r\n else\r\n DL_NAME=\"paperclip\"\r\n fi\r\n\r\n curl -o ${SERVER_JARFILE} https:\/\/papermc.io\/ci\/job\/Paper\/${DL_VERSION}\/artifact\/${DL_NAME}.jar\r\nfi", - "container": "alpine:3.8", + "script": "#!\/bin\/ash\r\n# Paper Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache --update 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\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\necho -e \"Downloading MC server.properties\"\r\ncurl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_java\/server.properties", + "container": "alpine:3.9", "entrypoint": "ash" } }, "variables": [ { "name": "Minecraft Version", - "description": "The version of minecraft to download. \r\nFrom 1.13 and forward paper is making individual folders for major MC versions\r\n\r\n1.13 and then legacy are the only things supported. leave blank for latest.", + "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": 0, - "user_editable": 0, - "rules": "nullable|string|max:20" - }, - { - "name": "Build Number", - "description": "The Paper build number. Ex 513\r\n\r\nDefault is \"latest\" which will grab the \"last sucessful build\" from the site. Leave blank for \"latest\"", - "env_variable": "BUILD_VERSION", - "default_value": "latest", "user_viewable": 1, - "user_editable": 1, + "user_editable": 0, "rules": "nullable|string|max:20" }, { @@ -49,6 +40,24 @@ "user_viewable": 1, "user_editable": 1, "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": 0, + "user_editable": 0, + "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": 1, + "user_editable": 0, + "rules": "required|string|max:20" } ] } \ No newline at end of file From d9a8e438bbeb4e6e76e44368b8786dcce525ec27 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 27 Feb 2019 15:25:46 -0500 Subject: [PATCH 150/393] Correct name for paper project Change Paper Spigot to Paper --- minecraft_java/paper/egg-paper.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_java/paper/egg-paper.json b/minecraft_java/paper/egg-paper.json index e93d55e4..e2791d3c 100644 --- a/minecraft_java/paper/egg-paper.json +++ b/minecraft_java/paper/egg-paper.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-02-27T15:21:19-05:00", + "exported_at": "2019-02-27T15:24:23-05:00", "name": "Paper", "author": "parker@pterodactyl.io", "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Paper Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache --update 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\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\necho -e \"Downloading MC server.properties\"\r\ncurl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_java\/server.properties", + "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache --update 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\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\necho -e \"Downloading MC server.properties\"\r\ncurl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_java\/server.properties", "container": "alpine:3.9", "entrypoint": "ash" } From 32c8f70b78dba765a09996ed14183b10c00a1450 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 27 Feb 2019 22:24:23 -0500 Subject: [PATCH 151/393] Clear out unused server props Only use the server properties the panel cares about. --- minecraft_java/server.properties | 35 -------------------------------- 1 file changed, 35 deletions(-) diff --git a/minecraft_java/server.properties b/minecraft_java/server.properties index 7c30d610..00313aec 100644 --- a/minecraft_java/server.properties +++ b/minecraft_java/server.properties @@ -1,38 +1,3 @@ #Minecraft server properties -#(File Modification Datestamp) -generator-settings= -op-permission-level=4 -allow-nether=true -enforce-whitelist=false -level-name=world -enable-query=false -allow-flight=false -prevent-proxy-connections=false server-port=25565 -max-world-size=29999984 -level-type=DEFAULT -enable-rcon=false -level-seed= -force-gamemode=false server-ip= -network-compression-threshold=256 -max-build-height=256 -spawn-npcs=true -white-list=false -spawn-animals=true -hardcore=false -snooper-enabled=true -resource-pack-sha1= -online-mode=true -resource-pack= -pvp=true -difficulty=1 -enable-command-block=false -gamemode=0 -player-idle-timeout=0 -max-players=20 -max-tick-time=60000 -spawn-monsters=true -view-distance=10 -generate-structures=true -motd=A Minecraft Server From 999a49f2aa4ec9d13b2a1049a292f8adb35ec023 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Thu, 28 Feb 2019 12:39:39 -0500 Subject: [PATCH 152/393] Correct SinusBot image Change the image to use the new container for sinusbot. --- bots/discord/sinusbot/egg-sinusbot.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bots/discord/sinusbot/egg-sinusbot.json b/bots/discord/sinusbot/egg-sinusbot.json index 4e122bad..c1805f68 100644 --- a/bots/discord/sinusbot/egg-sinusbot.json +++ b/bots/discord/sinusbot/egg-sinusbot.json @@ -3,11 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-10-28T12:24:35-04:00", + "exported_at": "2019-02-28T12:38:22-05:00", "name": "Sinusbot", "author": "support@pterodactyl.io", "description": "Musicbot for Discord and Teamspeak.", - "image": "quay.io\/parkervcp\/pterodactyl-images:sinusbot", + "image": "quay.io\/parkervcp\/pterodactyl-images:bot_sinusbot", "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}", From 00e96061ce406dc29ad97e5867a0665f1866073b Mon Sep 17 00:00:00 2001 From: itismejoey Date: Sat, 2 Mar 2019 19:25:56 -0500 Subject: [PATCH 153/393] Change Max Players FiveM can accept up to 32 players (64 if you're using OneSync) --- gta/fivem/egg-five-m.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gta/fivem/egg-five-m.json b/gta/fivem/egg-five-m.json index af2cc673..1ecddd69 100644 --- a/gta/fivem/egg-five-m.json +++ b/gta/fivem/egg-five-m.json @@ -36,10 +36,10 @@ "name": "Max Players", "description": "Set the fivem max play count", "env_variable": "MAX_PLAYERS", - "default_value": "30", + "default_value": "32", "user_viewable": 1, "user_editable": 0, - "rules": "required|integer|between:1,31" + "rules": "required|integer|between:1,32" }, { "name": "Server Hostname", From bf9d1355ea5c530249a4d11bacc4efa3dd6bf507 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sat, 2 Mar 2019 20:32:59 -0500 Subject: [PATCH 154/393] Update paper config management. removes query settings from the configs. --- minecraft_java/paper/egg-paper.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_java/paper/egg-paper.json b/minecraft_java/paper/egg-paper.json index e2791d3c..4e99297c 100644 --- a/minecraft_java/paper/egg-paper.json +++ b/minecraft_java/paper/egg-paper.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-02-27T15:24:23-05:00", + "exported_at": "2019-03-02T20:29:50-05: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", "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}", + "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" From f31327fd303e17a137a09f45a3f52e82a070f32c Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sat, 2 Mar 2019 21:17:29 -0500 Subject: [PATCH 155/393] add default config.yml for waterfall --- minecraft_proxy/waterfall/config.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 minecraft_proxy/waterfall/config.yml diff --git a/minecraft_proxy/waterfall/config.yml b/minecraft_proxy/waterfall/config.yml new file mode 100644 index 00000000..60295c99 --- /dev/null +++ b/minecraft_proxy/waterfall/config.yml @@ -0,0 +1,3 @@ +listeners: +- query_port: 25573 + host: 0.0.0.0:25573 \ No newline at end of file From 97d6eece6a8cd62862c3d46a84c7673ae88b4259 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sat, 2 Mar 2019 21:20:45 -0500 Subject: [PATCH 156/393] Update waterfall to use the parchment api Updates waterfall per #165 --- minecraft_proxy/waterfall/egg-waterfall.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/minecraft_proxy/waterfall/egg-waterfall.json b/minecraft_proxy/waterfall/egg-waterfall.json index cf4800f5..68aa6ac4 100644 --- a/minecraft_proxy/waterfall/egg-waterfall.json +++ b/minecraft_proxy/waterfall/egg-waterfall.json @@ -3,21 +3,21 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-09-26T12:40:31-04:00", + "exported_at": "2019-03-02T21:19:50-05:00", "name": "Waterfall", "author": "hostmaster@waterfallgaming.net", "description": "Waterfall is a fork of the well-known BungeeCord server teleportation suite.", "image": "quay.io\/pterodactyl\/core:java", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -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 \"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:25577\"\r\n ]\r\n}", + "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}", "logs": "{\r\n \"custom\": false,\r\n \"location\": \"proxy.log.0\"\r\n}", "stop": "end" }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Waterfall 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\nif [ -z \"${WATERFALL_VERSION}\" ] || [ \"${WATERFALL_VERSION}\" == \"latest\" ]; then\r\n WATERFALL_VERSION=\"lastStableBuild\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/papermc.io\/ci\/job\/Waterfall\/${WATERFALL_VERSION}\/artifact\/Waterfall-Proxy\/bootstrap\/target\/Waterfall.jar", + "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache --update 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\/waterfall | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | IN($VERSION)' | grep true`\r\n LATEST_WATERFALL_VERSION=`curl -s https:\/\/papermc.io\/api\/v1\/waterfall | 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 waterfall version\"\r\n MINECRAFT_VERSION=${LATEST_WATERFALL_VERSION}\r\n fi\r\n \r\n BUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v1\/waterfall\/${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\/waterfall\/${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\/waterfall\/${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\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\ncurl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_proxy\/waterfall\/config.yml", "container": "alpine:3.9", "entrypoint": "ash" } @@ -42,4 +42,4 @@ "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" } ] -} +} \ No newline at end of file From dd4af121cfa131953f59620d907298007a3bbb8b Mon Sep 17 00:00:00 2001 From: Baconator Date: Fri, 8 Mar 2019 22:47:36 +0100 Subject: [PATCH 157/393] Add files via upload --- source_servers/svencoop/egg-sven-co-op.json | 72 +++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 source_servers/svencoop/egg-sven-co-op.json diff --git a/source_servers/svencoop/egg-sven-co-op.json b/source_servers/svencoop/egg-sven-co-op.json new file mode 100644 index 00000000..7bc00475 --- /dev/null +++ b/source_servers/svencoop/egg-sven-co-op.json @@ -0,0 +1,72 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-03-08T22:46:21+01: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", + "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}", + "stop": "quit" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# Sven co-op 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 276060 validate +quit\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": "Default Map", + "description": "The default map for the server.", + "env_variable": "SC_MAP", + "default_value": "svencoop1", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string" + }, + { + "name": "Max Players", + "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, + "rules": "required|numeric|between:2,32" + }, + { + "name": "Server Name", + "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, + "rules": "required|string|max:40" + }, + { + "name": "Password", + "description": "Password required to join the server. Leave blank to disable.", + "env_variable": "SC_PASSWORD", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "nullable|string|max:20" + }, + { + "name": "Region", + "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, + "rules": "required|numeric|between:-1,255" + } + ] +} \ No newline at end of file From a5d94c394113ce3e8f590bc5f135041df1fc6680 Mon Sep 17 00:00:00 2001 From: Baconator Date: Fri, 8 Mar 2019 22:51:13 +0100 Subject: [PATCH 158/393] Create README.md --- source_servers/svencoop/README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 source_servers/svencoop/README.md diff --git a/source_servers/svencoop/README.md b/source_servers/svencoop/README.md new file mode 100644 index 00000000..ce233c73 --- /dev/null +++ b/source_servers/svencoop/README.md @@ -0,0 +1,11 @@ +# 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 +Sven co-op requires a single port to be opened + +game ports (default 27015 ) + +| Port | default | +|---------|---------| +| Game | 27015 | From b683da99d0ae01aa44c661c48667b1c7d089dff0 Mon Sep 17 00:00:00 2001 From: Baconator Date: Fri, 8 Mar 2019 22:54:58 +0100 Subject: [PATCH 159/393] Add Sven Co-op to the main README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5ed24c56..72973bee 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,7 @@ If you submit a PR without filling out the template I will deny it. This is for * [PixARK](/source_servers/pixark/) * [Rust Staging Branch](/source_servers/rust-staging/) * [Starbound](/source_servers/starbound) +* [Sven Co-op](/source_servers/svencoop) [Squad](/squad/) From 033d6d40b19a538236f983b94081a591b2899c9a Mon Sep 17 00:00:00 2001 From: Shirobaka Date: Sun, 10 Mar 2019 15:24:35 +0100 Subject: [PATCH 160/393] Update egg-multi-theft-auto.json --- gta/mtasa/egg-multi-theft-auto.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gta/mtasa/egg-multi-theft-auto.json b/gta/mtasa/egg-multi-theft-auto.json index 117ac602..b2f19d8f 100644 --- a/gta/mtasa/egg-multi-theft-auto.json +++ b/gta/mtasa/egg-multi-theft-auto.json @@ -3,11 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-02-01T13:25:30+01:00", + "exported_at": "2019-03-10T15:23:54+01: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\/bl4ckspr4y\/pterodactyl-images:mtasa", + "image": "quay.io\/shirobaka\/mtasa", "startup": ".\/mta-server64 --port {{SERVER_PORT}} --httpport {{SERVER_WEBPORT}} -n", "config": { "files": "{}", @@ -25,7 +25,7 @@ "variables": [ { "name": "SERVER_WEBPORT", - "description": "The http port for web resource", + "description": "The http port for web resource.\r\nThis Port needs to be the {{SERVER_PORT}}+3.", "env_variable": "SERVER_WEBPORT", "default_value": "22005", "user_viewable": 1, From 2385141bdee21b066c5e1210e4bc86866bc02d0d Mon Sep 17 00:00:00 2001 From: Shirobaka Date: Sun, 10 Mar 2019 15:39:40 +0100 Subject: [PATCH 161/393] Update egg-multi-theft-auto.json --- gta/mtasa/egg-multi-theft-auto.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gta/mtasa/egg-multi-theft-auto.json b/gta/mtasa/egg-multi-theft-auto.json index b2f19d8f..1500c5d6 100644 --- a/gta/mtasa/egg-multi-theft-auto.json +++ b/gta/mtasa/egg-multi-theft-auto.json @@ -3,11 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-03-10T15:23:54+01:00", + "exported_at": "2019-03-10T15:39:00+01: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\/shirobaka\/mtasa", + "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", "startup": ".\/mta-server64 --port {{SERVER_PORT}} --httpport {{SERVER_WEBPORT}} -n", "config": { "files": "{}", From e76265c2627cd4bc9d674adcf48ac4741276b4cc Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 10 Mar 2019 10:43:25 -0400 Subject: [PATCH 162/393] add MTA to README --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 5ed24c56..0841502c 100644 --- a/README.md +++ b/README.md @@ -43,11 +43,14 @@ If you submit a PR without filling out the template I will deny it. This is for [Don't Starve](/dont_starve/dont_starve) +[ET: Legacy](/etlegacy/etlegacy/) + [Factorio](/factorio/factorio/) [Grand Theft Auto](/gta/) * [FiveM](/gta/fivem/) * [RageMP](/gta/ragemp/) +* [Multi Theft Auto](/gta/mtasa/) [Minecraft Java](/minecraft_java/) * [Forge](/minecraft_java/forge/) @@ -66,6 +69,7 @@ If you submit a PR without filling out the template I will deny it. This is for [Mount & Blade Warband](/mb_warband/) + [OpenTTD](/openttd/) [Source](/source_servers/) These eggs use steamcmd to install From 1abcbd1f82c5bf0b5565f05dadf036673475dc5e Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Mon, 11 Mar 2019 06:47:12 -0400 Subject: [PATCH 163/393] Add ET Legacy --- README.md | 1 - etlegacy/etlegacy/README.md | 20 +++++++++++++++ etlegacy/etlegacy/egg-e-t-legacy.json | 36 +++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 etlegacy/etlegacy/README.md create mode 100644 etlegacy/etlegacy/egg-e-t-legacy.json diff --git a/README.md b/README.md index 0841502c..ee415429 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,6 @@ If you submit a PR without filling out the template I will deny it. This is for [Mount & Blade Warband](/mb_warband/) - [OpenTTD](/openttd/) [Source](/source_servers/) These eggs use steamcmd to install diff --git a/etlegacy/etlegacy/README.md b/etlegacy/etlegacy/README.md new file mode 100644 index 00000000..38a65ea8 --- /dev/null +++ b/etlegacy/etlegacy/README.md @@ -0,0 +1,20 @@ +# ET: Legacy + +#### The ET: Legacy Server + + +#### 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 own. + +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://factorio.com/starter-page](https://www.etlegacy.com/)). + +### Server Ports +ET: Legacy requires a single port + +| Port | default | +|---------|---------| +| Game | 27960 | \ No newline at end of file diff --git a/etlegacy/etlegacy/egg-e-t-legacy.json b/etlegacy/etlegacy/egg-e-t-legacy.json new file mode 100644 index 00000000..2c3fec2d --- /dev/null +++ b/etlegacy/etlegacy/egg-e-t-legacy.json @@ -0,0 +1,36 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-03-11T06:46:01-04:00", + "name": "ET Legacy", + "author": "parker@parkervcp.com", + "description": "Welcome to Enemy Territory: Legacy, an open source project that aims to create a fully compatible client and server for the popular online FPS game Wolfenstein: Enemy Territory - whose gameplay is still considered unmatched by many, despite its great age.", + "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", + "startup": ".\/etlded +set net_port {{SERVER_PORT}}", + "config": { + "files": "{\r\n \"etmain\/etl_server.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"\/\/set net_ip \\\"\\\"\": \"set net_ip \\\"0.0.0.0\\\"\",\r\n \"\/\/set net_port \\\"27960\\\"\": \"set net_port \\\"{{server.build.env.SERVER_PORT}}\\\"\"\r\n }\r\n }\r\n}", + "startup": "{}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n\r\napt-get update\r\napt-get -y install wget curl zip unzip\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading $ET_VERSION bit ET Legacy version\"\r\n\r\nif [ $ET_VERSION == \"32\" ];then \r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 32-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` -O etlegacy.tar.gz\r\nelse\r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 64-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` O etlegacy.tar.gz\r\nfi\r\n\r\necho \"Downloading latest enemy territory files\"\r\n\r\nwget `curl https:\/\/www.splashdamage.com\/games\/wolfenstein-enemy-territory\/ | grep .x86_full | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo --color=never '(http|https):\/\/[^\"]+'` -O enemy_terrain.zip\r\n\r\necho \"Unpacking enemy terrain files\"\r\nunzip enemy_terrain.zip\r\n\r\n.\/*.x86_keygen_V03.run --noexec --keep\r\n\r\necho \"Unpacking \"\r\ntar --strip-components=1 -xzvf etlegacy.tar.gz\r\n\r\ncp \/mnt\/server\/et-linux_work\/etmain\/pak* \/mnt\/server\/etmain\/", + "container": "ubuntu:18.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "ET Legacy Version", + "description": "What version of the server to install. 32 or 64 bit version.", + "env_variable": "ET_VERSION", + "default_value": "32", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|integer|in:32, 64" + } + ] +} \ No newline at end of file From 93733e84235e9af8207f12669a7b301a0a935eda Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 13 Mar 2019 18:41:54 -0400 Subject: [PATCH 164/393] Use new image for server Until the daemon is running in a container for everyone this is a stop gap measure. --- arma/arma3/egg-arma3.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arma/arma3/egg-arma3.json b/arma/arma3/egg-arma3.json index ff845ce6..0eec1209 100644 --- a/arma/arma3/egg-arma3.json +++ b/arma/arma3/egg-arma3.json @@ -3,11 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-10-16T13:07:23-04:00", + "exported_at": "2019-03-13T18:40:40-04:00", "name": "Arma 3", "author": "daave@aaathats3as.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.", - "image": "quay.io\/parkervcp\/pterodactyl-images:source", + "image": "quay.io\/parkervcp\/pterodactyl-images:game_arma3", "startup": ".\/arma3server -ip=0.0.0.0 -port={{SERVER_PORT}} -cfg={{CFG}} -config={{CONFIG}} {{CUSTOM}} -mod=\"{{MODS}}\" -serverMod=\"{{SERVERMODS}}\"", "config": { "files": "{}", From dc3d03316de134ffaa7baf7f4d1fa5f0a7128239 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Thu, 14 Mar 2019 22:12:25 -0400 Subject: [PATCH 165/393] minecraft bedrock url redirect changed Fixing the bedrock download link --- minecraft_bedrock/bedrock/egg-vanilla-bedrock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json b/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json index 9033faa9..40274efd 100644 --- a/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json +++ b/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-10-27T23:29:53-04:00", + "exported_at": "2019-03-14T22:10:44-04: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\".", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n\r\napk add --no-cache zip unzip wget curl\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Downloading files from https:\/\/minecraft.azureedge.net\/bin-linux\/bedrock-server-$BEDROCK_VERSION.zip\"\r\n\r\nif [ -z \"${BEDROCK_VERSION}\" ] || [ \"${BEDROCK_VERSION}\" == \"latest\" ]; then\r\n echo -e \"\\n Downloading latest Bedrock server\"\r\n DOWNLOAD_URL=$(curl https:\/\/minecraft.net\/en-us\/download\/server\/bedrock\/ | grep azureedge | grep linux | grep -Eo \"(http|https):\/\/[a-zA-Z0-9.\/?=_-]*\")\r\n BEDROCK_ZIP=$(echo ${DOWNLOAD_URL} | cut -d\"\/\" -f5)\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\n BEDROCK_ZIP=$(echo ${DOWNLOAD_URL} | cut -d\"\/\" -f5)\r\nfi\r\n\r\nwget ${DOWNLOAD_URL}\r\n\r\necho -e \"Unpacking server files\"\r\nunzip -o $BEDROCK_ZIP\r\n\r\necho -e \"Cleaning up after installing\"\r\nrm $BEDROCK_ZIP\r\n\r\necho -e \"Done\"", + "script": "#!\/bin\/ash\r\n\r\napk add --no-cache zip unzip wget curl\r\n\r\ncd \/mnt\/server\r\n\r\nif [ -z \"${BEDROCK_VERSION}\" ] || [ \"${BEDROCK_VERSION}\" == \"latest\" ]; then\r\n echo -e \"\\n Downloading latest Bedrock server\"\r\n DOWNLOAD_URL=$(curl https:\/\/www.minecraft.net\/en-us\/download\/server\/bedrock\/ | grep azureedge | grep linux | grep -Eo \"(http|https):\/\/[a-zA-Z0-9.\/?=_-]*\")\r\n BEDROCK_ZIP=$(echo ${DOWNLOAD_URL} | cut -d\"\/\" -f5)\r\nelse \r\n echo -e \"\\n Downloading ${BEDROCK_VERSION} Bedrock server\"\r\n DOWNLOAD_URL=https:\/\/www.minecraft.azureedge.net\/bin-linux\/bedrock-server-$BEDROCK_VERSION.zip\r\n BEDROCK_ZIP=$(echo ${DOWNLOAD_URL} | cut -d\"\/\" -f5)\r\nfi\r\n\r\necho -e \"Downloading files from https:\/\/minecraft.azureedge.net\/bin-linux\/bedrock-server-$BEDROCK_VERSION.zip\"\r\n\r\nwget ${DOWNLOAD_URL}\r\n\r\necho -e \"Unpacking server files\"\r\nunzip -o $BEDROCK_ZIP\r\n\r\necho -e \"Cleaning up after installing\"\r\nrm $BEDROCK_ZIP\r\n\r\necho -e \"Done\"", "container": "alpine:3.9", "entrypoint": "ash" } @@ -42,4 +42,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From eedecea3f6be7c47f4de72d1b06317a8c19f24cb Mon Sep 17 00:00:00 2001 From: StealWonders Date: Fri, 15 Mar 2019 17:39:48 +0100 Subject: [PATCH 166/393] Allow server owners to disable the query port in general. --- minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json | 4 ++-- minecraft_java/forge/forge-generic/egg-forge-generic.json | 4 ++-- minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json | 4 ++-- minecraft_java/ftb/ftb-revelation/egg-f-t-b-revelation.json | 4 ++-- .../spigot/spigot-enhanced/egg-spigot--enhanced.json | 4 ++-- minecraft_java/spigot/taco-spigot/egg-taco-spigot.json | 4 ++-- minecraft_java/technic/blightfall/egg-blightfall.json | 4 ++-- minecraft_java/technic/hexxit/egg-hexxit.json | 4 ++-- minecraft_java/technic/tekkit-legends/egg-tekkit-legends.json | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json b/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json index 5391775a..c4f41b31 100644 --- a/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json +++ b/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-02-10T22:57:27+01:00", + "exported_at": "2019-03-15T16:25:38+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.", "image": "quay.io\/pterodactyl\/core:java", "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}", + "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}", "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "stop" diff --git a/minecraft_java/forge/forge-generic/egg-forge-generic.json b/minecraft_java/forge/forge-generic/egg-forge-generic.json index 27d769e0..c49ff454 100644 --- a/minecraft_java/forge/forge-generic/egg-forge-generic.json +++ b/minecraft_java/forge/forge-generic/egg-forge-generic.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-07-15T12:35:48-04:00", + "exported_at": "2019-03-15T16:25:38+00:00", "name": "Forge Generic", "author": "parker@parkervcp.com", "description": "A generic egg for a forge modpack", "image": "quay.io\/pterodactyl\/core:java", "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 \"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 \"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" diff --git a/minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json b/minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json index e84cdd79..e6ffa4e8 100644 --- a/minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json +++ b/minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-04-02T17:20:55-04:00", + "exported_at": "2019-03-15T16:25:38+00:00", "name": "Feed the Beast", "author": "aevum@decess.us", "description": "Egg to handle all official FTB Modpacks", "image": "quay.io\/pterodactyl\/core:java", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar FTBserver-*.jar", "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 \"level-name\": \"{{server.build.env.LEVEL_NAME}}\",\r\n \"level-seed\": \"{{server.build.env.LEVEL_SEED}}\",\r\n \"max-players\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"motd\": \"{{server.build.env.MOTD}}\"\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 \"level-name\": \"{{server.build.env.LEVEL_NAME}}\",\r\n \"level-seed\": \"{{server.build.env.LEVEL_SEED}}\",\r\n \"max-players\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"motd\": \"{{server.build.env.MOTD}}\"\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" diff --git a/minecraft_java/ftb/ftb-revelation/egg-f-t-b-revelation.json b/minecraft_java/ftb/ftb-revelation/egg-f-t-b-revelation.json index ba408d36..726ce374 100644 --- a/minecraft_java/ftb/ftb-revelation/egg-f-t-b-revelation.json +++ b/minecraft_java/ftb/ftb-revelation/egg-f-t-b-revelation.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-26T23:48:51-05:00", + "exported_at": "2019-03-15T16:25:38+00:00", "name": "FTB Revelation", "author": "aevum@decess.us", "description": "Revelation is a general all-purpose pack that is designed for solo play as well as small and medium population servers. This pack contains a mix of magic, tech and exploration mods, and is the largest pack ever built and released by the Feed The Beast Team.", "image": "quay.io\/pterodactyl\/core:java", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar FTBserver-*.jar", "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 \"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" diff --git a/minecraft_java/spigot/spigot-enhanced/egg-spigot--enhanced.json b/minecraft_java/spigot/spigot-enhanced/egg-spigot--enhanced.json index 2f178d80..e1e92732 100644 --- a/minecraft_java/spigot/spigot-enhanced/egg-spigot--enhanced.json +++ b/minecraft_java/spigot/spigot-enhanced/egg-spigot--enhanced.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-25T12:20:22-05:00", + "exported_at": "2019-03-15T16:25:38+00:00", "name": "Spigot-Enhanced", "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.", "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}", + "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}", "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "stop" diff --git a/minecraft_java/spigot/taco-spigot/egg-taco-spigot.json b/minecraft_java/spigot/taco-spigot/egg-taco-spigot.json index aff41987..ac92c047 100644 --- a/minecraft_java/spigot/taco-spigot/egg-taco-spigot.json +++ b/minecraft_java/spigot/taco-spigot/egg-taco-spigot.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-03-10T00:34:01-06:00", + "exported_at": "2019-03-15T16:25:38+00:00", "name": "Taco Spigot", "author": "hostmaster@waterfallgaming.net", "description": "A even-higher higher performance PaperSpigot fork that adds new features.", "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}", + "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}", "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "stop" diff --git a/minecraft_java/technic/blightfall/egg-blightfall.json b/minecraft_java/technic/blightfall/egg-blightfall.json index 2fd18f10..229728f9 100644 --- a/minecraft_java/technic/blightfall/egg-blightfall.json +++ b/minecraft_java/technic/blightfall/egg-blightfall.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-26T20:41:27-05:00", + "exported_at": "2019-03-15T16:25:38+00:00", "name": "Blightfall", "author": "aevum@decess.us", "description": "Blightfall is a combination modpack and adventure map about surviving on an alien planet. It uses magic mods and tech mods to create a novel gameplay experience. Can you survive on a world completely covered by Thaumcraft taint?\r\n\r\nhttps:\/\/www.technicpack.net\/modpack\/blightfall.592618", "image": "quay.io\/pterodactyl\/core:java", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar Blightfall.jar", "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 \"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" diff --git a/minecraft_java/technic/hexxit/egg-hexxit.json b/minecraft_java/technic/hexxit/egg-hexxit.json index 2617acb5..5ca6fed8 100644 --- a/minecraft_java/technic/hexxit/egg-hexxit.json +++ b/minecraft_java/technic/hexxit/egg-hexxit.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-26T20:41:41-05:00", + "exported_at": "2019-03-15T16:25:38+00:00", "name": "Hexxit", "author": "aevum@decess.us", "description": "Gear up and set forth on a campaign worthy of legend, for Hexxit has been unearthed! Dark dungeons, towering spires, weathered ruins and musty tomes lay before you. Lay claim to riches or create your own artifacts, tame beasts and carve out your own story in endless wonder. Alone or with friends, adventure awaits in Hexxit.\r\n\r\nHexxit is a new collection of mods for Minecraft that put adventure above all else, in the style of old Dungeons and Dragons campaigns. Exploration is interesting, the dangers are greater and the sense of satisfaction of clearing out a dungeon is intense. The modlist is full of quality content from some very talented individuals. Be sure to head over to the donate page and show your appreciation!\r\n\r\nhttps:\/\/www.technicpack.net\/modpack\/hexxit.552552", "image": "quay.io\/pterodactyl\/core:java", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar Hexxit.jar", "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 \"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" diff --git a/minecraft_java/technic/tekkit-legends/egg-tekkit-legends.json b/minecraft_java/technic/tekkit-legends/egg-tekkit-legends.json index 0180f3be..5c6c0d6d 100644 --- a/minecraft_java/technic/tekkit-legends/egg-tekkit-legends.json +++ b/minecraft_java/technic/tekkit-legends/egg-tekkit-legends.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-26T20:41:35-05:00", + "exported_at": "2019-03-15T16:25:38+00:00", "name": "Tekkit Legends", "author": "aevum@decess.us", "description": "The ancient power of Tekkits past return in this legendary pack! Wield the philosopher's stone, ride the rails, breed the bees, and much, much more! This pack will remind you of what you've always loved about Tekkit, while bringing you new mods to discover and enjoy!\r\n\r\nhttps:\/\/www.technicpack.net\/modpack\/tekkit-legends.735902", "image": "quay.io\/pterodactyl\/core:java", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar TekkitLegends.jar", "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 \"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" From 5d4392276f1f1e4faf1deec38542fdfd11a21400 Mon Sep 17 00:00:00 2001 From: StealWonders Date: Fri, 15 Mar 2019 17:47:14 +0100 Subject: [PATCH 167/393] Added the query port to the server configuration file. --- minecraft_java/paper/egg-paper.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft_java/paper/egg-paper.json b/minecraft_java/paper/egg-paper.json index 4e99297c..022b098a 100644 --- a/minecraft_java/paper/egg-paper.json +++ b/minecraft_java/paper/egg-paper.json @@ -10,7 +10,7 @@ "image": "quay.io\/pterodactyl\/core:java", "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 \"server-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 \"userInteraction\": [\r\n \"Go to eula.txt for more info.\"\r\n ]\r\n}", "logs": "{}", "stop": "stop" From 1c4539577fbbe0cf86c79fd11c6ffc3d770d53ce Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 24 Mar 2019 23:35:38 -0400 Subject: [PATCH 168/393] remove forge enhanced and update forge generic --- .../forge-enhanced/egg-forge--enhanced.json | 45 ------------------- .../forge-generic/egg-forge-generic.json | 6 +-- 2 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json diff --git a/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json b/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json deleted file mode 100644 index 5391775a..00000000 --- a/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.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": "2019-02-10T22:57:27+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.", - "image": "quay.io\/pterodactyl\/core:java", - "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\r\n\r\n#Fetching version\r\nif [ -z \"$MC_VERSION\" ] || [ \"$MC_VERSION\" == \"latest\" ]; then\r\n echo \"Fetching latest\"\r\n MC_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index.html | grep -A 2 \"Latest\" | awk NF=NF RS= OFS=\" \" | grep -o -e '[1].[0-9]*.[0-9]* - [0-9]*.[0-9]*.[0-9]*.[0-9]*' | sed 's\/ \/\/g')\r\nelif [[ ! \"$MC_VERSION\" =~ - ]]; then\r\n echo \"Fetching latest from version $MC_VERSION\"\r\n MC_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index_$MC_VERSION.html | grep -A 2 \"Latest\" | awk NF=NF RS= OFS=\" \" | grep -o -e '[1].[0-9]*.[0-9]* - [0-9]*.[0-9]*.[0-9]*.[0-9]*' | sed 's\/ \/\/g')\r\nfi\r\n\r\n#Checking if forge version valid\r\nif [[ ! \"$MC_VERSION\" =~ [1].[0-9]*.[0-9]*-[0-9]*.[0-9]*.[0-9]*.[0-9]* ]]; then\r\n echo \"!!! Invalid forge version \\\"$MC_VERSION\\\" !!!\"\r\n exit\r\nfi\r\n\r\n#Go into main direction\r\ncd \/mnt\/server\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 \\\"$MC_VERSION\\\"\"\r\ncurl -o installer.jar -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$MC_VERSION\/forge-$MC_VERSION-installer.jar\r\ncurl -o $SERVER_JARFILE -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$MC_VERSION\/forge-$MC_VERSION-universal.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ] || [ ! -f .\/$SERVER_JARFILE ]; then\r\n echo \"!!! Error by downloading forge version \\\"$MC_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\r\n\r\n#Deleting installer.jar\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar", - "container": "openjdk:8", - "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": 1, - "user_editable": 1, - "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" - }, - { - "name": "Forge version", - "description": "The version of forge that you want to run.\r\nExamples:\r\n- 1.12.2\r\n- 1.12.2-14.23.5.2810", - "env_variable": "MC_VERSION", - "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:22" - } - ] -} \ No newline at end of file diff --git a/minecraft_java/forge/forge-generic/egg-forge-generic.json b/minecraft_java/forge/forge-generic/egg-forge-generic.json index 27d769e0..3715dbae 100644 --- a/minecraft_java/forge/forge-generic/egg-forge-generic.json +++ b/minecraft_java/forge/forge-generic/egg-forge-generic.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-07-15T12:35:48-04:00", + "exported_at": "2019-03-24T23:33:30-04:00", "name": "Forge Generic", "author": "parker@parkervcp.com", "description": "A generic egg for a forge modpack", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk update\r\napk add curl\r\n\r\nBASE_URL=${MODPACK_URL}\/files\r\n\r\nif [ -z \"${MODPACK_VERSION}\" ] || [ \"${MODPACK_VERSION}\" == \"latest\" ]; then\r\n ID=`curl -sl ${BASE_URL} | grep -i -A9 'title=\"release\"' | grep -m 1 -i -o 'href=\".*\"' | cut -d \"\/\" -f5 | sed s\/\\\"\/\/g`\r\n echo \"ID: ${ID}\"\r\nelse \r\n ID=`curl -sl ${BASE_URL} | grep -i -A9 \"${MODPACK_VERSION}\" | grep -m 1 -oE 'href=\"[^\\\"]+\"' | cut -d \"\/\" -f5 | grep -oE [0-9]+`\r\n echo \"ID: ${ID}\"\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n\r\nSECONDURL=${BASE_URL}\/${ID}\r\necho \"SECONDURL: ${SECONDURL}\"\r\n\r\nGOOD_ID=`curl -sl ${SECONDURL} | grep -i server | grep -Eo 'href=\"[^\\\"]+\"' | grep -o -E \"[0-9]+\" | tail -1`\r\necho \"GOOD_ID: ${GOOD_ID}\"\r\n\r\nDL_URL=${BASE_URL}\/${GOOD_ID}\/download\r\necho \"Download_URL: ${DL_URL}\"\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Executing curl -L ${DL_URL} -o server.zip\"\r\ncurl -L ${DL_URL} -o server.zip\r\n\r\nunzip server.zip\r\n\r\nrm -rf server.zip\r\n\r\necho -e \"\\nInstalling forge server usint the installer jar file.\\n\"\r\njava -jar *installer.jar --installServer\r\n\r\necho -e \"\\nDeleting installer jar file and cleaning up.\\n\"\r\nrm -rf *installer.jar\r\n\r\nmv *universal.jar server.jar", + "script": "#!\/bin\/ash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nfunction install_required {\r\n apk --no-cache --update add curl jq\r\n}\r\n\r\nfunction get_download {\r\n BASE_URL=${MODPACK_URL}\/files\r\n\r\n if [ -z \"${MODPACK_VERSION}\" ] || [ \"${MODPACK_VERSION}\" == \"latest\" ]; then\r\n ID=`curl -sl ${BASE_URL} | grep -i -A9 'title=\"release\"' | grep -m 1 -i -o 'href=\".*\"' | cut -d \"\/\" -f5 | sed s\/\\\"\/\/g`\r\n echo \"ID: ${ID}\"\r\n else\r\n ID=`curl -sl ${BASE_URL} | grep -i -A9 \"${MODPACK_VERSION}\" | grep -m 1 -oE 'href=\"[^\\\"]+\"' | cut -d \"\/\" -f5 | grep -oE [0-9]+`\r\n echo \"ID: ${ID}\"\r\n fi\r\n\r\n SECONDURL=${BASE_URL}\/${ID}\r\n echo \"SECONDURL: ${SECONDURL}\"\r\n\r\n GOOD_ID=`curl -sl ${SECONDURL} | grep -i server | grep -Eo 'href=\"[^\\\"]+\"' | grep -o -E \"[0-9]+\" | tail -1`\r\n if [ -z \"$GOOD_ID\" ]; then\r\n GOOD_ID=$ID\r\n fi\r\n echo \"GOOD_ID: ${GOOD_ID}\"\r\n\r\n DL_URL=${BASE_URL}\/${GOOD_ID}\/download\r\n echo \"Download_URL: ${DL_URL}\"\r\n\r\n cd \/mnt\/server\r\n\r\n echo \"Executing curl -L ${DL_URL} -o server.zip\"\r\n curl -L ${DL_URL} -o server.zip\r\n\r\n unzip server.zip\r\n\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 java -jar *installer.jar --installServer\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\r\n mv *universal.jar server.jar\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=\"https:\/\/minecraft.curseforge.com\/projects\/${projID}\/files\/${fileID}\/download\"\r\n echo \"mods file url: ${URL}\"\r\n # this is saving everything as \/mnt\/server\/mods\/download\r\n FINAL_URL=$(curl $URL -s -L -o \/dev\/null -w '%{url_effective}')\r\n echo \"Mod direct url: $FINAL_URL\"\r\n curl -JLO ${FINAL_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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\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\ninstall_required\r\nget_download\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\nelse\r\n forge_install\r\n forge_cleanup\r\nfi", "container": "openjdk:8-alpine", "entrypoint": "ash" } @@ -30,7 +30,7 @@ "default_value": "", "user_viewable": 1, "user_editable": 1, - "rules": "required|string|max:64" + "rules": "required|string" }, { "name": "Modpack Version", From 4daef4590b47fc2bb797b5d13f22a8171d81dca3 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Mon, 25 Mar 2019 10:48:14 -0400 Subject: [PATCH 169/393] adding the stock rust egg Added the stock rust egg. Added stock rust egg readme --- stock-eggs/source/rust/README.md | 14 +++ stock-eggs/source/rust/egg-rust.json | 144 +++++++++++++++++++++++++++ 2 files changed, 158 insertions(+) create mode 100644 stock-eggs/source/rust/README.md create mode 100644 stock-eggs/source/rust/egg-rust.json diff --git a/stock-eggs/source/rust/README.md b/stock-eggs/source/rust/README.md new file mode 100644 index 00000000..002634ee --- /dev/null +++ b/stock-eggs/source/rust/README.md @@ -0,0 +1,14 @@ +# [Rust](https://rust.facepunch.com/) + +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. + +#### Port Requirements +The Rust server requires 3 ports minimum. + +| Port | default | +|---------|---------| +| Game | 28015 | +| Game +1 | 28016 | +| RCON | 28017 | + +Please note the server may not show up on steam game server lists due to this requirement if all ports are not set/added. \ No newline at end of file diff --git a/stock-eggs/source/rust/egg-rust.json b/stock-eggs/source/rust/egg-rust.json new file mode 100644 index 00000000..9a43d0f5 --- /dev/null +++ b/stock-eggs/source/rust/egg-rust.json @@ -0,0 +1,144 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-03-25T10:30:58-04: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.worldsize \\\"{{WORLD_SIZE}}\\\" +server.seed \\\"{{WORLD_SEED}}\\\" +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}", + "stop": "quit" + }, + "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\n\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\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 258550 +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so", + "container": "ubuntu:16.04", + "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": 1, + "user_editable": 1, + "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": 1, + "user_editable": 1, + "rules": "required|boolean" + }, + { + "name": "Level", + "description": "The world file for Rust to use.", + "env_variable": "LEVEL", + "default_value": "Procedural Map", + "user_viewable": 1, + "user_editable": 1, + "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": 1, + "user_editable": 1, + "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": 1, + "user_editable": 1, + "rules": "nullable|url" + }, + { + "name": "World Size", + "description": "The world size for a procedural map.", + "env_variable": "WORLD_SIZE", + "default_value": "3000", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|integer" + }, + { + "name": "World Seed", + "description": "The seed for a procedural map.", + "env_variable": "WORLD_SEED", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "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": 1, + "user_editable": 1, + "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": 1, + "user_editable": 1, + "rules": "nullable|url" + }, + { + "name": "RCON Port", + "description": "Port for RCON connections.", + "env_variable": "RCON_PORT", + "default_value": "28016", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|integer" + }, + { + "name": "RCON Password", + "description": "RCON access password.", + "env_variable": "RCON_PASS", + "default_value": "CHANGEME", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:64" + }, + { + "name": "Additional Arguments", + "description": "Add additional startup parameters to the server.", + "env_variable": "ADDITIONAL_ARGS", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "nullable|string" + }, + { + "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, + "rules": "required|integer" + } + ] +} \ No newline at end of file From 5e5b17948e2236a2fafb833d0637d368d79a303a Mon Sep 17 00:00:00 2001 From: Maximilian Welt Date: Mon, 25 Mar 2019 16:41:11 +0100 Subject: [PATCH 170/393] Add basic config files Rename config according to official docs --- arma/arma3/egg-arma3-config/basic.cfg | 83 ++++++++++++++++ arma/arma3/egg-arma3-config/server.cfg | 130 +++++++++++++++++++++++++ arma/arma3/egg-arma3.json | 14 +-- 3 files changed, 220 insertions(+), 7 deletions(-) create mode 100644 arma/arma3/egg-arma3-config/basic.cfg create mode 100644 arma/arma3/egg-arma3-config/server.cfg diff --git a/arma/arma3/egg-arma3-config/basic.cfg b/arma/arma3/egg-arma3-config/basic.cfg new file mode 100644 index 00000000..7b5a1c99 --- /dev/null +++ b/arma/arma3/egg-arma3-config/basic.cfg @@ -0,0 +1,83 @@ +// **************************************************************************** +// * +// Arma 3 - basic.cfg * +// Version 060116 * +// * +// **************************************************************************** + +// Defines network tuning parameters +// +// This file is to be passed to the -cfg parameter on the command line for the server +// See http://community.bistudio.com/wiki/basic.cfg +// The following settings are the suggested settings + +// BANDWIDTH SETTINGS + +// Bandwidth the server is guaranteed to have (in bps) +// General guideline is NumberOfPlayers * 256kb +// Default: 131072 +MinBandwidth=5120000; +// Bandwidth the server can never go above (in bps) +// For a single server, use full network speed; decrease when running multiple servers +MaxBandwidth=10240000; + +// PACKET SETTINGS + +// Maximum number of packets per frame. +// Increasing the value potentially decreases lag, but increases desync +// Default: 128 +MaxMsgSend=2048; +// Maximum payload of guaranteed packet (in b) +// Small messages are packed to larger packets +// Guaranteed packets are used for non-repetitive events, like shooting +// Lower value means more packets are sent, so less events will get combined +// Default: 512 +MaxSizeGuaranteed=512; +// Maximum payload of non-guaranteed packet (in b) +// Increasing this value may improve bandwidth requirement, but may also increase lag +// Largest factor in desync +// Guidance is half of MaxSizeGuaranteed +// Default: 256 +MaxSizeNonguaranteed=256; +// Maximal size of a packet sent over the network +// Only necessary if ISP forces lower packet size and there are connectivity issues +// Default: 1400 +// class sockets{maxPacketSize=1400}; + +// SMOOTHNESS SETTINGS + +// Minimal error required to send network updates for far units +// Smaller values will make for smoother movement at long ranges, but will increase network traffic +// Default: 0.003 +MinErrorToSend=0.01; +// Minimal error required to send network updates for near units +// Using larger value can reduce traffic sent for near units +// Also controls client to server traffic +// Default: 0.01 +MinErrorToSendNear=0.02; + +// GEOLOCATION SETTINGS + +// Server latitude +serverLatitude=52; +serverLatitudeAuto=52; + +// Server Longitude +serverLongitude=0; +serverLongitudeAuto=0; +// MISC +// View Distance (not sure if this actually works) +viewDistance=10000; + +// Maximum size (in b) for custom face or sound files +// Default: 0 +MaxCustomFileSize=65536; +// Server language +language="English"; +steamLanguage="English"; +// Adapter +adapter=-1; +// Windowed mode +Windowed=0; + +3D_Performance=1.000000; \ No newline at end of file diff --git a/arma/arma3/egg-arma3-config/server.cfg b/arma/arma3/egg-arma3-config/server.cfg new file mode 100644 index 00000000..ee73e428 --- /dev/null +++ b/arma/arma3/egg-arma3-config/server.cfg @@ -0,0 +1,130 @@ +// **************************************************************************** +// * +// Arma 3 - server.cfg * +// Version 060117 * +// * +// **************************************************************************** + +// ArmA 3 Server Config File +// +// More info about parameters: +// https://community.bistudio.com/wiki/server.cfg + + +// GENERAL SETTINGS + +// Hostname for server. +hostname = "Arma 3 Server" + +// Server password - for private servers. +//password = "arma3pass"; + +// Admin Password +//passwordAdmin = "ADMINPASSWORD"; + +// Auto-admin +admins[] = {""}; + +// Server Slots +maxPlayers = 32; + +// Logfile +logFile = "arma3server.log"; + +// Minimum Required Client Build +//requiredBuild = 95691 + +// Message of the Day (MOTD) +motd[] = { + "Welcome to My Arma 3 Server", + "TS3 Server: teamspeak.somewhere.com", + "Web: www.example.com" +}; + +// MOTD Interval (Seconds) +motdInterval = 30; + + +// VOTING + +// Server Mission Start +// minimum number of clients before server starts mission +voteMissionPlayers = 1; + +// Accepted Vote Threshold +// 0.33 = 33% clients. +voteThreshold = 0.33; + +// INGAME SETTINGS + +// Disable Voice over Net (VoN) +// 0 = voice enabled. +// 1 = voice disabled. +disableVoN = 0; + +// VoN Codec Quality +// 0-10 = 8kHz (narrowband). +// 11-20 = 16kHz (wideband). +// 21-30 = 32kHz (ultrawideband). +vonCodecQuality = 3; + +// Persistent Battlefield +// 0 = disable. +// 1 = enable. +persistent = 1; + +// Time Stamp Format +// none, short, full +timeStampFormat = "short"; + +// Server Statistics +// Set this to 0 to opt-out! More info: https://community.bistudio.com/wiki/Arma_3_Analytics +statisticsEnabled = 1; + +// SERVER SECURITY/ANTI HACK + +// Verify Signitures for Client Addons +// 0 = off. +// 1 = weak protection (depricated). +// 2 = full protection. +verifySignatures = 2; + +// Secure Player ID +// 1 = Server warning message. +// 2 = Kick client. +requiredSecureId = 2; + +// Kick Duplicate Player IDs +kickDuplicate = 1; + +// BattlEye Anti-Cheat +// 0 = disable +// 1 = enable +BattlEye = 1; + +// Allowed File Extentions +allowedLoadFileExtensions[] = {"hpp","sqs","sqf","fsm","cpp","paa","txt","xml","inc","ext","sqm","ods","fxy","lip","csv","kb","bik","bikb","html","htm","biedi"}; +allowedPreprocessFileExtensions[] = {"hpp","sqs","sqf","fsm","cpp","paa","txt","xml","inc","ext","sqm","ods","fxy","lip","csv","kb","bik","bikb","html","htm","biedi"}; +allowedHTMLLoadExtensions[] = {"htm","html","xml","txt"}; + +// SCRIPTING ISSUES +onUserConnected = ""; +onUserDisconnected = ""; +doubleIdDetected = ""; + +// SIGNATURE VERIFICATION +// kick = kick (_this select 0) +// ban = ban (_this select 0) +onUnsignedData = "kick (_this select 0)"; +onHackedData = "kick (_this select 0)"; +onDifferentData = ""; + +// HEADLESS CLIENT SUPPORT +// specify ip-adresses of allowed headless clients +headlessClients[] = {"127.0.0.1", "172.18.0.1"}; +localClient[] = {"127.0.0.1", "172.18.0.1"}; + +// BattlEye Anti-Cheat License +// 0 = decline +// 1 = accept +battleyeLicense = 1; \ No newline at end of file diff --git a/arma/arma3/egg-arma3.json b/arma/arma3/egg-arma3.json index 0eec1209..e12dcc80 100644 --- a/arma/arma3/egg-arma3.json +++ b/arma/arma3/egg-arma3.json @@ -8,7 +8,7 @@ "author": "daave@aaathats3as.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.", "image": "quay.io\/parkervcp\/pterodactyl-images:game_arma3", - "startup": ".\/arma3server -ip=0.0.0.0 -port={{SERVER_PORT}} -cfg={{CFG}} -config={{CONFIG}} {{CUSTOM}} -mod=\"{{MODS}}\" -serverMod=\"{{SERVERMODS}}\"", + "startup": ".\/arma3server -ip=0.0.0.0 -port={{SERVER_PORT}} -cfg={{BASIC}} -config={{CONFIG}} {{CUSTOM}} -mod=\"{{MODS}}\" -serverMod=\"{{SERVERMODS}}\"", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Connected to Steam servers\",\r\n \"userInteraction\": []\r\n}", @@ -33,19 +33,19 @@ "rules": "required|alpha_dash|between:1,100" }, { - "name": "Config CFG", - "description": "Config CFG", - "env_variable": "CFG", - "default_value": "cfg.cfg", + "name": "Basic", + "description": "Basic network config", + "env_variable": "BASIC", + "default_value": "basic.cfg", "user_viewable": 1, "user_editable": 1, "rules": "string|nullable" }, { "name": "Config", - "description": "Config", + "description": "Server config", "env_variable": "CONFIG", - "default_value": "config.cfg", + "default_value": "server.cfg", "user_viewable": 1, "user_editable": 1, "rules": "string|nullable" From ee22111b1c772c3c9b214589b65842fe7ae55ae6 Mon Sep 17 00:00:00 2001 From: Maximilian Welt Date: Mon, 25 Mar 2019 17:10:26 +0100 Subject: [PATCH 171/393] Add config download to install script --- arma/arma3/egg-arma3.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arma/arma3/egg-arma3.json b/arma/arma3/egg-arma3.json index e12dcc80..7e4264ab 100644 --- a/arma/arma3/egg-arma3.json +++ b/arma/arma3/egg-arma3.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl\r\napt -y --no-install-recommends install lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSLO http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd \/mnt\/server\/logs\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\n\r\ntouch \/mnt\/server\/latest.log\r\nchown -R root:root \/mnt\r\n\r\ntar -xzvf \/tmp\/steamcmd_linux.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\nexport HOME=\/mnt\/server\r\n\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${APP_ID} validate +quit", + "script": "#!\/bin\/bash\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl\r\napt -y --no-install-recommends install lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSLO http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd \/mnt\/server\/logs\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\n\r\ntouch \/mnt\/server\/latest.log\r\nchown -R root:root \/mnt\r\n\r\ntar -xzvf \/tmp\/steamcmd_linux.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\nexport HOME=\/mnt\/server\r\n\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${APP_ID} validate +quit\r\n\r\ncd \/mnt\/server\/\r\ncurl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/arma\/arma3\/egg-arma3-config\/basic.cfg\r\ncurl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/arma\/arma3\/egg-arma3-config\/server.cfg", "container": "ubuntu:18.04", "entrypoint": "bash" } From 3c21bf9348ea8e75aaa7e3daad48526f6d766e43 Mon Sep 17 00:00:00 2001 From: Maximilian Welt Date: Mon, 25 Mar 2019 17:20:47 +0100 Subject: [PATCH 172/393] Add Arma 3 Headless Client Egg --- arma/arma3/egg-arma3-headless-client.json | 99 +++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 arma/arma3/egg-arma3-headless-client.json diff --git a/arma/arma3/egg-arma3-headless-client.json b/arma/arma3/egg-arma3-headless-client.json new file mode 100644 index 00000000..3a7888b0 --- /dev/null +++ b/arma/arma3/egg-arma3-headless-client.json @@ -0,0 +1,99 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-03-25T14:09:36+01:00", + "name": "Arma 3 Headless Client", + "author": "brainp4in@blueberry-hood-clan.de", + "description": "Headless Clients are used to offload AI calculations from the Arma 3 Server.", + "image": "quay.io\/parkervcp\/pterodactyl-images:game_arma3", + "startup": ".\/arma3server -client -connect={{SERVERIP}} -port={{SERVERPORT}} {{CUSTOM}} -mod=\"{{MODS}}\"", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Client connected\",\r\n \"userInteraction\": []\r\n}", + "logs": "{\r\n \"custom\": true,\r\n \"location\": \"latest.log\"\r\n}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl\r\napt -y --no-install-recommends install lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSLO http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd \/mnt\/server\/logs\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\n\r\ntouch \/mnt\/server\/latest.log\r\nchown -R root:root \/mnt\r\n\r\ntar -xzvf \/tmp\/steamcmd_linux.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\nexport HOME=\/mnt\/server\r\n\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${APP_ID} validate +quit\r\n\r\ncd \/mnt\/server\/\r\ncurl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/arma\/arma3\/egg-arma3-config\/server.cfg\r\ncurl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/arma\/arma3\/egg-arma3-config\/basic.cfg", + "container": "ubuntu:18.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Game App ID", + "description": "Steam CMD App ID.", + "env_variable": "APP_ID", + "default_value": "233780", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|alpha_dash|between:1,100" + }, + { + "name": "Custom Command Line Option.", + "description": "Put -autoinit or related things in here :)", + "env_variable": "CUSTOM", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "string|nullable" + }, + { + "name": "Mods", + "description": "This is where you put mods that go along with the -mods startup option", + "env_variable": "MODS", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "string|nullable" + }, + { + "name": "Steam User", + "description": "A Steam username with Arma3 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" + }, + { + "name": "Server IP", + "description": "IP address of the Arma 3 server that should be supported by the Headless Client.", + "env_variable": "SERVERIP", + "default_value": "127.0.0.1", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:30" + }, + { + "name": "Server Port", + "description": "Port of the Arma 3 server that should be supported by the Headless Client.", + "env_variable": "SERVERPORT", + "default_value": "2302", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:5" + } + ] +} \ No newline at end of file From 5ec4eca31421f210f6543842a06ae895e5a4a48b Mon Sep 17 00:00:00 2001 From: BrainP4in Date: Mon, 25 Mar 2019 17:22:47 +0100 Subject: [PATCH 173/393] But that is another story ... --- arma/arma3/egg-arma3-headless-client.json | 99 ----------------------- 1 file changed, 99 deletions(-) delete mode 100644 arma/arma3/egg-arma3-headless-client.json diff --git a/arma/arma3/egg-arma3-headless-client.json b/arma/arma3/egg-arma3-headless-client.json deleted file mode 100644 index 3a7888b0..00000000 --- a/arma/arma3/egg-arma3-headless-client.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2019-03-25T14:09:36+01:00", - "name": "Arma 3 Headless Client", - "author": "brainp4in@blueberry-hood-clan.de", - "description": "Headless Clients are used to offload AI calculations from the Arma 3 Server.", - "image": "quay.io\/parkervcp\/pterodactyl-images:game_arma3", - "startup": ".\/arma3server -client -connect={{SERVERIP}} -port={{SERVERPORT}} {{CUSTOM}} -mod=\"{{MODS}}\"", - "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"Client connected\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"latest.log\"\r\n}", - "stop": "^C" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl\r\napt -y --no-install-recommends install lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSLO http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd \/mnt\/server\/logs\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\n\r\ntouch \/mnt\/server\/latest.log\r\nchown -R root:root \/mnt\r\n\r\ntar -xzvf \/tmp\/steamcmd_linux.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\nexport HOME=\/mnt\/server\r\n\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${APP_ID} validate +quit\r\n\r\ncd \/mnt\/server\/\r\ncurl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/arma\/arma3\/egg-arma3-config\/server.cfg\r\ncurl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/arma\/arma3\/egg-arma3-config\/basic.cfg", - "container": "ubuntu:18.04", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Game App ID", - "description": "Steam CMD App ID.", - "env_variable": "APP_ID", - "default_value": "233780", - "user_viewable": 1, - "user_editable": 0, - "rules": "required|alpha_dash|between:1,100" - }, - { - "name": "Custom Command Line Option.", - "description": "Put -autoinit or related things in here :)", - "env_variable": "CUSTOM", - "default_value": "", - "user_viewable": 1, - "user_editable": 1, - "rules": "string|nullable" - }, - { - "name": "Mods", - "description": "This is where you put mods that go along with the -mods startup option", - "env_variable": "MODS", - "default_value": "", - "user_viewable": 1, - "user_editable": 1, - "rules": "string|nullable" - }, - { - "name": "Steam User", - "description": "A Steam username with Arma3 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" - }, - { - "name": "Server IP", - "description": "IP address of the Arma 3 server that should be supported by the Headless Client.", - "env_variable": "SERVERIP", - "default_value": "127.0.0.1", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:30" - }, - { - "name": "Server Port", - "description": "Port of the Arma 3 server that should be supported by the Headless Client.", - "env_variable": "SERVERPORT", - "default_value": "2302", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:5" - } - ] -} \ No newline at end of file From 2959c51d60a8a8028c03cacbd03ee50af4a6c1f6 Mon Sep 17 00:00:00 2001 From: Maximilian Welt Date: Tue, 26 Mar 2019 19:57:42 +0100 Subject: [PATCH 174/393] Add Arma 3 HC Egg --- arma/arma3/egg-arma3-headless-client.json | 99 +++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 arma/arma3/egg-arma3-headless-client.json diff --git a/arma/arma3/egg-arma3-headless-client.json b/arma/arma3/egg-arma3-headless-client.json new file mode 100644 index 00000000..11c89e45 --- /dev/null +++ b/arma/arma3/egg-arma3-headless-client.json @@ -0,0 +1,99 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-03-25T14:09:36+01:00", + "name": "Arma 3 Headless Client", + "author": "brainp4in@blueberry-hood-clan.de", + "description": "Headless Clients are used to offload AI calculations from the Arma 3 Server.", + "image": "quay.io\/parkervcp\/pterodactyl-images:game_arma3", + "startup": ".\/arma3server -client -connect={{SERVERIP}} -port={{SERVERPORT}} {{CUSTOM}} -mod=\"{{MODS}}\"", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Client connected\",\r\n \"userInteraction\": []\r\n}", + "logs": "{\r\n \"custom\": true,\r\n \"location\": \"latest.log\"\r\n}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl\r\napt -y --no-install-recommends install lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSLO http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd \/mnt\/server\/logs\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\n\r\ntouch \/mnt\/server\/latest.log\r\nchown -R root:root \/mnt\r\n\r\ntar -xzvf \/tmp\/steamcmd_linux.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\nexport HOME=\/mnt\/server\r\n\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${APP_ID} validate +quit\r\n\r\ncd \/mnt\/server\/\r\ncurl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/arma\/arma3\/egg-arma3-config\/server.cfg\r\ncurl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/arma\/arma3\/egg-arma3-config\/basic.cfg", + "container": "ubuntu:18.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Game App ID", + "description": "Steam CMD App ID.", + "env_variable": "APP_ID", + "default_value": "233780", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|alpha_dash|between:1,100" + }, + { + "name": "Server IP", + "description": "IP address of the Arma 3 server that should be supported by the Headless Client.", + "env_variable": "SERVERIP", + "default_value": "127.0.0.1", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:30" + }, + { + "name": "Server Port", + "description": "Port of the Arma 3 server that should be supported by the Headless Client.", + "env_variable": "SERVERPORT", + "default_value": "2302", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:5" + }, + { + "name": "Custom Command Line Option.", + "description": "Put -autoinit or related things in here :)", + "env_variable": "CUSTOM", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "string|nullable" + }, + { + "name": "Mods", + "description": "This is where you put mods that go along with the -mods startup option", + "env_variable": "MODS", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "string|nullable" + }, + { + "name": "Steam User", + "description": "A Steam username with Arma3 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 d9f21b1367680d0ecd2cc61dae56264dbcee4802 Mon Sep 17 00:00:00 2001 From: Maximilian Welt Date: Tue, 26 Mar 2019 20:13:33 +0100 Subject: [PATCH 175/393] Fix file structure according to other eggs --- README.md | 1 + arma/arma3_headless_client/README.md | 20 +++++++++++++++++++ .../egg-arma3-headless-client.json | 0 3 files changed, 21 insertions(+) create mode 100644 arma/arma3_headless_client/README.md rename arma/{arma3 => arma3_headless_client}/egg-arma3-headless-client.json (100%) diff --git a/README.md b/README.md index 0841502c..46e82e0a 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,7 @@ If you submit a PR without filling out the template I will deny it. This is for [Arma](/arma/) * [Arma 3](/arma/arma3/) +* [Arma 3 HC](/arma/arma3_headless_client/) [Conan Exiles](/conan_exiles/conan_exiles) diff --git a/arma/arma3_headless_client/README.md b/arma/arma3_headless_client/README.md new file mode 100644 index 00000000..cc556772 --- /dev/null +++ b/arma/arma3_headless_client/README.md @@ -0,0 +1,20 @@ +# Arma 3 Headless Client +### From their [Site](https://community.bistudio.com/wiki/Arma_3_Headless_Client) +What is a Headless Client (HC) used for? +* Headless Client is used to offload AI calculations from the server +* Headless Client is integrated into game client and dedicated server executable (WIndows and Linux, use -client parameter) +* The server doesn't allow arbitrary connections from headless clients if you do not define the headless clients IPs in the server.cfg, + +### But why? +If you host an Arma 3 Server with lots of AI in it, the Server FPS will drop pretty fast. +Since the server files are only 32 Bit you will need some kind of magical assistant to prevent slow AI. + +### Minimum RAM warning +This server requires about 2048m to run properly. ARMA 3 is more CPU intensive though. + +### Additional settings +Additional server flags can be found [here](https://community.bistudio.com/wiki/Arma_3_Startup_Parameters). +This can help is you see the server using to many cores/threads on the server. + +### Server Ports +Since this is basically a client, this Egg does not need a port. diff --git a/arma/arma3/egg-arma3-headless-client.json b/arma/arma3_headless_client/egg-arma3-headless-client.json similarity index 100% rename from arma/arma3/egg-arma3-headless-client.json rename to arma/arma3_headless_client/egg-arma3-headless-client.json From 30c0d4caf2d8c0f7084fcce2298b4895da874ed6 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Thu, 28 Mar 2019 15:17:39 -0400 Subject: [PATCH 176/393] moving to spigot only removed spigot enhanced and moved to using quay.io/parkervcp/pterodactyl-images:debian_openjdk-8-jre --- .../egg-spigot.json} | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) rename minecraft_java/spigot/{spigot-enhanced/egg-spigot--enhanced.json => spigot/egg-spigot.json} (78%) diff --git a/minecraft_java/spigot/spigot-enhanced/egg-spigot--enhanced.json b/minecraft_java/spigot/spigot/egg-spigot.json similarity index 78% rename from minecraft_java/spigot/spigot-enhanced/egg-spigot--enhanced.json rename to minecraft_java/spigot/spigot/egg-spigot.json index 2f178d80..fd50a7e8 100644 --- a/minecraft_java/spigot/spigot-enhanced/egg-spigot--enhanced.json +++ b/minecraft_java/spigot/spigot/egg-spigot.json @@ -3,11 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-25T12:20:22-05:00", - "name": "Spigot-Enhanced", + "exported_at": "2019-03-28T15:16:44-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.", - "image": "quay.io\/pterodactyl\/core:java-glibc", + "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-8-jre", "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}", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n apk update\r\n apk add curl\r\n\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 apk add --no-cache curl git openjdk8 openssl\r\n \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 mv BuildTools.jar \/srv\/\r\n\r\n java -jar BuildTools.jar --rev ${SPIGOT_VERSION}\r\n\r\n mv spigot-*.jar \/mnt\/server\/${SERVER_JARFILE}\r\nfi", + "script": "#!\/bin\/ash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n apk add --no-cache --update curl curl git openjdk8 openssl bash\r\n\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 cd \/srv\/\r\n \r\n wget https:\/\/hub.spigotmc.org\/jenkins\/job\/BuildTools\/lastSuccessfulBuild\/artifact\/target\/BuildTools.jar\r\n \r\n mv BuildTools.jar \/srv\/\r\n\r\n java -jar BuildTools.jar --rev ${DL_VERSION}\r\n\r\n mv spigot-*.jar \/mnt\/server\/${SERVER_JARFILE}\r\nfi", "container": "alpine:3.9", "entrypoint": "ash" } @@ -32,15 +32,6 @@ "user_editable": 1, "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" }, - { - "name": "Spigot Version", - "description": "The version of Spigot to download (using the --rev tag). Use \"latest\" for latest.", - "env_variable": "SPIGOT_VERSION", - "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|between:3,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).", @@ -49,6 +40,15 @@ "user_viewable": 0, "user_editable": 0, "rules": "nullable|string" + }, + { + "name": "Spigot Version", + "description": "The version of Spigot to download (using the --rev tag). Use \"latest\" for latest.", + "env_variable": "DL_VERSION", + "default_value": "latest", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|between:3,7" } ] -} +} \ No newline at end of file From 2779e7a8c35cce5da4cca752966413529a75c96c Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Thu, 28 Mar 2019 15:19:17 -0400 Subject: [PATCH 177/393] update paper egg switch to use debian_openjdk-8-jre --- minecraft_java/paper/egg-paper.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/minecraft_java/paper/egg-paper.json b/minecraft_java/paper/egg-paper.json index 4e99297c..9e47b21e 100644 --- a/minecraft_java/paper/egg-paper.json +++ b/minecraft_java/paper/egg-paper.json @@ -3,11 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-03-02T20:29:50-05:00", + "exported_at": "2019-03-28T15:18:36-04: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", + "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-8-jre", "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 \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache --update 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\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\necho -e \"Downloading MC server.properties\"\r\ncurl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_java\/server.properties", + "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache --update 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": "alpine:3.9", "entrypoint": "ash" } From f2c3d85ae44c56463a2348613e8cdc9e1212c134 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 29 Mar 2019 13:04:46 -0400 Subject: [PATCH 178/393] spigot and paper updates Updated spigot install script to install nss. Added README to each paper and spigot. Removed taco-spigot. --- minecraft_java/README.md | 26 +++++------ minecraft_java/paper/README.MD | 11 +++++ minecraft_java/spigot/spigot/README.MD | 19 ++++++++ minecraft_java/spigot/spigot/egg-spigot.json | 4 +- .../spigot/taco-spigot/egg-taco-spigot.json | 45 ------------------- 5 files changed, 45 insertions(+), 60 deletions(-) create mode 100644 minecraft_java/paper/README.MD create mode 100644 minecraft_java/spigot/spigot/README.MD delete mode 100644 minecraft_java/spigot/taco-spigot/egg-taco-spigot.json diff --git a/minecraft_java/README.md b/minecraft_java/README.md index 07a09740..0302be2e 100644 --- a/minecraft_java/README.md +++ b/minecraft_java/README.md @@ -7,19 +7,6 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, ## 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 -A collection of spigot and forked spigot eggs. - -[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) - -[PaperMC GitHub](https://github.com/PaperMC/Paper) -High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies - -[Taco Spigot GitHub](https://github.com/TacoSpigot/TacoSpigot) -An even-higher higher performance PaperSpigot fork that adds new features. - ## Forge [Forge MC](https://files.minecraftforge.net/) This is a direct fork of the default forge service @@ -38,6 +25,19 @@ Supply values to 2 variables to use [FTB Revelation](https://www.feed-the-beast.com/projects/ftb-revelation) Revelation is a general all-purpose modpack with optimal FPS, server performance and stability. +## Paper +Currently the default on pterodactyl for many reasons. First being that you don't need to build the jar. + +## Spigot +A collection of spigot and forked spigot eggs. + +[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) + +[PaperMC GitHub](https://github.com/PaperMC/Paper) +High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies + #### 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! diff --git a/minecraft_java/paper/README.MD b/minecraft_java/paper/README.MD new file mode 100644 index 00000000..87eef00a --- /dev/null +++ b/minecraft_java/paper/README.MD @@ -0,0 +1,11 @@ +# Paper + +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. + + +| Port | default | +|-------|---------| +| Game | 25565 | \ No newline at end of file diff --git a/minecraft_java/spigot/spigot/README.MD b/minecraft_java/spigot/spigot/README.MD new file mode 100644 index 00000000..92ed0f4f --- /dev/null +++ b/minecraft_java/spigot/spigot/README.MD @@ -0,0 +1,19 @@ +# Spigot + +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. + + +| Port | default | +|-------|---------| +| Game | 25565 | + +## Server Specific + +Spigot was hit with a DMCA and now requires that it be built by the user. + +#### 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 diff --git a/minecraft_java/spigot/spigot/egg-spigot.json b/minecraft_java/spigot/spigot/egg-spigot.json index fd50a7e8..c6e06f61 100644 --- a/minecraft_java/spigot/spigot/egg-spigot.json +++ b/minecraft_java/spigot/spigot/egg-spigot.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-03-28T15:16:44-04:00", + "exported_at": "2019-03-29T13:00:51-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.", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n apk add --no-cache --update curl curl git openjdk8 openssl bash\r\n\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 cd \/srv\/\r\n \r\n wget https:\/\/hub.spigotmc.org\/jenkins\/job\/BuildTools\/lastSuccessfulBuild\/artifact\/target\/BuildTools.jar\r\n \r\n mv BuildTools.jar \/srv\/\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\/ash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napk add --no-cache --update curl git openjdk8 openssl bash nss\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 cd \/srv\/\r\n \r\n wget https:\/\/hub.spigotmc.org\/jenkins\/job\/BuildTools\/lastSuccessfulBuild\/artifact\/target\/BuildTools.jar\r\n \r\n mv BuildTools.jar \/srv\/\r\n\r\n java -jar BuildTools.jar --rev ${DL_VERSION}\r\n\r\n mv spigot-*.jar \/mnt\/server\/${SERVER_JARFILE}\r\nfi", "container": "alpine:3.9", "entrypoint": "ash" } diff --git a/minecraft_java/spigot/taco-spigot/egg-taco-spigot.json b/minecraft_java/spigot/taco-spigot/egg-taco-spigot.json deleted file mode 100644 index aff41987..00000000 --- a/minecraft_java/spigot/taco-spigot/egg-taco-spigot.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": "2018-03-10T00:34:01-06:00", - "name": "Taco Spigot", - "author": "hostmaster@waterfallgaming.net", - "description": "A even-higher higher performance PaperSpigot fork that adds new features.", - "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\/ash\r\n# Taco Spigot 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\nif [ -z \"${DL_VERSION}\" ] || [ \"${DL_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=\"lastSuccessfulBuild\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/ci.techcable.net\/job\/TacoSpigot\/${DL_VERSION}\/artifact\/build\/TacoSpigot.jar", - "container": "alpine:3.9", - "entrypoint": "ash" - } - }, - "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": 1, - "user_editable": 1, - "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" - }, - { - "name": "TacoSpigot Version", - "description": "The version of TacoSpigot to download, Use \"latest\" for latest.", - "env_variable": "DL_VERSION", - "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|between:3,7" - } - ] -} From 2e614bf600fa191c6b805e7afb5d43729d9f5592 Mon Sep 17 00:00:00 2001 From: Maximilian Welt Date: Sun, 31 Mar 2019 11:33:25 +0200 Subject: [PATCH 179/393] Realize you were on the wrong branch. --- README.md | 1 - arma/arma3_headless_client/README.md | 20 ---- .../egg-arma3-headless-client.json | 99 ------------------- 3 files changed, 120 deletions(-) delete mode 100644 arma/arma3_headless_client/README.md delete mode 100644 arma/arma3_headless_client/egg-arma3-headless-client.json diff --git a/README.md b/README.md index 46e82e0a..0841502c 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,6 @@ If you submit a PR without filling out the template I will deny it. This is for [Arma](/arma/) * [Arma 3](/arma/arma3/) -* [Arma 3 HC](/arma/arma3_headless_client/) [Conan Exiles](/conan_exiles/conan_exiles) diff --git a/arma/arma3_headless_client/README.md b/arma/arma3_headless_client/README.md deleted file mode 100644 index cc556772..00000000 --- a/arma/arma3_headless_client/README.md +++ /dev/null @@ -1,20 +0,0 @@ -# Arma 3 Headless Client -### From their [Site](https://community.bistudio.com/wiki/Arma_3_Headless_Client) -What is a Headless Client (HC) used for? -* Headless Client is used to offload AI calculations from the server -* Headless Client is integrated into game client and dedicated server executable (WIndows and Linux, use -client parameter) -* The server doesn't allow arbitrary connections from headless clients if you do not define the headless clients IPs in the server.cfg, - -### But why? -If you host an Arma 3 Server with lots of AI in it, the Server FPS will drop pretty fast. -Since the server files are only 32 Bit you will need some kind of magical assistant to prevent slow AI. - -### Minimum RAM warning -This server requires about 2048m to run properly. ARMA 3 is more CPU intensive though. - -### Additional settings -Additional server flags can be found [here](https://community.bistudio.com/wiki/Arma_3_Startup_Parameters). -This can help is you see the server using to many cores/threads on the server. - -### Server Ports -Since this is basically a client, this Egg does not need a port. diff --git a/arma/arma3_headless_client/egg-arma3-headless-client.json b/arma/arma3_headless_client/egg-arma3-headless-client.json deleted file mode 100644 index 11c89e45..00000000 --- a/arma/arma3_headless_client/egg-arma3-headless-client.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2019-03-25T14:09:36+01:00", - "name": "Arma 3 Headless Client", - "author": "brainp4in@blueberry-hood-clan.de", - "description": "Headless Clients are used to offload AI calculations from the Arma 3 Server.", - "image": "quay.io\/parkervcp\/pterodactyl-images:game_arma3", - "startup": ".\/arma3server -client -connect={{SERVERIP}} -port={{SERVERPORT}} {{CUSTOM}} -mod=\"{{MODS}}\"", - "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"Client connected\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"latest.log\"\r\n}", - "stop": "^C" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl\r\napt -y --no-install-recommends install lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSLO http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd \/mnt\/server\/logs\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\n\r\ntouch \/mnt\/server\/latest.log\r\nchown -R root:root \/mnt\r\n\r\ntar -xzvf \/tmp\/steamcmd_linux.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\nexport HOME=\/mnt\/server\r\n\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${APP_ID} validate +quit\r\n\r\ncd \/mnt\/server\/\r\ncurl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/arma\/arma3\/egg-arma3-config\/server.cfg\r\ncurl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/arma\/arma3\/egg-arma3-config\/basic.cfg", - "container": "ubuntu:18.04", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Game App ID", - "description": "Steam CMD App ID.", - "env_variable": "APP_ID", - "default_value": "233780", - "user_viewable": 1, - "user_editable": 0, - "rules": "required|alpha_dash|between:1,100" - }, - { - "name": "Server IP", - "description": "IP address of the Arma 3 server that should be supported by the Headless Client.", - "env_variable": "SERVERIP", - "default_value": "127.0.0.1", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:30" - }, - { - "name": "Server Port", - "description": "Port of the Arma 3 server that should be supported by the Headless Client.", - "env_variable": "SERVERPORT", - "default_value": "2302", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:5" - }, - { - "name": "Custom Command Line Option.", - "description": "Put -autoinit or related things in here :)", - "env_variable": "CUSTOM", - "default_value": "", - "user_viewable": 1, - "user_editable": 1, - "rules": "string|nullable" - }, - { - "name": "Mods", - "description": "This is where you put mods that go along with the -mods startup option", - "env_variable": "MODS", - "default_value": "", - "user_viewable": 1, - "user_editable": 1, - "rules": "string|nullable" - }, - { - "name": "Steam User", - "description": "A Steam username with Arma3 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 bd11ca1cfdd5eb64a78e62c31ca0d157f5533270 Mon Sep 17 00:00:00 2001 From: BrainP4in Date: Mon, 1 Apr 2019 13:13:05 +0200 Subject: [PATCH 180/393] =?UTF-8?q?Don=E2=80=99t=20override=20customized?= =?UTF-8?q?=20configuration=20files.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arma/arma3/egg-arma3.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arma/arma3/egg-arma3.json b/arma/arma3/egg-arma3.json index 7e4264ab..6cafce19 100644 --- a/arma/arma3/egg-arma3.json +++ b/arma/arma3/egg-arma3.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl\r\napt -y --no-install-recommends install lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSLO http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd \/mnt\/server\/logs\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\n\r\ntouch \/mnt\/server\/latest.log\r\nchown -R root:root \/mnt\r\n\r\ntar -xzvf \/tmp\/steamcmd_linux.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\nexport HOME=\/mnt\/server\r\n\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${APP_ID} validate +quit\r\n\r\ncd \/mnt\/server\/\r\ncurl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/arma\/arma3\/egg-arma3-config\/basic.cfg\r\ncurl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/arma\/arma3\/egg-arma3-config\/server.cfg", + "script": "#!\/bin\/bash\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl\r\napt -y --no-install-recommends install lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSLO http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd \/mnt\/server\/logs\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\n\r\ntouch \/mnt\/server\/latest.log\r\nchown -R root:root \/mnt\r\n\r\ntar -xzvf \/tmp\/steamcmd_linux.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\nexport HOME=\/mnt\/server\r\n\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${APP_ID} validate +quit\r\n\r\ncd \/mnt\/server\/\r\n[[ -f basic.cfg ]] || curl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/arma\/arma3\/egg-arma3-config\/basic.cfg\r\n[[ -f server.cfg ]] || curl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/arma\/arma3\/egg-arma3-config\/server.cfg", "container": "ubuntu:18.04", "entrypoint": "bash" } @@ -105,4 +105,4 @@ "rules": "nullable|string" } ] -} \ No newline at end of file +} From b9396c615350ca6c555cb9e758955c3209b8fc0b Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Mon, 1 Apr 2019 09:45:21 -0400 Subject: [PATCH 181/393] add discord.js generic egg Add a generic discord,js egg. add README to all the bot eggs. --- README.md | 4 +- bots/discord/README.md | 4 ++ bots/discord/atlbot/README.md | 6 +++ .../atlbot/{bot => }/egg-a-t-l-bot.json | 0 bots/discord/bastion/README.md | 9 ++++ bots/discord/discord.js/README.md | 5 ++ .../discord.js/egg-discord-js-generic.json | 54 +++++++++++++++++++ bots/discord/parkertron/README.md | 8 +++ bots/discord/pixelbot/README.md | 9 ++++ bots/discord/sinusbot/README.md | 15 ++++++ 10 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 bots/discord/atlbot/README.md rename bots/discord/atlbot/{bot => }/egg-a-t-l-bot.json (100%) create mode 100644 bots/discord/bastion/README.md create mode 100644 bots/discord/discord.js/README.md create mode 100644 bots/discord/discord.js/egg-discord-js-generic.json create mode 100644 bots/discord/parkertron/README.md create mode 100644 bots/discord/pixelbot/README.md create mode 100644 bots/discord/sinusbot/README.md diff --git a/README.md b/README.md index 0841502c..82b31b09 100644 --- a/README.md +++ b/README.md @@ -29,10 +29,12 @@ If you submit a PR without filling out the template I will deny it. This is for ## Bot Eggs [Discord](/bots/discord/) -* [ATL Bot](/bots/discord/atlbot) Node JS +* [ATL Bot](/bots/discord/atlbot/) Node JS * [parkertron](/bots/discord/parkertron/) Golang * [pixel-bot](/bots/discord/pixelbot/) Python +* [discord.js](bots/discord/discord.js/) * [Sinusbot](/bots/discord/sinusbot/) +* [Bastion](/bots/discord/bastion/) ## Game Eggs diff --git a/bots/discord/README.md b/bots/discord/README.md index 06cfbb6e..8615f33f 100644 --- a/bots/discord/README.md +++ b/bots/discord/README.md @@ -2,6 +2,10 @@ ### Some of these bots support other services but are primarily Discord bots +#### Generic Discord.js bot egg +discord.js +A generic discord.js bot egg. Meant to pull from a repo can also be used where a user can upload the files on their own. + #### ATLauncher Discord Bot [ATLauncher/discord-bot](https://github.com/ATLauncher/discord-bot) Their github has all the info you need diff --git a/bots/discord/atlbot/README.md b/bots/discord/atlbot/README.md new file mode 100644 index 00000000..008d3906 --- /dev/null +++ b/bots/discord/atlbot/README.md @@ -0,0 +1,6 @@ +# ATLBot +### 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 diff --git a/bots/discord/atlbot/bot/egg-a-t-l-bot.json b/bots/discord/atlbot/egg-a-t-l-bot.json similarity index 100% rename from bots/discord/atlbot/bot/egg-a-t-l-bot.json rename to bots/discord/atlbot/egg-a-t-l-bot.json diff --git a/bots/discord/bastion/README.md b/bots/discord/bastion/README.md new file mode 100644 index 00000000..c57d5814 --- /dev/null +++ b/bots/discord/bastion/README.md @@ -0,0 +1,9 @@ +# 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. + +### Server Ports +No Ports are required for the bastion bot. \ No newline at end of file diff --git a/bots/discord/discord.js/README.md b/bots/discord/discord.js/README.md new file mode 100644 index 00000000..7a241119 --- /dev/null +++ b/bots/discord/discord.js/README.md @@ -0,0 +1,5 @@ +# discord.js generic + +This egg was designed to allow a user to pull their own nodejs discord bot from a repo. + +There is an option to allow a user to upload their own files to run a bot. \ No newline at end of file diff --git a/bots/discord/discord.js/egg-discord-js-generic.json b/bots/discord/discord.js/egg-discord-js-generic.json new file mode 100644 index 00000000..4286b00a --- /dev/null +++ b/bots/discord/discord.js/egg-discord-js-generic.json @@ -0,0 +1,54 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-04-01T09:21:41-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.", + "image": "quay.io\/parkervcp\/pterodactyl-images:bot_discordjs", + "startup": "\/usr\/local\/bin\/node \/home\/container\/index.js", + "config": { + "files": "{}", + "startup": "{}", + "logs": "{}", + "stop": "^c" + }, + "scripts": { + "installation": { + "script": "#\/bin\/ash\r\n\r\napk add --no-cache git\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", + "container": "node:10-alpine", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Install Repo", + "description": "The git repo to clone and install the discord js bot from", + "env_variable": "INSTALL_REPO", + "default_value": "", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|string|max:128" + }, + { + "name": "Install Branch", + "description": "The branch of the bot to install", + "env_variable": "INSTALL_BRANCH", + "default_value": "", + "user_viewable": 1, + "user_editable": 0, + "rules": "nullable|string|max:32" + }, + { + "name": "User Uploaded Files", + "description": "Skip all the install cruft is you are just letting a user upload files.\r\n\r\n0 = false (default)\r\n1 = true", + "env_variable": "USER_UPLOAD", + "default_value": "0", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|bool" + } + ] +} \ No newline at end of file diff --git a/bots/discord/parkertron/README.md b/bots/discord/parkertron/README.md new file mode 100644 index 00000000..99f14234 --- /dev/null +++ b/bots/discord/parkertron/README.md @@ -0,0 +1,8 @@ +# ATLBot +### 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 diff --git a/bots/discord/pixelbot/README.md b/bots/discord/pixelbot/README.md new file mode 100644 index 00000000..4726344e --- /dev/null +++ b/bots/discord/pixelbot/README.md @@ -0,0 +1,9 @@ +# pixelbot +### 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 diff --git a/bots/discord/sinusbot/README.md b/bots/discord/sinusbot/README.md new file mode 100644 index 00000000..9fe05294 --- /dev/null +++ b/bots/discord/sinusbot/README.md @@ -0,0 +1,15 @@ +# 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! + +### 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 From b61159d745cf0c964fc17c725b1c494b477d2fc0 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Mon, 1 Apr 2019 15:17:36 -0400 Subject: [PATCH 182/393] update discord.js egg change the repo vairable from required to nullable. --- 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 4286b00a..7bd0d3b7 100644 --- a/bots/discord/discord.js/egg-discord-js-generic.json +++ b/bots/discord/discord.js/egg-discord-js-generic.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-04-01T09:21:41-04:00", + "exported_at": "2019-04-01T15:16:34-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.", @@ -30,7 +30,7 @@ "default_value": "", "user_viewable": 1, "user_editable": 0, - "rules": "required|string|max:128" + "rules": "nullable|string|max:128" }, { "name": "Install Branch", From 3353645951ca1836e125e76631bf8b3fe45a06fe Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 3 Apr 2019 08:43:03 -0400 Subject: [PATCH 183/393] update ftb install script Update ftb install script due to some servers not having an install script. --- .../ftb/feed-the-beast/egg-feed-the-beast.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json b/minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json index e84cdd79..b17f3c04 100644 --- a/minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json +++ b/minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-04-02T17:20:55-04:00", + "exported_at": "2019-04-03T08:08:25-04:00", "name": "Feed the Beast", "author": "aevum@decess.us", "description": "Egg to handle all official FTB Modpacks", - "image": "quay.io\/pterodactyl\/core:java", - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar FTBserver-*.jar", + "image": "quay.io\/pterodactyl\/core:java-glibc", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar FTBserv*.jar", "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 \"level-name\": \"{{server.build.env.LEVEL_NAME}}\",\r\n \"level-seed\": \"{{server.build.env.LEVEL_SEED}}\",\r\n \"max-players\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"motd\": \"{{server.build.env.MOTD}}\"\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}", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Generic FTB Server Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# MODPACK_VERSION = version of the modpack, set in variables\r\n# i.e MODPACK_VERSION=1.5.0\r\n# MODPACK_URL = url base of the pack, set in variables, hardcoded\r\n# i.e https:\/\/www.feed-the-beast.com\/projects\/ftb-revelation\/files\r\n# MODPACK_URL=ftb-revelation\r\n\r\napk add curl --no-cache\r\n\r\n## Correcting for bad variables\r\nGETPACK=$(echo ${MODPACK_URL} | cut -d \"\/\" -f 5 )\r\necho -e \"\\n The pack being downloaded is $GETPACK \\n\"\r\n\r\n## Getting the Base URL\r\nBASEURL=https:\/\/www.feed-the-beast.com\/projects\/${GETPACK}\/files\r\necho \"The base URL is ${BASEURL}\"\r\n\r\n## This is meant to get the pack ID that is unique and not exactly clear \r\n\r\n\r\nif [ -z \"${MODPACK_VERSION}\" ] || [ \"${MODPACK_VERSION}\" == \"latest\" ]; then\r\n ID=`curl -sl ${BASEURL} | grep -i -A9 'title=\"release\"' | grep -i -o 'href=\".*\"' | cut -d \"\/\" -f5 | sed s\/\\\"\/\/g`\r\n echo \"ID: ${ID}\"\r\nelse \r\n ID=`curl -sl ${BASEURL} | grep -i -A9 \"${MODPACK_VERSION}\" | grep -m1 -oE 'href=\"[^\\\"]+\"' | cut -d \"\/\" -f5 | grep -oE [0-9]+`\r\n echo \"ID: ${ID}\"\r\nfi\r\n\r\nSECONDURL=${BASEURL}\/${ID}\r\necho \"SECONDURL: ${SECONDURL}\"\r\n\r\nGOOD_ID=`curl -sl ${SECONDURL} | grep -i server | grep -Eo 'href=\"[^\\\"]+\"' | grep -o -E \"[0-9]+\" | tail -1`\r\necho \"GOOD_ID: ${GOOD_ID}\"\r\n\r\nDL_URL=${BASEURL}\/${GOOD_ID}\/download\r\necho \"Download_URL: ${DL_URL}\"\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Executing curl -L ${DL_URL} -o $GETPACK.zip\"\r\ncurl -L ${DL_URL} -o $GETPACK.zip\r\n\r\nunzip ${GETPACK}.zip\r\n\r\nrm -rf ${GETPACK}.zip\r\n\r\necho \"Running FTBInstall.sh\"\r\n\r\nsh .\/FTBInstall.sh", + "script": "#!\/bin\/ash\r\n# Generic FTB Server Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# MODPACK_VERSION = version of the modpack, set in variables\r\n# i.e MODPACK_VERSION=1.5.0\r\n# MODPACK_URL = url base of the pack, set in variables, hardcoded\r\n# i.e https:\/\/www.feed-the-beast.com\/projects\/ftb-revelation\/files\r\n# MODPACK_URL=ftb-revelation\r\n\r\napk add curl --no-cache\r\n\r\n## Correcting for bad variables\r\nGETPACK=$(echo ${MODPACK_URL} | cut -d \"\/\" -f 5 )\r\necho -e \"\\n The pack being downloaded is $GETPACK \\n\"\r\n\r\n## Getting the Base URL\r\nBASEURL=https:\/\/www.feed-the-beast.com\/projects\/${GETPACK}\/files\r\necho \"The base URL is ${BASEURL}\"\r\n\r\n## This is meant to get the pack ID that is unique and not exactly clear \r\n\r\n\r\nif [ -z \"${MODPACK_VERSION}\" ] || [ \"${MODPACK_VERSION}\" == \"latest\" ]; then\r\n ID=`curl -sl ${BASEURL} | grep -i -A9 'title=\"release\"' | grep -i -o 'href=\".*\"' | cut -d \"\/\" -f5 | sed s\/\\\"\/\/g`\r\n echo \"ID: ${ID}\"\r\nelse \r\n ID=`curl -sl ${BASEURL} | grep -i -A9 \"${MODPACK_VERSION}\" | grep -m1 -oE 'href=\"[^\\\"]+\"' | cut -d \"\/\" -f5 | grep -oE [0-9]+`\r\n echo \"ID: ${ID}\"\r\nfi\r\n\r\nSECONDURL=${BASEURL}\/${ID}\r\necho \"SECONDURL: ${SECONDURL}\"\r\n\r\nGOOD_ID=`curl -sl ${SECONDURL} | grep -i server | grep -Eo 'href=\"[^\\\"]+\"' | grep -o -E \"[0-9]+\" | tail -1`\r\necho \"GOOD_ID: ${GOOD_ID}\"\r\n\r\nDL_URL=${BASEURL}\/${GOOD_ID}\/download\r\necho \"Download_URL: ${DL_URL}\"\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Executing curl -L ${DL_URL} -o $GETPACK.zip\"\r\ncurl -L ${DL_URL} -o $GETPACK.zip\r\n\r\nunzip ${GETPACK}.zip\r\n\r\nrm -rf ${GETPACK}.zip\r\n\r\necho \"Running FTBInstall.sh\"\r\nif [ -f .\/FTBInstall.sh ]; then\r\n sh .\/FTBInstall.sh\r\nelse\r\n echo -e \"No FTBInstall script found. Assumeing it's not needed.\"\r\nfi", "container": "alpine:3.9", "entrypoint": "ash" } @@ -30,7 +30,7 @@ "default_value": "", "user_viewable": 1, "user_editable": 1, - "rules": "required|regex:([a-z-0-9]+$)" + "rules": "nullable|regex:([a-z-0-9]+$)" }, { "name": "Modpack Version", @@ -78,4 +78,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From e247abb738a840cb8ae0503a234073d81a7a6d5b Mon Sep 17 00:00:00 2001 From: StealWonders Date: Sun, 7 Apr 2019 21:14:46 +0200 Subject: [PATCH 184/393] Updated files to be more up to date. --- .../forge/forge-generic/egg-forge-generic.json | 6 +++--- .../ftb/feed-the-beast/egg-feed-the-beast.json | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/minecraft_java/forge/forge-generic/egg-forge-generic.json b/minecraft_java/forge/forge-generic/egg-forge-generic.json index c49ff454..d09c03a4 100644 --- a/minecraft_java/forge/forge-generic/egg-forge-generic.json +++ b/minecraft_java/forge/forge-generic/egg-forge-generic.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-03-15T16:25:38+00:00", + "exported_at": "2019-03-24T23:33:30-04:00", "name": "Forge Generic", "author": "parker@parkervcp.com", "description": "A generic egg for a forge modpack", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk update\r\napk add curl\r\n\r\nBASE_URL=${MODPACK_URL}\/files\r\n\r\nif [ -z \"${MODPACK_VERSION}\" ] || [ \"${MODPACK_VERSION}\" == \"latest\" ]; then\r\n ID=`curl -sl ${BASE_URL} | grep -i -A9 'title=\"release\"' | grep -m 1 -i -o 'href=\".*\"' | cut -d \"\/\" -f5 | sed s\/\\\"\/\/g`\r\n echo \"ID: ${ID}\"\r\nelse \r\n ID=`curl -sl ${BASE_URL} | grep -i -A9 \"${MODPACK_VERSION}\" | grep -m 1 -oE 'href=\"[^\\\"]+\"' | cut -d \"\/\" -f5 | grep -oE [0-9]+`\r\n echo \"ID: ${ID}\"\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n\r\nSECONDURL=${BASE_URL}\/${ID}\r\necho \"SECONDURL: ${SECONDURL}\"\r\n\r\nGOOD_ID=`curl -sl ${SECONDURL} | grep -i server | grep -Eo 'href=\"[^\\\"]+\"' | grep -o -E \"[0-9]+\" | tail -1`\r\necho \"GOOD_ID: ${GOOD_ID}\"\r\n\r\nDL_URL=${BASE_URL}\/${GOOD_ID}\/download\r\necho \"Download_URL: ${DL_URL}\"\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Executing curl -L ${DL_URL} -o server.zip\"\r\ncurl -L ${DL_URL} -o server.zip\r\n\r\nunzip server.zip\r\n\r\nrm -rf server.zip\r\n\r\necho -e \"\\nInstalling forge server usint the installer jar file.\\n\"\r\njava -jar *installer.jar --installServer\r\n\r\necho -e \"\\nDeleting installer jar file and cleaning up.\\n\"\r\nrm -rf *installer.jar\r\n\r\nmv *universal.jar server.jar", + "script": "#!\/bin\/ash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nfunction install_required {\r\n apk --no-cache --update add curl jq\r\n}\r\n\r\nfunction get_download {\r\n BASE_URL=${MODPACK_URL}\/files\r\n\r\n if [ -z \"${MODPACK_VERSION}\" ] || [ \"${MODPACK_VERSION}\" == \"latest\" ]; then\r\n ID=`curl -sl ${BASE_URL} | grep -i -A9 'title=\"release\"' | grep -m 1 -i -o 'href=\".*\"' | cut -d \"\/\" -f5 | sed s\/\\\"\/\/g`\r\n echo \"ID: ${ID}\"\r\n else\r\n ID=`curl -sl ${BASE_URL} | grep -i -A9 \"${MODPACK_VERSION}\" | grep -m 1 -oE 'href=\"[^\\\"]+\"' | cut -d \"\/\" -f5 | grep -oE [0-9]+`\r\n echo \"ID: ${ID}\"\r\n fi\r\n\r\n SECONDURL=${BASE_URL}\/${ID}\r\n echo \"SECONDURL: ${SECONDURL}\"\r\n\r\n GOOD_ID=`curl -sl ${SECONDURL} | grep -i server | grep -Eo 'href=\"[^\\\"]+\"' | grep -o -E \"[0-9]+\" | tail -1`\r\n if [ -z \"$GOOD_ID\" ]; then\r\n GOOD_ID=$ID\r\n fi\r\n echo \"GOOD_ID: ${GOOD_ID}\"\r\n\r\n DL_URL=${BASE_URL}\/${GOOD_ID}\/download\r\n echo \"Download_URL: ${DL_URL}\"\r\n\r\n cd \/mnt\/server\r\n\r\n echo \"Executing curl -L ${DL_URL} -o server.zip\"\r\n curl -L ${DL_URL} -o server.zip\r\n\r\n unzip server.zip\r\n\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 java -jar *installer.jar --installServer\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\r\n mv *universal.jar server.jar\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=\"https:\/\/minecraft.curseforge.com\/projects\/${projID}\/files\/${fileID}\/download\"\r\n echo \"mods file url: ${URL}\"\r\n # this is saving everything as \/mnt\/server\/mods\/download\r\n FINAL_URL=$(curl $URL -s -L -o \/dev\/null -w '%{url_effective}')\r\n echo \"Mod direct url: $FINAL_URL\"\r\n curl -JLO ${FINAL_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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\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\ninstall_required\r\nget_download\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\nelse\r\n forge_install\r\n forge_cleanup\r\nfi", "container": "openjdk:8-alpine", "entrypoint": "ash" } @@ -30,7 +30,7 @@ "default_value": "", "user_viewable": 1, "user_editable": 1, - "rules": "required|string|max:64" + "rules": "required|string" }, { "name": "Modpack Version", diff --git a/minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json b/minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json index e6ffa4e8..0abb5b48 100644 --- a/minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json +++ b/minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-03-15T16:25:38+00:00", + "exported_at": "2019-04-03T08:08:25-04:00", "name": "Feed the Beast", "author": "aevum@decess.us", "description": "Egg to handle all official FTB Modpacks", - "image": "quay.io\/pterodactyl\/core:java", - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar FTBserver-*.jar", + "image": "quay.io\/pterodactyl\/core:java-glibc", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar FTBserv*.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 \"level-name\": \"{{server.build.env.LEVEL_NAME}}\",\r\n \"level-seed\": \"{{server.build.env.LEVEL_SEED}}\",\r\n \"max-players\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"motd\": \"{{server.build.env.MOTD}}\"\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}", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Generic FTB Server Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# MODPACK_VERSION = version of the modpack, set in variables\r\n# i.e MODPACK_VERSION=1.5.0\r\n# MODPACK_URL = url base of the pack, set in variables, hardcoded\r\n# i.e https:\/\/www.feed-the-beast.com\/projects\/ftb-revelation\/files\r\n# MODPACK_URL=ftb-revelation\r\n\r\napk add curl --no-cache\r\n\r\n## Correcting for bad variables\r\nGETPACK=$(echo ${MODPACK_URL} | cut -d \"\/\" -f 5 )\r\necho -e \"\\n The pack being downloaded is $GETPACK \\n\"\r\n\r\n## Getting the Base URL\r\nBASEURL=https:\/\/www.feed-the-beast.com\/projects\/${GETPACK}\/files\r\necho \"The base URL is ${BASEURL}\"\r\n\r\n## This is meant to get the pack ID that is unique and not exactly clear \r\n\r\n\r\nif [ -z \"${MODPACK_VERSION}\" ] || [ \"${MODPACK_VERSION}\" == \"latest\" ]; then\r\n ID=`curl -sl ${BASEURL} | grep -i -A9 'title=\"release\"' | grep -i -o 'href=\".*\"' | cut -d \"\/\" -f5 | sed s\/\\\"\/\/g`\r\n echo \"ID: ${ID}\"\r\nelse \r\n ID=`curl -sl ${BASEURL} | grep -i -A9 \"${MODPACK_VERSION}\" | grep -m1 -oE 'href=\"[^\\\"]+\"' | cut -d \"\/\" -f5 | grep -oE [0-9]+`\r\n echo \"ID: ${ID}\"\r\nfi\r\n\r\nSECONDURL=${BASEURL}\/${ID}\r\necho \"SECONDURL: ${SECONDURL}\"\r\n\r\nGOOD_ID=`curl -sl ${SECONDURL} | grep -i server | grep -Eo 'href=\"[^\\\"]+\"' | grep -o -E \"[0-9]+\" | tail -1`\r\necho \"GOOD_ID: ${GOOD_ID}\"\r\n\r\nDL_URL=${BASEURL}\/${GOOD_ID}\/download\r\necho \"Download_URL: ${DL_URL}\"\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Executing curl -L ${DL_URL} -o $GETPACK.zip\"\r\ncurl -L ${DL_URL} -o $GETPACK.zip\r\n\r\nunzip ${GETPACK}.zip\r\n\r\nrm -rf ${GETPACK}.zip\r\n\r\necho \"Running FTBInstall.sh\"\r\n\r\nsh .\/FTBInstall.sh", + "script": "#!\/bin\/ash\r\n# Generic FTB Server Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# MODPACK_VERSION = version of the modpack, set in variables\r\n# i.e MODPACK_VERSION=1.5.0\r\n# MODPACK_URL = url base of the pack, set in variables, hardcoded\r\n# i.e https:\/\/www.feed-the-beast.com\/projects\/ftb-revelation\/files\r\n# MODPACK_URL=ftb-revelation\r\n\r\napk add curl --no-cache\r\n\r\n## Correcting for bad variables\r\nGETPACK=$(echo ${MODPACK_URL} | cut -d \"\/\" -f 5 )\r\necho -e \"\\n The pack being downloaded is $GETPACK \\n\"\r\n\r\n## Getting the Base URL\r\nBASEURL=https:\/\/www.feed-the-beast.com\/projects\/${GETPACK}\/files\r\necho \"The base URL is ${BASEURL}\"\r\n\r\n## This is meant to get the pack ID that is unique and not exactly clear \r\n\r\n\r\nif [ -z \"${MODPACK_VERSION}\" ] || [ \"${MODPACK_VERSION}\" == \"latest\" ]; then\r\n ID=`curl -sl ${BASEURL} | grep -i -A9 'title=\"release\"' | grep -i -o 'href=\".*\"' | cut -d \"\/\" -f5 | sed s\/\\\"\/\/g`\r\n echo \"ID: ${ID}\"\r\nelse \r\n ID=`curl -sl ${BASEURL} | grep -i -A9 \"${MODPACK_VERSION}\" | grep -m1 -oE 'href=\"[^\\\"]+\"' | cut -d \"\/\" -f5 | grep -oE [0-9]+`\r\n echo \"ID: ${ID}\"\r\nfi\r\n\r\nSECONDURL=${BASEURL}\/${ID}\r\necho \"SECONDURL: ${SECONDURL}\"\r\n\r\nGOOD_ID=`curl -sl ${SECONDURL} | grep -i server | grep -Eo 'href=\"[^\\\"]+\"' | grep -o -E \"[0-9]+\" | tail -1`\r\necho \"GOOD_ID: ${GOOD_ID}\"\r\n\r\nDL_URL=${BASEURL}\/${GOOD_ID}\/download\r\necho \"Download_URL: ${DL_URL}\"\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Executing curl -L ${DL_URL} -o $GETPACK.zip\"\r\ncurl -L ${DL_URL} -o $GETPACK.zip\r\n\r\nunzip ${GETPACK}.zip\r\n\r\nrm -rf ${GETPACK}.zip\r\n\r\necho \"Running FTBInstall.sh\"\r\nif [ -f .\/FTBInstall.sh ]; then\r\n sh .\/FTBInstall.sh\r\nelse\r\n echo -e \"No FTBInstall script found. Assumeing it's not needed.\"\r\nfi", "container": "alpine:3.9", "entrypoint": "ash" } @@ -30,7 +30,7 @@ "default_value": "", "user_viewable": 1, "user_editable": 1, - "rules": "required|regex:([a-z-0-9]+$)" + "rules": "nullable|regex:([a-z-0-9]+$)" }, { "name": "Modpack Version", From ba7a292969a15eb4c016486cb276bed503d6eab7 Mon Sep 17 00:00:00 2001 From: StealWonders Date: Mon, 8 Apr 2019 12:44:54 +0200 Subject: [PATCH 185/393] Removed no longer existing files to be up to date. --- .../forge-enhanced/egg-forge--enhanced.json | 45 ---------------- .../spigot-enhanced/egg-spigot--enhanced.json | 54 ------------------- .../spigot/taco-spigot/egg-taco-spigot.json | 45 ---------------- 3 files changed, 144 deletions(-) delete mode 100644 minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json delete mode 100644 minecraft_java/spigot/spigot-enhanced/egg-spigot--enhanced.json delete mode 100644 minecraft_java/spigot/taco-spigot/egg-taco-spigot.json diff --git a/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json b/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.json deleted file mode 100644 index c4f41b31..00000000 --- a/minecraft_java/forge/forge-enhanced/egg-forge--enhanced.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": "2019-03-15T16:25:38+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.", - "image": "quay.io\/pterodactyl\/core:java", - "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 \"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\r\n\r\n#Fetching version\r\nif [ -z \"$MC_VERSION\" ] || [ \"$MC_VERSION\" == \"latest\" ]; then\r\n echo \"Fetching latest\"\r\n MC_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index.html | grep -A 2 \"Latest\" | awk NF=NF RS= OFS=\" \" | grep -o -e '[1].[0-9]*.[0-9]* - [0-9]*.[0-9]*.[0-9]*.[0-9]*' | sed 's\/ \/\/g')\r\nelif [[ ! \"$MC_VERSION\" =~ - ]]; then\r\n echo \"Fetching latest from version $MC_VERSION\"\r\n MC_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index_$MC_VERSION.html | grep -A 2 \"Latest\" | awk NF=NF RS= OFS=\" \" | grep -o -e '[1].[0-9]*.[0-9]* - [0-9]*.[0-9]*.[0-9]*.[0-9]*' | sed 's\/ \/\/g')\r\nfi\r\n\r\n#Checking if forge version valid\r\nif [[ ! \"$MC_VERSION\" =~ [1].[0-9]*.[0-9]*-[0-9]*.[0-9]*.[0-9]*.[0-9]* ]]; then\r\n echo \"!!! Invalid forge version \\\"$MC_VERSION\\\" !!!\"\r\n exit\r\nfi\r\n\r\n#Go into main direction\r\ncd \/mnt\/server\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 \\\"$MC_VERSION\\\"\"\r\ncurl -o installer.jar -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$MC_VERSION\/forge-$MC_VERSION-installer.jar\r\ncurl -o $SERVER_JARFILE -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$MC_VERSION\/forge-$MC_VERSION-universal.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ] || [ ! -f .\/$SERVER_JARFILE ]; then\r\n echo \"!!! Error by downloading forge version \\\"$MC_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\r\n\r\n#Deleting installer.jar\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar", - "container": "openjdk:8", - "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": 1, - "user_editable": 1, - "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" - }, - { - "name": "Forge version", - "description": "The version of forge that you want to run.\r\nExamples:\r\n- 1.12.2\r\n- 1.12.2-14.23.5.2810", - "env_variable": "MC_VERSION", - "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:22" - } - ] -} \ No newline at end of file diff --git a/minecraft_java/spigot/spigot-enhanced/egg-spigot--enhanced.json b/minecraft_java/spigot/spigot-enhanced/egg-spigot--enhanced.json deleted file mode 100644 index e1e92732..00000000 --- a/minecraft_java/spigot/spigot-enhanced/egg-spigot--enhanced.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": "2019-03-15T16:25:38+00:00", - "name": "Spigot-Enhanced", - "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.", - "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 \"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\/ash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n apk update\r\n apk add curl\r\n\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 apk add --no-cache curl git openjdk8 openssl\r\n \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 mv BuildTools.jar \/srv\/\r\n\r\n java -jar BuildTools.jar --rev ${SPIGOT_VERSION}\r\n\r\n mv spigot-*.jar \/mnt\/server\/${SERVER_JARFILE}\r\nfi", - "container": "alpine:3.9", - "entrypoint": "ash" - } - }, - "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": 1, - "user_editable": 1, - "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" - }, - { - "name": "Spigot Version", - "description": "The version of Spigot to download (using the --rev tag). Use \"latest\" for latest.", - "env_variable": "SPIGOT_VERSION", - "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|between:3,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).", - "env_variable": "DL_PATH", - "default_value": "", - "user_viewable": 0, - "user_editable": 0, - "rules": "nullable|string" - } - ] -} diff --git a/minecraft_java/spigot/taco-spigot/egg-taco-spigot.json b/minecraft_java/spigot/taco-spigot/egg-taco-spigot.json deleted file mode 100644 index ac92c047..00000000 --- a/minecraft_java/spigot/taco-spigot/egg-taco-spigot.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": "2019-03-15T16:25:38+00:00", - "name": "Taco Spigot", - "author": "hostmaster@waterfallgaming.net", - "description": "A even-higher higher performance PaperSpigot fork that adds new features.", - "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 \"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\/ash\r\n# Taco Spigot 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\nif [ -z \"${DL_VERSION}\" ] || [ \"${DL_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=\"lastSuccessfulBuild\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/ci.techcable.net\/job\/TacoSpigot\/${DL_VERSION}\/artifact\/build\/TacoSpigot.jar", - "container": "alpine:3.9", - "entrypoint": "ash" - } - }, - "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": 1, - "user_editable": 1, - "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" - }, - { - "name": "TacoSpigot Version", - "description": "The version of TacoSpigot to download, Use \"latest\" for latest.", - "env_variable": "DL_VERSION", - "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|between:3,7" - } - ] -} From 60eed418aeb8cf7a7f7a3d4c6e8296043cc6ef24 Mon Sep 17 00:00:00 2001 From: Maximilian Welt Date: Mon, 8 Apr 2019 15:48:26 +0200 Subject: [PATCH 186/393] Add Arma 3 HC Egg --- README.md | 1 + arma/arma3_headless_client/README.md | 21 ++++ .../egg-arma3-headless-client.json | 99 +++++++++++++++++++ 3 files changed, 121 insertions(+) create mode 100644 arma/arma3_headless_client/README.md create mode 100644 arma/arma3_headless_client/egg-arma3-headless-client.json diff --git a/README.md b/README.md index 0841502c..46e82e0a 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,7 @@ If you submit a PR without filling out the template I will deny it. This is for [Arma](/arma/) * [Arma 3](/arma/arma3/) +* [Arma 3 HC](/arma/arma3_headless_client/) [Conan Exiles](/conan_exiles/conan_exiles) diff --git a/arma/arma3_headless_client/README.md b/arma/arma3_headless_client/README.md new file mode 100644 index 00000000..ec3d320b --- /dev/null +++ b/arma/arma3_headless_client/README.md @@ -0,0 +1,21 @@ +# Arma 3 Headless Client +### From their [Site](https://community.bistudio.com/wiki/Arma_3_Headless_Client) +What is a Headless Client (HC) used for? +* Headless Client is used to offload AI calculations from the server +* Headless Client is integrated into game client and dedicated server executable (WIndows and Linux, use -client parameter) +* The server doesn't allow arbitrary connections from headless clients if you do not define the headless clients IPs in the server.cfg, + +### But why? +If you host an Arma 3 Server with lots of AI in it, the Server FPS will drop pretty fast. +Since the server files are only 32 Bit you will need some kind of magical assistant to prevent slow AI. + +### Minimum RAM warning +This server requires about 2048m to run properly. ARMA 3 is more CPU intensive though. + +### Additional settings +Additional server flags can be found [here](https://community.bistudio.com/wiki/Arma_3_Startup_Parameters). +This can help is you see the server using to many cores/threads on the server. +If you want to know how to implement, take a look at the Wiki [here](https://community.bistudio.com/wiki/Arma_3_Headless_Client#Spawning_the_AI) or at a guide in the A3 Forums [here](https://forums.bohemia.net/forums/topic/178434-arma3-headless-client-guide/). + +### Server Ports +Since this is basically a client, this Egg does not need a port. \ No newline at end of file diff --git a/arma/arma3_headless_client/egg-arma3-headless-client.json b/arma/arma3_headless_client/egg-arma3-headless-client.json new file mode 100644 index 00000000..b0cb6e02 --- /dev/null +++ b/arma/arma3_headless_client/egg-arma3-headless-client.json @@ -0,0 +1,99 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-03-25T14:09:36+01:00", + "name": "Arma 3 Headless Client", + "author": "brainp4in@blueberry-hood-clan.de", + "description": "Headless Clients are used to offload AI calculations from the Arma 3 Server.", + "image": "quay.io\/parkervcp\/pterodactyl-images:game_arma3", + "startup": ".\/arma3server -client -connect={{SERVERIP}} -port={{SERVERPORT}} {{CUSTOM}} -mod=\"{{MODS}}\"", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Client connected\",\r\n \"userInteraction\": []\r\n}", + "logs": "{\r\n \"custom\": true,\r\n \"location\": \"latest.log\"\r\n}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl\r\napt -y --no-install-recommends install lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSLO http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd \/mnt\/server\/logs\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\n\r\ntouch \/mnt\/server\/latest.log\r\nchown -R root:root \/mnt\r\n\r\ntar -xzvf \/tmp\/steamcmd_linux.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\nexport HOME=\/mnt\/server\r\n\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${APP_ID} validate +quit\r\n\r\ncd \/mnt\/server\/\r\ncurl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/arma\/arma3\/egg-arma3-config\/server.cfg\r\ncurl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/arma\/arma3\/egg-arma3-config\/basic.cfg", + "container": "ubuntu:18.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Game App ID", + "description": "Steam CMD App ID.", + "env_variable": "APP_ID", + "default_value": "233780", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|alpha_dash|between:1,100" + }, + { + "name": "Server IP", + "description": "IP address of the Arma 3 server that should be supported by the Headless Client.", + "env_variable": "SERVERIP", + "default_value": "127.0.0.1", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:30" + }, + { + "name": "Server Port", + "description": "Port of the Arma 3 server that should be supported by the Headless Client.", + "env_variable": "SERVERPORT", + "default_value": "2302", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:5" + }, + { + "name": "Custom Command Line Option.", + "description": "Put -autoinit or related things in here :)", + "env_variable": "CUSTOM", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "string|nullable" + }, + { + "name": "Mods", + "description": "This is where you put mods that go along with the -mods startup option", + "env_variable": "MODS", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "string|nullable" + }, + { + "name": "Steam User", + "description": "A Steam username with Arma3 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" + } + ] +} From a2dd9a9e4716c54dec6776d846d9fc993282f77f Mon Sep 17 00:00:00 2001 From: Maximilian Welt Date: Mon, 8 Apr 2019 16:01:48 +0200 Subject: [PATCH 187/393] Fix Typo --- arma/arma3_headless_client/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arma/arma3_headless_client/README.md b/arma/arma3_headless_client/README.md index ec3d320b..c674f030 100644 --- a/arma/arma3_headless_client/README.md +++ b/arma/arma3_headless_client/README.md @@ -6,7 +6,7 @@ What is a Headless Client (HC) used for? * The server doesn't allow arbitrary connections from headless clients if you do not define the headless clients IPs in the server.cfg, ### But why? -If you host an Arma 3 Server with lots of AI in it, the Server FPS will drop pretty fast. +If you host an Arma 3 Server with lots of AI in it, the Server FPS will drop fast. Since the server files are only 32 Bit you will need some kind of magical assistant to prevent slow AI. ### Minimum RAM warning From 781477253845598885e531660c61ca0f3f62378a Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 9 Apr 2019 23:01:48 -0400 Subject: [PATCH 188/393] update for openttd move to stripping apart the deb files that the openttd team supplies add variables for openttd and opengfx versions. --- openttd/openttd/egg-open-t-t-d-server.json | 24 +++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/openttd/openttd/egg-open-t-t-d-server.json b/openttd/openttd/egg-open-t-t-d-server.json index 146b10a1..834d51c7 100644 --- a/openttd/openttd/egg-open-t-t-d-server.json +++ b/openttd/openttd/egg-open-t-t-d-server.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-12-25T20:36:01-05:00", + "exported_at": "2019-04-09T22:59:20-04: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.", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "apk add --no-cache sdl-dev fontconfig curl\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\ncurl -LSs https:\/\/binaries.openttd.org\/releases\/1.8.0\/openttd-1.8.0-linux-generic-amd64.tar.gz -o openttd.tar.gz\r\n\r\ntar --strip-components=1 -xzvf openttd.tar.gz \r\n\r\nchmod +x openttd\r\n\r\ncurl -LSs https:\/\/binaries.openttd.org\/extra\/opengfx\/0.5.2\/opengfx-0.5.2-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\r\n\r\ncurl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/openttd\/openttd\/openttd.cfg > openttd.cfg", + "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", "entrypoint": "ash" } @@ -58,6 +58,24 @@ "user_viewable": 1, "user_editable": 1, "rules": "required|string|max:20" + }, + { + "name": "OpenTTD Version", + "description": "The version of OpenTTD i.e. 1.9.1", + "env_variable": "OPENTTD_VERSION", + "default_value": "1.9.1", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|string|max:20" + }, + { + "name": "OpenGFX Version", + "description": "The OpenGFX Version i.e. 0.5.5", + "env_variable": "OPENGFX_VERSION", + "default_value": "0.5.5", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From 1b0565258a87783d6557b3681a954d6a61119e53 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 10 Apr 2019 14:32:24 -0400 Subject: [PATCH 189/393] update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 82b31b09..db522fd3 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ If you submit a PR without filling out the template I will deny it. This is for * [ATL Bot](/bots/discord/atlbot/) Node JS * [parkertron](/bots/discord/parkertron/) Golang * [pixel-bot](/bots/discord/pixelbot/) Python -* [discord.js](bots/discord/discord.js/) +* [discord.js](bots/discord/discord.js/) discord.js * [Sinusbot](/bots/discord/sinusbot/) * [Bastion](/bots/discord/bastion/) From d6db69a54d26f970841fff32c0933d0ec533e749 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Thu, 11 Apr 2019 12:31:40 -0400 Subject: [PATCH 190/393] update request template --- .github/ISSUE_TEMPLATE/request.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/request.md b/.github/ISSUE_TEMPLATE/request.md index 62fe627d..e2122585 100644 --- a/.github/ISSUE_TEMPLATE/request.md +++ b/.github/ISSUE_TEMPLATE/request.md @@ -8,4 +8,10 @@ Please fill out the information bellow and remove from the line up --------------- Service: (Ex. minecraft/factorio/etc) -Link to game: (Ex. minecraft.net/factorio.com/etc) \ No newline at end of file +Does this expand an already existing service: Y/N + +Link to game: (Ex. minecraft.net/factorio.com/etc) + +Links for server downloads: + +Links for install steps/docs: \ No newline at end of file From 41d97eb0bf13da03f1f63a28aac34e5315d77a5b Mon Sep 17 00:00:00 2001 From: Sir3lit Date: Mon, 15 Apr 2019 04:50:48 -0400 Subject: [PATCH 191/393] Fixed server password Using "" as the blank password makes it happy and works. --- factorio/factorio/egg-factorio.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/factorio/factorio/egg-factorio.json b/factorio/factorio/egg-factorio.json index c637bdf4..e5017803 100644 --- a/factorio/factorio/egg-factorio.json +++ b/factorio/factorio/egg-factorio.json @@ -115,12 +115,12 @@ }, { "name": "Server Password", - "description": "Password to join the server, Blank is none.", + "description": "Password to join the server, \"\" is none", "env_variable": "SERVER_PASS", - "default_value": "", + "default_value": "\"\"", "user_viewable": 1, "user_editable": 1, "rules": "nullable|string|max:30" } ] -} \ No newline at end of file +} From eb825789e7240a11117e095b30ecfeb4974f3532 Mon Sep 17 00:00:00 2001 From: Arnaud Lier Date: Fri, 19 Apr 2019 20:27:41 +0200 Subject: [PATCH 192/393] Added second port for FiveM --- gta/fivem/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gta/fivem/README.md b/gta/fivem/README.md index 9cb6573f..8d42ff14 100644 --- a/gta/fivem/README.md +++ b/gta/fivem/README.md @@ -12,3 +12,6 @@ Ports required to run the server in a table format. | Port | default | |---------|---------| | Game | 30210 | +| | | +| Game+1 | 30211 | +| | | From 28fbf1135926a43fb8d710246d5eeb0f2f300ca6 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 19 Apr 2019 14:29:17 -0400 Subject: [PATCH 193/393] Update README.md --- gta/fivem/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gta/fivem/README.md b/gta/fivem/README.md index 8d42ff14..80b44f3f 100644 --- a/gta/fivem/README.md +++ b/gta/fivem/README.md @@ -12,6 +12,6 @@ Ports required to run the server in a table format. | Port | default | |---------|---------| | Game | 30210 | -| | | +|---------|---------| | Game+1 | 30211 | -| | | +|---------|---------| From 6d63d09468ef39ac0fd00a278a6d5956500e1a0c Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 19 Apr 2019 14:29:34 -0400 Subject: [PATCH 194/393] Update README.md --- gta/fivem/README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/gta/fivem/README.md b/gta/fivem/README.md index 80b44f3f..a90c6d7e 100644 --- a/gta/fivem/README.md +++ b/gta/fivem/README.md @@ -12,6 +12,4 @@ Ports required to run the server in a table format. | Port | default | |---------|---------| | Game | 30210 | -|---------|---------| | Game+1 | 30211 | -|---------|---------| From 4905d94c0e6def8e0be41fbc46091d9c53bf6008 Mon Sep 17 00:00:00 2001 From: Aaronstar-McClure Date: Sat, 27 Apr 2019 17:30:58 -0400 Subject: [PATCH 195/393] fix changes to config names the original maker slightly changed the way the configs file worked, so I updated some file names --- bots/discord/atlbot/egg-a-t-l-bot.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bots/discord/atlbot/egg-a-t-l-bot.json b/bots/discord/atlbot/egg-a-t-l-bot.json index e45efa89..d3586195 100644 --- a/bots/discord/atlbot/egg-a-t-l-bot.json +++ b/bots/discord/atlbot/egg-a-t-l-bot.json @@ -10,14 +10,14 @@ "image": "quay.io\/parkervcp\/pterodactyl-images:alpine_nodejs-10", "startup": "npm run start", "config": { - "files": "{\r\n \"config\/config.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"client_token\": \"{{server.build.env.CLIENT_TOKEN}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"config\/local.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"client_token\": \"{{server.build.env.CLIENT_TOKEN}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"I am ready!\",\r\n \"userInteraction\": [\r\n \"Request to use token, but token was unavailable\"\r\n ]\r\n}", "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "^C" }, "scripts": { "installation": { - "script": "apk add --no-cache openssl git\r\n\r\ncd \/mnt\/server\r\n\r\nwget https:\/\/github.com\/ATLauncher\/discord-bot\/archive\/master.zip\r\n\r\nunzip master.zip\r\n\r\nrm master.zip\r\n\r\nmv discord-bot-master\/* .\/\r\n\r\nmv config\/config.json.example config\/config.json\r\n\r\nrm package-lock.json\r\nnpm install\r\n\r\nrm -r discord-bot-master\/\r\nrm Dockerfile\r\nrm CONTRIBUTING.md\r\nrm README.md\r\nrm \/config\/.gitignore\r\nrm CODE_OF_CONDUCT.md", + "script": "apk add --no-cache openssl git\r\n\r\ncd \/mnt\/server\r\n\r\nwget https:\/\/github.com\/ATLauncher\/discord-bot\/archive\/master.zip\r\n\r\nunzip master.zip\r\n\r\nrm master.zip\r\n\r\nmv discord-bot-master\/* .\/\r\n\r\nmv config\/default.json config\/local.json\r\n\r\nrm package-lock.json\r\nnpm install\r\n\r\nrm -r discord-bot-master\/\r\nrm Dockerfile\r\nrm CONTRIBUTING.md\r\nrm README.md\r\nrm \/config\/.gitignore\r\nrm CODE_OF_CONDUCT.md", "container": "node:10-alpine", "entrypoint": "ash" } From 932439efe955eb441373334e43507184013e3b7b Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sat, 27 Apr 2019 21:37:50 -0400 Subject: [PATCH 196/393] Add fragbot and update parkertron readme --- bots/discord/fragbot/README.md | 8 ++++++ bots/discord/fragbot/egg-fragbot.json | 36 +++++++++++++++++++++++++++ bots/discord/parkertron/README.md | 2 +- 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 bots/discord/fragbot/README.md create mode 100644 bots/discord/fragbot/egg-fragbot.json diff --git a/bots/discord/fragbot/README.md b/bots/discord/fragbot/README.md new file mode 100644 index 00000000..d3d58ff2 --- /dev/null +++ b/bots/discord/fragbot/README.md @@ -0,0 +1,8 @@ +# fragbot +### 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 parkertron \ No newline at end of file diff --git a/bots/discord/fragbot/egg-fragbot.json b/bots/discord/fragbot/egg-fragbot.json new file mode 100644 index 00000000..76d0bef3 --- /dev/null +++ b/bots/discord/fragbot/egg-fragbot.json @@ -0,0 +1,36 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-04-27T21:33:33-04:00", + "name": "fragbot", + "author": "parker@parkervcp.com", + "description": "The fragforce discord bot.\r\n\r\nlocated at https:\/\/github.com\/fragforce\/fragbot", + "image": "quay.io\/parkervcp\/pterodactyl-images:base_alpine", + "startup": ".\/fragbot", + "config": { + "files": "{\r\n \"config.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"token\": \"{{server.build.env.DISCORD_TOKEN}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Bot is now running\",\r\n \"userInteraction\": []\r\n}", + "logs": "{}", + "stop": "shutdown" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/ash\r\n# fragbot 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\ncd\r\n\r\napk add --no-cache --update git\r\n\r\necho \"pulling the fragbot repo\"\r\n\r\ngit clone https:\/\/github.com\/fragforce\/fragbot.git\r\n\r\ncd fragbot\/\r\n\r\ngo mod download\r\n\r\necho \"building fragbot\"\r\n\r\ngo build \r\n\r\necho \"build complete copying parkertron and example configs over\"\r\n\r\ncp fragbot \/mnt\/server\/\r\n\r\nif [ -f \/mnt\/server\/config.json ]; then\r\n echo \"config file exists already\"\r\nelse\r\n cp -r \/root\/fragbot\/config.example.json \/mnt\/server\/config.json\r\nfi\r\n\r\necho \"Install complete. If you watched this. Congrats.\"", + "container": "golang:1.12-alpine", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Discord Bot Token", + "description": "The token that is to be used for the bot.", + "env_variable": "DISCORD_TOKEN", + "default_value": "ThisNeedsToBeChanged", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:64" + } + ] +} \ No newline at end of file diff --git a/bots/discord/parkertron/README.md b/bots/discord/parkertron/README.md index 99f14234..e66546f7 100644 --- a/bots/discord/parkertron/README.md +++ b/bots/discord/parkertron/README.md @@ -1,4 +1,4 @@ -# ATLBot +# parkertron ### Their [Github](https://github.com/parkervcp/parkertron) Purely a chatbot. Not even a smart one. From 73934337d3ab426331d11815cc76a1bdf60366ab Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 28 Apr 2019 18:47:21 -0400 Subject: [PATCH 197/393] Correct unit to unite --- unreal_engine/{tower_unit => tower_unite}/README.md | 0 .../egg-tower-unite.json} | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename unreal_engine/{tower_unit => tower_unite}/README.md (100%) rename unreal_engine/{tower_unit/egg-tower-unit.json => tower_unite/egg-tower-unite.json} (65%) diff --git a/unreal_engine/tower_unit/README.md b/unreal_engine/tower_unite/README.md similarity index 100% rename from unreal_engine/tower_unit/README.md rename to unreal_engine/tower_unite/README.md diff --git a/unreal_engine/tower_unit/egg-tower-unit.json b/unreal_engine/tower_unite/egg-tower-unite.json similarity index 65% rename from unreal_engine/tower_unit/egg-tower-unit.json rename to unreal_engine/tower_unite/egg-tower-unite.json index f0e710a7..43f7687b 100644 --- a/unreal_engine/tower_unit/egg-tower-unit.json +++ b/unreal_engine/tower_unite/egg-tower-unite.json @@ -4,9 +4,9 @@ "version": "PTDL_v1" }, "exported_at": "2019-02-08T01:46:57+01:00", - "name": "Tower Unit", + "name": "Tower Unite", "author": "teamwuffy@gmail.com", - "description": "Tower Unit\r\n\r\nDefault Port: 7778\r\nDefault Query Port: 27016\r\n\r\nConfig Path: Tower\/Saved\/Config\/TowerServer.ini", + "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", "startup": ".\/Tower\/Binaries\/Linux\/TowerServer-Linux-Shipping -log -Port={{SERVER_PORT}} -MULTIHOME=0.0.0.0 -TowerServerINI=..\/..\/Saved\/Config\/TowerServer.ini", "config": { @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Tower Unit 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", + "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", "entrypoint": "bash" } From 8e33c0dd31853e16a44dd8c7092580bac8e6e159 Mon Sep 17 00:00:00 2001 From: danny6167 Date: Mon, 29 Apr 2019 21:58:28 +0800 Subject: [PATCH 198/393] Update egg-e-t-legacy.json - Correct stop command - Add MAP to start params and server vars so server will init - Work in /tmp/ to avoid leaving installers and unneeded files in the server directory - Slightly re-order some of the setup code - Add startup string matching so server can update status to running - Create '/mnt/server/.etlegacy' during setup needed for the servers sqlite database (server wont create it its self) --- etlegacy/etlegacy/egg-e-t-legacy.json | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/etlegacy/etlegacy/egg-e-t-legacy.json b/etlegacy/etlegacy/egg-e-t-legacy.json index 2c3fec2d..27ad99b6 100644 --- a/etlegacy/etlegacy/egg-e-t-legacy.json +++ b/etlegacy/etlegacy/egg-e-t-legacy.json @@ -3,21 +3,21 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-03-11T06:46:01-04:00", + "exported_at": "2019-04-29T21:52:18+08:00", "name": "ET Legacy", "author": "parker@parkervcp.com", "description": "Welcome to Enemy Territory: Legacy, an open source project that aims to create a fully compatible client and server for the popular online FPS game Wolfenstein: Enemy Territory - whose gameplay is still considered unmatched by many, despite its great age.", "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", - "startup": ".\/etlded +set net_port {{SERVER_PORT}}", + "startup": ".\/etlded +set net_port {{SERVER_PORT}} +map {{MAP}}", "config": { "files": "{\r\n \"etmain\/etl_server.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"\/\/set net_ip \\\"\\\"\": \"set net_ip \\\"0.0.0.0\\\"\",\r\n \"\/\/set net_port \\\"27960\\\"\": \"set net_port \\\"{{server.build.env.SERVER_PORT}}\\\"\"\r\n }\r\n }\r\n}", - "startup": "{}", + "startup": "{\r\n \"done\": \"------ Server Initialization ------\",\r\n \"userInteraction\": []\r\n}", "logs": "{}", - "stop": "^C" + "stop": "quit" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt-get update\r\napt-get -y install wget curl zip unzip\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading $ET_VERSION bit ET Legacy version\"\r\n\r\nif [ $ET_VERSION == \"32\" ];then \r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 32-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` -O etlegacy.tar.gz\r\nelse\r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 64-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` O etlegacy.tar.gz\r\nfi\r\n\r\necho \"Downloading latest enemy territory files\"\r\n\r\nwget `curl https:\/\/www.splashdamage.com\/games\/wolfenstein-enemy-territory\/ | grep .x86_full | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo --color=never '(http|https):\/\/[^\"]+'` -O enemy_terrain.zip\r\n\r\necho \"Unpacking enemy terrain files\"\r\nunzip enemy_terrain.zip\r\n\r\n.\/*.x86_keygen_V03.run --noexec --keep\r\n\r\necho \"Unpacking \"\r\ntar --strip-components=1 -xzvf etlegacy.tar.gz\r\n\r\ncp \/mnt\/server\/et-linux_work\/etmain\/pak* \/mnt\/server\/etmain\/", + "script": "#!\/bin\/bash\r\n\r\napt-get update\r\napt-get -y install wget curl zip unzip\r\n\r\ncd \/tmp\/\r\n\r\necho \"Downloading $ET_VERSION bit ET Legacy version\"\r\n\r\nif [ $ET_VERSION == \"32\" ];then \r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 32-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` -O etlegacy.tar.gz\r\nelse\r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 64-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` O etlegacy.tar.gz\r\nfi\r\n\r\necho \"Unpacking ET: Legacy\"\r\ntar --strip-components=1 -xzvf etlegacy.tar.gz -C \/mnt\/server\/\r\n\r\necho \"Downloading latest enemy territory files\"\r\nwget `curl https:\/\/www.splashdamage.com\/games\/wolfenstein-enemy-territory\/ | grep .x86_full | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo --color=never '(http|https):\/\/[^\"]+'` -O enemy_territory.zip\r\n\r\necho \"Unpacking enemy territory files\"\r\nunzip enemy_territory.zip\r\n\r\necho \"Copying enemy territory assets\"\r\n.\/*.x86_keygen_V03.run --tar xvf .\/etmain\/\r\ncp etmain\/pak*.pk3 \/mnt\/server\/etmain\/\r\n\r\n# Create .etlegacy as the server doesn't correctly create it\r\nmkdir -p \/mnt\/server\/.etlegacy", "container": "ubuntu:18.04", "entrypoint": "bash" } @@ -31,6 +31,15 @@ "user_viewable": 1, "user_editable": 1, "rules": "required|integer|in:32, 64" + }, + { + "name": "Default Map", + "description": "The default map to use when starting the server.", + "env_variable": "MAP", + "default_value": "oasis", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From 87a7612257d295de4a2e9afb26a1f25d3cec5aaf Mon Sep 17 00:00:00 2001 From: danny6167 Date: Mon, 29 Apr 2019 22:10:02 +0800 Subject: [PATCH 199/393] Update egg-e-t-legacy.json Correct wget command for 64 bit installs --- etlegacy/etlegacy/egg-e-t-legacy.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etlegacy/etlegacy/egg-e-t-legacy.json b/etlegacy/etlegacy/egg-e-t-legacy.json index 27ad99b6..0f5dc4cc 100644 --- a/etlegacy/etlegacy/egg-e-t-legacy.json +++ b/etlegacy/etlegacy/egg-e-t-legacy.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-04-29T21:52:18+08:00", + "exported_at": "2019-04-29T22:08:18+08:00", "name": "ET Legacy", "author": "parker@parkervcp.com", "description": "Welcome to Enemy Territory: Legacy, an open source project that aims to create a fully compatible client and server for the popular online FPS game Wolfenstein: Enemy Territory - whose gameplay is still considered unmatched by many, despite its great age.", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt-get update\r\napt-get -y install wget curl zip unzip\r\n\r\ncd \/tmp\/\r\n\r\necho \"Downloading $ET_VERSION bit ET Legacy version\"\r\n\r\nif [ $ET_VERSION == \"32\" ];then \r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 32-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` -O etlegacy.tar.gz\r\nelse\r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 64-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` O etlegacy.tar.gz\r\nfi\r\n\r\necho \"Unpacking ET: Legacy\"\r\ntar --strip-components=1 -xzvf etlegacy.tar.gz -C \/mnt\/server\/\r\n\r\necho \"Downloading latest enemy territory files\"\r\nwget `curl https:\/\/www.splashdamage.com\/games\/wolfenstein-enemy-territory\/ | grep .x86_full | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo --color=never '(http|https):\/\/[^\"]+'` -O enemy_territory.zip\r\n\r\necho \"Unpacking enemy territory files\"\r\nunzip enemy_territory.zip\r\n\r\necho \"Copying enemy territory assets\"\r\n.\/*.x86_keygen_V03.run --tar xvf .\/etmain\/\r\ncp etmain\/pak*.pk3 \/mnt\/server\/etmain\/\r\n\r\n# Create .etlegacy as the server doesn't correctly create it\r\nmkdir -p \/mnt\/server\/.etlegacy", + "script": "#!\/bin\/bash\r\n\r\napt-get update\r\napt-get -y install wget curl zip unzip\r\n\r\ncd \/tmp\/\r\n\r\necho \"Downloading $ET_VERSION bit ET Legacy version\"\r\n\r\nif [ $ET_VERSION == \"32\" ];then \r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 32-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` -O etlegacy.tar.gz\r\nelse\r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 64-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` -O etlegacy.tar.gz\r\nfi\r\n\r\necho \"Unpacking ET: Legacy\"\r\ntar --strip-components=1 -xzvf etlegacy.tar.gz -C \/mnt\/server\/\r\n\r\necho \"Downloading latest enemy territory files\"\r\nwget `curl https:\/\/www.splashdamage.com\/games\/wolfenstein-enemy-territory\/ | grep .x86_full | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo --color=never '(http|https):\/\/[^\"]+'` -O enemy_territory.zip\r\n\r\necho \"Unpacking enemy territory files\"\r\nunzip enemy_territory.zip\r\n\r\necho \"Copying enemy territory assets\"\r\n.\/*.x86_keygen_V03.run --tar xvf .\/etmain\/\r\ncp etmain\/pak*.pk3 \/mnt\/server\/etmain\/\r\n\r\n# Create .etlegacy as the server doesn't correctly create it\r\nmkdir -p \/mnt\/server\/.etlegacy", "container": "ubuntu:18.04", "entrypoint": "bash" } From 49ce516b9506439da8f4cf03bf54f5ce09078c82 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 3 May 2019 11:55:00 -0400 Subject: [PATCH 200/393] update forge generic Make is so we can use settings.cfg in some capacity. Thanks `https://minecraft.curseforge.com/projects/all-the-mods-3` for not being standard. --- minecraft_java/forge/forge-generic/egg-forge-generic.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/minecraft_java/forge/forge-generic/egg-forge-generic.json b/minecraft_java/forge/forge-generic/egg-forge-generic.json index d09c03a4..53da7298 100644 --- a/minecraft_java/forge/forge-generic/egg-forge-generic.json +++ b/minecraft_java/forge/forge-generic/egg-forge-generic.json @@ -3,21 +3,21 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-03-24T23:33:30-04:00", + "exported_at": "2019-05-03T11:53:00-04:00", "name": "Forge Generic", "author": "parker@parkervcp.com", "description": "A generic egg for a forge modpack", "image": "quay.io\/pterodactyl\/core:java", "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}", + "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\/ash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nfunction install_required {\r\n apk --no-cache --update add curl jq\r\n}\r\n\r\nfunction get_download {\r\n BASE_URL=${MODPACK_URL}\/files\r\n\r\n if [ -z \"${MODPACK_VERSION}\" ] || [ \"${MODPACK_VERSION}\" == \"latest\" ]; then\r\n ID=`curl -sl ${BASE_URL} | grep -i -A9 'title=\"release\"' | grep -m 1 -i -o 'href=\".*\"' | cut -d \"\/\" -f5 | sed s\/\\\"\/\/g`\r\n echo \"ID: ${ID}\"\r\n else\r\n ID=`curl -sl ${BASE_URL} | grep -i -A9 \"${MODPACK_VERSION}\" | grep -m 1 -oE 'href=\"[^\\\"]+\"' | cut -d \"\/\" -f5 | grep -oE [0-9]+`\r\n echo \"ID: ${ID}\"\r\n fi\r\n\r\n SECONDURL=${BASE_URL}\/${ID}\r\n echo \"SECONDURL: ${SECONDURL}\"\r\n\r\n GOOD_ID=`curl -sl ${SECONDURL} | grep -i server | grep -Eo 'href=\"[^\\\"]+\"' | grep -o -E \"[0-9]+\" | tail -1`\r\n if [ -z \"$GOOD_ID\" ]; then\r\n GOOD_ID=$ID\r\n fi\r\n echo \"GOOD_ID: ${GOOD_ID}\"\r\n\r\n DL_URL=${BASE_URL}\/${GOOD_ID}\/download\r\n echo \"Download_URL: ${DL_URL}\"\r\n\r\n cd \/mnt\/server\r\n\r\n echo \"Executing curl -L ${DL_URL} -o server.zip\"\r\n curl -L ${DL_URL} -o server.zip\r\n\r\n unzip server.zip\r\n\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 java -jar *installer.jar --installServer\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\r\n mv *universal.jar server.jar\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=\"https:\/\/minecraft.curseforge.com\/projects\/${projID}\/files\/${fileID}\/download\"\r\n echo \"mods file url: ${URL}\"\r\n # this is saving everything as \/mnt\/server\/mods\/download\r\n FINAL_URL=$(curl $URL -s -L -o \/dev\/null -w '%{url_effective}')\r\n echo \"Mod direct url: $FINAL_URL\"\r\n curl -JLO ${FINAL_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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\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\ninstall_required\r\nget_download\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\nelse\r\n forge_install\r\n forge_cleanup\r\nfi", + "script": "#!\/bin\/ash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nfunction install_required {\r\n apk --no-cache --update add curl jq\r\n}\r\n\r\nfunction get_download {\r\n BASE_URL=${MODPACK_URL}\/files\r\n\r\n if [ -z \"${MODPACK_VERSION}\" ] || [ \"${MODPACK_VERSION}\" == \"latest\" ]; then\r\n ID=`curl -sl ${BASE_URL} | grep -i -A9 'title=\"release\"' | grep -m 1 -i -o 'href=\".*\"' | cut -d \"\/\" -f5 | sed s\/\\\"\/\/g`\r\n echo \"ID: ${ID}\"\r\n else\r\n ID=`curl -sl ${BASE_URL} | grep -i -A9 \"${MODPACK_VERSION}\" | grep -m 1 -oE 'href=\"[^\\\"]+\"' | cut -d \"\/\" -f5 | grep -oE [0-9]+`\r\n echo \"ID: ${ID}\"\r\n fi\r\n\r\n SECONDURL=${BASE_URL}\/${ID}\r\n echo \"SECONDURL: ${SECONDURL}\"\r\n\r\n GOOD_ID=`curl -sl ${SECONDURL} | grep -i server | grep -Eo 'href=\"[^\\\"]+\"' | grep -o -E \"[0-9]+\" | tail -1`\r\n if [ -z \"$GOOD_ID\" ]; then\r\n GOOD_ID=$ID\r\n fi\r\n echo \"GOOD_ID: ${GOOD_ID}\"\r\n\r\n DL_URL=${BASE_URL}\/${GOOD_ID}\/download\r\n echo \"Download_URL: ${DL_URL}\"\r\n\r\n cd \/mnt\/server\r\n\r\n echo \"Executing curl -L ${DL_URL} -o server.zip\"\r\n curl -L ${DL_URL} -o server.zip\r\n\r\n unzip -o server.zip\r\n\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 java -jar *installer.jar --installServer\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\r\n mv *universal.jar server.jar\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=\"https:\/\/minecraft.curseforge.com\/projects\/${projID}\/files\/${fileID}\/download\"\r\n echo \"mods file url: ${URL}\"\r\n # this is saving everything as \/mnt\/server\/mods\/download\r\n FINAL_URL=$(curl $URL -s -L -o \/dev\/null -w '%{url_effective}')\r\n echo \"Mod direct url: $FINAL_URL\"\r\n curl -JLO ${FINAL_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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\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 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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\ninstall_required\r\nget_download\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\nelse\r\n forge_install\r\n forge_cleanup\r\nfi", "container": "openjdk:8-alpine", "entrypoint": "ash" } From 2ff5e4ba0599c0c96915b76b9a186e8a6ccd87fe Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 5 May 2019 08:22:15 -0400 Subject: [PATCH 201/393] update issue templates and CONTRIBUTING.md --- .github/ISSUE_TEMPLATE/bugs.md | 2 ++ .github/ISSUE_TEMPLATE/request.md | 2 ++ .github/pull_request_template.md | 2 ++ CONTRIBUTING.md | 7 +++++-- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bugs.md b/.github/ISSUE_TEMPLATE/bugs.md index 82150487..8d0d4648 100644 --- a/.github/ISSUE_TEMPLATE/bugs.md +++ b/.github/ISSUE_TEMPLATE/bugs.md @@ -5,7 +5,9 @@ about: Report an issue for an egg --- Please fill out the information bellow and remove from the line up +If you just submit a bug with no info I will close out your bug. --------------- + Panel Version: (version number) Daemon Version: (version number) Service: (minecraft/factorio/etc) diff --git a/.github/ISSUE_TEMPLATE/request.md b/.github/ISSUE_TEMPLATE/request.md index e2122585..eb47a9bb 100644 --- a/.github/ISSUE_TEMPLATE/request.md +++ b/.github/ISSUE_TEMPLATE/request.md @@ -5,7 +5,9 @@ about: Suggest a server to build an egg for --- Please fill out the information bellow and remove from the line up +Please understand how Pterodactyl works when you are requesting an egg. (ie. docker-compose doesn't work for a pterodactyl server) --------------- + Service: (Ex. minecraft/factorio/etc) Does this expand an already existing service: Y/N diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index e70890ce..8285664e 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -2,6 +2,8 @@ * [ ] Have you followed the guidelines in our Contributing document? * [ ] Have you checked to ensure there aren't other open [Pull Requests](../../pulls) for the same update/change? +* [ ] Did you branch your changes and PR from that branch and not from your master branch? + * If not, why?: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 58a857fb..9662ccc9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,6 +11,9 @@ 3. Try to stay in the stock containers. If you need something in a container PR it to [my image repo](https://github.com/parkervcp/images) where I can review and pull up to the main repo. +4. Don't be afraid to submit PR's to the egg repo. + I dont 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. @@ -38,6 +41,6 @@ This is to maintain a clean repo that others can pull and be fully aware of what ## Step 3. -#### Don't be afraid to submit PR's to the egg repo. +#### Make a branch and do your work in there. -I dont bite. I will work with you on the egg and the required things to run it. +I have been getting messy PR's due to people always PRing from their master branch. Please make a branch and PR from there, From 9b1f5b8958fb763ce48e70321a230d79b041cb2f Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 5 May 2019 08:22:41 -0400 Subject: [PATCH 202/393] remove issue_template bug and request templates do the job already. --- .github/ISSUE_TEMPLATE/issue_template.md | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/issue_template.md diff --git a/.github/ISSUE_TEMPLATE/issue_template.md b/.github/ISSUE_TEMPLATE/issue_template.md deleted file mode 100644 index 4b46de11..00000000 --- a/.github/ISSUE_TEMPLATE/issue_template.md +++ /dev/null @@ -1,15 +0,0 @@ -Please fill out the information bellow and remove from the line up ---------------- -Panel Version: (version number) -Daemon Version: (version number) -New Service: (yes/no) (Is this a request for a new service?) -Service: (minecraft/factorio/etc) -Modified: (yes/no) (did you add or change things, this includes startup configs/install scripts/variables) - -Expected Behavior: - -Actual Behavior: - -Steps to Reproduce: (Step by step what to do to cause the issue) - -If this is a request for a new service then you can add info here like links to the site where the server files can be found. If it is a steamcmd game have you looked at the custom source engine service yet? \ No newline at end of file From c66621af60dba3154ef3f7d7e0f4c55de4134c28 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 5 May 2019 08:49:12 -0400 Subject: [PATCH 203/393] updated many readme files --- README.md | 38 ++++++++++++++++--------------- bots/discord/README.md | 8 +++++++ bots/discord/discord.js/README.md | 4 +++- bots/discord/fragbot/README.md | 2 +- 4 files changed, 32 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 06c75448..ce2ce96c 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ I am working on adding a large collection of public eggs for the Pterodactyl community. -With that I am also accepting PR's for new service and also updates to the current ones. +With that I am also accepting PR's for new services and also updates to the current ones. If you are submitting PR's try and keep names and titles the same. @@ -27,12 +27,13 @@ If you are reading this it looks like you are looking to add an egg to your serv ## Bot Eggs [Discord](/bots/discord/) -* [ATL Bot](/bots/discord/atlbot/) Node JS +* [ATL Bot](/bots/discord/atlbot/) Node JS +* [Bastion](/bots/discord/bastion/) +* [discord.js](bots/discord/discord.js/) Node JS generic +* [fragbot](/bots/discord/fragbot/) Golang * [parkertron](/bots/discord/parkertron/) Golang * [pixel-bot](/bots/discord/pixelbot/) Python -* [discord.js](bots/discord/discord.js/) discord.js * [Sinusbot](/bots/discord/sinusbot/) -* [Bastion](/bots/discord/bastion/) [TeamSpeak3](bots/teamspeak3) * [JTS3ServerMod](/bots/teamspeak3/jts3servermod/) @@ -47,14 +48,20 @@ If you are reading this it looks like you are looking to add an egg to your serv [Don't Starve](/dont_starve/dont_starve) -[ET: Legacy](/etlegacy/etlegacy/) - [Factorio](/factorio/factorio/) [Grand Theft Auto](/gta/) -* [FiveM](/gta/fivem/) -* [RageMP](/gta/ragemp/) -* [Multi Theft Auto](/gta/mtasa/) +* GTA V + * [FiveM](/gta/fivem/) + * [RageMP](/gta/ragemp/) +* GTA SA + * [Multi Theft Auto](/gta/mtasa/) + * [SA-MP](/gta/samp/) + +[Minecraft Bedrock](/minecraft_bedrock/) +* [Bedrock](/minecraft_bedrock/bedrock/) +* [Nukkit](/minecraft_bedrock/nukkit/) +* [PocketMine MP](/minecraft_bedrock/pocketmine_mp/) [Minecraft Java](/minecraft_java/) * [Forge](/minecraft_java/forge/) @@ -63,30 +70,25 @@ If you are reading this it looks like you are looking to add an egg to your serv * [PaperSpigot (Legacy)](/minecraft_java/spigot/paper-legacy) * [Technic](/minecraft_java/technic/) -[Minecraft Bedrock](/minecraft_bedrock/) -* [Bedrock](/minecraft_bedrock/bedrock/) -* [Nukkit](/minecraft_bedrock/nukkit/) -* [PocketMine MP](/minecraft_bedrock/pocketmine_mp/) - -[Minecraft Proxies](/minecraft_proxy/) +[Minecraft Proxies](/minecraft_proxy/) (these are for the java version of minecraft) * [Waterfall](/minecraft_proxy/waterfall/) [Mount & Blade Warband](/mb_warband/) - [OpenTTD](/openttd/) [Source](/source_servers/) These eggs use steamcmd to install * [7 Days to Die](/source_servers/7_days_to_die/) +* [ARK Survival Evolved](/source_servers/ark_survival_evolved/) * [PixARK](/source_servers/pixark/) * [Rust Staging Branch](/source_servers/rust-staging/) * [Starbound](/source_servers/starbound) +[Squad](/squad/) + [Unreal Engine](/unreal_engine) * [Tower Unit](/unreal_engine/tower_unit/) -[Squad](/squad/) - [Terraria](/terraria/) * [tmodloader](/terraria/tmodloader) * [tshock](/terraria/tshock/) diff --git a/bots/discord/README.md b/bots/discord/README.md index 8615f33f..8c1cf53f 100644 --- a/bots/discord/README.md +++ b/bots/discord/README.md @@ -14,6 +14,14 @@ Their github has all the info you need [TheBastionBot/Bastion](https://github.com/TheBastionBot/Bastion) Give awesome perks to your Discord server! +#### DiscordJS +[discord.js](https://discord.js.org/) +A generic discord.js egg for running discord bots. + +#### fragbot +[fragforce/fragbot](https://github.com/fragforce/fragbot) +The bot that runs as the fragforce `@Fragbot` offering looking-for-group services for now + #### parkertron [parkervcp/parkertron](https://github.com/parkervcp/parkertron) The bot that runs as the pterodactyl `@Support Bot` diff --git a/bots/discord/discord.js/README.md b/bots/discord/discord.js/README.md index 7a241119..db4a930f 100644 --- a/bots/discord/discord.js/README.md +++ b/bots/discord/discord.js/README.md @@ -2,4 +2,6 @@ This egg was designed to allow a user to pull their own nodejs discord bot from a repo. -There is an option to allow a user to upload their own files to run a bot. \ No newline at end of file +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 diff --git a/bots/discord/fragbot/README.md b/bots/discord/fragbot/README.md index d3d58ff2..6ef6eedd 100644 --- a/bots/discord/fragbot/README.md +++ b/bots/discord/fragbot/README.md @@ -5,4 +5,4 @@ The golang based discord bot for fragforce. Runs the fragforce `@fragbot` ### Server Ports -There are no ports required for parkertron \ No newline at end of file +There are no ports required for fragbot \ No newline at end of file From c28822cbe6ce59659ceec5a848da260a8492e14b Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Mon, 11 Mar 2019 06:47:12 -0400 Subject: [PATCH 204/393] Add ET Legacy --- etlegacy/etlegacy/README.md | 20 +++++++++++++++ etlegacy/etlegacy/egg-e-t-legacy.json | 36 +++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 etlegacy/etlegacy/README.md create mode 100644 etlegacy/etlegacy/egg-e-t-legacy.json diff --git a/etlegacy/etlegacy/README.md b/etlegacy/etlegacy/README.md new file mode 100644 index 00000000..38a65ea8 --- /dev/null +++ b/etlegacy/etlegacy/README.md @@ -0,0 +1,20 @@ +# ET: Legacy + +#### The ET: Legacy Server + + +#### 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 own. + +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://factorio.com/starter-page](https://www.etlegacy.com/)). + +### Server Ports +ET: Legacy requires a single port + +| Port | default | +|---------|---------| +| Game | 27960 | \ No newline at end of file diff --git a/etlegacy/etlegacy/egg-e-t-legacy.json b/etlegacy/etlegacy/egg-e-t-legacy.json new file mode 100644 index 00000000..2c3fec2d --- /dev/null +++ b/etlegacy/etlegacy/egg-e-t-legacy.json @@ -0,0 +1,36 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-03-11T06:46:01-04:00", + "name": "ET Legacy", + "author": "parker@parkervcp.com", + "description": "Welcome to Enemy Territory: Legacy, an open source project that aims to create a fully compatible client and server for the popular online FPS game Wolfenstein: Enemy Territory - whose gameplay is still considered unmatched by many, despite its great age.", + "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", + "startup": ".\/etlded +set net_port {{SERVER_PORT}}", + "config": { + "files": "{\r\n \"etmain\/etl_server.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"\/\/set net_ip \\\"\\\"\": \"set net_ip \\\"0.0.0.0\\\"\",\r\n \"\/\/set net_port \\\"27960\\\"\": \"set net_port \\\"{{server.build.env.SERVER_PORT}}\\\"\"\r\n }\r\n }\r\n}", + "startup": "{}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n\r\napt-get update\r\napt-get -y install wget curl zip unzip\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading $ET_VERSION bit ET Legacy version\"\r\n\r\nif [ $ET_VERSION == \"32\" ];then \r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 32-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` -O etlegacy.tar.gz\r\nelse\r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 64-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` O etlegacy.tar.gz\r\nfi\r\n\r\necho \"Downloading latest enemy territory files\"\r\n\r\nwget `curl https:\/\/www.splashdamage.com\/games\/wolfenstein-enemy-territory\/ | grep .x86_full | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo --color=never '(http|https):\/\/[^\"]+'` -O enemy_terrain.zip\r\n\r\necho \"Unpacking enemy terrain files\"\r\nunzip enemy_terrain.zip\r\n\r\n.\/*.x86_keygen_V03.run --noexec --keep\r\n\r\necho \"Unpacking \"\r\ntar --strip-components=1 -xzvf etlegacy.tar.gz\r\n\r\ncp \/mnt\/server\/et-linux_work\/etmain\/pak* \/mnt\/server\/etmain\/", + "container": "ubuntu:18.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "ET Legacy Version", + "description": "What version of the server to install. 32 or 64 bit version.", + "env_variable": "ET_VERSION", + "default_value": "32", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|integer|in:32, 64" + } + ] +} \ No newline at end of file From 0ca91eb652e88a56eb47734038e260454354025d Mon Sep 17 00:00:00 2001 From: danny6167 Date: Mon, 29 Apr 2019 21:58:28 +0800 Subject: [PATCH 205/393] Update egg-e-t-legacy.json - Correct stop command - Add MAP to start params and server vars so server will init - Work in /tmp/ to avoid leaving installers and unneeded files in the server directory - Slightly re-order some of the setup code - Add startup string matching so server can update status to running - Create '/mnt/server/.etlegacy' during setup needed for the servers sqlite database (server wont create it its self) --- etlegacy/etlegacy/egg-e-t-legacy.json | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/etlegacy/etlegacy/egg-e-t-legacy.json b/etlegacy/etlegacy/egg-e-t-legacy.json index 2c3fec2d..27ad99b6 100644 --- a/etlegacy/etlegacy/egg-e-t-legacy.json +++ b/etlegacy/etlegacy/egg-e-t-legacy.json @@ -3,21 +3,21 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-03-11T06:46:01-04:00", + "exported_at": "2019-04-29T21:52:18+08:00", "name": "ET Legacy", "author": "parker@parkervcp.com", "description": "Welcome to Enemy Territory: Legacy, an open source project that aims to create a fully compatible client and server for the popular online FPS game Wolfenstein: Enemy Territory - whose gameplay is still considered unmatched by many, despite its great age.", "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", - "startup": ".\/etlded +set net_port {{SERVER_PORT}}", + "startup": ".\/etlded +set net_port {{SERVER_PORT}} +map {{MAP}}", "config": { "files": "{\r\n \"etmain\/etl_server.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"\/\/set net_ip \\\"\\\"\": \"set net_ip \\\"0.0.0.0\\\"\",\r\n \"\/\/set net_port \\\"27960\\\"\": \"set net_port \\\"{{server.build.env.SERVER_PORT}}\\\"\"\r\n }\r\n }\r\n}", - "startup": "{}", + "startup": "{\r\n \"done\": \"------ Server Initialization ------\",\r\n \"userInteraction\": []\r\n}", "logs": "{}", - "stop": "^C" + "stop": "quit" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt-get update\r\napt-get -y install wget curl zip unzip\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading $ET_VERSION bit ET Legacy version\"\r\n\r\nif [ $ET_VERSION == \"32\" ];then \r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 32-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` -O etlegacy.tar.gz\r\nelse\r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 64-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` O etlegacy.tar.gz\r\nfi\r\n\r\necho \"Downloading latest enemy territory files\"\r\n\r\nwget `curl https:\/\/www.splashdamage.com\/games\/wolfenstein-enemy-territory\/ | grep .x86_full | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo --color=never '(http|https):\/\/[^\"]+'` -O enemy_terrain.zip\r\n\r\necho \"Unpacking enemy terrain files\"\r\nunzip enemy_terrain.zip\r\n\r\n.\/*.x86_keygen_V03.run --noexec --keep\r\n\r\necho \"Unpacking \"\r\ntar --strip-components=1 -xzvf etlegacy.tar.gz\r\n\r\ncp \/mnt\/server\/et-linux_work\/etmain\/pak* \/mnt\/server\/etmain\/", + "script": "#!\/bin\/bash\r\n\r\napt-get update\r\napt-get -y install wget curl zip unzip\r\n\r\ncd \/tmp\/\r\n\r\necho \"Downloading $ET_VERSION bit ET Legacy version\"\r\n\r\nif [ $ET_VERSION == \"32\" ];then \r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 32-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` -O etlegacy.tar.gz\r\nelse\r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 64-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` O etlegacy.tar.gz\r\nfi\r\n\r\necho \"Unpacking ET: Legacy\"\r\ntar --strip-components=1 -xzvf etlegacy.tar.gz -C \/mnt\/server\/\r\n\r\necho \"Downloading latest enemy territory files\"\r\nwget `curl https:\/\/www.splashdamage.com\/games\/wolfenstein-enemy-territory\/ | grep .x86_full | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo --color=never '(http|https):\/\/[^\"]+'` -O enemy_territory.zip\r\n\r\necho \"Unpacking enemy territory files\"\r\nunzip enemy_territory.zip\r\n\r\necho \"Copying enemy territory assets\"\r\n.\/*.x86_keygen_V03.run --tar xvf .\/etmain\/\r\ncp etmain\/pak*.pk3 \/mnt\/server\/etmain\/\r\n\r\n# Create .etlegacy as the server doesn't correctly create it\r\nmkdir -p \/mnt\/server\/.etlegacy", "container": "ubuntu:18.04", "entrypoint": "bash" } @@ -31,6 +31,15 @@ "user_viewable": 1, "user_editable": 1, "rules": "required|integer|in:32, 64" + }, + { + "name": "Default Map", + "description": "The default map to use when starting the server.", + "env_variable": "MAP", + "default_value": "oasis", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From 307b52a0eaa1eb2d4d99266741fcaad3f57f5e8a Mon Sep 17 00:00:00 2001 From: danny6167 Date: Mon, 29 Apr 2019 22:10:02 +0800 Subject: [PATCH 206/393] Update egg-e-t-legacy.json Correct wget command for 64 bit installs --- etlegacy/etlegacy/egg-e-t-legacy.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etlegacy/etlegacy/egg-e-t-legacy.json b/etlegacy/etlegacy/egg-e-t-legacy.json index 27ad99b6..0f5dc4cc 100644 --- a/etlegacy/etlegacy/egg-e-t-legacy.json +++ b/etlegacy/etlegacy/egg-e-t-legacy.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-04-29T21:52:18+08:00", + "exported_at": "2019-04-29T22:08:18+08:00", "name": "ET Legacy", "author": "parker@parkervcp.com", "description": "Welcome to Enemy Territory: Legacy, an open source project that aims to create a fully compatible client and server for the popular online FPS game Wolfenstein: Enemy Territory - whose gameplay is still considered unmatched by many, despite its great age.", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt-get update\r\napt-get -y install wget curl zip unzip\r\n\r\ncd \/tmp\/\r\n\r\necho \"Downloading $ET_VERSION bit ET Legacy version\"\r\n\r\nif [ $ET_VERSION == \"32\" ];then \r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 32-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` -O etlegacy.tar.gz\r\nelse\r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 64-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` O etlegacy.tar.gz\r\nfi\r\n\r\necho \"Unpacking ET: Legacy\"\r\ntar --strip-components=1 -xzvf etlegacy.tar.gz -C \/mnt\/server\/\r\n\r\necho \"Downloading latest enemy territory files\"\r\nwget `curl https:\/\/www.splashdamage.com\/games\/wolfenstein-enemy-territory\/ | grep .x86_full | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo --color=never '(http|https):\/\/[^\"]+'` -O enemy_territory.zip\r\n\r\necho \"Unpacking enemy territory files\"\r\nunzip enemy_territory.zip\r\n\r\necho \"Copying enemy territory assets\"\r\n.\/*.x86_keygen_V03.run --tar xvf .\/etmain\/\r\ncp etmain\/pak*.pk3 \/mnt\/server\/etmain\/\r\n\r\n# Create .etlegacy as the server doesn't correctly create it\r\nmkdir -p \/mnt\/server\/.etlegacy", + "script": "#!\/bin\/bash\r\n\r\napt-get update\r\napt-get -y install wget curl zip unzip\r\n\r\ncd \/tmp\/\r\n\r\necho \"Downloading $ET_VERSION bit ET Legacy version\"\r\n\r\nif [ $ET_VERSION == \"32\" ];then \r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 32-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` -O etlegacy.tar.gz\r\nelse\r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 64-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` -O etlegacy.tar.gz\r\nfi\r\n\r\necho \"Unpacking ET: Legacy\"\r\ntar --strip-components=1 -xzvf etlegacy.tar.gz -C \/mnt\/server\/\r\n\r\necho \"Downloading latest enemy territory files\"\r\nwget `curl https:\/\/www.splashdamage.com\/games\/wolfenstein-enemy-territory\/ | grep .x86_full | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo --color=never '(http|https):\/\/[^\"]+'` -O enemy_territory.zip\r\n\r\necho \"Unpacking enemy territory files\"\r\nunzip enemy_territory.zip\r\n\r\necho \"Copying enemy territory assets\"\r\n.\/*.x86_keygen_V03.run --tar xvf .\/etmain\/\r\ncp etmain\/pak*.pk3 \/mnt\/server\/etmain\/\r\n\r\n# Create .etlegacy as the server doesn't correctly create it\r\nmkdir -p \/mnt\/server\/.etlegacy", "container": "ubuntu:18.04", "entrypoint": "bash" } From b4f0d5273ba05f4567f5fa64a35989402d9c7915 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 5 May 2019 09:04:09 -0400 Subject: [PATCH 207/393] rebase and organize rebase on current master organize folders and READMEs --- README.md | 2 ++ {etlegacy => enemy_territory}/etlegacy/README.md | 2 +- {etlegacy => enemy_territory}/etlegacy/egg-e-t-legacy.json | 0 3 files changed, 3 insertions(+), 1 deletion(-) rename {etlegacy => enemy_territory}/etlegacy/README.md (95%) rename {etlegacy => enemy_territory}/etlegacy/egg-e-t-legacy.json (100%) diff --git a/README.md b/README.md index ce2ce96c..6a998501 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,8 @@ If you are reading this it looks like you are looking to add an egg to your serv [Don't Starve](/dont_starve/dont_starve) +[ET Legacy](/enemy_territory/etlegacy/) + [Factorio](/factorio/factorio/) [Grand Theft Auto](/gta/) diff --git a/etlegacy/etlegacy/README.md b/enemy_territory/etlegacy/README.md similarity index 95% rename from etlegacy/etlegacy/README.md rename to enemy_territory/etlegacy/README.md index 38a65ea8..7330b1f4 100644 --- a/etlegacy/etlegacy/README.md +++ b/enemy_territory/etlegacy/README.md @@ -6,7 +6,7 @@ #### 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 own. +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. diff --git a/etlegacy/etlegacy/egg-e-t-legacy.json b/enemy_territory/etlegacy/egg-e-t-legacy.json similarity index 100% rename from etlegacy/etlegacy/egg-e-t-legacy.json rename to enemy_territory/etlegacy/egg-e-t-legacy.json From 74425c8960e612c1202a5e8f30842a433f086d63 Mon Sep 17 00:00:00 2001 From: chasx003 Date: Sun, 5 May 2019 12:57:30 -0500 Subject: [PATCH 208/393] add mordhau --- README.md | 1 + source_servers/mordhau/README.md | 65 ++++++++++++++++++ source_servers/mordhau/egg-mordhau.json | 90 +++++++++++++++++++++++++ 3 files changed, 156 insertions(+) create mode 100644 source_servers/mordhau/README.md create mode 100644 source_servers/mordhau/egg-mordhau.json diff --git a/README.md b/README.md index 6a998501..1551873d 100644 --- a/README.md +++ b/README.md @@ -85,6 +85,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [PixARK](/source_servers/pixark/) * [Rust Staging Branch](/source_servers/rust-staging/) * [Starbound](/source_servers/starbound) +* [Mordhau](/source_servers/mordhau) [Squad](/squad/) diff --git a/source_servers/mordhau/README.md b/source_servers/mordhau/README.md new file mode 100644 index 00000000..94b99ea4 --- /dev/null +++ b/source_servers/mordhau/README.md @@ -0,0 +1,65 @@ +mog#Mordhau +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. + + +### Server Ports +Mordhau requires 2 ports + +game port (default 7777) +query port (default 27015) +web admin (default 8080) + +| Port | default | +|---------|---------------| +| Game | 7777 | +| Query | 27015 | + + + +### 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 +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 +HRD = Hoard +SKM = Skirmish +FL = Frontline +FFA = Deathmatch +BR = BattleRoyal +TDM = Team Death Match + + + +Valid types per map + +Grad/ +HRD_Grad +BR_Grad +FFA_Grad +FL_Grad +SKM_Grad + +Contraband/ +FFA_Contraband +SKM_Contraband +TDM_Contraband + +DuelCamp/ +FFA_Camp +FL_Camp +HRD_Camp +SKM_Camp +TDM_Camp_64 +TDM_Camp + +MaxMap/ +FFA_MountainPeak +FL_MountainPeak +HRD_MountainPeak +SKM_MountainPeak +TDM_MountainPeak diff --git a/source_servers/mordhau/egg-mordhau.json b/source_servers/mordhau/egg-mordhau.json new file mode 100644 index 00000000..d9286c4c --- /dev/null +++ b/source_servers/mordhau/egg-mordhau.json @@ -0,0 +1,90 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-05-04T21:54:08-05:00", + "name": "Mordhau", + "author": "chasx003", + "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": "chasx003\/mordhau", + "startup": ".\/MordhauServer.sh \/Game\/Mordhau\/Maps\/{{DEFAULT_MAP}}?MaxSlots={{MAX_PLAYERS}}? -USEALLAVAILABLECORES -Port={{SERVER_PORT}} -queryport={{QUERY_PORT}}", + "config": { + "files": "{\r\n \"Mordhau\/Saved\/Config\/LinuxServer\/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\": \"Session GameSession successfully created\",\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# Mordhau 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 \/mnt\/server\/logs\r\n\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.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 629800 +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", + "container": "ubuntu:18.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Max Players", + "description": "Max Players", + "env_variable": "MAX_PLAYERS", + "default_value": "48", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" + }, + { + "name": "Source APP ID", + "description": "", + "env_variable": "SRCDS_APPID", + "default_value": "629800", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|string|max:20" + }, + { + "name": "Query Port", + "description": "", + "env_variable": "QUERY_PORT", + "default_value": "27015", + "user_viewable": 1, + "user_editable": 1, + "rules": "nullable|string|max:20" + }, + { + "name": "Admin Password", + "description": "Password for managing server from in game", + "env_variable": "ADMIN_PASSWORD", + "default_value": "password123", + "user_viewable": 1, + "user_editable": 1, + "rules": "nullable|string|max:20" + }, + { + "name": "Server Name", + "description": "Name to show up in server Browser", + "env_variable": "SERVER_NAME", + "default_value": "Server", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:40" + }, + { + "name": "Server Password", + "description": "Password to get on the server", + "env_variable": "GAME_PASSWORD", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "nullable|string|max:20" + }, + { + "name": "DEFAULT_MAP", + "description": "First map to load. Format Expected is \"MAPNAME\/TYPE_NAME\". Examples in Readme", + "env_variable": "DEFAULT_MAP", + "default_value": "Grad\/FL_Grad", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:40" + } + ] +} \ No newline at end of file From 67ff371c6b0d70dc50c42b03c109cfdc55e47ad4 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Mon, 6 May 2019 14:53:25 -0400 Subject: [PATCH 209/393] Add JMusicBot This adds the JMusicBot --- README.md | 1 + bots/discord/README.md | 4 ++ bots/discord/jmusicbot/README.md | 6 +++ bots/discord/jmusicbot/egg-j-music-bot.json | 54 +++++++++++++++++++++ 4 files changed, 65 insertions(+) create mode 100644 bots/discord/jmusicbot/README.md create mode 100644 bots/discord/jmusicbot/egg-j-music-bot.json diff --git a/README.md b/README.md index 6a998501..56edaa5b 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Bastion](/bots/discord/bastion/) * [discord.js](bots/discord/discord.js/) Node JS generic * [fragbot](/bots/discord/fragbot/) Golang +* [jmusicbot](/bots/discord/jmusicbot) Java * [parkertron](/bots/discord/parkertron/) Golang * [pixel-bot](/bots/discord/pixelbot/) Python * [Sinusbot](/bots/discord/sinusbot/) diff --git a/bots/discord/README.md b/bots/discord/README.md index 8c1cf53f..66ab5d3b 100644 --- a/bots/discord/README.md +++ b/bots/discord/README.md @@ -18,6 +18,10 @@ Give awesome perks to your Discord server! [discord.js](https://discord.js.org/) A generic discord.js egg for running discord bots. +#### fragbot +[jagrosh/MusicBot](https://github.com/jagrosh/MusicBot) +A Discord music bot that's easy to set up and run yourself! + #### fragbot [fragforce/fragbot](https://github.com/fragforce/fragbot) The bot that runs as the fragforce `@Fragbot` offering looking-for-group services for now diff --git a/bots/discord/jmusicbot/README.md b/bots/discord/jmusicbot/README.md new file mode 100644 index 00000000..e38a71e1 --- /dev/null +++ b/bots/discord/jmusicbot/README.md @@ -0,0 +1,6 @@ +# JMusicBot +### Their [Github](https://github.com/jagrosh/MusicBot) +A Discord music bot that's easy to set up and run yourself! + +### Server Ports +There are no ports required for JMusicBot \ No newline at end of file diff --git a/bots/discord/jmusicbot/egg-j-music-bot.json b/bots/discord/jmusicbot/egg-j-music-bot.json new file mode 100644 index 00000000..423479c2 --- /dev/null +++ b/bots/discord/jmusicbot/egg-j-music-bot.json @@ -0,0 +1,54 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-05-06T14:52:22-04:00", + "name": "JMusicBot", + "author": "parker@parkervcp.com", + "description": "A Discord music bot that's easy to set up and run yourself!", + "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-8-jre", + "startup": "java -Djavax.accessibility.assistive_technologies=\" \" -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}", + "startup": "{\r\n \"done\": \"\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "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" + } + }, + "variables": [ + { + "name": "Discord Bot Token", + "description": "The token for the discord bot.\r\n\r\nhttps:\/\/discordapp.com\/developers\/applications\/", + "env_variable": "BOT_TOKEN", + "default_value": "You need to get a token", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:64" + }, + { + "name": "Bot Prefix", + "description": "Thew prefix for the bot.\r\n\r\nDefault is it @mention the bot.", + "env_variable": "BOT_PREFIX", + "default_value": "@mention", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" + }, + { + "name": "Bot Owner ID", + "description": "This is the user ID of the bot owner.", + "env_variable": "BOT_OWNER", + "default_value": "changethistoyourdiscordid", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:32" + } + ] +} \ No newline at end of file From 4c01ec67fb04bc416cae4883e7ddec6c7c9fe837 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Mon, 6 May 2019 23:02:08 -0400 Subject: [PATCH 210/393] update bastion egg change install process and start command. --- bots/discord/bastion/egg-bastion.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bots/discord/bastion/egg-bastion.json b/bots/discord/bastion/egg-bastion.json index 6d440bbb..03207ab9 100644 --- a/bots/discord/bastion/egg-bastion.json +++ b/bots/discord/bastion/egg-bastion.json @@ -3,22 +3,22 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-01-02T13:13:37+00:00", + "exported_at": "2019-05-06T23:01:39-04:00", "name": "Bastion", "author": "parker@parkervcp.com", "description": "Bastion is an all-in-one multipurpose Discord bot that can do a whole bunch of things and its features are expanding daily. Bastion does everything most people will ever need it to do. Check out some feature highlights below to get a peek into the vast feature list of Bastion. And if you think Bastion lacks some feature, please send a suggestion and we will add it to Bastion as soon as possible.", "image": "quay.io\/parkervcp\/pterodactyl-images:bot_bastion", - "startup": "node -r ./utils/globals.js .", + "startup": "node -r .\/utils\/globals.js .", "config": { - "files": "{\r\n \"settings\/credentials.yaml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"botId\": \"{{server.build.env.BOT_ID}}\",\r\n \"token\": \"{{server.build.env.BOT_TOKEN}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"settings\/credentials.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"botId\": \"{{server.build.env.BOT_ID}}\",\r\n \"token\": \"{{server.build.env.BOT_TOKEN}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"I'm ready to roll!\"\r\n}", "logs": "{}", "stop": "^C" }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Bastion Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## Install Requirements\r\napk --no-cache add python g++ make git\r\n\r\n## Move to install folder\r\ncd \/mnt\/server\/\r\n\r\n## Clone repo\r\ngit clone -b stable -q --depth 1 https:\/\/github.com\/TheBastionBot\/Bastion.git .\/\r\n\r\n## Install node_modules\r\nnpm install --only=production\r\n\r\n## Move config files.\r\nmv settings\/credentials.example.yaml settings\/credentials.yaml\r\nmv settings\/configurations.example.yaml settings\/configurations.yaml", - "container": "node:8-alpine", + "script": "#!\/bin\/ash\r\n# Bastion Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## Install Requirements\r\napk --no-cache add python g++ make git\r\n\r\n## Move to install folder\r\ncd \/mnt\/server\/\r\n\r\n## Clone repo\r\ngit clone -b stable -q --depth 1 https:\/\/github.com\/TheBastionBot\/Bastion.git .\/\r\n\r\n## Install node_modules\r\nyarn install --only=production\r\n\r\n## Move config files.\r\nmv settings\/credentials.example.yaml settings\/credentials.yaml\r\nmv settings\/configurations.example.yaml settings\/configurations.yaml", + "container": "node:10-alpine", "entrypoint": "ash" } }, @@ -42,4 +42,4 @@ "rules": "required|string|max:64" } ] -} +} \ No newline at end of file From cc2a0f4a1c160b6c988390fde1d62a4110526f24 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Mon, 6 May 2019 23:16:34 -0400 Subject: [PATCH 211/393] change bastion config settings change to use the yaml parser instead of json --- bots/discord/bastion/egg-bastion.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bots/discord/bastion/egg-bastion.json b/bots/discord/bastion/egg-bastion.json index 03207ab9..4355f1d8 100644 --- a/bots/discord/bastion/egg-bastion.json +++ b/bots/discord/bastion/egg-bastion.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-05-06T23:01:39-04:00", + "exported_at": "2019-05-06T23:13:44-04:00", "name": "Bastion", "author": "parker@parkervcp.com", "description": "Bastion is an all-in-one multipurpose Discord bot that can do a whole bunch of things and its features are expanding daily. Bastion does everything most people will ever need it to do. Check out some feature highlights below to get a peek into the vast feature list of Bastion. And if you think Bastion lacks some feature, please send a suggestion and we will add it to Bastion as soon as possible.", "image": "quay.io\/parkervcp\/pterodactyl-images:bot_bastion", "startup": "node -r .\/utils\/globals.js .", "config": { - "files": "{\r\n \"settings\/credentials.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"botId\": \"{{server.build.env.BOT_ID}}\",\r\n \"token\": \"{{server.build.env.BOT_TOKEN}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"settings\/credentials.yaml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"botId\": \"{{server.build.env.BOT_ID}}\",\r\n \"token\": \"{{server.build.env.BOT_TOKEN}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"I'm ready to roll!\"\r\n}", "logs": "{}", "stop": "^C" From 108d0b5b7748a485192bc404d5e794b241876738 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 8 May 2019 07:54:05 -0400 Subject: [PATCH 212/393] add nogui flag --- 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 423479c2..1fb7b94e 100644 --- a/bots/discord/jmusicbot/egg-j-music-bot.json +++ b/bots/discord/jmusicbot/egg-j-music-bot.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-05-06T14:52:22-04:00", + "exported_at": "2019-05-08T07:52:52-04:00", "name": "JMusicBot", "author": "parker@parkervcp.com", "description": "A Discord music bot that's easy to set up and run yourself!", "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-8-jre", - "startup": "java -Djavax.accessibility.assistive_technologies=\" \" -jar JMusicBot.jar", + "startup": "java -Djavax.accessibility.assistive_technologies=\" \" -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}", "startup": "{\r\n \"done\": \"\"\r\n}", From 45b256eb27983fd80384af62cf4c52da8442f087 Mon Sep 17 00:00:00 2001 From: Pascal Date: Wed, 8 May 2019 18:48:08 +0200 Subject: [PATCH 213/393] Fixed link to Paper egg --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 56edaa5b..13f5c325 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Forge](/minecraft_java/forge/) * [Feed The Beast](/minecraft_java/ftb/) * [Spigot](/minecraft_java/spigot/) -* [PaperSpigot (Legacy)](/minecraft_java/spigot/paper-legacy) +* [Paper](/minecraft_java/paper) * [Technic](/minecraft_java/technic/) [Minecraft Proxies](/minecraft_proxy/) (these are for the java version of minecraft) From 11154b9aba08e3455c247c050cf08f70e3abbce4 Mon Sep 17 00:00:00 2001 From: Pascal Date: Thu, 9 May 2019 12:07:01 +0200 Subject: [PATCH 214/393] Fixed link to Mount & Blade Warband egg --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 13f5c325..573a5593 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 [Minecraft Proxies](/minecraft_proxy/) (these are for the java version of minecraft) * [Waterfall](/minecraft_proxy/waterfall/) -[Mount & Blade Warband](/mb_warband/) +[Mount & Blade Warband](/mount_and_blade/warband/) [OpenTTD](/openttd/) From 961ef255c0394de526e35ecfe4fb1e45310941d9 Mon Sep 17 00:00:00 2001 From: Pascal Date: Thu, 9 May 2019 12:09:36 +0200 Subject: [PATCH 215/393] Fixed link to Tower Unite egg --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 573a5593..13807133 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ If you are reading this it looks like you are looking to add an egg to your serv [Squad](/squad/) [Unreal Engine](/unreal_engine) -* [Tower Unit](/unreal_engine/tower_unit/) +* [Tower Unite](/unreal_engine/tower_unite/) [Terraria](/terraria/) * [tmodloader](/terraria/tmodloader) From 9f34b07d117dcd67f952e72d62c49091633c45e1 Mon Sep 17 00:00:00 2001 From: Pascal Date: Thu, 9 May 2019 12:11:10 +0200 Subject: [PATCH 216/393] Fixed typos --- unreal_engine/tower_unite/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/unreal_engine/tower_unite/README.md b/unreal_engine/tower_unite/README.md index 956a333d..f43f9408 100644 --- a/unreal_engine/tower_unite/README.md +++ b/unreal_engine/tower_unite/README.md @@ -1,11 +1,11 @@ -# Tower Unit +# 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 -Tower Unit requires a single port to be oepened +Tower Unite requires a single port to be opened | Port | default | |---------|---------| | Game | 7778 | -| Query | 27016 | \ No newline at end of file +| Query | 27016 | From 0cf58c83c909c153aaa2b90984c4a76c8f9c5d2e Mon Sep 17 00:00:00 2001 From: chasx003 <4624854+chasx003@users.noreply.github.com> Date: Thu, 9 May 2019 19:50:08 -0500 Subject: [PATCH 217/393] correct author --- source_servers/mordhau/egg-mordhau.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source_servers/mordhau/egg-mordhau.json b/source_servers/mordhau/egg-mordhau.json index d9286c4c..810d1616 100644 --- a/source_servers/mordhau/egg-mordhau.json +++ b/source_servers/mordhau/egg-mordhau.json @@ -5,7 +5,7 @@ }, "exported_at": "2019-05-04T21:54:08-05:00", "name": "Mordhau", - "author": "chasx003", + "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.", "image": "chasx003\/mordhau", "startup": ".\/MordhauServer.sh \/Game\/Mordhau\/Maps\/{{DEFAULT_MAP}}?MaxSlots={{MAX_PLAYERS}}? -USEALLAVAILABLECORES -Port={{SERVER_PORT}} -queryport={{QUERY_PORT}}", @@ -87,4 +87,4 @@ "rules": "required|string|max:40" } ] -} \ No newline at end of file +} From 45237ee44b2ed0a3ec00bdc464b2d651d3d7acb6 Mon Sep 17 00:00:00 2001 From: chasx003 <4624854+chasx003@users.noreply.github.com> Date: Thu, 9 May 2019 22:24:26 -0500 Subject: [PATCH 218/393] Update README.md --- source_servers/mordhau/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/source_servers/mordhau/README.md b/source_servers/mordhau/README.md index 94b99ea4..1d4d2b7f 100644 --- a/source_servers/mordhau/README.md +++ b/source_servers/mordhau/README.md @@ -14,6 +14,7 @@ web admin (default 8080) |---------|---------------| | Game | 7777 | | Query | 27015 | +| Beacon | 15000 | From 92bd43d4598d9a55b79bc9d7b7d366b1b4548f00 Mon Sep 17 00:00:00 2001 From: chasx003 <4624854+chasx003@users.noreply.github.com> Date: Thu, 9 May 2019 22:25:22 -0500 Subject: [PATCH 219/393] update egg with new beacon port requirement --- source_servers/mordhau/egg-mordhau.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/source_servers/mordhau/egg-mordhau.json b/source_servers/mordhau/egg-mordhau.json index 810d1616..efd7d9b6 100644 --- a/source_servers/mordhau/egg-mordhau.json +++ b/source_servers/mordhau/egg-mordhau.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-05-04T21:54:08-05:00", + "exported_at": "2019-05-09T22:22:13-05:00", "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.", "image": "chasx003\/mordhau", - "startup": ".\/MordhauServer.sh \/Game\/Mordhau\/Maps\/{{DEFAULT_MAP}}?MaxSlots={{MAX_PLAYERS}}? -USEALLAVAILABLECORES -Port={{SERVER_PORT}} -queryport={{QUERY_PORT}}", + "startup": ".\/MordhauServer.sh \/Game\/Mordhau\/Maps\/{{DEFAULT_MAP}}?MaxSlots={{MAX_PLAYERS}}? -USEALLAVAILABLECORES -Port={{SERVER_PORT}} -queryport={{QUERY_PORT}} -beaconport={{BEACON_PORT}}", "config": { "files": "{\r\n \"Mordhau\/Saved\/Config\/LinuxServer\/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\": \"Session GameSession successfully created\",\r\n \"userInteraction\": []\r\n}", @@ -85,6 +85,15 @@ "user_viewable": 1, "user_editable": 1, "rules": "required|string|max:40" + }, + { + "name": "Beacon Port", + "description": "Beacon Port required", + "env_variable": "BEACON_PORT", + "default_value": "15000", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" } ] } From 05d297582bb8974e98b580fdcbc4eb379aa699e1 Mon Sep 17 00:00:00 2001 From: chasx003 <4624854+chasx003@users.noreply.github.com> Date: Sat, 18 May 2019 11:44:23 -0500 Subject: [PATCH 220/393] update ports in README --- source_servers/mordhau/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source_servers/mordhau/README.md b/source_servers/mordhau/README.md index 1d4d2b7f..e7aa78b7 100644 --- a/source_servers/mordhau/README.md +++ b/source_servers/mordhau/README.md @@ -4,11 +4,11 @@ MORDHAU is a medieval first & third person multiplayer slasher. Enter a hectic b ### Server Ports -Mordhau requires 2 ports +Mordhau requires 3 ports game port (default 7777) query port (default 27015) -web admin (default 8080) +Beacon (default 15000) | Port | default | |---------|---------------| From 424f437212003adcd5bc503ad9e6e166c41d124a Mon Sep 17 00:00:00 2001 From: QuickCentralHosting <46080934+QuickCentralHosting@users.noreply.github.com> Date: Fri, 24 May 2019 02:55:42 -0700 Subject: [PATCH 221/393] Update Server Config Missing ; after Hostname. --- arma/arma3/egg-arma3-config/server.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arma/arma3/egg-arma3-config/server.cfg b/arma/arma3/egg-arma3-config/server.cfg index ee73e428..daf2d213 100644 --- a/arma/arma3/egg-arma3-config/server.cfg +++ b/arma/arma3/egg-arma3-config/server.cfg @@ -14,7 +14,7 @@ // GENERAL SETTINGS // Hostname for server. -hostname = "Arma 3 Server" +hostname = "Arma 3 Server"; // Server password - for private servers. //password = "arma3pass"; @@ -127,4 +127,4 @@ localClient[] = {"127.0.0.1", "172.18.0.1"}; // BattlEye Anti-Cheat License // 0 = decline // 1 = accept -battleyeLicense = 1; \ No newline at end of file +battleyeLicense = 1; From e7c5817524844e7665328551a62c7dcffee26197 Mon Sep 17 00:00:00 2001 From: Joshua Walsh Date: Mon, 27 May 2019 02:50:28 +1000 Subject: [PATCH 222/393] Add egg-vanilla-cord.json --- .../vanillacord/egg-vanilla-cord.json | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 minecraft_java/vanillacord/egg-vanilla-cord.json diff --git a/minecraft_java/vanillacord/egg-vanilla-cord.json b/minecraft_java/vanillacord/egg-vanilla-cord.json new file mode 100644 index 00000000..016d6d80 --- /dev/null +++ b/minecraft_java/vanillacord/egg-vanilla-cord.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-05-26T12:47:26-04: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.", + "image": "quay.io\/pterodactyl\/core:java", + "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# Vanilla MC Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt-get update\r\napt-get install -y curl jq\r\n\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\nif [ -z \"$VANILLA_VERSION\" ] || [ \"$VANILLA_VERSION\" == \"latest\" ]; then\r\n INSTALLING_VERSION=$LATEST_VERSION\r\nelse\r\n INSTALLING_VERSION=$VANILLA_VERSION\r\nfi\r\nMANIFEST_URL=$(curl https:\/\/launchermeta.mojang.com\/mc\/game\/version_manifest.json | jq .versions | jq -r '.[] | select(.id == \"'$INSTALLING_VERSION'\") | .url')\r\n\r\nDOWNLOAD_URL=`curl $MANIFEST_URL | jq .downloads.server | jq -r '. | .url'`\r\n\r\nMAJOR_VERSION=$(echo $INSTALLING_VERSION | grep -Po '^\\K\\d+(?=\\.\\d+\\.\\d+$)')\r\nMINOR_VERSION=$(echo $INSTALLING_VERSION | grep -Po '^\\d+\\.\\K\\d+(?=\\.\\d+$)')\r\nPATCH_VERSION=$(echo $INSTALLING_VERSION | grep -Po '^\\d+\\.\\d+\\.\\K\\d+(?=$)')\r\n\r\nVANILLACORD_URL=https:\/\/src.me1312.net\/jenkins\/job\/VanillaCord\/job\/1.12\/lastSuccessfulBuild\/artifact\/artifacts\/VanillaCord.jar\r\nif [[ MAJOR_VERSION -eq 1 && MINOR_VERSION -lt 12 ]]; then\r\n VANILLACORD_URL=https:\/\/src.me1312.net\/jenkins\/job\/VanillaCord\/job\/1.7.10\/lastSuccessfulBuild\/artifact\/artifacts\/VanillaCord.jar\r\nfi\r\n\r\nif [[ (MAJOR_VERSION -eq 1 && MINOR_VERSION -eq 7 && PATCH_VERSION -lt 10) || (MAJOR_VERSION -eq 1 && MINOR_VERSION -lt 7) ]]; then\r\n echo \"VanillaCord is only supported on Minecraft 1.7.10 or higher! You cannot use it with $INSTALLING_VERSION.\"\r\n exit 1\r\nfi\r\n\r\ncurl -o vanillacord.jar $VANILLACORD_URL\r\njava -jar vanillacord.jar $INSTALLING_VERSION\r\n\r\nrm -f vanillacord.jar\r\nrm -rf in\r\nmv out\/*.jar $SERVER_JARFILE\r\nrm -rf out", + "container": "openjdk:8-jre-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": 1, + "user_editable": 1, + "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": 1, + "user_editable": 1, + "rules": "required|string|between:3,15" + } + ] +} From 0ca9507e1942ff826d31fce7efbb67e86aff4ce0 Mon Sep 17 00:00:00 2001 From: Joshua Walsh Date: Mon, 27 May 2019 02:53:09 +1000 Subject: [PATCH 223/393] Add VanillaCord to main README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 13807133..048bc676 100644 --- a/README.md +++ b/README.md @@ -72,6 +72,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Spigot](/minecraft_java/spigot/) * [Paper](/minecraft_java/paper) * [Technic](/minecraft_java/technic/) +* [VanillaCord](/minecraft_java/vanillacord/) [Minecraft Proxies](/minecraft_proxy/) (these are for the java version of minecraft) * [Waterfall](/minecraft_proxy/waterfall/) From ff7e18365d362b7d63f28b61cf3c41c4acdb6b52 Mon Sep 17 00:00:00 2001 From: Joshua Walsh Date: Mon, 27 May 2019 02:56:11 +1000 Subject: [PATCH 224/393] Create README.MD for VanillaCord --- minecraft_java/vanillacord/README.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 minecraft_java/vanillacord/README.md diff --git a/minecraft_java/vanillacord/README.md b/minecraft_java/vanillacord/README.md new file mode 100644 index 00000000..b76396a6 --- /dev/null +++ b/minecraft_java/vanillacord/README.md @@ -0,0 +1,5 @@ +# VanillaCord + +A patch for vanilla servers to work with BungeeCord's ip_forward setting. + +[Details](https://www.spigotmc.org/resources/vanillacord.952/) From 5ee10e995c639c914d5116f1bc681a087de91bee Mon Sep 17 00:00:00 2001 From: Joshua Walsh Date: Mon, 27 May 2019 11:08:46 +1000 Subject: [PATCH 225/393] Update VanillaCord link to point to ME1312's fork --- minecraft_java/vanillacord/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft_java/vanillacord/README.md b/minecraft_java/vanillacord/README.md index b76396a6..d1544799 100644 --- a/minecraft_java/vanillacord/README.md +++ b/minecraft_java/vanillacord/README.md @@ -2,4 +2,4 @@ A patch for vanilla servers to work with BungeeCord's ip_forward setting. -[Details](https://www.spigotmc.org/resources/vanillacord.952/) +This uses [ME1312's fork](https://github.com/ME1312/VanillaCord) of VanillaCord which has been updated for modern Minecraft. From 32b614802eb29e437554ab70a341c15d716e7d86 Mon Sep 17 00:00:00 2001 From: Joshua Walsh Date: Mon, 27 May 2019 11:25:03 +1000 Subject: [PATCH 226/393] Add some notes about online-mode --- minecraft_java/vanillacord/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/minecraft_java/vanillacord/README.md b/minecraft_java/vanillacord/README.md index d1544799..c5d91e0e 100644 --- a/minecraft_java/vanillacord/README.md +++ b/minecraft_java/vanillacord/README.md @@ -3,3 +3,7 @@ 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: + +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. From 5603dbcc747367e21ad1bef1cb34f2868d145f11 Mon Sep 17 00:00:00 2001 From: Arnaud Lier Date: Sun, 2 Jun 2019 11:30:53 +0200 Subject: [PATCH 227/393] Create egg-attack-of-the-b--team.json --- .../egg-attack-of-the-b--team.json | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 minecraft_java/technic/attack-of-the-bteam/egg-attack-of-the-b--team.json diff --git a/minecraft_java/technic/attack-of-the-bteam/egg-attack-of-the-b--team.json b/minecraft_java/technic/attack-of-the-bteam/egg-attack-of-the-b--team.json new file mode 100644 index 00000000..f38046e3 --- /dev/null +++ b/minecraft_java/technic/attack-of-the-bteam/egg-attack-of-the-b--team.json @@ -0,0 +1,36 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-06-02T11:29:46+02:00", + "name": "Attack of the B-Team", + "author": "support@pterodactyl.io", + "description": "This modpack was designed with one thing in mind, crazy mad science! With the help of the B-Team we hand picked the wackiest mods we could find and shoved them all in a modpack for you guys. The result is Attack of the B-Team!", + "image": "quay.io\/pterodactyl\/core:java", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar BTeam.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}", + "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "stop": "stop" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/ash\r\n# Forge 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\ncurl -sS http:\/\/servers.technicpack.net\/Technic\/servers\/bteam\/BTeam_Server_v$MODPACK_VERSION.zip -o BTeam_Server_v$MODPACK_VERSION.zip\r\n\r\nunzip BTeam_Server_v$MODPACK_VERSION.zip\r\n\r\nrm -rf BTeam_Server_v$MODPACK_VERSION.zip", + "container": "alpine:3.9", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Modpack Version", + "description": "Version of the modpack to use", + "env_variable": "MODPACK_VERSION", + "default_value": "1.0.12c", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" + } + ] +} From ee8bd5c21a38724c611600e978af233d4fb7f8e9 Mon Sep 17 00:00:00 2001 From: Arnaud Lier Date: Sun, 2 Jun 2019 11:33:19 +0200 Subject: [PATCH 228/393] Create README.MD --- minecraft_java/technic/attack-of-the-bteam/README.MD | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 minecraft_java/technic/attack-of-the-bteam/README.MD diff --git a/minecraft_java/technic/attack-of-the-bteam/README.MD b/minecraft_java/technic/attack-of-the-bteam/README.MD new file mode 100644 index 00000000..f5bc5be3 --- /dev/null +++ b/minecraft_java/technic/attack-of-the-bteam/README.MD @@ -0,0 +1,11 @@ +# Minecraft: Attack of the B Team + +A very good modpack! + +## 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 45639b92467c4f41ad2c0ee31dbf07050b5f5281 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 2 Jun 2019 19:22:12 -0400 Subject: [PATCH 229/393] 7dtd and xml is garbage --- source_servers/7_days_to_die/egg-7-days-to-die.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source_servers/7_days_to_die/egg-7-days-to-die.json b/source_servers/7_days_to_die/egg-7-days-to-die.json index 5f5f7c0b..49475dd8 100644 --- a/source_servers/7_days_to_die/egg-7-days-to-die.json +++ b/source_servers/7_days_to_die/egg-7-days-to-die.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-10-23T10:20:04-04:00", + "exported_at": "2019-06-02T19:20:57-04:00", "name": "7 Days To Die", "author": "kristoffer.norman@bahnhof.se", "description": "7 days to die server", "image": "quay.io\/parkervcp\/pterodactyl-images:source", - "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.build.default.port}} -ServerMaxPlayerCount=${{server.build.env.MAX_PLAYERS}} -GameDifficulty=${{server.build.env.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": "{\r\n \"serverconfig.xml\": {\r\n \"parser\": \"xml\",\r\n \"find\": {\r\n \"ServerPort\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "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}", "stop": "shutdown" @@ -51,4 +51,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From c21621c3ccf99635aaea54ce71cfc4fbc67ddc2c Mon Sep 17 00:00:00 2001 From: Joshua Walsh Date: Tue, 4 Jun 2019 21:15:06 +1000 Subject: [PATCH 230/393] Fix #219 This fixes an issue where installation of Forge Generic would fail if the modpack's included settings.cfg file had Windows-style (\r\n) line endings --- minecraft_java/forge/forge-generic/egg-forge-generic.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/minecraft_java/forge/forge-generic/egg-forge-generic.json b/minecraft_java/forge/forge-generic/egg-forge-generic.json index 53da7298..929da0be 100644 --- a/minecraft_java/forge/forge-generic/egg-forge-generic.json +++ b/minecraft_java/forge/forge-generic/egg-forge-generic.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-05-03T11:53:00-04:00", + "exported_at": "2019-06-04T07:13:30-04:00", "name": "Forge Generic", "author": "parker@parkervcp.com", "description": "A generic egg for a forge modpack", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nfunction install_required {\r\n apk --no-cache --update add curl jq\r\n}\r\n\r\nfunction get_download {\r\n BASE_URL=${MODPACK_URL}\/files\r\n\r\n if [ -z \"${MODPACK_VERSION}\" ] || [ \"${MODPACK_VERSION}\" == \"latest\" ]; then\r\n ID=`curl -sl ${BASE_URL} | grep -i -A9 'title=\"release\"' | grep -m 1 -i -o 'href=\".*\"' | cut -d \"\/\" -f5 | sed s\/\\\"\/\/g`\r\n echo \"ID: ${ID}\"\r\n else\r\n ID=`curl -sl ${BASE_URL} | grep -i -A9 \"${MODPACK_VERSION}\" | grep -m 1 -oE 'href=\"[^\\\"]+\"' | cut -d \"\/\" -f5 | grep -oE [0-9]+`\r\n echo \"ID: ${ID}\"\r\n fi\r\n\r\n SECONDURL=${BASE_URL}\/${ID}\r\n echo \"SECONDURL: ${SECONDURL}\"\r\n\r\n GOOD_ID=`curl -sl ${SECONDURL} | grep -i server | grep -Eo 'href=\"[^\\\"]+\"' | grep -o -E \"[0-9]+\" | tail -1`\r\n if [ -z \"$GOOD_ID\" ]; then\r\n GOOD_ID=$ID\r\n fi\r\n echo \"GOOD_ID: ${GOOD_ID}\"\r\n\r\n DL_URL=${BASE_URL}\/${GOOD_ID}\/download\r\n echo \"Download_URL: ${DL_URL}\"\r\n\r\n cd \/mnt\/server\r\n\r\n echo \"Executing curl -L ${DL_URL} -o server.zip\"\r\n curl -L ${DL_URL} -o server.zip\r\n\r\n unzip -o server.zip\r\n\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 java -jar *installer.jar --installServer\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\r\n mv *universal.jar server.jar\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=\"https:\/\/minecraft.curseforge.com\/projects\/${projID}\/files\/${fileID}\/download\"\r\n echo \"mods file url: ${URL}\"\r\n # this is saving everything as \/mnt\/server\/mods\/download\r\n FINAL_URL=$(curl $URL -s -L -o \/dev\/null -w '%{url_effective}')\r\n echo \"Mod direct url: $FINAL_URL\"\r\n curl -JLO ${FINAL_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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\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 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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\ninstall_required\r\nget_download\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\nelse\r\n forge_install\r\n forge_cleanup\r\nfi", + "script": "#!\/bin\/ash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nfunction install_required {\r\n apk --no-cache --update add curl jq\r\n}\r\n\r\nfunction get_download {\r\n BASE_URL=${MODPACK_URL}\/files\r\n\r\n if [ -z \"${MODPACK_VERSION}\" ] || [ \"${MODPACK_VERSION}\" == \"latest\" ]; then\r\n ID=`curl -sl ${BASE_URL} | grep -i -A9 'title=\"release\"' | grep -m 1 -i -o 'href=\".*\"' | cut -d \"\/\" -f5 | sed s\/\\\"\/\/g`\r\n echo \"ID: ${ID}\"\r\n else\r\n ID=`curl -sl ${BASE_URL} | grep -i -A9 \"${MODPACK_VERSION}\" | grep -m 1 -oE 'href=\"[^\\\"]+\"' | cut -d \"\/\" -f5 | grep -oE [0-9]+`\r\n echo \"ID: ${ID}\"\r\n fi\r\n\r\n SECONDURL=${BASE_URL}\/${ID}\r\n echo \"SECONDURL: ${SECONDURL}\"\r\n\r\n GOOD_ID=`curl -sl ${SECONDURL} | grep -i server | grep -Eo 'href=\"[^\\\"]+\"' | grep -o -E \"[0-9]+\" | tail -1`\r\n if [ -z \"$GOOD_ID\" ]; then\r\n GOOD_ID=$ID\r\n fi\r\n echo \"GOOD_ID: ${GOOD_ID}\"\r\n\r\n DL_URL=${BASE_URL}\/${GOOD_ID}\/download\r\n echo \"Download_URL: ${DL_URL}\"\r\n\r\n cd \/mnt\/server\r\n\r\n echo \"Executing curl -L ${DL_URL} -o server.zip\"\r\n curl -L ${DL_URL} -o server.zip\r\n\r\n unzip -o server.zip\r\n\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 java -jar *installer.jar --installServer\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\r\n mv *universal.jar server.jar\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=\"https:\/\/minecraft.curseforge.com\/projects\/${projID}\/files\/${fileID}\/download\"\r\n echo \"mods file url: ${URL}\"\r\n # this is saving everything as \/mnt\/server\/mods\/download\r\n FINAL_URL=$(curl $URL -s -L -o \/dev\/null -w '%{url_effective}')\r\n echo \"Mod direct url: $FINAL_URL\"\r\n curl -JLO ${FINAL_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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\ninstall_required\r\nget_download\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\nelse\r\n forge_install\r\n forge_cleanup\r\nfi", "container": "openjdk:8-alpine", "entrypoint": "ash" } @@ -42,4 +42,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From 7e2c37769218faa0f35b95d99c9632181fdad8aa Mon Sep 17 00:00:00 2001 From: Joshua Walsh Date: Thu, 6 Jun 2019 14:41:40 +1000 Subject: [PATCH 231/393] Use Alpine instead of Debian for install image Required using `sed` instead of `grep` due to BusyBox `grep` not supporting PCRE. Also required rewriting the conditions for the if statements, as `ash` does not support Bash's Conditional Expressions. --- minecraft_java/vanillacord/egg-vanilla-cord.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/minecraft_java/vanillacord/egg-vanilla-cord.json b/minecraft_java/vanillacord/egg-vanilla-cord.json index 016d6d80..9927e189 100644 --- a/minecraft_java/vanillacord/egg-vanilla-cord.json +++ b/minecraft_java/vanillacord/egg-vanilla-cord.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-05-26T12:47:26-04:00", + "exported_at": "2019-06-06T00:39:33-04: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.", @@ -17,9 +17,9 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Vanilla MC Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt-get update\r\napt-get install -y curl jq\r\n\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\nif [ -z \"$VANILLA_VERSION\" ] || [ \"$VANILLA_VERSION\" == \"latest\" ]; then\r\n INSTALLING_VERSION=$LATEST_VERSION\r\nelse\r\n INSTALLING_VERSION=$VANILLA_VERSION\r\nfi\r\nMANIFEST_URL=$(curl https:\/\/launchermeta.mojang.com\/mc\/game\/version_manifest.json | jq .versions | jq -r '.[] | select(.id == \"'$INSTALLING_VERSION'\") | .url')\r\n\r\nDOWNLOAD_URL=`curl $MANIFEST_URL | jq .downloads.server | jq -r '. | .url'`\r\n\r\nMAJOR_VERSION=$(echo $INSTALLING_VERSION | grep -Po '^\\K\\d+(?=\\.\\d+\\.\\d+$)')\r\nMINOR_VERSION=$(echo $INSTALLING_VERSION | grep -Po '^\\d+\\.\\K\\d+(?=\\.\\d+$)')\r\nPATCH_VERSION=$(echo $INSTALLING_VERSION | grep -Po '^\\d+\\.\\d+\\.\\K\\d+(?=$)')\r\n\r\nVANILLACORD_URL=https:\/\/src.me1312.net\/jenkins\/job\/VanillaCord\/job\/1.12\/lastSuccessfulBuild\/artifact\/artifacts\/VanillaCord.jar\r\nif [[ MAJOR_VERSION -eq 1 && MINOR_VERSION -lt 12 ]]; then\r\n VANILLACORD_URL=https:\/\/src.me1312.net\/jenkins\/job\/VanillaCord\/job\/1.7.10\/lastSuccessfulBuild\/artifact\/artifacts\/VanillaCord.jar\r\nfi\r\n\r\nif [[ (MAJOR_VERSION -eq 1 && MINOR_VERSION -eq 7 && PATCH_VERSION -lt 10) || (MAJOR_VERSION -eq 1 && MINOR_VERSION -lt 7) ]]; then\r\n echo \"VanillaCord is only supported on Minecraft 1.7.10 or higher! You cannot use it with $INSTALLING_VERSION.\"\r\n exit 1\r\nfi\r\n\r\ncurl -o vanillacord.jar $VANILLACORD_URL\r\njava -jar vanillacord.jar $INSTALLING_VERSION\r\n\r\nrm -f vanillacord.jar\r\nrm -rf in\r\nmv out\/*.jar $SERVER_JARFILE\r\nrm -rf out", - "container": "openjdk:8-jre-slim", - "entrypoint": "bash" + "script": "#!\/bin\/ash\r\n\r\napk --no-cache --update add curl jq\r\n\r\ncd \/mnt\/server\r\n\r\necho $VANILLA_VERSION\r\n\r\nLATEST_VERSION=`curl https:\/\/launchermeta.mojang.com\/mc\/game\/version_manifest.json | jq -r '.latest.release'`\r\n\r\nif { [ -z \"$VANILLA_VERSION\" ] || [ \"$VANILLA_VERSION\" == \"latest\" ]; } then\r\n INSTALLING_VERSION=$LATEST_VERSION\r\nelse\r\n INSTALLING_VERSION=$VANILLA_VERSION\r\nfi\r\nMANIFEST_URL=$(curl https:\/\/launchermeta.mojang.com\/mc\/game\/version_manifest.json | jq .versions | jq -r '.[] | select(.id == \"'$INSTALLING_VERSION'\") | .url')\r\n\r\nDOWNLOAD_URL=`curl $MANIFEST_URL | jq .downloads.server | jq -r '. | .url'`\r\n\r\nMAJOR_VERSION=$(echo $INSTALLING_VERSION | sed -En 's\/^([0-9]*)\\.[0-9]*\\.[0-9]*$\/\\1\/p')\r\nMINOR_VERSION=$(echo $INSTALLING_VERSION | sed -En 's\/^[0-9]*\\.([0-9]*)\\.[0-9]*$\/\\1\/p')\r\nPATCH_VERSION=$(echo $INSTALLING_VERSION | sed -En 's\/^[0-9]*\\.[0-9]*\\.([0-9]*)$\/\\1\/p')\r\n\r\nVANILLACORD_URL=https:\/\/src.me1312.net\/jenkins\/job\/VanillaCord\/job\/1.12\/lastSuccessfulBuild\/artifact\/artifacts\/VanillaCord.jar\r\nif [ $MAJOR_VERSION -eq 1 ] && [ $MINOR_VERSION -lt 12 ]; then\r\n VANILLACORD_URL=https:\/\/src.me1312.net\/jenkins\/job\/VanillaCord\/job\/1.7.10\/lastSuccessfulBuild\/artifact\/artifacts\/VanillaCord.jar\r\nfi\r\n\r\nif { [ $MAJOR_VERSION -eq 1 ] && [ $MINOR_VERSION -eq 7 ] && [ $PATCH_VERSION -lt 10 ]; } || { [ $MAJOR_VERSION -eq 1 ] && [ $MINOR_VERSION -lt 7 ]; } then\r\n echo \"VanillaCord is only supported on Minecraft 1.7.10 or higher! You cannot use it with $INSTALLING_VERSION.\"\r\n exit 1\r\nfi\r\n\r\ncurl -o vanillacord.jar $VANILLACORD_URL\r\njava -jar vanillacord.jar $INSTALLING_VERSION\r\n\r\nrm -f vanillacord.jar\r\nrm -rf in\r\nmv out\/*.jar $SERVER_JARFILE\r\nrm -rf out", + "container": "openjdk:8-jre-alpine", + "entrypoint": "ash" } }, "variables": [ From cd74e81d05fe678d722e6f9f36369a3f8d79e72c Mon Sep 17 00:00:00 2001 From: Joshua Walsh Date: Thu, 6 Jun 2019 23:34:08 +1000 Subject: [PATCH 232/393] Remove unused environment variables --- minecraft_java/vanillacord/egg-vanilla-cord.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_java/vanillacord/egg-vanilla-cord.json b/minecraft_java/vanillacord/egg-vanilla-cord.json index 9927e189..7df2d5c5 100644 --- a/minecraft_java/vanillacord/egg-vanilla-cord.json +++ b/minecraft_java/vanillacord/egg-vanilla-cord.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-06-06T00:39:33-04:00", + "exported_at": "2019-06-06T09:33:27-04: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.", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n\r\napk --no-cache --update add curl jq\r\n\r\ncd \/mnt\/server\r\n\r\necho $VANILLA_VERSION\r\n\r\nLATEST_VERSION=`curl https:\/\/launchermeta.mojang.com\/mc\/game\/version_manifest.json | jq -r '.latest.release'`\r\n\r\nif { [ -z \"$VANILLA_VERSION\" ] || [ \"$VANILLA_VERSION\" == \"latest\" ]; } then\r\n INSTALLING_VERSION=$LATEST_VERSION\r\nelse\r\n INSTALLING_VERSION=$VANILLA_VERSION\r\nfi\r\nMANIFEST_URL=$(curl https:\/\/launchermeta.mojang.com\/mc\/game\/version_manifest.json | jq .versions | jq -r '.[] | select(.id == \"'$INSTALLING_VERSION'\") | .url')\r\n\r\nDOWNLOAD_URL=`curl $MANIFEST_URL | jq .downloads.server | jq -r '. | .url'`\r\n\r\nMAJOR_VERSION=$(echo $INSTALLING_VERSION | sed -En 's\/^([0-9]*)\\.[0-9]*\\.[0-9]*$\/\\1\/p')\r\nMINOR_VERSION=$(echo $INSTALLING_VERSION | sed -En 's\/^[0-9]*\\.([0-9]*)\\.[0-9]*$\/\\1\/p')\r\nPATCH_VERSION=$(echo $INSTALLING_VERSION | sed -En 's\/^[0-9]*\\.[0-9]*\\.([0-9]*)$\/\\1\/p')\r\n\r\nVANILLACORD_URL=https:\/\/src.me1312.net\/jenkins\/job\/VanillaCord\/job\/1.12\/lastSuccessfulBuild\/artifact\/artifacts\/VanillaCord.jar\r\nif [ $MAJOR_VERSION -eq 1 ] && [ $MINOR_VERSION -lt 12 ]; then\r\n VANILLACORD_URL=https:\/\/src.me1312.net\/jenkins\/job\/VanillaCord\/job\/1.7.10\/lastSuccessfulBuild\/artifact\/artifacts\/VanillaCord.jar\r\nfi\r\n\r\nif { [ $MAJOR_VERSION -eq 1 ] && [ $MINOR_VERSION -eq 7 ] && [ $PATCH_VERSION -lt 10 ]; } || { [ $MAJOR_VERSION -eq 1 ] && [ $MINOR_VERSION -lt 7 ]; } then\r\n echo \"VanillaCord is only supported on Minecraft 1.7.10 or higher! You cannot use it with $INSTALLING_VERSION.\"\r\n exit 1\r\nfi\r\n\r\ncurl -o vanillacord.jar $VANILLACORD_URL\r\njava -jar vanillacord.jar $INSTALLING_VERSION\r\n\r\nrm -f vanillacord.jar\r\nrm -rf in\r\nmv out\/*.jar $SERVER_JARFILE\r\nrm -rf out", + "script": "#!\/bin\/ash\r\n\r\napk --no-cache --update add curl jq\r\n\r\ncd \/mnt\/server\r\n\r\necho $VANILLA_VERSION\r\n\r\nLATEST_VERSION=`curl https:\/\/launchermeta.mojang.com\/mc\/game\/version_manifest.json | jq -r '.latest.release'`\r\n\r\nif { [ -z \"$VANILLA_VERSION\" ] || [ \"$VANILLA_VERSION\" == \"latest\" ]; } then\r\n INSTALLING_VERSION=$LATEST_VERSION\r\nelse\r\n INSTALLING_VERSION=$VANILLA_VERSION\r\nfi\r\n\r\nMAJOR_VERSION=$(echo $INSTALLING_VERSION | sed -En 's\/^([0-9]*)\\.[0-9]*\\.[0-9]*$\/\\1\/p')\r\nMINOR_VERSION=$(echo $INSTALLING_VERSION | sed -En 's\/^[0-9]*\\.([0-9]*)\\.[0-9]*$\/\\1\/p')\r\nPATCH_VERSION=$(echo $INSTALLING_VERSION | sed -En 's\/^[0-9]*\\.[0-9]*\\.([0-9]*)$\/\\1\/p')\r\n\r\nVANILLACORD_URL=https:\/\/src.me1312.net\/jenkins\/job\/VanillaCord\/job\/1.12\/lastSuccessfulBuild\/artifact\/artifacts\/VanillaCord.jar\r\nif [ $MAJOR_VERSION -eq 1 ] && [ $MINOR_VERSION -lt 12 ]; then\r\n VANILLACORD_URL=https:\/\/src.me1312.net\/jenkins\/job\/VanillaCord\/job\/1.7.10\/lastSuccessfulBuild\/artifact\/artifacts\/VanillaCord.jar\r\nfi\r\n\r\nif { [ $MAJOR_VERSION -eq 1 ] && [ $MINOR_VERSION -eq 7 ] && [ $PATCH_VERSION -lt 10 ]; } || { [ $MAJOR_VERSION -eq 1 ] && [ $MINOR_VERSION -lt 7 ]; } then\r\n echo \"VanillaCord is only supported on Minecraft 1.7.10 or higher! You cannot use it with $INSTALLING_VERSION.\"\r\n exit 1\r\nfi\r\n\r\ncurl -o vanillacord.jar $VANILLACORD_URL\r\njava -jar vanillacord.jar $INSTALLING_VERSION\r\n\r\nrm -f vanillacord.jar\r\nrm -rf in\r\nmv out\/*.jar $SERVER_JARFILE\r\nrm -rf out", "container": "openjdk:8-jre-alpine", "entrypoint": "ash" } From 8ec037589ad76e55d964f6704f749c9a5ab52ce4 Mon Sep 17 00:00:00 2001 From: Arnaud Lier Date: Mon, 10 Jun 2019 21:37:29 +0200 Subject: [PATCH 233/393] Create README.md --- minecraft_java/technic/README.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 minecraft_java/technic/README.md diff --git a/minecraft_java/technic/README.md b/minecraft_java/technic/README.md new file mode 100644 index 00000000..4f2e1e57 --- /dev/null +++ b/minecraft_java/technic/README.md @@ -0,0 +1,22 @@ +## How to import an egg + +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. 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. + 1. 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). + +# You must restart your daemon after importing an egg + +## Technic Eggs + +[Technic](/minecraft_java/technic/) +* [Blightfall](/minecraft_java/technic/blightfall/) +* [Hexxit](/minecraft_java/technic/hexxit/) +* [Tekkit Legends](/minecraft_java/technic/tekkit-legends/) +* [Attack of the B-Team](/minecraft_java/technic/attack-of-the-bteam/) From d08d6cbeed9ded51119c15898c333ba99dec0fb7 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 11 Jun 2019 11:08:32 -0400 Subject: [PATCH 234/393] add mariadb start --- database/README.md | 9 +++ database/mariadb/my.cnf | 147 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+) create mode 100644 database/README.md create mode 100644 database/mariadb/my.cnf diff --git a/database/README.md b/database/README.md new file mode 100644 index 00000000..66e60c2b --- /dev/null +++ b/database/README.md @@ -0,0 +1,9 @@ +# databases + +## sql DBs + +### [mariadb](/database/mariadb/) + https://mariadb.org/ + +### [postgres](/database/postgres/) + https://www.postgresql.org/ \ No newline at end of file diff --git a/database/mariadb/my.cnf b/database/mariadb/my.cnf new file mode 100644 index 00000000..e2571fdf --- /dev/null +++ b/database/mariadb/my.cnf @@ -0,0 +1,147 @@ +# +# The MySQL database server configuration file. +# +# You can copy this to one of: +# - "/etc/mysql/my.cnf" to set global options, +# - "~/.my.cnf" to set user-specific options. +# +# One can use all long options that the program supports. +# Run program with --help to get a list of available options and with +# --print-defaults to see which it would actually understand and use. +# +# For explanations see +# http://dev.mysql.com/doc/mysql/en/server-system-variables.html + +# This will be passed to all mysql clients +# It has been reported that passwords should be enclosed with ticks/quotes +# escpecially if they contain "#" chars... +# Remember to edit /etc/mysql/debian.cnf when changing the socket location. +[client] +port = 3306 +socket = /var/run/mysqld/mysqld.sock + +# Here is entries for some specific programs +# The following values assume you have at least 32M ram + +# This was formally known as [safe_mysqld]. Both versions are currently parsed. +[mysqld_safe] +socket = /var/run/mysqld/mysqld.sock +nice = 0 + +[mysqld] +# +# * Basic Settings +# +user = mysql +pid-file = /var/run/mysqld/mysqld.pid +socket = /var/run/mysqld/mysqld.sock +port = 3306 +basedir = /usr +datadir = /var/lib/mysql +tmpdir = /tmp +lc-messages-dir = /usr/share/mysql +skip-external-locking +skip-character-set-client-handshake +default-storage-engine = InnoDB +character-set-server = utf8 +transaction-isolation = READ-COMMITTED + +# +# Instead of skip-networking the default is now to listen only on +# localhost which is more compatible and is not less secure. +bind-address = 127.0.0.1 +# +# * Fine Tuning +# +key_buffer = 16M +max_allowed_packet = 16M +thread_stack = 192K +thread_cache_size = 16 +# This replaces the startup script and checks MyISAM tables if needed +# the first time they are touched +myisam-recover = BACKUP +max_connections = 300 +table_open_cache = 64 +thread_concurrency = 10 +table_open_cache = 32 +thread_concurrency = 4 + +# +# * Query Cache Configuration +# +query_cache_type = 1 +query_cache_limit = 1M +query_cache_size = 8M +# +# * Logging and Replication +# +# Both location gets rotated by the cronjob. +# Be aware that this log type is a performance killer. +# As of 5.1 you can enable the log at runtime! +general_log_file = /var/log/mysql/mysql.log +#general_log = 1 +# +# Error log - should be very few entries. +# +log_error = /var/log/mysql/error.log +# +# Here you can see queries with especially long duration +slow_query_log = 1 +slow_query_log_file = /var/log/mysql/mysql-slow.log +long_query_time = 1 +#log-queries-not-using-indexes + +# +# The following can be used as easy to replay backup logs or for replication. +# note: if you are setting up a replication slave, see README.Debian about +# other settings you may need to change. +#server-id = 1 +#log_bin = /var/log/mysql/mysql-bin.log +expire_logs_days = 14 +max_binlog_size = 1G +#binlog_do_db = include_database_name +#binlog_ignore_db = include_database_name +# +# * InnoDB +# +# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/. +# Read the manual for more InnoDB related options. There are many! +# +# * Security Features +# +# Read the manual, too, if you want chroot! +# chroot = /var/lib/mysql/ +# +# For generating SSL certificates I recommend the OpenSSL GUI "tinyca". +# +# ssl-ca=/etc/mysql/cacert.pem +# ssl-cert=/etc/mysql/server-cert.pem +# ssl-key=/etc/mysql/server-key.pem +innodb_data_file_path = ibdata1:128M:autoextend +innodb_file_per_table = 1 +skip-innodb_doublewrite +innodb_additional_mem_pool_size = 12M +innodb_buffer_pool_size = 256M +innodb_log_buffer_size = 8M +innodb_log_file_size = 8M +innodb_flush_log_at_trx_commit = 0 +innodb_flush_method = O_DIRECT +innodb_support_xa = OFF + + +[mysqldump] +quick +quote-names +max_allowed_packet = 16M + +[mysql] +#no-auto-rehash # faster start of mysql but no tab completition + +[isamchk] +key_buffer = 16M + +# +# * IMPORTANT: Additional settings that can override those from this file! +# The files must end with '.cnf', otherwise they'll be ignored. +# +!includedir /etc/mysql/conf.d/ From d8dc9052334c05462d899ab11d6efe2cfab5c447 Mon Sep 17 00:00:00 2001 From: rtm516 Date: Wed, 12 Jun 2019 22:40:53 +0100 Subject: [PATCH 235/393] Added query port to the starbound config --- source_servers/starbound/egg-starbound.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source_servers/starbound/egg-starbound.json b/source_servers/starbound/egg-starbound.json index 39dcccc8..06930e29 100644 --- a/source_servers/starbound/egg-starbound.json +++ b/source_servers/starbound/egg-starbound.json @@ -10,7 +10,7 @@ "image": "quay.io\/pterodactyl\/core:source", "startup": ".\/starbound_server", "config": { - "files": "{\r\n \"storage\/starbound_server.config\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"gameServerPort\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"storage\/starbound_server.config\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"gameServerPort\": \"{{server.build.default.port}}\",\r\n \"queryServerPort\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Starting UniverseServer\",\r\n \"userInteraction\": []\r\n}", "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "^C" @@ -60,4 +60,4 @@ "rules": "string" } ] -} \ No newline at end of file +} From 8eb3f761e7becf00e71754742e3ca3713787294b Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Wed, 12 Jun 2019 17:41:25 -0400 Subject: [PATCH 236/393] updated install script. --- 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 7bd0d3b7..aa277b42 100644 --- a/bots/discord/discord.js/egg-discord-js-generic.json +++ b/bots/discord/discord.js/egg-discord-js-generic.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-04-01T15:16:34-04:00", + "exported_at": "2019-06-12T17:40:57-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.", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#\/bin\/ash\r\n\r\napk add --no-cache git\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\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" } From b076ca8a9b5bf52edc7467c10a996a71621f257a Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Wed, 12 Jun 2019 17:48:11 -0400 Subject: [PATCH 237/393] fix startup conf fix startup conf for those easily confused. --- 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 aa277b42..8017c49a 100644 --- a/bots/discord/discord.js/egg-discord-js-generic.json +++ b/bots/discord/discord.js/egg-discord-js-generic.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-06-12T17:40:57-04:00", + "exported_at": "2019-06-12T17:47:09-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.", @@ -11,7 +11,7 @@ "startup": "\/usr\/local\/bin\/node \/home\/container\/index.js", "config": { "files": "{}", - "startup": "{}", + "startup": "{\r\n \"done\": \"change this part\"\r\n}", "logs": "{}", "stop": "^c" }, From 68f8eed12b756f98692397de845f7c6952c422e9 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Wed, 12 Jun 2019 21:03:48 -0400 Subject: [PATCH 238/393] add mariadb confs --- database/mariadb/install.my.cnf | 189 ++++++++++++++++++++++++++++++++ database/mariadb/my.cnf | 154 ++++++++++++++++---------- 2 files changed, 287 insertions(+), 56 deletions(-) create mode 100644 database/mariadb/install.my.cnf diff --git a/database/mariadb/install.my.cnf b/database/mariadb/install.my.cnf new file mode 100644 index 00000000..f1af70ac --- /dev/null +++ b/database/mariadb/install.my.cnf @@ -0,0 +1,189 @@ +# MariaDB database server configuration file. +# +# You can copy this file to one of: +# - "/etc/mysql/my.cnf" to set global options, +# - "~/.my.cnf" to set user-specific options. +# +# One can use all long options that the program supports. +# Run program with --help to get a list of available options and with +# --print-defaults to see which it would actually understand and use. +# +# For explanations see +# http://dev.mysql.com/doc/mysql/en/server-system-variables.html + +# This will be passed to all mysql clients +# It has been reported that passwords should be enclosed with ticks/quotes +# escpecially if they contain "#" chars... +# Remember to edit /etc/mysql/debian.cnf when changing the socket location. +[client] +port = 3306 +socket = /mnt/server/run/mysqld/mysqld.sock + +# Here is entries for some specific programs +# The following values assume you have at least 32M ram + +# This was formally known as [safe_mysqld]. Both versions are currently parsed. +[mysqld_safe] +socket = /mnt/server/run/mysqld/mysqld.sock +nice = 0 + +[mysqld] +# +# * Basic Settings +# +#user = mysql +pid-file = /mnt/server/run/mysqld/mysqld.pid +socket = /mnt/server/run/mysqld/mysqld.sock +port = 3306 +basedir = /usr +datadir = /mnt/server/mysql +tmpdir = /tmp +lc_messages_dir = /usr/share/mysql +lc_messages = en_US +skip-external-locking +# +# Instead of skip-networking the default is now to listen only on +# localhost which is more compatible and is not less secure. +# +# * Fine Tuning +# +max_connections = 100 +connect_timeout = 5 +wait_timeout = 600 +max_allowed_packet = 16M +thread_cache_size = 128 +sort_buffer_size = 4M +bulk_insert_buffer_size = 16M +tmp_table_size = 32M +max_heap_table_size = 32M +# +# * MyISAM +# +# This replaces the startup script and checks MyISAM tables if needed +# the first time they are touched. On error, make copy and try a repair. +myisam_recover_options = BACKUP +key_buffer_size = 128M +#open-files-limit = 2000 +table_open_cache = 400 +myisam_sort_buffer_size = 512M +concurrent_insert = 2 +read_buffer_size = 2M +read_rnd_buffer_size = 1M +# +# * Query Cache Configuration +# +# Cache only tiny result sets, so we can fit more in the query cache. +query_cache_limit = 128K +query_cache_size = 64M +# for more write intensive setups, set to DEMAND or OFF +#query_cache_type = DEMAND +# +# * Logging and Replication +# +# Both location gets rotated by the cronjob. +# Be aware that this log type is a performance killer. +# As of 5.1 you can enable the log at runtime! +general_log_file = /mnt/server/log/mysql/mysql.log +#general_log = 1 +# +# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf. +# +# we do want to know about network errors and such +#log_warnings = 2 +# +# Enable the slow query log to see queries with especially long duration +#slow_query_log[={0|1}] +slow_query_log_file = /mnt/server/log/mysql/mariadb-slow.log +long_query_time = 10 +#log_slow_rate_limit = 1000 +#log_slow_verbosity = query_plan + +#log-queries-not-using-indexes +#log_slow_admin_statements +# +# The following can be used as easy to replay backup logs or for replication. +# note: if you are setting up a replication slave, see README.Debian about +# other settings you may need to change. +#server-id = 1 +#report_host = master1 +#auto_increment_increment = 2 +#auto_increment_offset = 1 +#log_bin = /var/log/mysql/mariadb-bin +#log_bin_index = /var/log/mysql/mariadb-bin.index +# not fab for performance, but safer +#sync_binlog = 1 +expire_logs_days = 10 +max_binlog_size = 100M +# slaves +#relay_log = /var/log/mysql/relay-bin +#relay_log_index = /var/log/mysql/relay-bin.index +#relay_log_info_file = /var/log/mysql/relay-bin.info +#log_slave_updates +#read_only +# +# If applications support it, this stricter sql_mode prevents some +# mistakes like inserting invalid dates etc. +#sql_mode = NO_ENGINE_SUBSTITUTION,TRADITIONAL +# +# * InnoDB +# +# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/. +# Read the manual for more InnoDB related options. There are many! +default_storage_engine = InnoDB +# you can't just change log file size, requires special procedure +#innodb_log_file_size = 50M +innodb_buffer_pool_size = 256M +innodb_log_buffer_size = 8M +innodb_file_per_table = 1 +innodb_open_files = 400 +innodb_io_capacity = 400 +innodb_flush_method = O_DIRECT +# +# * Security Features +# +# Read the manual, too, if you want chroot! +# chroot = /var/lib/mysql/ +# +# For generating SSL certificates I recommend the OpenSSL GUI "tinyca". +# +# ssl-ca=/etc/mysql/cacert.pem +# ssl-cert=/etc/mysql/server-cert.pem +# ssl-key=/etc/mysql/server-key.pem + +# +# * Galera-related settings +# +[galera] +# Mandatory settings +#wsrep_on=ON +#wsrep_provider= +#wsrep_cluster_address= +#binlog_format=row +#default_storage_engine=InnoDB +#innodb_autoinc_lock_mode=2 +# +# Allow server to accept connections on all interfaces. +# +bind-address=0.0.0.0 +# +# Optional setting +#wsrep_slave_threads=1 +#innodb_flush_log_at_trx_commit=0 + +[mysqldump] +quick +quote-names +max_allowed_packet = 16M + +[mysql] +#no-auto-rehash # faster start of mysql but no tab completion + +[isamchk] +key_buffer = 16M + +# +# * IMPORTANT: Additional settings that can override those from this file! +# The files must end with '.cnf', otherwise they'll be ignored. +# +!include /etc/mysql/mariadb.cnf +!includedir /etc/mysql/conf.d/ \ No newline at end of file diff --git a/database/mariadb/my.cnf b/database/mariadb/my.cnf index e2571fdf..643d9474 100644 --- a/database/mariadb/my.cnf +++ b/database/mariadb/my.cnf @@ -1,10 +1,9 @@ +# MariaDB database server configuration file. # -# The MySQL database server configuration file. -# -# You can copy this to one of: +# You can copy this file to one of: # - "/etc/mysql/my.cnf" to set global options, # - "~/.my.cnf" to set user-specific options. -# +# # One can use all long options that the program supports. # Run program with --help to get a list of available options and with # --print-defaults to see which it would actually understand and use. @@ -18,94 +17,127 @@ # Remember to edit /etc/mysql/debian.cnf when changing the socket location. [client] port = 3306 -socket = /var/run/mysqld/mysqld.sock +socket = /home/container/run/mysqld/mysqld.sock # Here is entries for some specific programs # The following values assume you have at least 32M ram # This was formally known as [safe_mysqld]. Both versions are currently parsed. [mysqld_safe] -socket = /var/run/mysqld/mysqld.sock +socket = /home/container/run/mysqld/mysqld.sock nice = 0 [mysqld] # # * Basic Settings # -user = mysql -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock +#user = mysql +pid-file = /home/container/run/mysqld/mysqld.pid +socket = /home/container/run/mysqld/mysqld.sock port = 3306 basedir = /usr -datadir = /var/lib/mysql +datadir = /home/container/mysql tmpdir = /tmp -lc-messages-dir = /usr/share/mysql +lc_messages_dir = /usr/share/mysql +lc_messages = en_US skip-external-locking -skip-character-set-client-handshake -default-storage-engine = InnoDB -character-set-server = utf8 -transaction-isolation = READ-COMMITTED - # # Instead of skip-networking the default is now to listen only on # localhost which is more compatible and is not less secure. -bind-address = 127.0.0.1 # # * Fine Tuning # -key_buffer = 16M +max_connections = 100 +connect_timeout = 5 +wait_timeout = 600 max_allowed_packet = 16M -thread_stack = 192K -thread_cache_size = 16 +thread_cache_size = 128 +sort_buffer_size = 4M +bulk_insert_buffer_size = 16M +tmp_table_size = 32M +max_heap_table_size = 32M +# +# * MyISAM +# # This replaces the startup script and checks MyISAM tables if needed -# the first time they are touched -myisam-recover = BACKUP -max_connections = 300 -table_open_cache = 64 -thread_concurrency = 10 -table_open_cache = 32 -thread_concurrency = 4 - +# the first time they are touched. On error, make copy and try a repair. +myisam_recover_options = BACKUP +key_buffer_size = 128M +#open-files-limit = 2000 +table_open_cache = 400 +myisam_sort_buffer_size = 512M +concurrent_insert = 2 +read_buffer_size = 2M +read_rnd_buffer_size = 1M # # * Query Cache Configuration # -query_cache_type = 1 -query_cache_limit = 1M -query_cache_size = 8M +# Cache only tiny result sets, so we can fit more in the query cache. +query_cache_limit = 128K +query_cache_size = 64M +# for more write intensive setups, set to DEMAND or OFF +#query_cache_type = DEMAND # # * Logging and Replication # # Both location gets rotated by the cronjob. # Be aware that this log type is a performance killer. # As of 5.1 you can enable the log at runtime! -general_log_file = /var/log/mysql/mysql.log +general_log_file = /home/container/log/mysql/mysql.log #general_log = 1 # -# Error log - should be very few entries. +# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf. # -log_error = /var/log/mysql/error.log +# we do want to know about network errors and such +#log_warnings = 2 # -# Here you can see queries with especially long duration -slow_query_log = 1 -slow_query_log_file = /var/log/mysql/mysql-slow.log -long_query_time = 1 -#log-queries-not-using-indexes +# Enable the slow query log to see queries with especially long duration +#slow_query_log[={0|1}] +slow_query_log_file = /home/container/log/mysql/mariadb-slow.log +long_query_time = 10 +#log_slow_rate_limit = 1000 +#log_slow_verbosity = query_plan +#log-queries-not-using-indexes +#log_slow_admin_statements # # The following can be used as easy to replay backup logs or for replication. # note: if you are setting up a replication slave, see README.Debian about # other settings you may need to change. #server-id = 1 -#log_bin = /var/log/mysql/mysql-bin.log -expire_logs_days = 14 -max_binlog_size = 1G -#binlog_do_db = include_database_name -#binlog_ignore_db = include_database_name +#report_host = master1 +#auto_increment_increment = 2 +#auto_increment_offset = 1 +#log_bin = /var/log/mysql/mariadb-bin +#log_bin_index = /var/log/mysql/mariadb-bin.index +# not fab for performance, but safer +#sync_binlog = 1 +expire_logs_days = 10 +max_binlog_size = 100M +# slaves +#relay_log = /var/log/mysql/relay-bin +#relay_log_index = /var/log/mysql/relay-bin.index +#relay_log_info_file = /var/log/mysql/relay-bin.info +#log_slave_updates +#read_only +# +# If applications support it, this stricter sql_mode prevents some +# mistakes like inserting invalid dates etc. +#sql_mode = NO_ENGINE_SUBSTITUTION,TRADITIONAL # # * InnoDB # # InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/. # Read the manual for more InnoDB related options. There are many! +default_storage_engine = InnoDB +# you can't just change log file size, requires special procedure +#innodb_log_file_size = 50M +innodb_buffer_pool_size = 256M +innodb_log_buffer_size = 8M +innodb_file_per_table = 1 +innodb_open_files = 400 +innodb_io_capacity = 400 +innodb_flush_method = O_DIRECT # # * Security Features # @@ -117,17 +149,26 @@ max_binlog_size = 1G # ssl-ca=/etc/mysql/cacert.pem # ssl-cert=/etc/mysql/server-cert.pem # ssl-key=/etc/mysql/server-key.pem -innodb_data_file_path = ibdata1:128M:autoextend -innodb_file_per_table = 1 -skip-innodb_doublewrite -innodb_additional_mem_pool_size = 12M -innodb_buffer_pool_size = 256M -innodb_log_buffer_size = 8M -innodb_log_file_size = 8M -innodb_flush_log_at_trx_commit = 0 -innodb_flush_method = O_DIRECT -innodb_support_xa = OFF +# +# * Galera-related settings +# +[galera] +# Mandatory settings +#wsrep_on=ON +#wsrep_provider= +#wsrep_cluster_address= +#binlog_format=row +#default_storage_engine=InnoDB +#innodb_autoinc_lock_mode=2 +# +# Allow server to accept connections on all interfaces. +# +bind-address=0.0.0.0 +# +# Optional setting +#wsrep_slave_threads=1 +#innodb_flush_log_at_trx_commit=0 [mysqldump] quick @@ -135,7 +176,7 @@ quote-names max_allowed_packet = 16M [mysql] -#no-auto-rehash # faster start of mysql but no tab completition +#no-auto-rehash # faster start of mysql but no tab completion [isamchk] key_buffer = 16M @@ -144,4 +185,5 @@ key_buffer = 16M # * IMPORTANT: Additional settings that can override those from this file! # The files must end with '.cnf', otherwise they'll be ignored. # -!includedir /etc/mysql/conf.d/ +!include /etc/mysql/mariadb.cnf +!includedir /etc/mysql/conf.d/ \ No newline at end of file From 2e2d70635e795b0d0137770f15a1a7454ae7e0a0 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Thu, 13 Jun 2019 10:46:29 -0400 Subject: [PATCH 239/393] update discordjs start command add an auto update variable added command to run git pull if .git and auto_update are set added npm install to start command. --- bots/discord/discord.js/egg-discord-js-generic.json | 13 +++++++++++-- 1 file changed, 11 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 8017c49a..573ca56c 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-12T17:47:09-04:00", + "exported_at": "2019-06-13T10:40:57-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.", "image": "quay.io\/parkervcp\/pterodactyl-images:bot_discordjs", - "startup": "\/usr\/local\/bin\/node \/home\/container\/index.js", + "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", "config": { "files": "{}", "startup": "{\r\n \"done\": \"change this part\"\r\n}", @@ -49,6 +49,15 @@ "user_viewable": 1, "user_editable": 0, "rules": "required|bool" + }, + { + "name": "Auto Update", + "description": "When using a git repo pull the latest files on startup.", + "env_variable": "AUTO_UPDATE", + "default_value": "false", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|boolean" } ] } \ No newline at end of file From acc43cbdbe8ad98143de95846f0d5ae0d256540b Mon Sep 17 00:00:00 2001 From: QuickCentralHosting <46080934+QuickCentralHosting@users.noreply.github.com> Date: Thu, 13 Jun 2019 23:33:15 -0700 Subject: [PATCH 240/393] Update Server.cfg - Add Mission Selection This adds the ability for players to select the mission their server boots up to and adds the ability to cycle missions. --- arma/arma3/egg-arma3-config/server.cfg | 28 ++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/arma/arma3/egg-arma3-config/server.cfg b/arma/arma3/egg-arma3-config/server.cfg index daf2d213..2615bf70 100644 --- a/arma/arma3/egg-arma3-config/server.cfg +++ b/arma/arma3/egg-arma3-config/server.cfg @@ -34,6 +34,34 @@ logFile = "arma3server.log"; // Minimum Required Client Build //requiredBuild = 95691 +class Missions +{ + class Mission1 + { + template = ; + difficulty = "Regular"; + class Params {}; + }; + class Mission2 + { + template = ; + difficulty = "Regular"; + class Params {}; + }; + class Mission3 + { + template = ; + difficulty = "Regular"; + class Params {}; + }; + class Mission4 + { + template = ; + difficulty = "Regular"; + class Params {}; + }; +}; + // Message of the Day (MOTD) motd[] = { "Welcome to My Arma 3 Server", From 828fc19bb47b29266971f77cae8f3cc70d023eed Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 16 Jun 2019 08:10:10 -0400 Subject: [PATCH 241/393] add bind address --- database/mariadb/my.cnf | 1 + 1 file changed, 1 insertion(+) diff --git a/database/mariadb/my.cnf b/database/mariadb/my.cnf index 643d9474..3049c1bb 100644 --- a/database/mariadb/my.cnf +++ b/database/mariadb/my.cnf @@ -44,6 +44,7 @@ skip-external-locking # # Instead of skip-networking the default is now to listen only on # localhost which is more compatible and is not less secure. +bind-address=0.0.0.0 # # * Fine Tuning # From c5c37061b8436676512ca52f134d40183e983b08 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 16 Jun 2019 08:15:13 -0400 Subject: [PATCH 242/393] update forge eggs. moved forge-generic to forge-mod-generic brought back forge enhanced as forge generic. --- minecraft_java/forge/forge-generic/README.md | 8 ++-- .../forge-generic/egg-forge-enhanced.json | 45 +++++++++++++++++++ .../forge/forge-mod-generic/README.md | 9 ++++ .../egg-forge-generic.json | 0 4 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 minecraft_java/forge/forge-generic/egg-forge-enhanced.json create mode 100644 minecraft_java/forge/forge-mod-generic/README.md rename minecraft_java/forge/{forge-generic => forge-mod-generic}/egg-forge-generic.json (100%) diff --git a/minecraft_java/forge/forge-generic/README.md b/minecraft_java/forge/forge-generic/README.md index 03468b6f..72585414 100644 --- a/minecraft_java/forge/forge-generic/README.md +++ b/minecraft_java/forge/forge-generic/README.md @@ -1,9 +1,7 @@ # Forge Generic -### This is a generic egg for curseforge modpacks +### This is a generic egg for the forge standalone server -You will need to give it a modpack URL such as `https://minecraft.curseforge.com/projects/` +This will download the latest jar for a specific forge version. -This will grabe the latest release when the version is set to latest. - -It "should" grab versions of the pack based on the modpack version numbers \ No newline at end of file +this has a fix for the broken 1.7.10 and 1.8.9 versions forge has \ No newline at end of file diff --git a/minecraft_java/forge/forge-generic/egg-forge-enhanced.json b/minecraft_java/forge/forge-generic/egg-forge-enhanced.json new file mode 100644 index 00000000..9b30a67d --- /dev/null +++ b/minecraft_java/forge/forge-generic/egg-forge-enhanced.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-06-16T08:09:35-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.", + "image": "quay.io\/pterodactyl\/core:java", + "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\r\n\r\n#Fetching version\r\nif [ -z \"$MC_VERSION\" ] || [ \"$MC_VERSION\" == \"latest\" ]; then\r\n echo \"Fetching latest\"\r\n FORGE_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index.html | grep -A 2 \"Latest\" | awk NF=NF RS= OFS=\" \" | grep -o -e '[1]\\.[0-9][0-9]\\?\\.\\?[0-9]\\?[0-9] - [0-9][0-9]\\.[0-9][0-9]\\.[0-9]\\?[0-9]\\.[0-9][0-9][0-9][0-9]' | sed 's\/ \/\/g')\r\nelif [[ ! \"$MC_VERSION\" =~ - ]]; then\r\n echo \"Fetching latest from version $MC_VERSION\"\r\n FORGE_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index_$MC_VERSION.html | grep -A 2 \"Latest\" | awk NF=NF RS= OFS=\" \" | grep -o -e '[1]\\.[0-9][0-9]\\?\\.\\?[0-9]\\?[0-9] - [0-9][0-9]\\.[0-9][0-9]\\.[0-9]\\?[0-9]\\.[0-9][0-9][0-9][0-9]' | sed 's\/ \/\/g')\r\nfi\r\n\r\nif [ ${MC_VERSION} == \"1.7.10\" ] || [ ${MC_VERSION} == \"1.8.9\" ]; then\r\n\tFORGE_VERSION=\"${FORGE_VERSION}-${MC_VERSION}\"\r\nfi\r\n\r\n#Checking if forge version valid\r\nif [[ ! \"$FORGE_VERSION\" =~ [0-9]?[0-9]?\\.[0-9]?[0-9]?\\.?[0-9]?[0-9]-[0-9]?[0-9]\\.[0-9]?[0-9]\\.[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]?[0-9] ]]; then\r\n echo \"!!! Invalid forge version \\\"$FORGE_VERSION\\\" !!!\"\r\n exit\r\nfi\r\n\r\nif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\tFORGE=\"${FORGE}-${MCVER}\"\r\nfi\r\n\r\n#Go into main direction\r\ncd \/mnt\/server\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 \\\"$MC_VERSION\\\"\"\r\ncurl -o installer.jar -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$MC_VERSION\/forge-$MC_VERSION-installer.jar\r\ncurl -o $SERVER_JARFILE -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$MC_VERSION\/forge-$MC_VERSION-universal.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ] || [ ! -f .\/$SERVER_JARFILE ]; then\r\n echo \"!!! Error by downloading forge version \\\"$MC_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\r\n\r\n#Deleting installer.jar\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar", + "container": "openjdk:8", + "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": 1, + "user_editable": 1, + "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" + }, + { + "name": "Forge version", + "description": "The version of forge that you want to run.\r\nExamples:\r\n- 1.12.2\r\n- 1.12.2-14.23.5.2810", + "env_variable": "MC_VERSION", + "default_value": "latest", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:22" + } + ] +} \ No newline at end of file diff --git a/minecraft_java/forge/forge-mod-generic/README.md b/minecraft_java/forge/forge-mod-generic/README.md new file mode 100644 index 00000000..03468b6f --- /dev/null +++ b/minecraft_java/forge/forge-mod-generic/README.md @@ -0,0 +1,9 @@ +# Forge Generic + +### This is a generic egg for curseforge modpacks + +You will need to give it a modpack URL such as `https://minecraft.curseforge.com/projects/` + +This will grabe the latest release when the version is set to latest. + +It "should" grab versions of the pack based on the modpack version numbers \ No newline at end of file diff --git a/minecraft_java/forge/forge-generic/egg-forge-generic.json b/minecraft_java/forge/forge-mod-generic/egg-forge-generic.json similarity index 100% rename from minecraft_java/forge/forge-generic/egg-forge-generic.json rename to minecraft_java/forge/forge-mod-generic/egg-forge-generic.json From 68726f7074c4c4683ce468bf6812e894d9f84a24 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 16 Jun 2019 11:08:16 -0400 Subject: [PATCH 243/393] fix start command --- bots/discord/discord.js/egg-discord-js-generic.json | 6 +++--- 1 file changed, 3 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 573ca56c..9ea8f656 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-13T10:40:57-04:00", + "exported_at": "2019-06-16T11:06:52-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.", "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", + "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`", "config": { "files": "{}", "startup": "{\r\n \"done\": \"change this part\"\r\n}", @@ -54,7 +54,7 @@ "name": "Auto Update", "description": "When using a git repo pull the latest files on startup.", "env_variable": "AUTO_UPDATE", - "default_value": "false", + "default_value": "0", "user_viewable": 1, "user_editable": 1, "rules": "required|boolean" From d21f83cee42e5e0f5c529233221c71d9f1069788 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 23 Jun 2019 10:01:47 -0400 Subject: [PATCH 244/393] update for atlbot changes Update to work with the latest atl bot changes --- bots/discord/atlbot/egg-a-t-l-bot.json | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/bots/discord/atlbot/egg-a-t-l-bot.json b/bots/discord/atlbot/egg-a-t-l-bot.json index d3586195..2bea0340 100644 --- a/bots/discord/atlbot/egg-a-t-l-bot.json +++ b/bots/discord/atlbot/egg-a-t-l-bot.json @@ -3,21 +3,21 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-12-25T21:12:00-05:00", + "exported_at": "2019-06-23T10:00:12-04:00", "name": "ATLBot", "author": "jfeldt19@gmail.com", "description": "ATLbot in ptero\r\n\r\nhttps:\/\/github.com\/ATLauncher\/discord-bot\/", "image": "quay.io\/parkervcp\/pterodactyl-images:alpine_nodejs-10", "startup": "npm run start", "config": { - "files": "{\r\n \"config\/local.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"client_token\": \"{{server.build.env.CLIENT_TOKEN}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"I am ready!\",\r\n \"userInteraction\": [\r\n \"Request to use token, but token was unavailable\"\r\n ]\r\n}", + "files": "{\r\n \"config\/local.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"discord.client_token\": \"{{server.build.env.CLIENT_TOKEN}}\",\r\n \"logging.level\": \"debug\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Bot started\"\r\n}", "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "^C" }, "scripts": { "installation": { - "script": "apk add --no-cache openssl git\r\n\r\ncd \/mnt\/server\r\n\r\nwget https:\/\/github.com\/ATLauncher\/discord-bot\/archive\/master.zip\r\n\r\nunzip master.zip\r\n\r\nrm master.zip\r\n\r\nmv discord-bot-master\/* .\/\r\n\r\nmv config\/default.json config\/local.json\r\n\r\nrm package-lock.json\r\nnpm install\r\n\r\nrm -r discord-bot-master\/\r\nrm Dockerfile\r\nrm CONTRIBUTING.md\r\nrm README.md\r\nrm \/config\/.gitignore\r\nrm CODE_OF_CONDUCT.md", + "script": "apk add --no-cache openssl git\r\n\r\ncd \/mnt\/server\r\nif [[ -d .git\/ ]]; then\r\n git pull\r\nelse\r\n git clone https:\/\/github.com\/ATLauncher\/discord-bot.git . \r\nfi\r\n\r\necho '{}' > config\/local.json\r\n\r\nnpm install --production\r\n\r\nnpm run build\r\n\r\nrm Dockerfile\r\nrm CONTRIBUTING.md\r\nrm README.md\r\nrm \/config\/.gitignore\r\nrm CODE_OF_CONDUCT.md", "container": "node:10-alpine", "entrypoint": "ash" } @@ -31,6 +31,15 @@ "user_viewable": 1, "user_editable": 1, "rules": "required|string|max:75" + }, + { + "name": "Node Environment", + "description": "The node environment variable.\r\n\r\nNeeds to stay at \"development\" to log to console.", + "env_variable": "NODE_ENV", + "default_value": "development", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From afb2cf8d48b6f40277d8c41ebb543728182ccb9c Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Fri, 28 Jun 2019 20:42:13 -0400 Subject: [PATCH 245/393] add hlds server stuff This mostly is for CS 1.6 but supports other hlds servers as well. --- README.md | 1 + source_servers/hlds_server/README.md | 12 ++++ .../egg-custom-h-l-d-s-engine-game.json | 63 +++++++++++++++++++ 3 files changed, 76 insertions(+) create mode 100644 source_servers/hlds_server/README.md create mode 100644 source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json diff --git a/README.md b/README.md index 048bc676..4efbb6d3 100644 --- a/README.md +++ b/README.md @@ -84,6 +84,7 @@ If you are reading this it looks like you are looking to add an egg to your serv [Source](/source_servers/) These eggs use steamcmd to install * [7 Days to Die](/source_servers/7_days_to_die/) * [ARK Survival Evolved](/source_servers/ark_survival_evolved/) +* [HLDS server](/source_servers/hlds_server) * [PixARK](/source_servers/pixark/) * [Rust Staging Branch](/source_servers/rust-staging/) * [Starbound](/source_servers/starbound) diff --git a/source_servers/hlds_server/README.md b/source_servers/hlds_server/README.md new file mode 100644 index 00000000..8f65ef99 --- /dev/null +++ b/source_servers/hlds_server/README.md @@ -0,0 +1,12 @@ +# 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 + +### Server Ports +HLDS servers require up to 6 ports + +| Port | default | +|-----------|---------| +| Game/rcon | 27015 | +| HLTV | 27020 | +| VAC | 26900 | \ No newline at end of file diff --git a/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json b/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json new file mode 100644 index 00000000..040c47a3 --- /dev/null +++ b/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json @@ -0,0 +1,63 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-06-28T20:41:35-04: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", + "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}", + "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 \u201c90 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" + } + }, + "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": 1, + "user_editable": 0, + "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": 1, + "user_editable": 0, + "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": 1, + "user_editable": 1, + "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": 1, + "user_editable": 0, + "rules": "required|numeric|digits_between:1,5" + } + ] +} \ No newline at end of file From 11819c9520dbf6e9f909f07acfc970e9a1a38db9 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Fri, 28 Jun 2019 21:02:51 -0400 Subject: [PATCH 246/393] add vac port for sven co-op I am adding this because people can't read. --- source_servers/svencoop/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/source_servers/svencoop/README.md b/source_servers/svencoop/README.md index ce233c73..af43edf9 100644 --- a/source_servers/svencoop/README.md +++ b/source_servers/svencoop/README.md @@ -9,3 +9,4 @@ game ports (default 27015 ) | Port | default | |---------|---------| | Game | 27015 | +| VAC | 26900 | From 86ded9ddb375738677904ca83bb0560f0b05ef04 Mon Sep 17 00:00:00 2001 From: Kurounin Date: Tue, 9 Jul 2019 07:33:35 +0300 Subject: [PATCH 247/393] Remove invalid utf8 character Remove the character \u201c90 from installation script which caused an error --- .../hlds_server/egg-custom-h-l-d-s-engine-game.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json b/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json index 040c47a3..3cfe1a7a 100644 --- a/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json +++ b/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# SRCDS Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} +app_set_config \u201c90 mod ${HLDS_GAME} +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", + "script": "#!\/bin\/bash\r\n# SRCDS Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} +app_set_config mod ${HLDS_GAME} +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", "container": "ubuntu:18.04", "entrypoint": "bash" } @@ -60,4 +60,4 @@ "rules": "required|numeric|digits_between:1,5" } ] -} \ No newline at end of file +} From 923fa940e671bb45eeb3ecf0b5a56f3820191c61 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Tue, 9 Jul 2019 23:34:37 -0400 Subject: [PATCH 248/393] update image used to run bedrock Will resolve #238 --- minecraft_bedrock/bedrock/egg-vanilla-bedrock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json b/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json index 40274efd..ab665064 100644 --- a/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json +++ b/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json @@ -3,11 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-03-14T22:10:44-04:00", + "exported_at": "2019-07-09T23:32:57-04: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\".", - "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu", + "image": "quay.io\/parkervcp\/pterodactyl-images:base_ubuntu", "startup": ".\/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 }\r\n }\r\n}", From 38abae58ef8ab4974fd07d8fc0dda86dcb38f551 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Tue, 9 Jul 2019 23:54:41 -0400 Subject: [PATCH 249/393] add stock pterodactyl eggs to the eggs repo Adding the stock pterodactyl eggs in the same folder format. --- stock-eggs/minecraft/README.md | 6 ++ stock-eggs/minecraft/egg-bungeecord.json | 45 ++++++++++ stock-eggs/minecraft/egg-forge-minecraft.json | 45 ++++++++++ stock-eggs/minecraft/egg-paper.json | 63 +++++++++++++ .../minecraft/egg-sponge--sponge-vanilla.json | 45 ++++++++++ .../minecraft/egg-vanilla-minecraft.json | 45 ++++++++++ stock-eggs/{source => rust}/README.md | 0 stock-eggs/{source => }/rust/egg-rust.json | 0 stock-eggs/source-engine/README.md | 70 +++++++++++++++ .../egg-ark--survival-evolved.json | 0 ...egg-counter--strike--global-offensive.json | 54 +++++++++++ .../egg-custom-source-engine-game.json | 54 +++++++++++ stock-eggs/source-engine/egg-garrys-mod.json | 90 +++++++++++++++++++ stock-eggs/source-engine/egg-insurgency.json | 54 +++++++++++ .../source-engine/egg-team-fortress2.json | 54 +++++++++++ stock-eggs/source/ark/README.md | 17 ---- stock-eggs/source/rust/README.md | 14 --- stock-eggs/terraria/README.md | 14 +++ .../egg-terraria-server--t-shock.json | 45 ++++++++++ stock-eggs/voice-servers/README.md | 29 ++++++ .../voice-servers/egg-mumble-server.json | 45 ++++++++++ .../voice-servers/egg-teamspeak3-server.json | 36 ++++++++ terraria/README.md | 14 +++ 23 files changed, 808 insertions(+), 31 deletions(-) create mode 100644 stock-eggs/minecraft/README.md create mode 100644 stock-eggs/minecraft/egg-bungeecord.json create mode 100644 stock-eggs/minecraft/egg-forge-minecraft.json create mode 100644 stock-eggs/minecraft/egg-paper.json create mode 100644 stock-eggs/minecraft/egg-sponge--sponge-vanilla.json create mode 100644 stock-eggs/minecraft/egg-vanilla-minecraft.json rename stock-eggs/{source => rust}/README.md (100%) rename stock-eggs/{source => }/rust/egg-rust.json (100%) create mode 100644 stock-eggs/source-engine/README.md rename stock-eggs/{source/ark => source-engine}/egg-ark--survival-evolved.json (100%) create mode 100644 stock-eggs/source-engine/egg-counter--strike--global-offensive.json create mode 100644 stock-eggs/source-engine/egg-custom-source-engine-game.json create mode 100644 stock-eggs/source-engine/egg-garrys-mod.json create mode 100644 stock-eggs/source-engine/egg-insurgency.json create mode 100644 stock-eggs/source-engine/egg-team-fortress2.json delete mode 100644 stock-eggs/source/ark/README.md delete mode 100644 stock-eggs/source/rust/README.md create mode 100644 stock-eggs/terraria/README.md create mode 100644 stock-eggs/terraria/egg-terraria-server--t-shock.json create mode 100644 stock-eggs/voice-servers/README.md create mode 100644 stock-eggs/voice-servers/egg-mumble-server.json create mode 100644 stock-eggs/voice-servers/egg-teamspeak3-server.json create mode 100644 terraria/README.md diff --git a/stock-eggs/minecraft/README.md b/stock-eggs/minecraft/README.md new file mode 100644 index 00000000..c63519ed --- /dev/null +++ b/stock-eggs/minecraft/README.md @@ -0,0 +1,6 @@ +# Minecraft + +All the ddefault 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 diff --git a/stock-eggs/minecraft/egg-bungeecord.json b/stock-eggs/minecraft/egg-bungeecord.json new file mode 100644 index 00000000..d527024f --- /dev/null +++ b/stock-eggs/minecraft/egg-bungeecord.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2017-11-03T22:15:10-05: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", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -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 \"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:25577\"\r\n ]\r\n}", + "logs": "{\r\n \"custom\": false,\r\n \"location\": \"proxy.log.0\"\r\n}", + "stop": "end" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/ash\n# Bungeecord Installation Script\n#\n# Server Files: \/mnt\/server\napk update\napk add curl\n\ncd \/mnt\/server\n\nif [ -z \"${BUNGEE_VERSION}\" ] || [ \"${BUNGEE_VERSION}\" == \"latest\" ]; then\n BUNGEE_VERSION=\"lastStableBuild\"\nfi\n\ncurl -o ${SERVER_JARFILE} https:\/\/ci.md-5.net\/job\/BungeeCord\/${BUNGEE_VERSION}\/artifact\/bootstrap\/target\/BungeeCord.jar", + "container": "alpine:3.9", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Bungeecord Version", + "description": "The version of Bungeecord to download and use.", + "env_variable": "BUNGEE_VERSION", + "default_value": "latest", + "user_viewable": 1, + "user_editable": 1, + "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": 1, + "user_editable": 1, + "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" + } + ] +} diff --git a/stock-eggs/minecraft/egg-forge-minecraft.json b/stock-eggs/minecraft/egg-forge-minecraft.json new file mode 100644 index 00000000..2e8b43bf --- /dev/null +++ b/stock-eggs/minecraft/egg-forge-minecraft.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-02-07T07:47:35-05: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", + "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\/ash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk update\r\napk add curl\r\n\r\nif [ -z \"$MC_VERSION\" ] || [ \"$MC_VERSION\" == \"latest\" ]; then\r\n FORGE_VERSION=$(echo $(curl -sSl http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/ | grep -A2 Latest | grep small) | grep -o -e '[1].[0-9]*.[0-9]* - [0-9]*.[0-9]*.[0-9]*.[0-9]*' | sed 's\/ \/\/g')\r\nelse\r\n FORGE_VERSION=$(echo $(curl -sl http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index_$MC_VERSION.html | grep -A2 Latest | grep small) | grep -o -e '[1].[0-9]*.[0-9]* - [0-9]*.[0-9]*.[0-9]*.[0-9]*' | sed 's\/ \/\/g')\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\ncurl -sS http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\ncurl -sS http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -o $SERVER_JARFILE\r\n\r\necho -e \"\\nInstalling forge server usint the installer jar file.\\n\"\r\njava -jar installer.jar --installServer\r\n\r\necho -e \"\\nDeleting installer jar file and cleaning up.\\n\"\r\nrm -rf installer.jar", + "container": "openjdk:8-alpine", + "entrypoint": "ash" + } + }, + "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": 1, + "user_editable": 1, + "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" + }, + { + "name": "Minecraft version", + "description": "The version of minecraft that you want to run. Example (1.10.2).", + "env_variable": "MC_VERSION", + "default_value": "latest", + "user_viewable": 1, + "user_editable": 1, + "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 new file mode 100644 index 00000000..86208f68 --- /dev/null +++ b/stock-eggs/minecraft/egg-paper.json @@ -0,0 +1,63 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-02-27T22:23:55-05: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", + "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 \"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\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache --update 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\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\necho -e \"Downloading MC server.properties\"\r\ncurl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_java\/server.properties", + "container": "alpine:3.9", + "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": 1, + "user_editable": 0, + "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": 1, + "user_editable": 1, + "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": 0, + "user_editable": 0, + "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": 1, + "user_editable": 0, + "rules": "required|string|max:20" + } + ] +} \ No newline at end of file diff --git a/stock-eggs/minecraft/egg-sponge--sponge-vanilla.json b/stock-eggs/minecraft/egg-sponge--sponge-vanilla.json new file mode 100644 index 00000000..2bbfba23 --- /dev/null +++ b/stock-eggs/minecraft/egg-sponge--sponge-vanilla.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2017-11-03T22:20:03-05: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\/ash\n# Sponge Installation Script\n#\n# Server Files: \/mnt\/server\n\napk update\napk add curl\n\ncd \/mnt\/server\n\ncurl -sSL \"https:\/\/repo.spongepowered.org\/maven\/org\/spongepowered\/spongevanilla\/${SPONGE_VERSION}\/spongevanilla-${SPONGE_VERSION}.jar\" -o ${SERVER_JARFILE}", + "container": "alpine:3.9", + "entrypoint": "ash" + } + }, + "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": 1, + "user_editable": 0, + "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": 1, + "user_editable": 1, + "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" + } + ] +} diff --git a/stock-eggs/minecraft/egg-vanilla-minecraft.json b/stock-eggs/minecraft/egg-vanilla-minecraft.json new file mode 100644 index 00000000..5937fc17 --- /dev/null +++ b/stock-eggs/minecraft/egg-vanilla-minecraft.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-06-19T17:09:18-04: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", + "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\/ash\r\n# Vanilla MC Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk update\r\napk add curl jq\r\n\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\nif [ -z \"$VANILLA_VERSION\" ] || [ \"$VANILLA_VERSION\" == \"latest\" ]; then\r\n MANIFEST_URL=$(curl https:\/\/launchermeta.mojang.com\/mc\/game\/version_manifest.json | jq .versions | jq -r '.[] | select(.id == \"'$LATEST_VERSION'\") | .url')\r\nelse\r\n MANIFEST_URL=$(curl https:\/\/launchermeta.mojang.com\/mc\/game\/version_manifest.json | jq .versions | jq -r '.[] | select(.id == \"'$VANILLA_VERSION'\") | .url')\r\nfi\r\n\r\nDOWNLOAD_URL=`curl $MANIFEST_URL | jq .downloads.server | jq -r '. | .url'`\r\n\r\ncurl -o ${SERVER_JARFILE} $DOWNLOAD_URL", + "container": "alpine:3.9", + "entrypoint": "ash" + } + }, + "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": 1, + "user_editable": 1, + "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": 1, + "user_editable": 1, + "rules": "required|string|between:3,15" + } + ] +} diff --git a/stock-eggs/source/README.md b/stock-eggs/rust/README.md similarity index 100% rename from stock-eggs/source/README.md rename to stock-eggs/rust/README.md diff --git a/stock-eggs/source/rust/egg-rust.json b/stock-eggs/rust/egg-rust.json similarity index 100% rename from stock-eggs/source/rust/egg-rust.json rename to stock-eggs/rust/egg-rust.json diff --git a/stock-eggs/source-engine/README.md b/stock-eggs/source-engine/README.md new file mode 100644 index 00000000..a4deb544 --- /dev/null +++ b/stock-eggs/source-engine/README.md @@ -0,0 +1,70 @@ +# 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. + +### 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 | +|---------|---------| +| Game | 7777 | +| Game +1 | 7778 | +| Query | 27015 | +| RCON | 27020 | + +Please note the server may not show up on steam game server lists due to this requirement if all ports are not set/added. + +## 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.). + +### Port Requirements +| Port | default | +|----------|---------| +| Game | 27015 | + +## Custom Source Engine Game + +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](/source_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. + +### 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. + +### Port Requirements +| Port | default | +|----------|---------| +| Game | 27015 | + +## Team Fortress 2 + +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 | \ No newline at end of file diff --git a/stock-eggs/source/ark/egg-ark--survival-evolved.json b/stock-eggs/source-engine/egg-ark--survival-evolved.json similarity index 100% rename from stock-eggs/source/ark/egg-ark--survival-evolved.json rename to stock-eggs/source-engine/egg-ark--survival-evolved.json diff --git a/stock-eggs/source-engine/egg-counter--strike--global-offensive.json b/stock-eggs/source-engine/egg-counter--strike--global-offensive.json new file mode 100644 index 00000000..ad921025 --- /dev/null +++ b/stock-eggs/source-engine/egg-counter--strike--global-offensive.json @@ -0,0 +1,54 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-06-19T07:46:06-04: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\n# CSGO Installation Script\n#\n# Server Files: \/mnt\/server\napt -y update\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\n\ncd \/tmp\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\n\nmkdir -p \/mnt\/server\/steamcmd\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\ncd \/mnt\/server\/steamcmd\n\n# SteamCMD fails otherwise for some reason, even running as root.\n# This is changed at the end of the install process anyways.\nchown -R root:root \/mnt\n\nexport HOME=\/mnt\/server\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 740 +quit\n\nmkdir -p \/mnt\/server\/.steam\/sdk32\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", + "container": "ubuntu:16.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Map", + "description": "The default map for the server.", + "env_variable": "SRCDS_MAP", + "default_value": "de_dust2", + "user_viewable": 1, + "user_editable": 1, + "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": 1, + "user_editable": 1, + "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": 0, + "user_editable": 0, + "rules": "required|string|max:20" + } + ] +} diff --git a/stock-eggs/source-engine/egg-custom-source-engine-game.json b/stock-eggs/source-engine/egg-custom-source-engine-game.json new file mode 100644 index 00000000..7a7b40bd --- /dev/null +++ b/stock-eggs/source-engine/egg-custom-source-engine-game.json @@ -0,0 +1,54 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-01-21T16:59:45-06: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\n# SRCDS Base Installation Script\n#\n# Server Files: \/mnt\/server\napt -y update\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\n\ncd \/tmp\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\n\nmkdir -p \/mnt\/server\/steamcmd\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\ncd \/mnt\/server\/steamcmd\n\n# SteamCMD fails otherwise for some reason, even running as root.\n# This is changed at the end of the install process anyways.\nchown -R root:root \/mnt\n\nexport HOME=\/mnt\/server\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} +quit\n\nmkdir -p \/mnt\/server\/.steam\/sdk32\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", + "container": "ubuntu:16.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": "", + "user_viewable": 1, + "user_editable": 0, + "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": 1, + "user_editable": 0, + "rules": "required|alpha_dash|between:1,100" + }, + { + "name": "Map", + "description": "The default map for the server.", + "env_variable": "SRCDS_MAP", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|alpha_dash" + } + ] +} diff --git a/stock-eggs/source-engine/egg-garrys-mod.json b/stock-eggs/source-engine/egg-garrys-mod.json new file mode 100644 index 00000000..c0e4f31b --- /dev/null +++ b/stock-eggs/source-engine/egg-garrys-mod.json @@ -0,0 +1,90 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-02-16T14:20:52-05: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 +map {{SRCDS_MAP}} +gamemode {{GAMEMODE}} -strictportbind -norestart +sv_setsteamaccount {{STEAM_ACC}} +host_workshop_collection {{WORKSHOP_ID}} +maxplayers {{MAX_PLAYERS}} -tickrate {{TICKRATE}}", + "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# Garry's Mod 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 4020 +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/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\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": "ubuntu:16.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Map", + "description": "The default map for the server.", + "env_variable": "SRCDS_MAP", + "default_value": "gm_flatgrass", + "user_viewable": 1, + "user_editable": 1, + "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": 1, + "user_editable": 1, + "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": 0, + "user_editable": 0, + "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": 1, + "user_editable": 1, + "rules": "nullable|integer" + }, + { + "name": "Gamemode", + "description": "The gamemode of your server.", + "env_variable": "GAMEMODE", + "default_value": "sandbox", + "user_viewable": 1, + "user_editable": 1, + "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": 1, + "user_editable": 1, + "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": 1, + "user_editable": 1, + "rules": "required|integer|max:100" + } + ] +} diff --git a/stock-eggs/source-engine/egg-insurgency.json b/stock-eggs/source-engine/egg-insurgency.json new file mode 100644 index 00000000..4e3df4a8 --- /dev/null +++ b/stock-eggs/source-engine/egg-insurgency.json @@ -0,0 +1,54 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-01-21T16:59:48-06: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", + "config": { + "files": "{}", + "startup": "{\"done\": \"gameserver Steam ID\", \"userInteraction\": []}", + "logs": "{\"custom\": true, \"location\": \"logs\/latest.log\"}", + "stop": "quit" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\n# SRCDS Base Installation Script\n#\n# Server Files: \/mnt\/server\napt -y update\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\n\ncd \/tmp\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\n\nmkdir -p \/mnt\/server\/steamcmd\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\ncd \/mnt\/server\/steamcmd\n\n# SteamCMD fails otherwise for some reason, even running as root.\n# This is changed at the end of the install process anyways.\nchown -R root:root \/mnt\n\nexport HOME=\/mnt\/server\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} +quit\n\nmkdir -p \/mnt\/server\/.steam\/sdk32\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", + "container": "ubuntu:16.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": "17705", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|regex:\/^(17705)$\/" + }, + { + "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": 1, + "user_editable": 0, + "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": 1, + "user_editable": 1, + "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 new file mode 100644 index 00000000..ae443370 --- /dev/null +++ b/stock-eggs/source-engine/egg-team-fortress2.json @@ -0,0 +1,54 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-01-21T16:59:45-06: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\n# SRCDS Base Installation Script\n#\n# Server Files: \/mnt\/server\napt -y update\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\n\ncd \/tmp\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\n\nmkdir -p \/mnt\/server\/steamcmd\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\ncd \/mnt\/server\/steamcmd\n\n# SteamCMD fails otherwise for some reason, even running as root.\n# This is changed at the end of the install process anyways.\nchown -R root:root \/mnt\n\nexport HOME=\/mnt\/server\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} +quit\n\nmkdir -p \/mnt\/server\/.steam\/sdk32\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", + "container": "ubuntu:16.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": "232250", + "user_viewable": 1, + "user_editable": 0, + "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": 1, + "user_editable": 0, + "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": 1, + "user_editable": 1, + "rules": "required|regex:\/^(\\w{1,20})$\/" + } + ] +} \ No newline at end of file diff --git a/stock-eggs/source/ark/README.md b/stock-eggs/source/ark/README.md deleted file mode 100644 index 0ccd9589..00000000 --- a/stock-eggs/source/ark/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# ARK Survival Evolved - -#### Port Requirements -The ARK server requires 4 ports minimum. - -| Port | default | -|---------|---------| -| Game | 7777 | -| Game +1 | 7778 | -| Query | 27015 | -| RCON | 27020 | - -Please note the server may not show up on steam game server lists due to this requirement if all ports are not set/added. - -### 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 \ No newline at end of file diff --git a/stock-eggs/source/rust/README.md b/stock-eggs/source/rust/README.md deleted file mode 100644 index 002634ee..00000000 --- a/stock-eggs/source/rust/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# [Rust](https://rust.facepunch.com/) - -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. - -#### Port Requirements -The Rust server requires 3 ports minimum. - -| Port | default | -|---------|---------| -| Game | 28015 | -| Game +1 | 28016 | -| RCON | 28017 | - -Please note the server may not show up on steam game server lists due to this requirement if all ports are not set/added. \ No newline at end of file diff --git a/stock-eggs/terraria/README.md b/stock-eggs/terraria/README.md new file mode 100644 index 00000000..ab8485b0 --- /dev/null +++ b/stock-eggs/terraria/README.md @@ -0,0 +1,14 @@ +# 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 +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. \ No newline at end of file diff --git a/stock-eggs/terraria/egg-terraria-server--t-shock.json b/stock-eggs/terraria/egg-terraria-server--t-shock.json new file mode 100644 index 00000000..9381890d --- /dev/null +++ b/stock-eggs/terraria/egg-terraria-server--t-shock.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-01-21T17:01:31-06:00", + "name": "Terraria Server (TShock)", + "author": "support@pterodactyl.io", + "description": "TShock is a server modification for Terraria, written in C#, and based upon the Terraria Server API. It uses JSON for configuration management, and offers several features not present in the Terraria Server normally.", + "image": "quay.io\/pterodactyl\/core:mono", + "startup": null, + "config": { + "files": "{\"tshock\/config.json\":{\"parser\": \"json\", \"find\":{\"ServerPort\": \"{{server.build.default.port}}\", \"MaxSlots\": \"{{server.build.env.MAX_SLOTS}}\"}}}", + "startup": "{\"done\": \"Type 'help' for a list of commands\", \"userInteraction\": []}", + "logs": "{\"custom\": false, \"location\": \"ServerLog.txt\"}", + "stop": "exit" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/ash\n# TShock Installation Script\n#\n# Server Files: \/mnt\/server\napk update\napk add curl unzip\n\ncd \/tmp\n\ncurl -sSLO https:\/\/github.com\/NyxStudios\/TShock\/releases\/download\/v${T_VERSION}\/tshock_${T_VERSION}.zip\n\nunzip -o tshock_${T_VERSION}.zip -d \/mnt\/server", + "container": "alpine:3.9", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "TShock Version", + "description": "Which version of TShock to install and use.", + "env_variable": "T_VERSION", + "default_value": "4.3.22", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|regex:\/^([0-9_\\.-]{5,10})$\/" + }, + { + "name": "Maximum Slots", + "description": "Total number of slots to allow on the server.", + "env_variable": "MAX_SLOTS", + "default_value": "20", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|numeric|digits_between:1,3" + } + ] +} diff --git a/stock-eggs/voice-servers/README.md b/stock-eggs/voice-servers/README.md new file mode 100644 index 00000000..40aed5be --- /dev/null +++ b/stock-eggs/voice-servers/README.md @@ -0,0 +1,29 @@ +# Voice Servers + +## Mumble + +Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming. + +## Required Server Ports +Mumble only requires a single port to run. The default is 64738 + +| Port | default | +|---------|---------| +| Game | 64738 | + +## Teamspeak 3 + +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 +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. + +| Port | default | +|---------|---------| +| Server | 9987 | +| Query | 10011 | +| Files | 30033 | + +By default pteordactyl sets the query port to the same as the server port. \ No newline at end of file diff --git a/stock-eggs/voice-servers/egg-mumble-server.json b/stock-eggs/voice-servers/egg-mumble-server.json new file mode 100644 index 00000000..e6256259 --- /dev/null +++ b/stock-eggs/voice-servers/egg-mumble-server.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-01-21T17:01:44-06: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\/ash\n# Mumble Installation Script\n#\n# Server Files: \/mnt\/server\napk update\napk add tar curl\n\ncd \/tmp\n\ncurl -sSLO https:\/\/github.com\/mumble-voip\/mumble\/releases\/download\/${MUMBLE_VERSION}\/murmur-static_x86-${MUMBLE_VERSION}.tar.bz2\n\ntar -xjvf murmur-static_x86-${MUMBLE_VERSION}.tar.bz2\ncp -r murmur-static_x86-${MUMBLE_VERSION}\/* \/mnt\/server", + "container": "alpine:3.9", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Maximum Users", + "description": "Maximum concurrent users on the mumble server.", + "env_variable": "MAX_USERS", + "default_value": "100", + "user_viewable": 1, + "user_editable": 0, + "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.2.19", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|regex:\/^([0-9_\\.-]{5,8})$\/" + } + ] +} diff --git a/stock-eggs/voice-servers/egg-teamspeak3-server.json b/stock-eggs/voice-servers/egg-teamspeak3-server.json new file mode 100644 index 00000000..2058ec22 --- /dev/null +++ b/stock-eggs/voice-servers/egg-teamspeak3-server.json @@ -0,0 +1,36 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-05-01T16:35:15+00: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.", + "image": "quay.io\/pterodactyl\/core:glibc", + "startup": ".\/ts3server_minimal_runscript.sh default_voice_port={{SERVER_PORT}} query_port={{SERVER_PORT}} license_accepted=1", + "config": { + "files": "{}", + "startup": "{\"done\": \"listening on 0.0.0.0:\", \"userInteraction\": []}", + "logs": "{\"custom\": true, \"location\": \"logs\/ts3.log\"}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/ash\n# TS3 Installation Script\n#\n# Server Files: \/mnt\/server\napk update\napk add tar curl\n\ncd \/mnt\/server\n\ncurl http:\/\/dl.4players.de\/ts\/releases\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2 | tar xj --strip-components=1", + "container": "alpine:3.9", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Server Version", + "description": "The version of Teamspeak 3 to use when running the server.", + "env_variable": "TS_VERSION", + "default_value": "3.7.1", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|regex:\/^([0-9_\\.-]{5,10})$\/" + } + ] +} \ No newline at end of file diff --git a/terraria/README.md b/terraria/README.md new file mode 100644 index 00000000..a91dae80 --- /dev/null +++ b/terraria/README.md @@ -0,0 +1,14 @@ +# 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. From 89b50e07baf1517bb7ef4f9cec3d2d21caa94790 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Thu, 11 Jul 2019 16:12:19 -0400 Subject: [PATCH 250/393] correct bedrock download address. to resolve #241 --- minecraft_bedrock/bedrock/egg-vanilla-bedrock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json b/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json index ab665064..919bfe71 100644 --- a/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json +++ b/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-07-09T23:32:57-04:00", + "exported_at": "2019-07-11T16:09:28-04: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\".", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n\r\napk add --no-cache zip unzip wget curl\r\n\r\ncd \/mnt\/server\r\n\r\nif [ -z \"${BEDROCK_VERSION}\" ] || [ \"${BEDROCK_VERSION}\" == \"latest\" ]; then\r\n echo -e \"\\n Downloading latest Bedrock server\"\r\n DOWNLOAD_URL=$(curl https:\/\/www.minecraft.net\/en-us\/download\/server\/bedrock\/ | grep azureedge | grep linux | grep -Eo \"(http|https):\/\/[a-zA-Z0-9.\/?=_-]*\")\r\n BEDROCK_ZIP=$(echo ${DOWNLOAD_URL} | cut -d\"\/\" -f5)\r\nelse \r\n echo -e \"\\n Downloading ${BEDROCK_VERSION} Bedrock server\"\r\n DOWNLOAD_URL=https:\/\/www.minecraft.azureedge.net\/bin-linux\/bedrock-server-$BEDROCK_VERSION.zip\r\n BEDROCK_ZIP=$(echo ${DOWNLOAD_URL} | cut -d\"\/\" -f5)\r\nfi\r\n\r\necho -e \"Downloading files from https:\/\/minecraft.azureedge.net\/bin-linux\/bedrock-server-$BEDROCK_VERSION.zip\"\r\n\r\nwget ${DOWNLOAD_URL}\r\n\r\necho -e \"Unpacking server files\"\r\nunzip -o $BEDROCK_ZIP\r\n\r\necho -e \"Cleaning up after installing\"\r\nrm $BEDROCK_ZIP\r\n\r\necho -e \"Done\"", + "script": "#!\/bin\/ash\r\n\r\napk add --no-cache zip unzip wget curl\r\n\r\ncd \/mnt\/server\r\n\r\nif [ -z \"${BEDROCK_VERSION}\" ] || [ \"${BEDROCK_VERSION}\" == \"latest\" ]; then\r\n echo -e \"\\n Downloading latest Bedrock server\"\r\n DOWNLOAD_URL=$(curl https:\/\/www.minecraft.net\/en-us\/download\/server\/bedrock\/ | grep azureedge | grep linux | grep -Eo \"(http|https):\/\/[a-zA-Z0-9.\/?=_-]*\")\r\n BEDROCK_ZIP=$(echo ${DOWNLOAD_URL} | cut -d\"\/\" -f5)\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\n BEDROCK_ZIP=$(echo ${DOWNLOAD_URL} | cut -d\"\/\" -f5)\r\nfi\r\n\r\necho -e \"Downloading files from https:\/\/minecraft.azureedge.net\/bin-linux\/bedrock-server-$BEDROCK_VERSION.zip\"\r\n\r\nwget ${DOWNLOAD_URL}\r\n\r\necho -e \"Unpacking server files\"\r\nunzip -o $BEDROCK_ZIP\r\n\r\necho -e \"Cleaning up after installing\"\r\nrm $BEDROCK_ZIP\r\n\r\necho -e \"Done\"", "container": "alpine:3.9", "entrypoint": "ash" } From 195513ff14d18b5dcbd8d833fd43c98db632baa6 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Fri, 12 Jul 2019 16:30:46 -0400 Subject: [PATCH 251/393] update the force enhanced install script This is a fix for the install script for forge. --- minecraft_java/forge/forge-generic/egg-forge-enhanced.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_java/forge/forge-generic/egg-forge-enhanced.json b/minecraft_java/forge/forge-generic/egg-forge-enhanced.json index 9b30a67d..3c47856e 100644 --- a/minecraft_java/forge/forge-generic/egg-forge-enhanced.json +++ b/minecraft_java/forge/forge-generic/egg-forge-enhanced.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-06-16T08:09:35-04:00", + "exported_at": "2019-07-12T16:29:11-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.", @@ -17,7 +17,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\r\n\r\n#Fetching version\r\nif [ -z \"$MC_VERSION\" ] || [ \"$MC_VERSION\" == \"latest\" ]; then\r\n echo \"Fetching latest\"\r\n FORGE_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index.html | grep -A 2 \"Latest\" | awk NF=NF RS= OFS=\" \" | grep -o -e '[1]\\.[0-9][0-9]\\?\\.\\?[0-9]\\?[0-9] - [0-9][0-9]\\.[0-9][0-9]\\.[0-9]\\?[0-9]\\.[0-9][0-9][0-9][0-9]' | sed 's\/ \/\/g')\r\nelif [[ ! \"$MC_VERSION\" =~ - ]]; then\r\n echo \"Fetching latest from version $MC_VERSION\"\r\n FORGE_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index_$MC_VERSION.html | grep -A 2 \"Latest\" | awk NF=NF RS= OFS=\" \" | grep -o -e '[1]\\.[0-9][0-9]\\?\\.\\?[0-9]\\?[0-9] - [0-9][0-9]\\.[0-9][0-9]\\.[0-9]\\?[0-9]\\.[0-9][0-9][0-9][0-9]' | sed 's\/ \/\/g')\r\nfi\r\n\r\nif [ ${MC_VERSION} == \"1.7.10\" ] || [ ${MC_VERSION} == \"1.8.9\" ]; then\r\n\tFORGE_VERSION=\"${FORGE_VERSION}-${MC_VERSION}\"\r\nfi\r\n\r\n#Checking if forge version valid\r\nif [[ ! \"$FORGE_VERSION\" =~ [0-9]?[0-9]?\\.[0-9]?[0-9]?\\.?[0-9]?[0-9]-[0-9]?[0-9]\\.[0-9]?[0-9]\\.[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]?[0-9] ]]; then\r\n echo \"!!! Invalid forge version \\\"$FORGE_VERSION\\\" !!!\"\r\n exit\r\nfi\r\n\r\nif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\tFORGE=\"${FORGE}-${MCVER}\"\r\nfi\r\n\r\n#Go into main direction\r\ncd \/mnt\/server\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 \\\"$MC_VERSION\\\"\"\r\ncurl -o installer.jar -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$MC_VERSION\/forge-$MC_VERSION-installer.jar\r\ncurl -o $SERVER_JARFILE -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$MC_VERSION\/forge-$MC_VERSION-universal.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ] || [ ! -f .\/$SERVER_JARFILE ]; then\r\n echo \"!!! Error by downloading forge version \\\"$MC_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\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\r\n\r\n#Fetching version\r\nif [ -z \"${MC_VERSION}\" ] || [ \"${MC_VERSION}\" == \"latest\" ]; then\r\n echo \"Fetching latest\"\r\n FORGE_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index.html | grep -A 2 \"Latest\" | awk NF=NF RS= OFS=\" \" | grep -o -e '[1]\\.[0-9][0-9]\\?\\.\\?[0-9]\\?[0-9] - [0-9][0-9]\\.[0-9][0-9]\\.[0-9]\\?[0-9]\\.[0-9][0-9][0-9][0-9]' | sed 's\/ \/\/g')\r\nelif [[ ! \"${MC_VERSION}\" =~ - ]]; then\r\n echo \"Fetching latest from version $MC_VERSION\"\r\n FORGE_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index_${MC_VERSION}.html | grep -A 2 \"Latest\" | awk NF=NF RS= OFS=\" \" | grep -o -e '[1]\\.[0-9][0-9]\\?\\.\\?[0-9]\\?[0-9] - [0-9][0-9]\\.[0-9][0-9]\\.[0-9]\\?[0-9]\\.[0-9][0-9][0-9][0-9]' | sed 's\/ \/\/g')\r\nfi\r\n\r\nif [ -z ${MC_VERSION} ]; then\r\n echo -e \"\"\r\nelse\r\n if [ ${MC_VERSION} == \"1.7.10\" ] || [ ${MC_VERSION} == \"1.8.9\" ]; then\r\n echo -e \"correcting forge version to ${FORGE_VERSION}-${MC_VERSION}\"\r\n\t FORGE_VERSION=\"${FORGE_VERSION}-${MC_VERSION}\"\r\n fi\r\nfi\r\n\r\n#Checking if forge version valid\r\nif [[ ! \"$FORGE_VERSION\" =~ [0-9]?[0-9]?\\.[0-9]?[0-9]?\\.?[0-9]?[0-9]-[0-9]?[0-9]\\.[0-9]?[0-9]\\.[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]?[0-9] ]]; then\r\n echo \"!!! Invalid forge version \\\"$FORGE_VERSION\\\" !!!\"\r\n exit\r\nfi\r\n\r\n#Go into main direction\r\ncd \/mnt\/server\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\ncurl -o installer.jar -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/${FORGE_VERSION}\/forge-${FORGE_VERSION}-installer.jar\r\ncurl -o $SERVER_JARFILE -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/${FORGE_VERSION}\/forge-${FORGE_VERSION}-universal.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ] || [ ! -f .\/$SERVER_JARFILE ]; 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\r\n\r\n#Deleting installer.jar\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar", "container": "openjdk:8", "entrypoint": "bash" } From 61b73bb70137668c283c71cd86ef9c41d2b28cff Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Fri, 12 Jul 2019 16:34:03 -0400 Subject: [PATCH 252/393] update for the fivem installer I have added a required variable for the fivem version This is needed to pull the correct version of fivem from the artifact repo. --- gta/fivem/egg-five-m.json | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gta/fivem/egg-five-m.json b/gta/fivem/egg-five-m.json index 1ecddd69..4d526bf8 100644 --- a/gta/fivem/egg-five-m.json +++ b/gta/fivem/egg-five-m.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-02-20T16:46:04-05:00", + "exported_at": "2019-07-12T16:32:34-04:00", "name": "FiveM", "author": "parker@parkervcp.com", "description": "A new FiveM egg for the latest builds due to recent changes in FiveM", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash \r\n\r\napk add openssl tar xz curl wget git --no-cache\r\n\r\ncd \/mnt\/server\r\n\r\nmkdir resources\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\ncd \/mnt\/server\r\n\r\necho \"Downloading the latest fivem server files\"\r\nlatest_fivem_url=`curl https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/ | grep -Eo 'href=\".*\/\"' | grep -Eo '\".*\"' | grep -Eo 'href=\".*\/\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g'`\r\n\r\necho -e \"pulling files from https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${latest_fivem_url}fx.tar.xz\"\r\nwget https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${latest_fivem_url}fx.tar.xz\r\n\r\necho \"Extracting fivem files\"\r\n\r\ntar xf fx.tar.xz\r\n\r\nrm -rf fx.tar.xz 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\/gta\/fivem\/server.cfg >> server.cfg\r\nfi\r\n\r\nmkdir logs\/\r\n\r\necho \"install complete\"", + "script": "#!\/bin\/ash \r\n\r\napk add openssl tar xz curl wget git --no-cache\r\n\r\ncd \/mnt\/server\r\n\r\nmkdir resources\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\ncd \/mnt\/server\r\n\r\necho -e \"pulling files from https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${latest_fivem_url}fx.tar.xz\"\r\nwget https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${FIVEM_VERSION}fx.tar.xz\r\n\r\necho \"Extracting fivem files\"\r\n\r\ntar xf fx.tar.xz\r\n\r\nrm -rf fx.tar.xz 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\/gta\/fivem\/server.cfg >> server.cfg\r\nfi\r\n\r\nmkdir logs\/\r\n\r\necho \"install complete\"", "container": "alpine:3.9", "entrypoint": "ash" } @@ -36,10 +36,10 @@ "name": "Max Players", "description": "Set the fivem max play count", "env_variable": "MAX_PLAYERS", - "default_value": "32", + "default_value": "30", "user_viewable": 1, "user_editable": 0, - "rules": "required|integer|between:1,32" + "rules": "required|integer|between:1,31" }, { "name": "Server Hostname", @@ -49,6 +49,15 @@ "user_viewable": 1, "user_editable": 1, "rules": "required|string" + }, + { + "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 the latest version from here - https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/", + "env_variable": "FIVEM_VERSION", + "default_value": "", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|string|max:50" } ] } \ No newline at end of file From dbe4ffe9b7b59dbbeb80d34c25105a62de590fdb Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sat, 13 Jul 2019 15:14:16 -0400 Subject: [PATCH 253/393] update the fivem installscript to resolve $246 old script pulled the version with the trailing slash. need to add it back in. --- gta/fivem/egg-five-m.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gta/fivem/egg-five-m.json b/gta/fivem/egg-five-m.json index 4d526bf8..88584452 100644 --- a/gta/fivem/egg-five-m.json +++ b/gta/fivem/egg-five-m.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-07-12T16:32:34-04:00", + "exported_at": "2019-07-13T15:13:03-04:00", "name": "FiveM", "author": "parker@parkervcp.com", "description": "A new FiveM egg for the latest builds due to recent changes in FiveM", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash \r\n\r\napk add openssl tar xz curl wget git --no-cache\r\n\r\ncd \/mnt\/server\r\n\r\nmkdir resources\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\ncd \/mnt\/server\r\n\r\necho -e \"pulling files from https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${latest_fivem_url}fx.tar.xz\"\r\nwget https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${FIVEM_VERSION}fx.tar.xz\r\n\r\necho \"Extracting fivem files\"\r\n\r\ntar xf fx.tar.xz\r\n\r\nrm -rf fx.tar.xz 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\/gta\/fivem\/server.cfg >> server.cfg\r\nfi\r\n\r\nmkdir logs\/\r\n\r\necho \"install complete\"", + "script": "#!\/bin\/ash \r\n\r\napk add openssl tar xz curl wget git --no-cache\r\n\r\ncd \/mnt\/server\r\n\r\nmkdir resources\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\ncd \/mnt\/server\r\n\r\necho -e \"pulling files from https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${FIVEM_VERSION}\/fx.tar.xz\"\r\nwget https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${FIVEM_VERSION}\/fx.tar.xz\r\n\r\necho \"Extracting fivem files\"\r\n\r\ntar xf fx.tar.xz\r\n\r\nrm -rf fx.tar.xz 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\/gta\/fivem\/server.cfg >> server.cfg\r\nfi\r\n\r\nmkdir logs\/\r\n\r\necho \"install complete\"", "container": "alpine:3.9", "entrypoint": "ash" } From 142fad2979bd4794c1d51c5c46e68e0387f288e8 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 14 Jul 2019 20:05:50 -0400 Subject: [PATCH 254/393] add velocity.toml --- minecraft_proxy/velocity/velocity.toml | 106 +++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 minecraft_proxy/velocity/velocity.toml diff --git a/minecraft_proxy/velocity/velocity.toml b/minecraft_proxy/velocity/velocity.toml new file mode 100644 index 00000000..1221a696 --- /dev/null +++ b/minecraft_proxy/velocity/velocity.toml @@ -0,0 +1,106 @@ +# Config version. Do not change this +config-version = "1.0" + +# 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" + +# 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 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 from the +# proxy and will have offline-mode UUIDs. +# - "legacy": Forward player IPs and UUIDs in a BungeeCord-compatible format. Use this if +# you run servers using Minecraft 1.12 or lower. +# - "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" + +# If you are using modern IP forwarding, configure an unique secret here. +forwarding-secret = "FrP42MxySW6Y" + +# Announce whether or not your server supports Forge. If you run a modded server, we +# suggest turning this on. +announce-forge = false + +[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" +factions = "127.0.0.1:30067" + +# In what order we should try servers when a player logs in or is kicked from aserver. +try = [ + "lobby" +] + +[forced-hosts] +# Configure your forced hosts here. +"minigames.example.com" = [ + "minigames" +] +"lobby.example.com" = [ + "lobby" +] +"factions.example.com" = [ + "factions" +] + +[advanced] +# 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. +proxy-protocol = false + +[query] +# Whether to enable responding to GameSpy 4 query responses or not. +enabled = false + +# If query is enabled, on what port should the query protocol listen on? +port = 25577 + +# 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 + +[metrics] +# 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 = true + +# A unique, anonymous ID to identify this proxy with. +id = "b12f2e77-133c-4a5f-b288-d8833be3dc4d" + +log-failure = false + From 5dbe1f08825a1c0d987c8898cdda0a368b19a99a Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 14 Jul 2019 20:40:46 -0400 Subject: [PATCH 255/393] Add the velocity mc proxy --- minecraft_proxy/velocity/egg-velocity.json | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 minecraft_proxy/velocity/egg-velocity.json diff --git a/minecraft_proxy/velocity/egg-velocity.json b/minecraft_proxy/velocity/egg-velocity.json new file mode 100644 index 00000000..7bfb6a83 --- /dev/null +++ b/minecraft_proxy/velocity/egg-velocity.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-07-14T20:36:29-04:00", + "name": "Velocity", + "author": "parker@parkervcp.com", + "description": "Velocity is a Minecraft server proxy with unparalleled server support, scalability, and flexibility.", + "image": "quay.io\/pterodactyl\/core:java", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", + "config": { + "files": "{\r\n \"velocity.toml\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"bind = \": \"bind = \\\"0.0.0.0:{{server.build.default.port}}\\\"\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Done (\"\r\n}", + "logs": "{}", + "stop": "shutdown" + }, + "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=\/lastStableBuild\r\nfi\r\n\r\necho -e \"Getting download link\"\r\nDOWNLOAD_ENDPOINT=$(curl https:\/\/ci.velocitypowered.com\/job\/velocity\/${VELOCITY_VERSION}\/ | grep -Eo 'href=\"[^\\\"]+\"' | grep -vE \"view|fingerprint\" | grep \".jar\" | sed -n 's\/.*href=\"\\([^\"]*\\).*\/\\1\/p')\r\nDOWNLOAD_LINK=https:\/\/ci.velocitypowered.com\/job\/velocity\/lastStableBuild\/${DOWNLOAD_ENDPOINT}\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\/minecraft_proxy\/velocity\/velocity.toml -o velocity.toml\r\nfi\r\n\r\necho -e \"install complete\"", + "container": "alpine:3.10", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Velocity Version", + "description": "The Velocity Proxy version to download.\r\n\r\nset to 'latest ' the download the last stable build.", + "env_variable": "VELOCITY_VERSION", + "default_value": "latest", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|string|max:20" + }, + { + "name": "Server Jar File", + "description": "Server Jar File name", + "env_variable": "SERVER_JARFILE", + "default_value": "velocity.jar", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|string|max:20" + } + ] +} \ No newline at end of file From 3f8dc64647d9521828d0fa9c9a5193e769df3042 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 14 Jul 2019 20:56:42 -0400 Subject: [PATCH 256/393] update/add readme's Update the core readme to add velocity. Add a readme for velocity to the folder. --- README.md | 1 + minecraft_proxy/velocity/README.md | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 minecraft_proxy/velocity/README.md diff --git a/README.md b/README.md index 4193e16d..6cab2958 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 [Minecraft Proxies](/minecraft_proxy/) (these are for the java version of minecraft) * [Waterfall](/minecraft_proxy/waterfall/) +* [Velocity](/minecraft_proxy/velocity/) [Mount & Blade Warband](/mount_and_blade/warband/) diff --git a/minecraft_proxy/velocity/README.md b/minecraft_proxy/velocity/README.md new file mode 100644 index 00000000..c1c794dc --- /dev/null +++ b/minecraft_proxy/velocity/README.md @@ -0,0 +1,10 @@ +# Velocity Minecraft Proxy +Velocity is a Minecraft server proxy with unparalleled server support, scalability, and flexibility. + +## 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 From e55be4bb137fac3adc0da3e3bcd2ada8afceba81 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Mon, 15 Jul 2019 23:06:03 -0400 Subject: [PATCH 257/393] add TyphoonLimbo This will resolve #226 Add the typhoon limbo server --- README.md | 1 + minecraft_proxy/typhoonlimbo/README.md | 10 +++++++ .../typhoonlimbo/egg-typhoon-limbo.json | 26 +++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 minecraft_proxy/typhoonlimbo/README.md create mode 100644 minecraft_proxy/typhoonlimbo/egg-typhoon-limbo.json diff --git a/README.md b/README.md index 4193e16d..81104b4e 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 [Minecraft Proxies](/minecraft_proxy/) (these are for the java version of minecraft) * [Waterfall](/minecraft_proxy/waterfall/) +* [TyphoonLimbo](/minecraft_proxy/typhoonlimbo/) [Mount & Blade Warband](/mount_and_blade/warband/) diff --git a/minecraft_proxy/typhoonlimbo/README.md b/minecraft_proxy/typhoonlimbo/README.md new file mode 100644 index 00000000..697210e2 --- /dev/null +++ b/minecraft_proxy/typhoonlimbo/README.md @@ -0,0 +1,10 @@ +# TyphoonLimbo server +Lightweight minecraft limbo 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/minecraft_proxy/typhoonlimbo/egg-typhoon-limbo.json b/minecraft_proxy/typhoonlimbo/egg-typhoon-limbo.json new file mode 100644 index 00000000..b24d5d72 --- /dev/null +++ b/minecraft_proxy/typhoonlimbo/egg-typhoon-limbo.json @@ -0,0 +1,26 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-07-15T23:01:54-04:00", + "name": "TyphoonLimbo", + "author": "parker@parkervcp.com", + "description": "Lightweight minecraft limbo server", + "image": "quay.io\/parkervcp\/pterodactyl-images:base_alpine", + "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\/ash\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\napk add --no-cache --update 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.12-alpine", + "entrypoint": "ash" + } + }, + "variables": [] +} \ No newline at end of file From a9a5b94efb5e450d584ab1a33efcaef9c885370d Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 21 Jul 2019 20:36:21 -0400 Subject: [PATCH 258/393] update samp to use the new docker iamge This is to resolve #253 --- gta/samp/egg-s-a--m-p.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 gta/samp/egg-s-a--m-p.json diff --git a/gta/samp/egg-s-a--m-p.json b/gta/samp/egg-s-a--m-p.json new file mode 100644 index 00000000..090a4511 --- /dev/null +++ b/gta/samp/egg-s-a--m-p.json @@ -0,0 +1,26 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-07-21T20:35:32-04:00", + "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", + "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}", + "startup": "{\r\n \"done\": \"Started server on port: \",\r\n \"userInteraction\": []\r\n}", + "logs": "{\r\n \"custom\": true,\r\n \"location\": \"samp.log\"\r\n}", + "stop": "^C" + }, + "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 -sSL -o samp.tar.gz http:\/\/files.sa-mp.com\/samp037svr_R2-1.tar.gz\r\n\r\nmkdir -p \/mnt\/server\r\ntar -xzvf samp.tar.gz -C \/mnt\/server\/\r\ncp -r \/mnt\/server\/samp03\/* \/mnt\/server\r\nrm -rf \/mnt\/server\/samp03\/\r\ncd \/mnt\/server\r\nsed -i '3d' \/mnt\/server\/server.cfg\r\necho \"rcon_password changemeplease\" >> \/mnt\/server\/server.cfg\r\n\r\nchown -R root:root \/mnt\r\n\r\nexport HOME=\/mnt\/server", + "container": "ubuntu:16.04", + "entrypoint": "bash" + } + }, + "variables": [] +} \ No newline at end of file From 52c5c6d4b2757279f94280dac3f97e13dc5fdf72 Mon Sep 17 00:00:00 2001 From: Kurounin Date: Mon, 22 Jul 2019 22:38:47 +0300 Subject: [PATCH 259/393] app_set_config 90 --- source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json b/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json index 3cfe1a7a..173dc848 100644 --- a/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json +++ b/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# SRCDS Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} +app_set_config mod ${HLDS_GAME} +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", + "script": "#!\/bin\/bash\r\n# SRCDS Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} +app_set_config 90 mod ${HLDS_GAME} +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", "container": "ubuntu:18.04", "entrypoint": "bash" } From 38a01b229711405ee157819388ff4866bf6e96ef Mon Sep 17 00:00:00 2001 From: Kurounin Date: Tue, 23 Jul 2019 09:49:26 +0300 Subject: [PATCH 260/393] Add MAX_PLAYERS variable --- .../hlds_server/egg-custom-h-l-d-s-engine-game.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json b/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json index 173dc848..692c7aa6 100644 --- a/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json +++ b/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json @@ -8,7 +8,7 @@ "author": "parker@parkervcp.com", "description": "This option allows modifying the startup arguments and other details to run a custom HLDS based game on the panel.", "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", - "startup": ".\/hlds_run -console -game {{HLDS_GAME}} -port {{SERVER_PORT}} -sport {{VAC_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart", + "startup": ".\/hlds_run -console -game {{HLDS_GAME}} -port {{SERVER_PORT}} -sport {{VAC_PORT}} +map {{SRCDS_MAP}} +maxplayers {{MAX_PLAYERS}} +ip 0.0.0.0 -strictportbind -norestart", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Connection to Steam servers successful\",\r\n \"userInteraction\": []\r\n}", @@ -58,6 +58,15 @@ "user_viewable": 1, "user_editable": 0, "rules": "required|numeric|digits_between:1,5" + }, + { + "name": "Max Players", + "description": "Maximum amount of players that can connect to the server.", + "env_variable": "MAX_PLAYERS", + "default_value": "18", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|numeric|digits_between:1,2" } ] } From b7f4a0ec8fbc4459517abf8159dc2ec9d17e37bd Mon Sep 17 00:00:00 2001 From: Kurounin Date: Tue, 23 Jul 2019 15:58:09 +0300 Subject: [PATCH 261/393] Revert commit to add MAX_PLAYERS --- .../hlds_server/egg-custom-h-l-d-s-engine-game.json | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json b/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json index 692c7aa6..173dc848 100644 --- a/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json +++ b/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json @@ -8,7 +8,7 @@ "author": "parker@parkervcp.com", "description": "This option allows modifying the startup arguments and other details to run a custom HLDS based game on the panel.", "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", - "startup": ".\/hlds_run -console -game {{HLDS_GAME}} -port {{SERVER_PORT}} -sport {{VAC_PORT}} +map {{SRCDS_MAP}} +maxplayers {{MAX_PLAYERS}} +ip 0.0.0.0 -strictportbind -norestart", + "startup": ".\/hlds_run -console -game {{HLDS_GAME}} -port {{SERVER_PORT}} -sport {{VAC_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Connection to Steam servers successful\",\r\n \"userInteraction\": []\r\n}", @@ -58,15 +58,6 @@ "user_viewable": 1, "user_editable": 0, "rules": "required|numeric|digits_between:1,5" - }, - { - "name": "Max Players", - "description": "Maximum amount of players that can connect to the server.", - "env_variable": "MAX_PLAYERS", - "default_value": "18", - "user_viewable": 1, - "user_editable": 0, - "rules": "required|numeric|digits_between:1,2" } ] } From 2e4821114715c133667b3768fb61c77f06cc9b2b Mon Sep 17 00:00:00 2001 From: Michael <28601081+clrxbl@users.noreply.github.com> Date: Wed, 24 Jul 2019 10:07:12 +0200 Subject: [PATCH 262/393] Workaround for bugged console output --- minecraft_java/paper/egg-paper.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_java/paper/egg-paper.json b/minecraft_java/paper/egg-paper.json index 05a8bfce..d8b95c96 100644 --- a/minecraft_java/paper/egg-paper.json +++ b/minecraft_java/paper/egg-paper.json @@ -8,7 +8,7 @@ "author": "parker@pterodactyl.io", "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-8-jre", - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", + "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 \"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}", @@ -60,4 +60,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From 7f5684f21de1146a83eaf8bf1829dd98a2785834 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 24 Jul 2019 10:02:58 -0400 Subject: [PATCH 263/393] update waterfall install script to resolve #260 --- minecraft_proxy/waterfall/egg-waterfall.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/minecraft_proxy/waterfall/egg-waterfall.json b/minecraft_proxy/waterfall/egg-waterfall.json index 68aa6ac4..b092cb4a 100644 --- a/minecraft_proxy/waterfall/egg-waterfall.json +++ b/minecraft_proxy/waterfall/egg-waterfall.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-03-02T21:19:50-05:00", + "exported_at": "2019-07-24T10:01:37-04:00", "name": "Waterfall", "author": "hostmaster@waterfallgaming.net", "description": "Waterfall is a fork of the well-known BungeeCord server teleportation suite.", @@ -17,8 +17,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache --update 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\/waterfall | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | IN($VERSION)' | grep true`\r\n LATEST_WATERFALL_VERSION=`curl -s https:\/\/papermc.io\/api\/v1\/waterfall | 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 waterfall version\"\r\n MINECRAFT_VERSION=${LATEST_WATERFALL_VERSION}\r\n fi\r\n \r\n BUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v1\/waterfall\/${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\/waterfall\/${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\/waterfall\/${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\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\ncurl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_proxy\/waterfall\/config.yml", - "container": "alpine:3.9", + "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache --update 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\/waterfall | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | IN($VERSION)' | grep true`\r\n LATEST_WATERFALL_VERSION=`curl -s https:\/\/papermc.io\/api\/v1\/waterfall | 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 waterfall version\"\r\n MINECRAFT_VERSION=${LATEST_WATERFALL_VERSION}\r\n fi\r\n \r\n BUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v1\/waterfall\/${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\/waterfall\/${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\/waterfall\/${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\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f config.yml ]; then\r\n echo -e \"Downloading waterfall config.yml\"\r\n curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_proxy\/waterfall\/config.yml\r\nelse\r\n echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi", + "container": "alpine:3.10", "entrypoint": "ash" } }, From b94afcd78145190c420e6d3d6b10b488c60aa3cd Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Thu, 25 Jul 2019 10:50:51 -0400 Subject: [PATCH 264/393] update sinusbot install script. --- bots/discord/sinusbot/egg-sinusbot.json | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/bots/discord/sinusbot/egg-sinusbot.json b/bots/discord/sinusbot/egg-sinusbot.json index c1805f68..fa050d60 100644 --- a/bots/discord/sinusbot/egg-sinusbot.json +++ b/bots/discord/sinusbot/egg-sinusbot.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-02-28T12:38:22-05:00", + "exported_at": "2019-07-25T10:48:45-04:00", "name": "Sinusbot", "author": "support@pterodactyl.io", "description": "Musicbot for Discord and Teamspeak.", @@ -17,7 +17,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\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#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#cp scripts scripts_org\r\n\r\n#Install Sinusbot plugin\r\ncp plugin\/libsoundbot_plugin.so TeamSpeak3-Client-linux_amd64\/plugins\r\n\r\n#Download TeamSpeak Client\r\nwget http:\/\/dl.4players.de\/ts\/releases\/${TS_VERSION}\/TeamSpeak3-Client-linux_amd64-${TS_VERSION}.run\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\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#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-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", "container": "ubuntu:18.04", "entrypoint": "bash" } @@ -31,15 +31,6 @@ "user_viewable": 1, "user_editable": 1, "rules": "required|string|max:20" - }, - { - "name": "Teamspeak version", - "description": "What version of teamspeak client to download", - "env_variable": "TS_VERSION", - "default_value": "3.2.2", - "user_viewable": 0, - "user_editable": 0, - "rules": "required|string|max:20" } ] } \ No newline at end of file From 42e98494a248d2a73b8ba68252bd3b904d9ea4e4 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Thu, 25 Jul 2019 14:11:43 -0400 Subject: [PATCH 265/393] add auto update disable to 7dtd This is to resolve #255 add variable to disable auto_update move to using `quay.io/parkervcp/pterodactyl-images:ubuntu_source` as the image --- .../7_days_to_die/egg-7-days-to-die.json | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/source_servers/7_days_to_die/egg-7-days-to-die.json b/source_servers/7_days_to_die/egg-7-days-to-die.json index 49475dd8..4e9fcb36 100644 --- a/source_servers/7_days_to_die/egg-7-days-to-die.json +++ b/source_servers/7_days_to_die/egg-7-days-to-die.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-06-02T19:20:57-04:00", + "exported_at": "2019-07-25T14:08:07-04:00", "name": "7 Days To Die", "author": "kristoffer.norman@bahnhof.se", "description": "7 days to die server", - "image": "quay.io\/parkervcp\/pterodactyl-images:source", + "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", "startup": "'.\/7DaysToDieServer.x86_64 -configfile=serverconfig.xml -quit -batchmode -nographics -dedicated -ServerPort=${{server.build.default.port}} -ServerMaxPlayerCount=${{server.build.env.MAX_PLAYERS}} -GameDifficulty=${{server.build.env.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": "{}", + "files": "{\r\n \"serverconfig.xml\": {\r\n \"parser\": \"xml\",\r\n \"find\": {\r\n \"ServerSettings.property name=\\\"ServerPort\\\"\": \"value=\\\"{{server.build.env.SERVER_PORT}}\\\"\"\r\n }\r\n }\r\n}", "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}", "stop": "shutdown" @@ -49,6 +49,15 @@ "user_viewable": 0, "user_editable": 0, "rules": "required|string|max:20" + }, + { + "name": "Auto Update", + "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, + "rules": "required|boolean" } ] } \ No newline at end of file From 655b505ce2b7cce6bbf2acc08be4236afb4ce09f Mon Sep 17 00:00:00 2001 From: Shane Hughes Date: Sat, 27 Jul 2019 19:35:18 -0400 Subject: [PATCH 266/393] fix for download/fix server buried in subdirectory --- .../forge/forge-mod-generic/egg-forge-generic.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/minecraft_java/forge/forge-mod-generic/egg-forge-generic.json b/minecraft_java/forge/forge-mod-generic/egg-forge-generic.json index 929da0be..e09c2dd2 100644 --- a/minecraft_java/forge/forge-mod-generic/egg-forge-generic.json +++ b/minecraft_java/forge/forge-mod-generic/egg-forge-generic.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-06-04T07:13:30-04:00", + "exported_at": "2019-07-23T19:59:03-04:00", "name": "Forge Generic", "author": "parker@parkervcp.com", "description": "A generic egg for a forge modpack", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nfunction install_required {\r\n apk --no-cache --update add curl jq\r\n}\r\n\r\nfunction get_download {\r\n BASE_URL=${MODPACK_URL}\/files\r\n\r\n if [ -z \"${MODPACK_VERSION}\" ] || [ \"${MODPACK_VERSION}\" == \"latest\" ]; then\r\n ID=`curl -sl ${BASE_URL} | grep -i -A9 'title=\"release\"' | grep -m 1 -i -o 'href=\".*\"' | cut -d \"\/\" -f5 | sed s\/\\\"\/\/g`\r\n echo \"ID: ${ID}\"\r\n else\r\n ID=`curl -sl ${BASE_URL} | grep -i -A9 \"${MODPACK_VERSION}\" | grep -m 1 -oE 'href=\"[^\\\"]+\"' | cut -d \"\/\" -f5 | grep -oE [0-9]+`\r\n echo \"ID: ${ID}\"\r\n fi\r\n\r\n SECONDURL=${BASE_URL}\/${ID}\r\n echo \"SECONDURL: ${SECONDURL}\"\r\n\r\n GOOD_ID=`curl -sl ${SECONDURL} | grep -i server | grep -Eo 'href=\"[^\\\"]+\"' | grep -o -E \"[0-9]+\" | tail -1`\r\n if [ -z \"$GOOD_ID\" ]; then\r\n GOOD_ID=$ID\r\n fi\r\n echo \"GOOD_ID: ${GOOD_ID}\"\r\n\r\n DL_URL=${BASE_URL}\/${GOOD_ID}\/download\r\n echo \"Download_URL: ${DL_URL}\"\r\n\r\n cd \/mnt\/server\r\n\r\n echo \"Executing curl -L ${DL_URL} -o server.zip\"\r\n curl -L ${DL_URL} -o server.zip\r\n\r\n unzip -o server.zip\r\n\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 java -jar *installer.jar --installServer\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\r\n mv *universal.jar server.jar\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=\"https:\/\/minecraft.curseforge.com\/projects\/${projID}\/files\/${fileID}\/download\"\r\n echo \"mods file url: ${URL}\"\r\n # this is saving everything as \/mnt\/server\/mods\/download\r\n FINAL_URL=$(curl $URL -s -L -o \/dev\/null -w '%{url_effective}')\r\n echo \"Mod direct url: $FINAL_URL\"\r\n curl -JLO ${FINAL_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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\ninstall_required\r\nget_download\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\nelse\r\n forge_install\r\n forge_cleanup\r\nfi", + "script": "#!\/bin\/ash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nfunction install_required {\r\n apk --no-cache --update add curl jq\r\n}\r\n\r\nfunction get_download {\r\n BASE_URL=${MODPACK_URL}\/files\r\n ID=`curl -sl ${BASE_URL} | grep -i -A9 \"${MODPACK_VERSION}\" | grep -m 1 -oE 'href=\"[^\\\"]+\"' | cut -d \"\/\" -f6 | grep -oE [0-9]+`\r\n echo \"ID: ${ID}\"\r\n\r\n SECONDURL=${BASE_URL}\/${ID}\r\n echo \"SECONDURL: ${SECONDURL}\"\r\n\r\n GOOD_ID=`curl -sl ${SECONDURL} | grep -i server | grep -i $MODPACK_VERSION | grep -Eo 'href=\"[^\\\"]+\"' | grep -o -E \"[0-9]+\" | tail -1`\r\n if [ -z \"$GOOD_ID\" ]; then\r\n GOOD_ID=$ID\r\n fi\r\n echo \"GOOD_ID: ${GOOD_ID}\"\r\n\r\n DL_URL=${MODPACK_URL}\/download\/${GOOD_ID}\/file\r\n echo \"Download_URL: ${DL_URL}\"\r\n\r\n cd \/mnt\/server\r\n\r\n echo \"Executing curl -L ${DL_URL} -o server.zip\"\r\n curl -L ${DL_URL} -o server.zip\r\n\r\n unzip -o server.zip\r\n\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\r\n else\r\n echo \"No forge installer found moving on.\"\r\n fi\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 mv *universal.jar server.jar\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=\"https:\/\/minecraft.curseforge.com\/projects\/${projID}\/files\/${fileID}\/download\"\r\n echo \"mods file url: ${URL}\"\r\n # this is saving everything as \/mnt\/server\/mods\/download\r\n FINAL_URL=$(curl $URL -s -L -o \/dev\/null -w '%{url_effective}')\r\n echo \"Mod direct url: $FINAL_URL\"\r\n curl -JLO ${FINAL_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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\ninstall_required\r\nget_download\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\nelse\r\n forge_install\r\n forge_cleanup\r\nfi", "container": "openjdk:8-alpine", "entrypoint": "ash" } @@ -36,10 +36,10 @@ "name": "Modpack Version", "description": "Version of the modpack to use.", "env_variable": "MODPACK_VERSION", - "default_value": "latest", + "default_value": "", "user_viewable": 1, "user_editable": 1, "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From f300eb7b6a02f154629403371dcb630d21d351ef Mon Sep 17 00:00:00 2001 From: Shane Hughes Date: Sat, 27 Jul 2019 19:36:12 -0400 Subject: [PATCH 267/393] adding optional java parameters --- .../forge/forge-mod-generic/egg-forge-generic.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/minecraft_java/forge/forge-mod-generic/egg-forge-generic.json b/minecraft_java/forge/forge-mod-generic/egg-forge-generic.json index e09c2dd2..1dc8402a 100644 --- a/minecraft_java/forge/forge-mod-generic/egg-forge-generic.json +++ b/minecraft_java/forge/forge-mod-generic/egg-forge-generic.json @@ -8,7 +8,7 @@ "author": "parker@parkervcp.com", "description": "A generic egg for a forge modpack", "image": "quay.io\/pterodactyl\/core:java", - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar server.jar", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M {{JAVA_PARAMETERS}} -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 \"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}", @@ -40,6 +40,15 @@ "user_viewable": 1, "user_editable": 1, "rules": "required|string|max:20" + }, + { + "name": "Java Parameters", + "description": "java parameters that are loaded in specific modpack", + "env_variable": "JAVA_PARAMETERS", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "string|max:280|nullable" } ] } \ No newline at end of file From 3041bac2de369c07c0544efbea427ec18c5a21bf Mon Sep 17 00:00:00 2001 From: shanehughes1990 Date: Tue, 30 Jul 2019 17:36:54 -0400 Subject: [PATCH 268/393] removing JAVA_PARAMETERS variable --- .../forge/forge-mod-generic/egg-forge-generic.json | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/minecraft_java/forge/forge-mod-generic/egg-forge-generic.json b/minecraft_java/forge/forge-mod-generic/egg-forge-generic.json index 1dc8402a..e09c2dd2 100644 --- a/minecraft_java/forge/forge-mod-generic/egg-forge-generic.json +++ b/minecraft_java/forge/forge-mod-generic/egg-forge-generic.json @@ -8,7 +8,7 @@ "author": "parker@parkervcp.com", "description": "A generic egg for a forge modpack", "image": "quay.io\/pterodactyl\/core:java", - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M {{JAVA_PARAMETERS}} -jar server.jar", + "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 \"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}", @@ -40,15 +40,6 @@ "user_viewable": 1, "user_editable": 1, "rules": "required|string|max:20" - }, - { - "name": "Java Parameters", - "description": "java parameters that are loaded in specific modpack", - "env_variable": "JAVA_PARAMETERS", - "default_value": "", - "user_viewable": 1, - "user_editable": 1, - "rules": "string|max:280|nullable" } ] } \ No newline at end of file From 760e52a6ae0c6885c4275796ac3695b48bcafc44 Mon Sep 17 00:00:00 2001 From: Michael PArker Date: Thu, 1 Aug 2019 04:57:28 -0400 Subject: [PATCH 269/393] update paper egg Switch to using the core pterodactyl java. Also removed the server query port in the config section. --- minecraft_java/paper/egg-paper.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/minecraft_java/paper/egg-paper.json b/minecraft_java/paper/egg-paper.json index d8b95c96..60fde38e 100644 --- a/minecraft_java/paper/egg-paper.json +++ b/minecraft_java/paper/egg-paper.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-03-28T15:18:36-04:00", + "exported_at": "2019-08-01T04:49:37-04:00", "name": "Paper", "author": "parker@pterodactyl.io", "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-8-jre", + "image": "quay.io\/pterodactyl\/core:java", "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 \"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 }\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" @@ -60,4 +60,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From 79a47bfe88d86c8cd9883e8e49fd3468465518c0 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Mon, 12 Aug 2019 22:08:35 -0400 Subject: [PATCH 270/393] update to fix the xml parsing should resolve #279 --- source_servers/7_days_to_die/egg-7-days-to-die.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source_servers/7_days_to_die/egg-7-days-to-die.json b/source_servers/7_days_to_die/egg-7-days-to-die.json index 4e9fcb36..dc2f7642 100644 --- a/source_servers/7_days_to_die/egg-7-days-to-die.json +++ b/source_servers/7_days_to_die/egg-7-days-to-die.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-07-25T14:08:07-04:00", + "exported_at": "2019-08-12T22:06:45-04: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", "startup": "'.\/7DaysToDieServer.x86_64 -configfile=serverconfig.xml -quit -batchmode -nographics -dedicated -ServerPort=${{server.build.default.port}} -ServerMaxPlayerCount=${{server.build.env.MAX_PLAYERS}} -GameDifficulty=${{server.build.env.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": "{\r\n \"serverconfig.xml\": {\r\n \"parser\": \"xml\",\r\n \"find\": {\r\n \"ServerSettings.property name=\\\"ServerPort\\\"\": \"value=\\\"{{server.build.env.SERVER_PORT}}\\\"\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"serverconfig.xml\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"ServerPort\": \" Date: Mon, 12 Aug 2019 22:32:02 -0400 Subject: [PATCH 271/393] update issue templates. --- .github/ISSUE_TEMPLATE/bugs.md | 6 +++++- .github/ISSUE_TEMPLATE/request.md | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bugs.md b/.github/ISSUE_TEMPLATE/bugs.md index 8d0d4648..759830d8 100644 --- a/.github/ISSUE_TEMPLATE/bugs.md +++ b/.github/ISSUE_TEMPLATE/bugs.md @@ -4,7 +4,11 @@ about: Report an issue for an egg --- -Please fill out the information bellow and remove from the line up +# If you are seeing any of the following go to Discord and port your error in a support channel. + * `A fatal error was encountered while starting this server.` + * `No server egg configuration could be located; aborting startup.` + +Please fill out the information bellow and remove from the line up If you just submit a bug with no info I will close out your bug. --------------- diff --git a/.github/ISSUE_TEMPLATE/request.md b/.github/ISSUE_TEMPLATE/request.md index eb47a9bb..0de43824 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: +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 install steps/docs: \ No newline at end of file From 9e842f3e83a19e43e94a139c6dd46f385fba1f7b Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 14 Aug 2019 11:10:40 -0400 Subject: [PATCH 272/393] remove old samp egg --- gta/samp/egg-sa-mp.json | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 gta/samp/egg-sa-mp.json diff --git a/gta/samp/egg-sa-mp.json b/gta/samp/egg-sa-mp.json deleted file mode 100644 index a3ff2f6b..00000000 --- a/gta/samp/egg-sa-mp.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2018-02-25T21:32:57+02:00", - "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: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}", - "startup": "{\r\n \"done\": \"Started server on port: \",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"samp.log\"\r\n}", - "stop": "^C" - }, - "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 -sSL -o samp.tar.gz http:\/\/files.sa-mp.com\/samp037svr_R2-1.tar.gz\r\n\r\nmkdir -p \/mnt\/server\r\ntar -xzvf samp.tar.gz -C \/mnt\/server\/\r\ncp -r \/mnt\/server\/samp03\/* \/mnt\/server\r\nrm -rf \/mnt\/server\/samp03\/\r\ncd \/mnt\/server\r\nsed -i '3d' \/mnt\/server\/server.cfg\r\necho \"rcon_password changemeplease\" >> \/mnt\/server\/server.cfg\r\n\r\nchown -R root:root \/mnt\r\n\r\nexport HOME=\/mnt\/server", - "container": "ubuntu:16.04", - "entrypoint": "bash" - } - }, - "variables": [] -} From 0c9541a4a958cf06c0c6893258f2a9cee1d6c68a Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 18 Aug 2019 09:32:38 -0400 Subject: [PATCH 273/393] update pocketmine mp Use the new php7.3 tar from the pmmp build server --- minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json b/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json index 613abb26..9989c575 100644 --- a/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json +++ b/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-10-27T22:53:48-04:00", + "exported_at": "2019-08-18T09:29:46-04: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 :)", @@ -17,8 +17,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n\r\napk add --no-cache curl\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"\\n downloading pocketmine MP build ${PMMP_VERSION}\"\r\nif [ -z \"$PMMP_VERSION\" ] || [ \"$PMMP_VERSION\" == \"latest\" ]; then\r\n curl -sSL -o PocketMine-MP.phar https:\/\/jenkins.pmmp.io\/job\/PocketMine-MP\/Stable\/artifact\/PocketMine-MP.phar\r\nelse \r\n curl -sSL -o PocketMine-MP.phar https:\/\/jenkins.pmmp.io\/job\/PocketMine-MP\/${PMMP_VERSION}\/artifact\/PocketMine-MP.phar\r\nfi\r\n\r\necho -e \"\\n downloading latest php7 build from pocketmine\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-7.2-Linux-x86_64\/lastSuccessfulBuild\/artifact\/PHP_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\/minecraft_bedrock\/pocketmine_mp\/server.properties > server.properties\r\necho -e \"\\n unpacking php7 binaries\"\r\ntar -xzvf php.binary.tar.gz\r\necho -e \"\\n removing pvp7 packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.tx banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs", - "container": "alpine:3.9", + "script": "#!\/bin\/ash\r\n\r\napk add --no-cache curl\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"\\n downloading pocketmine MP build ${PMMP_VERSION}\"\r\nif [ -z \"$PMMP_VERSION\" ] || [ \"$PMMP_VERSION\" == \"latest\" ]; then\r\n curl -sSL -o PocketMine-MP.phar https:\/\/jenkins.pmmp.io\/job\/PocketMine-MP\/Stable\/artifact\/PocketMine-MP.phar\r\nelse \r\n curl -sSL -o PocketMine-MP.phar https:\/\/jenkins.pmmp.io\/job\/PocketMine-MP\/${PMMP_VERSION}\/artifact\/PocketMine-MP.phar\r\nfi\r\n\r\necho -e \"\\n downloading latest php7.3 build from pocketmine\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-7.3-Linux-x86_64\/lastSuccessfulBuild\/artifact\/PHP_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\/Minecraft%20PE\/PocketmineMP\/server.properties > server.properties\r\necho -e \"\\n unpacking php7 binaries\"\r\ntar -xzvf php.binary.tar.gz\r\necho -e \"\\n removing pvp7 packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.tx banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs", + "container": "alpine:3.10", "entrypoint": "ash" } }, @@ -33,4 +33,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From c330d3d21ca2b23563d718302964ee8dd9f85627 Mon Sep 17 00:00:00 2001 From: DomiiBunn <51760394+DomiiBunn@users.noreply.github.com> Date: Sun, 18 Aug 2019 21:06:15 +0200 Subject: [PATCH 274/393] Quick Fix for "Server Password" var. Removed the server password variable as the parser was not able to parse an empty string for the password. --- factorio/factorio/egg-factorio.json | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/factorio/factorio/egg-factorio.json b/factorio/factorio/egg-factorio.json index e5017803..34201ede 100644 --- a/factorio/factorio/egg-factorio.json +++ b/factorio/factorio/egg-factorio.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-02-26T21:01:31-05:00", + "exported_at": "2019-08-18T21:02:25+02: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:glibc", "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 \"game_password\": \"{{server.build.env.SERVER_PASS}}\",\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}", + "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}", "stop": "\/quit" @@ -112,15 +112,6 @@ "user_viewable": 1, "user_editable": 1, "rules": "required|numeric|digits_between:1,3" - }, - { - "name": "Server Password", - "description": "Password to join the server, \"\" is none", - "env_variable": "SERVER_PASS", - "default_value": "\"\"", - "user_viewable": 1, - "user_editable": 1, - "rules": "nullable|string|max:30" } ] } From f637460aeac14082d7e750e51b669c6f8578c156 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 25 Aug 2019 00:23:17 -0400 Subject: [PATCH 275/393] update to use the forge version json This uses the forge version json to get the latest version information from forge directly. --- .../forge-generic/egg-forge-enhanced.json | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/minecraft_java/forge/forge-generic/egg-forge-enhanced.json b/minecraft_java/forge/forge-generic/egg-forge-enhanced.json index 3c47856e..06ce8b5c 100644 --- a/minecraft_java/forge/forge-generic/egg-forge-enhanced.json +++ b/minecraft_java/forge/forge-generic/egg-forge-enhanced.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-07-12T16:29:11-04:00", + "exported_at": "2019-08-25T00:22:02-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.", @@ -17,8 +17,8 @@ }, "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\r\n\r\n#Fetching version\r\nif [ -z \"${MC_VERSION}\" ] || [ \"${MC_VERSION}\" == \"latest\" ]; then\r\n echo \"Fetching latest\"\r\n FORGE_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index.html | grep -A 2 \"Latest\" | awk NF=NF RS= OFS=\" \" | grep -o -e '[1]\\.[0-9][0-9]\\?\\.\\?[0-9]\\?[0-9] - [0-9][0-9]\\.[0-9][0-9]\\.[0-9]\\?[0-9]\\.[0-9][0-9][0-9][0-9]' | sed 's\/ \/\/g')\r\nelif [[ ! \"${MC_VERSION}\" =~ - ]]; then\r\n echo \"Fetching latest from version $MC_VERSION\"\r\n FORGE_VERSION=$(curl -sl https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index_${MC_VERSION}.html | grep -A 2 \"Latest\" | awk NF=NF RS= OFS=\" \" | grep -o -e '[1]\\.[0-9][0-9]\\?\\.\\?[0-9]\\?[0-9] - [0-9][0-9]\\.[0-9][0-9]\\.[0-9]\\?[0-9]\\.[0-9][0-9][0-9][0-9]' | sed 's\/ \/\/g')\r\nfi\r\n\r\nif [ -z ${MC_VERSION} ]; then\r\n echo -e \"\"\r\nelse\r\n if [ ${MC_VERSION} == \"1.7.10\" ] || [ ${MC_VERSION} == \"1.8.9\" ]; then\r\n echo -e \"correcting forge version to ${FORGE_VERSION}-${MC_VERSION}\"\r\n\t FORGE_VERSION=\"${FORGE_VERSION}-${MC_VERSION}\"\r\n fi\r\nfi\r\n\r\n#Checking if forge version valid\r\nif [[ ! \"$FORGE_VERSION\" =~ [0-9]?[0-9]?\\.[0-9]?[0-9]?\\.?[0-9]?[0-9]-[0-9]?[0-9]\\.[0-9]?[0-9]\\.[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]?[0-9] ]]; then\r\n echo \"!!! Invalid forge version \\\"$FORGE_VERSION\\\" !!!\"\r\n exit\r\nfi\r\n\r\n#Go into main direction\r\ncd \/mnt\/server\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\ncurl -o installer.jar -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/${FORGE_VERSION}\/forge-${FORGE_VERSION}-installer.jar\r\ncurl -o $SERVER_JARFILE -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/${FORGE_VERSION}\/forge-${FORGE_VERSION}-universal.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ] || [ ! -f .\/$SERVER_JARFILE ]; 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\r\n\r\n#Deleting installer.jar\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar", - "container": "openjdk:8", + "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\necho -e \"minecraft version: ${MC_VERSION}\"\r\necho -e \"build type: ${BUILD_TYPE}\"\r\n\r\nif [ \"$MC_VERSION\" == \"latest\" ]; then\r\n echo -e \"getting latest recommended version of forge.\"\r\n LATEST_RECOMMENDED=$(curl -s https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json | jq -r '.promos.recommended')\r\n MC_VERSION=$(curl -s https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json | jq --arg LATEST \"$LATEST_RECOMMENDED\" '.promos | to_entries[] | select(.value==$LATEST)' | jq -rs '.[0].key' | sed 's\/-recommended\/\/g')\r\n\tBUILD_TYPE=recommended\r\n\t\r\n\techo -e \"minecraft version: ${MC_VERSION}\"\r\n\techo -e \"build type: ${BUILD_TYPE}\"\r\nfi\r\n\r\n## some variables for getting versions and things\r\nFILE_SITE=$(curl -s https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json | jq -r '.homepage')\r\nVERSION_KEY=$(curl -s https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json | jq -r --arg MC_VERSION \"$MC_VERSION\" --arg BUILD_TYPE \"$BUILD_TYPE\" '.promos | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n## locating the forge version\r\nif [ \"${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=$(curl -s https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json | jq -r --arg MC_VERSION \"$MC_VERSION\" '.promos | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"latest\"))')\r\nfi\r\n\r\n## Error if the mc version set wasn't valid.\r\nif [ \"${VERSION_KEY}\" == \"\" ]; 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\nfi\r\n\r\nFORGE_VERSION=$(curl -s https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\nif [ \"$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\nelse\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\nfi\r\n\r\n#Go into main direction\r\ncd \/mnt\/server\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\ncurl -s -o installer.jar -sS ${DOWNLOAD_LINK}-installer.jar\r\ncurl -s -o $SERVER_JARFILE -sS ${DOWNLOAD_LINK}-universal.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ] || [ ! -f .\/$SERVER_JARFILE ]; 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\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" } }, @@ -34,12 +34,21 @@ }, { "name": "Forge version", - "description": "The version of forge that you want to run.\r\nExamples:\r\n- 1.12.2\r\n- 1.12.2-14.23.5.2810", + "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": 1, "user_editable": 1, - "rules": "required|string|max:22" + "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": 1, + "user_editable": 1, + "rules": "required|string|max:20" } ] } \ No newline at end of file From 45a3b568207d12386ca502a3dbfbbb43bc78b5ae Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Fri, 30 Aug 2019 20:28:46 -0400 Subject: [PATCH 276/393] update 7dtd egg fix the bad parser. --- source_servers/7_days_to_die/egg-7-days-to-die.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source_servers/7_days_to_die/egg-7-days-to-die.json b/source_servers/7_days_to_die/egg-7-days-to-die.json index dc2f7642..9cbe9056 100644 --- a/source_servers/7_days_to_die/egg-7-days-to-die.json +++ b/source_servers/7_days_to_die/egg-7-days-to-die.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-08-12T22:06:45-04:00", + "exported_at": "2019-08-30T20:28:24-04: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", "startup": "'.\/7DaysToDieServer.x86_64 -configfile=serverconfig.xml -quit -batchmode -nographics -dedicated -ServerPort=${{server.build.default.port}} -ServerMaxPlayerCount=${{server.build.env.MAX_PLAYERS}} -GameDifficulty=${{server.build.env.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": "{\r\n \"serverconfig.xml\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"ServerPort\": \" \"\r\n }\r\n }\r\n}", "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}", "stop": "shutdown" From 9a6fac26e4a514c9b332216cbc184127ff20d315 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Fri, 30 Aug 2019 20:43:24 -0400 Subject: [PATCH 277/393] update start command No longer need to edit the config as we set the port on startup --- source_servers/7_days_to_die/egg-7-days-to-die.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source_servers/7_days_to_die/egg-7-days-to-die.json b/source_servers/7_days_to_die/egg-7-days-to-die.json index 9cbe9056..3a1d4165 100644 --- a/source_servers/7_days_to_die/egg-7-days-to-die.json +++ b/source_servers/7_days_to_die/egg-7-days-to-die.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-08-30T20:28:24-04:00", + "exported_at": "2019-08-30T20:42:59-04: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", - "startup": "'.\/7DaysToDieServer.x86_64 -configfile=serverconfig.xml -quit -batchmode -nographics -dedicated -ServerPort=${{server.build.default.port}} -ServerMaxPlayerCount=${{server.build.env.MAX_PLAYERS}} -GameDifficulty=${{server.build.env.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 \"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": "{\r\n \"serverconfig.xml\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"ServerPort\": \" \"\r\n }\r\n }\r\n}", + "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}", "stop": "shutdown" From 0efd53bda9de7a0df73de658004ac796710621ae Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Wed, 4 Sep 2019 17:11:14 -0400 Subject: [PATCH 278/393] update ragemp images move to the debian:stable-slim image to run the install. move to the base_debian image to run the server. this should resolve #290 --- gta/ragemp/egg-rage--m-p.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gta/ragemp/egg-rage--m-p.json b/gta/ragemp/egg-rage--m-p.json index 4e9b11bc..0d340205 100644 --- a/gta/ragemp/egg-rage--m-p.json +++ b/gta/ragemp/egg-rage--m-p.json @@ -3,11 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-11-18T22:56:21-05:00", + "exported_at": "2019-09-04T17:08:39-04:00", "name": "Rage.MP", "author": "noreply.waypointhosting@gmail.com", "description": "https:\/\/rage.mp\/\r\n\r\nThis server requires 2 ports to be added for the server. the main port and the next (port+1) as ports for the server.", - "image": "quay.io\/pterodactyl\/core:glibc", + "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", "startup": ".\/server", "config": { "files": "{\r\n \"conf.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"bind\": \"0.0.0.0\",\r\n \"port\": \"{{server.build.default.port}}\",\r\n \"name\": \"{{server.build.env.SERVER_NAME}}\",\r\n \"maxplayers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"announce\": \"{{server.build.env.ANNOUNCE}}\"\r\n }\r\n }\r\n}", @@ -17,8 +17,8 @@ }, "scripts": { "installation": { - "script": "apt update\r\napt -y install curl tar libstdc++6\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading rage.mp\"\r\ncurl -sSL -o ragemp-srv.tar.gz https:\/\/cdn.rage.mp\/lin\/ragemp-srv.tar.gz\r\n\r\ntar -xzvf ragemp-srv.tar.gz --strip 1 -C \/mnt\/server\r\n\r\nrm ragemp-srv.tar.gz\r\n\r\nchmod +x .\/server\r\n\r\nif [ -e conf.json ]; then\r\n echo \"server config file exists\"\r\nelse\r\n echo \"Downloading default rage.mp config\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/gta\/ragemp\/conf.json >> conf.json\r\nfi\r\n\r\necho \"install complete\"\r\n\r\nexit 0", - "container": "ubuntu:16.04", + "script": "apt update\r\napt -y install curl tar\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading rage.mp\"\r\ncurl -sSL -o ragemp-srv.tar.gz https:\/\/cdn.rage.mp\/lin\/ragemp-srv.tar.gz\r\n\r\ntar -xzvf ragemp-srv.tar.gz --strip 1 -C \/mnt\/server\r\n\r\nrm ragemp-srv.tar.gz\r\n\r\nchmod +x .\/server\r\n\r\nif [ -e conf.json ]; then\r\n echo \"server config file exists\"\r\nelse\r\n echo \"Downloading default rage.mp config\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/GTA\/RageMP\/conf.json >> conf.json\r\nfi\r\n\r\necho \"install complete\"\r\n\r\nexit 0", + "container": "debian:stable-slim", "entrypoint": "bash" } }, @@ -45,10 +45,10 @@ "name": "Announce", "description": "Announce to the master server so people can see you in their server browser.", "env_variable": "ANNOUNCE", - "default_value": "true", + "default_value": "0", "user_viewable": 1, "user_editable": 1, "rules": "required|boolean" } ] -} +} \ No newline at end of file From d22bf8051c989a60cea489cc4ba23f1f69d3fda7 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Wed, 4 Sep 2019 17:32:04 -0400 Subject: [PATCH 279/393] add note for boolean fields --- gta/ragemp/egg-rage--m-p.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gta/ragemp/egg-rage--m-p.json b/gta/ragemp/egg-rage--m-p.json index 0d340205..4c9ea78a 100644 --- a/gta/ragemp/egg-rage--m-p.json +++ b/gta/ragemp/egg-rage--m-p.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-09-04T17:08:39-04:00", + "exported_at": "2019-09-04T17:31:10-04:00", "name": "Rage.MP", "author": "noreply.waypointhosting@gmail.com", "description": "https:\/\/rage.mp\/\r\n\r\nThis server requires 2 ports to be added for the server. the main port and the next (port+1) as ports for the server.", @@ -43,7 +43,7 @@ }, { "name": "Announce", - "description": "Announce to the master server so people can see you in their server browser.", + "description": "Announce to the master server so people can see you in their server browser.\r\n\r\nThis needs to be a 0 (false) or 1 (true) due to weird boolean parsing.", "env_variable": "ANNOUNCE", "default_value": "0", "user_viewable": 1, From 1cbd69613b3740841a429a0109bfed091282bf54 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sat, 7 Sep 2019 20:10:33 -0400 Subject: [PATCH 280/393] update mordhau egg to use new image --- source_servers/mordhau/egg-mordhau.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source_servers/mordhau/egg-mordhau.json b/source_servers/mordhau/egg-mordhau.json index efd7d9b6..f923995e 100644 --- a/source_servers/mordhau/egg-mordhau.json +++ b/source_servers/mordhau/egg-mordhau.json @@ -3,11 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-05-09T22:22:13-05:00", + "exported_at": "2019-09-07T20:08:55-04:00", "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.", - "image": "chasx003\/mordhau", + "image": "quay.io\/parkervcp\/pterodactyl-images:game_mordhau", "startup": ".\/MordhauServer.sh \/Game\/Mordhau\/Maps\/{{DEFAULT_MAP}}?MaxSlots={{MAX_PLAYERS}}? -USEALLAVAILABLECORES -Port={{SERVER_PORT}} -queryport={{QUERY_PORT}} -beaconport={{BEACON_PORT}}", "config": { "files": "{\r\n \"Mordhau\/Saved\/Config\/LinuxServer\/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}", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Mordhau 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 \/mnt\/server\/logs\r\n\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.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 629800 +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", + "script": "#!\/bin\/bash\r\n# Mordhau Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\n\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\n\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\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\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 629800 +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\n\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", "container": "ubuntu:18.04", "entrypoint": "bash" } @@ -96,4 +96,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From 1960182c4fc838e9763d05001844609163426a50 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 11 Sep 2019 10:37:25 -0400 Subject: [PATCH 281/393] update install script and readme update install script to use DOWNLOAD_URL update the readme to have a notice due to fivem changes --- gta/fivem/README.md | 8 ++++++++ gta/fivem/egg-five-m.json | 19 ++++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/gta/fivem/README.md b/gta/fivem/README.md index a90c6d7e..69dd4670 100644 --- a/gta/fivem/README.md +++ b/gta/fivem/README.md @@ -1,5 +1,13 @@ # FiveM +# Notice + +This is to inform all users that the4 fivem team has enabled cloudflare ddos protection and the install script is now broken due to this. + +You will need to have a self hosted version of the server files to curl in the install script. + +I have added a `DOWNLOAD_URL` variable that needs to point to a `fx.tar.xz` file as I am too lazy to update the entire script. + ### 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. diff --git a/gta/fivem/egg-five-m.json b/gta/fivem/egg-five-m.json index 88584452..021533fe 100644 --- a/gta/fivem/egg-five-m.json +++ b/gta/fivem/egg-five-m.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-07-13T15:13:03-04:00", + "exported_at": "2019-09-11T10:35:51-04:00", "name": "FiveM", "author": "parker@parkervcp.com", "description": "A new FiveM egg for the latest builds due to recent changes in FiveM", @@ -17,8 +17,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash \r\n\r\napk add openssl tar xz curl wget git --no-cache\r\n\r\ncd \/mnt\/server\r\n\r\nmkdir resources\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\ncd \/mnt\/server\r\n\r\necho -e \"pulling files from https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${FIVEM_VERSION}\/fx.tar.xz\"\r\nwget https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${FIVEM_VERSION}\/fx.tar.xz\r\n\r\necho \"Extracting fivem files\"\r\n\r\ntar xf fx.tar.xz\r\n\r\nrm -rf fx.tar.xz 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\/gta\/fivem\/server.cfg >> server.cfg\r\nfi\r\n\r\nmkdir logs\/\r\n\r\necho \"install complete\"", - "container": "alpine:3.9", + "script": "#!\/bin\/ash \r\n\r\napk add openssl tar xz curl wget git --no-cache\r\n\r\ncd \/mnt\/server\r\n\r\nmkdir resources\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\ncd \/mnt\/server\r\n\r\necho -e \"pulling files from ${DOWNLOAD_URL}\"\r\nwget ${DOWNLOAD_URL}\r\n\r\necho \"Extracting fivem files\"\r\n\r\ntar xf fx.tar.xz\r\n\r\nrm -rf fx.tar.xz 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\/gta\/fivem\/server.cfg >> server.cfg\r\nfi\r\n\r\nmkdir logs\/\r\n\r\necho \"install complete\"", + "container": "alpine:3.10", "entrypoint": "ash" } }, @@ -36,10 +36,10 @@ "name": "Max Players", "description": "Set the fivem max play count", "env_variable": "MAX_PLAYERS", - "default_value": "30", + "default_value": "32", "user_viewable": 1, "user_editable": 0, - "rules": "required|integer|between:1,31" + "rules": "required|integer|between:1,32" }, { "name": "Server Hostname", @@ -58,6 +58,15 @@ "user_viewable": 1, "user_editable": 0, "rules": "required|string|max:50" + }, + { + "name": "Download Link", + "description": "This is the link to download fivem from.\r\n\r\nThis is only used in the install script.", + "env_variable": "DOWNLOAD_URL", + "default_value": "", + "user_viewable": 0, + "user_editable": 0, + "rules": "required|string" } ] } \ No newline at end of file From 3b8575a0f77f230e631206e982d054771e88c349 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Wed, 11 Sep 2019 18:25:33 -0400 Subject: [PATCH 282/393] update readme Added recommended server settings section --- source_servers/ark_survival_evolved/README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/source_servers/ark_survival_evolved/README.md b/source_servers/ark_survival_evolved/README.md index 1546d680..094dc5d6 100644 --- a/source_servers/ark_survival_evolved/README.md +++ b/source_servers/ark_survival_evolved/README.md @@ -2,7 +2,13 @@ Steam Description : As a man or woman stranded naked, freezing and starving on the shores of a mysterious island called ARK, you must hunt, harvest resources, craft items, grow crops, research technologies, and build shelters to withstand the elements. Use your cunning and resources to kill or tame & breed the leviathan dinosaurs and other primeval creatures roaming the land, and team up with or prey on hundreds of other players to survive, dominate... and escape! -### Server Ports +## Recommended server settings +### Minimum RAM +This server requires about 4096M to run with no players. It is recommended to run 6144M by the ARK creators. + +See the following - https://ark.gamepedia.com/Dedicated_Server_Setup#Hardware + +## Server Ports | Port | default | |-------|---------| From 575fba303deb0b9763a23bcd501a076e326e0be0 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Wed, 11 Sep 2019 20:42:24 -0400 Subject: [PATCH 283/393] update folder names for steamcmd Rename source_servers to steamcmd_servers Rename rust-staging to rust_staging Add a README for steamcmd server section Update main README with new links. --- README.md | 18 +++++++------- .../7_days_to_die/README.md | 0 .../7_days_to_die/egg-7-days-to-die.json | 0 steamcmd_servers/README.md | 24 +++++++++++++++++++ .../ark_survival_evolved/README.md | 0 .../egg-ark--survival-evolved.json | 0 .../hlds_server/README.md | 0 .../egg-custom-h-l-d-s-engine-game.json | 0 .../mordhau/README.md | 0 .../mordhau/egg-mordhau.json | 0 .../pixark/README.md | 0 .../pixark/egg-pix-a-r-k.json | 0 .../rust_staging}/README.md | 0 .../rust_staging}/egg-rust-staging.json | 0 .../starbound/README.md | 0 .../starbound/egg-starbound.json | 0 .../svencoop/README.md | 0 .../svencoop/egg-sven-co-op.json | 0 18 files changed, 33 insertions(+), 9 deletions(-) rename {source_servers => steamcmd_servers}/7_days_to_die/README.md (100%) rename {source_servers => steamcmd_servers}/7_days_to_die/egg-7-days-to-die.json (100%) create mode 100644 steamcmd_servers/README.md rename {source_servers => steamcmd_servers}/ark_survival_evolved/README.md (100%) rename {source_servers => steamcmd_servers}/ark_survival_evolved/egg-ark--survival-evolved.json (100%) rename {source_servers => steamcmd_servers}/hlds_server/README.md (100%) rename {source_servers => steamcmd_servers}/hlds_server/egg-custom-h-l-d-s-engine-game.json (100%) rename {source_servers => steamcmd_servers}/mordhau/README.md (100%) rename {source_servers => steamcmd_servers}/mordhau/egg-mordhau.json (100%) rename {source_servers => steamcmd_servers}/pixark/README.md (100%) rename {source_servers => steamcmd_servers}/pixark/egg-pix-a-r-k.json (100%) rename {source_servers/rust-staging => steamcmd_servers/rust_staging}/README.md (100%) rename {source_servers/rust-staging => steamcmd_servers/rust_staging}/egg-rust-staging.json (100%) rename {source_servers => steamcmd_servers}/starbound/README.md (100%) rename {source_servers => steamcmd_servers}/starbound/egg-starbound.json (100%) rename {source_servers => steamcmd_servers}/svencoop/README.md (100%) rename {source_servers => steamcmd_servers}/svencoop/egg-sven-co-op.json (100%) diff --git a/README.md b/README.md index f259b6fb..2ee7c838 100644 --- a/README.md +++ b/README.md @@ -83,15 +83,15 @@ If you are reading this it looks like you are looking to add an egg to your serv [OpenTTD](/openttd/) -[Source](/source_servers/) These eggs use steamcmd to install -* [7 Days to Die](/source_servers/7_days_to_die/) -* [ARK Survival Evolved](/source_servers/ark_survival_evolved/) -* [HLDS server](/source_servers/hlds_server) -* [PixARK](/source_servers/pixark/) -* [Rust Staging Branch](/source_servers/rust-staging/) -* [Starbound](/source_servers/starbound) -* [Sven Co-op](/source_servers/svencoop) -* [Mordhau](/source_servers/mordhau) +[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/) +* [HLDS server](/steamcmd_servers/hlds_server) +* [PixARK](/steamcmd_servers/pixark/) +* [Rust Staging Branch](/steamcmd_servers/rust_staging/) +* [Starbound](/steamcmd_servers/starbound) +* [Sven Co-op](/steamcmd_servers/svencoop) +* [Mordhau](/steamcmd_servers/mordhau) [Squad](/squad/) diff --git a/source_servers/7_days_to_die/README.md b/steamcmd_servers/7_days_to_die/README.md similarity index 100% rename from source_servers/7_days_to_die/README.md rename to steamcmd_servers/7_days_to_die/README.md diff --git a/source_servers/7_days_to_die/egg-7-days-to-die.json b/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json similarity index 100% rename from source_servers/7_days_to_die/egg-7-days-to-die.json rename to steamcmd_servers/7_days_to_die/egg-7-days-to-die.json diff --git a/steamcmd_servers/README.md b/steamcmd_servers/README.md new file mode 100644 index 00000000..a0b70ee8 --- /dev/null +++ b/steamcmd_servers/README.md @@ -0,0 +1,24 @@ +# steamcmd servers + +This is a collection of servers that use steamcmd to install. + +## 7 Days To Die +[7dtd](7_days_to_die/) + +## ARK +[ark](ark_survival_evolved/) + +## HLDS Server +[hlds](hlds_server/) + +## Mordhau +[mordhau](mordhau/) + +## Rust Staging +[rust staging](rust_staging/) + +## Starbound +[starbound](starbound/) + +## Sven coop +[svencoop](svencoop) \ No newline at end of file diff --git a/source_servers/ark_survival_evolved/README.md b/steamcmd_servers/ark_survival_evolved/README.md similarity index 100% rename from source_servers/ark_survival_evolved/README.md rename to steamcmd_servers/ark_survival_evolved/README.md diff --git a/source_servers/ark_survival_evolved/egg-ark--survival-evolved.json b/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json similarity index 100% rename from source_servers/ark_survival_evolved/egg-ark--survival-evolved.json rename to steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json diff --git a/source_servers/hlds_server/README.md b/steamcmd_servers/hlds_server/README.md similarity index 100% rename from source_servers/hlds_server/README.md rename to steamcmd_servers/hlds_server/README.md diff --git a/source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json b/steamcmd_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json similarity index 100% rename from source_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json rename to steamcmd_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json diff --git a/source_servers/mordhau/README.md b/steamcmd_servers/mordhau/README.md similarity index 100% rename from source_servers/mordhau/README.md rename to steamcmd_servers/mordhau/README.md diff --git a/source_servers/mordhau/egg-mordhau.json b/steamcmd_servers/mordhau/egg-mordhau.json similarity index 100% rename from source_servers/mordhau/egg-mordhau.json rename to steamcmd_servers/mordhau/egg-mordhau.json diff --git a/source_servers/pixark/README.md b/steamcmd_servers/pixark/README.md similarity index 100% rename from source_servers/pixark/README.md rename to steamcmd_servers/pixark/README.md diff --git a/source_servers/pixark/egg-pix-a-r-k.json b/steamcmd_servers/pixark/egg-pix-a-r-k.json similarity index 100% rename from source_servers/pixark/egg-pix-a-r-k.json rename to steamcmd_servers/pixark/egg-pix-a-r-k.json diff --git a/source_servers/rust-staging/README.md b/steamcmd_servers/rust_staging/README.md similarity index 100% rename from source_servers/rust-staging/README.md rename to steamcmd_servers/rust_staging/README.md diff --git a/source_servers/rust-staging/egg-rust-staging.json b/steamcmd_servers/rust_staging/egg-rust-staging.json similarity index 100% rename from source_servers/rust-staging/egg-rust-staging.json rename to steamcmd_servers/rust_staging/egg-rust-staging.json diff --git a/source_servers/starbound/README.md b/steamcmd_servers/starbound/README.md similarity index 100% rename from source_servers/starbound/README.md rename to steamcmd_servers/starbound/README.md diff --git a/source_servers/starbound/egg-starbound.json b/steamcmd_servers/starbound/egg-starbound.json similarity index 100% rename from source_servers/starbound/egg-starbound.json rename to steamcmd_servers/starbound/egg-starbound.json diff --git a/source_servers/svencoop/README.md b/steamcmd_servers/svencoop/README.md similarity index 100% rename from source_servers/svencoop/README.md rename to steamcmd_servers/svencoop/README.md diff --git a/source_servers/svencoop/egg-sven-co-op.json b/steamcmd_servers/svencoop/egg-sven-co-op.json similarity index 100% rename from source_servers/svencoop/egg-sven-co-op.json rename to steamcmd_servers/svencoop/egg-sven-co-op.json From aaf8f67ca5d3258a7f911100aac1de2becfa7674 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Fri, 13 Sep 2019 20:12:51 -0400 Subject: [PATCH 284/393] move spigot location moving spigot files up one folder level. --- minecraft_java/spigot/{spigot => }/README.MD | 0 minecraft_java/spigot/{spigot => }/egg-spigot.json | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename minecraft_java/spigot/{spigot => }/README.MD (100%) rename minecraft_java/spigot/{spigot => }/egg-spigot.json (100%) diff --git a/minecraft_java/spigot/spigot/README.MD b/minecraft_java/spigot/README.MD similarity index 100% rename from minecraft_java/spigot/spigot/README.MD rename to minecraft_java/spigot/README.MD diff --git a/minecraft_java/spigot/spigot/egg-spigot.json b/minecraft_java/spigot/egg-spigot.json similarity index 100% rename from minecraft_java/spigot/spigot/egg-spigot.json rename to minecraft_java/spigot/egg-spigot.json From 7f0fda3a34103597172f1738e88455666d8c9f55 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Fri, 13 Sep 2019 20:48:39 -0400 Subject: [PATCH 285/393] add spongeforge adds spongeforge to the repo resolves #213 --- minecraft_java/spongeforge/README.MD | 9 ++++ .../spongeforge/egg-sponge-forge.json | 45 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 minecraft_java/spongeforge/README.MD create mode 100644 minecraft_java/spongeforge/egg-sponge-forge.json diff --git a/minecraft_java/spongeforge/README.MD b/minecraft_java/spongeforge/README.MD new file mode 100644 index 00000000..685f7f66 --- /dev/null +++ b/minecraft_java/spongeforge/README.MD @@ -0,0 +1,9 @@ +# SpongeForge +SpongeForge is the implementation of the Sponge API on the Minecraft Forge platform. + +## Server Ports +Minecraft servers 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/minecraft_java/spongeforge/egg-sponge-forge.json b/minecraft_java/spongeforge/egg-sponge-forge.json new file mode 100644 index 00000000..bf83b774 --- /dev/null +++ b/minecraft_java/spongeforge/egg-sponge-forge.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-09-13T20:47:26-04:00", + "name": "SpongeForge", + "author": "parker@parkervcp.com", + "description": "A community-driven open source Minecraft: Java Edition modding platform.", + "image": "quay.io\/pterodactyl\/core:java", + "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 \"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": "{}", + "stop": "stop" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# SpongeForge 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\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\r\nif [ -z ${SF_VERSION} ] || [ \"$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/${SF_VERSION})\" == \"Unknown version\" ]; then\r\n echo -e \"defaulting to recommended\"\r\n SF_VERSION=\"recommended\"\r\nfi\r\n\r\nif [ \"${SF_VERSION}\" == \"recommended\" ]; then\r\n echo -e \"using recommended SpongeForge version\"\r\n SF_VERSION=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/recommended | jq -r '.version')\r\n echo -e \"found SpongeForge Version ${SF_VERSION}\"\r\n SF_DL_LINK=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/recommended | jq -r '.artifacts.\"\".url')\r\n FORGE_DOWNLOAD_VERSION=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/recommended | jq -r '.dependencies.forge')\r\n echo -e \"found Forge Version ${FORGE_DOWNLOAD_VERSION}\"\r\n FORGE_DL_LINK=https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/${FORGE_DOWNLOAD_VERSION}\/forge-${FORGE_DOWNLOAD_VERSION}\r\nelif [ \"${SF_VERSION}\" == \"latest\" ]; then\r\n echo -e \"using latest SpongForge version\"\r\n SF_VERSION=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge | jq -r '.buildTypes.stable.latest.version')\r\n echo -e \"found SpongeForge Version ${SF_VERSION}\"\r\n SF_DL_LINK=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/${SF_VERSION} | jq -r '.artifacts.\"\".url')\r\n FORGE_DOWNLOAD_VERSION=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/${SF_VERSION} | jq -r '.dependencies.forge')\r\n \r\n FORGE_DL_LINK=https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/${FORGE_DOWNLOAD_VERSION}\/forge-${FORGE_DOWNLOAD_VERSION}\r\nelse\r\n echo -e \"found SpongeForge Version ${SF_VERSION}\"\r\n SF_DL_LINK=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/${SF_VERSION} | jq -r '.artifacts.\"\".url')\r\n FORGE_DOWNLOAD_VERSION=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/${SF_VERSION} | jq -r '.dependencies.forge')\r\n echo -e \"found Forge Version ${FORGE_DOWNLOAD_VERSION}\"\r\n FORGE_DL_LINK=https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/${FORGE_DOWNLOAD_VERSION}\/forge-${FORGE_DOWNLOAD_VERSION}\r\nfi\r\n\r\nif [ -f server.jar ] && [ $(sha1sum server.jar | awk '{ print $1 }') == $(curl -s ${FORGE_DL_LINK}-universal.jar.sha1) ]; then\r\n echo -e \"Already have the correct forge version\"\r\nelse\r\n echo -e \"Downloading forge version ${FORGE_VERSION}\"\r\n echo -e \"running: curl -s -o installer.jar -o ${FORGE_DL_LINK}-installer.jar\"\r\n curl -s -o installer.jar ${FORGE_DL_LINK}-installer.jar\r\n echo -e \"running: curl -s -o ${SERVER_JARFILE} -o ${FORGE_DL_LINK}-universal.jar\"\r\n curl -s -o ${SERVER_JARFILE} ${FORGE_DL_LINK}-universal.jar\r\n java -jar installer.jar --installServer\r\n rm installer.jar forge-${FORGE_DOWNLOAD_VERSION}-universal.jar\r\nfi\r\n\r\nif [ ! -d \/mnt\/server\/mods\/ ]; then\r\n echo -e \"making mods directory\"\r\n mkdir -p \/mnt\/server\/mods\/\r\nfi\r\n\r\nif [ -f \/mnt\/server\/mods\/spongeforge*.jar ]; then\r\n mkdir -p \/mnt\/server\/mods\/old\/\r\n mv -f \/mnt\/server\/mods\/spongeforge*.jar \/mnt\/server\/mods\/old\/spongeforge*.jar\r\nfi \r\n\r\necho -e \"running: curl -s ${SF_DL_LINK} -o \/mnt\/server\/mods\/spongeforge-${SF_VERSION}.jar\"\r\ncurl -s ${SF_DL_LINK} -o \/mnt\/server\/mods\/spongeforge-${SF_VERSION}.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\/minecraft_java\/server.properties\r\nfi\r\n\r\necho -e \"Install for SpongeForge is complete\"", + "container": "openjdk:8-jre-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "SpongeForge Version", + "description": "Example 1.12.2-2825-7.1.6\r\n\r\nIf the version fails it defaults to recommended", + "env_variable": "SF_VERSION", + "default_value": "recommended", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string" + }, + { + "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": 1, + "user_editable": 1, + "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" + } + ] +} \ No newline at end of file From 03f14a3fd8d199110c4b5f6a0a2df30bc85ba70b Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Fri, 13 Sep 2019 20:50:16 -0400 Subject: [PATCH 286/393] update main readme forgot to do this --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2ee7c838..3ab928e9 100644 --- a/README.md +++ b/README.md @@ -69,8 +69,9 @@ If you are reading this it looks like you are looking to add an egg to your serv [Minecraft Java](/minecraft_java/) * [Forge](/minecraft_java/forge/) * [Feed The Beast](/minecraft_java/ftb/) -* [Spigot](/minecraft_java/spigot/) * [Paper](/minecraft_java/paper) +* [Spigot](/minecraft_java/spigot/) +* [spongeforge](/minecraft_java/spongeforge/) * [Technic](/minecraft_java/technic/) * [VanillaCord](/minecraft_java/vanillacord/) From 25c022fa1ccc491c0aebbb65d3feb68ecb5e356a Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Fri, 13 Sep 2019 21:19:51 -0400 Subject: [PATCH 287/393] add spongevanilla This will probably replace the main SpongeVanilla egg in the panel --- README.md | 3 +- minecraft_java/README.md | 11 +++-- minecraft_java/spongevanilla/README.MD | 10 +++++ .../spongevanilla/egg-sponge-vanilla.json | 45 +++++++++++++++++++ 4 files changed, 65 insertions(+), 4 deletions(-) create mode 100644 minecraft_java/spongevanilla/README.MD create mode 100644 minecraft_java/spongevanilla/egg-sponge-vanilla.json diff --git a/README.md b/README.md index 2ee7c838..a9807274 100644 --- a/README.md +++ b/README.md @@ -69,8 +69,9 @@ If you are reading this it looks like you are looking to add an egg to your serv [Minecraft Java](/minecraft_java/) * [Forge](/minecraft_java/forge/) * [Feed The Beast](/minecraft_java/ftb/) -* [Spigot](/minecraft_java/spigot/) * [Paper](/minecraft_java/paper) +* [Spigot](/minecraft_java/spigot/) +* [SpongeVanilla](/minecraft_java/spongevanilla/) * [Technic](/minecraft_java/technic/) * [VanillaCord](/minecraft_java/vanillacord/) diff --git a/minecraft_java/README.md b/minecraft_java/README.md index 0302be2e..38fd583f 100644 --- a/minecraft_java/README.md +++ b/minecraft_java/README.md @@ -28,6 +28,9 @@ Revelation is a general all-purpose modpack with optimal FPS, server performance ## Paper Currently the default on pterodactyl for many reasons. First being that you don't need to build the jar. +[PaperMC GitHub](https://github.com/PaperMC/Paper) +High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies + ## Spigot A collection of spigot and forked spigot eggs. @@ -35,10 +38,12 @@ A collection of spigot and forked spigot eggs. 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) -[PaperMC GitHub](https://github.com/PaperMC/Paper) -High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies +## Sponge -#### Technic Packs +[SpongeVanilla](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! diff --git a/minecraft_java/spongevanilla/README.MD b/minecraft_java/spongevanilla/README.MD new file mode 100644 index 00000000..611b3648 --- /dev/null +++ b/minecraft_java/spongevanilla/README.MD @@ -0,0 +1,10 @@ +# 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. + + +| Port | default | +|-------|---------| +| Game | 25565 | \ No newline at end of file diff --git a/minecraft_java/spongevanilla/egg-sponge-vanilla.json b/minecraft_java/spongevanilla/egg-sponge-vanilla.json new file mode 100644 index 00000000..3b129848 --- /dev/null +++ b/minecraft_java/spongevanilla/egg-sponge-vanilla.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-09-13T21:18:48-04:00", + "name": "SpongeVanilla", + "author": "parker@parkervcp.com", + "description": "SpongeVanilla is the implementation of the Sponge API on top of Vanilla Minecraft.", + "image": "quay.io\/pterodactyl\/core:java", + "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 \"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": "{}", + "stop": "stop" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# spongeVanilla 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\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## check spongevanilla version and default to recommended if it's invalid\r\nif [ -z ${SV_VERSION} ] || [ \"$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongevanilla\/downloads\/${SV_VERSION})\" == \"Unknown version\" ]; then\r\n echo -e \"defaulting to recommended\"\r\n SV_VERSION=\"recommended\"\r\nfi\r\n\r\n## handle getting download linsk for sponge\r\nif [ \"${SV_VERSION}\" == \"recommended\" ]; then\r\n echo -e \"using recommended spongevanilla version\"\r\n SV_VERSION=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongevanilla\/downloads\/recommended | jq -r '.version')\r\n echo -e \"found spongevanilla Version ${SV_VERSION}\"\r\n SV_DL_LINK=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongevanilla\/downloads\/recommended | jq -r '.artifacts.\"\".url')\r\nelif [ \"${SV_VERSION}\" == \"latest\" ]; then\r\n echo -e \"using latest SpongForge version\"\r\n SV_VERSION=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongevanilla | jq -r '.buildTypes.stable.latest.version')\r\n echo -e \"found spongevanilla Version ${SV_VERSION}\"\r\nelse\r\n echo -e \"found spongevanilla Version ${SV_VERSION}\"\r\n SV_DL_LINK=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongevanilla\/downloads\/${SV_VERSION} | jq -r '.artifacts.\"\".url')\r\nfi\r\n\r\nif [ -f ${SERVER_JARFILE} ] && [ $(sha1sum server.jar | awk '{ print $1 }') == $(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongevanilla\/downloads\/recommended | jq -r '.artifacts.\"\".sha1') ]; then\r\n echo -e \"Already have the correct spongevanilla version\"\r\nelse\r\n echo -e \"Downloading spongevanilla version ${SV_VERSION}\"\r\n echo -e \"running: curl -s ${SV_DL_LINK} -o \/mnt\/server\/mods\/spongevanilla-${SV_VERSION}.jar\"\r\n curl -s ${SV_DL_LINK} -o \/mnt\/server\/${SERVER_JARFILE}\r\nfi\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"Downloading MC server.properties\"\r\n curl -s -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_java\/server.properties\r\nfi\r\n\r\necho -e \"Install for spongevanilla is complete\"", + "container": "debian:stable-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "SpongeVanilla Version", + "description": "Example 1.12.2-7.1.6\r\n\r\nIf the version fails it defaults to recommended", + "env_variable": "SV_VERSION", + "default_value": "recommended", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string" + }, + { + "name": "Server Jar File", + "description": "The name of the Jarfile to use when running Mod.", + "env_variable": "SERVER_JARFILE", + "default_value": "server.jar", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" + } + ] +} \ No newline at end of file From af0686ad4100f91c9c36e473ff6d311d4f703776 Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Mon, 30 Sep 2019 06:04:43 -0400 Subject: [PATCH 288/393] Update pull_request_template.md Fixed typo --- .github/pull_request_template.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 8285664e..edcd00b2 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -12,11 +12,11 @@ 1. [ ] Does your submission pass tests (server is connectable)? 2. [ ] Does your server use a custom docker image? * [ ] Have you tried to use a generic image? - * [ ] Did you PR the nesessary changes to make it work? + * [ ] 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? \ No newline at end of file +2. [ ] Have you tested your Egg changes? From 42dcd14a92e82336dd4c1afa1ba05be4c449b1ab Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Mon, 30 Sep 2019 21:43:41 -0400 Subject: [PATCH 289/393] Update FiveM install script This moves to pulling the latest version for FiveM again. If they enable cloudflare protection it will break but it has support for download URL. DOWNLOAD_URL is still limited to fx.tar.xz being the filename. The installer will fail if the file is not named correctly or is the wrong file type. --- gta/fivem/egg-five-m.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gta/fivem/egg-five-m.json b/gta/fivem/egg-five-m.json index 021533fe..71a035de 100644 --- a/gta/fivem/egg-five-m.json +++ b/gta/fivem/egg-five-m.json @@ -3,11 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-09-11T10:35:51-04:00", + "exported_at": "2019-09-30T21:32:14-04:00", "name": "FiveM", "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:alpine", + "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", "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}", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash \r\n\r\napk add openssl tar xz curl wget git --no-cache\r\n\r\ncd \/mnt\/server\r\n\r\nmkdir resources\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\ncd \/mnt\/server\r\n\r\necho -e \"pulling files from ${DOWNLOAD_URL}\"\r\nwget ${DOWNLOAD_URL}\r\n\r\necho \"Extracting fivem files\"\r\n\r\ntar xf fx.tar.xz\r\n\r\nrm -rf fx.tar.xz 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\/gta\/fivem\/server.cfg >> server.cfg\r\nfi\r\n\r\nmkdir logs\/\r\n\r\necho \"install complete\"", + "script": "#!\/bin\/ash \r\n\r\napk add openssl tar xz curl wget git --no-cache\r\n\r\ncd \/mnt\/server\r\n\r\nmkdir resources\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\ncd \/mnt\/server\r\n\r\necho \"Downloading the latest fivem server files\"\r\nlatest_fivem_url=`curl https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/ | grep -Eo 'href=\".*\/\"' | grep -Eo '\".*\"' | grep -Eo 'href=\".*\/\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g'`\r\n\r\necho -e \"pulling files from https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${latest_fivem_url}fx.tar.xz\"\r\nwget https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${latest_fivem_url}fx.tar.xz\r\n\r\necho \"Extracting fivem files\"\r\n\r\ntar xf fx.tar.xz\r\n\r\nrm -rf fx.tar.xz 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\/gta\/fivem\/server.cfg >> server.cfg\r\nfi\r\n\r\nmkdir logs\/\r\n\r\necho \"install complete\"", "container": "alpine:3.10", "entrypoint": "ash" } @@ -54,14 +54,14 @@ "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 the latest version from here - https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/", "env_variable": "FIVEM_VERSION", - "default_value": "", + "default_value": "latest", "user_viewable": 1, - "user_editable": 0, + "user_editable": 1, "rules": "required|string|max:50" }, { "name": "Download Link", - "description": "This is the link to download fivem from.\r\n\r\nThis is only used in the install script.", + "description": "This is the link to download fivem from. This is only used in the install script.\r\n\r\nThe file you link to needs to be an fx.tar.zx file.\r\n\r\nExample:\r\nhttps:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/1626-8c06e8bc3ed7e6690c6c2d9e0b90e29df65b3ea6\/fx.tar.xz", "env_variable": "DOWNLOAD_URL", "default_value": "", "user_viewable": 0, From 75f7266ea0733bb37e80f2e080d832ffc13ef646 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sat, 7 Sep 2019 20:10:33 -0400 Subject: [PATCH 290/393] update mordhau egg to use new image --- steamcmd_servers/mordhau/egg-mordhau.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/steamcmd_servers/mordhau/egg-mordhau.json b/steamcmd_servers/mordhau/egg-mordhau.json index efd7d9b6..f923995e 100644 --- a/steamcmd_servers/mordhau/egg-mordhau.json +++ b/steamcmd_servers/mordhau/egg-mordhau.json @@ -3,11 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-05-09T22:22:13-05:00", + "exported_at": "2019-09-07T20:08:55-04:00", "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.", - "image": "chasx003\/mordhau", + "image": "quay.io\/parkervcp\/pterodactyl-images:game_mordhau", "startup": ".\/MordhauServer.sh \/Game\/Mordhau\/Maps\/{{DEFAULT_MAP}}?MaxSlots={{MAX_PLAYERS}}? -USEALLAVAILABLECORES -Port={{SERVER_PORT}} -queryport={{QUERY_PORT}} -beaconport={{BEACON_PORT}}", "config": { "files": "{\r\n \"Mordhau\/Saved\/Config\/LinuxServer\/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}", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Mordhau 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 \/mnt\/server\/logs\r\n\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.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 629800 +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", + "script": "#!\/bin\/bash\r\n# Mordhau Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\n\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\n\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\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\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 629800 +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\n\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", "container": "ubuntu:18.04", "entrypoint": "bash" } @@ -96,4 +96,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From 92c587147e3ef44f0b33783d40b98042b4deaa73 Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Tue, 1 Oct 2019 15:06:00 -0400 Subject: [PATCH 291/393] Removed Duplicate Egg Same egg as /enemy_territory/etlegacy --- etlegacy/etlegacy/README.md | 20 ------------ etlegacy/etlegacy/egg-e-t-legacy.json | 45 --------------------------- 2 files changed, 65 deletions(-) delete mode 100644 etlegacy/etlegacy/README.md delete mode 100644 etlegacy/etlegacy/egg-e-t-legacy.json diff --git a/etlegacy/etlegacy/README.md b/etlegacy/etlegacy/README.md deleted file mode 100644 index 38a65ea8..00000000 --- a/etlegacy/etlegacy/README.md +++ /dev/null @@ -1,20 +0,0 @@ -# ET: Legacy - -#### The ET: Legacy Server - - -#### 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 own. - -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://factorio.com/starter-page](https://www.etlegacy.com/)). - -### Server Ports -ET: Legacy requires a single port - -| Port | default | -|---------|---------| -| Game | 27960 | \ No newline at end of file diff --git a/etlegacy/etlegacy/egg-e-t-legacy.json b/etlegacy/etlegacy/egg-e-t-legacy.json deleted file mode 100644 index 0f5dc4cc..00000000 --- a/etlegacy/etlegacy/egg-e-t-legacy.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": "2019-04-29T22:08:18+08:00", - "name": "ET Legacy", - "author": "parker@parkervcp.com", - "description": "Welcome to Enemy Territory: Legacy, an open source project that aims to create a fully compatible client and server for the popular online FPS game Wolfenstein: Enemy Territory - whose gameplay is still considered unmatched by many, despite its great age.", - "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", - "startup": ".\/etlded +set net_port {{SERVER_PORT}} +map {{MAP}}", - "config": { - "files": "{\r\n \"etmain\/etl_server.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"\/\/set net_ip \\\"\\\"\": \"set net_ip \\\"0.0.0.0\\\"\",\r\n \"\/\/set net_port \\\"27960\\\"\": \"set net_port \\\"{{server.build.env.SERVER_PORT}}\\\"\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"------ Server Initialization ------\",\r\n \"userInteraction\": []\r\n}", - "logs": "{}", - "stop": "quit" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n\r\napt-get update\r\napt-get -y install wget curl zip unzip\r\n\r\ncd \/tmp\/\r\n\r\necho \"Downloading $ET_VERSION bit ET Legacy version\"\r\n\r\nif [ $ET_VERSION == \"32\" ];then \r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 32-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` -O etlegacy.tar.gz\r\nelse\r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 64-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` -O etlegacy.tar.gz\r\nfi\r\n\r\necho \"Unpacking ET: Legacy\"\r\ntar --strip-components=1 -xzvf etlegacy.tar.gz -C \/mnt\/server\/\r\n\r\necho \"Downloading latest enemy territory files\"\r\nwget `curl https:\/\/www.splashdamage.com\/games\/wolfenstein-enemy-territory\/ | grep .x86_full | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo --color=never '(http|https):\/\/[^\"]+'` -O enemy_territory.zip\r\n\r\necho \"Unpacking enemy territory files\"\r\nunzip enemy_territory.zip\r\n\r\necho \"Copying enemy territory assets\"\r\n.\/*.x86_keygen_V03.run --tar xvf .\/etmain\/\r\ncp etmain\/pak*.pk3 \/mnt\/server\/etmain\/\r\n\r\n# Create .etlegacy as the server doesn't correctly create it\r\nmkdir -p \/mnt\/server\/.etlegacy", - "container": "ubuntu:18.04", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "ET Legacy Version", - "description": "What version of the server to install. 32 or 64 bit version.", - "env_variable": "ET_VERSION", - "default_value": "32", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|integer|in:32, 64" - }, - { - "name": "Default Map", - "description": "The default map to use when starting the server.", - "env_variable": "MAP", - "default_value": "oasis", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:20" - } - ] -} From 2fb6380c801490560110d4b06dc6c54d181079f5 Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Tue, 1 Oct 2019 15:16:48 -0400 Subject: [PATCH 292/393] Corrected Header Readme header was "Example Server Name" --- arma/arma3/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arma/arma3/README.md b/arma/arma3/README.md index 9bd5392a..15eb3296 100644 --- a/arma/arma3/README.md +++ b/arma/arma3/README.md @@ -1,4 +1,4 @@ -# Example Server Name +# Arma 3 ### From their [Site](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 42136b6ef856faf375afae69b9cc755972c5fb65 Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Tue, 1 Oct 2019 15:22:15 -0400 Subject: [PATCH 293/393] Fixed Conan Exiles URL Arma3 != Conan --- conan_exiles/conan_exiles/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conan_exiles/conan_exiles/README.md b/conan_exiles/conan_exiles/README.md index c490ffdd..28d4024b 100644 --- a/conan_exiles/conan_exiles/README.md +++ b/conan_exiles/conan_exiles/README.md @@ -1,4 +1,4 @@ -### From their [Site](https://arma3.com/) +### From their [Site](https://conanexiles.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. ### Minimum RAM warning From 500bdd745087234309f1ae7b7c5c297c7721e343 Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Tue, 1 Oct 2019 15:26:20 -0400 Subject: [PATCH 294/393] Fixed Typo --- stock-eggs/minecraft/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock-eggs/minecraft/README.md b/stock-eggs/minecraft/README.md index c63519ed..89d19035 100644 --- a/stock-eggs/minecraft/README.md +++ b/stock-eggs/minecraft/README.md @@ -1,6 +1,6 @@ # Minecraft -All the ddefault 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 From ad2ce491d219833676a1b57387452e464b3b4d49 Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Tue, 1 Oct 2019 15:27:05 -0400 Subject: [PATCH 295/393] Fixed URL --- terraria/tmodloader/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraria/tmodloader/README.md b/terraria/tmodloader/README.md index be139132..932dc9fe 100644 --- a/terraria/tmodloader/README.md +++ b/terraria/tmodloader/README.md @@ -1,5 +1,5 @@ # tModLoader -### From their [GitHub](https://github.com/blushiemagic/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 From 56504e9c7b36faf558b4ed2184263a97300919fc Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Tue, 1 Oct 2019 15:29:48 -0400 Subject: [PATCH 296/393] Fixed URL --- enemy_territory/etlegacy/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enemy_territory/etlegacy/README.md b/enemy_territory/etlegacy/README.md index 7330b1f4..43b83406 100644 --- a/enemy_territory/etlegacy/README.md +++ b/enemy_territory/etlegacy/README.md @@ -10,7 +10,7 @@ and transmitting confidential documents, it was time to dust off the game which 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://factorio.com/starter-page](https://www.etlegacy.com/)). +Make sure to checkout their [Home Page](https://www.etlegacy.com/). ### Server Ports ET: Legacy requires a single port From bb59e9b6362e40d0d516dfd926dfe9ad23bf7a18 Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Tue, 1 Oct 2019 15:30:27 -0400 Subject: [PATCH 297/393] Update egg-pixel-bot.json Clearly not Factorio --- bots/discord/pixelbot/egg-pixel-bot.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bots/discord/pixelbot/egg-pixel-bot.json b/bots/discord/pixelbot/egg-pixel-bot.json index e9646353..d149e036 100644 --- a/bots/discord/pixelbot/egg-pixel-bot.json +++ b/bots/discord/pixelbot/egg-pixel-bot.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Factorio Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache git gcc g++ libffi-dev make\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Cloning pixel-bot repo\"\r\ngit clone https:\/\/github.com\/Ispira\/pixel-bot.git .\r\n\r\necho \"Installing python requirements into folder\"\r\npip install -U --target $(pwd) discord imgurpython xkcd pynacl", + "script": "#!\/bin\/ash\r\n# Pixel Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache git gcc g++ libffi-dev make\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Cloning pixel-bot repo\"\r\ngit clone https:\/\/github.com\/Ispira\/pixel-bot.git .\r\n\r\necho \"Installing python requirements into folder\"\r\npip install -U --target $(pwd) discord imgurpython xkcd pynacl", "container": "python:3.6-alpine3.7", "entrypoint": "ash" } From c8f1479f78f42e566e604d7b330862d5d003db9a Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Thu, 3 Oct 2019 21:04:00 -0400 Subject: [PATCH 298/393] Update egg-squad.json Added Variables, Fixed Started value. --- squad/squad/egg-squad.json | 80 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 4 deletions(-) diff --git a/squad/squad/egg-squad.json b/squad/squad/egg-squad.json index a8735ce7..de73c96b 100644 --- a/squad/squad/egg-squad.json +++ b/squad/squad/egg-squad.json @@ -3,15 +3,15 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-21T13:00:36-05:00", + "exported_at": "2019-10-03T21:02:54-04:00", "name": "Squad", "author": "brycea@rapidnetworks.org", "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", - "startup": ".\/SquadServer.sh Port={{SERVER_PORT}} QueryPort={{QUERY_PORT}}", + "startup": ".\/SquadGameServer.sh Port={{SERVER_PORT}} QueryPort={{QUERY_PORT}}", "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"LogInit:Display: Starting Game.\",\r\n \"userInteraction\": []\r\n}", + "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}", "stop": "^C" }, @@ -31,6 +31,78 @@ "user_viewable": 1, "user_editable": 1, "rules": "required|numeric" + }, + { + "name": "Server Name", + "description": "The name for the server in the server list", + "env_variable": "servername", + "default_value": "Squad Server", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:30" + }, + { + "name": "Max Players", + "description": "Sets the maximum number of players.", + "env_variable": "maxplayers", + "default_value": "80", + "user_viewable": 1, + "user_editable": 1, + "rules": "required" + }, + { + "name": "Allow Team Change", + "description": "Allow players to change teams ( true \/ false )", + "env_variable": "allowteamchange", + "default_value": "true", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string" + }, + { + "name": "Advertise Server", + "description": "Have the server report to the public server list ( true \/ false )", + "env_variable": "advertise", + "default_value": "true", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string" + }, + { + "name": "Reserved Slows", + "description": "The number of reserved slots for admins \/ mods", + "env_variable": "reservedslots", + "default_value": "0", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string" + }, + { + "name": "Prevent Team Change If Unbalanced", + "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, + "rules": "required|string" + }, + { + "name": "Enforce Team Balance", + "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, + "rules": "required|string" + }, + { + "name": "Record Demos", + "description": "This will record demos of the players ( true \/ false )", + "env_variable": "recorddemos", + "default_value": "true", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string" } ] } \ No newline at end of file From 95d52417a0e16529a1337fdb8fbf52cafb109d66 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Fri, 4 Oct 2019 16:32:16 -0400 Subject: [PATCH 299/393] update fivem variable values --- gta/fivem/egg-five-m.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gta/fivem/egg-five-m.json b/gta/fivem/egg-five-m.json index 71a035de..295ce327 100644 --- a/gta/fivem/egg-five-m.json +++ b/gta/fivem/egg-five-m.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-09-30T21:32:14-04:00", + "exported_at": "2019-10-04T16:30:46-04:00", "name": "FiveM", "author": "parker@parkervcp.com", "description": "A new FiveM egg for the latest builds due to recent changes in FiveM", @@ -66,7 +66,7 @@ "default_value": "", "user_viewable": 0, "user_editable": 0, - "rules": "required|string" + "rules": "string|nullable" } ] } \ No newline at end of file From 7441c2ed057dc450ec158a70af1c31eb8f297b05 Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Tue, 1 Oct 2019 15:06:00 -0400 Subject: [PATCH 300/393] Removed Duplicate Egg Same egg as /enemy_territory/etlegacy --- etlegacy/etlegacy/README.md | 20 ------------ etlegacy/etlegacy/egg-e-t-legacy.json | 45 --------------------------- 2 files changed, 65 deletions(-) delete mode 100644 etlegacy/etlegacy/README.md delete mode 100644 etlegacy/etlegacy/egg-e-t-legacy.json diff --git a/etlegacy/etlegacy/README.md b/etlegacy/etlegacy/README.md deleted file mode 100644 index 38a65ea8..00000000 --- a/etlegacy/etlegacy/README.md +++ /dev/null @@ -1,20 +0,0 @@ -# ET: Legacy - -#### The ET: Legacy Server - - -#### 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 own. - -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://factorio.com/starter-page](https://www.etlegacy.com/)). - -### Server Ports -ET: Legacy requires a single port - -| Port | default | -|---------|---------| -| Game | 27960 | \ No newline at end of file diff --git a/etlegacy/etlegacy/egg-e-t-legacy.json b/etlegacy/etlegacy/egg-e-t-legacy.json deleted file mode 100644 index 0f5dc4cc..00000000 --- a/etlegacy/etlegacy/egg-e-t-legacy.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": "2019-04-29T22:08:18+08:00", - "name": "ET Legacy", - "author": "parker@parkervcp.com", - "description": "Welcome to Enemy Territory: Legacy, an open source project that aims to create a fully compatible client and server for the popular online FPS game Wolfenstein: Enemy Territory - whose gameplay is still considered unmatched by many, despite its great age.", - "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", - "startup": ".\/etlded +set net_port {{SERVER_PORT}} +map {{MAP}}", - "config": { - "files": "{\r\n \"etmain\/etl_server.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"\/\/set net_ip \\\"\\\"\": \"set net_ip \\\"0.0.0.0\\\"\",\r\n \"\/\/set net_port \\\"27960\\\"\": \"set net_port \\\"{{server.build.env.SERVER_PORT}}\\\"\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"------ Server Initialization ------\",\r\n \"userInteraction\": []\r\n}", - "logs": "{}", - "stop": "quit" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n\r\napt-get update\r\napt-get -y install wget curl zip unzip\r\n\r\ncd \/tmp\/\r\n\r\necho \"Downloading $ET_VERSION bit ET Legacy version\"\r\n\r\nif [ $ET_VERSION == \"32\" ];then \r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 32-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` -O etlegacy.tar.gz\r\nelse\r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 64-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` -O etlegacy.tar.gz\r\nfi\r\n\r\necho \"Unpacking ET: Legacy\"\r\ntar --strip-components=1 -xzvf etlegacy.tar.gz -C \/mnt\/server\/\r\n\r\necho \"Downloading latest enemy territory files\"\r\nwget `curl https:\/\/www.splashdamage.com\/games\/wolfenstein-enemy-territory\/ | grep .x86_full | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo --color=never '(http|https):\/\/[^\"]+'` -O enemy_territory.zip\r\n\r\necho \"Unpacking enemy territory files\"\r\nunzip enemy_territory.zip\r\n\r\necho \"Copying enemy territory assets\"\r\n.\/*.x86_keygen_V03.run --tar xvf .\/etmain\/\r\ncp etmain\/pak*.pk3 \/mnt\/server\/etmain\/\r\n\r\n# Create .etlegacy as the server doesn't correctly create it\r\nmkdir -p \/mnt\/server\/.etlegacy", - "container": "ubuntu:18.04", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "ET Legacy Version", - "description": "What version of the server to install. 32 or 64 bit version.", - "env_variable": "ET_VERSION", - "default_value": "32", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|integer|in:32, 64" - }, - { - "name": "Default Map", - "description": "The default map to use when starting the server.", - "env_variable": "MAP", - "default_value": "oasis", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:20" - } - ] -} From fcfcfa3d1fc2894a6ed98950d8c58764cb5ec151 Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Tue, 1 Oct 2019 15:16:48 -0400 Subject: [PATCH 301/393] Corrected Header Readme header was "Example Server Name" --- arma/arma3/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arma/arma3/README.md b/arma/arma3/README.md index 9bd5392a..15eb3296 100644 --- a/arma/arma3/README.md +++ b/arma/arma3/README.md @@ -1,4 +1,4 @@ -# Example Server Name +# Arma 3 ### From their [Site](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 221d268e4b7977e92aed7c5442f687baec854488 Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Tue, 1 Oct 2019 15:22:15 -0400 Subject: [PATCH 302/393] Fixed Conan Exiles URL Arma3 != Conan --- conan_exiles/conan_exiles/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conan_exiles/conan_exiles/README.md b/conan_exiles/conan_exiles/README.md index c490ffdd..28d4024b 100644 --- a/conan_exiles/conan_exiles/README.md +++ b/conan_exiles/conan_exiles/README.md @@ -1,4 +1,4 @@ -### From their [Site](https://arma3.com/) +### From their [Site](https://conanexiles.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. ### Minimum RAM warning From 8e14f0b123ea358bc789b26e97b4425ce05add92 Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Tue, 1 Oct 2019 15:26:20 -0400 Subject: [PATCH 303/393] Fixed Typo --- stock-eggs/minecraft/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock-eggs/minecraft/README.md b/stock-eggs/minecraft/README.md index c63519ed..89d19035 100644 --- a/stock-eggs/minecraft/README.md +++ b/stock-eggs/minecraft/README.md @@ -1,6 +1,6 @@ # Minecraft -All the ddefault 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 From 29693dfe31bb1d98574e51181cc5be673b5dbe60 Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Tue, 1 Oct 2019 15:27:05 -0400 Subject: [PATCH 304/393] Fixed URL --- terraria/tmodloader/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraria/tmodloader/README.md b/terraria/tmodloader/README.md index be139132..932dc9fe 100644 --- a/terraria/tmodloader/README.md +++ b/terraria/tmodloader/README.md @@ -1,5 +1,5 @@ # tModLoader -### From their [GitHub](https://github.com/blushiemagic/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 From cf099bf54b0a0dddbf8d3904c174740e847075f6 Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Tue, 1 Oct 2019 15:29:48 -0400 Subject: [PATCH 305/393] Fixed URL --- enemy_territory/etlegacy/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enemy_territory/etlegacy/README.md b/enemy_territory/etlegacy/README.md index 7330b1f4..43b83406 100644 --- a/enemy_territory/etlegacy/README.md +++ b/enemy_territory/etlegacy/README.md @@ -10,7 +10,7 @@ and transmitting confidential documents, it was time to dust off the game which 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://factorio.com/starter-page](https://www.etlegacy.com/)). +Make sure to checkout their [Home Page](https://www.etlegacy.com/). ### Server Ports ET: Legacy requires a single port From af1034249e35a78cdc9b00bcd0a83c73a1e94589 Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Tue, 1 Oct 2019 15:30:27 -0400 Subject: [PATCH 306/393] Update egg-pixel-bot.json Clearly not Factorio --- bots/discord/pixelbot/egg-pixel-bot.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bots/discord/pixelbot/egg-pixel-bot.json b/bots/discord/pixelbot/egg-pixel-bot.json index e9646353..d149e036 100644 --- a/bots/discord/pixelbot/egg-pixel-bot.json +++ b/bots/discord/pixelbot/egg-pixel-bot.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Factorio Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache git gcc g++ libffi-dev make\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Cloning pixel-bot repo\"\r\ngit clone https:\/\/github.com\/Ispira\/pixel-bot.git .\r\n\r\necho \"Installing python requirements into folder\"\r\npip install -U --target $(pwd) discord imgurpython xkcd pynacl", + "script": "#!\/bin\/ash\r\n# Pixel Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache git gcc g++ libffi-dev make\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Cloning pixel-bot repo\"\r\ngit clone https:\/\/github.com\/Ispira\/pixel-bot.git .\r\n\r\necho \"Installing python requirements into folder\"\r\npip install -U --target $(pwd) discord imgurpython xkcd pynacl", "container": "python:3.6-alpine3.7", "entrypoint": "ash" } From 23ef5d4b85029b59803c28e92604b15a6702ad35 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 6 Oct 2019 00:29:42 -0400 Subject: [PATCH 307/393] Fix squad startup --- squad/squad/egg-squad.json | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/squad/squad/egg-squad.json b/squad/squad/egg-squad.json index de73c96b..fb8db39d 100644 --- a/squad/squad/egg-squad.json +++ b/squad/squad/egg-squad.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-10-03T21:02:54-04:00", + "exported_at": "2019-10-06T00:29:04-04:00", "name": "Squad", "author": "brycea@rapidnetworks.org", "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.", @@ -17,8 +17,8 @@ }, "scripts": { "installation": { - "script": "apt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\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\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 403240 +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so", - "container": "ubuntu:16.04", + "script": "#!\/bin\/bash\r\n## install required packages to install squad\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\r\n\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\r\n## needs to be used for steamcmd to operate correctly\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install squad\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${{SRCDS_APPID}} +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\n\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\n\r\nchmod +x \/mnt\/server\/SquadGame\/Binaries\/Linux\/SquadGameServer", + "container": "ubuntu:18.04", "entrypoint": "bash" } }, @@ -103,6 +103,24 @@ "user_viewable": 1, "user_editable": 1, "rules": "required|string" + }, + { + "name": "ld lib path", + "description": "this is needed for some reason", + "env_variable": "LD_LIBRARY_PATH", + "default_value": "\/home\/container\/linux64\/", + "user_viewable": 0, + "user_editable": 0, + "rules": "required|string" + }, + { + "name": "Game ID", + "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, + "rules": "required|string|max:20" } ] } \ No newline at end of file From c232995d545d776de1cbf40db30a4588b2140fc0 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Tue, 8 Oct 2019 09:07:48 -0400 Subject: [PATCH 308/393] update install script --- squad/squad/egg-squad.json | 42 +++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/squad/squad/egg-squad.json b/squad/squad/egg-squad.json index fb8db39d..64730158 100644 --- a/squad/squad/egg-squad.json +++ b/squad/squad/egg-squad.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-10-06T00:29:04-04:00", + "exported_at": "2019-10-08T08:47:08-04:00", "name": "Squad", "author": "brycea@rapidnetworks.org", "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", - "startup": ".\/SquadGameServer.sh Port={{SERVER_PORT}} QueryPort={{QUERY_PORT}}", + "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}", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n## install required packages to install squad\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\r\n\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\r\n## needs to be used for steamcmd to operate correctly\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install squad\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${{SRCDS_APPID}} +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\n\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\n\r\nchmod +x \/mnt\/server\/SquadGame\/Binaries\/Linux\/SquadGameServer", + "script": "#!\/bin\/bash\r\n## install required packages to install squad\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\r\n\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\r\n## needs to be used for steamcmd to operate correctly\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install squad\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\n\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\n\r\nchmod +x \/mnt\/server\/SquadGame\/Binaries\/Linux\/SquadGameServer", "container": "ubuntu:18.04", "entrypoint": "bash" } @@ -32,6 +32,24 @@ "user_editable": 1, "rules": "required|numeric" }, + { + "name": "ld lib path", + "description": "this is needed for some reason", + "env_variable": "LD_LIBRARY_PATH", + "default_value": "\/home\/container\/linux64\/", + "user_viewable": 0, + "user_editable": 0, + "rules": "required|string" + }, + { + "name": "Game ID", + "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, + "rules": "required|string|max:20" + }, { "name": "Server Name", "description": "The name for the server in the server list", @@ -103,24 +121,6 @@ "user_viewable": 1, "user_editable": 1, "rules": "required|string" - }, - { - "name": "ld lib path", - "description": "this is needed for some reason", - "env_variable": "LD_LIBRARY_PATH", - "default_value": "\/home\/container\/linux64\/", - "user_viewable": 0, - "user_editable": 0, - "rules": "required|string" - }, - { - "name": "Game ID", - "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, - "rules": "required|string|max:20" } ] } \ No newline at end of file From 12d0189a0959ff11418cb4dc969f42e978a6ef29 Mon Sep 17 00:00:00 2001 From: Michael PArker Date: Thu, 24 Oct 2019 00:01:04 -0400 Subject: [PATCH 309/393] update install script Actually install the game in the right place --- steamcmd_servers/pixark/egg-pix-a-r-k.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/steamcmd_servers/pixark/egg-pix-a-r-k.json b/steamcmd_servers/pixark/egg-pix-a-r-k.json index 16bb3905..219447bb 100644 --- a/steamcmd_servers/pixark/egg-pix-a-r-k.json +++ b/steamcmd_servers/pixark/egg-pix-a-r-k.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-06-07T12:39:45-04:00", + "exported_at": "2019-10-24T00:00:15-04:00", "name": "PixARK", "author": "hello@venatus.digital", "description": "A simple Docker container with Wine to run PixARK using Pterodactyl Panel", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# PixARK: 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\n\r\ntar -xzvf steamcmd.tar.gz -C \/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\/mnt\/server\/steamcmd\/steamcmd.sh +@sSteamCmdForcePlatformType windows +login anonymous +force_install_dir \/home\/container +app_update {{SRCDS_APPID}} +quit", + "script": "#!\/bin\/bash\r\n# PixARK: 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\n\r\ntar -xzvf steamcmd.tar.gz -C \/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\/mnt\/server\/steamcmd\/steamcmd.sh +@sSteamCmdForcePlatformType windows +login anonymous +force_install_dir \/mnt\/server +app_update {{SRCDS_APPID}} +quit", "container": "ubuntu:latest", "entrypoint": "bash" } From 450ca72c92310566db6d795207b88f3d00435c6e Mon Sep 17 00:00:00 2001 From: Michael PArker Date: Thu, 24 Oct 2019 00:08:33 -0400 Subject: [PATCH 310/393] add ld lib path to 7dtd adds a variable to set the ld lib path for version 18. --- steamcmd_servers/7_days_to_die/egg-7-days-to-die.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json b/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json index 3a1d4165..402aad78 100644 --- a/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json +++ b/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-08-30T20:42:59-04:00", + "exported_at": "2019-10-24T00:07:13-04:00", "name": "7 Days To Die", "author": "kristoffer.norman@bahnhof.se", "description": "7 days to die server", @@ -58,6 +58,15 @@ "user_viewable": 1, "user_editable": 1, "rules": "required|boolean" + }, + { + "name": "ld lib path", + "description": "This is really annoying that more games are doing this.", + "env_variable": "LD_LIBRARY_PATH", + "default_value": ".", + "user_viewable": 0, + "user_editable": 0, + "rules": "required|string|max:20" } ] } \ No newline at end of file From 1de9f96692b366c40aef2a7e36361875a6c54a9d Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Wed, 30 Oct 2019 22:01:42 -0400 Subject: [PATCH 311/393] update tModLoader install script Update script to get versions better. Uses the github api to pull the release versions and check for validity. Update start command to be correct --- terraria/tmodloader/egg-t-modloader.json | 43 +++++++++++++++++++----- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/terraria/tmodloader/egg-t-modloader.json b/terraria/tmodloader/egg-t-modloader.json index 20847d38..d49516c2 100644 --- a/terraria/tmodloader/egg-t-modloader.json +++ b/terraria/tmodloader/egg-t-modloader.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-10-07T10:01:51-04:00", + "exported_at": "2019-10-30T21:46:07-04: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+.", - "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu", - "startup": ".\/tModLoaderServer.bin.x86_64 -ip 0.0.0.0 -port ${SERVER_PORT} -maxplayers ${MAX_PLAYERS} -world ~\/saves\/Worlds\/${WORLD_NAME}.wld -worldname ${WORLD_NAME} -autocreate ${WORLD_SIZE} -savedirectory ~\/ -tmlsavedirectory ~\/saves -modpath ~\/mods", + "image": "quay.io\/parkervcp\/pterodactyl-images:base_ubuntu", + "startup": ".\/TerrariaServer.bin.x86_64 -ip 0.0.0.0 -port ${SERVER_PORT} -maxplayers ${MAX_PLAYERS} -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}", @@ -17,8 +17,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Vanilla T-shock Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\ncd \/mnt\/server\r\n\r\necho -e \"Downloading tModloader\"\r\nwget https:\/\/github.com\/blushiemagic\/tModLoader\/releases\/download\/${TMODLOADER_VERSION}\/tModLoader.Linux.${TMODLOADER_VERSION}.zip\r\n\r\necho -e \"Unpacking mod loader files\"\r\nunzip tModLoader.Linux.${TMODLOADER_VERSION}.zip\r\n\r\nCLEAN_VERSION=$(echo ${TERRARIA_VERSION} | sed 's\/\\.\/\/g')\r\n\r\necho -e \"Downloading terraria server files\"\r\nwget http:\/\/terraria.org\/server\/terraria-server-${CLEAN_VERSION}.zip\r\n\r\necho -e \"Unpacking server files\"\r\nunzip terraria-server-$(echo ${CLEAN_VERSION} | sed 's\/\\.\/\/g').zip\r\ncp -R ${CLEAN_VERSION}\/Linux\/* .\/\r\n\r\necho -e \"Cleaning up extra files.\"\r\nrm -rf ${CLEAN_VERSION}\r\n\r\nchmod +x .\/tModLoaderServer.bin.x86_64", - "container": "alpine:3.9", + "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\napk add --no-cache curl wget jq file unzip\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 linux)\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)\r\n fi\r\nfi\r\n\r\n## clean terraria version\r\nCLEAN_VERSION=$(echo ${TERRARIA_VERSION} | sed 's\/\\.\/\/g')\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 \"Downloading terraria server files\"\r\nwget http:\/\/terraria.org\/server\/terraria-server-${CLEAN_VERSION}.zip\r\n\r\necho -e \"Unpacking server files\"\r\nunzip terraria-server-$(echo ${CLEAN_VERSION} | sed 's\/\\.\/\/g').zip\r\ncp -R ${CLEAN_VERSION}\/Linux\/* .\/\r\n\r\nchmod +x TerrariaServer.bin.x86_64\r\n\r\necho -e \"Cleaning up extra files.\"\r\nrm -rf ${CLEAN_VERSION}", + "container": "alpine:3.10", "entrypoint": "ash" } }, @@ -26,8 +26,8 @@ { "name": "tModloader Version", "description": "The version of tModloader that is to be used.", - "env_variable": "TMODLOADER_VERSION", - "default_value": "v0.10.1.5", + "env_variable": "VERSION", + "default_value": "latest", "user_viewable": 1, "user_editable": 1, "rules": "required|string|max:20" @@ -67,6 +67,33 @@ "user_viewable": 1, "user_editable": 1, "rules": "required|numeric|digits_between:1,3" + }, + { + "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": 0, + "user_editable": 0, + "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": 0, + "user_editable": 0, + "rules": "string|nullable" + }, + { + "name": "GitHub Package", + "description": "This is to make automating this kind of thing easier.\r\n\r\nDo not edit if you don't know what you are doing.", + "env_variable": "GITHUB_PACKAGE", + "default_value": "tModLoader\/tModLoader", + "user_viewable": 0, + "user_editable": 0, + "rules": "required|string" } ] -} +} \ No newline at end of file From 26da778220b08b99ae787e2d3d1c7327c7b8b5b9 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Wed, 30 Oct 2019 23:31:08 -0400 Subject: [PATCH 312/393] update nukkit install script only pull files when the file doesn't exist. --- minecraft_bedrock/nukkit/egg-nukkit.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/minecraft_bedrock/nukkit/egg-nukkit.json b/minecraft_bedrock/nukkit/egg-nukkit.json index 5dedc848..4f5af0d7 100644 --- a/minecraft_bedrock/nukkit/egg-nukkit.json +++ b/minecraft_bedrock/nukkit/egg-nukkit.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-11-11T23:32:59-05:00", + "exported_at": "2019-10-30T23:29:01-04: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\/", @@ -17,8 +17,8 @@ }, "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.nukkitx.com\/job\/NukkitX\/job\/Nukkit\/job\/master\/lastSuccessfulBuild\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nelse\r\n wget https:\/\/ci.nukkitx.com\/job\/NukkitX\/job\/Nukkit\/job\/master\/${NUKKIT_VERSION}\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nfi\r\n\r\nwget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_bedrock\/nukkit\/nukkit.yml\r\n\r\nwget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_bedrock\/nukkit\/server.properties", - "container": "alpine:3.9", + "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.nukkitx.com\/job\/NukkitX\/job\/Nukkit\/job\/master\/lastSuccessfulBuild\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nelse\r\n wget https:\/\/ci.nukkitx.com\/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 ]; \r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_bedrock\/nukkit\/nukkit.yml\r\nfi \r\n\r\nif [ ! -f nukkit.yml ]; \r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_bedrock\/nukkit\/server.properties\r\nfi", + "container": "alpine:3.10", "entrypoint": "ash" } }, @@ -51,4 +51,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From 12f59d0cf19c6029eda661c7fc2d479f0836b229 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sat, 2 Nov 2019 21:12:22 -0500 Subject: [PATCH 313/393] add missing then in if statements --- minecraft_bedrock/nukkit/egg-nukkit.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_bedrock/nukkit/egg-nukkit.json b/minecraft_bedrock/nukkit/egg-nukkit.json index 4f5af0d7..1444cb91 100644 --- a/minecraft_bedrock/nukkit/egg-nukkit.json +++ b/minecraft_bedrock/nukkit/egg-nukkit.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-10-30T23:29:01-04:00", + "exported_at": "2019-11-02T22:11:25-04: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\/", @@ -17,7 +17,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:\/\/ci.nukkitx.com\/job\/NukkitX\/job\/Nukkit\/job\/master\/lastSuccessfulBuild\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nelse\r\n wget https:\/\/ci.nukkitx.com\/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 ]; \r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_bedrock\/nukkit\/nukkit.yml\r\nfi \r\n\r\nif [ ! -f nukkit.yml ]; \r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/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:\/\/ci.nukkitx.com\/job\/NukkitX\/job\/Nukkit\/job\/master\/lastSuccessfulBuild\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nelse\r\n wget https:\/\/ci.nukkitx.com\/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\/minecraft_bedrock\/nukkit\/nukkit.yml\r\nfi\r\n\r\nif [ ! -f nukkit.yml ]; then\r\n wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_bedrock\/nukkit\/server.properties\r\nfi", "container": "alpine:3.10", "entrypoint": "ash" } From 4cf24bbec002491a6cd0e2713c097128f2a65e16 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 3 Nov 2019 20:47:39 -0500 Subject: [PATCH 314/393] Update FiveM install script Resolves #341 --- gta/fivem/egg-five-m.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gta/fivem/egg-five-m.json b/gta/fivem/egg-five-m.json index 295ce327..8d9baef5 100644 --- a/gta/fivem/egg-five-m.json +++ b/gta/fivem/egg-five-m.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-10-04T16:30:46-04:00", + "exported_at": "2019-11-03T20:45:20-05:00", "name": "FiveM", "author": "parker@parkervcp.com", "description": "A new FiveM egg for the latest builds due to recent changes in FiveM", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash \r\n\r\napk add openssl tar xz curl wget git --no-cache\r\n\r\ncd \/mnt\/server\r\n\r\nmkdir resources\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\ncd \/mnt\/server\r\n\r\necho \"Downloading the latest fivem server files\"\r\nlatest_fivem_url=`curl https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/ | grep -Eo 'href=\".*\/\"' | grep -Eo '\".*\"' | grep -Eo 'href=\".*\/\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g'`\r\n\r\necho -e \"pulling files from https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${latest_fivem_url}fx.tar.xz\"\r\nwget https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${latest_fivem_url}fx.tar.xz\r\n\r\necho \"Extracting fivem files\"\r\n\r\ntar xf fx.tar.xz\r\n\r\nrm -rf fx.tar.xz 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\/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\napk add openssl tar xz curl wget git file --no-cache\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 '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 ${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. 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\/gta\/fivem\/server.cfg >> server.cfg\r\nfi\r\n\r\nmkdir logs\/\r\n\r\necho \"install complete\"", "container": "alpine:3.10", "entrypoint": "ash" } From 533ce1f34322a54035f50d70f101b5bb01797cf4 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 3 Nov 2019 22:29:44 -0500 Subject: [PATCH 315/393] add a scripts folder as a resource This specifically adds a the github_release_grabber I wrote for the tmodloader egg. --- scripts/github_release_grabber.sh | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 scripts/github_release_grabber.sh diff --git a/scripts/github_release_grabber.sh b/scripts/github_release_grabber.sh new file mode 100644 index 00000000..d05120c8 --- /dev/null +++ b/scripts/github_release_grabber.sh @@ -0,0 +1,28 @@ +## this is a simple script to use the github API for release versions. +## this requires the egg has a variable for GITHUB_PACKAGE, VERSION and MATCH (match is to match the filename in some way) +## this supports using oauth/personal access tokens via GITHUB_USER and GITHUB_OAUTH_TOKEN (both are required.) +## if you are getting hit with GitHub API limit issues then you need to have the user and token set. + + +if [ -z "$GITHUB_USER" ] && [ -z "$GITHUB_OAUTH_TOKEN" ] ; then + echo -e "using anon api call" +else + echo -e "user and oauth token set" + alias curl='curl -u $GITHUB_USER:$GITHUB_OAUTH_TOKEN ' +fi + +## get release info and download links +LATEST_JSON=$(curl --silent "https://api.github.com/repos/$GITHUB_PACKAGE/releases/latest") +RELEASES=$(curl --silent "https://api.github.com/repos/$GITHUB_PACKAGE/releases") + +if [ -z "$VERSION" ] || [ "$VERSION" == "latest" ]; then + DOWNLOAD_LINK=$(echo $LATEST_JSON | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH}) +else + VERSION_CHECK=$(echo $RELEASES | jq -r --arg VERSION "$VERSION" '.[] | select(.tag_name==$VERSION) | .tag_name') + if [ "$VERSION" == "$VERSION_CHECK" ]; then + DOWNLOAD_LINK=$(echo $RELEASES | jq -r --arg VERSION "$VERSION" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH}) + else + echo -e "defaulting to latest release" + DOWNLOAD_LINK=$(echo $LATEST_JSON | jq .assets | jq -r .[].browser_download_url) + fi +fi \ No newline at end of file From f5c7014231090048cb1eabb984562c8e3ea27e15 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 3 Nov 2019 22:34:43 -0500 Subject: [PATCH 316/393] add file unpacker This is to unpack files. --- scripts/file_unpacker.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 scripts/file_unpacker.sh diff --git a/scripts/file_unpacker.sh b/scripts/file_unpacker.sh new file mode 100644 index 00000000..42cb8bcc --- /dev/null +++ b/scripts/file_unpacker.sh @@ -0,0 +1,15 @@ +## only needs to have the file with a file passed into it to get the filetype. +## only supports tar.gz/xz and zip currently for unpacking. +## The value for ${DOWNLOAD_LINK##*/} is + +FILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*/} | cut -d',' -f2 | cut -d' ' -f2) +if [ "$FILETYPE" == "gzip" ]; then + tar xzvf ${DOWNLOAD_LINK##*/} +elif [ "$FILETYPE" == "Zip" ]; then + unzip ${DOWNLOAD_LINK##*/} +elif [ "$FILETYPE" == "XZ" ]; then + tar xvf ${DOWNLOAD_LINK##*/} +else + echo -e "unknown filetype. Exeting" + exit 2 +fi \ No newline at end of file From 5151d88dec1dbc250aec6af8f0bc6e5933695097 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 3 Nov 2019 22:38:58 -0500 Subject: [PATCH 317/393] add notes for the unpacker script. --- scripts/file_unpacker.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/file_unpacker.sh b/scripts/file_unpacker.sh index 42cb8bcc..c5d818f5 100644 --- a/scripts/file_unpacker.sh +++ b/scripts/file_unpacker.sh @@ -1,6 +1,7 @@ ## only needs to have the file with a file passed into it to get the filetype. ## only supports tar.gz/xz and zip currently for unpacking. -## The value for ${DOWNLOAD_LINK##*/} is +## The value for ${DOWNLOAD_LINK##*/} is derived from DOWNLOAD_LINK +## if the download link is https://launcher.mojang.com/v1/objects/3dc3d84a581f14691199cf6831b71ed1296a9fdf/server.jar then the ##*/ is server.jar FILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*/} | cut -d',' -f2 | cut -d' ' -f2) if [ "$FILETYPE" == "gzip" ]; then From 5d933653d3d366e10740acef43c67cea83cfd75c Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Wed, 6 Nov 2019 18:53:24 -0500 Subject: [PATCH 318/393] add json file for the egg. this won't actually run until the PR merged. This is due to file locations. --- database/mariadb/egg-maria-d-b.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 database/mariadb/egg-maria-d-b.json diff --git a/database/mariadb/egg-maria-d-b.json b/database/mariadb/egg-maria-d-b.json new file mode 100644 index 00000000..8dd3015d --- /dev/null +++ b/database/mariadb/egg-maria-d-b.json @@ -0,0 +1,26 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-11-06T18:52:33-05:00", + "name": "MariaDB", + "author": "parker@parkervcp.com", + "description": "One of the most popular database servers. Made by the original developers of MySQL. Guaranteed to stay open source.", + "image": "quay.io\/parkervcp\/pterodactyl-images:db_mariadb", + "startup": "{ \/usr\/sbin\/mysqld & } && sleep 5 && mysql -u root", + "config": { + "files": "{\r\n \".my.cnf\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"port\": \"port = {{server.build.default.port}}\",\r\n \"bind-address\": \"bind-address=0.0.0.0\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"mysqld: ready for connections\"\r\n}", + "logs": "{}", + "stop": "shutdown; exit;" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# MariaDB Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nset -x\r\n\r\necho -e \"installing dependencies\"\r\napt-get -y update\r\napt-get -y install curl\r\n\r\n## add user\r\necho -e \"adding container user\"\r\nuseradd -d \/home\/container -m container -s \/bin\/bash\r\n\r\n## own server to container user\r\nchown container: \/mnt\/server\/\r\n\r\n## run install script as user\r\necho -e \"getting my.conf\"\r\nif [ -f \/mnt\/server\/.my.cnf ]; then\r\n echo -e \"moving current config for install\"\r\n mv \/mnt\/server\/.my.cnf \/mnt\/server\/custom.my.cnf\r\n runuser -l container -c 'curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/install.my.cnf > \/mnt\/server\/.my.cnf'\r\nelse\r\n runuser -l container -c 'curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/install.my.cnf > \/mnt\/server\/.my.cnf'\r\nfi\r\n\r\n## mkdir and install db\r\necho -e \"installing mysql database\"\r\nrunuser -l container -c 'mkdir -p \/mnt\/server\/run\/mysqld'\r\nrunuser -l container -c 'mkdir -p \/mnt\/server\/log\/mysql'\r\nrunuser -l container -c 'mkdir \/mnt\/server\/mysql'\r\n\r\nrunuser -l container -c 'mysql_install_db --defaults-file=\/mnt\/server\/.my.cnf'\r\n\r\nif [ -f \/mnt\/server\/custom.my.cnf ]; then\r\n echo -e \"moving current config back in place\"\r\n mv \/mnt\/server\/custom.my.cnf \/mnt\/server\/.my.cnf\r\nelse\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/add\/mariadb\/database\/mariadb\/my.cnf > \/mnt\/server\/.my.cnf\r\nfi\r\n\r\necho -e \"install complete\"\r\n\r\nexit", + "container": "mariadb:10.3", + "entrypoint": "bash" + } + }, + "variables": [] +} \ No newline at end of file From c298af96896a42a1b7a31b4e25d3fd8bf8ec907d Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Wed, 6 Nov 2019 18:59:03 -0500 Subject: [PATCH 319/393] add readme for mariadb --- database/mariadb/README.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 database/mariadb/README.md diff --git a/database/mariadb/README.md b/database/mariadb/README.md new file mode 100644 index 00000000..10acde47 --- /dev/null +++ b/database/mariadb/README.md @@ -0,0 +1,17 @@ +# 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 +There is no actual minimum suggested for MariaDB. + +See here https://mariadb.com/kb/en/library/mariadb-hardware-requirements/ + + +### Server Ports +Ports required to run the server in a table format. + +| Port | default | +|---------|---------| +| Server | 3306 | From 03661343bc59a14ba8b2ef61c3c045be23667888 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Wed, 6 Nov 2019 19:03:53 -0500 Subject: [PATCH 320/393] update core readme to add mariadb --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 048bc676..e5ce17c5 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,9 @@ If you are reading this it looks like you are looking to add an egg to your serv [TeamSpeak3](bots/teamspeak3) * [JTS3ServerMod](/bots/teamspeak3/jts3servermod/) +## Database Eggs +[MariaDB](/database/mariadb/) + ## Game Eggs [Arma](/arma/) From 6afdfd547e6c024a3474c0908b86e5c9c288cf94 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Wed, 6 Nov 2019 20:07:39 -0500 Subject: [PATCH 321/393] update 7dtd start for new entrypoint --- steamcmd_servers/7_days_to_die/egg-7-days-to-die.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json b/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json index 402aad78..858e871d 100644 --- a/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json +++ b/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-10-24T00:07:13-04:00", + "exported_at": "2019-11-06T20:06:59-05: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", - "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 \"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": "{}", "startup": "{\r\n \"done\": \"Connected with 7DTD server\",\r\n \"userInteraction\": []\r\n}", From fdd45557b3826458f93a1fd987e11f6f716f2eef Mon Sep 17 00:00:00 2001 From: Michael PArker Date: Fri, 8 Nov 2019 06:05:28 -0500 Subject: [PATCH 322/393] update curse naming moved forge-generic to forge moved forge-mod-generic to curseforge-generic Updated forge-generic yml to the newer curseforge-generic installer. --- .../README.md | 0 .../egg-curseforge-generic.json | 45 +++++++++++++++++++ .../forge-mod-generic/egg-forge-generic.json | 45 ------------------- .../forge/{forge-generic => forge}/README.md | 0 .../egg-forge-enhanced.json | 0 5 files changed, 45 insertions(+), 45 deletions(-) rename minecraft_java/forge/{forge-mod-generic => curseforge-generic}/README.md (100%) create mode 100644 minecraft_java/forge/curseforge-generic/egg-curseforge-generic.json delete mode 100644 minecraft_java/forge/forge-mod-generic/egg-forge-generic.json rename minecraft_java/forge/{forge-generic => forge}/README.md (100%) rename minecraft_java/forge/{forge-generic => forge}/egg-forge-enhanced.json (100%) diff --git a/minecraft_java/forge/forge-mod-generic/README.md b/minecraft_java/forge/curseforge-generic/README.md similarity index 100% rename from minecraft_java/forge/forge-mod-generic/README.md rename to minecraft_java/forge/curseforge-generic/README.md diff --git a/minecraft_java/forge/curseforge-generic/egg-curseforge-generic.json b/minecraft_java/forge/curseforge-generic/egg-curseforge-generic.json new file mode 100644 index 00000000..6f3b096c --- /dev/null +++ b/minecraft_java/forge/curseforge-generic/egg-curseforge-generic.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-11-08T06:03:05-05:00", + "name": "Curseforge Generic", + "author": "parker@parkervcp.com", + "description": "A generic egg for a forge modpack", + "image": "quay.io\/pterodactyl\/core:java", + "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}", + "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\nmkdir -p \/mnt\/server\r\n\r\nfunction install_required {\r\n apt update\r\n apt install -y curl jq unzip\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 DOWNLOAD_URL=$(echo -e ${JSON_DATA} | jq -r .latestFiles[0].downloadUrl)\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\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\r\n else\r\n echo \"No forge installer found moving on.\"\r\n fi\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 mv *universal.jar server.jar\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=\"https:\/\/minecraft.curseforge.com\/projects\/${projID}\/files\/${fileID}\/download\"\r\n echo \"mods file url: ${URL}\"\r\n # this is saving everything as \/mnt\/server\/mods\/download\r\n FINAL_URL=$(curl $URL -s -L -o \/dev\/null -w '%{url_effective}')\r\n echo \"Mod direct url: $FINAL_URL\"\r\n curl -JLO ${FINAL_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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\ninstall_required\r\nget_download\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\nelse\r\n forge_install\r\n forge_cleanup\r\nfi", + "container": "openjdk:8-jdk-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "modpack project ID", + "description": "The modpack project ID from the curseforge site on the pack page.\r\n\r\n(Ex. https:\/\/minecraft.curseforge.com\/projects\/sevtech-ages ID is 268208)", + "env_variable": "MODPACK_ID", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string" + }, + { + "name": "Modpack Version", + "description": "Version of the modpack to use.", + "env_variable": "MODPACK_VERSION", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" + } + ] +} \ No newline at end of file diff --git a/minecraft_java/forge/forge-mod-generic/egg-forge-generic.json b/minecraft_java/forge/forge-mod-generic/egg-forge-generic.json deleted file mode 100644 index e09c2dd2..00000000 --- a/minecraft_java/forge/forge-mod-generic/egg-forge-generic.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": "2019-07-23T19:59:03-04:00", - "name": "Forge Generic", - "author": "parker@parkervcp.com", - "description": "A generic egg for a forge modpack", - "image": "quay.io\/pterodactyl\/core:java", - "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 \"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\/ash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nfunction install_required {\r\n apk --no-cache --update add curl jq\r\n}\r\n\r\nfunction get_download {\r\n BASE_URL=${MODPACK_URL}\/files\r\n ID=`curl -sl ${BASE_URL} | grep -i -A9 \"${MODPACK_VERSION}\" | grep -m 1 -oE 'href=\"[^\\\"]+\"' | cut -d \"\/\" -f6 | grep -oE [0-9]+`\r\n echo \"ID: ${ID}\"\r\n\r\n SECONDURL=${BASE_URL}\/${ID}\r\n echo \"SECONDURL: ${SECONDURL}\"\r\n\r\n GOOD_ID=`curl -sl ${SECONDURL} | grep -i server | grep -i $MODPACK_VERSION | grep -Eo 'href=\"[^\\\"]+\"' | grep -o -E \"[0-9]+\" | tail -1`\r\n if [ -z \"$GOOD_ID\" ]; then\r\n GOOD_ID=$ID\r\n fi\r\n echo \"GOOD_ID: ${GOOD_ID}\"\r\n\r\n DL_URL=${MODPACK_URL}\/download\/${GOOD_ID}\/file\r\n echo \"Download_URL: ${DL_URL}\"\r\n\r\n cd \/mnt\/server\r\n\r\n echo \"Executing curl -L ${DL_URL} -o server.zip\"\r\n curl -L ${DL_URL} -o server.zip\r\n\r\n unzip -o server.zip\r\n\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\r\n else\r\n echo \"No forge installer found moving on.\"\r\n fi\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 mv *universal.jar server.jar\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=\"https:\/\/minecraft.curseforge.com\/projects\/${projID}\/files\/${fileID}\/download\"\r\n echo \"mods file url: ${URL}\"\r\n # this is saving everything as \/mnt\/server\/mods\/download\r\n FINAL_URL=$(curl $URL -s -L -o \/dev\/null -w '%{url_effective}')\r\n echo \"Mod direct url: $FINAL_URL\"\r\n curl -JLO ${FINAL_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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\ninstall_required\r\nget_download\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\nelse\r\n forge_install\r\n forge_cleanup\r\nfi", - "container": "openjdk:8-alpine", - "entrypoint": "ash" - } - }, - "variables": [ - { - "name": "modpack URL", - "description": "The modpack URL from the curseforge site.\r\n\r\n(Ex. https:\/\/minecraft.curseforge.com\/projects\/sevtech-ages)", - "env_variable": "MODPACK_URL", - "default_value": "", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string" - }, - { - "name": "Modpack Version", - "description": "Version of the modpack to use.", - "env_variable": "MODPACK_VERSION", - "default_value": "", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:20" - } - ] -} \ No newline at end of file diff --git a/minecraft_java/forge/forge-generic/README.md b/minecraft_java/forge/forge/README.md similarity index 100% rename from minecraft_java/forge/forge-generic/README.md rename to minecraft_java/forge/forge/README.md diff --git a/minecraft_java/forge/forge-generic/egg-forge-enhanced.json b/minecraft_java/forge/forge/egg-forge-enhanced.json similarity index 100% rename from minecraft_java/forge/forge-generic/egg-forge-enhanced.json rename to minecraft_java/forge/forge/egg-forge-enhanced.json From b1a455f7cb03e4045c504d26d77404943c7e8edc Mon Sep 17 00:00:00 2001 From: Michael PArker Date: Fri, 8 Nov 2019 06:09:16 -0500 Subject: [PATCH 323/393] update curseforge readme --- minecraft_java/forge/curseforge-generic/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/minecraft_java/forge/curseforge-generic/README.md b/minecraft_java/forge/curseforge-generic/README.md index 03468b6f..c92470c2 100644 --- a/minecraft_java/forge/curseforge-generic/README.md +++ b/minecraft_java/forge/curseforge-generic/README.md @@ -2,7 +2,8 @@ ### This is a generic egg for curseforge modpacks -You will need to give it a modpack URL such as `https://minecraft.curseforge.com/projects/` +You will need to give it a modpack ID. The ID for sevtech-ages is `268208` for example. +This can be found on the modpack page in the `About Project` section in the upper right corner. This will grabe the latest release when the version is set to latest. From f3d61e922420c63fc4bd9809bbcd3b4edcf1b00c Mon Sep 17 00:00:00 2001 From: Renaud Gaspard Date: Thu, 14 Nov 2019 21:54:08 +0100 Subject: [PATCH 324/393] Added SRCDS_APPID in Sven-Coop so it automatically updates on startup --- steamcmd_servers/svencoop/egg-sven-co-op.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/steamcmd_servers/svencoop/egg-sven-co-op.json b/steamcmd_servers/svencoop/egg-sven-co-op.json index 7bc00475..c341b5a7 100644 --- a/steamcmd_servers/svencoop/egg-sven-co-op.json +++ b/steamcmd_servers/svencoop/egg-sven-co-op.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-03-08T22:46:21+01:00", + "exported_at": "2019-11-14T21:43:14+01: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.", @@ -67,6 +67,15 @@ "user_viewable": 1, "user_editable": 1, "rules": "required|numeric|between:-1,255" + }, + { + "name": "Source AppID", + "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, + "rules": "required|string|max:20" } ] } \ No newline at end of file From 635949add86c3c10054116cdf3b8e8defc811986 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 15 Nov 2019 11:56:06 -0500 Subject: [PATCH 325/393] update curseforge install script changes to use the curseforge api to download mods. --- .../forge/curseforge-generic/egg-curseforge-generic.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_java/forge/curseforge-generic/egg-curseforge-generic.json b/minecraft_java/forge/curseforge-generic/egg-curseforge-generic.json index 6f3b096c..82178d97 100644 --- a/minecraft_java/forge/curseforge-generic/egg-curseforge-generic.json +++ b/minecraft_java/forge/curseforge-generic/egg-curseforge-generic.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-11-08T06:03:05-05:00", + "exported_at": "2019-11-15T11:54:24-05:00", "name": "Curseforge Generic", "author": "parker@parkervcp.com", "description": "A generic egg for a forge modpack", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nmkdir -p \/mnt\/server\r\n\r\nfunction install_required {\r\n apt update\r\n apt install -y curl jq unzip\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 DOWNLOAD_URL=$(echo -e ${JSON_DATA} | jq -r .latestFiles[0].downloadUrl)\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\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\r\n else\r\n echo \"No forge installer found moving on.\"\r\n fi\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 mv *universal.jar server.jar\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=\"https:\/\/minecraft.curseforge.com\/projects\/${projID}\/files\/${fileID}\/download\"\r\n echo \"mods file url: ${URL}\"\r\n # this is saving everything as \/mnt\/server\/mods\/download\r\n FINAL_URL=$(curl $URL -s -L -o \/dev\/null -w '%{url_effective}')\r\n echo \"Mod direct url: $FINAL_URL\"\r\n curl -JLO ${FINAL_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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\ninstall_required\r\nget_download\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\nelse\r\n forge_install\r\n forge_cleanup\r\nfi", + "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nmkdir -p \/mnt\/server\r\n\r\nfunction install_required {\r\n apt update\r\n apt install -y curl jq unzip\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 DOWNLOAD_URL=$(echo -e ${JSON_DATA} | jq -r .latestFiles[0].downloadUrl)\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\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\r\n else\r\n echo \"No forge installer found moving on.\"\r\n fi\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 mv *universal.jar server.jar\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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\ninstall_required\r\nget_download\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\nelse\r\n forge_install\r\n forge_cleanup\r\nfi", "container": "openjdk:8-jdk-slim", "entrypoint": "bash" } From a89b5400fa2f01f303b86ad7a38c866b866e4b7b Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Fri, 15 Nov 2019 16:00:06 -0500 Subject: [PATCH 326/393] update download link --- .../forge/curseforge-generic/egg-curseforge-generic.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_java/forge/curseforge-generic/egg-curseforge-generic.json b/minecraft_java/forge/curseforge-generic/egg-curseforge-generic.json index 82178d97..cf8b870b 100644 --- a/minecraft_java/forge/curseforge-generic/egg-curseforge-generic.json +++ b/minecraft_java/forge/curseforge-generic/egg-curseforge-generic.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-11-15T11:54:24-05:00", + "exported_at": "2019-11-15T15:58:47-05:00", "name": "Curseforge Generic", "author": "parker@parkervcp.com", "description": "A generic egg for a forge modpack", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nmkdir -p \/mnt\/server\r\n\r\nfunction install_required {\r\n apt update\r\n apt install -y curl jq unzip\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 DOWNLOAD_URL=$(echo -e ${JSON_DATA} | jq -r .latestFiles[0].downloadUrl)\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\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\r\n else\r\n echo \"No forge installer found moving on.\"\r\n fi\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 mv *universal.jar server.jar\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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\ninstall_required\r\nget_download\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\nelse\r\n forge_install\r\n forge_cleanup\r\nfi", + "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nmkdir -p \/mnt\/server\r\n\r\nfunction install_required {\r\n apt update\r\n apt install -y curl jq unzip\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 DOWNLOAD_URL=$(echo -e ${JSON_DATA} | jq -r .latestFiles[0].downloadUrl)\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\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\r\n else\r\n echo \"No forge installer found moving on.\"\r\n fi\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 mv *universal.jar server.jar\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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\ninstall_required\r\nget_download\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\nelse\r\n forge_install\r\n forge_cleanup\r\nfi", "container": "openjdk:8-jdk-slim", "entrypoint": "bash" } From 1f4e06644c23b17fc6c27fb8054dbf9af59524f8 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sat, 16 Nov 2019 18:20:17 -0500 Subject: [PATCH 327/393] update default download link location --- .../forge/curseforge-generic/egg-curseforge-generic.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_java/forge/curseforge-generic/egg-curseforge-generic.json b/minecraft_java/forge/curseforge-generic/egg-curseforge-generic.json index cf8b870b..6bec4389 100644 --- a/minecraft_java/forge/curseforge-generic/egg-curseforge-generic.json +++ b/minecraft_java/forge/curseforge-generic/egg-curseforge-generic.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-11-15T15:58:47-05:00", + "exported_at": "2019-11-16T18:19:38-05:00", "name": "Curseforge Generic", "author": "parker@parkervcp.com", "description": "A generic egg for a forge modpack", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nmkdir -p \/mnt\/server\r\n\r\nfunction install_required {\r\n apt update\r\n apt install -y curl jq unzip\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 DOWNLOAD_URL=$(echo -e ${JSON_DATA} | jq -r .latestFiles[0].downloadUrl)\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\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\r\n else\r\n echo \"No forge installer found moving on.\"\r\n fi\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 mv *universal.jar server.jar\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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\ninstall_required\r\nget_download\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\nelse\r\n forge_install\r\n forge_cleanup\r\nfi", + "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nmkdir -p \/mnt\/server\r\n\r\nfunction install_required {\r\n apt update\r\n apt install -y curl jq unzip\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 DOWNLOAD_URL=$(https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID}\/file\/${FILE_ID}\/download-url)\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\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\r\n else\r\n echo \"No forge installer found moving on.\"\r\n fi\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 mv *universal.jar server.jar\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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\ninstall_required\r\nget_download\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\nelse\r\n forge_install\r\n forge_cleanup\r\nfi", "container": "openjdk:8-jdk-slim", "entrypoint": "bash" } From 140b782e45ac94a4a7103abc0277a1f2d1b92b6a Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 17 Nov 2019 11:02:39 -0500 Subject: [PATCH 328/393] update download url --- .../forge/curseforge-generic/egg-curseforge-generic.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_java/forge/curseforge-generic/egg-curseforge-generic.json b/minecraft_java/forge/curseforge-generic/egg-curseforge-generic.json index 6bec4389..99325559 100644 --- a/minecraft_java/forge/curseforge-generic/egg-curseforge-generic.json +++ b/minecraft_java/forge/curseforge-generic/egg-curseforge-generic.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-11-16T18:19:38-05:00", + "exported_at": "2019-11-17T11:02:14-05:00", "name": "Curseforge Generic", "author": "parker@parkervcp.com", "description": "A generic egg for a forge modpack", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nmkdir -p \/mnt\/server\r\n\r\nfunction install_required {\r\n apt update\r\n apt install -y curl jq unzip\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 DOWNLOAD_URL=$(https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID}\/file\/${FILE_ID}\/download-url)\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\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\r\n else\r\n echo \"No forge installer found moving on.\"\r\n fi\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 mv *universal.jar server.jar\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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\ninstall_required\r\nget_download\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\nelse\r\n forge_install\r\n forge_cleanup\r\nfi", + "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nmkdir -p \/mnt\/server\r\n\r\nfunction install_required {\r\n apt update\r\n apt install -y curl jq unzip\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 DOWNLOAD_URL=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID}\/file\/${FILE_ID}\/download-url)\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\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\r\n else\r\n echo \"No forge installer found moving on.\"\r\n fi\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 mv *universal.jar server.jar\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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\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 \r\n echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n echo -r \"running curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O \\n\"\r\n curl -sS https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -O\r\n java -jar installer.jar --installServer\r\n mv *universal.jar server.jar\r\n rm installer.jar\r\n}\r\n\r\ninstall_required\r\nget_download\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\nelse\r\n forge_install\r\n forge_cleanup\r\nfi", "container": "openjdk:8-jdk-slim", "entrypoint": "bash" } From 441c48212dda4f39b4d9f9224ad3a5ebcd6bd589 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 1 Dec 2019 20:04:10 -0500 Subject: [PATCH 329/393] add steamcmd install script add a steamcmd install script for people to use. --- scripts/steamcmd_installer.sh | 37 +++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 scripts/steamcmd_installer.sh diff --git a/scripts/steamcmd_installer.sh b/scripts/steamcmd_installer.sh new file mode 100644 index 00000000..e99847e4 --- /dev/null +++ b/scripts/steamcmd_installer.sh @@ -0,0 +1,37 @@ +#!/bin/bash +# steamcmd Base Installation Script +# +# Server Files: /mnt/server +# Image to install with is 'ubuntu:18.04' +apt -y update +apt -y --no-install-recommends install curl lib32gcc1 ca-certificates + +## just in case someone removed the defaults. +if [ "${STEAM_USER}" == "" ]; then + STEAM_USER=anonymous + STEAM_PASS="" + STEAM_AUTH="" +fi + +## download and install steamcmd +cd /tmp +mkdir -p /mnt/server/steamcmd +curl -sSL -o steamcmd.tar.gz http://media.steampowered.com/installer/steamcmd_linux.tar.gz +tar -xzvf steamcmd.tar.gz -C /mnt/server/steamcmd +cd /mnt/server/steamcmd + +# SteamCMD fails otherwise for some reason, even running as root. +# This is changed at the end of the install process anyways. +chown -R root:root /mnt +export HOME=/mnt/server + +## install game using steamcmd +./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. + +## set up 32 bit libraries +mkdir -p /mnt/server/.steam/sdk32 +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 \ No newline at end of file From 3b378af9bf1d413488ef4cb49a692c97a7ed970b Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 1 Dec 2019 20:06:13 -0500 Subject: [PATCH 330/393] update forge install script Update forge enhanced install script. --- minecraft_java/forge/forge/egg-forge-enhanced.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_java/forge/forge/egg-forge-enhanced.json b/minecraft_java/forge/forge/egg-forge-enhanced.json index 06ce8b5c..c97fa8a6 100644 --- a/minecraft_java/forge/forge/egg-forge-enhanced.json +++ b/minecraft_java/forge/forge/egg-forge-enhanced.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-08-25T00:22:02-04:00", + "exported_at": "2019-12-01T20:05:28-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.", @@ -17,7 +17,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\necho -e \"minecraft version: ${MC_VERSION}\"\r\necho -e \"build type: ${BUILD_TYPE}\"\r\n\r\nif [ \"$MC_VERSION\" == \"latest\" ]; then\r\n echo -e \"getting latest recommended version of forge.\"\r\n LATEST_RECOMMENDED=$(curl -s https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json | jq -r '.promos.recommended')\r\n MC_VERSION=$(curl -s https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json | jq --arg LATEST \"$LATEST_RECOMMENDED\" '.promos | to_entries[] | select(.value==$LATEST)' | jq -rs '.[0].key' | sed 's\/-recommended\/\/g')\r\n\tBUILD_TYPE=recommended\r\n\t\r\n\techo -e \"minecraft version: ${MC_VERSION}\"\r\n\techo -e \"build type: ${BUILD_TYPE}\"\r\nfi\r\n\r\n## some variables for getting versions and things\r\nFILE_SITE=$(curl -s https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json | jq -r '.homepage')\r\nVERSION_KEY=$(curl -s https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json | jq -r --arg MC_VERSION \"$MC_VERSION\" --arg BUILD_TYPE \"$BUILD_TYPE\" '.promos | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n## locating the forge version\r\nif [ \"${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=$(curl -s https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json | jq -r --arg MC_VERSION \"$MC_VERSION\" '.promos | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"latest\"))')\r\nfi\r\n\r\n## Error if the mc version set wasn't valid.\r\nif [ \"${VERSION_KEY}\" == \"\" ]; 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\nfi\r\n\r\nFORGE_VERSION=$(curl -s https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\nif [ \"$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\nelse\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\nfi\r\n\r\n#Go into main direction\r\ncd \/mnt\/server\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\ncurl -s -o installer.jar -sS ${DOWNLOAD_LINK}-installer.jar\r\ncurl -s -o $SERVER_JARFILE -sS ${DOWNLOAD_LINK}-universal.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ] || [ ! -f .\/$SERVER_JARFILE ]; 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\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\necho -e \"minecraft version: ${MC_VERSION}\"\r\necho -e \"build type: ${BUILD_TYPE}\"\r\n\r\nJSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\nif [ \"${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\t\r\n\techo -e \"minecraft version: ${MC_VERSION}\"\r\n\techo -e \"build type: ${BUILD_TYPE}\"\r\nfi\r\n\r\n## some variables for getting versions and things\r\nFILE_SITE=$(echo -e ${JSON_DATA} | jq -r '.homepage')\r\nVERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n## locating the forge version\r\nif [ \"${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 | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"latest\"))')\r\nfi\r\n\r\n## Error if the mc version set wasn't valid.\r\nif [ \"${VERSION_KEY}\" == \"\" ]; 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\nfi\r\n\r\nFORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\nif [ \"${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\nelse\r\n DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\nfi\r\n\r\n#Go into main direction\r\ncd \/mnt\/server\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\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 if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-universal.jar; then\r\n echo -e \"universal jar download link is valid.\"\r\n else\r\n echo -e \"link is invalid closing out\"\r\n exit 3\r\n fi\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 installer.jar -sS ${DOWNLOAD_LINK}-installer.jar\r\ncurl -s -o $SERVER_JARFILE -sS ${DOWNLOAD_LINK}-universal.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ] || [ ! -f .\/$SERVER_JARFILE ]; 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\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" } From bc042cc92bf4b71d4a80c545f397cd34756b61c3 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Thu, 5 Dec 2019 19:00:08 -0500 Subject: [PATCH 331/393] Fix config download link --- database/mariadb/egg-maria-d-b.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/mariadb/egg-maria-d-b.json b/database/mariadb/egg-maria-d-b.json index 8dd3015d..13b75295 100644 --- a/database/mariadb/egg-maria-d-b.json +++ b/database/mariadb/egg-maria-d-b.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# MariaDB Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nset -x\r\n\r\necho -e \"installing dependencies\"\r\napt-get -y update\r\napt-get -y install curl\r\n\r\n## add user\r\necho -e \"adding container user\"\r\nuseradd -d \/home\/container -m container -s \/bin\/bash\r\n\r\n## own server to container user\r\nchown container: \/mnt\/server\/\r\n\r\n## run install script as user\r\necho -e \"getting my.conf\"\r\nif [ -f \/mnt\/server\/.my.cnf ]; then\r\n echo -e \"moving current config for install\"\r\n mv \/mnt\/server\/.my.cnf \/mnt\/server\/custom.my.cnf\r\n runuser -l container -c 'curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/install.my.cnf > \/mnt\/server\/.my.cnf'\r\nelse\r\n runuser -l container -c 'curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/install.my.cnf > \/mnt\/server\/.my.cnf'\r\nfi\r\n\r\n## mkdir and install db\r\necho -e \"installing mysql database\"\r\nrunuser -l container -c 'mkdir -p \/mnt\/server\/run\/mysqld'\r\nrunuser -l container -c 'mkdir -p \/mnt\/server\/log\/mysql'\r\nrunuser -l container -c 'mkdir \/mnt\/server\/mysql'\r\n\r\nrunuser -l container -c 'mysql_install_db --defaults-file=\/mnt\/server\/.my.cnf'\r\n\r\nif [ -f \/mnt\/server\/custom.my.cnf ]; then\r\n echo -e \"moving current config back in place\"\r\n mv \/mnt\/server\/custom.my.cnf \/mnt\/server\/.my.cnf\r\nelse\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/add\/mariadb\/database\/mariadb\/my.cnf > \/mnt\/server\/.my.cnf\r\nfi\r\n\r\necho -e \"install complete\"\r\n\r\nexit", + "script": "#!\/bin\/bash\r\n# MariaDB Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nset -x\r\n\r\necho -e \"installing dependencies\"\r\napt-get -y update\r\napt-get -y install curl\r\n\r\n## add user\r\necho -e \"adding container user\"\r\nuseradd -d \/home\/container -m container -s \/bin\/bash\r\n\r\n## own server to container user\r\nchown container: \/mnt\/server\/\r\n\r\n## run install script as user\r\necho -e \"getting my.conf\"\r\nif [ -f \/mnt\/server\/.my.cnf ]; then\r\n echo -e \"moving current config for install\"\r\n mv \/mnt\/server\/.my.cnf \/mnt\/server\/custom.my.cnf\r\n runuser -l container -c 'curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/install.my.cnf > \/mnt\/server\/.my.cnf'\r\nelse\r\n runuser -l container -c 'curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/install.my.cnf > \/mnt\/server\/.my.cnf'\r\nfi\r\n\r\n## mkdir and install db\r\necho -e \"installing mysql database\"\r\nrunuser -l container -c 'mkdir -p \/mnt\/server\/run\/mysqld'\r\nrunuser -l container -c 'mkdir -p \/mnt\/server\/log\/mysql'\r\nrunuser -l container -c 'mkdir \/mnt\/server\/mysql'\r\n\r\nrunuser -l container -c 'mysql_install_db --defaults-file=\/mnt\/server\/.my.cnf'\r\n\r\nif [ -f \/mnt\/server\/custom.my.cnf ]; then\r\n echo -e \"moving current config back in place\"\r\n mv \/mnt\/server\/custom.my.cnf \/mnt\/server\/.my.cnf\r\nelse\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/mariadb\/database\/mariadb\/my.cnf > \/mnt\/server\/.my.cnf\r\nfi\r\n\r\necho -e \"install complete\"\r\n\r\nexit", "container": "mariadb:10.3", "entrypoint": "bash" } From 123e8e037ee830f95ca0c83fb95a3b18d5042919 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 8 Dec 2019 10:17:37 -0500 Subject: [PATCH 332/393] Update ark install script use the new steamcmd install script. --- .../egg-ark--survival-evolved.json | 39 +++++++------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json b/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json index 1017fefb..48cb562d 100644 --- a/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json +++ b/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-10-29T20:51:32+01:00", + "exported_at": "2019-12-08T10:15:59-05: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\/pterodactyl\/core:source", - "startup": "\"cd ShooterGame\/Binaries\/Linux && .\/ShooterGameServer {{SERVER_MAP}}?listen?SessionName='{{SESSION_NAME}}'?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?Port={{PORT}}?MaxPlayers={{SERVER_MAX_PLAYERS}}?RCONPort={{RCON_PORT}}?QueryPort={{QUERY_PORT}}?RCONEnabled={{ENABLE_RCON}} -server -log\"", + "startup": "\"cd ShooterGame\/Binaries\/Linux && .\/ShooterGameServer {{SERVER_MAP}}?listen?SessionName='{{SESSION_NAME}}'?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?Port={{PORT}}?RCONPort={{RCON_PORT}}?QueryPort={{QUERY_PORT}}?RCONEnabled={{ENABLE_RCON}} -server -log\"", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Setting breakpad minidump AppID = 346110\",\r\n \"userInteraction\": []\r\n}", @@ -17,12 +17,21 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# ARK: 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\nmkdir -p \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\n\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\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\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 376030 +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\ncd \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\n\r\nln -sf ..\/..\/..\/..\/..\/Steam\/steamapps steamapps\r\n\r\ncd \/mnt\/server", - "container": "ubuntu:16.04", + "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\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## ARK specific setup.\r\n## copy steamcmd folder to the thirdparty folder for ark\r\ncp -r $(pwd) \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux", + "container": "ubuntu:18.04", "entrypoint": "bash" } }, "variables": [ + { + "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": 1, + "user_editable": 0, + "rules": "nullable|numeric" + }, { "name": "Server Name", "description": "ARK server name", @@ -48,7 +57,7 @@ "default_value": "", "user_viewable": 1, "user_editable": 1, - "rules": "nullable|alpha_dash|between:1,100" + "rules": "nullable|alpha_dash|between:1,100" }, { "name": "Server Port", @@ -86,24 +95,6 @@ "user_editable": 1, "rules": "required|numeric" }, - { - "name": "Maximum Players", - "description": "Specifies the maximum number of players that can play on the server simultaneously.", - "env_variable": "SERVER_MAX_PLAYERS", - "default_value": "20", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|numeric|digits_between:1,4" - }, - { - "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": 1, - "user_editable": 0, - "rules": "nullable|numeric" - }, { "name": "Server Map", "description": "Available Maps: TheIsland, TheCenter, Ragnarok, ScorchedEarth_P, Aberration_P, Extinction", @@ -114,4 +105,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From 3f91a4d7b6c2ca3d1a8c80315261b23453702afb Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 8 Dec 2019 10:18:25 -0500 Subject: [PATCH 333/393] update steamcmd script Use the newer steamcmd zip. --- scripts/steamcmd_installer.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/steamcmd_installer.sh b/scripts/steamcmd_installer.sh index e99847e4..876b2ab0 100644 --- a/scripts/steamcmd_installer.sh +++ b/scripts/steamcmd_installer.sh @@ -16,7 +16,7 @@ fi ## download and install steamcmd cd /tmp mkdir -p /mnt/server/steamcmd -curl -sSL -o steamcmd.tar.gz http://media.steampowered.com/installer/steamcmd_linux.tar.gz +curl -sSL -o steamcmd.tar.gz https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz tar -xzvf steamcmd.tar.gz -C /mnt/server/steamcmd cd /mnt/server/steamcmd @@ -26,7 +26,7 @@ chown -R root:root /mnt export HOME=/mnt/server ## install game using steamcmd -./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. +./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 ## set up 32 bit libraries mkdir -p /mnt/server/.steam/sdk32 From a7c9353fe44cbfe33979ac425ef21a9ab4836c6d Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 8 Dec 2019 11:10:53 -0500 Subject: [PATCH 334/393] update stock egg install scripts --- .../egg-ark--survival-evolved.json | 99 ++++++++++++------- ...egg-counter--strike--global-offensive.json | 8 +- .../egg-custom-source-engine-game.json | 8 +- stock-eggs/source-engine/egg-garrys-mod.json | 10 +- stock-eggs/source-engine/egg-insurgency.json | 10 +- .../source-engine/egg-team-fortress2.json | 6 +- 6 files changed, 84 insertions(+), 57 deletions(-) diff --git a/stock-eggs/source-engine/egg-ark--survival-evolved.json b/stock-eggs/source-engine/egg-ark--survival-evolved.json index ad08c705..1017fefb 100644 --- a/stock-eggs/source-engine/egg-ark--survival-evolved.json +++ b/stock-eggs/source-engine/egg-ark--survival-evolved.json @@ -3,26 +3,35 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-07-07T06:35:40-04:00", + "exported_at": "2018-10-29T20:51:32+01:00", "name": "Ark: Survival Evolved", - "author": "support@pterodactyl.io", + "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\/pterodactyl\/core:source", - "startup": ".\/ShooterGame\/Binaries\/Linux\/ShooterGameServer TheIsland?listen?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?Port={{SERVER_PORT}}?MaxPlayers={{SERVER_MAX_PLAYERS}}?QueryPort={{QUERY_PORT}}?bRawScokets?RCONPort={{RCON_PORT}}", + "startup": "\"cd ShooterGame\/Binaries\/Linux && .\/ShooterGameServer {{SERVER_MAP}}?listen?SessionName='{{SESSION_NAME}}'?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?Port={{PORT}}?MaxPlayers={{SERVER_MAX_PLAYERS}}?RCONPort={{RCON_PORT}}?QueryPort={{QUERY_PORT}}?RCONEnabled={{ENABLE_RCON}} -server -log\"", "config": { - "files": "{\r\n \"ShooterGame\/Saved\/Config\/LinuxServer\/GameUserSettings.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"SessionName=\": \"SessionName={{server.build.env.SESSION_NAME}}\",\r\n \"RCONPort=\": \"RCONPort={{server.build.env.RCON_PORT}}\"\r\n }\r\n }\r\n}", + "files": "{}", "startup": "{\r\n \"done\": \"Setting breakpad minidump AppID = 346110\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", - "stop": "quit" + "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "stop": "^C" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# ARK: 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\nmkdir -p \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\n\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\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\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\r\n\r\nHOME=\/mnt\/server\r\nln -s ~\/Steam\/steamapps ~\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux", - "container": "ubuntu:18.04", + "script": "#!\/bin\/bash\r\n# ARK: 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\nmkdir -p \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\n\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\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\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 376030 +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\ncd \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\n\r\nln -sf ..\/..\/..\/..\/..\/Steam\/steamapps steamapps\r\n\r\ncd \/mnt\/server", + "container": "ubuntu:16.04", "entrypoint": "bash" } }, "variables": [ + { + "name": "Server Name", + "description": "ARK server name", + "env_variable": "SESSION_NAME", + "default_value": "ARK SERVER", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:128" + }, { "name": "Server Password", "description": "If specified, players must provide this password to join the server.", @@ -36,10 +45,46 @@ "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": "APa55word", + "default_value": "", "user_viewable": 1, "user_editable": 1, - "rules": "nullable|alpha_dash|between:1,100" + "rules": "nullable|alpha_dash|between:1,100" + }, + { + "name": "Server Port", + "description": "ARK server port used by client.", + "env_variable": "PORT", + "default_value": "7777", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|numeric" + }, + { + "name": "Use Rcon", + "description": "Enable or disable rcon system. (true or false)", + "env_variable": "ENABLE_RCON", + "default_value": "false", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:5" + }, + { + "name": "Rcon Port", + "description": "ARK rcon port used by rcon tools.", + "env_variable": "RCON_PORT", + "default_value": "27020", + "user_viewable": 1, + "user_editable": 1, + "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": 1, + "user_editable": 1, + "rules": "required|numeric" }, { "name": "Maximum Players", @@ -51,40 +96,22 @@ "rules": "required|numeric|digits_between:1,4" }, { - "name": "Game ID", - "description": "The ID corresponding to the game to download and run using SRCDS.", + "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": 0, - "user_editable": 0, - "rules": "required|string|max:20" - }, - { - "name": "Query Port", - "description": "This is the steam query port.", - "env_variable": "QUERY_PORT", - "default_value": "27015", "user_viewable": 1, "user_editable": 0, - "rules": "required|string|max:20" + "rules": "nullable|numeric" }, { - "name": "Session Name", - "description": "The name that shows up in the server list", - "env_variable": "SESSION_NAME", - "default_value": "ARK Server", + "name": "Server Map", + "description": "Available Maps: TheIsland, TheCenter, Ragnarok, ScorchedEarth_P, Aberration_P, Extinction", + "env_variable": "SERVER_MAP", + "default_value": "TheIsland", "user_viewable": 1, "user_editable": 1, - "rules": "required|string|max:64" - }, - { - "name": "RCON Port", - "description": "This is the rcon port for the server", - "env_variable": "RCON_PORT", - "default_value": "27020", - "user_viewable": 1, - "user_editable": 0, "rules": "required|string|max:20" } ] -} \ 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 index ad921025..191aa99e 100644 --- a/stock-eggs/source-engine/egg-counter--strike--global-offensive.json +++ b/stock-eggs/source-engine/egg-counter--strike--global-offensive.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-06-19T07:46:06-04:00", + "exported_at": "2019-12-08T10:52:19-05: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.", @@ -17,8 +17,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\n# CSGO Installation Script\n#\n# Server Files: \/mnt\/server\napt -y update\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\n\ncd \/tmp\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\n\nmkdir -p \/mnt\/server\/steamcmd\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\ncd \/mnt\/server\/steamcmd\n\n# SteamCMD fails otherwise for some reason, even running as root.\n# This is changed at the end of the install process anyways.\nchown -R root:root \/mnt\n\nexport HOME=\/mnt\/server\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 740 +quit\n\nmkdir -p \/mnt\/server\/.steam\/sdk32\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", - "container": "ubuntu:16.04", + "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" } }, @@ -51,4 +51,4 @@ "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 index 7a7b40bd..aae3b3f3 100644 --- a/stock-eggs/source-engine/egg-custom-source-engine-game.json +++ b/stock-eggs/source-engine/egg-custom-source-engine-game.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-01-21T16:59:45-06:00", + "exported_at": "2019-12-08T10:54:26-05: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.", @@ -17,8 +17,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\n# SRCDS Base Installation Script\n#\n# Server Files: \/mnt\/server\napt -y update\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\n\ncd \/tmp\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\n\nmkdir -p \/mnt\/server\/steamcmd\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\ncd \/mnt\/server\/steamcmd\n\n# SteamCMD fails otherwise for some reason, even running as root.\n# This is changed at the end of the install process anyways.\nchown -R root:root \/mnt\n\nexport HOME=\/mnt\/server\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} +quit\n\nmkdir -p \/mnt\/server\/.steam\/sdk32\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", - "container": "ubuntu:16.04", + "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" } }, @@ -51,4 +51,4 @@ "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 index c0e4f31b..17940e8f 100644 --- a/stock-eggs/source-engine/egg-garrys-mod.json +++ b/stock-eggs/source-engine/egg-garrys-mod.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-02-16T14:20:52-05:00", + "exported_at": "2019-12-08T10:56:42-05: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 +map {{SRCDS_MAP}} +gamemode {{GAMEMODE}} -strictportbind -norestart +sv_setsteamaccount {{STEAM_ACC}} +host_workshop_collection {{WORKSHOP_ID}} +maxplayers {{MAX_PLAYERS}} -tickrate {{TICKRATE}}", + "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}}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"gameserver Steam ID\",\r\n \"userInteraction\": []\r\n}", @@ -17,8 +17,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Garry's Mod 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 4020 +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/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\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": "ubuntu:16.04", + "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\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\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": "ubuntu:18.04", "entrypoint": "bash" } }, @@ -87,4 +87,4 @@ "rules": "required|integer|max:100" } ] -} +} \ No newline at end of file diff --git a/stock-eggs/source-engine/egg-insurgency.json b/stock-eggs/source-engine/egg-insurgency.json index 4e3df4a8..7f0c76be 100644 --- a/stock-eggs/source-engine/egg-insurgency.json +++ b/stock-eggs/source-engine/egg-insurgency.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-01-21T16:59:48-06:00", + "exported_at": "2019-12-08T10:57:32-05: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.", @@ -17,8 +17,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\n# SRCDS Base Installation Script\n#\n# Server Files: \/mnt\/server\napt -y update\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\n\ncd \/tmp\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\n\nmkdir -p \/mnt\/server\/steamcmd\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\ncd \/mnt\/server\/steamcmd\n\n# SteamCMD fails otherwise for some reason, even running as root.\n# This is changed at the end of the install process anyways.\nchown -R root:root \/mnt\n\nexport HOME=\/mnt\/server\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} +quit\n\nmkdir -p \/mnt\/server\/.steam\/sdk32\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", - "container": "ubuntu:16.04", + "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" } }, @@ -27,10 +27,10 @@ "name": "Game ID", "description": "The ID corresponding to the game to download and run using SRCDS.", "env_variable": "SRCDS_APPID", - "default_value": "17705", + "default_value": "237410", "user_viewable": 1, "user_editable": 0, - "rules": "required|regex:\/^(17705)$\/" + "rules": "required|regex:\/^(237410)$\/" }, { "name": "Game Name", diff --git a/stock-eggs/source-engine/egg-team-fortress2.json b/stock-eggs/source-engine/egg-team-fortress2.json index ae443370..159e7bf9 100644 --- a/stock-eggs/source-engine/egg-team-fortress2.json +++ b/stock-eggs/source-engine/egg-team-fortress2.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-01-21T16:59:45-06:00", + "exported_at": "2019-12-08T10:58:48-05: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.", @@ -17,8 +17,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\n# SRCDS Base Installation Script\n#\n# Server Files: \/mnt\/server\napt -y update\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\n\ncd \/tmp\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\n\nmkdir -p \/mnt\/server\/steamcmd\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\ncd \/mnt\/server\/steamcmd\n\n# SteamCMD fails otherwise for some reason, even running as root.\n# This is changed at the end of the install process anyways.\nchown -R root:root \/mnt\n\nexport HOME=\/mnt\/server\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} +quit\n\nmkdir -p \/mnt\/server\/.steam\/sdk32\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", - "container": "ubuntu:16.04", + "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" } }, From 9c25b8ca8fd7397e95a7bdc9ceb04c207493c8ff Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 8 Dec 2019 11:11:57 -0500 Subject: [PATCH 335/393] update tmodloader egg Use debian-mono-5 image as a base change startup command --- terraria/tmodloader/egg-t-modloader.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/terraria/tmodloader/egg-t-modloader.json b/terraria/tmodloader/egg-t-modloader.json index d49516c2..c18d8edb 100644 --- a/terraria/tmodloader/egg-t-modloader.json +++ b/terraria/tmodloader/egg-t-modloader.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-10-30T21:46:07-04:00", + "exported_at": "2019-12-08T11:10:18-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+.", - "image": "quay.io\/parkervcp\/pterodactyl-images:base_ubuntu", - "startup": ".\/TerrariaServer.bin.x86_64 -ip 0.0.0.0 -port ${SERVER_PORT} -maxplayers ${MAX_PLAYERS} -world ~\/saves\/Worlds\/${WORLD_NAME}.wld -worldname ${WORLD_NAME} -autocreate ${WORLD_SIZE} -savedirectory ~\/ -tmlsavedirectory ~\/saves -modpath ~\/mods", + "image": "quay.io\/parkervcp\/pterodactyl-images:debian_mono-5", + "startup": ".\/tModLoaderServer -ip 0.0.0.0 -port ${SERVER_PORT} -maxplayers ${MAX_PLAYERS} -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}", From 3167785e0891c92b86755cded5e9862f5fc8f0ce Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 8 Dec 2019 11:55:36 -0500 Subject: [PATCH 336/393] update terraria readme files This adds a callout about the startup for tmodloader and tshock --- terraria/README.md | 1 - terraria/tmodloader/README.md | 10 ++++++++++ terraria/tshock/README.md | 11 ++++++++++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/terraria/README.md b/terraria/README.md index a91dae80..1a8469da 100644 --- a/terraria/README.md +++ b/terraria/README.md @@ -3,7 +3,6 @@ ## 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 diff --git a/terraria/tmodloader/README.md b/terraria/tmodloader/README.md index 932dc9fe..4fa490da 100644 --- a/terraria/tmodloader/README.md +++ b/terraria/tmodloader/README.md @@ -17,3 +17,13 @@ tModloader, like Terraria, only requires a single port to run. The default is 77 | Game | 7777 | #### Plugins may require ports to be added to the server. + +### Extra Information + +If you want to download mods in the console, the startup command has to be changed. + +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. +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 diff --git a/terraria/tshock/README.md b/terraria/tshock/README.md index 998d8bec..fec56632 100644 --- a/terraria/tshock/README.md +++ b/terraria/tshock/README.md @@ -12,4 +12,13 @@ TShock, like Terraria, only requires a single port to run. The default is 7777 |---------|---------| | Game | 7777 | -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. + +### Extra Information +If you want to download mods in the console, the startup command has to be changed. + +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 From 58963d627cb069e86bb6d99100c397c5adfe3231 Mon Sep 17 00:00:00 2001 From: Nikita Obrekht Date: Tue, 10 Dec 2019 22:50:25 +0200 Subject: [PATCH 337/393] Fix MariaDB config URL --- database/mariadb/egg-maria-d-b.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/mariadb/egg-maria-d-b.json b/database/mariadb/egg-maria-d-b.json index 13b75295..12afd857 100644 --- a/database/mariadb/egg-maria-d-b.json +++ b/database/mariadb/egg-maria-d-b.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# MariaDB Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nset -x\r\n\r\necho -e \"installing dependencies\"\r\napt-get -y update\r\napt-get -y install curl\r\n\r\n## add user\r\necho -e \"adding container user\"\r\nuseradd -d \/home\/container -m container -s \/bin\/bash\r\n\r\n## own server to container user\r\nchown container: \/mnt\/server\/\r\n\r\n## run install script as user\r\necho -e \"getting my.conf\"\r\nif [ -f \/mnt\/server\/.my.cnf ]; then\r\n echo -e \"moving current config for install\"\r\n mv \/mnt\/server\/.my.cnf \/mnt\/server\/custom.my.cnf\r\n runuser -l container -c 'curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/install.my.cnf > \/mnt\/server\/.my.cnf'\r\nelse\r\n runuser -l container -c 'curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/install.my.cnf > \/mnt\/server\/.my.cnf'\r\nfi\r\n\r\n## mkdir and install db\r\necho -e \"installing mysql database\"\r\nrunuser -l container -c 'mkdir -p \/mnt\/server\/run\/mysqld'\r\nrunuser -l container -c 'mkdir -p \/mnt\/server\/log\/mysql'\r\nrunuser -l container -c 'mkdir \/mnt\/server\/mysql'\r\n\r\nrunuser -l container -c 'mysql_install_db --defaults-file=\/mnt\/server\/.my.cnf'\r\n\r\nif [ -f \/mnt\/server\/custom.my.cnf ]; then\r\n echo -e \"moving current config back in place\"\r\n mv \/mnt\/server\/custom.my.cnf \/mnt\/server\/.my.cnf\r\nelse\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/mariadb\/database\/mariadb\/my.cnf > \/mnt\/server\/.my.cnf\r\nfi\r\n\r\necho -e \"install complete\"\r\n\r\nexit", + "script": "#!\/bin\/bash\r\n# MariaDB Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nset -x\r\n\r\necho -e \"installing dependencies\"\r\napt-get -y update\r\napt-get -y install curl\r\n\r\n## add user\r\necho -e \"adding container user\"\r\nuseradd -d \/home\/container -m container -s \/bin\/bash\r\n\r\n## own server to container user\r\nchown container: \/mnt\/server\/\r\n\r\n## run install script as user\r\necho -e \"getting my.conf\"\r\nif [ -f \/mnt\/server\/.my.cnf ]; then\r\n echo -e \"moving current config for install\"\r\n mv \/mnt\/server\/.my.cnf \/mnt\/server\/custom.my.cnf\r\n runuser -l container -c 'curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/install.my.cnf > \/mnt\/server\/.my.cnf'\r\nelse\r\n runuser -l container -c 'curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/install.my.cnf > \/mnt\/server\/.my.cnf'\r\nfi\r\n\r\n## mkdir and install db\r\necho -e \"installing mysql database\"\r\nrunuser -l container -c 'mkdir -p \/mnt\/server\/run\/mysqld'\r\nrunuser -l container -c 'mkdir -p \/mnt\/server\/log\/mysql'\r\nrunuser -l container -c 'mkdir \/mnt\/server\/mysql'\r\n\r\nrunuser -l container -c 'mysql_install_db --defaults-file=\/mnt\/server\/.my.cnf'\r\n\r\nif [ -f \/mnt\/server\/custom.my.cnf ]; then\r\n echo -e \"moving current config back in place\"\r\n mv \/mnt\/server\/custom.my.cnf \/mnt\/server\/.my.cnf\r\nelse\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/my.cnf > \/mnt\/server\/.my.cnf\r\nfi\r\n\r\necho -e \"install complete\"\r\n\r\nexit", "container": "mariadb:10.3", "entrypoint": "bash" } From 25e5e12be5c2c2877f45122d82b3199f9aece857 Mon Sep 17 00:00:00 2001 From: Nikita Obrekht Date: Wed, 11 Dec 2019 00:46:49 +0200 Subject: [PATCH 338/393] Fix SpongeForge Forge download url --- minecraft_java/spongeforge/egg-sponge-forge.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_java/spongeforge/egg-sponge-forge.json b/minecraft_java/spongeforge/egg-sponge-forge.json index bf83b774..76fa3a1f 100644 --- a/minecraft_java/spongeforge/egg-sponge-forge.json +++ b/minecraft_java/spongeforge/egg-sponge-forge.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-09-13T20:47:26-04:00", + "exported_at": "2019-12-11T01:44:03+03:00", "name": "SpongeForge", "author": "parker@parkervcp.com", "description": "A community-driven open source Minecraft: Java Edition modding platform.", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# SpongeForge 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\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\r\nif [ -z ${SF_VERSION} ] || [ \"$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/${SF_VERSION})\" == \"Unknown version\" ]; then\r\n echo -e \"defaulting to recommended\"\r\n SF_VERSION=\"recommended\"\r\nfi\r\n\r\nif [ \"${SF_VERSION}\" == \"recommended\" ]; then\r\n echo -e \"using recommended SpongeForge version\"\r\n SF_VERSION=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/recommended | jq -r '.version')\r\n echo -e \"found SpongeForge Version ${SF_VERSION}\"\r\n SF_DL_LINK=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/recommended | jq -r '.artifacts.\"\".url')\r\n FORGE_DOWNLOAD_VERSION=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/recommended | jq -r '.dependencies.forge')\r\n echo -e \"found Forge Version ${FORGE_DOWNLOAD_VERSION}\"\r\n FORGE_DL_LINK=https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/${FORGE_DOWNLOAD_VERSION}\/forge-${FORGE_DOWNLOAD_VERSION}\r\nelif [ \"${SF_VERSION}\" == \"latest\" ]; then\r\n echo -e \"using latest SpongForge version\"\r\n SF_VERSION=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge | jq -r '.buildTypes.stable.latest.version')\r\n echo -e \"found SpongeForge Version ${SF_VERSION}\"\r\n SF_DL_LINK=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/${SF_VERSION} | jq -r '.artifacts.\"\".url')\r\n FORGE_DOWNLOAD_VERSION=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/${SF_VERSION} | jq -r '.dependencies.forge')\r\n \r\n FORGE_DL_LINK=https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/${FORGE_DOWNLOAD_VERSION}\/forge-${FORGE_DOWNLOAD_VERSION}\r\nelse\r\n echo -e \"found SpongeForge Version ${SF_VERSION}\"\r\n SF_DL_LINK=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/${SF_VERSION} | jq -r '.artifacts.\"\".url')\r\n FORGE_DOWNLOAD_VERSION=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/${SF_VERSION} | jq -r '.dependencies.forge')\r\n echo -e \"found Forge Version ${FORGE_DOWNLOAD_VERSION}\"\r\n FORGE_DL_LINK=https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/${FORGE_DOWNLOAD_VERSION}\/forge-${FORGE_DOWNLOAD_VERSION}\r\nfi\r\n\r\nif [ -f server.jar ] && [ $(sha1sum server.jar | awk '{ print $1 }') == $(curl -s ${FORGE_DL_LINK}-universal.jar.sha1) ]; then\r\n echo -e \"Already have the correct forge version\"\r\nelse\r\n echo -e \"Downloading forge version ${FORGE_VERSION}\"\r\n echo -e \"running: curl -s -o installer.jar -o ${FORGE_DL_LINK}-installer.jar\"\r\n curl -s -o installer.jar ${FORGE_DL_LINK}-installer.jar\r\n echo -e \"running: curl -s -o ${SERVER_JARFILE} -o ${FORGE_DL_LINK}-universal.jar\"\r\n curl -s -o ${SERVER_JARFILE} ${FORGE_DL_LINK}-universal.jar\r\n java -jar installer.jar --installServer\r\n rm installer.jar forge-${FORGE_DOWNLOAD_VERSION}-universal.jar\r\nfi\r\n\r\nif [ ! -d \/mnt\/server\/mods\/ ]; then\r\n echo -e \"making mods directory\"\r\n mkdir -p \/mnt\/server\/mods\/\r\nfi\r\n\r\nif [ -f \/mnt\/server\/mods\/spongeforge*.jar ]; then\r\n mkdir -p \/mnt\/server\/mods\/old\/\r\n mv -f \/mnt\/server\/mods\/spongeforge*.jar \/mnt\/server\/mods\/old\/spongeforge*.jar\r\nfi \r\n\r\necho -e \"running: curl -s ${SF_DL_LINK} -o \/mnt\/server\/mods\/spongeforge-${SF_VERSION}.jar\"\r\ncurl -s ${SF_DL_LINK} -o \/mnt\/server\/mods\/spongeforge-${SF_VERSION}.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\/minecraft_java\/server.properties\r\nfi\r\n\r\necho -e \"Install for SpongeForge is complete\"", + "script": "#!\/bin\/bash\r\n# SpongeForge 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\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\r\nif [ -z ${SF_VERSION} ] || [ \"$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/${SF_VERSION})\" == \"Unknown version\" ]; then\r\n echo -e \"defaulting to recommended\"\r\n SF_VERSION=\"recommended\"\r\nfi\r\n\r\nif [ \"${SF_VERSION}\" == \"recommended\" ]; then\r\n echo -e \"using recommended SpongeForge version\"\r\n SF_VERSION=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/recommended | jq -r '.version')\r\n echo -e \"found SpongeForge Version ${SF_VERSION}\"\r\n SF_DL_LINK=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/recommended | jq -r '.artifacts.\"\".url')\r\n FORGE_DOWNLOAD_VERSION=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/recommended | jq -r '.dependencies.forge')\r\n echo -e \"found Forge Version ${FORGE_DOWNLOAD_VERSION}\"\r\n MC_VERSION=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/${SF_VERSION} | jq -r '.dependencies.minecraft')\r\nelif [ \"${SF_VERSION}\" == \"latest\" ]; then\r\n echo -e \"using latest SpongForge version\"\r\n SF_VERSION=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge | jq -r '.buildTypes.stable.latest.version')\r\n echo -e \"found SpongeForge Version ${SF_VERSION}\"\r\n SF_DL_LINK=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/${SF_VERSION} | jq -r '.artifacts.\"\".url')\r\n FORGE_DOWNLOAD_VERSION=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/${SF_VERSION} | jq -r '.dependencies.forge')\r\n MC_VERSION=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/${SF_VERSION} | jq -r '.dependencies.minecraft')\r\nelse\r\n echo -e \"found SpongeForge Version ${SF_VERSION}\"\r\n SF_DL_LINK=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/${SF_VERSION} | jq -r '.artifacts.\"\".url')\r\n FORGE_DOWNLOAD_VERSION=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/${SF_VERSION} | jq -r '.dependencies.forge')\r\n echo -e \"found Forge Version ${FORGE_DOWNLOAD_VERSION}\"\r\n MC_VERSION=$(curl -s https:\/\/dl-api.spongepowered.org\/v1\/org.spongepowered\/spongeforge\/downloads\/${SF_VERSION} | jq -r '.dependencies.minecraft')\r\nfi\r\n\r\nFORGE_DL_LINK=https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/${MC_VERSION}-${FORGE_DOWNLOAD_VERSION}\/forge-${MC_VERSION}-${FORGE_DOWNLOAD_VERSION}\r\n\r\nif [ -f server.jar ] && [ $(sha1sum server.jar | awk '{ print $1 }') == $(curl -s ${FORGE_DL_LINK}-universal.jar.sha1) ]; then\r\n echo -e \"Already have the correct forge version\"\r\nelse\r\n echo -e \"Downloading forge version ${FORGE_VERSION}\"\r\n echo -e \"running: curl -s -o installer.jar -o ${FORGE_DL_LINK}-installer.jar\"\r\n curl -s -o installer.jar ${FORGE_DL_LINK}-installer.jar\r\n echo -e \"running: curl -s -o ${SERVER_JARFILE} -o ${FORGE_DL_LINK}-universal.jar\"\r\n curl -s -o ${SERVER_JARFILE} ${FORGE_DL_LINK}-universal.jar\r\n java -jar installer.jar --installServer\r\n rm installer.jar forge-${MC_VERSION}-${FORGE_DOWNLOAD_VERSION}-universal.jar\r\nfi\r\n\r\nif [ ! -d \/mnt\/server\/mods\/ ]; then\r\n echo -e \"making mods directory\"\r\n mkdir -p \/mnt\/server\/mods\/\r\nfi\r\n\r\nif [ -f \/mnt\/server\/mods\/spongeforge*.jar ]; then\r\n mkdir -p \/mnt\/server\/mods\/old\/\r\n mv -f \/mnt\/server\/mods\/spongeforge*.jar \/mnt\/server\/mods\/old\/spongeforge*.jar\r\nfi \r\n\r\necho -e \"running: curl -s ${SF_DL_LINK} -o \/mnt\/server\/mods\/spongeforge-${SF_VERSION}.jar\"\r\ncurl -s ${SF_DL_LINK} -o \/mnt\/server\/mods\/spongeforge-${SF_VERSION}.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\/minecraft_java\/server.properties\r\nfi\r\n\r\necho -e \"Install for SpongeForge is complete\"", "container": "openjdk:8-jre-slim", "entrypoint": "bash" } From 5dc4f3340acaadd76c59268d468862d82c74c209 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Thu, 12 Dec 2019 12:45:50 -0500 Subject: [PATCH 339/393] Add Onset Dedicated Server Add egg for Onset Add Onset Readme Update Main Readme --- README.md | 3 +- steamcmd_servers/onset/README.md | 20 ++++++++++ steamcmd_servers/onset/egg-onset.json | 54 +++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 steamcmd_servers/onset/README.md create mode 100644 steamcmd_servers/onset/egg-onset.json diff --git a/README.md b/README.md index 68bcd040..b3a0619e 100644 --- a/README.md +++ b/README.md @@ -92,11 +92,12 @@ If you are reading this it looks like you are looking to add an egg to your serv * [7 Days to Die](/steamcmd_servers/7_days_to_die/) * [ARK Survival Evolved](/steamcmd_servers/ark_survival_evolved/) * [HLDS server](/steamcmd_servers/hlds_server) +* [Mordhau](/steamcmd_servers/mordhau) +* [Onset](/steamcmd_servers/onset) * [PixARK](/steamcmd_servers/pixark/) * [Rust Staging Branch](/steamcmd_servers/rust_staging/) * [Starbound](/steamcmd_servers/starbound) * [Sven Co-op](/steamcmd_servers/svencoop) -* [Mordhau](/steamcmd_servers/mordhau) [Squad](/squad/) diff --git a/steamcmd_servers/onset/README.md b/steamcmd_servers/onset/README.md new file mode 100644 index 00000000..274faf9e --- /dev/null +++ b/steamcmd_servers/onset/README.md @@ -0,0 +1,20 @@ +# 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. + +## Recommended server settings +### RAM +This server requires about 100M to run. + +See the following - https://dev.playonset.com/wiki/DedicatedServer#Minimum_requirements_2 + +### Disk +This server uses about 50M of disk. + +## Server Ports + +| Port | default | +|-------|---------| +| Game | 7777 | +| Query | 7776 | +| file | 7775 | \ No newline at end of file diff --git a/steamcmd_servers/onset/egg-onset.json b/steamcmd_servers/onset/egg-onset.json new file mode 100644 index 00000000..8815fdf7 --- /dev/null +++ b/steamcmd_servers/onset/egg-onset.json @@ -0,0 +1,54 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-12-12T12:43:34-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", + "startup": ".\/OnsetServer", + "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}", + "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 '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": "alpine:3.10", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "App ID", + "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, + "rules": "required|string|max:20" + }, + { + "name": "ld lib path", + "description": "required to load server libraries.", + "env_variable": "LD_LIBRARY_PATH", + "default_value": ".", + "user_viewable": 0, + "user_editable": 0, + "rules": "required|string|max:20" + }, + { + "name": "Auto Update Server", + "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, + "rules": "required|string|max:20" + } + ] +} \ No newline at end of file From a50d383ecbd8a22e05efbbb1560295cd82facf26 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Thu, 12 Dec 2019 18:56:50 -0500 Subject: [PATCH 340/393] update install script Change install container --- steamcmd_servers/onset/egg-onset.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/steamcmd_servers/onset/egg-onset.json b/steamcmd_servers/onset/egg-onset.json index 8815fdf7..923fc507 100644 --- a/steamcmd_servers/onset/egg-onset.json +++ b/steamcmd_servers/onset/egg-onset.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-12-12T12:43:34-05:00", + "exported_at": "2019-12-12T18:56:28-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.", @@ -18,8 +18,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 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": "alpine:3.10", - "entrypoint": "ash" + "container": "ubuntu:18.04", + "entrypoint": "bash" } }, "variables": [ From 5e2175058bf5e2ee07d8c9c0a1cb54d8e9ba8b51 Mon Sep 17 00:00:00 2001 From: parkervcp Date: Sat, 14 Dec 2019 12:25:03 -0500 Subject: [PATCH 341/393] add cuberite This resolves #176 --- minecraft_java/cuberite/egg-cuberite.json | 54 +++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 minecraft_java/cuberite/egg-cuberite.json diff --git a/minecraft_java/cuberite/egg-cuberite.json b/minecraft_java/cuberite/egg-cuberite.json new file mode 100644 index 00000000..e6c6e0e7 --- /dev/null +++ b/minecraft_java/cuberite/egg-cuberite.json @@ -0,0 +1,54 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-12-14T12:24:30-05:00", + "name": "Cuberite", + "author": "parker@parkervcp.com", + "description": "A lightweight, fast and extensible game server for Minecraft", + "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", + "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}", + "startup": "{\r\n \"done\": \"Startup complete \"\r\n}", + "logs": "{}", + "stop": "stop" + }, + "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:\/\/builds.cuberite.org\/job\/Cuberite%20Linux%20x64%20Master\/lastSuccessfulBuild\/artifact\/Cuberite.tar.gz\r\n\r\ntar --strip-components=1 -xf Cuberite.tar.gz", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Server Description", + "description": "Server Description", + "env_variable": "SERV_DESC", + "default_value": "Cuberite on Pterodactyl!", + "user_viewable": 1, + "user_editable": 1, + "rules": "nullable|string" + }, + { + "name": "Admin Password", + "description": "The password for the webadmin panel 'admin' user", + "env_variable": "ADMIN_PASS", + "default_value": "ChangeMe", + "user_viewable": 1, + "user_editable": 1, + "rules": "nullable|string" + }, + { + "name": "WebAdmin Port", + "description": "Port for the cuberite webadmin panel.", + "env_variable": "WEB_PORT", + "default_value": "8080", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|integer|between:1,65535" + } + ] +} \ No newline at end of file From c7cae37fa2462bda598396ea1f45589d98d40aad Mon Sep 17 00:00:00 2001 From: parkervcp Date: Sat, 14 Dec 2019 12:37:28 -0500 Subject: [PATCH 342/393] Update README files Update necessary readme files. --- README.md | 1 + minecraft_java/README.md | 6 +++++- minecraft_java/cuberite/README.md | 11 +++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 minecraft_java/cuberite/README.md diff --git a/README.md b/README.md index 68bcd040..1588192d 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [PocketMine MP](/minecraft_bedrock/pocketmine_mp/) [Minecraft Java](/minecraft_java/) +* [Cuberite]/minecraft_java/cuberite/) * [Forge](/minecraft_java/forge/) * [Feed The Beast](/minecraft_java/ftb/) * [Paper](/minecraft_java/paper) diff --git a/minecraft_java/README.md b/minecraft_java/README.md index 38fd583f..68d2b300 100644 --- a/minecraft_java/README.md +++ b/minecraft_java/README.md @@ -7,6 +7,10 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, ## 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 +A lightweight, fast and extensible game server for Minecraft +[Cuberite](https://cuberite.org/) + ## Forge [Forge MC](https://files.minecraftforge.net/) This is a direct fork of the default forge service @@ -51,4 +55,4 @@ Gear up and set forth on a campaign worthy of legend, for Hexxit has been uneart Blightfall is a combination modpack and adventure map about surviving on an alien planet. [Tekkit Legends](https://www.technicpack.net/modpack/tekkit-legends) -The ancient power of Tekkits past return in this legendary pack! +The ancient power of Tekkits past return in this legendary pack! \ No newline at end of file diff --git a/minecraft_java/cuberite/README.md b/minecraft_java/cuberite/README.md new file mode 100644 index 00000000..b5c0b2a5 --- /dev/null +++ b/minecraft_java/cuberite/README.md @@ -0,0 +1,11 @@ +# Cuberite +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. + + +| Port | default | +|----------|---------| +| Game | 25565 | +| WebAdmin | 8080 | \ No newline at end of file From 4d05d3e2302c5930885b7b51c3ec22fc4cee8286 Mon Sep 17 00:00:00 2001 From: parkervcp Date: Sat, 14 Dec 2019 12:39:00 -0500 Subject: [PATCH 343/393] add default config files This adds files that can be pulled for configs --- minecraft_java/cuberite/settings.ini | 52 ++++++++++++++++++++++++++++ minecraft_java/cuberite/webadmin.ini | 14 ++++++++ 2 files changed, 66 insertions(+) create mode 100644 minecraft_java/cuberite/settings.ini create mode 100644 minecraft_java/cuberite/webadmin.ini diff --git a/minecraft_java/cuberite/settings.ini b/minecraft_java/cuberite/settings.ini new file mode 100644 index 00000000..a6b1afbb --- /dev/null +++ b/minecraft_java/cuberite/settings.ini @@ -0,0 +1,52 @@ +; This is the main server configuration +; Most of the settings here can be configured using the webadmin interface, if enabled in webadmin.ini + +[Authentication] +Authenticate=1 +AllowBungeeCord=0 +Server=sessionserver.mojang.com +Address=/session/minecraft/hasJoined?username=%USERNAME%&serverId=%SERVERID% + +[MojangAPI] +NameToUUIDServer=api.mojang.com +NameToUUIDAddress=/profiles/minecraft +UUIDToProfileServer=sessionserver.mojang.com +UUIDToProfileAddress=/session/minecraft/profile/%UUID%?unsigned=false + +[Server] +Description=Cuberite - in C++! +ShutdownMessage=Server shutdown +MaxPlayers=100 +HardcoreEnabled=0 +AllowMultiLogin=0 +Ports=25565 +AllowMultiWorldTabCompletion=1 +DefaultViewDistance=10 + +[RCON] +Enabled=0 + +[AntiCheat] +LimitPlayerBlockChanges=1 + +[PlayerData] +LoadOfflinePlayerData=0 +LoadNamedPlayerData=1 + +[Worlds] +DefaultWorld=world +World=world_nether +World=world_the_end + +[WorldPaths] +world=world +world_nether=world_nether +world_the_end=world_the_end + +[Plugins] +Plugin=Core +Plugin=ChatLog + +[DeadlockDetect] +Enabled=1 +IntervalSec=20 diff --git a/minecraft_java/cuberite/webadmin.ini b/minecraft_java/cuberite/webadmin.ini new file mode 100644 index 00000000..64652b85 --- /dev/null +++ b/minecraft_java/cuberite/webadmin.ini @@ -0,0 +1,14 @@ +; This file controls the webadmin feature of Cuberite +; It specifies whether webadmin is enabled, and what logins are allowed. +; Username format: [User:*username*] +; Password format: Password=*password*; for example: +; [User:admin] +; Password=admin +; Please restart Cuberite to apply changes made in this file! + +[WebAdmin] +Ports=8080 +Enabled=1 + +[User:admin] +Password= \ No newline at end of file From 1e45eafc17071800a867687d281a54bd13096889 Mon Sep 17 00:00:00 2001 From: parkervcp Date: Sat, 14 Dec 2019 19:42:28 -0500 Subject: [PATCH 344/393] add starbound files --- .../starbound/starbound_server.config | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 steamcmd_servers/starbound/starbound_server.config diff --git a/steamcmd_servers/starbound/starbound_server.config b/steamcmd_servers/starbound/starbound_server.config new file mode 100644 index 00000000..c9785af0 --- /dev/null +++ b/steamcmd_servers/starbound/starbound_server.config @@ -0,0 +1,50 @@ +{ + "allowAdminCommands" : true, + "allowAdminCommandsFromAnyone" : false, + "allowAnonymousConnections" : true, + "allowAssetsMismatch" : true, + "anonymousConnectionsAreAdmin" : false, + "bannedIPs" : [], + "bannedUuids" : [], + "checkAssetsDigest" : false, + "clearPlayerFiles" : false, + "clearUniverseFiles" : false, + "clientIPJoinable" : false, + "clientP2PJoinable" : true, + "configurationVersion" : { + "basic" : 2, + "server" : 4 + }, + "crafting" : { + "filterHaveMaterials" : false + }, + "gameServerBind" : "::", + "gameServerPort" : 21025, + "interactiveHighlight" : true, + "inventory" : { + "pickupToActionBar" : true + }, + "maxPlayers" : 8, + "maxTeamSize" : 4, + "monochromeLighting" : false, + "playerBackupFileCount" : 3, + "queryServerBind" : "::", + "queryServerPort" : 21025, + "rconServerBind" : "::", + "rconServerPassword" : "", + "rconServerPort" : 21026, + "rconServerTimeout" : 1000, + "runQueryServer" : false, + "runRconServer" : false, + "safeScripts" : true, + "scriptInstructionLimit" : 10000000, + "scriptInstructionMeasureInterval" : 10000, + "scriptProfilingEnabled" : false, + "scriptRecursionLimit" : 100, + "serverFidelity" : "automatic", + "serverName" : "A Starbound Server", + "serverOverrideAssetsDigest" : null, + "serverUsers" : { + }, + "tutorialMessages" : true +} \ No newline at end of file From 7167e1c5dc320cb5679963f45405ec0b0963e170 Mon Sep 17 00:00:00 2001 From: parkervcp Date: Sun, 15 Dec 2019 10:07:37 -0500 Subject: [PATCH 345/393] update starbound installer This updates the starbound installed to use the same steamcmd installer as my other steamdcmd eggs. --- steamcmd_servers/starbound/egg-starbound.json | 47 +++++++++++-------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/steamcmd_servers/starbound/egg-starbound.json b/steamcmd_servers/starbound/egg-starbound.json index 06930e29..b8cc0c4e 100644 --- a/steamcmd_servers/starbound/egg-starbound.json +++ b/steamcmd_servers/starbound/egg-starbound.json @@ -3,31 +3,31 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-08-14T10:11:29-05:00", + "exported_at": "2019-12-15T10:05:42-05:00", "name": "Starbound", - "author": "hostmaster@watefallnetwork.net", + "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.", - "image": "quay.io\/pterodactyl\/core:source", + "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", "startup": ".\/starbound_server", "config": { - "files": "{\r\n \"storage\/starbound_server.config\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"gameServerPort\": \"{{server.build.default.port}}\",\r\n \"queryServerPort\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"storage\/starbound_server.config\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"gameServerPort\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Starting UniverseServer\",\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# 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 ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} validate +quit\r\n\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\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\nmkdir \/mnt\/server\/storage\r\n\r\ncat <> \/mnt\/server\/storage\/starbound_server.config\r\n{\r\n \"allowAdminCommands\" : true,\r\n \"allowAdminCommandsFromAnyone\" : false,\r\n \"allowAnonymousConnections\" : true,\r\n \"allowAssetsMismatch\" : true,\r\n \"anonymousConnectionsAreAdmin\" : false,\r\n \"bannedIPs\" : [],\r\n \"bannedUuids\" : [],\r\n \"checkAssetsDigest\" : false,\r\n \"clearPlayerFiles\" : false,\r\n \"clearUniverseFiles\" : false,\r\n \"clientIPJoinable\" : false,\r\n \"clientP2PJoinable\" : true,\r\n \"configurationVersion\" : {\r\n \"basic\" : 2,\r\n \"server\" : 4\r\n },\r\n \"crafting\" : {\r\n \"filterHaveMaterials\" : false\r\n },\r\n \"gameServerBind\" : \"::\",\r\n \"gameServerPort\" : 21025,\r\n \"interactiveHighlight\" : true,\r\n \"inventory\" : {\r\n \"pickupToActionBar\" : true\r\n },\r\n \"maxPlayers\" : 8,\r\n \"maxTeamSize\" : 4,\r\n \"monochromeLighting\" : false,\r\n \"playerBackupFileCount\" : 3,\r\n \"queryServerBind\" : \"::\",\r\n \"queryServerPort\" : 21025,\r\n \"rconServerBind\" : \"::\",\r\n \"rconServerPassword\" : \"\",\r\n \"rconServerPort\" : 21026,\r\n \"rconServerTimeout\" : 1000,\r\n \"runQueryServer\" : false,\r\n \"runRconServer\" : false,\r\n \"safeScripts\" : true,\r\n \"scriptInstructionLimit\" : 10000000,\r\n \"scriptInstructionMeasureInterval\" : 10000,\r\n \"scriptProfilingEnabled\" : false,\r\n \"scriptRecursionLimit\" : 100,\r\n \"serverFidelity\" : \"automatic\",\r\n \"serverName\" : \"A Starbound Server\",\r\n \"serverOverrideAssetsDigest\" : null,\r\n \"serverUsers\" : {\r\n },\r\n \"tutorialMessages\" : true\r\n}\r\nEOF", - "container": "ubuntu:16.04", - "entrypoint": "bash" + "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## 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\/steamcmd_servers\/starbound\/starbound_server.config > \/mnt\/server\/storage\/starbound_server.config", + "container": "ubuntu:18.04", + "entrypoint": "\/bin\/bash" } }, "variables": [ { "name": "Steam User", - "description": "A Steam username with Starbound on the account.", + "description": "This is a required setting and cannot be set to anonymous.", "env_variable": "STEAM_USER", - "default_value": "anonymous", + "default_value": "", "user_viewable": 0, "user_editable": 0, "rules": "required|string" @@ -41,15 +41,6 @@ "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" - }, { "name": "Game ID", "description": "The ID corresponding to the game to download and run using SRCDS.", @@ -58,6 +49,24 @@ "user_viewable": 1, "user_editable": 0, "rules": "string" + }, + { + "name": "Steam Auth", + "description": "Steam account auth code. Required if you have 2fa enabled.", + "env_variable": "STEAM_AUTH", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "nullable|string|max:5" + }, + { + "name": "Auto Update Server", + "description": "This is to auto-update the game server.", + "env_variable": "AUTO_UPDATE", + "default_value": "1", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|bool" } ] -} +} \ No newline at end of file From 82a16e4dafc7d45206359c95a3a6b7cfa088148d Mon Sep 17 00:00:00 2001 From: parkervcp Date: Sun, 15 Dec 2019 10:08:23 -0500 Subject: [PATCH 346/393] update steamcmd script Makes the script more noisy saying what it's doing. --- scripts/steamcmd_installer.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/steamcmd_installer.sh b/scripts/steamcmd_installer.sh index 876b2ab0..eba1d2c2 100644 --- a/scripts/steamcmd_installer.sh +++ b/scripts/steamcmd_installer.sh @@ -8,9 +8,13 @@ apt -y --no-install-recommends install curl lib32gcc1 ca-certificates ## just in case someone removed the defaults. if [ "${STEAM_USER}" == "" ]; then + echo -e "steam user is not set.\n" + echo -e "Using anonymous user.\n" STEAM_USER=anonymous STEAM_PASS="" STEAM_AUTH="" +else + echo -e "user set to ${STEAM_USER}" fi ## download and install steamcmd @@ -26,7 +30,7 @@ chown -R root:root /mnt export HOME=/mnt/server ## install game using steamcmd -./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 +./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 ## set up 32 bit libraries mkdir -p /mnt/server/.steam/sdk32 From 31a39ccac3b85d17408f5abedd3f04e46d040531 Mon Sep 17 00:00:00 2001 From: fenpaws Date: Tue, 17 Dec 2019 08:18:57 +0100 Subject: [PATCH 347/393] added worksop support --- steamcmd_servers/starbound/egg-starbound.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/steamcmd_servers/starbound/egg-starbound.json b/steamcmd_servers/starbound/egg-starbound.json index b8cc0c4e..f0c0d07a 100644 --- a/steamcmd_servers/starbound/egg-starbound.json +++ b/steamcmd_servers/starbound/egg-starbound.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-12-15T10:05:42-05:00", + "exported_at": "2019-12-17T08:01:28+01: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.", @@ -17,7 +17,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## 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\/steamcmd_servers\/starbound\/starbound_server.config > \/mnt\/server\/storage\/starbound_server.config", + "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\/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", "container": "ubuntu:18.04", "entrypoint": "\/bin\/bash" } @@ -67,6 +67,15 @@ "user_viewable": 1, "user_editable": 1, "rules": "required|bool" + }, + { + "name": "Use Workshop content", + "description": "Set to true if you want to use your subscribed Workshop content", + "env_variable": "WORKSHOP", + "default_value": "0", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|bool" } ] } \ No newline at end of file From 5e71a011048ae6f3880cd3a62f28cf4f8d27e52e Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 18 Dec 2019 13:44:12 -0500 Subject: [PATCH 348/393] move openttd to tycoon_games folder Renames the OpenTTD base folder. --- {openttd => tycoon_games}/openttd/README.md | 0 {openttd => tycoon_games}/openttd/egg-open-t-t-d-server.json | 0 {openttd => tycoon_games}/openttd/openttd.cfg | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {openttd => tycoon_games}/openttd/README.md (100%) rename {openttd => tycoon_games}/openttd/egg-open-t-t-d-server.json (100%) rename {openttd => tycoon_games}/openttd/openttd.cfg (100%) diff --git a/openttd/openttd/README.md b/tycoon_games/openttd/README.md similarity index 100% rename from openttd/openttd/README.md rename to tycoon_games/openttd/README.md diff --git a/openttd/openttd/egg-open-t-t-d-server.json b/tycoon_games/openttd/egg-open-t-t-d-server.json similarity index 100% rename from openttd/openttd/egg-open-t-t-d-server.json rename to tycoon_games/openttd/egg-open-t-t-d-server.json diff --git a/openttd/openttd/openttd.cfg b/tycoon_games/openttd/openttd.cfg similarity index 100% rename from openttd/openttd/openttd.cfg rename to tycoon_games/openttd/openttd.cfg From 6d1419a3b655b475341d7b5438217588a6884718 Mon Sep 17 00:00:00 2001 From: parkervcp Date: Wed, 18 Dec 2019 22:08:51 -0500 Subject: [PATCH 349/393] Reorganize main folder Updates main README Moves many games to steamcmd as that installs them. Removes Mount and Blade: Warband. --- README.md | 48 +++++------ mount_and_blade/warband/README.md | 17 ---- mount_and_blade/warband/egg-m--b-warband.json | 81 ------------------- .../conan_exiles/README.md | 0 .../conan_exiles/egg-conan-exiles.json | 0 .../dont_starve/README.md | 0 .../dont_starve/egg-don-t-starve.json | 0 {squad => steamcmd_servers}/squad/README.md | 0 .../squad/egg-squad.json | 0 9 files changed, 21 insertions(+), 125 deletions(-) delete mode 100644 mount_and_blade/warband/README.md delete mode 100644 mount_and_blade/warband/egg-m--b-warband.json rename {conan_exiles => steamcmd_servers}/conan_exiles/README.md (100%) rename {conan_exiles => steamcmd_servers}/conan_exiles/egg-conan-exiles.json (100%) rename {dont_starve => steamcmd_servers}/dont_starve/README.md (100%) rename {dont_starve => steamcmd_servers}/dont_starve/egg-don-t-starve.json (100%) rename {squad => steamcmd_servers}/squad/README.md (100%) rename {squad => steamcmd_servers}/squad/egg-squad.json (100%) diff --git a/README.md b/README.md index c885dec2..a33eedb5 100644 --- a/README.md +++ b/README.md @@ -44,14 +44,6 @@ If you are reading this it looks like you are looking to add an egg to your serv ## Game Eggs -[Arma](/arma/) -* [Arma 3](/arma/arma3/) -* [Arma 3 HC](/arma/arma3_headless_client/) - -[Conan Exiles](/conan_exiles/conan_exiles) - -[Don't Starve](/dont_starve/dont_starve) - [ET Legacy](/enemy_territory/etlegacy/) [Factorio](/factorio/factorio/) @@ -64,13 +56,13 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Multi Theft Auto](/gta/mtasa/) * [SA-MP](/gta/samp/) -[Minecraft Bedrock](/minecraft_bedrock/) +[Minecraft Bedrock](/minecraft_bedrock/) Servers for Bedrock Minecraft * [Bedrock](/minecraft_bedrock/bedrock/) * [Nukkit](/minecraft_bedrock/nukkit/) * [PocketMine MP](/minecraft_bedrock/pocketmine_mp/) -[Minecraft Java](/minecraft_java/) -* [Cuberite]/minecraft_java/cuberite/) +[Minecraft Java](/minecraft_java/) Servers for Java Minecraft +* [Cuberite](/minecraft_java/cuberite/) * [Forge](/minecraft_java/forge/) * [Feed The Beast](/minecraft_java/ftb/) * [Paper](/minecraft_java/paper) @@ -85,22 +77,27 @@ 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/) -[Mount & Blade Warband](/mount_and_blade/warband/) - -[OpenTTD](/openttd/) +[Tycoon Games](/tycoon_games/) +* [OpenTTD](/tycoon_games/openttd/) [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/) -* [HLDS server](/steamcmd_servers/hlds_server) -* [Mordhau](/steamcmd_servers/mordhau) -* [Onset](/steamcmd_servers/onset) +* [ARK Survival Evolved](/steamcmd_servers/ark_survival_evolved/) +* [Arma](/arma/) + * [Arma 3](/arma/arma3/) + * [Arma 3 HC](/arma/arma3_headless_client/) +* [Conan Exiles](/steamcmd_servers/conan_exiles) +* [Don't Starve](/steamcmd_servers/dont_starve) +* [HLDS server](/steamcmd_servers/hlds_server) +* [Mordhau](/steamcmd_servers/mordhau) +* [Onset](/steamcmd_servers/onset) * [PixARK](/steamcmd_servers/pixark/) -* [Rust Staging Branch](/steamcmd_servers/rust_staging/) -* [Starbound](/steamcmd_servers/starbound) -* [Sven Co-op](/steamcmd_servers/svencoop) - -[Squad](/squad/) +* [Rust Staging Branch](/steamcmd_servers/rust_staging/) +* [Starbound](/steamcmd_servers/starbound) +* [Sven Co-op](/steamcmd_servers/svencoop) +* [Squad](/steamcmd_servers/squad/) +* [Unturned](/unturned/) + * [RocketMod](/unturned/rocketmod/) [Unreal Engine](/unreal_engine) * [Tower Unite](/unreal_engine/tower_unite/) @@ -109,7 +106,4 @@ If you are reading this it looks like you are looking to add an egg to your serv * [tmodloader](/terraria/tmodloader) * [tshock](/terraria/tshock/) -[Unturned](/unturned/) -* [RocketMod](/unturned/rocketmod/) - -[Xonotic](/xonotic/) +[Xonotic](/xonotic/xonotic/) diff --git a/mount_and_blade/warband/README.md b/mount_and_blade/warband/README.md deleted file mode 100644 index 0798ccfd..00000000 --- a/mount_and_blade/warband/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# Mount & Blade Warband - -Mount & Blade: Warband is a stand alone expansion pack for the game that brought medieval battlefields to life with its realistic mounted combat and detailed fighting system. Many modifications have been developed to bring the Warband universe into different eras, including the popular Napoleonic Wars DLC, among many others, featuring battles of up to concurrent 200 players. - -### Server Ports - -Warband requires a single port (default 7240) - -| Port | default | -|---------|---------| -| Game | 7240 | - -### Other Notes - -* The server can only use the main IP address of the node due to limitations in the way Warband's server reporting system operates, no alias or secondary IP addresses can be used. -* A complete list of modules supported by this egg can be found [here](https://github.com/masonr/pterodactyl-images/tree/mb-warband), the module name will need to be copied exactly as shown. -* The current module can be changed at any time and will automatically download the new files upon restart after changing the module name diff --git a/mount_and_blade/warband/egg-m--b-warband.json b/mount_and_blade/warband/egg-m--b-warband.json deleted file mode 100644 index 9d46ddd4..00000000 --- a/mount_and_blade/warband/egg-m--b-warband.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2018-07-28T22:01:58-04:00", - "name": "M&B Warband", - "author": "mason@rowe.sh", - "description": "Mount & Blade Warband server", - "image": "masonr\/pterodactyl-images:mb-warband", - "startup": "WINEDEBUG=\"fixme-all\" wine mb_warband_dedicated.exe -r Config.txt -m {{MODULE}}", - "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"Starting mission\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"Logs\/\"\r\n}", - "stop": "^C" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\napt update\r\napt install -y wget dos2unix\r\ncd \/mnt\/server\/\r\n\r\nif [[ -z \"$MODULE\" ]] ; then\r\n\tMODULE=\"Native\"\r\nfi\r\n\r\n# Download helper script with all server file links\r\nwget \"https:\/\/files.rowe.sh\/pterodactyl\/mb-warband\/mb-warband-links.sh\"\r\nchmod +x mb-warband-links.sh\r\n\r\n# Generate links for server files\r\nMODULE_BASE_LINK=`.\/mb-warband-links.sh link \"$MODULE\" base`\r\nMODULE_LINK=`.\/mb-warband-links.sh link \"$MODULE\" mod`\r\n\r\n# Ensure module files link has been obtained, exit if not\r\nif [[ -z \"$MODULE_LINK\" ]] ; then\r\n\techo \"ERROR: Module name was mistyped or is not currently supported.\"\r\n\techo \"Available modules:\"\r\n\t.\/mb-warband-links.sh modules\r\n\texit 1\r\nfi\r\n\r\n# Install base server files, if needed\r\nif [[ ! -z \"$MODULE_BASE_LINK\" ]] ; then\r\n\twget -qO- $MODULE_BASE_LINK | tar xvz --strip-components=1\r\nfi\r\n\r\n# Install module files\r\nwget -qO- $MODULE_LINK | tar xvz --strip-components=1\r\ncp -rf \"$MODULE\"_Sample_Config.txt Config.txt\r\ndos2unix Config.txt\r\n\r\necho \"Module: $MODULE has been sucessfully installed.\"\r\nrm mb-warband-links.sh\r\n\r\n# Edit Server Name ($SERVER_NAME)\r\nsed -i 's\/.*set_server_name.*\/set_server_name '\"$SERVER_NAME\"'\/g' Config.txt\r\n\r\n# Edit Server Admin Password ($ADMIN_PASSWORD)\r\nsed -i 's\/.*set_pass_admin.*\/set_pass_admin '\"$ADMIN_PASS\"'\/g' Config.txt\r\n\r\n# Edit Server Password ($SERVER_PASS)\r\nsed -i 's\/.*set_pass .*\/set_pass '\"$SERVER_PASS\"'\/g' Config.txt\r\nsed -i 's\/.*set_pass$\/set_pass '\"$SERVER_PASS\"'\/g' Config.txt\r\n\r\n# Edit Server Welcome Message ($MOTD)\r\nsed -i 's\/.*set_welcome_message.*\/set_welcome_message '\"$MOTD\"'\/g' Config.txt\r\n\r\n# Edit Player Count ($PLAYERS)\r\nsed -i 's\/.*set_max_players.*\/set_max_players '\"$PLAYERS\"' '\"$PLAYERS\"'\/g' Config.txt\r\n\r\n# Edit Server Port ($SERVER_PORT)\r\nsed -i 's\/.*set_port.*\/set_port '\"$SERVER_PORT\"'\/g' Config.txt", - "container": "ubuntu:16.04", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Module", - "description": "Name of the module. For a full list of supported modules visit --- https:\/\/github.com\/masonr\/pterodactyl-images\/tree\/mb-warband --- and copy the module name from the first column exactly as shown.", - "env_variable": "MODULE", - "default_value": "Native", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:200" - }, - { - "name": "Player Count", - "description": "Number of players", - "env_variable": "PLAYERS", - "default_value": "32", - "user_viewable": 1, - "user_editable": 0, - "rules": "required|integer|max:200" - }, - { - "name": "Server Name", - "description": "Name of the game server", - "env_variable": "SERVER_NAME", - "default_value": "Pterodactyl_Server", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:100" - }, - { - "name": "Admin Password", - "description": "Password for admin login", - "env_variable": "ADMIN_PASS", - "default_value": "ptero", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:50" - }, - { - "name": "Welcome Message", - "description": "Welcome message \/ MOTD", - "env_variable": "MOTD", - "default_value": "Welcome!", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:500" - }, - { - "name": "Server Password", - "description": "Password for the server.\r\nLeave blank to keep server unlocked.", - "env_variable": "SERVER_PASS", - "default_value": "", - "user_viewable": 1, - "user_editable": 1, - "rules": "nullable|string|max:50" - } - ] -} diff --git a/conan_exiles/conan_exiles/README.md b/steamcmd_servers/conan_exiles/README.md similarity index 100% rename from conan_exiles/conan_exiles/README.md rename to steamcmd_servers/conan_exiles/README.md diff --git a/conan_exiles/conan_exiles/egg-conan-exiles.json b/steamcmd_servers/conan_exiles/egg-conan-exiles.json similarity index 100% rename from conan_exiles/conan_exiles/egg-conan-exiles.json rename to steamcmd_servers/conan_exiles/egg-conan-exiles.json diff --git a/dont_starve/dont_starve/README.md b/steamcmd_servers/dont_starve/README.md similarity index 100% rename from dont_starve/dont_starve/README.md rename to steamcmd_servers/dont_starve/README.md diff --git a/dont_starve/dont_starve/egg-don-t-starve.json b/steamcmd_servers/dont_starve/egg-don-t-starve.json similarity index 100% rename from dont_starve/dont_starve/egg-don-t-starve.json rename to steamcmd_servers/dont_starve/egg-don-t-starve.json diff --git a/squad/squad/README.md b/steamcmd_servers/squad/README.md similarity index 100% rename from squad/squad/README.md rename to steamcmd_servers/squad/README.md diff --git a/squad/squad/egg-squad.json b/steamcmd_servers/squad/egg-squad.json similarity index 100% rename from squad/squad/egg-squad.json rename to steamcmd_servers/squad/egg-squad.json From c0b600d008d8a9b0ed5d16a89cbece8d97028cf8 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 20 Dec 2019 10:49:23 -0500 Subject: [PATCH 350/393] update waterfall egg Update install script Add variables for the install script resolves #384 --- minecraft_proxy/waterfall/egg-waterfall.json | 28 ++++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/minecraft_proxy/waterfall/egg-waterfall.json b/minecraft_proxy/waterfall/egg-waterfall.json index b092cb4a..7d5364a6 100644 --- a/minecraft_proxy/waterfall/egg-waterfall.json +++ b/minecraft_proxy/waterfall/egg-waterfall.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-07-24T10:01:37-04:00", + "exported_at": "2019-12-20T10:47:29-05:00", "name": "Waterfall", "author": "hostmaster@waterfallgaming.net", "description": "Waterfall is a fork of the well-known BungeeCord server teleportation suite.", @@ -17,16 +17,16 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache --update 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\/waterfall | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | IN($VERSION)' | grep true`\r\n LATEST_WATERFALL_VERSION=`curl -s https:\/\/papermc.io\/api\/v1\/waterfall | 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 waterfall version\"\r\n MINECRAFT_VERSION=${LATEST_WATERFALL_VERSION}\r\n fi\r\n \r\n BUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v1\/waterfall\/${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\/waterfall\/${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\/waterfall\/${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\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f config.yml ]; then\r\n echo -e \"Downloading waterfall config.yml\"\r\n curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_proxy\/waterfall\/config.yml\r\nelse\r\n echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi", + "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache --update curl jq\r\n\r\ncd \/mnt\/server\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 if [ -z \"$VANILLA_VERSION\" ] || [ \"${MINECRAFT_VERSION}\" == \"latest\" ]; then\r\n MINECRAFT_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall | jq -r '.versions[0]')\r\n else\r\n VER_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | IN($VERSION)' | grep true)\r\n fi\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 waterfall version\"\r\n MINECRAFT_VERSION=${LATEST_WATERFALL_VERSION}\r\n fi\r\n \r\n BUILD_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall\/${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\/waterfall\/${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\/waterfall\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download \r\nfi\r\n\r\necho -e \"running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f config.yml ]; then\r\n echo -e \"Downloading waterfall config.yml\"\r\n curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_proxy\/waterfall\/config.yml\r\nelse\r\n echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi", "container": "alpine:3.10", "entrypoint": "ash" } }, "variables": [ { - "name": "Waterfall Version", - "description": "The version of Waterfall to download and use.", - "env_variable": "WATERFALL_VERSION", + "name": "Minecraft Version", + "description": "The version of Minecraft that water was built to support.", + "env_variable": "MINECRAFT_VERSION", "default_value": "latest", "user_viewable": 1, "user_editable": 1, @@ -40,6 +40,24 @@ "user_viewable": 1, "user_editable": 1, "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" + }, + { + "name": "Download Link", + "description": "A link to the server jar to download the waterfall jar.", + "env_variable": "DL_LINK", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "nullable|string" + }, + { + "name": "Waterfall build number", + "description": "Default is latest.\r\n\r\nif set to latest or an invalid version will grab the latest build number.", + "env_variable": "BUILD_NUMBER", + "default_value": "latest", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" } ] } \ No newline at end of file From f4c069eb93a1e8ac0a11c4324c19e1c744d1e86e Mon Sep 17 00:00:00 2001 From: parkervcp Date: Sat, 21 Dec 2019 14:21:00 -0500 Subject: [PATCH 351/393] organize repo update readme for steamcmd games move arma into the right folder. --- README.md | 86 +++++++++---------- steamcmd_servers/README.md | 17 ++++ steamcmd_servers/arma/README.md | 9 ++ .../arma}/arma3/README.md | 0 .../arma}/arma3/egg-arma3-config/basic.cfg | 0 .../arma}/arma3/egg-arma3-config/server.cfg | 0 .../arma}/arma3/egg-arma3.json | 0 .../arma}/arma3_headless_client/README.md | 0 .../egg-arma3-headless-client.json | 0 9 files changed, 69 insertions(+), 43 deletions(-) create mode 100644 steamcmd_servers/arma/README.md rename {arma => steamcmd_servers/arma}/arma3/README.md (100%) rename {arma => steamcmd_servers/arma}/arma3/egg-arma3-config/basic.cfg (100%) rename {arma => steamcmd_servers/arma}/arma3/egg-arma3-config/server.cfg (100%) rename {arma => steamcmd_servers/arma}/arma3/egg-arma3.json (100%) rename {arma => steamcmd_servers/arma}/arma3_headless_client/README.md (100%) rename {arma => steamcmd_servers/arma}/arma3_headless_client/egg-arma3-headless-client.json (100%) diff --git a/README.md b/README.md index a33eedb5..1c5aa0dd 100644 --- a/README.md +++ b/README.md @@ -26,15 +26,15 @@ 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 -* [fragbot](/bots/discord/fragbot/) Golang +* [Bastion](/bots/discord/bastion/) +* [discord.js](bots/discord/discord.js/) Node JS generic +* [fragbot](/bots/discord/fragbot/) Golang * [jmusicbot](/bots/discord/jmusicbot) Java -* [parkertron](/bots/discord/parkertron/) Golang -* [pixel-bot](/bots/discord/pixelbot/) Python -* [Sinusbot](/bots/discord/sinusbot/) +* [parkertron](/bots/discord/parkertron/) Golang +* [pixel-bot](/bots/discord/pixelbot/) Python +* [Sinusbot](/bots/discord/sinusbot/) [TeamSpeak3](bots/teamspeak3) * [JTS3ServerMod](/bots/teamspeak3/jts3servermod/) @@ -46,64 +46,64 @@ If you are reading this it looks like you are looking to add an egg to your serv [ET Legacy](/enemy_territory/etlegacy/) -[Factorio](/factorio/factorio/) +[Factorio](/factorio/factorio/) -[Grand Theft Auto](/gta/) +[Grand Theft Auto](/gta/) * GTA V - * [FiveM](/gta/fivem/) - * [RageMP](/gta/ragemp/) + * [FiveM](/gta/fivem/) + * [RageMP](/gta/ragemp/) * GTA SA * [Multi Theft Auto](/gta/mtasa/) * [SA-MP](/gta/samp/) -[Minecraft Bedrock](/minecraft_bedrock/) Servers for Bedrock Minecraft -* [Bedrock](/minecraft_bedrock/bedrock/) -* [Nukkit](/minecraft_bedrock/nukkit/) -* [PocketMine MP](/minecraft_bedrock/pocketmine_mp/) +[Minecraft Bedrock](/minecraft_bedrock/) Servers for Bedrock Minecraft +* [Bedrock](/minecraft_bedrock/bedrock/) +* [Nukkit](/minecraft_bedrock/nukkit/) +* [PocketMine MP](/minecraft_bedrock/pocketmine_mp/) -[Minecraft Java](/minecraft_java/) Servers for Java Minecraft +[Minecraft Java](/minecraft_java/) Servers for Java Minecraft * [Cuberite](/minecraft_java/cuberite/) -* [Forge](/minecraft_java/forge/) -* [Feed The Beast](/minecraft_java/ftb/) +* [Forge](/minecraft_java/forge/) +* [Feed The Beast](/minecraft_java/ftb/) * [Paper](/minecraft_java/paper) * [Spigot](/minecraft_java/spigot/) * [spongeforge](/minecraft_java/spongeforge/) * [SpongeVanilla](/minecraft_java/spongevanilla/) -* [Technic](/minecraft_java/technic/) +* [Technic](/minecraft_java/technic/) * [VanillaCord](/minecraft_java/vanillacord/) -[Minecraft Proxies](/minecraft_proxy/) (these are for the java version of minecraft) -* [Waterfall](/minecraft_proxy/waterfall/) +[Minecraft Proxies](/minecraft_proxy/) (these are for the java version of minecraft) +* [Waterfall](/minecraft_proxy/waterfall/) * [TyphoonLimbo](/minecraft_proxy/typhoonlimbo/) * [Velocity](/minecraft_proxy/velocity/) [Tycoon Games](/tycoon_games/) * [OpenTTD](/tycoon_games/openttd/) -[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](/arma/) - * [Arma 3](/arma/arma3/) - * [Arma 3 HC](/arma/arma3_headless_client/) -* [Conan Exiles](/steamcmd_servers/conan_exiles) -* [Don't Starve](/steamcmd_servers/dont_starve) -* [HLDS server](/steamcmd_servers/hlds_server) -* [Mordhau](/steamcmd_servers/mordhau) -* [Onset](/steamcmd_servers/onset) -* [PixARK](/steamcmd_servers/pixark/) -* [Rust Staging Branch](/steamcmd_servers/rust_staging/) -* [Starbound](/steamcmd_servers/starbound) -* [Sven Co-op](/steamcmd_servers/svencoop) -* [Squad](/steamcmd_servers/squad/) -* [Unturned](/unturned/) - * [RocketMod](/unturned/rocketmod/) +[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/) + * [Arma 3](/steamcmd_servers/arma/arma3/) + * [Arma 3 HC](/steamcmd_servers/arma/arma3_headless_client/) +* [Conan Exiles](/steamcmd_servers/conan_exiles) +* [Don't Starve](/steamcmd_servers/dont_starve) +* [HLDS server](/steamcmd_servers/hlds_server) +* [Mordhau](/steamcmd_servers/mordhau) +* [Onset](/steamcmd_servers/onset) +* [PixARK](/steamcmd_servers/pixark/) +* [Rust Staging Branch](/steamcmd_servers/rust_staging/) +* [Starbound](/steamcmd_servers/starbound) +* [Sven Co-op](/steamcmd_servers/svencoop) +* [Squad](/steamcmd_servers/squad/) +* [Unturned](/unturned/) + * [RocketMod](/unturned/rocketmod/) [Unreal Engine](/unreal_engine) * [Tower Unite](/unreal_engine/tower_unite/) -[Terraria](/terraria/) -* [tmodloader](/terraria/tmodloader) -* [tshock](/terraria/tshock/) +[Terraria](/terraria/) +* [tmodloader](/terraria/tmodloader) +* [tshock](/terraria/tshock/) -[Xonotic](/xonotic/xonotic/) +[Xonotic](/xonotic/xonotic/) diff --git a/steamcmd_servers/README.md b/steamcmd_servers/README.md index a0b70ee8..6f123f7a 100644 --- a/steamcmd_servers/README.md +++ b/steamcmd_servers/README.md @@ -8,15 +8,32 @@ This is a collection of servers that use steamcmd to install. ## ARK [ark](ark_survival_evolved/) +## ARMA +[arma](arma/) +* [arma 3](arma/arma3/) +* [arma 3 headless](arma/arma3_headless_client/) + +## Conan Exiles +[conan_exiles](conan_exiles/) + +## Don't Starve +[dont_starve](dont_starve/) + ## HLDS Server [hlds](hlds_server/) ## Mordhau [mordhau](mordhau/) +## Onset +[onset](onset/) + ## Rust Staging [rust staging](rust_staging/) +## Squad +[squad](squad/) + ## Starbound [starbound](starbound/) diff --git a/steamcmd_servers/arma/README.md b/steamcmd_servers/arma/README.md new file mode 100644 index 00000000..f90116a9 --- /dev/null +++ b/steamcmd_servers/arma/README.md @@ -0,0 +1,9 @@ +# ARMA + +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 III +[arma 3](arma3/) + +## ARMA III headless client +[arma 3 headless](arma3_headless_client/) \ No newline at end of file diff --git a/arma/arma3/README.md b/steamcmd_servers/arma/arma3/README.md similarity index 100% rename from arma/arma3/README.md rename to steamcmd_servers/arma/arma3/README.md diff --git a/arma/arma3/egg-arma3-config/basic.cfg b/steamcmd_servers/arma/arma3/egg-arma3-config/basic.cfg similarity index 100% rename from arma/arma3/egg-arma3-config/basic.cfg rename to steamcmd_servers/arma/arma3/egg-arma3-config/basic.cfg diff --git a/arma/arma3/egg-arma3-config/server.cfg b/steamcmd_servers/arma/arma3/egg-arma3-config/server.cfg similarity index 100% rename from arma/arma3/egg-arma3-config/server.cfg rename to steamcmd_servers/arma/arma3/egg-arma3-config/server.cfg diff --git a/arma/arma3/egg-arma3.json b/steamcmd_servers/arma/arma3/egg-arma3.json similarity index 100% rename from arma/arma3/egg-arma3.json rename to steamcmd_servers/arma/arma3/egg-arma3.json diff --git a/arma/arma3_headless_client/README.md b/steamcmd_servers/arma/arma3_headless_client/README.md similarity index 100% rename from arma/arma3_headless_client/README.md rename to steamcmd_servers/arma/arma3_headless_client/README.md diff --git a/arma/arma3_headless_client/egg-arma3-headless-client.json b/steamcmd_servers/arma/arma3_headless_client/egg-arma3-headless-client.json similarity index 100% rename from arma/arma3_headless_client/egg-arma3-headless-client.json rename to steamcmd_servers/arma/arma3_headless_client/egg-arma3-headless-client.json From d4fcfb93852b1bada7712f35a3f1a69eeefb33bb Mon Sep 17 00:00:00 2001 From: Fern <15272073+Fernthedev@users.noreply.github.com> Date: Mon, 23 Dec 2019 12:59:44 -0400 Subject: [PATCH 352/393] Waterfall Installation and Startup command modification Fixed issues such as failure to parse Waterfall latest build, version and latest Minecraft version Changed startup command to use https://aikar.co/2018/07/02/tuning-the-jvm-g1gc-garbage-collector-flags-for-minecraft/ --- minecraft_proxy/waterfall/egg-waterfall.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/minecraft_proxy/waterfall/egg-waterfall.json b/minecraft_proxy/waterfall/egg-waterfall.json index 7d5364a6..84f50a33 100644 --- a/minecraft_proxy/waterfall/egg-waterfall.json +++ b/minecraft_proxy/waterfall/egg-waterfall.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-12-20T10:47:29-05:00", + "exported_at": "2019-12-23T12:28:53-04:00", "name": "Waterfall", "author": "hostmaster@waterfallgaming.net", "description": "Waterfall is a fork of the well-known BungeeCord server teleportation suite.", "image": "quay.io\/pterodactyl\/core:java", - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", + "startup": "java -Xms{{SERVER_MEMORY}}M -Xmx{{SERVER_MEMORY}}M -XX:+UseG1GC -XX:+UnlockExperimentalVMOptions -XX:MaxGCPauseMillis=100 -XX:+DisableExplicitGC -XX:TargetSurvivorRatio=90 -XX:G1NewSizePercent=50 -XX:G1MaxNewSizePercent=80 -XX:G1MixedGCLiveThresholdPercent=35 -XX:+AlwaysPreTouch -XX:+ParallelRefProcEnabled -Dusing.aikars.flags=mcflags.emc.gs -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}", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache --update curl jq\r\n\r\ncd \/mnt\/server\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 if [ -z \"$VANILLA_VERSION\" ] || [ \"${MINECRAFT_VERSION}\" == \"latest\" ]; then\r\n MINECRAFT_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall | jq -r '.versions[0]')\r\n else\r\n VER_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | IN($VERSION)' | grep true)\r\n fi\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 waterfall version\"\r\n MINECRAFT_VERSION=${LATEST_WATERFALL_VERSION}\r\n fi\r\n \r\n BUILD_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall\/${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\/waterfall\/${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\/waterfall\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download \r\nfi\r\n\r\necho -e \"running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f config.yml ]; then\r\n echo -e \"Downloading waterfall config.yml\"\r\n curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_proxy\/waterfall\/config.yml\r\nelse\r\n echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi", + "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache --update curl jq\r\n\r\ncd \/mnt\/server\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 if [ -z \"$VANILLA_VERSION\" ] || [ \"${MINECRAFT_VERSION}\" == \"latest\" ]; then\r\n MINECRAFT_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall | jq -r '.versions[0]')\r\n echo ${MINECRAFT_VERSION} is mc ver\r\n else\r\n echo Result: $(curl -s https:\/\/papermc.io\/api\/v1\/waterfall)\r\n VER_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall | jq -r --arg VERSION $MINECRAFT_VERSION '.versions | contains ([$VERSION])')\r\n# VER_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | IN($VERSION)' | grep true)\r\n fi\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 waterfall version\"\r\n LATEST_WATERFALL_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall\/ | jq -r '.versions[0]')\r\n MINECRAFT_VERSION=${LATEST_WATERFALL_VERSION}\r\n fi\r\n \r\n if [ ! ${BUILD_NUMBER} == \"latest\" ] ; then\r\n BUILD_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all[] | IN($BUILD)' | grep true)\r\n LATEST_WATERFALL_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall\/ | jq -r '.versions[0]')\r\n \r\n if [ \"${BUILD_EXISTS}\" == \"true\" ]; 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_WATERFALL_VERSION}\r\n fi\r\n fi\r\n \r\n echo \"Version being downloaded: ${BUILD_NUMBER}\"\r\n echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n echo -e \"Build: ${BUILD_NUMBER}\"\r\n DOWNLOAD_URL=https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download \r\nfi\r\n\r\necho -e \"running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f config.yml ]; then\r\n echo -e \"Downloading waterfall config.yml\"\r\n curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_proxy\/waterfall\/config.yml\r\nelse\r\n echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi", "container": "alpine:3.10", "entrypoint": "ash" } From 9cd38f33cb32ede59c0179e896751986a93c8e39 Mon Sep 17 00:00:00 2001 From: Fern <15272073+Fernthedev@users.noreply.github.com> Date: Mon, 23 Dec 2019 13:10:24 -0400 Subject: [PATCH 353/393] Removed flags --- minecraft_proxy/waterfall/egg-waterfall.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_proxy/waterfall/egg-waterfall.json b/minecraft_proxy/waterfall/egg-waterfall.json index 84f50a33..f494adf5 100644 --- a/minecraft_proxy/waterfall/egg-waterfall.json +++ b/minecraft_proxy/waterfall/egg-waterfall.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-12-23T12:28:53-04:00", + "exported_at": "2019-12-23T13:10:08-04:00", "name": "Waterfall", "author": "hostmaster@waterfallgaming.net", "description": "Waterfall is a fork of the well-known BungeeCord server teleportation suite.", "image": "quay.io\/pterodactyl\/core:java", - "startup": "java -Xms{{SERVER_MEMORY}}M -Xmx{{SERVER_MEMORY}}M -XX:+UseG1GC -XX:+UnlockExperimentalVMOptions -XX:MaxGCPauseMillis=100 -XX:+DisableExplicitGC -XX:TargetSurvivorRatio=90 -XX:G1NewSizePercent=50 -XX:G1MaxNewSizePercent=80 -XX:G1MixedGCLiveThresholdPercent=35 -XX:+AlwaysPreTouch -XX:+ParallelRefProcEnabled -Dusing.aikars.flags=mcflags.emc.gs -jar {{SERVER_JARFILE}}", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -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}", From f8f6cf22f5330058663f26f74bdc1808552cee10 Mon Sep 17 00:00:00 2001 From: Fern <15272073+Fernthedev@users.noreply.github.com> Date: Mon, 23 Dec 2019 13:23:33 -0400 Subject: [PATCH 354/393] Used parkervcp's suggestions --- minecraft_proxy/waterfall/egg-waterfall.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft_proxy/waterfall/egg-waterfall.json b/minecraft_proxy/waterfall/egg-waterfall.json index f494adf5..3af57a1e 100644 --- a/minecraft_proxy/waterfall/egg-waterfall.json +++ b/minecraft_proxy/waterfall/egg-waterfall.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-12-23T13:10:08-04:00", + "exported_at": "2019-12-23T13:23:16-04:00", "name": "Waterfall", "author": "hostmaster@waterfallgaming.net", "description": "Waterfall is a fork of the well-known BungeeCord server teleportation suite.", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache --update curl jq\r\n\r\ncd \/mnt\/server\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 if [ -z \"$VANILLA_VERSION\" ] || [ \"${MINECRAFT_VERSION}\" == \"latest\" ]; then\r\n MINECRAFT_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall | jq -r '.versions[0]')\r\n echo ${MINECRAFT_VERSION} is mc ver\r\n else\r\n echo Result: $(curl -s https:\/\/papermc.io\/api\/v1\/waterfall)\r\n VER_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall | jq -r --arg VERSION $MINECRAFT_VERSION '.versions | contains ([$VERSION])')\r\n# VER_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | IN($VERSION)' | grep true)\r\n fi\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 waterfall version\"\r\n LATEST_WATERFALL_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall\/ | jq -r '.versions[0]')\r\n MINECRAFT_VERSION=${LATEST_WATERFALL_VERSION}\r\n fi\r\n \r\n if [ ! ${BUILD_NUMBER} == \"latest\" ] ; then\r\n BUILD_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all[] | IN($BUILD)' | grep true)\r\n LATEST_WATERFALL_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall\/ | jq -r '.versions[0]')\r\n \r\n if [ \"${BUILD_EXISTS}\" == \"true\" ]; 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_WATERFALL_VERSION}\r\n fi\r\n fi\r\n \r\n echo \"Version being downloaded: ${BUILD_NUMBER}\"\r\n echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n echo -e \"Build: ${BUILD_NUMBER}\"\r\n DOWNLOAD_URL=https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download \r\nfi\r\n\r\necho -e \"running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f config.yml ]; then\r\n echo -e \"Downloading waterfall config.yml\"\r\n curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_proxy\/waterfall\/config.yml\r\nelse\r\n echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi", + "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache --update curl jq\r\n\r\ncd \/mnt\/server\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 if [ -z \"$VANILLA_VERSION\" ] || [ \"${MINECRAFT_VERSION}\" == \"latest\" ]; then\r\n MINECRAFT_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall | jq -r '.versions[0]')\r\n else\r\n VER_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall | jq -r --arg VERSION $MINECRAFT_VERSION '.versions | contains ([$VERSION])')\r\n fi\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 waterfall version\"\r\n MINECRAFT_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall\/ | jq -r '.versions[0]')\r\n fi\r\n \r\n if [ ! ${BUILD_NUMBER} == \"latest\" ] ; then\r\n BUILD_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all[] | IN($BUILD)' | grep true)\r\n LATEST_WATERFALL_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall\/ | jq -r '.versions[0]')\r\n \r\n if [ \"${BUILD_EXISTS}\" == \"true\" ]; 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_WATERFALL_VERSION}\r\n fi\r\n fi\r\n \r\n echo \"Version being downloaded: ${BUILD_NUMBER}\"\r\n echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n echo -e \"Build: ${BUILD_NUMBER}\"\r\n DOWNLOAD_URL=https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download \r\nfi\r\n\r\necho -e \"running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f config.yml ]; then\r\n echo -e \"Downloading waterfall config.yml\"\r\n curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_proxy\/waterfall\/config.yml\r\nelse\r\n echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi", "container": "alpine:3.10", "entrypoint": "ash" } From 3b4eb847c6553a2ef1f76d146acb15e1bdce2448 Mon Sep 17 00:00:00 2001 From: parkervcp Date: Mon, 23 Dec 2019 12:24:38 -0500 Subject: [PATCH 355/393] more organizing Moves more servers into the steamcmd folder. --- .gitignore | 4 +- .gitignore_global | 1 - steamcmd_servers/tower_unite/README.md | 11 ++++ .../tower_unite/egg-tower-unite.json | 63 +++++++++++++++++++ steamcmd_servers/unturned/rocketmod/README.md | 17 +++++ .../unturned/rocketmod/egg-rocketmod.json | 54 ++++++++++++++++ 6 files changed, 148 insertions(+), 2 deletions(-) delete mode 100644 .gitignore_global create mode 100644 steamcmd_servers/tower_unite/README.md create mode 100644 steamcmd_servers/tower_unite/egg-tower-unite.json create mode 100644 steamcmd_servers/unturned/rocketmod/README.md create mode 100644 steamcmd_servers/unturned/rocketmod/egg-rocketmod.json diff --git a/.gitignore b/.gitignore index ccc9fd93..378f0ca5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -*.DS_Store \ No newline at end of file +*.DS_Store +node_modules/ +.vuepress/ \ No newline at end of file diff --git a/.gitignore_global b/.gitignore_global deleted file mode 100644 index 496ee2ca..00000000 --- a/.gitignore_global +++ /dev/null @@ -1 +0,0 @@ -.DS_Store \ No newline at end of file diff --git a/steamcmd_servers/tower_unite/README.md b/steamcmd_servers/tower_unite/README.md new file mode 100644 index 00000000..f43f9408 --- /dev/null +++ b/steamcmd_servers/tower_unite/README.md @@ -0,0 +1,11 @@ +# 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 +Tower Unite requires a single port to be opened + +| Port | default | +|---------|---------| +| Game | 7778 | +| Query | 27016 | diff --git a/steamcmd_servers/tower_unite/egg-tower-unite.json b/steamcmd_servers/tower_unite/egg-tower-unite.json new file mode 100644 index 00000000..43f7687b --- /dev/null +++ b/steamcmd_servers/tower_unite/egg-tower-unite.json @@ -0,0 +1,63 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-02-08T01:46:57+01: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", + "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}", + "stop": "^C" + }, + "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", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Steam Login Token", + "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, + "rules": "required|string|max:100" + }, + { + "name": "Steam Admin ID", + "description": "Note that your admin id is only a number!", + "env_variable": "STEAM_ADMIN_ID", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|integer|max:76561202255233023" + }, + { + "name": "Server Title", + "description": "", + "env_variable": "SERVER_TITLE", + "default_value": "Tower Unite Server", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:512" + }, + { + "name": "Max Players", + "description": "", + "env_variable": "SERVER_MAX_PLAYER", + "default_value": "40", + "user_viewable": 0, + "user_editable": 0, + "rules": "required|integer|max:512" + } + ] +} \ No newline at end of file diff --git a/steamcmd_servers/unturned/rocketmod/README.md b/steamcmd_servers/unturned/rocketmod/README.md new file mode 100644 index 00000000..b4386da3 --- /dev/null +++ b/steamcmd_servers/unturned/rocketmod/README.md @@ -0,0 +1,17 @@ +# 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. + +### 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 diff --git a/steamcmd_servers/unturned/rocketmod/egg-rocketmod.json b/steamcmd_servers/unturned/rocketmod/egg-rocketmod.json new file mode 100644 index 00000000..acaf657f --- /dev/null +++ b/steamcmd_servers/unturned/rocketmod/egg-rocketmod.json @@ -0,0 +1,54 @@ +{ + "_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 6406b1894d8ca011c12d31bb6240901ccce4210f Mon Sep 17 00:00:00 2001 From: parkervcp Date: Wed, 25 Dec 2019 19:09:30 -0500 Subject: [PATCH 356/393] update minecraft install script fixes a bug with the minecraft install script. --- stock-eggs/minecraft/egg-vanilla-minecraft.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stock-eggs/minecraft/egg-vanilla-minecraft.json b/stock-eggs/minecraft/egg-vanilla-minecraft.json index 5937fc17..baaa63db 100644 --- a/stock-eggs/minecraft/egg-vanilla-minecraft.json +++ b/stock-eggs/minecraft/egg-vanilla-minecraft.json @@ -3,22 +3,22 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-06-19T17:09:18-04:00", + "exported_at": "2019-12-25T19:08:05-05: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", "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}", + "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\/ash\r\n# Vanilla MC Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk update\r\napk add curl jq\r\n\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\nif [ -z \"$VANILLA_VERSION\" ] || [ \"$VANILLA_VERSION\" == \"latest\" ]; then\r\n MANIFEST_URL=$(curl https:\/\/launchermeta.mojang.com\/mc\/game\/version_manifest.json | jq .versions | jq -r '.[] | select(.id == \"'$LATEST_VERSION'\") | .url')\r\nelse\r\n MANIFEST_URL=$(curl https:\/\/launchermeta.mojang.com\/mc\/game\/version_manifest.json | jq .versions | jq -r '.[] | select(.id == \"'$VANILLA_VERSION'\") | .url')\r\nfi\r\n\r\nDOWNLOAD_URL=`curl $MANIFEST_URL | jq .downloads.server | jq -r '. | .url'`\r\n\r\ncurl -o ${SERVER_JARFILE} $DOWNLOAD_URL", - "container": "alpine:3.9", + "script": "#!\/bin\/ash\r\n# Vanilla MC Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk update\r\napk add curl jq\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\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\ncurl -o ${SERVER_JARFILE} $DOWNLOAD_URL", + "container": "alpine:3.10", "entrypoint": "ash" } }, @@ -42,4 +42,4 @@ "rules": "required|string|between:3,15" } ] -} +} \ No newline at end of file From e360567f3a2322411ae5e984784f05bc7f58fcae Mon Sep 17 00:00:00 2001 From: parkervcp Date: Wed, 25 Dec 2019 19:57:48 -0500 Subject: [PATCH 357/393] update script corrently --- stock-eggs/minecraft/egg-vanilla-minecraft.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stock-eggs/minecraft/egg-vanilla-minecraft.json b/stock-eggs/minecraft/egg-vanilla-minecraft.json index baaa63db..f613c815 100644 --- a/stock-eggs/minecraft/egg-vanilla-minecraft.json +++ b/stock-eggs/minecraft/egg-vanilla-minecraft.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-12-25T19:08:05-05:00", + "exported_at": "2019-12-25T19:55:01-05: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.", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Vanilla MC Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk update\r\napk add curl jq\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\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\ncurl -o ${SERVER_JARFILE} $DOWNLOAD_URL", + "script": "#!\/bin\/ash\r\n# Vanilla MC Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add curl --no-cache --update jq\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": "alpine:3.10", "entrypoint": "ash" } From 2b069811178e8008a5946c476853a216c2ae0849 Mon Sep 17 00:00:00 2001 From: parkervcp Date: Thu, 26 Dec 2019 15:51:38 -0500 Subject: [PATCH 358/393] update arma 3 config links Updates the arma3 config links. Also updates the install scripts. --- steamcmd_servers/arma/arma3/egg-arma3.json | 28 +++++++++---------- .../egg-arma3-headless-client.json | 8 +++--- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/steamcmd_servers/arma/arma3/egg-arma3.json b/steamcmd_servers/arma/arma3/egg-arma3.json index 6cafce19..66496d91 100644 --- a/steamcmd_servers/arma/arma3/egg-arma3.json +++ b/steamcmd_servers/arma/arma3/egg-arma3.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-03-13T18:40:40-04:00", + "exported_at": "2019-12-26T15:50:38-05:00", "name": "Arma 3", "author": "daave@aaathats3as.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.", @@ -17,8 +17,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl\r\napt -y --no-install-recommends install lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSLO http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd \/mnt\/server\/logs\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\n\r\ntouch \/mnt\/server\/latest.log\r\nchown -R root:root \/mnt\r\n\r\ntar -xzvf \/tmp\/steamcmd_linux.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\nexport HOME=\/mnt\/server\r\n\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${APP_ID} validate +quit\r\n\r\ncd \/mnt\/server\/\r\n[[ -f basic.cfg ]] || curl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/arma\/arma3\/egg-arma3-config\/basic.cfg\r\n[[ -f server.cfg ]] || curl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/arma\/arma3\/egg-arma3-config\/server.cfg", - "container": "ubuntu:18.04", + "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 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## ARMA III specific 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 https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/steamcmd_servers\/arma\/arma3\/egg-arma3-config\/basic.cfg\r\n[[ -f server.cfg ]] || curl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/steamcmd_servers\/arma\/arma3\/egg-arma3-config\/server.cfg", + "container": "debian:buster-slim", "entrypoint": "bash" } }, @@ -26,21 +26,12 @@ { "name": "Game App ID", "description": "Steam CMD App ID.", - "env_variable": "APP_ID", + "env_variable": "SRCDS_APPID", "default_value": "233780", "user_viewable": 1, "user_editable": 0, "rules": "required|alpha_dash|between:1,100" }, - { - "name": "Basic", - "description": "Basic network config", - "env_variable": "BASIC", - "default_value": "basic.cfg", - "user_viewable": 1, - "user_editable": 1, - "rules": "string|nullable" - }, { "name": "Config", "description": "Server config", @@ -95,6 +86,15 @@ "user_editable": 0, "rules": "nullable|string" }, + { + "name": "Basic", + "description": "Basic network config", + "env_variable": "BASIC", + "default_value": "basic.cfg", + "user_viewable": 1, + "user_editable": 1, + "rules": "string|nullable" + }, { "name": "Steam Auth Code", "description": "Steam Auth Code only when you're using Steam Auth", @@ -105,4 +105,4 @@ "rules": "nullable|string" } ] -} +} \ No newline at end of file diff --git a/steamcmd_servers/arma/arma3_headless_client/egg-arma3-headless-client.json b/steamcmd_servers/arma/arma3_headless_client/egg-arma3-headless-client.json index b0cb6e02..775b722a 100644 --- a/steamcmd_servers/arma/arma3_headless_client/egg-arma3-headless-client.json +++ b/steamcmd_servers/arma/arma3_headless_client/egg-arma3-headless-client.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-03-25T14:09:36+01:00", + "exported_at": "2019-12-26T15:50:34-05:00", "name": "Arma 3 Headless Client", "author": "brainp4in@blueberry-hood-clan.de", "description": "Headless Clients are used to offload AI calculations from the Arma 3 Server.", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl\r\napt -y --no-install-recommends install lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSLO http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd \/mnt\/server\/logs\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\n\r\ntouch \/mnt\/server\/latest.log\r\nchown -R root:root \/mnt\r\n\r\ntar -xzvf \/tmp\/steamcmd_linux.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\nexport HOME=\/mnt\/server\r\n\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${APP_ID} validate +quit\r\n\r\ncd \/mnt\/server\/\r\ncurl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/arma\/arma3\/egg-arma3-config\/server.cfg\r\ncurl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/arma\/arma3\/egg-arma3-config\/basic.cfg", + "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 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## ARMA III specific 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 https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/steamcmd_servers\/arma\/arma3\/egg-arma3-config\/basic.cfg\r\n[[ -f server.cfg ]] || curl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/steamcmd_servers\/arma\/arma3\/egg-arma3-config\/server.cfg", "container": "ubuntu:18.04", "entrypoint": "bash" } @@ -26,7 +26,7 @@ { "name": "Game App ID", "description": "Steam CMD App ID.", - "env_variable": "APP_ID", + "env_variable": "SRCDS_APPID", "default_value": "233780", "user_viewable": 1, "user_editable": 0, @@ -96,4 +96,4 @@ "rules": "nullable|string" } ] -} +} \ No newline at end of file From f47d632378d66a1e4159f544a7d6d058283866f5 Mon Sep 17 00:00:00 2001 From: gOOvER Date: Fri, 27 Dec 2019 12:28:14 +0100 Subject: [PATCH 359/393] add/eco New PR for ECO Server. Original Author deleted his Account --- steamcmd_servers/eco/README.md | 15 +++++++++++ steamcmd_servers/eco/egg-eco.json | 45 +++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 steamcmd_servers/eco/README.md create mode 100644 steamcmd_servers/eco/egg-eco.json diff --git a/steamcmd_servers/eco/README.md b/steamcmd_servers/eco/README.md new file mode 100644 index 00000000..147bda91 --- /dev/null +++ b/steamcmd_servers/eco/README.md @@ -0,0 +1,15 @@ +# Eco +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 +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 diff --git a/steamcmd_servers/eco/egg-eco.json b/steamcmd_servers/eco/egg-eco.json new file mode 100644 index 00000000..d9a7056f --- /dev/null +++ b/steamcmd_servers/eco/egg-eco.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-12-27T12:17:53+01:00", + "name": "Eco", + "author": "parker@parkervcp.com", + "description": "Eco is a community-based game", + "image": "quay.io\/parkervcp\/pterodactyl-images:debian_mono-5-complete", + "startup": "mono EcoServer.exe -nogui", + "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 }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Server Initialization \",\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# 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 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 +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} +app_set_config \u201c90 mod ${HLDS_GAME} +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", + "container": "ubuntu:18.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Game ID", + "description": "ID", + "env_variable": "SRCDS_APPID", + "default_value": "739590", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|numeric|digits_between:1,6" + }, + { + "name": "Web server port", + "description": "port", + "env_variable": "WEB_PORT", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" + } + ] +} \ No newline at end of file From 26f6165fff04dc682ec532144437226d6c5d44fa Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Fri, 27 Dec 2019 14:04:04 +0100 Subject: [PATCH 360/393] Update README.md --- steamcmd_servers/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/steamcmd_servers/README.md b/steamcmd_servers/README.md index 6f123f7a..0d3285d9 100644 --- a/steamcmd_servers/README.md +++ b/steamcmd_servers/README.md @@ -19,6 +19,9 @@ This is a collection of servers that use steamcmd to install. ## Don't Starve [dont_starve](dont_starve/) +## ECO +[ECO](eco/) + ## HLDS Server [hlds](hlds_server/) @@ -38,4 +41,4 @@ This is a collection of servers that use steamcmd to install. [starbound](starbound/) ## Sven coop -[svencoop](svencoop) \ No newline at end of file +[svencoop](svencoop) From a7ff957c71b413f14869540314d77cabd3fd0f4a Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 28 Dec 2019 08:57:25 +0100 Subject: [PATCH 361/393] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1c5aa0dd..5942be30 100644 --- a/README.md +++ b/README.md @@ -88,6 +88,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Arma 3 HC](/steamcmd_servers/arma/arma3_headless_client/) * [Conan Exiles](/steamcmd_servers/conan_exiles) * [Don't Starve](/steamcmd_servers/dont_starve) +* [ECO](/steamcmd_servers/eco/) * [HLDS server](/steamcmd_servers/hlds_server) * [Mordhau](/steamcmd_servers/mordhau) * [Onset](/steamcmd_servers/onset) From 04eddb8cd35e290a875cd037f822e6e4ca0af288 Mon Sep 17 00:00:00 2001 From: gOOvER Date: Sat, 28 Dec 2019 16:38:09 +0100 Subject: [PATCH 362/393] Updated startup command and Installscript --- steamcmd_servers/eco/egg-eco.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/steamcmd_servers/eco/egg-eco.json b/steamcmd_servers/eco/egg-eco.json index d9a7056f..199a0b29 100644 --- a/steamcmd_servers/eco/egg-eco.json +++ b/steamcmd_servers/eco/egg-eco.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-12-27T12:17:53+01:00", + "exported_at": "2019-12-28T16:37:09+01:00", "name": "Eco", "author": "parker@parkervcp.com", "description": "Eco is a community-based game", "image": "quay.io\/parkervcp\/pterodactyl-images:debian_mono-5-complete", - "startup": "mono EcoServer.exe -nogui", + "startup": "\/usr\/bin\/mono .\/EcoServer.exe -nogui", "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 }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Server Initialization \",\r\n \"userInteraction\": []\r\n}", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# SRCDS Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates 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 +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} +app_set_config \u201c90 mod ${HLDS_GAME} +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", + "script": "#!\/bin\/bash\r\n# 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", "container": "ubuntu:18.04", "entrypoint": "bash" } From 6dffcd3c7ed4921ba4a946e390290f80141024e2 Mon Sep 17 00:00:00 2001 From: gOOvER Date: Sun, 29 Dec 2019 10:27:38 +0100 Subject: [PATCH 363/393] Updated Description and eMail --- steamcmd_servers/eco/egg-eco.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/steamcmd_servers/eco/egg-eco.json b/steamcmd_servers/eco/egg-eco.json index 199a0b29..4f40a5a0 100644 --- a/steamcmd_servers/eco/egg-eco.json +++ b/steamcmd_servers/eco/egg-eco.json @@ -3,10 +3,10 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-12-28T16:37:09+01:00", + "exported_at": "2019-12-29T10:25:38+01:00", "name": "Eco", - "author": "parker@parkervcp.com", - "description": "Eco is a community-based game", + "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.", "image": "quay.io\/parkervcp\/pterodactyl-images:debian_mono-5-complete", "startup": "\/usr\/bin\/mono .\/EcoServer.exe -nogui", "config": { @@ -42,4 +42,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From c938b86acda0817d70c8a3631461662f6523519d Mon Sep 17 00:00:00 2001 From: gOOvER Date: Sun, 29 Dec 2019 11:24:33 +0100 Subject: [PATCH 364/393] Added Publicserver and Passwort Variable --- steamcmd_servers/eco/egg-eco.json | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/steamcmd_servers/eco/egg-eco.json b/steamcmd_servers/eco/egg-eco.json index 4f40a5a0..e7c016f6 100644 --- a/steamcmd_servers/eco/egg-eco.json +++ b/steamcmd_servers/eco/egg-eco.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-12-29T10:25:38+01:00", + "exported_at": "2019-12-29T11:23:06+01: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.", "image": "quay.io\/parkervcp\/pterodactyl-images:debian_mono-5-complete", "startup": "\/usr\/bin\/mono .\/EcoServer.exe -nogui", "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 }\r\n }\r\n}", + "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 }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Server Initialization \",\r\n \"userInteraction\": []\r\n}", "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "exit" @@ -39,7 +39,25 @@ "default_value": "", "user_viewable": 1, "user_editable": 1, + "rules": "required|numeric|digits_between:1,6" + }, + { + "name": "Public Server", + "description": "Public Server = true | Private Server = false", + "env_variable": "PUB_SRV", + "default_value": "false", + "user_viewable": 1, + "user_editable": 1, "rules": "required|string|max:20" + }, + { + "name": "Server Password", + "description": "Password to join the Server", + "env_variable": "SRV_PWD", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "nullable|string|max:20" } ] -} +} \ No newline at end of file From 5805ab86c04b56039366b1856e437437427ee3fe Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 29 Dec 2019 17:54:25 -0500 Subject: [PATCH 365/393] update scripts folder Change steamcmd recommended to debian-buster-slim Update release grabber with curly braces on variables (readability). Add script for validating that download links actually exist with no errors. update gitignore. --- .gitignore | 2 +- scripts/download_link_validator.sh | 11 +++++++++++ scripts/github_release_grabber.sh | 21 ++++++++++----------- scripts/steamcmd_installer.sh | 2 +- 4 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 scripts/download_link_validator.sh diff --git a/.gitignore b/.gitignore index 378f0ca5..615b2764 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ *.DS_Store node_modules/ -.vuepress/ \ No newline at end of file +.vuepress/* \ No newline at end of file diff --git a/scripts/download_link_validator.sh b/scripts/download_link_validator.sh new file mode 100644 index 00000000..10a6d69a --- /dev/null +++ b/scripts/download_link_validator.sh @@ -0,0 +1,11 @@ +## this is a simple script to validate a download url actaully exists + +if [ ! -z "${DOWNLOAD_URL}"]; then + if curl --output /dev/null --silent --head --fail ${DOWNLOAD_URL}; then + echo -e "link is valid. setting download link to ${DOWNLOAD_URL}" + DOWNLOAD_LINK=${DOWNLOAD_URL} + else + echo -e "link is invalid closing out" + exit 2 + fi +fi \ No newline at end of file diff --git a/scripts/github_release_grabber.sh b/scripts/github_release_grabber.sh index d05120c8..14d4e70e 100644 --- a/scripts/github_release_grabber.sh +++ b/scripts/github_release_grabber.sh @@ -3,26 +3,25 @@ ## this supports using oauth/personal access tokens via GITHUB_USER and GITHUB_OAUTH_TOKEN (both are required.) ## if you are getting hit with GitHub API limit issues then you need to have the user and token set. - -if [ -z "$GITHUB_USER" ] && [ -z "$GITHUB_OAUTH_TOKEN" ] ; then +if [ -z "${GITHUB_USER}" ] && [ -z "${GITHUB_OAUTH_TOKEN}" ] ; then echo -e "using anon api call" else echo -e "user and oauth token set" - alias curl='curl -u $GITHUB_USER:$GITHUB_OAUTH_TOKEN ' + alias curl='curl -u ${GITHUB_USER}:${GITHUB_OAUTH_TOKEN} ' fi ## get release info and download links -LATEST_JSON=$(curl --silent "https://api.github.com/repos/$GITHUB_PACKAGE/releases/latest") -RELEASES=$(curl --silent "https://api.github.com/repos/$GITHUB_PACKAGE/releases") +LATEST_JSON=$(curl --silent "https://api.github.com/repos/${GITHUB_PACKAGE}/releases/latest") +RELEASES=$(curl --silent "https://api.github.com/repos/${GITHUB_PACKAGE}/releases") -if [ -z "$VERSION" ] || [ "$VERSION" == "latest" ]; then - DOWNLOAD_LINK=$(echo $LATEST_JSON | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH}) +if [ -z "${VERSION}" ] || [ "${VERSION}" == "latest" ]; then + DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH}) else - VERSION_CHECK=$(echo $RELEASES | jq -r --arg VERSION "$VERSION" '.[] | select(.tag_name==$VERSION) | .tag_name') - if [ "$VERSION" == "$VERSION_CHECK" ]; then - DOWNLOAD_LINK=$(echo $RELEASES | jq -r --arg VERSION "$VERSION" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH}) + VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION "${VERSION}" '.[] | select(.tag_name==$VERSION) | .tag_name') + if [ "${VERSION}" == "${VERSION_CHECK}" ]; then + DOWNLOAD_LINK=$(echo ${RELEASES} | jq -r --arg VERSION "${VERSION}" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH}) else echo -e "defaulting to latest release" - DOWNLOAD_LINK=$(echo $LATEST_JSON | jq .assets | jq -r .[].browser_download_url) + DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url) fi fi \ No newline at end of file diff --git a/scripts/steamcmd_installer.sh b/scripts/steamcmd_installer.sh index eba1d2c2..c36fa040 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 'ubuntu:18.04' +# Image to install with is 'debian:buster-slim' apt -y update apt -y --no-install-recommends install curl lib32gcc1 ca-certificates From 0be5d837412ca6ce5392e9bfb571847c8d3523e5 Mon Sep 17 00:00:00 2001 From: gOOvER Date: Mon, 30 Dec 2019 09:05:45 +0100 Subject: [PATCH 366/393] Updated installscript to lastest --- steamcmd_servers/eco/egg-eco.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/steamcmd_servers/eco/egg-eco.json b/steamcmd_servers/eco/egg-eco.json index e7c016f6..49041fa0 100644 --- a/steamcmd_servers/eco/egg-eco.json +++ b/steamcmd_servers/eco/egg-eco.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-12-29T11:23:06+01:00", + "exported_at": "2019-12-30T09:04:05+01: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.", @@ -17,8 +17,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", - "container": "ubuntu:18.04", + "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", + "container": "debian:buster-slim", "entrypoint": "bash" } }, From 01e4f9d8a892d161624521069e0067002805f66c Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Tue, 31 Dec 2019 18:51:23 -0500 Subject: [PATCH 367/393] update teamspeak egg --- .../voice-servers/egg-teamspeak3-server.json | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/stock-eggs/voice-servers/egg-teamspeak3-server.json b/stock-eggs/voice-servers/egg-teamspeak3-server.json index 2058ec22..d96ee5c4 100644 --- a/stock-eggs/voice-servers/egg-teamspeak3-server.json +++ b/stock-eggs/voice-servers/egg-teamspeak3-server.json @@ -3,22 +3,22 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-05-01T16:35:15+00:00", + "exported_at": "2019-12-31T18:49:40-05: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.", - "image": "quay.io\/pterodactyl\/core:glibc", - "startup": ".\/ts3server_minimal_runscript.sh default_voice_port={{SERVER_PORT}} query_port={{SERVER_PORT}} license_accepted=1", + "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", + "startup": ".\/ts3server default_voice_port={{SERVER_PORT}} query_port={{SERVER_PORT}} filetransfer_ip=0.0.0.0 filetransfer_port={{FILE_TRANSFER}} license_accepted=1", "config": { "files": "{}", - "startup": "{\"done\": \"listening on 0.0.0.0:\", \"userInteraction\": []}", - "logs": "{\"custom\": true, \"location\": \"logs\/ts3.log\"}", + "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\/ash\n# TS3 Installation Script\n#\n# Server Files: \/mnt\/server\napk update\napk add tar curl\n\ncd \/mnt\/server\n\ncurl http:\/\/dl.4players.de\/ts\/releases\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2 | tar xj --strip-components=1", - "container": "alpine:3.9", + "script": "#!\/bin\/ash\r\n# TS3 Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache tar curl jq\r\n\r\nif [ -z ${TS_VERSION} ] || [ ${TS_VERSION} == latest ]; then\r\n TS_VERSION=$(wget https:\/\/teamspeak.com\/versions\/server.json -qO - | jq -r '.linux.x86_64.version')\r\nfi\r\n\r\ncd \/mnt\/server\r\n\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 http:\/\/files.teamspeak-services.com\/releases\/server\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2 | tar xj --strip-components=1", + "container": "alpine:3.10", "entrypoint": "ash" } }, @@ -27,10 +27,19 @@ "name": "Server Version", "description": "The version of Teamspeak 3 to use when running the server.", "env_variable": "TS_VERSION", - "default_value": "3.7.1", + "default_value": "latest", "user_viewable": 1, "user_editable": 1, - "rules": "required|regex:\/^([0-9_\\.-]{5,10})$\/" + "rules": "required|string|max:6" + }, + { + "name": "File Transfer Port", + "description": "The Teamspeak file transfer port", + "env_variable": "FILE_TRANSFER", + "default_value": "30033", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|integer|between:1,65535" } ] } \ No newline at end of file From 2180299d63cfb1df9f404d08fe9943111fc02f5e Mon Sep 17 00:00:00 2001 From: gOOvER Date: Wed, 1 Jan 2020 11:56:08 +0100 Subject: [PATCH 368/393] 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 369/393] 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 370/393] 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 ae5b0ae8ceba9781c36bb82f32fb13e1dd624d31 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Thu, 2 Jan 2020 00:09:05 -0500 Subject: [PATCH 371/393] update pocketmine egg update link for server.properties. --- 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 9989c575..8d752d82 100644 --- a/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json +++ b/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-08-18T09:29:46-04:00", + "exported_at": "2020-01-02T00:07:42-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 :)", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n\r\napk add --no-cache curl\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"\\n downloading pocketmine MP build ${PMMP_VERSION}\"\r\nif [ -z \"$PMMP_VERSION\" ] || [ \"$PMMP_VERSION\" == \"latest\" ]; then\r\n curl -sSL -o PocketMine-MP.phar https:\/\/jenkins.pmmp.io\/job\/PocketMine-MP\/Stable\/artifact\/PocketMine-MP.phar\r\nelse \r\n curl -sSL -o PocketMine-MP.phar https:\/\/jenkins.pmmp.io\/job\/PocketMine-MP\/${PMMP_VERSION}\/artifact\/PocketMine-MP.phar\r\nfi\r\n\r\necho -e \"\\n downloading latest php7.3 build from pocketmine\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-7.3-Linux-x86_64\/lastSuccessfulBuild\/artifact\/PHP_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\/Minecraft%20PE\/PocketmineMP\/server.properties > server.properties\r\necho -e \"\\n unpacking php7 binaries\"\r\ntar -xzvf php.binary.tar.gz\r\necho -e \"\\n removing pvp7 packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.tx banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs", + "script": "#!\/bin\/ash\r\n\r\napk add --no-cache curl\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"\\n downloading pocketmine MP build ${PMMP_VERSION}\"\r\nif [ -z \"$PMMP_VERSION\" ] || [ \"$PMMP_VERSION\" == \"latest\" ]; then\r\n curl -sSL -o PocketMine-MP.phar https:\/\/jenkins.pmmp.io\/job\/PocketMine-MP\/Stable\/artifact\/PocketMine-MP.phar\r\nelse \r\n curl -sSL -o PocketMine-MP.phar https:\/\/jenkins.pmmp.io\/job\/PocketMine-MP\/${PMMP_VERSION}\/artifact\/PocketMine-MP.phar\r\nfi\r\n\r\necho -e \"\\n downloading latest php7.3 build from pocketmine\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-7.3-Linux-x86_64\/lastSuccessfulBuild\/artifact\/PHP_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\/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 pvp7 packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.tx banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs", "container": "alpine:3.10", "entrypoint": "ash" } From 403031bddf8dce91821b543126cb6e150a7912fa Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Thu, 2 Jan 2020 15:26:05 -0500 Subject: [PATCH 372/393] add altV resolves #402 --- README.md | 1 + gta/README.md | 5 +++- gta/altv/README.md | 11 +++++++ gta/altv/egg-alt--v.json | 63 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 gta/altv/README.md create mode 100644 gta/altv/egg-alt--v.json diff --git a/README.md b/README.md index 5942be30..e3b4005c 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 * GTA V * [FiveM](/gta/fivem/) * [RageMP](/gta/ragemp/) + * [alt:V](/gta/altv/) * GTA SA * [Multi Theft Auto](/gta/mtasa/) * [SA-MP](/gta/samp/) diff --git a/gta/README.md b/gta/README.md index 0106aa42..64bdd40e 100644 --- a/gta/README.md +++ b/gta/README.md @@ -5,9 +5,12 @@ [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) +alt:V Multiplayer a third-party multiplayer modification for Grand Theft Auto: V + ## San Andreas [GTA SA:MP](https://www.sa-mp.com/) diff --git a/gta/altv/README.md b/gta/altv/README.md new file mode 100644 index 00000000..dddd7a36 --- /dev/null +++ b/gta/altv/README.md @@ -0,0 +1,11 @@ +# alt:v + +### From the [alt:V](https://altv.mp) Site +alt:V Multiplayer a third-party multiplayer modification for Grand Theft Auto: V. + +### Server Ports +Ports required to run the server in a table format. + +| Port | default | +|---------|---------| +| Game | 7788 | diff --git a/gta/altv/egg-alt--v.json b/gta/altv/egg-alt--v.json new file mode 100644 index 00000000..f1a31b78 --- /dev/null +++ b/gta/altv/egg-alt--v.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-02T15:11:11-05:00", + "name": "alt:V", + "author": "parker@parkervcp.com", + "description": "alt:V Multiplayer a third-party multiplayer modification for Grand Theft Auto: V", + "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", + "startup": "sleep 2 && .\/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}", + "startup": "{\r\n \"done\": \"Server started\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# AltV Install Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# BUILD=stable ## this should be an egg variable.\r\nBASE_URL=\"https:\/\/cdn.altv.mp\/\" ## Where the files are stored.\r\n\r\n## install required dependancies.\r\nfunction install_deps () {\r\n apt update\r\n apt install -y libatomic1 zip unzip jq curl wget\r\n echo -e \"deps installed\"\r\n echo -e\r\n}\r\n\r\n## check the has on files and compare to a remote source.\r\n## usage 'check_hash \"file\" \"remote_hash_source\"'\r\nfunction check_hash () {\r\n echo -e \"Checking for file ${1}\"\r\n echo -e \"running: curl -sSL ${2} | jq -r --arg FILENAME \\\"${3}\\\" '.hashList | .[\\$FILENAME]'\"\r\n hash=$(curl -sSL ${2} | jq -r --arg FILENAME ${3} '.hashList | .[$FILENAME]')\r\n echo -e \"hash: $hash\"\r\n\r\n if [ -f ${2} ]; then\r\n\r\n echo -e \"hash is $(sha1sum ${1} | awk '{ print $1 }')\"\r\n echo -e \"current has is ${hash}\"\r\n\r\n if [ \"$(sha1sum ${2} | awk '{ print $1 }')\" == \"${hash}\" ]; then\r\n echo -e \"Hash matched\"\r\n echo -e \"No need to download new file.\"\r\n return 0\r\n else\r\n echo -e \"Hash didn't match\"\r\n echo -e \"Need to download the correct version\"\r\n return 1\r\n fi\r\n else\r\n echo \"No file found\"\r\n return 1\r\n fi\r\n}\r\n\r\n## makes sure a download link is valid.\r\nfunction validate_download () {\r\n DOWNLOAD_URL=${1}\r\n\r\n echo -e \"Download url is ${DOWNLOAD_URL}\"\r\n\r\n if [ ! -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\n fi\r\n\r\n}\r\n\r\nfunction download_files () {\r\n ## validate download link and get files\r\n validate_download ${1}\r\n echo -e \"running wget ${DOWNLOAD_URL} -O ${2}\"\r\n wget ${DOWNLOAD_URL} -O ${2}\r\n}\r\n\r\n## This is a file array for files to get downloaded.\r\n## They are all comma separated lists.\r\n## remote folder (0), json file with hashes (1), file name in json file (2), file name (3), file folder (4), extra commands (5)\r\nfile_array=( \\\r\n\"server\/${BUILD}\/x64_linux\/\",\"update.json\",\"altv-server\",\"altv-server\",\/mnt\/server\/,execute \\\r\n\"server\/${BUILD}\/x64_linux\/\",\"update.json\",\"data\/vehmodels.bin\",\"vehmodels.bin\",\/mnt\/server\/data\/ \\\r\n\"server\/${BUILD}\/x64_linux\/\",\"update.json\",\"data\/vehmods.bin\",\"vehmods.bin\",\/mnt\/server\/data\/ \\\r\n\"others\/\",,\"server.cfg\",server.cfg,\/mnt\/server\/ \\\r\n\"node-module\/${BUILD}\/x64_linux\/\",\"update.json\",\"libnode.so.72\",\"libnode.so.72\",\/mnt\/server\/ \\\r\n\"node-module\/${BUILD}\/x64_linux\/\",\"update.json\",\"modules\/libnode-module.so\",\"libnode-module.so\",\/mnt\/server\/modules\/ \\\r\n\"coreclr-module\/${BUILD}\/x64_linux\/\",,\"AltV.Net.Host.dll\",\"AltV.Net.Host.dll\",\/mnt\/server\/ \\\r\n\"coreclr-module\/${BUILD}\/x64_linux\/\",,\"AltV.Net.Host.runtimeconfig.json\",\"AltV.Net.Host.runtimeconfig.json\",\/mnt\/server\/ \\\r\n\"coreclr-module\/stable\/x64_linux\/\",\"update.json\",\"modules\/libcsharp-module.so\",\"libcsharp-module.so\",\/mnt\/server\/modules\/ \\\r\n\"samples\/\",,\"resources.zip\",\"resources.zip\",\/mnt\/server\/,unzip \\\r\n)\r\n\r\ninstall_deps\r\n\r\n## this goes through each value in the array and then checks the hash\r\nfor EACH in ${file_array[@]}\r\ndo\r\n ## this needs to be here to break apart the arrays.\r\n IFS=',' read -r -a array <<< \"$EACH\"\r\n\r\n if [ ! -z \"${array[1]}\" ]; then\r\n ## check hash on 'folder\/file' with 'remote file base url\/remote folder\/ json file' 'json file name' \r\n if check_hash \"${array[4]}${array[3]}\" \"${BASE_URL}${array[0]}${array[1]}\" \"${array[2]}\"; then\r\n echo -e \"file up to date\"\r\n else\r\n echo -e \"downloading most recent file\"\r\n fi\r\n ## make the directory if it doesn't exist.\r\n if [ ! -d ${array[4]} ]; then\r\n mkdir ${array[4]}\r\n fi\r\n download_files \"${BASE_URL}${array[0]}${array[2]}\" \"${array[4]}${array[3]}\"\r\n else\r\n ## make the directory if it doesn't exist.\r\n if [ ! -d ${array[4]} ]; then\r\n mkdir ${array[4]}\r\n fi\r\n download_files \"${BASE_URL}${array[0]}${array[2]}\" \"${array[4]}${array[3]}\"\r\n fi\r\n\r\n ## run extra commands if needed.\r\n case ${array[5]} in\r\n unzip)\r\n cd ${array[4]}\r\n unzip -o ${array[3]}\r\n rm ${array[3]}\r\n ;;\r\n execute)\r\n chmod +x ${array[4]}${array[3]}\r\n ;;\r\n esac\r\n\r\n# echo -e \"HashFile: ${BASE_URL}${array[0]}${array[1]}\"\r\n# echo -e \"Download URL ${BASE_URL}${array[0]}${array[2]}\"\r\n# echo -e \"Filename ${array[3]}\"\r\n# echo -e \"File Folder ${array[4]}\"\r\n# echo -e \"commands to run ${array[5]}\"\r\n# echo -e\r\ndone\r\n\r\necho -e \"install complete\"", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "ld lib path", + "description": "Needed to load modules correctly.", + "env_variable": "LD_LIBRARY_PATH", + "default_value": ".", + "user_viewable": 0, + "user_editable": 0, + "rules": "required|string|max:20" + }, + { + "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", + "env_variable": "BUILD", + "default_value": "stable", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" + }, + { + "name": "Server Password", + "description": "The password to join the server", + "env_variable": "PASSWORD", + "default_value": "ChangeMe", + "user_viewable": 1, + "user_editable": 1, + "rules": "nullable|string|min:6" + }, + { + "name": "Server Description", + "description": "Description for the server.", + "env_variable": "SERVER_DESC", + "default_value": "A Pterodactyl Hosted Server", + "user_viewable": 1, + "user_editable": 1, + "rules": "nullable|string" + } + ] +} \ No newline at end of file From d25ab80f3f488bda6acad9ca11e53cc9428361d9 Mon Sep 17 00:00:00 2001 From: gOOvER Date: Mon, 6 Jan 2020 09:37:15 +0100 Subject: [PATCH 373/393] 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 374/393] 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 bf630af9be7cc612780a406ffb886c3d4838ef65 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 19 Jan 2020 11:12:35 -0500 Subject: [PATCH 375/393] update pixelbot image Updating to use the updated python image. --- bots/discord/pixelbot/egg-pixel-bot.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bots/discord/pixelbot/egg-pixel-bot.json b/bots/discord/pixelbot/egg-pixel-bot.json index d149e036..5949b3b1 100644 --- a/bots/discord/pixelbot/egg-pixel-bot.json +++ b/bots/discord/pixelbot/egg-pixel-bot.json @@ -3,11 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-03-27T08:57:41-04:00", + "exported_at": "2020-01-19T11:11:24-05:00", "name": "pixel-bot", "author": "parker@parkervcp.com", "description": "A Discord bot written in Python using discord.py\r\n\r\nhttps:\/\/github.com\/Ispira\/pixel-bot", - "image": "quay.io\/parkervcp\/pterodactyl-images:python3", + "image": "quay.io\/parkervcp\/pterodactyl-images:alpine_python-3", "startup": "python bot.py", "config": { "files": "{\r\n \"config\/config.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"owner\": \"{{server.build.env.OWNER_UID}}\",\r\n \"token\": \"{{server.build.env.BOT_TOKEN}}\",\r\n \"bot_name\": \"{{server.build.env.BOT_NAME}}\",\r\n \"log_file\": \"latest.log\"\r\n }\r\n },\r\n \"plugins\/settings\/imgur.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"client_id\": \"{{server.build.env.IMGUR_KEY}}\",\r\n \"client_secret\": \"{{server.build.env.IMGUR_SECRET}}\"\r\n }\r\n }\r\n}", From b948d2f18de64eaa3759ca1dcda4b1ff3b7e7348 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 24 Jan 2020 09:01:45 -0500 Subject: [PATCH 376/393] 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 377/393] 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 378/393] 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 379/393] 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 380/393] 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 3fa05227d2663f5f7e1b9978ec5b908c2f38d57b Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sat, 1 Feb 2020 08:00:48 -0500 Subject: [PATCH 381/393] add/RedM support resolved #379 --- rdr/README.md | 6 ++++ rdr/redm/README.md | 16 +++++++++ rdr/redm/egg-red-m.json | 72 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+) create mode 100644 rdr/README.md create mode 100644 rdr/redm/README.md create mode 100644 rdr/redm/egg-red-m.json diff --git a/rdr/README.md b/rdr/README.md new file mode 100644 index 00000000..abade62b --- /dev/null +++ b/rdr/README.md @@ -0,0 +1,6 @@ +# 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 diff --git a/rdr/redm/README.md b/rdr/redm/README.md new file mode 100644 index 00000000..469e3f07 --- /dev/null +++ b/rdr/redm/README.md @@ -0,0 +1,16 @@ +# Red M + +### 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 +- Only installs latest version versions are not selectable. + +### 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 diff --git a/rdr/redm/egg-red-m.json b/rdr/redm/egg-red-m.json new file mode 100644 index 00000000..f61bec80 --- /dev/null +++ b/rdr/redm/egg-red-m.json @@ -0,0 +1,72 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2020-02-01T08:00:01-05:00", + "name": "RedM", + "author": "parker@parkervcp.com", + "description": "A new RedM egg for the latest builds due to recent changes in RedM", + "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 {{CFX_LICENSE}} +set sv_maxplayers {{MAX_PLAYERS}} +exec server.cfg gamename rdr3", + "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}", + "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "stop": "^C" + }, + "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\/gta\/fivem\/server.cfg >> server.cfg\r\nfi\r\n\r\necho \"install complete\"", + "container": "alpine:3.10", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "fivem license", + "description": "Required to start the service. Get your keys at https:\/\/keymaster.fivem.net\/", + "env_variable": "CFX_LICENSE", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string" + }, + { + "name": "Max Players", + "description": "Set the fivem max play count", + "env_variable": "MAX_PLAYERS", + "default_value": "32", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|integer|between:1,32" + }, + { + "name": "Server Hostname", + "description": "The name that shows up in the server browser", + "env_variable": "SERVER_HOSTNAME", + "default_value": "My new FXServer!", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string" + }, + { + "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 the latest version from here - https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/", + "env_variable": "CFX_VERSION", + "default_value": "latest", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:50" + }, + { + "name": "Download Link", + "description": "This is the link to download fivem from. This is only used in the install script.\r\n\r\nThe file you link to needs to be an fx.tar.zx file.\r\n\r\nExample:\r\nhttps:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/1626-8c06e8bc3ed7e6690c6c2d9e0b90e29df65b3ea6\/fx.tar.xz", + "env_variable": "DOWNLOAD_URL", + "default_value": "", + "user_viewable": 0, + "user_editable": 0, + "rules": "string|nullable" + } + ] +} \ No newline at end of file From 10c81977b6322f4d68fb4a7a4e9900a9edf8beff Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sat, 1 Feb 2020 08:03:20 -0500 Subject: [PATCH 382/393] update main readme --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e3b4005c..c5fda26b 100644 --- a/README.md +++ b/README.md @@ -78,8 +78,8 @@ 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/) +[Red Dead Redemption](/rdr/) +* [RedM](/rdr/redm/) [steamcmd servers](/steamcmd_servers/) These eggs use steamcmd to install * [7 Days to Die](/steamcmd_servers/7_days_to_die/) @@ -101,6 +101,9 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Unturned](/unturned/) * [RocketMod](/unturned/rocketmod/) +[Tycoon Games](/tycoon_games/) +* [OpenTTD](/tycoon_games/openttd/) + [Unreal Engine](/unreal_engine) * [Tower Unite](/unreal_engine/tower_unite/) From 1c92b6f11fbdd4dd3591a343a627a93edcbe65ea Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sat, 1 Feb 2020 21:37:44 -0500 Subject: [PATCH 383/393] 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 384/393] 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 385/393] 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 386/393] 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 e4932f9e5ba194bcf04a16be2779f06bf1c7433c Mon Sep 17 00:00:00 2001 From: KungRaseri Date: Thu, 6 Feb 2020 09:45:15 -0700 Subject: [PATCH 387/393] A few updates to the new RedM egg This should properly set the gamename to rdr3. A few changes to the variables to reflect the proper game name. --- rdr/redm/egg-red-m.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rdr/redm/egg-red-m.json b/rdr/redm/egg-red-m.json index f61bec80..63e8b28b 100644 --- a/rdr/redm/egg-red-m.json +++ b/rdr/redm/egg-red-m.json @@ -8,7 +8,7 @@ "author": "parker@parkervcp.com", "description": "A new RedM egg for the latest builds due to recent changes in RedM", "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 {{CFX_LICENSE}} +set sv_maxplayers {{MAX_PLAYERS}} +exec server.cfg gamename rdr3", + "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 sv_maxplayers {{MAX_PLAYERS}} +exec server.cfg +set gamename rdr3", "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}", @@ -24,7 +24,7 @@ }, "variables": [ { - "name": "fivem license", + "name": "CFX license", "description": "Required to start the service. Get your keys at https:\/\/keymaster.fivem.net\/", "env_variable": "CFX_LICENSE", "default_value": "", @@ -51,8 +51,8 @@ "rules": "required|string" }, { - "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 the latest version from here - https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/", + "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\/", "env_variable": "CFX_VERSION", "default_value": "latest", "user_viewable": 1, @@ -61,7 +61,7 @@ }, { "name": "Download Link", - "description": "This is the link to download fivem from. This is only used in the install script.\r\n\r\nThe file you link to needs to be an fx.tar.zx file.\r\n\r\nExample:\r\nhttps:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/1626-8c06e8bc3ed7e6690c6c2d9e0b90e29df65b3ea6\/fx.tar.xz", + "description": "This is the link to download redm from. This is only used in the install script.\r\n\r\nThe file you link to needs to be an fx.tar.zx file.\r\n\r\nExample:\r\nhttps:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/1626-8c06e8bc3ed7e6690c6c2d9e0b90e29df65b3ea6\/fx.tar.xz", "env_variable": "DOWNLOAD_URL", "default_value": "", "user_viewable": 0, @@ -69,4 +69,4 @@ "rules": "string|nullable" } ] -} \ No newline at end of file +} From ac9b60215a38265eccf632d0b5fbee660185bd6b Mon Sep 17 00:00:00 2001 From: KungRaseri Date: Thu, 6 Feb 2020 09:58:27 -0700 Subject: [PATCH 388/393] added steam_webApiKey variable --- rdr/redm/egg-red-m.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/rdr/redm/egg-red-m.json b/rdr/redm/egg-red-m.json index 63e8b28b..8e2c3f9d 100644 --- a/rdr/redm/egg-red-m.json +++ b/rdr/redm/egg-red-m.json @@ -8,7 +8,7 @@ "author": "parker@parkervcp.com", "description": "A new RedM egg for the latest builds due to recent changes in RedM", "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 {{CFX_LICENSE}} +set sv_maxplayers {{MAX_PLAYERS}} +exec server.cfg +set gamename rdr3", + "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": { "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" }, + { + "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", From 9ad7616f266b57cab7823dd0df44c059ca07be5b Mon Sep 17 00:00:00 2001 From: KungRaseri Date: Thu, 6 Feb 2020 10:34:58 -0700 Subject: [PATCH 389/393] 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 390/393] 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 391/393] 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 392/393] 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 393/393] 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": [