From a88bd78b077b5f5633e2cfb56f0d3a44f13bbde6 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 23 Feb 2018 20:13:28 -0500 Subject: [PATCH 01/55] fixing factorio experimental Getting the correct experimental version --- Factorio/factorio/egg-factorio.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Factorio/factorio/egg-factorio.json b/Factorio/factorio/egg-factorio.json index 39f124ad..586848da 100644 --- a/Factorio/factorio/egg-factorio.json +++ b/Factorio/factorio/egg-factorio.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-23T19:29:30-05:00", + "exported_at": "2018-02-23T19:59:22-05:00", "name": "Factorio", "author": "parker@parkervcp.com", "description": "The vanilla Factorio server.\r\n\r\nhttps:\/\/www.factorio.com\/", @@ -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 curl tar xz\r\n\r\nlatest_stable=`curl https:\/\/updater.factorio.com\/get-available-versions | grep stable | grep -o -E '([0-9]\\.[0-9][0-9]\\.[0-9][0-9]|[0-9]\\.[0-9][0-9]\\.[0-9])'`\r\nlatest_experimental=`curl https:\/\/updater.factorio.com\/get-available-versions | grep to | grep -o -E '([0-9]\\.[0-9][0-9]\\.[0-9][0-9]|[0-9]\\.[0-9][0-9]\\.[0-9])' | tail -1`\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 \"\\n running 'curl -L 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 -L 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\nmv data\/map-gen-settings.example.json data\/map-gen-settings.json\r\nmv data\/server-settings.example.json data\/server-settings.json\r\n\r\n.\/bin\/x64\/factorio --create ${SAVE_NAME}", + "script": "#!\/bin\/ash\r\n# Factorio Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache curl tar xz\r\n\r\nlatest_stable=`curl https:\/\/updater.factorio.com\/get-available-versions | grep stable | grep -o -E '([0-9]\\.[0-9][0-9]\\.[0-9][0-9]|[0-9]\\.[0-9][0-9]\\.[0-9])'`\r\nlatest_experimental=`curl 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 \"\\n running 'curl -L 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 -L 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\nmv data\/map-gen-settings.example.json data\/map-gen-settings.json\r\nmv data\/server-settings.example.json data\/server-settings.json\r\n\r\n.\/bin\/x64\/factorio --create ${SAVE_NAME}", "container": "frolvlad\/alpine-glibc", "entrypoint": "ash" } From 8f2257417e856fa1195b30191ca6576cf904774e Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 23 Feb 2018 20:13:59 -0500 Subject: [PATCH 02/55] adding nukkit --- Minecraft/nukkit/egg-nukkit.json | 54 ++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 Minecraft/nukkit/egg-nukkit.json diff --git a/Minecraft/nukkit/egg-nukkit.json b/Minecraft/nukkit/egg-nukkit.json new file mode 100644 index 00000000..29b05e77 --- /dev/null +++ b/Minecraft/nukkit/egg-nukkit.json @@ -0,0 +1,54 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-02-23T20:12:46-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\/", + "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# 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 http:\/\/ci.mengcraft.com:8080\/job\/nukkit\/lastSuccessfulBuild\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nelse\r\n wget http:\/\/ci.mengcraft.com:8080\/job\/nukkit\/${NUKKIT_VERSION}\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nfi\r\n\r\nwget https:\/\/github.com\/parkervcp\/eggs\/raw\/master\/Minecraft\/nukkit\/nukkit.yml", + "container": "alpine:3.7", + "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": "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": 1, + "user_editable": 0, + "rules": "nullable|string" + }, + { + "name": "nukkit version", + "description": "The version of Nukkitt to download (using the --rev tag). Use \"latest\" for latest.", + "env_variable": "NUKKIT_VERSION", + "default_value": "latest", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" + } + ] +} \ No newline at end of file From 2a187e69fcad86856f57ed78a8945cfe205649cb Mon Sep 17 00:00:00 2001 From: Black Spray Date: Sun, 25 Feb 2018 11:38:34 -0500 Subject: [PATCH 03/55] added SA-MP --- GTA/SA-MP/egg-s-a--m-p.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 GTA/SA-MP/egg-s-a--m-p.json diff --git a/GTA/SA-MP/egg-s-a--m-p.json b/GTA/SA-MP/egg-s-a--m-p.json new file mode 100644 index 00000000..bc63df0b --- /dev/null +++ b/GTA/SA-MP/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": "2018-02-25T18:35:25+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": "registry.gitlab.com\/bl4ckspr4y\/pterodactyl_sa-mp:latest", + "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 179dc8481e8464a1dc938c54d8d701fe6199d57e Mon Sep 17 00:00:00 2001 From: Bl4ckSpr4y Date: Sun, 25 Feb 2018 18:51:06 +0200 Subject: [PATCH 04/55] Rename egg-s-a--m-p.json to egg-sa-mp.json --- GTA/SA-MP/{egg-s-a--m-p.json => egg-sa-mp.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename GTA/SA-MP/{egg-s-a--m-p.json => egg-sa-mp.json} (100%) diff --git a/GTA/SA-MP/egg-s-a--m-p.json b/GTA/SA-MP/egg-sa-mp.json similarity index 100% rename from GTA/SA-MP/egg-s-a--m-p.json rename to GTA/SA-MP/egg-sa-mp.json From a7bb785f73695cb85cf1c175ee7105eb227600f1 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 25 Feb 2018 12:26:27 -0500 Subject: [PATCH 05/55] spigot update Changed name and setup so it doesn't get removed on updates. --- .../egg-spigot--enhanced.json} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename Minecraft/{spigot/egg-spigot.json => spigot-enhanced/egg-spigot--enhanced.json} (97%) diff --git a/Minecraft/spigot/egg-spigot.json b/Minecraft/spigot-enhanced/egg-spigot--enhanced.json similarity index 97% rename from Minecraft/spigot/egg-spigot.json rename to Minecraft/spigot-enhanced/egg-spigot--enhanced.json index ca91d1a3..a55ee430 100644 --- a/Minecraft/spigot/egg-spigot.json +++ b/Minecraft/spigot-enhanced/egg-spigot--enhanced.json @@ -3,8 +3,8 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-15T16:00:42-05:00", - "name": "Spigot", + "exported_at": "2018-02-25T12:20:22-05: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", From 16502211cd64d196da5387d1863aed41d037ddb3 Mon Sep 17 00:00:00 2001 From: Bl4ckSpr4y Date: Sun, 25 Feb 2018 21:34:13 +0200 Subject: [PATCH 06/55] Use parkervcp's quay --- GTA/SA-MP/egg-sa-mp.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GTA/SA-MP/egg-sa-mp.json b/GTA/SA-MP/egg-sa-mp.json index bc63df0b..a3ff2f6b 100644 --- a/GTA/SA-MP/egg-sa-mp.json +++ b/GTA/SA-MP/egg-sa-mp.json @@ -3,11 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-25T18:35:25+02:00", + "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": "registry.gitlab.com\/bl4ckspr4y\/pterodactyl_sa-mp:latest", + "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}", From 3ca1eb65a145cc114e09682b8bb29a6a9a81399d Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Mon, 26 Feb 2018 14:16:15 -0500 Subject: [PATCH 07/55] beginning forge updates --- .../forge-enhanced/egg-forge--enchanced.json | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 Minecraft/forge-enhanced/egg-forge--enchanced.json diff --git a/Minecraft/forge-enhanced/egg-forge--enchanced.json b/Minecraft/forge-enhanced/egg-forge--enchanced.json new file mode 100644 index 00000000..545fd471 --- /dev/null +++ b/Minecraft/forge-enhanced/egg-forge--enchanced.json @@ -0,0 +1,36 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-02-26T14:15:27-05:00", + "name": "Forge-Enchanced", + "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\/ash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk update\r\napk add curl\r\n\r\nGET_VERSIONS=$(curl -sl http:\/\/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]')\r\nLATEST_VERSION=$(echo $GET_VERSIONS | sed 's\/ \/\/g')\r\n\r\ncd \/mnt\/server\r\n\r\ncurl -sS http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$LATEST_VERSION\/forge-$LATEST_VERSION-installer.jar -o installer.jar\r\ncurl -sS http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$LATEST_VERSION\/forge-$LATEST_VERSION-universal.jar -o server.jar\r\n\r\njava -jar installer.jar --installServer\r\nrm -rf installer.jar", + "container": "frolvlad\/alpine-oraclejdk8:cleaned", + "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)$\/" + } + ] +} \ No newline at end of file From e59cd509736f277adba80f5abfdb2e03db60c9ca Mon Sep 17 00:00:00 2001 From: AevumDecessus Date: Mon, 26 Feb 2018 20:43:31 -0500 Subject: [PATCH 08/55] Added 3 official Tekkit packs for install --- Minecraft/blightfall/egg-blightfall.json | 37 +++++++++++++++++++ Minecraft/hexxit/egg-hexxit.json | 36 ++++++++++++++++++ .../tekkit-legends/egg-tekkit-legends.json | 36 ++++++++++++++++++ 3 files changed, 109 insertions(+) create mode 100644 Minecraft/blightfall/egg-blightfall.json create mode 100644 Minecraft/hexxit/egg-hexxit.json create mode 100644 Minecraft/tekkit-legends/egg-tekkit-legends.json diff --git a/Minecraft/blightfall/egg-blightfall.json b/Minecraft/blightfall/egg-blightfall.json new file mode 100644 index 00000000..b8ffd98a --- /dev/null +++ b/Minecraft/blightfall/egg-blightfall.json @@ -0,0 +1,37 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-02-26T20:41:27-05: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}", + "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\/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", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Modpack Version", + "description": "Version of the modpack to use", + "env_variable": "MODPACK_VERSION", + "default_value": "2.1.5", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" + } + ] +} + diff --git a/Minecraft/hexxit/egg-hexxit.json b/Minecraft/hexxit/egg-hexxit.json new file mode 100644 index 00000000..4b6b01d0 --- /dev/null +++ b/Minecraft/hexxit/egg-hexxit.json @@ -0,0 +1,36 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-02-26T20:41:41-05: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}", + "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\/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", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Modpack Version", + "description": "Version of the modpack to use", + "env_variable": "MODPACK_VERSION", + "default_value": "1.0.10", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" + } + ] +} diff --git a/Minecraft/tekkit-legends/egg-tekkit-legends.json b/Minecraft/tekkit-legends/egg-tekkit-legends.json new file mode 100644 index 00000000..7e328f26 --- /dev/null +++ b/Minecraft/tekkit-legends/egg-tekkit-legends.json @@ -0,0 +1,36 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-02-26T20:41:35-05: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}", + "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\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", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Modpack Version", + "description": "Version of the modpack to use", + "env_variable": "MODPACK_VERSION", + "default_value": "1.1.1", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" + } + ] +} From 31281553306a96a0530f864cec37665d2172b142 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Mon, 26 Feb 2018 23:01:30 -0500 Subject: [PATCH 09/55] fix factorio experimntal --- Factorio/factorio/egg-factorio.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Factorio/factorio/egg-factorio.json b/Factorio/factorio/egg-factorio.json index 586848da..73262c27 100644 --- a/Factorio/factorio/egg-factorio.json +++ b/Factorio/factorio/egg-factorio.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-23T19:59:22-05:00", + "exported_at": "2018-02-26T22:58:58-05:00", "name": "Factorio", "author": "parker@parkervcp.com", "description": "The vanilla Factorio server.\r\n\r\nhttps:\/\/www.factorio.com\/", @@ -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 curl tar xz\r\n\r\nlatest_stable=`curl https:\/\/updater.factorio.com\/get-available-versions | grep stable | grep -o -E '([0-9]\\.[0-9][0-9]\\.[0-9][0-9]|[0-9]\\.[0-9][0-9]\\.[0-9])'`\r\nlatest_experimental=`curl 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 \"\\n running 'curl -L 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 -L 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\nmv data\/map-gen-settings.example.json data\/map-gen-settings.json\r\nmv data\/server-settings.example.json data\/server-settings.json\r\n\r\n.\/bin\/x64\/factorio --create ${SAVE_NAME}", + "script": "#!\/bin\/ash\r\n# Factorio Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache curl tar xz\r\n\r\nlatest_stable=`curl https:\/\/updater.factorio.com\/get-available-versions | grep stable | grep -o -E '([0-9]\\.[0-9][0-9]\\.[0-9][0-9]|[0-9]\\.[0-9][0-9]\\.[0-9])'`\r\nlatest_experimental=`curl 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 echo \"latest\"\r\nelif [ ${FACTORIO_VERSION} == \"experimental\" ]; then\r\n echo \"experimental\"\r\nelse\r\n echo \"FUCK\"\r\nfi\r\n\r\necho \"\\n running 'curl -L 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 -L 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\nmv data\/map-gen-settings.example.json data\/map-gen-settings.json\r\nmv data\/server-settings.example.json data\/server-settings.json\r\n\r\n.\/bin\/x64\/factorio --create ${SAVE_NAME}", "container": "frolvlad\/alpine-glibc", "entrypoint": "ash" } From 54eca80e2604b50c3efe8cd653dcd02b4fb4e79e Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Mon, 26 Feb 2018 23:01:30 -0500 Subject: [PATCH 10/55] Revert "fix factorio experimntal" This reverts commit 31281553306a96a0530f864cec37665d2172b142. --- Factorio/factorio/egg-factorio.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Factorio/factorio/egg-factorio.json b/Factorio/factorio/egg-factorio.json index 73262c27..586848da 100644 --- a/Factorio/factorio/egg-factorio.json +++ b/Factorio/factorio/egg-factorio.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-26T22:58:58-05:00", + "exported_at": "2018-02-23T19:59:22-05:00", "name": "Factorio", "author": "parker@parkervcp.com", "description": "The vanilla Factorio server.\r\n\r\nhttps:\/\/www.factorio.com\/", @@ -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 curl tar xz\r\n\r\nlatest_stable=`curl https:\/\/updater.factorio.com\/get-available-versions | grep stable | grep -o -E '([0-9]\\.[0-9][0-9]\\.[0-9][0-9]|[0-9]\\.[0-9][0-9]\\.[0-9])'`\r\nlatest_experimental=`curl 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 echo \"latest\"\r\nelif [ ${FACTORIO_VERSION} == \"experimental\" ]; then\r\n echo \"experimental\"\r\nelse\r\n echo \"FUCK\"\r\nfi\r\n\r\necho \"\\n running 'curl -L 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 -L 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\nmv data\/map-gen-settings.example.json data\/map-gen-settings.json\r\nmv data\/server-settings.example.json data\/server-settings.json\r\n\r\n.\/bin\/x64\/factorio --create ${SAVE_NAME}", + "script": "#!\/bin\/ash\r\n# Factorio Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache curl tar xz\r\n\r\nlatest_stable=`curl https:\/\/updater.factorio.com\/get-available-versions | grep stable | grep -o -E '([0-9]\\.[0-9][0-9]\\.[0-9][0-9]|[0-9]\\.[0-9][0-9]\\.[0-9])'`\r\nlatest_experimental=`curl 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 \"\\n running 'curl -L 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 -L 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\nmv data\/map-gen-settings.example.json data\/map-gen-settings.json\r\nmv data\/server-settings.example.json data\/server-settings.json\r\n\r\n.\/bin\/x64\/factorio --create ${SAVE_NAME}", "container": "frolvlad\/alpine-glibc", "entrypoint": "ash" } From 5b5b1a56d63224f94da1b03ac0cbb02194f2bccd Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Mon, 26 Feb 2018 23:09:39 -0500 Subject: [PATCH 11/55] fix factorio experimntal really.... --- Factorio/factorio/egg-factorio.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Factorio/factorio/egg-factorio.json b/Factorio/factorio/egg-factorio.json index 586848da..a41ea09e 100644 --- a/Factorio/factorio/egg-factorio.json +++ b/Factorio/factorio/egg-factorio.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-23T19:59:22-05:00", + "exported_at": "2018-02-26T23:08:58-05:00", "name": "Factorio", "author": "parker@parkervcp.com", "description": "The vanilla Factorio server.\r\n\r\nhttps:\/\/www.factorio.com\/", @@ -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 curl tar xz\r\n\r\nlatest_stable=`curl https:\/\/updater.factorio.com\/get-available-versions | grep stable | grep -o -E '([0-9]\\.[0-9][0-9]\\.[0-9][0-9]|[0-9]\\.[0-9][0-9]\\.[0-9])'`\r\nlatest_experimental=`curl 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 \"\\n running 'curl -L 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 -L 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\nmv data\/map-gen-settings.example.json data\/map-gen-settings.json\r\nmv data\/server-settings.example.json data\/server-settings.json\r\n\r\n.\/bin\/x64\/factorio --create ${SAVE_NAME}", + "script": "#!\/bin\/ash\r\n# Factorio Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache curl tar xz\r\n\r\nlatest_stable=`curl https:\/\/updater.factorio.com\/get-available-versions | grep stable | grep -o -E '([0-9]\\.[0-9][0-9]\\.[0-9][0-9]|[0-9]\\.[0-9][0-9]\\.[0-9])'`\r\nlatest_experimental=`curl 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 \"\\n running 'curl -L 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 -L 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\nmv data\/map-gen-settings.example.json data\/map-gen-settings.json\r\nmv data\/server-settings.example.json data\/server-settings.json\r\n\r\n.\/bin\/x64\/factorio --create ${SAVE_NAME}", "container": "frolvlad\/alpine-glibc", "entrypoint": "ash" } From 04e28ad46b32d7f316982c96c25bdc1641b5161e Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Mon, 26 Feb 2018 23:27:27 -0500 Subject: [PATCH 12/55] organizing --- {Minecraft => Minecraft PE}/nukkit/egg-nukkit.json | 0 {Minecraft => Minecraft PE}/nukkit/nukkit.yml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {Minecraft => Minecraft PE}/nukkit/egg-nukkit.json (100%) rename {Minecraft => Minecraft PE}/nukkit/nukkit.yml (100%) diff --git a/Minecraft/nukkit/egg-nukkit.json b/Minecraft PE/nukkit/egg-nukkit.json similarity index 100% rename from Minecraft/nukkit/egg-nukkit.json rename to Minecraft PE/nukkit/egg-nukkit.json diff --git a/Minecraft/nukkit/nukkit.yml b/Minecraft PE/nukkit/nukkit.yml similarity index 100% rename from Minecraft/nukkit/nukkit.yml rename to Minecraft PE/nukkit/nukkit.yml From 2ec44dff7fb54e649245ba1a1e79b1431c253d25 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Mon, 26 Feb 2018 23:27:51 -0500 Subject: [PATCH 13/55] updated read me --- README.md | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ef9abab3..7c99b99b 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ If you are submitting PR's try and keep names and titles the same. #### Please read the HOWTO.md as it container important information. ## Game Eggs + ### GTA #### FiveM The [FiveM](https://fivem.net/) GTA 5 dedicated server @@ -27,13 +28,33 @@ The [tShock](https://tshock.co) modded server. - This requires a minimum of 1g (1024m) to actually create a map. This will get OOM if you have less. ### Minecraft -#### Spigot +#### Spigot Enhanced 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) +#### Forge Enhanced +This is a direct fork of the default forge service +- Has a version detection fix for "latest" + +#### Tekkit Packs +##### Hexxit +[Hexxit](https://www.technicpack.net/modpack/hexxit.552552) +##### Blightcraft +[Blightcraft](https://www.technicpack.net/modpack/blightfall.592618) +##### Tekkit-Legends +[Tekkit Legends](https://www.technicpack.net/modpack/tekkit-legends.735902) + +### Minecraft PE +#### Nukkit +The [Nukkit](https://nukkit.io/) Minecraft PE server + +### Squad +#### Squad Dedicated +The [Squad](https://joinsquad.com/) official dedicated server + ### Xonotic #### xonotic -The [xonotic](http://www.xonotic.org/) dedicated server. +The [xonotic](http://www.xonotic.org/) official dedicated server. - Disk space needs to be ## Bot Eggs From f7b2360a705d2a7e86bc6d600668b94e0f847a1f Mon Sep 17 00:00:00 2001 From: AevumDecessus Date: Mon, 26 Feb 2018 23:53:52 -0500 Subject: [PATCH 14/55] Added FTB Revelation modpack Their download URL system sucks much --- .../ftb-revelation/egg-f-t-b-revelation.json | 36 +++++++++++++++++++ README.md | 6 +++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 Minecraft/ftb-revelation/egg-f-t-b-revelation.json diff --git a/Minecraft/ftb-revelation/egg-f-t-b-revelation.json b/Minecraft/ftb-revelation/egg-f-t-b-revelation.json new file mode 100644 index 00000000..46974916 --- /dev/null +++ b/Minecraft/ftb-revelation/egg-f-t-b-revelation.json @@ -0,0 +1,36 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-02-26T23:48:51-05: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}", + "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 --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", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Modpack Version", + "description": "Version of the modpack to use", + "env_variable": "MODPACK_VERSION", + "default_value": "1.6.0", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" + } + ] +} diff --git a/README.md b/README.md index 7c99b99b..0ae617cf 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,10 @@ This is a direct fork of the default spigot service with the added benefit of be This is a direct fork of the default forge service - Has a version detection fix for "latest" +#### FTB Packs +##### FTB Revelation +[FTB Revelation](https://www.feed-the-beast.com/projects/ftb-revelation) + #### Tekkit Packs ##### Hexxit [Hexxit](https://www.technicpack.net/modpack/hexxit.552552) @@ -60,4 +64,4 @@ The [xonotic](http://www.xonotic.org/) official dedicated server. ## Bot Eggs ### Discord #### ATLBot -The [ATLauncher Bot](https://github.com/ATLauncher/discord-bot/) \ No newline at end of file +The [ATLauncher Bot](https://github.com/ATLauncher/discord-bot/) From 4db9b61e356e61c49ad2b74b846081e1f85cfb02 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 27 Feb 2018 00:07:41 -0500 Subject: [PATCH 15/55] update readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 0ae617cf..0828fde7 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,9 @@ If you are submitting PR's try and keep names and titles the same. #### FiveM The [FiveM](https://fivem.net/) GTA 5 dedicated server +#### SA:MP +The [SA:MP](https://www.sa-mp.com/) GTA San Andreas dedicated server + ### Factorio #### factorio The [Factorio](https://factorio.com/) dedicated server From 662b8f20f9ab48123b61a953252086f9f17f2d4d Mon Sep 17 00:00:00 2001 From: Siebren Bakker Date: Tue, 27 Feb 2018 11:47:17 -0500 Subject: [PATCH 16/55] Added generic FTB egg to handle official modpacks --- .../feed-the-beast/egg-feed-the-beast.json | 81 +++++++++++++++++++ README.md | 7 ++ 2 files changed, 88 insertions(+) create mode 100644 Minecraft/feed-the-beast/egg-feed-the-beast.json diff --git a/Minecraft/feed-the-beast/egg-feed-the-beast.json b/Minecraft/feed-the-beast/egg-feed-the-beast.json new file mode 100644 index 00000000..8cea0a54 --- /dev/null +++ b/Minecraft/feed-the-beast/egg-feed-the-beast.json @@ -0,0 +1,81 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-02-27T11:41:14-05: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}", + "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# 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 update\r\napk add curl --no-cache\r\n\r\nBASEURL=https:\/\/www.feed-the-beast.com\/projects\/${MODPACK_URL}\/files\r\nPATTERN=\"projects\\\/${MODPACK_URL}\\\/files\\\/\\d{7,}\"\r\nID_PATTERN=\"\\d{7,}\"\r\nID=`curl -sl ${BASEURL}| grep -A2 ${MODPACK_VERSION} | grep -oE \"${PATTERN}\" | grep -oE \"${ID_PATTERN}\"`\r\necho \"ID: ${ID}\"\r\nSECONDURL=${BASEURL}\/${ID}\r\necho \"SECONDURL: ${SECONDURL}\"\r\nGOOD_ID=`curl -sl ${SECONDURL} | grep -B2 Server_${MODPACK_VERSION}.zip | grep -oE \"${PATTERN}\" | grep -oE \"${ID_PATTERN}\"`\r\necho \"GOOD_ID: ${GOOD_ID}\"\r\nDL_URL=${BASEURL}\/${GOOD_ID}\/download\r\necho \"Download_URL: ${DL_URL}\"\r\ncd \/mnt\/server\r\n\r\necho \"Executing curl -L ${DL_URL} -o ${MODPACK_URL}.zip\"\r\ncurl -L ${DL_URL} -o ${MODPACK_URL}.zip\r\n\r\nunzip ${MODPACK_URL}.zip\r\n\r\nrm -rf ${MODPACK_URL}.zip\r\n\r\nsh .\/FTBInstall.sh", + "container": "alpine:3.7", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Modpack URL Name", + "description": "Name of the modpack as referenced in URL's on feed-the-beast.com\r\ni.e\r\nhttps:\/\/www.feed-the-beast.com\/projects\/", + "env_variable": "MODPACK_URL", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|regex:[a-z-0-9]+|max:30" + }, + { + "name": "Modpack Version", + "description": "Version of the modpack to use", + "env_variable": "MODPACK_VERSION", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|regex:\\d+.\\d+.\\d+" + }, + { + "name": "Level Seed", + "description": "Optional specified level seed for map generation", + "env_variable": "LEVEL_SEED", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "string|max:40" + }, + { + "name": "Max Players", + "description": "Max # of players on the server", + "env_variable": "MAX_PLAYERS", + "default_value": "20", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|integer|max:100" + }, + { + "name": "Level Name", + "description": "Name of the world save", + "env_variable": "LEVEL_NAME", + "default_value": "world", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|alpha_dash|max:20" + }, + { + "name": "MOTD", + "description": "Message to appear when viewing the server in browser and on login", + "env_variable": "MOTD", + "default_value": "A Minecraft Server", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" + } + ] +} diff --git a/README.md b/README.md index 0828fde7..dda79b80 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,13 @@ This is a direct fork of the default forge service - Has a version detection fix for "latest" #### FTB Packs +##### Feed The Beast - generic +[FTB](https://www.feed-the-beast.com/modpacks) +Generic egg to handle any standard FTB modpack. +Supply values to 2 variables to use +- MODPACK_URL: from the url to the pack https://www.feed-the-beast.com/projects/{MODPACK_URL} +- MODPACK_VERSION: version of the modpack to install + ##### FTB Revelation [FTB Revelation](https://www.feed-the-beast.com/projects/ftb-revelation) From 98031fad4997f2c6e8e8dc573efbffdc7a01a739 Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Tue, 27 Feb 2018 18:48:25 -0600 Subject: [PATCH 17/55] Changed Download Added optional SubMinor Version and 3rd decimal place (optional) to the Minecraft Version to fix the install. --- Minecraft/forge-enhanced/egg-forge--enchanced.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Minecraft/forge-enhanced/egg-forge--enchanced.json b/Minecraft/forge-enhanced/egg-forge--enchanced.json index 545fd471..eaa901c4 100644 --- a/Minecraft/forge-enhanced/egg-forge--enchanced.json +++ b/Minecraft/forge-enhanced/egg-forge--enchanced.json @@ -3,8 +3,8 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-26T14:15:27-05:00", - "name": "Forge-Enchanced", + "exported_at": "2018-02-27T18:47:17-06: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\nGET_VERSIONS=$(curl -sl http:\/\/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]')\r\nLATEST_VERSION=$(echo $GET_VERSIONS | sed 's\/ \/\/g')\r\n\r\ncd \/mnt\/server\r\n\r\ncurl -sS http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$LATEST_VERSION\/forge-$LATEST_VERSION-installer.jar -o installer.jar\r\ncurl -sS http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$LATEST_VERSION\/forge-$LATEST_VERSION-universal.jar -o server.jar\r\n\r\njava -jar installer.jar --installServer\r\nrm -rf installer.jar", + "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\nGET_VERSIONS=$(curl -sl http:\/\/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]')\r\nLATEST_VERSION=$(echo $GET_VERSIONS | sed 's\/ \/\/g')\r\n\r\ncd \/mnt\/server\r\n\r\ncurl -sS http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$LATEST_VERSION\/forge-$LATEST_VERSION-installer.jar -o installer.jar\r\ncurl -sS http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$LATEST_VERSION\/forge-$LATEST_VERSION-universal.jar -o server.jar\r\n\r\njava -jar installer.jar --installServer\r\nrm -rf installer.jar", "container": "frolvlad\/alpine-oraclejdk8:cleaned", "entrypoint": "ash" } @@ -33,4 +33,4 @@ "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" } ] -} \ No newline at end of file +} From 098cdad6f772b2cc0a1e75d494325b032527351d Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Wed, 28 Feb 2018 00:50:15 -0600 Subject: [PATCH 18/55] Added PaperSpigot PaperSpigot is a Performance/Game Fix fork of Spigot. --- .../egg-paper-spigot--spigot-fork.json | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 Minecraft/paper-spigot/egg-paper-spigot--spigot-fork.json diff --git a/Minecraft/paper-spigot/egg-paper-spigot--spigot-fork.json b/Minecraft/paper-spigot/egg-paper-spigot--spigot-fork.json new file mode 100644 index 00000000..b3b76f62 --- /dev/null +++ b/Minecraft/paper-spigot/egg-paper-spigot--spigot-fork.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-02-28T00:49:31-06:00", + "name": "PaperSpigot (Spigot Fork)", + "author": "hostmaster@waterfallgaming.net", + "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.\r\n\r\nSpigot 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}", + "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# Bungeecord 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=\"lastSucessfulBuild\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/ci.destroystokyo.com\/job\/Paper\/${DL_VERSION}\/artifact\/paperclip.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 89ed7d31e632fb5778d1e82ea83acbf459805f0c Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Wed, 28 Feb 2018 00:52:11 -0600 Subject: [PATCH 19/55] Added Waterfall Waterfall is a performance fork of bungeecord. --- .../egg-waterfall--bungeecord-fork.json | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 Minecraft Proxy/waterfall/egg-waterfall--bungeecord-fork.json diff --git a/Minecraft Proxy/waterfall/egg-waterfall--bungeecord-fork.json b/Minecraft Proxy/waterfall/egg-waterfall--bungeecord-fork.json new file mode 100644 index 00000000..af00fb9e --- /dev/null +++ b/Minecraft Proxy/waterfall/egg-waterfall--bungeecord-fork.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-02-28T00:49:00-06:00", + "name": "Waterfall (Bungeecord Fork)", + "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}", + "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:\/\/ci.destroystokyo.com\/job\/Waterfall\/${WATERFALL_VERSION}\/artifact\/Waterfall-Proxy\/bootstrap\/target\/Waterfall.jar", + "container": "alpine:3.4", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Waterfall Version", + "description": "The version of Waterfall to download and use.", + "env_variable": "WATERFALL_VERSION", + "default_value": "latest", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|alpha_num|between:1,6" + }, + { + "name": "Waterfall Jar File", + "description": "The name of the Jarfile to use when running Waterfall.", + "env_variable": "SERVER_JARFILE", + "default_value": "waterfall.jar", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" + } + ] +} \ No newline at end of file From f356ca902a544cfd62f01bff46be1bc43284a60f Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Wed, 28 Feb 2018 01:02:19 -0600 Subject: [PATCH 20/55] Added TacoSpigot A fork of PaperSpigot which is a fork of Spigot. Adds even more performance enhancements. --- .../egg-taco-spigot--paper-spigot-fork.json | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 Minecraft/taco-spigot/egg-taco-spigot--paper-spigot-fork.json diff --git a/Minecraft/taco-spigot/egg-taco-spigot--paper-spigot-fork.json b/Minecraft/taco-spigot/egg-taco-spigot--paper-spigot-fork.json new file mode 100644 index 00000000..1ccb1248 --- /dev/null +++ b/Minecraft/taco-spigot/egg-taco-spigot--paper-spigot-fork.json @@ -0,0 +1,45 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-02-28T01:01:31-06:00", + "name": "TacoSpigot (PaperSpigot Fork)", + "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": null, + "startup": null, + "logs": null, + "stop": null + }, + "scripts": { + "installation": { + "script": "#!\/bin\/ash\r\n# Bungeecord 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=\"lastSucessfulBuild\"\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", + "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" + } + ] +} \ No newline at end of file From 8ee9055d1da65bfbac00e032003a5ea2cd68ded1 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Thu, 1 Mar 2018 08:35:52 -0500 Subject: [PATCH 21/55] update nukkit for repo layout change. Fixed the wget line for the nukkit.yml --- Minecraft PE/nukkit/egg-nukkit.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Minecraft PE/nukkit/egg-nukkit.json b/Minecraft PE/nukkit/egg-nukkit.json index 29b05e77..f30cf8fc 100644 --- a/Minecraft PE/nukkit/egg-nukkit.json +++ b/Minecraft PE/nukkit/egg-nukkit.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-23T20:12:46-05:00", + "exported_at": "2018-03-01T08:34:01-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 http:\/\/ci.mengcraft.com:8080\/job\/nukkit\/lastSuccessfulBuild\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nelse\r\n wget http:\/\/ci.mengcraft.com:8080\/job\/nukkit\/${NUKKIT_VERSION}\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nfi\r\n\r\nwget https:\/\/github.com\/parkervcp\/eggs\/raw\/master\/Minecraft\/nukkit\/nukkit.yml", + "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 http:\/\/ci.mengcraft.com:8080\/job\/nukkit\/lastSuccessfulBuild\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nelse\r\n wget http:\/\/ci.mengcraft.com:8080\/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", "container": "alpine:3.7", "entrypoint": "ash" } From 8a12293794fe67123443915890b32d256e88c27c Mon Sep 17 00:00:00 2001 From: ki2007 Date: Sun, 4 Mar 2018 21:28:36 +0100 Subject: [PATCH 22/55] Add Sinusbot Musicbot for Discord and Teamspeak. --- discordbots/Sinusbot/egg-sinusbot.json | 36 ++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 discordbots/Sinusbot/egg-sinusbot.json diff --git a/discordbots/Sinusbot/egg-sinusbot.json b/discordbots/Sinusbot/egg-sinusbot.json new file mode 100644 index 00000000..6c1c9a1c --- /dev/null +++ b/discordbots/Sinusbot/egg-sinusbot.json @@ -0,0 +1,36 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-03-04T21:25:08+01:00", + "name": "Sinusbot", + "author": "ki2007@damw.eu", + "description": "Musicbot for Discord and Teamspeak.", + "image": "quay.io\/ki2007\/pterodactyl-images: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}", + "startup": "{\r\n \"done\": \"NOTICE You may now configure and launch the bots from the webinterface\",\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# 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\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\/pre\/sinusbot-0.13.37-f7e9ece.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\nTSVERSION=$(wget -q -O - http:\/\/dl.4players.de\/ts\/releases\/ | grep -Po '(?<=href=\")[0-9]+(\\.[0-9]+){2,3}(?=\/\")' | sort -Vr | head -1)\r\nwget -q \"http:\/\/dl.4players.de\/ts\/releases\/$TSVERSION\/TeamSpeak3-Client-linux_amd64-$TSVERSION.run\"\r\n\r\n# Install TeamSpeak Client\r\nchmod +x TeamSpeak3-Client-linux_amd64-$TSVERSION.run\r\n.\/TeamSpeak3-Client-linux_amd64-$TSVERSION.run --tar xfv -C TeamSpeak3-Client-linux_amd64\r\nrm TeamSpeak3-Client-linux_amd64-$TSVERSION.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:16.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Password", + "description": "Password for admin account.", + "env_variable": "OVERRIDE_PASSWORD", + "default_value": "CHANGEME", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" + } + ] +} \ No newline at end of file From 3b133c072b300a91df4355886ff7fd5d11c9ceb3 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 7 Mar 2018 00:15:26 -0500 Subject: [PATCH 23/55] factorio fixes --- Factorio/factorio/egg-factorio.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Factorio/factorio/egg-factorio.json b/Factorio/factorio/egg-factorio.json index a41ea09e..9ccb8595 100644 --- a/Factorio/factorio/egg-factorio.json +++ b/Factorio/factorio/egg-factorio.json @@ -3,21 +3,21 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-26T23:08:58-05:00", + "exported_at": "2018-03-07T00:13:07-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", "startup": ".\/bin\/x64\/factorio --port {{SERVER_PORT}} --start-server {{SAVE_NAME}}.zip", "config": { - "files": "{\r\n \"data\/server-settings.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"game_password\": \"{{server.build.env.SERVER_PASS}}\",\r\n \"max_players\": \"{{server.build.env.MAX_SLOTS}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Type 'help' for a list of commands\",\r\n \"userInteraction\": []\r\n}", + "files": "{\r\n \"data\/server-settings.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"password\": \"{{server.build.env.SERVER_PASS}}\",\r\n \"max_players\": \"{{server.build.env.MAX_SLOTS}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Type changing state from(CreatingGame) to(InGame)\",\r\n \"userInteraction\": []\r\n}", "logs": "{\r\n \"custom\": false,\r\n \"location\": \"factorio-current.log\"\r\n}", "stop": "^C" }, "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\r\n\r\nlatest_stable=`curl https:\/\/updater.factorio.com\/get-available-versions | grep stable | grep -o -E '([0-9]\\.[0-9][0-9]\\.[0-9][0-9]|[0-9]\\.[0-9][0-9]\\.[0-9])'`\r\nlatest_experimental=`curl 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 \"\\n running 'curl -L 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 -L 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\nmv data\/map-gen-settings.example.json data\/map-gen-settings.json\r\nmv data\/server-settings.example.json data\/server-settings.json\r\n\r\n.\/bin\/x64\/factorio --create ${SAVE_NAME}", + "script": "#!\/bin\/ash\r\n# Factorio Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache curl tar xz\r\n\r\nlatest_stable=`curl https:\/\/updater.factorio.com\/get-available-versions | grep stable | grep -o -E '([0-9]\\.[0-9][0-9]\\.[0-9][0-9]|[0-9]\\.[0-9][0-9]\\.[0-9])'`\r\nlatest_experimental=`curl 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 -L 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 -L 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" } From 4d30cfefa59ac2c88f3132843bb619feb061389b Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 7 Mar 2018 08:52:04 -0500 Subject: [PATCH 24/55] Adding parkertron --- README.md | 4 ++++ discordbots/parkertron/egg-parkertron.json | 26 ++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 discordbots/parkertron/egg-parkertron.json diff --git a/README.md b/README.md index dda79b80..6727f8a9 100644 --- a/README.md +++ b/README.md @@ -75,3 +75,7 @@ The [xonotic](http://www.xonotic.org/) official dedicated server. ### Discord #### ATLBot The [ATLauncher Bot](https://github.com/ATLauncher/discord-bot/) + +#### parkertron +My own stupid chat bot [parkertron](https://github.com/parkervcp/parkertron) + - Currently runs as the SupportBot in the pterodactyl discord server. \ No newline at end of file diff --git a/discordbots/parkertron/egg-parkertron.json b/discordbots/parkertron/egg-parkertron.json new file mode 100644 index 00000000..f96c2bf5 --- /dev/null +++ b/discordbots/parkertron/egg-parkertron.json @@ -0,0 +1,26 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-03-07T08:48:51-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", + "startup": ".\/parkertron", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Discord service connected\"\r\n}", + "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/info.log\"\r\n}", + "stop": "^C" + }, + "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\ncurl https:\/\/raw.githubusercontent.com\/golang\/dep\/master\/install.sh | sh\r\n\r\ncd go\/src\/\r\n\r\ngit clone -b pterodactyl https:\/\/github.com\/parkervcp\/parkertron.git\r\n\r\ncd parkertron\/\r\n\r\ndep ensure\r\n\r\ngo build \r\n\r\ncp parkertron \/mnt\/server\/\r\ncp -r configs\/ \/mnt\/server\/", + "container": "alpine:3.7", + "entrypoint": "ash" + } + }, + "variables": [] +} \ No newline at end of file From 9b099756edf5ae078426c50c22de54c645dd9ae7 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 7 Mar 2018 08:53:39 -0500 Subject: [PATCH 25/55] small update to parkertron --- discordbots/parkertron/egg-parkertron.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/discordbots/parkertron/egg-parkertron.json b/discordbots/parkertron/egg-parkertron.json index f96c2bf5..ba850c3e 100644 --- a/discordbots/parkertron/egg-parkertron.json +++ b/discordbots/parkertron/egg-parkertron.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-03-07T08:48:51-05:00", + "exported_at": "2018-03-07T08:53:21-05:00", "name": "parkertron", "author": "parker@parkervcp.com", "description": "The stupid chatbot parkertron by Parkervcp.\r\n\r\nhttps:\/\/github.com\/parkervcp\/parkertron", @@ -12,7 +12,7 @@ "config": { "files": "{}", "startup": "{\r\n \"done\": \"Discord service connected\"\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/info.log\"\r\n}", + "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "^C" }, "scripts": { From 667299809d61135340097187052927b47917ac62 Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Thu, 8 Mar 2018 01:15:02 -0600 Subject: [PATCH 26/55] Update egg-waterfall--bungeecord-fork.json Changed Name. --- .../waterfall/egg-waterfall--bungeecord-fork.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Minecraft Proxy/waterfall/egg-waterfall--bungeecord-fork.json b/Minecraft Proxy/waterfall/egg-waterfall--bungeecord-fork.json index af00fb9e..7863fbc3 100644 --- a/Minecraft Proxy/waterfall/egg-waterfall--bungeecord-fork.json +++ b/Minecraft Proxy/waterfall/egg-waterfall--bungeecord-fork.json @@ -3,8 +3,8 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-28T00:49:00-06:00", - "name": "Waterfall (Bungeecord Fork)", + "exported_at": "2018-03-08T01:14:39-06: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", @@ -42,4 +42,4 @@ "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" } ] -} \ No newline at end of file +} From 7d769ad63922ec34a5ef79b4872ee5c1e7a61bf8 Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Thu, 8 Mar 2018 01:15:51 -0600 Subject: [PATCH 27/55] Rename egg-waterfall--bungeecord-fork.json to egg-waterfall.json --- .../{egg-waterfall--bungeecord-fork.json => egg-waterfall.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Minecraft Proxy/waterfall/{egg-waterfall--bungeecord-fork.json => egg-waterfall.json} (100%) diff --git a/Minecraft Proxy/waterfall/egg-waterfall--bungeecord-fork.json b/Minecraft Proxy/waterfall/egg-waterfall.json similarity index 100% rename from Minecraft Proxy/waterfall/egg-waterfall--bungeecord-fork.json rename to Minecraft Proxy/waterfall/egg-waterfall.json From 96eb2f1b85ebbcd5c7984b175817f1a251afd3df Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Thu, 8 Mar 2018 01:17:38 -0600 Subject: [PATCH 28/55] Update and rename egg-taco-spigot--paper-spigot-fork.json to egg-taco-spigot.json --- ...-spigot--paper-spigot-fork.json => egg-taco-spigot.json} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename Minecraft/taco-spigot/{egg-taco-spigot--paper-spigot-fork.json => egg-taco-spigot.json} (95%) diff --git a/Minecraft/taco-spigot/egg-taco-spigot--paper-spigot-fork.json b/Minecraft/taco-spigot/egg-taco-spigot.json similarity index 95% rename from Minecraft/taco-spigot/egg-taco-spigot--paper-spigot-fork.json rename to Minecraft/taco-spigot/egg-taco-spigot.json index 1ccb1248..a3b26b6e 100644 --- a/Minecraft/taco-spigot/egg-taco-spigot--paper-spigot-fork.json +++ b/Minecraft/taco-spigot/egg-taco-spigot.json @@ -3,8 +3,8 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-28T01:01:31-06:00", - "name": "TacoSpigot (PaperSpigot Fork)", + "exported_at": "2018-03-08T01:16:59-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", @@ -42,4 +42,4 @@ "rules": "required|string|between:3,7" } ] -} \ No newline at end of file +} From 327ec9286505cfcc8450ffe352ade5d011b4f334 Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Thu, 8 Mar 2018 01:18:40 -0600 Subject: [PATCH 29/55] Update egg-taco-spigot.json --- Minecraft/taco-spigot/egg-taco-spigot.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Minecraft/taco-spigot/egg-taco-spigot.json b/Minecraft/taco-spigot/egg-taco-spigot.json index a3b26b6e..3ca553db 100644 --- a/Minecraft/taco-spigot/egg-taco-spigot.json +++ b/Minecraft/taco-spigot/egg-taco-spigot.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-03-08T01:16:59-06:00", + "exported_at": "2018-03-08T01:18:25-06:00", "name": "Taco Spigot", "author": "hostmaster@waterfallgaming.net", "description": "A even-higher higher performance PaperSpigot fork that adds new features.", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Bungeecord 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=\"lastSucessfulBuild\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/ci.techcable.net\/job\/TacoSpigot\/${DL_VERSION}\/artifact\/build\/TacoSpigot.jar", + "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=\"lastSucessfulBuild\"\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", "entrypoint": "ash" } From a6d82529772f0e1dfcc844b11b7a8e52988c2dc6 Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Thu, 8 Mar 2018 01:20:58 -0600 Subject: [PATCH 30/55] Update and rename egg-paper-spigot--spigot-fork.json to egg-paper-spigot.json --- ...-spigot--spigot-fork.json => egg-paper-spigot.json} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename Minecraft/paper-spigot/{egg-paper-spigot--spigot-fork.json => egg-paper-spigot.json} (66%) diff --git a/Minecraft/paper-spigot/egg-paper-spigot--spigot-fork.json b/Minecraft/paper-spigot/egg-paper-spigot.json similarity index 66% rename from Minecraft/paper-spigot/egg-paper-spigot--spigot-fork.json rename to Minecraft/paper-spigot/egg-paper-spigot.json index b3b76f62..e4e5bfdf 100644 --- a/Minecraft/paper-spigot/egg-paper-spigot--spigot-fork.json +++ b/Minecraft/paper-spigot/egg-paper-spigot.json @@ -3,10 +3,10 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-28T00:49:31-06:00", - "name": "PaperSpigot (Spigot Fork)", + "exported_at": "2018-03-08T01:20:41-06:00", + "name": "Paper Spigot", "author": "hostmaster@waterfallgaming.net", - "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.\r\n\r\nSpigot 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.", + "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": { @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Bungeecord 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=\"lastSucessfulBuild\"\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=\"lastSucessfulBuild\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/ci.destroystokyo.com\/job\/Paper\/${DL_VERSION}\/artifact\/paperclip.jar", "container": "alpine:3.4", "entrypoint": "ash" } @@ -42,4 +42,4 @@ "rules": "required|string|between:3,7" } ] -} \ No newline at end of file +} From e0f0ed6564e6bbb11a873da5faf168de40ef3779 Mon Sep 17 00:00:00 2001 From: Aaronstar-McClure Date: Thu, 8 Mar 2018 10:38:31 -0500 Subject: [PATCH 31/55] updated the name on blightfall to be blightfall, not blightcraft --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6727f8a9..75ec01cd 100644 --- a/README.md +++ b/README.md @@ -53,8 +53,8 @@ Supply values to 2 variables to use #### Tekkit Packs ##### Hexxit [Hexxit](https://www.technicpack.net/modpack/hexxit.552552) -##### Blightcraft -[Blightcraft](https://www.technicpack.net/modpack/blightfall.592618) +##### Blightfall +[Blightfall](https://www.technicpack.net/modpack/blightfall.592618) ##### Tekkit-Legends [Tekkit Legends](https://www.technicpack.net/modpack/tekkit-legends.735902) @@ -78,4 +78,4 @@ The [ATLauncher Bot](https://github.com/ATLauncher/discord-bot/) #### parkertron My own stupid chat bot [parkertron](https://github.com/parkervcp/parkertron) - - Currently runs as the SupportBot in the pterodactyl discord server. \ No newline at end of file + - Currently runs as the SupportBot in the pterodactyl discord server. From 99550250c13c57fd57e15dca176015258092d285 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 9 Mar 2018 13:26:58 -0500 Subject: [PATCH 32/55] Update HOWTO.md --- HOWTO.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/HOWTO.md b/HOWTO.md index ef81930c..202b3ff2 100644 --- a/HOWTO.md +++ b/HOWTO.md @@ -2,12 +2,12 @@ ## General rules -1. Keep it simple. +1. Keep it simple. We don't need 8 miles of install script -2. Keep it Small. +2. Keep it Small. Only use what is absolutely needed. -3. Try to stay in the stock containers. - If you need something in a container PR it to [my container repo](https://github.com/parkervcp/Containers) where I can review and pull up to the main repo. +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. ## Step 1. #### Be aware of the pterodactyl install process. @@ -38,4 +38,4 @@ 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. -I dont bite. I will work with you on the egg and the required things to run it. \ No newline at end of file +I dont bite. I will work with you on the egg and the required things to run it. From 45dcc85fabbdbc36cadcdfd627bbabf28b0d5191 Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Sat, 10 Mar 2018 00:31:19 -0600 Subject: [PATCH 33/55] Add CONFIG to Waterfall Proxy --- Minecraft Proxy/waterfall/egg-waterfall.json | 44 ++++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/Minecraft Proxy/waterfall/egg-waterfall.json b/Minecraft Proxy/waterfall/egg-waterfall.json index 7863fbc3..fc99620e 100644 --- a/Minecraft Proxy/waterfall/egg-waterfall.json +++ b/Minecraft Proxy/waterfall/egg-waterfall.json @@ -3,43 +3,43 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-03-08T01:14:39-06:00", - "name": "Waterfall", + "exported_at": "2018-03-10T00:30:35-06:00", + "name": "Paper Spigot", "author": "hostmaster@waterfallgaming.net", - "description": "Waterfall is a fork of the well-known BungeeCord server teleportation suite.", - "image": "quay.io\/pterodactyl\/core:java", + "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 \"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" + "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# 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:\/\/ci.destroystokyo.com\/job\/Waterfall\/${WATERFALL_VERSION}\/artifact\/Waterfall-Proxy\/bootstrap\/target\/Waterfall.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=\"lastSucessfulBuild\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/ci.destroystokyo.com\/job\/Paper\/${DL_VERSION}\/artifact\/paperclip.jar", "container": "alpine:3.4", "entrypoint": "ash" } }, "variables": [ { - "name": "Waterfall Version", - "description": "The version of Waterfall to download and use.", - "env_variable": "WATERFALL_VERSION", - "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|alpha_num|between:1,6" - }, - { - "name": "Waterfall Jar File", - "description": "The name of the Jarfile to use when running Waterfall.", + "name": "Server Jar File", + "description": "The name of the server jarfile to run the server with.", "env_variable": "SERVER_JARFILE", - "default_value": "waterfall.jar", + "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 1239fd7c19478b481e36604b4941d507fc6d2cd5 Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Sat, 10 Mar 2018 00:33:09 -0600 Subject: [PATCH 34/55] Add PaperSpigot CONFIG --- Minecraft/paper-spigot/egg-paper-spigot.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Minecraft/paper-spigot/egg-paper-spigot.json b/Minecraft/paper-spigot/egg-paper-spigot.json index e4e5bfdf..fc99620e 100644 --- a/Minecraft/paper-spigot/egg-paper-spigot.json +++ b/Minecraft/paper-spigot/egg-paper-spigot.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-03-08T01:20:41-06:00", + "exported_at": "2018-03-10T00:30:35-06:00", "name": "Paper Spigot", "author": "hostmaster@waterfallgaming.net", "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", @@ -42,4 +42,4 @@ "rules": "required|string|between:3,7" } ] -} +} \ No newline at end of file From f1efc79a3bfa0a07239ecd0a0530e201233a58c2 Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Sat, 10 Mar 2018 00:34:27 -0600 Subject: [PATCH 35/55] Add TacoSpigot CONFIG --- Minecraft/taco-spigot/egg-taco-spigot.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Minecraft/taco-spigot/egg-taco-spigot.json b/Minecraft/taco-spigot/egg-taco-spigot.json index 3ca553db..79a70f11 100644 --- a/Minecraft/taco-spigot/egg-taco-spigot.json +++ b/Minecraft/taco-spigot/egg-taco-spigot.json @@ -3,17 +3,17 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-03-08T01:18:25-06:00", + "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": null, - "startup": null, - "logs": null, - "stop": null + "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": { @@ -42,4 +42,4 @@ "rules": "required|string|between:3,7" } ] -} +} \ No newline at end of file From 35e56fa84cf53bc102f6d82fb3b78b512b5c055f Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Sat, 10 Mar 2018 00:36:44 -0600 Subject: [PATCH 36/55] Add Waterfall Config --- Minecraft Proxy/waterfall/egg-waterfall.json | 44 ++++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/Minecraft Proxy/waterfall/egg-waterfall.json b/Minecraft Proxy/waterfall/egg-waterfall.json index fc99620e..5c42ea03 100644 --- a/Minecraft Proxy/waterfall/egg-waterfall.json +++ b/Minecraft Proxy/waterfall/egg-waterfall.json @@ -3,43 +3,43 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-03-10T00:30:35-06:00", - "name": "Paper Spigot", + "exported_at": "2018-03-10T00:36:18-06:00", + "name": "Waterfall", "author": "hostmaster@waterfallgaming.net", - "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", - "image": "quay.io\/pterodactyl\/core:java-glibc", + "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 \"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" + "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\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=\"lastSucessfulBuild\"\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# 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:\/\/ci.destroystokyo.com\/job\/Waterfall\/${WATERFALL_VERSION}\/artifact\/Waterfall-Proxy\/bootstrap\/target\/Waterfall.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", + "name": "Waterfall Version", + "description": "The version of Waterfall to download and use.", + "env_variable": "WATERFALL_VERSION", "default_value": "latest", "user_viewable": 1, "user_editable": 1, - "rules": "required|string|between:3,7" + "rules": "required|alpha_num|between:1,6" + }, + { + "name": "Waterfall Jar File", + "description": "The name of the Jarfile to use when running Waterfall.", + "env_variable": "SERVER_JARFILE", + "default_value": "waterfall.jar", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" } ] } \ No newline at end of file From 4fcce7cb305da8815035a84ce4a8cacb18a8b985 Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Sat, 10 Mar 2018 00:56:43 -0600 Subject: [PATCH 37/55] Rename HOWTO.md to CONTRIBUTING.md Github monitors the "CONTRIBUTING.md" for the "Community" feature. This falls under that. I feel this would be better listed as that feature instead of a seperate Markdown that Github has no special features for. --- HOWTO.md => CONTRIBUTING.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename HOWTO.md => CONTRIBUTING.md (100%) diff --git a/HOWTO.md b/CONTRIBUTING.md similarity index 100% rename from HOWTO.md rename to CONTRIBUTING.md From 51f966b4af2133d34b99b90d668bca3bafbeaf90 Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Sat, 10 Mar 2018 01:01:56 -0600 Subject: [PATCH 38/55] Add MIT License The MIT License should be added to follow the panels license. This is just a formality. --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..7302e436 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT + +Copyright (c) 2015 - 2017 Dane Everitt + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file From b2bc5a281a1b97f2904bee2e176fbf5d87bbe281 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sat, 10 Mar 2018 19:24:59 -0500 Subject: [PATCH 39/55] fivem update --- GTA/FiveM/egg-five-m.json | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/GTA/FiveM/egg-five-m.json b/GTA/FiveM/egg-five-m.json index 4c58690c..99fa15f8 100644 --- a/GTA/FiveM/egg-five-m.json +++ b/GTA/FiveM/egg-five-m.json @@ -3,52 +3,34 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-13T23:23:06-05:00", + "exported_at": "2018-03-10T19:23:00-05:00", "name": "FiveM", "author": "parker@parkervcp.com", "description": "The FiveM multiplayer server on Pterodactyl.", "image": "quay.io\/pterodactyl\/core:glibc", "startup": ".\/cfx-server\/FXServer +exec server.cfg +set sv_licenseKey {{FIVEM_LICENSE}} +set citizen_dir \/home\/container\/cfx-server\/citizen", "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.HOSTNAME}}\\\"\",\r\n \"sv_maxclients\": \"sv_maxclients {{server.build.env.MAX_CLIENTS}}\",\r\n \"sv_licenseKey\": \"sv_licenseKey {{server.build.env.FIVEM_LICENSE}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"server_data\/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_licenseKey\": \"sv_licenseKey {{FIVEM_LICENSE}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Server license key authentication 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# FiveM Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## Only download if a path is provided, otherwise continue.\r\napk add openssl tar xz curl git --no-cache\r\n\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/mnt\/server\/\r\n\r\ncd \/mnt\/server\r\n\r\nwget https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/446-8a058b67e5f11677c380a330f677e768e2b2a705\/fx.tar.xz\r\n\r\ntar xf fx.tar.xz alpine\/opt\/\r\n\r\nmv alpine\/opt\/cfx-server\/ .\/\r\n\r\nchmod +x .\/cfx-server\/FXServer\r\n\r\nrm -rf fx.tar.xz alpine\/\r\n\r\ncurl https:\/\/hastebin.com\/raw\/lawubemuhe >> server.cfg", + "script": "#!\/bin\/ash\r\n# FiveM Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## Only download if a path is provided, otherwise continue.\r\napk add openssl tar xz curl git --no-cache\r\n\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/mnt\/server\/\r\n\r\ncd \/mnt\/server\r\n\r\nwget https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/446-8a058b67e5f11677c380a330f677e768e2b2a705\/fx.tar.xz\r\n\r\ntar xf fx.tar.xz alpine\/opt\/\r\n\r\nmv alpine\/opt\/cfx-server\/ .\/\r\n\r\nchmod +x .\/cfx-server\/FXServer\r\n\r\nrm -rf fx.tar.xz alpine\/\r\n\r\ncurl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/GTA\/FiveM\/server.cfg >> server.cfg", "container": "alpine:3.7", "entrypoint": "ash" } }, "variables": [ { - "name": "Server License Key", - "description": "Key is required to start the service. Get your keys at https://keymaster.fivem.net", + "name": "fivem license", + "description": "Required to start the service. Get your keys at https:\/\/keymaster.fivem.net\/", "env_variable": "FIVEM_LICENSE", "default_value": "", "user_viewable": 1, "user_editable": 1, "rules": "required|string|max:32" - }, - { - "name": "Hostname", - "description": "The name of your server as it appears in the server list.", - "env_variable": "HOSTNAME", - "default_value": "My FX Server", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:64" - }, - { - "name": "Max Players", - "description": "Maximum amount of players at one time.", - "env_variable": "MAX_CLIENTS", - "default_value": "31", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|numeric|max:31" } ] -} +} \ No newline at end of file From 31418b04e9b7fe63a26c21e405865a4e37901b4d Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 11 Mar 2018 23:35:07 -0400 Subject: [PATCH 40/55] factorio server settings change --- Factorio/factorio/egg-factorio.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Factorio/factorio/egg-factorio.json b/Factorio/factorio/egg-factorio.json index 9ccb8595..41968cdc 100644 --- a/Factorio/factorio/egg-factorio.json +++ b/Factorio/factorio/egg-factorio.json @@ -3,14 +3,14 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-03-07T00:13:07-05:00", + "exported_at": "2018-03-11T23:34:09-04: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", "startup": ".\/bin\/x64\/factorio --port {{SERVER_PORT}} --start-server {{SAVE_NAME}}.zip", "config": { - "files": "{\r\n \"data\/server-settings.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"password\": \"{{server.build.env.SERVER_PASS}}\",\r\n \"max_players\": \"{{server.build.env.MAX_SLOTS}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"data\/server-settings.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"game_password\": \"{{server.build.env.SERVER_PASS}}\",\r\n \"max_players\": \"{{server.build.env.MAX_SLOTS}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Type changing state from(CreatingGame) to(InGame)\",\r\n \"userInteraction\": []\r\n}", "logs": "{\r\n \"custom\": false,\r\n \"location\": \"factorio-current.log\"\r\n}", "stop": "^C" From 207a4c893c450e4742d3a5e5889ab2f576e5e3a6 Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Tue, 13 Mar 2018 00:52:37 -0500 Subject: [PATCH 41/55] Rename egg-forge--enchanced.json to egg-forge--enhanced.json --- .../{egg-forge--enchanced.json => egg-forge--enhanced.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Minecraft/forge-enhanced/{egg-forge--enchanced.json => egg-forge--enhanced.json} (100%) diff --git a/Minecraft/forge-enhanced/egg-forge--enchanced.json b/Minecraft/forge-enhanced/egg-forge--enhanced.json similarity index 100% rename from Minecraft/forge-enhanced/egg-forge--enchanced.json rename to Minecraft/forge-enhanced/egg-forge--enhanced.json From 9dee072172123a4db44442573f1610403807601a Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 14 Mar 2018 15:09:42 -0400 Subject: [PATCH 42/55] fivem download link changes --- 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 99fa15f8..15858eff 100644 --- a/GTA/FiveM/egg-five-m.json +++ b/GTA/FiveM/egg-five-m.json @@ -3,21 +3,21 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-03-10T19:23:00-05:00", + "exported_at": "2018-03-14T15:06:47-04:00", "name": "FiveM", "author": "parker@parkervcp.com", "description": "The FiveM multiplayer server on Pterodactyl.", "image": "quay.io\/pterodactyl\/core:glibc", "startup": ".\/cfx-server\/FXServer +exec server.cfg +set sv_licenseKey {{FIVEM_LICENSE}} +set citizen_dir \/home\/container\/cfx-server\/citizen", "config": { - "files": "{\r\n \"server_data\/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_licenseKey\": \"sv_licenseKey {{FIVEM_LICENSE}}\"\r\n }\r\n }\r\n}", + "files": "{\r\n \"server_data\/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 }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Server license key authentication 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# FiveM Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## Only download if a path is provided, otherwise continue.\r\napk add openssl tar xz curl git --no-cache\r\n\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/mnt\/server\/\r\n\r\ncd \/mnt\/server\r\n\r\nwget https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/446-8a058b67e5f11677c380a330f677e768e2b2a705\/fx.tar.xz\r\n\r\ntar xf fx.tar.xz alpine\/opt\/\r\n\r\nmv alpine\/opt\/cfx-server\/ .\/\r\n\r\nchmod +x .\/cfx-server\/FXServer\r\n\r\nrm -rf fx.tar.xz alpine\/\r\n\r\ncurl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/GTA\/FiveM\/server.cfg >> server.cfg", + "script": "#!\/bin\/ash\r\n# FiveM Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## Only download if a path is provided, otherwise continue.\r\napk add openssl tar xz curl git --no-cache\r\n\r\necho \"cloning citizenfx files\"\r\n\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/mnt\/server\/\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading the fivem server files\"\r\n\r\nwget https:\/\/m-84g4dtu6fd76.runkit.sh\/?q=linux -O fx.tar.xz\r\n\r\necho \"Extracting fivem files\"\r\n\r\ntar xf fx.tar.xz alpine\/opt\/\r\n\r\nmv alpine\/opt\/cfx-server\/ .\/\r\n\r\nchmod +x .\/cfx-server\/FXServer\r\n\r\nrm -rf fx.tar.xz alpine\/\r\n\r\necho \"Downloading default fivem config\"\r\n\r\ncurl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/GTA\/FiveM\/server.cfg >> server.cfg", "container": "alpine:3.7", "entrypoint": "ash" } From 4f88b5ee229c43a96feab362080c39d852c8a9df Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Mon, 19 Mar 2018 01:01:40 -0400 Subject: [PATCH 43/55] fixing to match more MC versions Also added more logging for the install process. --- .../forge-enhanced/egg-forge--enchanced.json | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Minecraft/forge-enhanced/egg-forge--enchanced.json b/Minecraft/forge-enhanced/egg-forge--enchanced.json index eaa901c4..90e65346 100644 --- a/Minecraft/forge-enhanced/egg-forge--enchanced.json +++ b/Minecraft/forge-enhanced/egg-forge--enchanced.json @@ -3,8 +3,8 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-27T18:47:17-06:00", - "name": "Forge-Enhanced", + "exported_at": "2018-03-19T01:01:29-04:00", + "name": "Forge-Enchanced", "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\nGET_VERSIONS=$(curl -sl http:\/\/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]')\r\nLATEST_VERSION=$(echo $GET_VERSIONS | sed 's\/ \/\/g')\r\n\r\ncd \/mnt\/server\r\n\r\ncurl -sS http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$LATEST_VERSION\/forge-$LATEST_VERSION-installer.jar -o installer.jar\r\ncurl -sS http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$LATEST_VERSION\/forge-$LATEST_VERSION-universal.jar -o server.jar\r\n\r\njava -jar installer.jar --installServer\r\nrm -rf installer.jar", + "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_URL=http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/\r\nelse\r\n FORGE_URL=http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/index_$MC_VERSION.html\r\nfi\r\n\r\n echo \"MC version is $MC_VERSION\"\r\n echo \"Forge URL is $FORGE_URL\"\r\n\r\nGET_VERSIONS=$(curl -sl $FORGE_URL | grep -A1 Recommended | grep -o -E '[0-9]+\\.[0-9]+\\.[0-9]+ - [0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+')\r\nLATEST_VERSION=$(echo $GET_VERSIONS | sed 's\/ \/\/g')\r\n\r\necho \"full forge versions to download is $LATEST_VERSION\"\r\n\r\ncd \/mnt\/server\r\n\r\necho \"getting installer from 'http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$MC_VERSION\/forge-$LATEST_VERSION-installer.jar'\"\r\ncurl -sS http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$LATEST_VERSION\/forge-$LATEST_VERSION-installer.jar -o installer.jar\r\necho \"getting universal jar from 'http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$LATEST_VERSION\/forge-$LATEST_VERSION-universal.jar'\"\r\ncurl -sS http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$LATEST_VERSION\/forge-$LATEST_VERSION-universal.jar -o server.jar\r\n\r\njava -jar installer.jar --installServer\r\nrm -rf installer.jar", "container": "frolvlad\/alpine-oraclejdk8:cleaned", "entrypoint": "ash" } @@ -31,6 +31,15 @@ "user_viewable": 1, "user_editable": 1, "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", + "env_variable": "MC_VERSION", + "default_value": "latest", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From 4c92bdb8539ace31e6f928e70d380363ef0f447b Mon Sep 17 00:00:00 2001 From: Rouing Date: Mon, 19 Mar 2018 14:29:28 -0500 Subject: [PATCH 44/55] Update egg-forge--enhanced.json I SWARE TO GOD @parkervcp --- Minecraft/forge-enhanced/egg-forge--enhanced.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Minecraft/forge-enhanced/egg-forge--enhanced.json b/Minecraft/forge-enhanced/egg-forge--enhanced.json index 90e65346..8df2cf62 100644 --- a/Minecraft/forge-enhanced/egg-forge--enhanced.json +++ b/Minecraft/forge-enhanced/egg-forge--enhanced.json @@ -4,7 +4,7 @@ "version": "PTDL_v1" }, "exported_at": "2018-03-19T01:01:29-04:00", - "name": "Forge-Enchanced", + "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", @@ -42,4 +42,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From bbb79cfe656b1d86b418faff82672304a4ffedb2 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 21 Mar 2018 13:32:03 -0400 Subject: [PATCH 45/55] added issue template --- .github/issue_template.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/issue_template.md diff --git a/.github/issue_template.md b/.github/issue_template.md new file mode 100644 index 00000000..4b46de11 --- /dev/null +++ b/.github/issue_template.md @@ -0,0 +1,15 @@ +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 f2de112ec78316b93f2ba0adfb7d0fd305dec3b1 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 21 Mar 2018 23:58:42 -0400 Subject: [PATCH 46/55] parkertron updates --- discordbots/parkertron/egg-parkertron.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/discordbots/parkertron/egg-parkertron.json b/discordbots/parkertron/egg-parkertron.json index ba850c3e..a62f15db 100644 --- a/discordbots/parkertron/egg-parkertron.json +++ b/discordbots/parkertron/egg-parkertron.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-03-07T08:53:21-05:00", + "exported_at": "2018-03-21T23:58:08-04:00", "name": "parkertron", "author": "parker@parkervcp.com", "description": "The stupid chatbot parkertron by Parkervcp.\r\n\r\nhttps:\/\/github.com\/parkervcp\/parkertron", @@ -17,7 +17,7 @@ }, "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\ncurl https:\/\/raw.githubusercontent.com\/golang\/dep\/master\/install.sh | sh\r\n\r\ncd go\/src\/\r\n\r\ngit clone -b pterodactyl https:\/\/github.com\/parkervcp\/parkertron.git\r\n\r\ncd parkertron\/\r\n\r\ndep ensure\r\n\r\ngo build \r\n\r\ncp parkertron \/mnt\/server\/\r\ncp -r configs\/ \/mnt\/server\/", + "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 -b pterodactyl 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\ncp -r configs\/ \/mnt\/server\/\r\n\r\necho \"Install complete. If you watched this. Congrats.\"", "container": "alpine:3.7", "entrypoint": "ash" } From f889e70aac053e19560655648819f2f5f370a10a Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 23 Mar 2018 11:16:37 -0400 Subject: [PATCH 47/55] updated generic FTB Fixed the variable matching to no cause issues on the panel. Also changed the install script to work for all FTB linked packs. It is known that curseforge links do not work. --- Minecraft/feed-the-beast/egg-feed-the-beast.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Minecraft/feed-the-beast/egg-feed-the-beast.json b/Minecraft/feed-the-beast/egg-feed-the-beast.json index 8cea0a54..a84169bf 100644 --- a/Minecraft/feed-the-beast/egg-feed-the-beast.json +++ b/Minecraft/feed-the-beast/egg-feed-the-beast.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-27T11:41:14-05:00", + "exported_at": "2018-03-23T11:15:04-04:00", "name": "Feed the Beast", "author": "aevum@decess.us", "description": "Egg to handle all official FTB Modpacks", @@ -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 update\r\napk add curl --no-cache\r\n\r\nBASEURL=https:\/\/www.feed-the-beast.com\/projects\/${MODPACK_URL}\/files\r\nPATTERN=\"projects\\\/${MODPACK_URL}\\\/files\\\/\\d{7,}\"\r\nID_PATTERN=\"\\d{7,}\"\r\nID=`curl -sl ${BASEURL}| grep -A2 ${MODPACK_VERSION} | grep -oE \"${PATTERN}\" | grep -oE \"${ID_PATTERN}\"`\r\necho \"ID: ${ID}\"\r\nSECONDURL=${BASEURL}\/${ID}\r\necho \"SECONDURL: ${SECONDURL}\"\r\nGOOD_ID=`curl -sl ${SECONDURL} | grep -B2 Server_${MODPACK_VERSION}.zip | grep -oE \"${PATTERN}\" | grep -oE \"${ID_PATTERN}\"`\r\necho \"GOOD_ID: ${GOOD_ID}\"\r\nDL_URL=${BASEURL}\/${GOOD_ID}\/download\r\necho \"Download_URL: ${DL_URL}\"\r\ncd \/mnt\/server\r\n\r\necho \"Executing curl -L ${DL_URL} -o ${MODPACK_URL}.zip\"\r\ncurl -L ${DL_URL} -o ${MODPACK_URL}.zip\r\n\r\nunzip ${MODPACK_URL}.zip\r\n\r\nrm -rf ${MODPACK_URL}.zip\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\nsh .\/FTBInstall.sh", "container": "alpine:3.7", "entrypoint": "ash" } @@ -30,16 +30,16 @@ "default_value": "", "user_viewable": 1, "user_editable": 1, - "rules": "required|regex:[a-z-0-9]+|max:30" + "rules": "required|regex:([a-z-0-9]+$)" }, { "name": "Modpack Version", - "description": "Version of the modpack to use", + "description": "Version of the modpack to use.", "env_variable": "MODPACK_VERSION", - "default_value": "", + "default_value": "latest", "user_viewable": 1, "user_editable": 1, - "rules": "required|regex:\\d+.\\d+.\\d+" + "rules": "required|string|max:20" }, { "name": "Level Seed", @@ -48,7 +48,7 @@ "default_value": "", "user_viewable": 1, "user_editable": 1, - "rules": "string|max:40" + "rules": "nullable|string|max:40" }, { "name": "Max Players", @@ -78,4 +78,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From 09f6c7aeb91868f45c55eb0896d0878f9723c0f7 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Mon, 26 Mar 2018 15:07:21 -0400 Subject: [PATCH 48/55] fixed fivem download --- 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 15858eff..4c628605 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-03-14T15:06:47-04:00", + "exported_at": "2018-03-26T13:04:05-04:00", "name": "FiveM", "author": "parker@parkervcp.com", "description": "The FiveM multiplayer server on Pterodactyl.", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# FiveM Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## Only download if a path is provided, otherwise continue.\r\napk add openssl tar xz curl git --no-cache\r\n\r\necho \"cloning citizenfx files\"\r\n\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/mnt\/server\/\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading the fivem server files\"\r\n\r\nwget https:\/\/m-84g4dtu6fd76.runkit.sh\/?q=linux -O fx.tar.xz\r\n\r\necho \"Extracting fivem files\"\r\n\r\ntar xf fx.tar.xz alpine\/opt\/\r\n\r\nmv alpine\/opt\/cfx-server\/ .\/\r\n\r\nchmod +x .\/cfx-server\/FXServer\r\n\r\nrm -rf fx.tar.xz alpine\/\r\n\r\necho \"Downloading default fivem config\"\r\n\r\ncurl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/GTA\/FiveM\/server.cfg >> server.cfg", + "script": "#!\/bin\/ash\r\n# FiveM Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## Only download if a path is provided, otherwise continue.\r\napk add openssl tar xz curl git --no-cache\r\n\r\necho \"cloning citizenfx files\"\r\n\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/mnt\/server\/\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 -3 | 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 alpine\/opt\/\r\n\r\nmv alpine\/opt\/cfx-server\/ .\/\r\n\r\nchmod +x .\/cfx-server\/FXServer\r\n\r\nrm -rf fx.tar.xz alpine\/\r\n\r\necho \"Downloading default fivem config\"\r\n\r\ncurl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/GTA\/FiveM\/server.cfg >> server.cfg", "container": "alpine:3.7", "entrypoint": "ash" } From 959df932522637aa4b7358d6726da221c57e2220 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 27 Mar 2018 09:14:00 -0400 Subject: [PATCH 49/55] Adding pixel-bot --- README.md | 6 +- discordbots/pixel-bot/egg-pixel-bot.json | 72 ++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 discordbots/pixel-bot/egg-pixel-bot.json diff --git a/README.md b/README.md index 75ec01cd..f81512fd 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ The [Squad](https://joinsquad.com/) official dedicated server ### Xonotic #### xonotic The [xonotic](http://www.xonotic.org/) official dedicated server. -- Disk space needs to be +- Disk space needs to be at least 1 gig for the full package. ## Bot Eggs ### Discord @@ -79,3 +79,7 @@ The [ATLauncher Bot](https://github.com/ATLauncher/discord-bot/) #### parkertron My own stupid chat bot [parkertron](https://github.com/parkervcp/parkertron) - Currently runs as the SupportBot in the pterodactyl discord server. + +#### pixel-bot +[pixel-bot](https://github.com/Ispira/pixel-bot) + - More of a reason/way to test a python container. \ No newline at end of file diff --git a/discordbots/pixel-bot/egg-pixel-bot.json b/discordbots/pixel-bot/egg-pixel-bot.json new file mode 100644 index 00000000..e9646353 --- /dev/null +++ b/discordbots/pixel-bot/egg-pixel-bot.json @@ -0,0 +1,72 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-03-27T08:57:41-04: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", + "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}", + "startup": "{\r\n \"done\": \"Logged in as\",\r\n \"userInteraction\": []\r\n}", + "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "stop": "^C" + }, + "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", + "container": "python:3.6-alpine3.7", + "entrypoint": "ash" + } + }, + "variables": [ + { + "name": "Owner Discord UID", + "description": "The Discord UID of the bot owner.", + "env_variable": "OWNER_UID", + "default_value": "copy from discord", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:32" + }, + { + "name": "Discord Bot Token", + "description": "Get the app token from https:\/\/discordapp.com\/developers\/applications\/me", + "env_variable": "BOT_TOKEN", + "default_value": "get from discord developers", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:64" + }, + { + "name": "Bot Name", + "description": "The name that you want set for the bot", + "env_variable": "BOT_NAME", + "default_value": "Ispyra", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" + }, + { + "name": "Imgur API ID", + "description": "Add your Imgur API client_id if you want. \r\n\r\nhttps:\/\/api.imgur.com\/oauth2\/addclient", + "env_variable": "IMGUR_KEY", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "nullable|string|max:64" + }, + { + "name": "Imgur Secret", + "description": "Add your Imgur API client_secret if you want. \r\n\r\nhttps:\/\/api.imgur.com\/oauth2\/addclient", + "env_variable": "IMGUR_SECRET", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "nullable|string|max:20" + } + ] +} \ No newline at end of file From 63777285d678267d1b7159eb34abf44a4dc439d0 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 27 Mar 2018 09:15:45 -0400 Subject: [PATCH 50/55] sinusbot added to the readme. --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f81512fd..824f9012 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,7 @@ The [xonotic](http://www.xonotic.org/) official dedicated server. ## Bot Eggs ### Discord + #### ATLBot The [ATLauncher Bot](https://github.com/ATLauncher/discord-bot/) @@ -82,4 +83,7 @@ My own stupid chat bot [parkertron](https://github.com/parkervcp/parkertron) #### pixel-bot [pixel-bot](https://github.com/Ispira/pixel-bot) - - More of a reason/way to test a python container. \ No newline at end of file + - More of a reason/way to test a python container. + +#### Sinusbot +TS3 and Discord music bot. [sinusbot](https://www.sinusbot.com/) \ No newline at end of file From 2bd22a60283e6321d8757751a7eef745263adad6 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 27 Mar 2018 09:17:08 -0400 Subject: [PATCH 51/55] factorio startup fix --- Factorio/factorio/egg-factorio.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Factorio/factorio/egg-factorio.json b/Factorio/factorio/egg-factorio.json index 41968cdc..1fbb4102 100644 --- a/Factorio/factorio/egg-factorio.json +++ b/Factorio/factorio/egg-factorio.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-03-11T23:34:09-04:00", + "exported_at": "2018-03-27T09:16:37-04:00", "name": "Factorio", "author": "parker@parkervcp.com", "description": "The vanilla Factorio server.\r\n\r\nhttps:\/\/www.factorio.com\/", @@ -11,7 +11,7 @@ "startup": ".\/bin\/x64\/factorio --port {{SERVER_PORT}} --start-server {{SAVE_NAME}}.zip", "config": { "files": "{\r\n \"data\/server-settings.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"game_password\": \"{{server.build.env.SERVER_PASS}}\",\r\n \"max_players\": \"{{server.build.env.MAX_SLOTS}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Type changing state from(CreatingGame) to(InGame)\",\r\n \"userInteraction\": []\r\n}", + "startup": "{\r\n \"done\": \"InGame\",\r\n \"userInteraction\": []\r\n}", "logs": "{\r\n \"custom\": false,\r\n \"location\": \"factorio-current.log\"\r\n}", "stop": "^C" }, From c3ac9984036538560e2aa6df51fac2404d82b761 Mon Sep 17 00:00:00 2001 From: ki2007 Date: Tue, 27 Mar 2018 15:42:58 +0200 Subject: [PATCH 52/55] Update Sinusbot Egg -Set image to parkervcps quay.io repository -Update startup config setting --- discordbots/Sinusbot/egg-sinusbot.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/discordbots/Sinusbot/egg-sinusbot.json b/discordbots/Sinusbot/egg-sinusbot.json index 6c1c9a1c..71bcb9ee 100644 --- a/discordbots/Sinusbot/egg-sinusbot.json +++ b/discordbots/Sinusbot/egg-sinusbot.json @@ -3,15 +3,15 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-03-04T21:25:08+01:00", + "exported_at": "2018-03-27T15:39:54+02:00", "name": "Sinusbot", "author": "ki2007@damw.eu", "description": "Musicbot for Discord and Teamspeak.", - "image": "quay.io\/ki2007\/pterodactyl-images:sinusbot", + "image": "quay.io\/parkervcp\/pterodactyl-images: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}", - "startup": "{\r\n \"done\": \"NOTICE You may now configure and launch the bots from the webinterface\",\r\n \"userInteraction\": []\r\n}", + "startup": "{\r\n \"done\": \"Initialization complete\",\r\n \"userInteraction\": []\r\n}", "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "^C" }, From 581ee871a80e334e5123f486ae4e29b9f6430f5a Mon Sep 17 00:00:00 2001 From: Bl4ckSpr4y Date: Mon, 2 Apr 2018 20:09:22 +0300 Subject: [PATCH 53/55] Successful not Sucessful --- Minecraft/taco-spigot/egg-taco-spigot.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Minecraft/taco-spigot/egg-taco-spigot.json b/Minecraft/taco-spigot/egg-taco-spigot.json index 79a70f11..1b226a51 100644 --- a/Minecraft/taco-spigot/egg-taco-spigot.json +++ b/Minecraft/taco-spigot/egg-taco-spigot.json @@ -17,7 +17,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=\"lastSucessfulBuild\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/ci.techcable.net\/job\/TacoSpigot\/${DL_VERSION}\/artifact\/build\/TacoSpigot.jar", + "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", "entrypoint": "ash" } @@ -42,4 +42,4 @@ "rules": "required|string|between:3,7" } ] -} \ No newline at end of file +} From 22d38730b0e3593e0fbc4ec5a6ab0db41dc7994d Mon Sep 17 00:00:00 2001 From: Bl4ckSpr4y Date: Mon, 2 Apr 2018 20:10:39 +0300 Subject: [PATCH 54/55] Successful not Sucessful --- Minecraft/paper-spigot/egg-paper-spigot.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Minecraft/paper-spigot/egg-paper-spigot.json b/Minecraft/paper-spigot/egg-paper-spigot.json index fc99620e..335a36fc 100644 --- a/Minecraft/paper-spigot/egg-paper-spigot.json +++ b/Minecraft/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=\"lastSucessfulBuild\"\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:\/\/ci.destroystokyo.com\/job\/Paper\/${DL_VERSION}\/artifact\/paperclip.jar", "container": "alpine:3.4", "entrypoint": "ash" } @@ -42,4 +42,4 @@ "rules": "required|string|between:3,7" } ] -} \ No newline at end of file +} From 9b8357e322f3769d3aeb21d587f23fac59fb9203 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Mon, 2 Apr 2018 17:22:03 -0400 Subject: [PATCH 55/55] FTB fixes --- Minecraft/feed-the-beast/egg-feed-the-beast.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Minecraft/feed-the-beast/egg-feed-the-beast.json b/Minecraft/feed-the-beast/egg-feed-the-beast.json index a84169bf..289ba61c 100644 --- a/Minecraft/feed-the-beast/egg-feed-the-beast.json +++ b/Minecraft/feed-the-beast/egg-feed-the-beast.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-03-23T11:15:04-04:00", + "exported_at": "2018-04-02T17:20:55-04:00", "name": "Feed the Beast", "author": "aevum@decess.us", "description": "Egg to handle all official FTB Modpacks", @@ -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\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\n\r\nsh .\/FTBInstall.sh", "container": "alpine:3.7", "entrypoint": "ash" }