From ec8ec50821f071b31bf486677a0d4341cc36b272 Mon Sep 17 00:00:00 2001 From: regulad <52430642+regulad@users.noreply.github.com> Date: Mon, 28 Jun 2021 11:15:50 -0400 Subject: [PATCH 1/9] Add VIAaaS egg and close #1207 --- README.md | 1 + minecraft/proxy/java/viaaas/README.md | 10 +++++ .../proxy/java/viaaas/egg-v-i-aaa-s.json | 42 +++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 minecraft/proxy/java/viaaas/README.md create mode 100644 minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json diff --git a/README.md b/README.md index c1df35db..772a0500 100644 --- a/README.md +++ b/README.md @@ -141,6 +141,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) * [Velocity](/minecraft/proxy/java/velocity) * [Waterfall](/minecraft/proxy/java/waterfall) + * [VIAaaS](/minecraft/proxy/java/viaaas) * [Cross Platform](/minecraft/proxy/cross_platform) * [GeyserMC](/minecraft/proxy/cross_platform/geyser) * [Waterdog](/minecraft/proxy/cross_platform/waterdog) diff --git a/minecraft/proxy/java/viaaas/README.md b/minecraft/proxy/java/viaaas/README.md new file mode 100644 index 00000000..13dc8fe3 --- /dev/null +++ b/minecraft/proxy/java/viaaas/README.md @@ -0,0 +1,10 @@ +# VIAaaS +VIAaaS is the Minecraft plugin VIAaaS made standalone as a proxy. + +## Server Ports +The minecraft server requires a single port for access (default 25565), and one TCP port 25543, to be used for HTTPS and WebSocket connections. + +| Port | default | +|------------|---------| +| Game | 25565 | +| WS & HTTPS | 25543 | diff --git a/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json b/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json new file mode 100644 index 00000000..8dedae77 --- /dev/null +++ b/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json @@ -0,0 +1,42 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2021-06-28T11:03:44-04:00", + "name": "VIAaaS", + "author": "regulad@outlook.com", + "description": "VIAaaS - ViaVersion as a Service - Standalone ViaVersion proxy", + "features": null, + "images": [ + "ghcr.io\/pterodactyl\/yolks:java_11", + "ghcr.io\/pterodactyl\/yolks:java_16" + ], + "file_denylist": [], + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", + "config": { + "files": "{\r\n \"config\/viaaas.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"port\": \"{{server.build.default.port}}\",\r\n \"bind-address\": \"0.0.0.0\"\r\n }\r\n }\r\n}", + "startup": "{\n \"done\": \"Listening on \",\n \"userInteraction\": [\n \"Listening on /0.0.0.0:\"\n ]\n}", + "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "stop": "end" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# VIAaaS Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl\r\n\r\ncd \/mnt\/server\r\n\r\ncurl -Lf -o ${SERVER_JARFILE} \"https:\/\/jitpack.io\/com\/github\/ViaVersion\/VIAaaS\/master-SNAPSHOT\/VIAaaS-master-SNAPSHOT-all.jar\"", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "VIAaaS Jar File", + "description": "The name of the jarfile to be used when downloading & running VIAaaS", + "env_variable": "SERVER_JARFILE", + "default_value": "VIAaaS-all.jar", + "user_viewable": false, + "user_editable": false, + "rules": "required|string" + } + ] +} \ No newline at end of file From 7b5b88917b399cccf475384897b5a506c4dfe84a Mon Sep 17 00:00:00 2001 From: regulad <52430642+regulad@users.noreply.github.com> Date: Mon, 28 Jun 2021 11:56:28 -0400 Subject: [PATCH 2/9] Remove bad docker images, fix startup, and add option to change webserver port --- .../proxy/java/viaaas/egg-v-i-aaa-s.json | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json b/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json index 8dedae77..708939f9 100644 --- a/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json +++ b/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json @@ -4,20 +4,19 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-06-28T11:03:44-04:00", + "exported_at": "2021-06-28T11:55:37-04:00", "name": "VIAaaS", "author": "regulad@outlook.com", "description": "VIAaaS - ViaVersion as a Service - Standalone ViaVersion proxy", "features": null, "images": [ - "ghcr.io\/pterodactyl\/yolks:java_11", "ghcr.io\/pterodactyl\/yolks:java_16" ], "file_denylist": [], - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}} -sslPort {{WEBSERVER_PORT}}", "config": { "files": "{\r\n \"config\/viaaas.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"port\": \"{{server.build.default.port}}\",\r\n \"bind-address\": \"0.0.0.0\"\r\n }\r\n }\r\n}", - "startup": "{\n \"done\": \"Listening on \",\n \"userInteraction\": [\n \"Listening on /0.0.0.0:\"\n ]\n}", + "startup": "{\r\n \"done\": \"Application started:\"\r\n}", "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", "stop": "end" }, @@ -31,10 +30,19 @@ "variables": [ { "name": "VIAaaS Jar File", - "description": "The name of the jarfile to be used when downloading & running VIAaaS", + "description": "The name of the jarfile to be used when downloading & running VIAaaS.", "env_variable": "SERVER_JARFILE", "default_value": "VIAaaS-all.jar", - "user_viewable": false, + "user_viewable": true, + "user_editable": true, + "rules": "required|string" + }, + { + "name": "Webserver Port", + "description": "The port to listen to webserver connections on.", + "env_variable": "WEBSERVER_PORT", + "default_value": "25543", + "user_viewable": true, "user_editable": false, "rules": "required|string" } From fb13854a089cf40cd22e22e778a224446603ec16 Mon Sep 17 00:00:00 2001 From: Parker Wahle Date: Tue, 29 Jun 2021 10:51:38 -0400 Subject: [PATCH 3/9] Link to GitHub repo --- minecraft/proxy/java/viaaas/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/minecraft/proxy/java/viaaas/README.md b/minecraft/proxy/java/viaaas/README.md index 13dc8fe3..f3736ab3 100644 --- a/minecraft/proxy/java/viaaas/README.md +++ b/minecraft/proxy/java/viaaas/README.md @@ -1,6 +1,8 @@ # VIAaaS VIAaaS is the Minecraft plugin VIAaaS made standalone as a proxy. +More information is available here: https://github.com/ViaVersion/VIAaaS + ## Server Ports The minecraft server requires a single port for access (default 25565), and one TCP port 25543, to be used for HTTPS and WebSocket connections. From 27297461809885178dd1f5577b9d5f1f31e3fae6 Mon Sep 17 00:00:00 2001 From: Parker Wahle Date: Tue, 29 Jun 2021 14:11:12 -0400 Subject: [PATCH 4/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 772a0500..a18aa3e7 100644 --- a/README.md +++ b/README.md @@ -140,8 +140,8 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Travertine](/minecraft/proxy/java/travertine) * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) * [Velocity](/minecraft/proxy/java/velocity) - * [Waterfall](/minecraft/proxy/java/waterfall) * [VIAaaS](/minecraft/proxy/java/viaaas) + * [Waterfall](/minecraft/proxy/java/waterfall) * [Cross Platform](/minecraft/proxy/cross_platform) * [GeyserMC](/minecraft/proxy/cross_platform/geyser) * [Waterdog](/minecraft/proxy/cross_platform/waterdog) From bda83944d35c53d1006182251b05fe4498a3f4a8 Mon Sep 17 00:00:00 2001 From: regulad <52430642+regulad@users.noreply.github.com> Date: Tue, 29 Jun 2021 14:30:02 -0400 Subject: [PATCH 5/9] Couple small things I didn't notice on first whack --- README.md | 2 +- minecraft/README.md | 1 + minecraft/proxy/README.md | 5 +++-- minecraft/proxy/java/README.md | 3 +++ minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json | 4 ++-- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a18aa3e7..efaa7a55 100644 --- a/README.md +++ b/README.md @@ -139,8 +139,8 @@ If you are reading this it looks like you are looking to add an egg to your serv * [FlameCord](/minecraft/proxy/java/flamecord) * [Travertine](/minecraft/proxy/java/travertine) * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) - * [Velocity](/minecraft/proxy/java/velocity) * [VIAaaS](/minecraft/proxy/java/viaaas) + * [Velocity](/minecraft/proxy/java/velocity) * [Waterfall](/minecraft/proxy/java/waterfall) * [Cross Platform](/minecraft/proxy/cross_platform) * [GeyserMC](/minecraft/proxy/cross_platform/geyser) diff --git a/minecraft/README.md b/minecraft/README.md index 1cd6d519..8b7644b3 100644 --- a/minecraft/README.md +++ b/minecraft/README.md @@ -31,6 +31,7 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [FlameCord](/minecraft/proxy/java/flamecord) * [Travertine](/minecraft/proxy/java/travertine) * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) + * [VIAaaS](/minecraft/proxy/java/viaaas) * [Velocity](/minecraft/proxy/java/velocity) * [Waterfall](/minecraft/proxy/java/waterfall) * [Cross Platform](/minecraft/proxy/cross_platform) diff --git a/minecraft/proxy/README.md b/minecraft/proxy/README.md index 0ade0eb7..a58c2562 100644 --- a/minecraft/proxy/README.md +++ b/minecraft/proxy/README.md @@ -2,10 +2,11 @@ * [Java](/minecraft/proxy/java/) * [FlameCord](/minecraft/proxy/java/flamecord) - * [Waterfall](/minecraft/proxy/java/waterfall) * [Travertine](/minecraft/proxy/java/travertine) - * [Velocity](/minecraft/proxy/java/velocity) * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) + * [VIAaaS](/minecraft/proxy/java/viaaas) + * [Velocity](/minecraft/proxy/java/velocity) + * [Waterfall](/minecraft/proxy/java/waterfall) * [Cross Platform](/minecraft/proxy/cross_platform) * [GeyserMC](/minecraft/proxy/cross_platform/geyser) * [Waterdog](/minecraft/proxy/cross_platform/waterdog) diff --git a/minecraft/proxy/java/README.md b/minecraft/proxy/java/README.md index b9be1296..6fe06983 100644 --- a/minecraft/proxy/java/README.md +++ b/minecraft/proxy/java/README.md @@ -17,6 +17,9 @@ A limbo server is a fallback server able to handle a massive amount of simultane [Velocity](https://velocitypowered.com) Velocity is a Minecraft server proxy with unparalleled server support, scalability, and flexibility. +#### VIAaaS +[VIAaaS](https://github.com/ViaVersion/VIAaaS) is the Minecraft plugin VIAaaS made standalone as a proxy. + #### Waterfall [Waterfall](https://papermc.io/downloads#Waterfall) Paper fork of the BungeeCord software, with improved Forge support and more features. \ No newline at end of file diff --git a/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json b/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json index 708939f9..19837abd 100644 --- a/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json +++ b/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json @@ -13,7 +13,7 @@ "ghcr.io\/pterodactyl\/yolks:java_16" ], "file_denylist": [], - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}} -sslPort {{WEBSERVER_PORT}}", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}} -sslPort={{WEBSERVER_PORT}}", "config": { "files": "{\r\n \"config\/viaaas.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"port\": \"{{server.build.default.port}}\",\r\n \"bind-address\": \"0.0.0.0\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Application started:\"\r\n}", @@ -43,7 +43,7 @@ "env_variable": "WEBSERVER_PORT", "default_value": "25543", "user_viewable": true, - "user_editable": false, + "user_editable": true, "rules": "required|string" } ] From 25f5ad248dbbd20991cbc81bb92e77800fc6966a Mon Sep 17 00:00:00 2001 From: regulad <52430642+regulad@users.noreply.github.com> Date: Tue, 29 Jun 2021 16:10:43 -0400 Subject: [PATCH 6/9] Should be it? --- minecraft/proxy/java/README.md | 2 +- minecraft/proxy/java/viaaas/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft/proxy/java/README.md b/minecraft/proxy/java/README.md index 6fe06983..b546c9c4 100644 --- a/minecraft/proxy/java/README.md +++ b/minecraft/proxy/java/README.md @@ -18,7 +18,7 @@ A limbo server is a fallback server able to handle a massive amount of simultane Velocity is a Minecraft server proxy with unparalleled server support, scalability, and flexibility. #### VIAaaS -[VIAaaS](https://github.com/ViaVersion/VIAaaS) is the Minecraft plugin VIAaaS made standalone as a proxy. +[VIAaaS](https://github.com/ViaVersion/VIAaaS) is the Minecraft plugin ViaVersion made standalone as a proxy. #### Waterfall [Waterfall](https://papermc.io/downloads#Waterfall) diff --git a/minecraft/proxy/java/viaaas/README.md b/minecraft/proxy/java/viaaas/README.md index f3736ab3..d84615e9 100644 --- a/minecraft/proxy/java/viaaas/README.md +++ b/minecraft/proxy/java/viaaas/README.md @@ -1,5 +1,5 @@ # VIAaaS -VIAaaS is the Minecraft plugin VIAaaS made standalone as a proxy. +VIAaaS is the Minecraft plugin ViaVersion made standalone as a proxy. More information is available here: https://github.com/ViaVersion/VIAaaS From 6222033ce2c7f043b64ebead10e4f623a333e67b Mon Sep 17 00:00:00 2001 From: regulad <52430642+regulad@users.noreply.github.com> Date: Fri, 2 Jul 2021 13:29:58 -0400 Subject: [PATCH 7/9] https://github.com/parkervcp/eggs/pull/1210#issuecomment-871663016 --- README.md | 2 +- minecraft/README.md | 2 +- minecraft/proxy/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index efaa7a55..a18aa3e7 100644 --- a/README.md +++ b/README.md @@ -139,8 +139,8 @@ If you are reading this it looks like you are looking to add an egg to your serv * [FlameCord](/minecraft/proxy/java/flamecord) * [Travertine](/minecraft/proxy/java/travertine) * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) - * [VIAaaS](/minecraft/proxy/java/viaaas) * [Velocity](/minecraft/proxy/java/velocity) + * [VIAaaS](/minecraft/proxy/java/viaaas) * [Waterfall](/minecraft/proxy/java/waterfall) * [Cross Platform](/minecraft/proxy/cross_platform) * [GeyserMC](/minecraft/proxy/cross_platform/geyser) diff --git a/minecraft/README.md b/minecraft/README.md index 8b7644b3..eec1eeec 100644 --- a/minecraft/README.md +++ b/minecraft/README.md @@ -31,8 +31,8 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [FlameCord](/minecraft/proxy/java/flamecord) * [Travertine](/minecraft/proxy/java/travertine) * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) - * [VIAaaS](/minecraft/proxy/java/viaaas) * [Velocity](/minecraft/proxy/java/velocity) + * [VIAaaS](/minecraft/proxy/java/viaaas) * [Waterfall](/minecraft/proxy/java/waterfall) * [Cross Platform](/minecraft/proxy/cross_platform) * [GeyserMC](/minecraft/proxy/cross_platform/geyser) diff --git a/minecraft/proxy/README.md b/minecraft/proxy/README.md index a58c2562..b0364aaa 100644 --- a/minecraft/proxy/README.md +++ b/minecraft/proxy/README.md @@ -4,8 +4,8 @@ * [FlameCord](/minecraft/proxy/java/flamecord) * [Travertine](/minecraft/proxy/java/travertine) * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) - * [VIAaaS](/minecraft/proxy/java/viaaas) * [Velocity](/minecraft/proxy/java/velocity) + * [VIAaaS](/minecraft/proxy/java/viaaas) * [Waterfall](/minecraft/proxy/java/waterfall) * [Cross Platform](/minecraft/proxy/cross_platform) * [GeyserMC](/minecraft/proxy/cross_platform/geyser) From 4f3be0e204ba4d0512a0963704ab15ca409a2eba Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 4 Jul 2021 00:40:55 +0300 Subject: [PATCH 8/9] patch: bedrock latest version fetching --- minecraft/bedrock/bedrock/egg-vanilla-bedrock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/minecraft/bedrock/bedrock/egg-vanilla-bedrock.json b/minecraft/bedrock/bedrock/egg-vanilla-bedrock.json index c14216e1..31507ac9 100644 --- a/minecraft/bedrock/bedrock/egg-vanilla-bedrock.json +++ b/minecraft/bedrock/bedrock/egg-vanilla-bedrock.json @@ -4,7 +4,7 @@ "version": "PTDL_v1", "update_url": null }, - "exported_at": "2021-04-07T08:57:04+03:00", + "exported_at": "2021-07-04T00:38:57+03:00", "name": "Vanilla Bedrock", "author": "parker@parkervcp.com", "description": "Bedrock Edition (also known as the Bedrock Version, Bedrock Codebase, Bedrock Engine or just Bedrock) refers to the multi-platform family of editions of Minecraft developed by Mojang AB, Microsoft Studios, 4J Studios, and SkyBox Labs. Prior to this term, as the engine originated with Pocket Edition, this entire product family was referred to as \"Pocket Edition\", \"MCPE\", or \"Pocket\/Windows 10 Edition\".", @@ -22,7 +22,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y zip unzip wget curl\r\n\r\nif [ ! -d \/mnt\/server\/ ]; then\r\n mkdir \/mnt\/server\/\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\nif [ -z \"${BEDROCK_VERSION}\" ] || [ \"${BEDROCK_VERSION}\" == \"latest\" ]; then\r\n echo -e \"\\n Downloading latest Bedrock server\"\r\n DOWNLOAD_URL=$(curl -sSL https:\/\/www.minecraft.net\/en-us\/download\/server\/bedrock\/ | grep azureedge | grep linux | grep -Eo \"(http|https):\/\/[a-zA-Z0-9.\/?=_-]*\")\r\nelse \r\n echo -e \"\\n Downloading ${BEDROCK_VERSION} Bedrock server\"\r\n DOWNLOAD_URL=https:\/\/minecraft.azureedge.net\/bin-linux\/bedrock-server-$BEDROCK_VERSION.zip\r\nfi\r\n\r\necho -e \"backing up config files\"\r\nrm *.bak\r\ncp server.properties server.properties.bak\r\ncp permissions.json permissions.json.bak\r\ncp whitelist.json whitelist.json.bak\r\n\r\necho -e \"Downloading files from https:\/\/minecraft.azureedge.net\/bin-linux\/bedrock-server-$BEDROCK_VERSION.zip\"\r\n\r\nwget ${DOWNLOAD_URL}\r\n\r\necho -e \"Unpacking server files\"\r\nunzip -o $(echo ${DOWNLOAD_URL} | cut -d\"\/\" -f5)\r\n\r\necho -e \"Cleaning up after installing\"\r\nrm $(echo ${DOWNLOAD_URL} | cut -d\"\/\" -f5)\r\n\r\necho -e \"restoring config files\"\r\ncp -rf server.properties.bak server.properties\r\ncp -rf permissions.json.bak permissions.json\r\ncp -rf whitelist.json.bak whitelist.json\r\nchmod +x bedrock_server\r\n\r\necho -e \"Done\"", + "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y zip unzip wget curl\r\n\r\nif [ ! -d \/mnt\/server\/ ]; then\r\n mkdir \/mnt\/server\/\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n# Minecraft CDN Akamai blocks script user-agents\r\nRANDVERSION=$(echo $((1 + $RANDOM % 4000)))\r\n\r\nif [ -z \"${BEDROCK_VERSION}\" ] || [ \"${BEDROCK_VERSION}\" == \"latest\" ]; then\r\n echo -e \"\\n Downloading latest Bedrock server\"\r\n curl -L -A \"Mozilla\/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit\/537.36 (KHTML, like Gecko) Chrome\/90.0.$RANDVERSION.212 Safari\/537.36\" -H \"Accept-Language: en\" -H \"Accept-Encoding: gzip, deflate\" -o versions.html.gz https:\/\/www.minecraft.net\/en-us\/download\/server\/bedrock\r\n DOWNLOAD_URL=$(zgrep -o 'https:\/\/minecraft.azureedge.net\/bin-linux\/[^\"]*' versions.html.gz)\r\nelse \r\n echo -e \"\\n Downloading ${BEDROCK_VERSION} Bedrock server\"\r\n DOWNLOAD_URL=https:\/\/minecraft.azureedge.net\/bin-linux\/bedrock-server-$BEDROCK_VERSION.zip\r\nfi\r\n\r\nDOWNLOAD_FILE=$(echo ${DOWNLOAD_URL} | cut -d\"\/\" -f5) # Retrieve archive name\r\n\r\necho -e \"backing up config files\"\r\nrm *.bak versions.html.gz\r\ncp server.properties server.properties.bak\r\ncp permissions.json permissions.json.bak\r\ncp whitelist.json whitelist.json.bak\r\n\r\necho -e \"Downloading files from: $DOWNLOAD_URL\"\r\n\r\ncurl -L -A \"Mozilla\/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit\/537.36 (KHTML, like Gecko) Chrome\/90.0.$RANDVERSION.212 Safari\/537.36\" -H \"Accept-Language: en\" -o $DOWNLOAD_FILE $DOWNLOAD_URL\r\n\r\necho -e \"Unpacking server files\"\r\nunzip -o $DOWNLOAD_FILE\r\n\r\necho -e \"Cleaning up after installing\"\r\nrm $DOWNLOAD_FILE\r\n\r\necho -e \"restoring backup config files - on first install there will be file not found errors which you can ignore.\"\r\ncp -rf server.properties.bak server.properties\r\ncp -rf permissions.json.bak permissions.json\r\ncp -rf whitelist.json.bak whitelist.json\r\n\r\nchmod +x bedrock_server\r\n\r\necho -e \"Install Completed\"", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -83,4 +83,4 @@ "rules": "required|string|in:true,false" } ] -} +} \ No newline at end of file From 4de5642e2b34e29668580ded4b8c3a9d710a748a Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 4 Jul 2021 17:19:02 +0300 Subject: [PATCH 9/9] add: new Github issue templates --- .github/ISSUE_TEMPLATE/bug-report.yml | 78 ++++++++++++++++++++++++++ .github/ISSUE_TEMPLATE/bugs.md | 24 -------- .github/ISSUE_TEMPLATE/config.yml | 5 ++ .github/ISSUE_TEMPLATE/egg-request.yml | 49 ++++++++++++++++ .github/ISSUE_TEMPLATE/request.md | 19 ------- 5 files changed, 132 insertions(+), 43 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/bug-report.yml delete mode 100644 .github/ISSUE_TEMPLATE/bugs.md create mode 100644 .github/ISSUE_TEMPLATE/config.yml create mode 100644 .github/ISSUE_TEMPLATE/egg-request.yml delete mode 100644 .github/ISSUE_TEMPLATE/request.md diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml new file mode 100644 index 00000000..5ef1390c --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -0,0 +1,78 @@ +name: 🐛 Bug Report +description: Report an issue for an egg +title: "[Bug]: " +labels: [Bug] +body: + - type: markdown + attributes: + value: | + If you see any of the following, go to [Discord](https://discord.gg/pterodactyl) and report your error in a support channel. + * `A fatal error was encountered while starting this server.` + * `No server egg configuration could be located; aborting startup.` + - type: input + id: panel-version + attributes: + label: Panel Version + description: Version number of your Panel (latest is not a version) + placeholder: 1.x.x + validations: + required: true + - type: input + id: wings-version + attributes: + label: Wings Version + description: Version number of your Wings (latest is not a version) + placeholder: 1.x.x + validations: + required: true + - type: input + id: service + attributes: + label: Service + description: Service you are experiencing issues with + placeholder: minecraft/factorio/etc + validations: + required: true + - type: dropdown + id: modified + attributes: + label: Modified + description: Did you add or change things, this includes startup configs/install scripts/variables + options: + - Yes, I modified the egg (will provide details below) + - No, I did not modify the egg + validations: + required: true + - type: textarea + id: expected-behavior + attributes: + label: Expected Behavior + description: What did you expect to happen + placeholder: Install the server, start it, play + validations: + required: true + - type: textarea + id: actual-behavior + attributes: + label: Actual Behavior + description: What actually happened instead + placeholder: Server crashed with error X + validations: + required: true + - type: textarea + id: reproduce-steps + attributes: + label: Steps To Reproduce + description: Step by step what to do to cause the issue + placeholder: | + Step 1 Set version to latest + Step 2 install + Step 3 Receive error X or Y + validations: + required: true + - type: textarea + id: logs + attributes: + label: Relevant log output + description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. + render: shell \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/bugs.md b/.github/ISSUE_TEMPLATE/bugs.md deleted file mode 100644 index 759830d8..00000000 --- a/.github/ISSUE_TEMPLATE/bugs.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -name: "\U0001F41B Bug Report" -about: Report an issue for an egg - ---- - -# If you are seeing any of the following go to Discord and port your error in a support channel. - * `A fatal error was encountered while starting this server.` - * `No server egg configuration could be located; aborting startup.` - -Please fill out the information bellow and remove from the line up -If you just submit a bug with no info I will close out your bug. ---------------- - -Panel Version: (version number) -Daemon Version: (version number) -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) \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 00000000..51392286 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: ❓ Discord + url: https://discord.gg/pterodactyl + about: Please visit our Discord for support with configuration issues. diff --git a/.github/ISSUE_TEMPLATE/egg-request.yml b/.github/ISSUE_TEMPLATE/egg-request.yml new file mode 100644 index 00000000..4a144ed2 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/egg-request.yml @@ -0,0 +1,49 @@ +name: 🎮 Game Request +description: Suggest a server to build an egg for +title: "[Egg Request]: " +body: + - type: markdown + attributes: + value: | + Make sure there are no existing egg requests by searching the repository issues. Please understand how Pterodactyl works when you are requesting an egg. (ie. docker-compose doesn't work for a pterodactyl server) + - type: input + id: service + attributes: + label: Service + description: Service you are experiencing issues with + placeholder: minecraft/factorio/etc + validations: + required: true + - type: dropdown + id: expand + attributes: + label: Does this expand an already existing service + options: + - "Yes" + - "No" + validations: + required: true + - type: input + id: game-link + attributes: + label: Link to game + placeholder: minecraft.net/factorio.com/etc + validations: + required: true + - type: input + id: download-link + attributes: + label: Links for server downloads + description: This needs to be an official link and not one that is hosted on some forum page or a personal Github page. + validations: + required: true + validations: + required: true + - type: input + id: instruction-link + attributes: + label: Links for the install docs + description: Link to install instructions or documentation based on which the server can be created + placeholder: Install the server, start it, play + validations: + required: true diff --git a/.github/ISSUE_TEMPLATE/request.md b/.github/ISSUE_TEMPLATE/request.md deleted file mode 100644 index 1590d3a8..00000000 --- a/.github/ISSUE_TEMPLATE/request.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -name: "\U0001F3AE Game Request" -about: Suggest a server to build an egg for - ---- - -Please fill out the information bellow and remove from the line up -Please understand how Pterodactyl works when you are requesting an egg. (ie. docker-compose doesn't work for a pterodactyl server) ---------------- - -Service: (Ex. minecraft/factorio/etc) - -Does this expand an already existing service: Y/N - -Link to game: (Ex. minecraft.net/factorio.com/etc) - -Links for server downloads: This needs to be an official link and not one that is hosted on some forum page or a personal github page. - -Links for install steps/docs: