From a8eb19829b6a54c2dc21010d855a6af3ebd11f4a Mon Sep 17 00:00:00 2001 From: jonathan <12849750+JonathanTF2@users.noreply.github.com> Date: Tue, 13 Oct 2020 15:42:55 +0100 Subject: [PATCH 001/104] Add TF2C egg config. --- .../egg-team-fortress2-classic.json | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 steamcmd_servers/tf2_classic/egg-team-fortress2-classic.json diff --git a/steamcmd_servers/tf2_classic/egg-team-fortress2-classic.json b/steamcmd_servers/tf2_classic/egg-team-fortress2-classic.json new file mode 100644 index 000000000..3679525f1 --- /dev/null +++ b/steamcmd_servers/tf2_classic/egg-team-fortress2-classic.json @@ -0,0 +1,72 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2020-10-13T15:32:28+01:00", + "name": "Team Fortress 2 Classic", + "author": "eggs@scattergun.io", + "description": "Team Fortress 2 Classic is a free mod of the 2007 game Team Fortress 2, developed by Eminoma and utilizing the Source engine.", + "image": "quay.io\/parkervcp\/pterodactyl-images:debian_base", + "startup": ".\/srcds_run -game {{SRCDS_GAME}} -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} +ip {{SERVER_IP}} -strictportbind -norestart -debug +maxplayers {{MAXPLAYERS}}", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"gameserver Steam ID\",\r\n \"userInteraction\": []\r\n}", + "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "stop": "quit" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates p7zip-full wget \r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## download TF2C from website\r\ncd \/mnt\/server\r\nwget -v https:\/\/chapo.services\/tf2c\/tf2classic-${GAMEVERSION}.7z -O tf2classic.7z\r\n7z x tf2classic.7z -y\r\n\r\n## fix issue \/w symlink\r\ncd \/mnt\/server\/bin\r\nln -s vphysics_srv.so vphysics.so\r\nln -s studiorender_srv.so studiorender.so\r\nln -s soundemittersystem_srv.so soundemittersystem.so\r\nln -s shaderapiempty_srv.so shaderapiempty.so\r\nln -s scenefilecache_srv.so scenefilecache.so\r\nln -s replay_srv.so replay.so\r\nln -s materialsystem_srv.so materialsystem.so", + "container": "ubuntu:18.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Game ID", + "description": "The ID corresponding to the game to download and run using SRCDS.", + "env_variable": "SRCDS_APPID", + "default_value": "244310", + "user_viewable": true, + "user_editable": false, + "rules": "required|regex:\/^(244310)$\/" + }, + { + "name": "Game Name", + "description": "The name corresponding to the game to download and run using SRCDS.", + "env_variable": "SRCDS_GAME", + "default_value": "tf2classic", + "user_viewable": true, + "user_editable": false, + "rules": "required|regex:\/^(tf2classic)$\/" + }, + { + "name": "Default Map", + "description": "The default map to use when starting the server.", + "env_variable": "SRCDS_MAP", + "default_value": "ctf_2fort", + "user_viewable": true, + "user_editable": true, + "rules": "required|regex:\/^(\\w{1,20})$\/" + }, + { + "name": "Game Version", + "description": "Version of TF2C to download.", + "env_variable": "GAMEVERSION", + "default_value": "2.0.1", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + }, + { + "name": "Max Players", + "description": "The maximum amount of players allowed on the server.", + "env_variable": "MAXPLAYERS", + "default_value": "24", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + } + ] +} From be6a08abb11862b94fc46bd9b8b7f0dd6418edb9 Mon Sep 17 00:00:00 2001 From: jonathan <12849750+JonathanTF2@users.noreply.github.com> Date: Tue, 13 Oct 2020 15:44:06 +0100 Subject: [PATCH 002/104] Rename steamcmd_servers/tf2_classic/egg-team-fortress2-classic.json to steamcmd_servers/team_fortress_2_classic/egg-team-fortress-2-classic.json --- .../egg-team-fortress-2-classic.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename steamcmd_servers/{tf2_classic/egg-team-fortress2-classic.json => team_fortress_2_classic/egg-team-fortress-2-classic.json} (100%) diff --git a/steamcmd_servers/tf2_classic/egg-team-fortress2-classic.json b/steamcmd_servers/team_fortress_2_classic/egg-team-fortress-2-classic.json similarity index 100% rename from steamcmd_servers/tf2_classic/egg-team-fortress2-classic.json rename to steamcmd_servers/team_fortress_2_classic/egg-team-fortress-2-classic.json From 83fc1023e2c814c517c42eb986705a09310b2d6c Mon Sep 17 00:00:00 2001 From: jonathan <12849750+JonathanTF2@users.noreply.github.com> Date: Tue, 13 Oct 2020 15:44:26 +0100 Subject: [PATCH 003/104] Added TF2C to the readme. --- steamcmd_servers/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/steamcmd_servers/README.md b/steamcmd_servers/README.md index 36118d51a..cea7345a3 100644 --- a/steamcmd_servers/README.md +++ b/steamcmd_servers/README.md @@ -70,6 +70,9 @@ This is a collection of servers that use steamcmd to install. ## Sven coop [svencoop](svencoop) +## Team Fortress 2 Classic +[Team Fortress 2 Classic](team_fortress_2_classic) + ## Tower Unite [Tower Unite](tower_unite) From b96e46c4ef2d03a258f37a4d8551a65128656216 Mon Sep 17 00:00:00 2001 From: jonathan <12849750+JonathanTF2@users.noreply.github.com> Date: Tue, 13 Oct 2020 15:45:18 +0100 Subject: [PATCH 004/104] Added TF2C to repo readme. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6a8b5177d..d09f3e5ab 100644 --- a/README.md +++ b/README.md @@ -145,6 +145,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Stationeers](/steamcmd_servers/stationeers/) * [Sven Co-op](/steamcmd_servers/svencoop) * [Squad](/steamcmd_servers/squad/) +* [Team Fortress 2 Classic](/steamcmd_servers/team_fortress_2_classic/) * [Unturned](/steamcmd_servers/unturned/) * [Unturned](/steamcmd_servers/unturned/unturned/) From 457bc89e24077507958cfee853606e2121012d23 Mon Sep 17 00:00:00 2001 From: jonathan <12849750+JonathanTF2@users.noreply.github.com> Date: Tue, 13 Oct 2020 15:47:57 +0100 Subject: [PATCH 005/104] Create README.md --- steamcmd_servers/team_fortress_2_classic/README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 steamcmd_servers/team_fortress_2_classic/README.md diff --git a/steamcmd_servers/team_fortress_2_classic/README.md b/steamcmd_servers/team_fortress_2_classic/README.md new file mode 100644 index 000000000..2a71916ec --- /dev/null +++ b/steamcmd_servers/team_fortress_2_classic/README.md @@ -0,0 +1,12 @@ +# Team Fortress 2 Classic + +From their [Website](https://tf2classic.com) +Team Fortress 2 Classic is a re-imagining of the 2008-2009 era of the original Team Fortress 2, of which is what we consider the "Classic Era", featuring old features that were scrapped and worked upon, or new content such as new weapons and gamemodes. + +### Server Ports +TF2C servers require 1 port to be open. + +| Port | default | +|-----------|---------| +| Game/rcon | 27015 | +| SourceTV | 27020 | From 175a846c0909ebd58d3ddbc196efd512cce4baf1 Mon Sep 17 00:00:00 2001 From: jonathan <12849750+JonathanTF2@users.noreply.github.com> Date: Tue, 13 Oct 2020 15:48:05 +0100 Subject: [PATCH 006/104] Update README.md --- steamcmd_servers/team_fortress_2_classic/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/steamcmd_servers/team_fortress_2_classic/README.md b/steamcmd_servers/team_fortress_2_classic/README.md index 2a71916ec..6709edc26 100644 --- a/steamcmd_servers/team_fortress_2_classic/README.md +++ b/steamcmd_servers/team_fortress_2_classic/README.md @@ -1,6 +1,7 @@ # Team Fortress 2 Classic From their [Website](https://tf2classic.com) + Team Fortress 2 Classic is a re-imagining of the 2008-2009 era of the original Team Fortress 2, of which is what we consider the "Classic Era", featuring old features that were scrapped and worked upon, or new content such as new weapons and gamemodes. ### Server Ports From cb99ba945b88fdd03a992c20d2178ed127134a05 Mon Sep 17 00:00:00 2001 From: jonathan <12849750+JonathanTF2@users.noreply.github.com> Date: Tue, 13 Oct 2020 15:48:23 +0100 Subject: [PATCH 007/104] Update README.md --- steamcmd_servers/team_fortress_2_classic/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/steamcmd_servers/team_fortress_2_classic/README.md b/steamcmd_servers/team_fortress_2_classic/README.md index 6709edc26..6de62e021 100644 --- a/steamcmd_servers/team_fortress_2_classic/README.md +++ b/steamcmd_servers/team_fortress_2_classic/README.md @@ -1,6 +1,6 @@ # Team Fortress 2 Classic -From their [Website](https://tf2classic.com) +## From their [Website](https://tf2classic.com) Team Fortress 2 Classic is a re-imagining of the 2008-2009 era of the original Team Fortress 2, of which is what we consider the "Classic Era", featuring old features that were scrapped and worked upon, or new content such as new weapons and gamemodes. From edccca9312610331ce3bbea7153edc335d6ddfdb Mon Sep 17 00:00:00 2001 From: jonathan <12849750+JonathanTF2@users.noreply.github.com> Date: Tue, 13 Oct 2020 15:50:14 +0100 Subject: [PATCH 008/104] Update README.md --- steamcmd_servers/team_fortress_2_classic/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/steamcmd_servers/team_fortress_2_classic/README.md b/steamcmd_servers/team_fortress_2_classic/README.md index 6de62e021..410bc7422 100644 --- a/steamcmd_servers/team_fortress_2_classic/README.md +++ b/steamcmd_servers/team_fortress_2_classic/README.md @@ -5,7 +5,7 @@ Team Fortress 2 Classic is a re-imagining of the 2008-2009 era of the original Team Fortress 2, of which is what we consider the "Classic Era", featuring old features that were scrapped and worked upon, or new content such as new weapons and gamemodes. ### Server Ports -TF2C servers require 1 port to be open. +TF2C servers require 1 port to be open, the SourceTV port can also be opened for spectators. | Port | default | |-----------|---------| From fe9154976919ddd67d38889c390c21c059dc4b6e Mon Sep 17 00:00:00 2001 From: Aaronstar-McClure Date: Tue, 3 Nov 2020 20:13:20 -0500 Subject: [PATCH 009/104] add minetest (egg by niansa) --- README.md | 2 ++ minetest/README.md | 3 +++ minetest/egg-minetest.json | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 minetest/README.md create mode 100644 minetest/egg-minetest.json diff --git a/README.md b/README.md index 8fcfa050f..654535236 100644 --- a/README.md +++ b/README.md @@ -85,6 +85,8 @@ If you are reading this it looks like you are looking to add an egg to your serv [Mindustry](/mindustry/) +[Minetest](/minetest/) (including MTG) + [Minecraft](/minecraft/) * [Bedrock](/minecraft/bedrock/) * [Bedrock](/minecraft/bedrock/bedrock/) diff --git a/minetest/README.md b/minetest/README.md new file mode 100644 index 000000000..591733ca1 --- /dev/null +++ b/minetest/README.md @@ -0,0 +1,3 @@ +# Minetest + +An open source voxel game engine. Play one of our many games, mod a game to your liking, make your own game, or play on a multiplayer server. diff --git a/minetest/egg-minetest.json b/minetest/egg-minetest.json new file mode 100644 index 000000000..f648a4b22 --- /dev/null +++ b/minetest/egg-minetest.json @@ -0,0 +1,36 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2020-11-02T22:59:26-05:00", + "name": "Minetest", + "author": "support@pterodactyl.io", + "description": "An open source voxel game engine. Play one of our many games, mod a game to your liking, make your own game, or play on a multiplayer server.", + "image": "quay.io\/parkervcp\/pterodactyl-images:base_ubuntu", + "startup": ".\/bin\/minetestserver --port {{SERVER_PORT}}", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \" listening on \",\r\n \"userInteraction\": []\r\n}", + "logs": "{\r\n \"custom\": false,\r\n \"location\": \"debug.txt\"\r\n}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# Minetest Installation Script\r\ncd \/mnt\/server &&\r\n\r\n# Install installation dependencies\r\napt update &&\r\napt -y install unzip wget build-essential libirrlicht-dev cmake libbz2-dev libjpeg-dev libxxf86vm-dev libsqlite3-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev luajit libncurses5-dev &&\r\n#touch test &&\r\n\r\n# Download, compile and prepare the engine\r\nwget -Osrc.zip https:\/\/github.com\/minetest\/minetest\/archive\/\"${MTVERSION}\".zip &&\r\nunzip .\/src.zip &&\r\nrm .\/src.zip &&\r\ncd .\/minetest-\"${MTVERSION}\" &&\r\ncmake . -DRUN_IN_PLACE=TRUE -DBUILD_CLIENT=FALSE -DBUILD_SERVER=TRUE -DENABLE_GLES=OFF -DENABLE_POSTGRESQL=OFF -DENABLE_REDIS=OFF -DENABLE_SOUND=OFF -DENABLE_LEVELDB=OFF -DENABLE_SPATIAL=OFF &&\r\nmake -j$(nproc) &&\r\nmake package &&\r\nmv .\/minetest-\"${MTVERSION}\"-linux.tar.gz ..\/ &&\r\ncd .. &&\r\nrm -rf .\/minetest-\"${MTVERSION}\" &&\r\ntar xfz .\/minetest-\"${MTVERSION}\"-linux.tar.gz &&\r\nrm minetest-\"${MTVERSION}\"-linux.tar.gz &&\r\nmv .\/minetest-\"${MTVERSION}\"-linux\/* .\/ &&\r\nrm -rf minetest-\"${MTVERSION}\"-linux &&\r\ntouch .\/minetest.conf &&\r\n\r\n# Download and prepare the game\r\ncd .\/games &&\r\nwget -Ominetest_game.zip https:\/\/github.com\/minetest\/minetest_game\/archive\/\"${MTVERSION}\".zip &&\r\nunzip minetest_game.zip &&\r\n#rm minetest_game.zip &&\r\nmv minetest_game-\"${MTVERSION}\" minetest_game &&\r\ncd .. &&\r\n\r\n# Clean up a bit\r\nrm -rf clientmods unix doc client fonts textures &&\r\n\r\n# Done!\r\necho \"Installation was successfully completed!\"", + "container": "ubuntu:18.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Version", + "description": "The version of MT to install. Releases only", + "env_variable": "MTVERSION", + "default_value": "5.3.0", + "user_viewable": false, + "user_editable": true, + "rules": "required|string|max:10" + } + ] +} \ No newline at end of file From 5d0378c8d37b5f148369385ab376647bcd81c26e Mon Sep 17 00:00:00 2001 From: Tin Date: Wed, 4 Nov 2020 15:24:47 +0100 Subject: [PATCH 010/104] Allow EXILED Modification to run Auto Updater I'm proposing this change as it will add an Environment Variable used by the EXILED (a Popular SCP:SL Mods Framework) to run its auto updater. Otherwise, the user could run into an issue with his server not starting. I know this is normally not used to support modifications. But as this is only an environment variable I will propose the change anyway. --- steamcmd_servers/scpsl/dedicated/egg-scpsl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/steamcmd_servers/scpsl/dedicated/egg-scpsl.json b/steamcmd_servers/scpsl/dedicated/egg-scpsl.json index fff58d92f..2b35ab93e 100644 --- a/steamcmd_servers/scpsl/dedicated/egg-scpsl.json +++ b/steamcmd_servers/scpsl/dedicated/egg-scpsl.json @@ -8,7 +8,7 @@ "author": "info@goover.de", "description": "Egg for SCP: Secret Laboratory Dedicated Linux Server", "image": "quay.io\/parkervcp\/pterodactyl-images:debian_mono-5-complete", - "startup": ".\/LocalAdmin {{SERVER_PORT}}", + "startup": "export DOTNET_BUNDLE_EXTRACT_BASE_DIR=.\/dotnet-bundle && .\/LocalAdmin {{SERVER_PORT}}", "config": { "files": "{\r\n \"config_gameplay.txt\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"server_ip\": \"0.0.0.0\",\r\n \"forward_ports\": \"false\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Waiting for players..\",\r\n \"userInteraction\": []\r\n}", @@ -33,4 +33,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From 51c8a80dd7e7911b6cd7547d344a2b32b383cad8 Mon Sep 17 00:00:00 2001 From: Tin Date: Thu, 5 Nov 2020 01:09:24 +0100 Subject: [PATCH 011/104] Update egg-scpsl.json --- steamcmd_servers/scpsl/dedicated/egg-scpsl.json | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/steamcmd_servers/scpsl/dedicated/egg-scpsl.json b/steamcmd_servers/scpsl/dedicated/egg-scpsl.json index 2b35ab93e..2f135fe54 100644 --- a/steamcmd_servers/scpsl/dedicated/egg-scpsl.json +++ b/steamcmd_servers/scpsl/dedicated/egg-scpsl.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-01-29T19:54:33+01:00", + "exported_at": "2020-11-05T01:08:38+01:00", "name": "SCP:SL", "author": "info@goover.de", "description": "Egg for SCP: Secret Laboratory Dedicated Linux Server", "image": "quay.io\/parkervcp\/pterodactyl-images:debian_mono-5-complete", - "startup": "export DOTNET_BUNDLE_EXTRACT_BASE_DIR=.\/dotnet-bundle && .\/LocalAdmin {{SERVER_PORT}}", + "startup": ".\/LocalAdmin {{SERVER_PORT}}", "config": { "files": "{\r\n \"config_gameplay.txt\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"server_ip\": \"0.0.0.0\",\r\n \"forward_ports\": \"false\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Waiting for players..\",\r\n \"userInteraction\": []\r\n}", @@ -28,9 +28,18 @@ "description": "", "env_variable": "SRCDS_APPID", "default_value": "996560", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "required|string|max:20" + }, + { + "name": "Dotnet Bundle", + "description": "Only used for EXILED Framework Updater.", + "env_variable": "DOTNET_BUNDLE_EXTRACT_BASE_DIR", + "default_value": ".\/dotnet-bundle", + "user_viewable": false, + "user_editable": false, + "rules": "required|string" } ] } From 3a1d3c3353981d2a7ded3c6411b7ef09166c57a1 Mon Sep 17 00:00:00 2001 From: Philipp Kraft Date: Fri, 6 Nov 2020 20:11:33 +0100 Subject: [PATCH 012/104] Add new circular server logo --- stock-eggs/rust/egg-rust.json | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/stock-eggs/rust/egg-rust.json b/stock-eggs/rust/egg-rust.json index bd3ea90ff..67e7f046d 100644 --- a/stock-eggs/rust/egg-rust.json +++ b/stock-eggs/rust/egg-rust.json @@ -8,7 +8,7 @@ "author": "support@pterodactyl.io", "description": "The only aim in Rust is to survive. To do this you will need to overcome struggles such as hunger, thirst and cold. Build a fire. Build a shelter. Kill animals for meat. Protect yourself from other players, and kill them for meat. Create alliances with other players and form a town. Do whatever it takes to survive.", "image": "quay.io\/pterodactyl\/core:rust", - "startup": ".\/RustDedicated -batchmode +server.port {{SERVER_PORT}} +server.identity \"rust\" +rcon.port {{RCON_PORT}} +rcon.web true +server.hostname \\\"{{HOSTNAME}}\\\" +server.level \\\"{{LEVEL}}\\\" +server.description \\\"{{DESCRIPTION}}\\\" +server.url \\\"{{SERVER_URL}}\\\" +server.headerimage \\\"{{SERVER_IMG}}\\\" +server.worldsize \\\"{{WORLD_SIZE}}\\\" +server.seed \\\"{{WORLD_SEED}}\\\" +server.maxplayers {{MAX_PLAYERS}} +rcon.password \\\"{{RCON_PASS}}\\\" +server.saveinterval {{SAVEINTERVAL}} +app.port {{APP_PORT}}{{ADDITIONAL_ARGS}}", + "startup": ".\/RustDedicated -batchmode +server.port {{SERVER_PORT}} +server.identity \"rust\" +rcon.port {{RCON_PORT}} +rcon.web true +server.hostname \\\"{{HOSTNAME}}\\\" +server.level \\\"{{LEVEL}}\\\" +server.description \\\"{{DESCRIPTION}}\\\" +server.url \\\"{{SERVER_URL}}\\\" +server.headerimage \\\"{{SERVER_IMG}}\\\" +server.logoimage \\\"{{SERVER_LOGO}}\\\" +server.worldsize \\\"{{WORLD_SIZE}}\\\" +server.seed \\\"{{WORLD_SEED}}\\\" +server.maxplayers {{MAX_PLAYERS}} +rcon.password \\\"{{RCON_PASS}}\\\" +server.saveinterval {{SAVEINTERVAL}} +app.port {{APP_PORT}}{{ADDITIONAL_ARGS}}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Server startup complete\",\r\n \"userInteraction\": []\r\n}", @@ -104,6 +104,15 @@ "user_editable": true, "rules": "nullable|url" }, + { + "name": "Server Logo", + "description": "The circular server logo for the Rust+ app.", + "env_variable": "SERVER_LOGO", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|url" + }, { "name": "RCON Port", "description": "Port for RCON connections.", @@ -140,7 +149,7 @@ "user_editable": true, "rules": "nullable|string" }, - { + { "name": "App Port", "description": "Port for the Rust+ App. -1 to disable.", "env_variable": "APP_PORT", @@ -150,4 +159,4 @@ "rules": "required|integer" } ] -} \ No newline at end of file +} From 4ede54de79ab66e67e608a342e1b9f8000daef0d Mon Sep 17 00:00:00 2001 From: tmunsch Date: Tue, 10 Nov 2020 04:13:51 -0500 Subject: [PATCH 013/104] Egg for Fabric Minecraft Fabric is a modular modding toolchain targeting Minecraft 1.14 and above, including snapshots. --- minecraft/java/fabric/egg-fabric.json | 48 +++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 minecraft/java/fabric/egg-fabric.json diff --git a/minecraft/java/fabric/egg-fabric.json b/minecraft/java/fabric/egg-fabric.json new file mode 100644 index 000000000..29fe81a43 --- /dev/null +++ b/minecraft/java/fabric/egg-fabric.json @@ -0,0 +1,48 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2020-11-10T04:10:30-05:00", + "name": "Fabric", + "author": "accounts@bofanodes.io", + "description": "Fabric is a modular modding toolchain targeting Minecraft 1.14 and above, including snapshots.", + "features": [ + "eula" + ], + "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 }\r\n }\r\n}", + "startup": "{\r\n \"done\": \")! For help, type \",\r\n \"userInteraction\": [\r\n \"Go to eula.txt for more info.\"\r\n ]\r\n}", + "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "stop": "stop" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# Fabric MC Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq unzip dos2unix wget\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\nwget https:\/\/maven.fabricmc.net\/net\/fabricmc\/fabric-installer\/$FABRIC_VERSION\/fabric-installer-$FABRIC_VERSION.jar\r\njava -jar fabric-installer-$FABRIC_VERSION.jar server -downloadMinecraft\r\necho -e \"Install Complete\"", + "container": "openjdk:8-jdk-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Server Jar File", + "description": "The name of the server jarfile to run the server with.", + "env_variable": "SERVER_JARFILE", + "default_value": "fabric-server-launch.jar", + "user_viewable": true, + "user_editable": true, + "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" + }, + { + "name": "Fabric Version", + "description": "The version of Fabric to install.", + "env_variable": "FABRIC_VERSION", + "default_value": "0.6.1.51", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|between:3,15" + } + ] +} From f8e27e11153759877fbc1c916716c9c43220d270 Mon Sep 17 00:00:00 2001 From: tmunsch Date: Tue, 10 Nov 2020 04:19:56 -0500 Subject: [PATCH 014/104] Create README.MD Readme for Fabric --- minecraft/java/fabric/README.MD | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 minecraft/java/fabric/README.MD diff --git a/minecraft/java/fabric/README.MD b/minecraft/java/fabric/README.MD new file mode 100644 index 000000000..745eced2a --- /dev/null +++ b/minecraft/java/fabric/README.MD @@ -0,0 +1,11 @@ +# Fabric + +Fabric is a lightweight, experimental modding toolchain for Minecraft. + +## Server Ports +The fabric server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. + + +| Port | default | +|-------|---------| +| Game | 25565 | From be605edf4273c0443ece3bf9bd43107e28a8f340 Mon Sep 17 00:00:00 2001 From: tmunsch Date: Tue, 10 Nov 2020 04:23:32 -0500 Subject: [PATCH 015/104] Added Fabric MC added Fabric Egg --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8fcfa050f..77ae2547e 100644 --- a/README.md +++ b/README.md @@ -94,6 +94,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Java](/minecraft/java/) Servers for Java Minecraft * [Cuberite](/minecraft/java/cuberite/) + * [fabric](/minecraft/java/fabric) * [feather](/minecraft/feather/) * [Feed The Beast](/minecraft/java/ftb/) * [Forge](/minecraft/java/forge/) @@ -174,4 +175,4 @@ If you are reading this it looks like you are looking to add an egg to your serv [Xonotic](/xonotic/xonotic/) -[Cryofall](/cryofall/) \ No newline at end of file +[Cryofall](/cryofall/) From 7a7fde7424245b52bbf1600d129be53c043c5245 Mon Sep 17 00:00:00 2001 From: KungRaseri Date: Tue, 10 Nov 2020 11:59:16 -0700 Subject: [PATCH 016/104] Update egg-onset.json Added startup parameter `noinput`. This should fix the issue where the server stops due to a `std::runtime_error`. --- steamcmd_servers/onset/egg-onset.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/steamcmd_servers/onset/egg-onset.json b/steamcmd_servers/onset/egg-onset.json index 923fc5078..5bdd099ad 100644 --- a/steamcmd_servers/onset/egg-onset.json +++ b/steamcmd_servers/onset/egg-onset.json @@ -8,7 +8,7 @@ "author": "parker@parkervcp.com", "description": "Onset is an open world multiplayer sandbox without predefined goals. Create and host your very own experience in Onset using scripting functions. Whether that is Roleplay, Cops and Robbers or classic Freeroam. Or just enjoy the different gamemodes created by other players.", "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", - "startup": ".\/OnsetServer", + "startup": ".\/OnsetServer --noinput", "config": { "files": "{\r\n \"server_config.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"ipaddress\": \"0.0.0.0\",\r\n \"port\": \"{{server.build.default.port}}\",\r\n \"servername\": \"{{server.build.env.SERVER_NAME}}\",\r\n \"password\":\"{{server.build.env.SERVER_PASSWORD}}\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Entering simulation\",\r\n \"userInteraction\": []\r\n}", @@ -51,4 +51,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From 4460ea63853e9b1dbd688fcdcd79e154d8e3e813 Mon Sep 17 00:00:00 2001 From: Terrahost Date: Fri, 20 Nov 2020 08:30:57 -0600 Subject: [PATCH 017/104] hm yes commits --- README.md | 1 + steamcmd_servers/arma/arma3_x64/README.md | 20 +++ .../arma/arma3_x64/egg-arma3-64-bit.json | 109 ++++++++++++ .../arma/arma3_x64/egg-arma3-config/basic.cfg | 83 +++++++++ .../arma3_x64/egg-arma3-config/server.cfg | 158 ++++++++++++++++++ 5 files changed, 371 insertions(+) create mode 100644 steamcmd_servers/arma/arma3_x64/README.md create mode 100644 steamcmd_servers/arma/arma3_x64/egg-arma3-64-bit.json create mode 100644 steamcmd_servers/arma/arma3_x64/egg-arma3-config/basic.cfg create mode 100644 steamcmd_servers/arma/arma3_x64/egg-arma3-config/server.cfg diff --git a/README.md b/README.md index e451b6e55..18a3e67f0 100644 --- a/README.md +++ b/README.md @@ -103,6 +103,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Arma](/steamcmd_servers/arma/) * [Arma 3](/steamcmd_servers/arma/arma3/) * [Arma 3 HC](/steamcmd_servers/arma/arma3_headless_client/) + * [Arma 3 x64](/steamcmd_servers/arma/arma3_x64/) * [Citadel: Forged with Fire](/steamcmd_servers/citadel) * [Conan Exiles](/steamcmd_servers/conan_exiles) * [Don't Starve](/steamcmd_servers/dont_starve) diff --git a/steamcmd_servers/arma/arma3_x64/README.md b/steamcmd_servers/arma/arma3_x64/README.md new file mode 100644 index 000000000..15eb32968 --- /dev/null +++ b/steamcmd_servers/arma/arma3_x64/README.md @@ -0,0 +1,20 @@ +# Arma 3 +### From their [Site](https://arma3.com/) +Experience true combat gameplay in a massive military sandbox. Deploying a wide variety of single- and multiplayer content, over 20 vehicles and 40 weapons, and limitless opportunities for content creation, this is the PC’s premier military game. Authentic, diverse, open - Arma 3 sends you to war. + +### Minimum RAM warning +This server requires about 2048m to run properly. ARMA 3 is more CPU intensive though. + +### Additional settings +Additional server flags can be found [here](https://community.bistudio.com/wiki/Arma_3_Startup_Parameters). +This can help is you see the server using to many cores/threads on the server. + +### Server Ports +Ports required to run the server in a table format. + +| Port | default | +|---------|---------| +| Game | 2302-2306 | +| BattleEye | 2344-2345 | + +#### Mods/Plugins may require ports to be added to the server. diff --git a/steamcmd_servers/arma/arma3_x64/egg-arma3-64-bit.json b/steamcmd_servers/arma/arma3_x64/egg-arma3-64-bit.json new file mode 100644 index 000000000..a31e703d9 --- /dev/null +++ b/steamcmd_servers/arma/arma3_x64/egg-arma3-64-bit.json @@ -0,0 +1,109 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2020-11-18T10:58:51-05:00", + "name": "Arma 3 (64-bit)", + "author": "brycea@terrahost.cloud", + "description": "Experience true combat gameplay in a massive military sandbox. Deploying a wide variety of single- and multiplayer content, over 20 vehicles and 40 weapons, and limitless opportunities for content creation, this is the PC's premier military game. Authentic, diverse, open - Arma 3 sends you to war.", + "features": null, + "image": "quay.io\/terrahost\/pterodactyl-images:game_arma3_x64", + "startup": ".\/arma3server_x64 -ip=0.0.0.0 -port={{SERVER_PORT}} -profiles=.\/profiles -bepath=.\/battleye -cfg={{BASIC}} -config={{CONFIG}} {{CUSTOM}} -mod={{MODS}} -serverMod={{SERVERMODS}}", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Connected to Steam servers\",\r\n \"userInteraction\": []\r\n}", + "logs": "{\r\n \"custom\": true,\r\n \"location\": \"latest.log\"\r\n}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n## install required packages to install arma\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\r\n## install steamcmd\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\nmkdir -p \/mnt\/server\/steam\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steam\r\ncd \/mnt\/server\/steam\r\n## needs to be used for steamcmd to operate correctly\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n## install arma\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\n# 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\nchmod +x \/mnt\/server\/arma3server_x64\r\n# doesn't actually work with current 64 bit wrapper\r\nchmod +x \/mnt\/server\/arma3server", + "container": "ubuntu:20.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Game AppID", + "description": "", + "env_variable": "SRCDS_APPID", + "default_value": "233780", + "user_viewable": true, + "user_editable": false, + "rules": "required|numeric" + }, + { + "name": "Steam Username", + "description": "Used for installation", + "env_variable": "STEAM_USER", + "default_value": "anonymous", + "user_viewable": true, + "user_editable": false, + "rules": "required|string" + }, + { + "name": "Steam Password", + "description": "", + "env_variable": "STEAM_PASS", + "default_value": "!xNfMpAN*Lr3iMsJ", + "user_viewable": true, + "user_editable": false, + "rules": "nullable|string" + }, + { + "name": "Server Configuration File", + "description": "https:\/\/community.bistudio.com\/wiki\/server.cfg", + "env_variable": "CONFIG", + "default_value": "server.cfg", + "user_viewable": true, + "user_editable": true, + "rules": "string|nullable" + }, + { + "name": "Basic Network Config", + "description": "Network Configuration", + "env_variable": "BASIC", + "default_value": "basic.cfg", + "user_viewable": true, + "user_editable": true, + "rules": "string|nullable" + }, + { + "name": "Check for Updates", + "description": "Check for updates on server start.\r\n1 True | 0 False", + "env_variable": "UPDATE", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|numeric" + }, + { + "name": "Mods", + "description": "Client mods with the -mods startup option", + "env_variable": "MODS", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Server Mods", + "description": "Server-sided mods with the -serverMods startup option.", + "env_variable": "SERVERMODS", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Extra Flags for SteamCMD", + "description": "Typically used for grabbing beta builds.\r\nExample: -beta profiling -betapassword CautionSpecialProfilingAndTestingBranchArma3", + "env_variable": "EXTRA_FLAGS", + "default_value": "", + "user_viewable": true, + "user_editable": false, + "rules": "nullable|string" + } + ] +} \ No newline at end of file diff --git a/steamcmd_servers/arma/arma3_x64/egg-arma3-config/basic.cfg b/steamcmd_servers/arma/arma3_x64/egg-arma3-config/basic.cfg new file mode 100644 index 000000000..7b5a1c996 --- /dev/null +++ b/steamcmd_servers/arma/arma3_x64/egg-arma3-config/basic.cfg @@ -0,0 +1,83 @@ +// **************************************************************************** +// * +// Arma 3 - basic.cfg * +// Version 060116 * +// * +// **************************************************************************** + +// Defines network tuning parameters +// +// This file is to be passed to the -cfg parameter on the command line for the server +// See http://community.bistudio.com/wiki/basic.cfg +// The following settings are the suggested settings + +// BANDWIDTH SETTINGS + +// Bandwidth the server is guaranteed to have (in bps) +// General guideline is NumberOfPlayers * 256kb +// Default: 131072 +MinBandwidth=5120000; +// Bandwidth the server can never go above (in bps) +// For a single server, use full network speed; decrease when running multiple servers +MaxBandwidth=10240000; + +// PACKET SETTINGS + +// Maximum number of packets per frame. +// Increasing the value potentially decreases lag, but increases desync +// Default: 128 +MaxMsgSend=2048; +// Maximum payload of guaranteed packet (in b) +// Small messages are packed to larger packets +// Guaranteed packets are used for non-repetitive events, like shooting +// Lower value means more packets are sent, so less events will get combined +// Default: 512 +MaxSizeGuaranteed=512; +// Maximum payload of non-guaranteed packet (in b) +// Increasing this value may improve bandwidth requirement, but may also increase lag +// Largest factor in desync +// Guidance is half of MaxSizeGuaranteed +// Default: 256 +MaxSizeNonguaranteed=256; +// Maximal size of a packet sent over the network +// Only necessary if ISP forces lower packet size and there are connectivity issues +// Default: 1400 +// class sockets{maxPacketSize=1400}; + +// SMOOTHNESS SETTINGS + +// Minimal error required to send network updates for far units +// Smaller values will make for smoother movement at long ranges, but will increase network traffic +// Default: 0.003 +MinErrorToSend=0.01; +// Minimal error required to send network updates for near units +// Using larger value can reduce traffic sent for near units +// Also controls client to server traffic +// Default: 0.01 +MinErrorToSendNear=0.02; + +// GEOLOCATION SETTINGS + +// Server latitude +serverLatitude=52; +serverLatitudeAuto=52; + +// Server Longitude +serverLongitude=0; +serverLongitudeAuto=0; +// MISC +// View Distance (not sure if this actually works) +viewDistance=10000; + +// Maximum size (in b) for custom face or sound files +// Default: 0 +MaxCustomFileSize=65536; +// Server language +language="English"; +steamLanguage="English"; +// Adapter +adapter=-1; +// Windowed mode +Windowed=0; + +3D_Performance=1.000000; \ No newline at end of file diff --git a/steamcmd_servers/arma/arma3_x64/egg-arma3-config/server.cfg b/steamcmd_servers/arma/arma3_x64/egg-arma3-config/server.cfg new file mode 100644 index 000000000..2615bf706 --- /dev/null +++ b/steamcmd_servers/arma/arma3_x64/egg-arma3-config/server.cfg @@ -0,0 +1,158 @@ +// **************************************************************************** +// * +// Arma 3 - server.cfg * +// Version 060117 * +// * +// **************************************************************************** + +// ArmA 3 Server Config File +// +// More info about parameters: +// https://community.bistudio.com/wiki/server.cfg + + +// GENERAL SETTINGS + +// Hostname for server. +hostname = "Arma 3 Server"; + +// Server password - for private servers. +//password = "arma3pass"; + +// Admin Password +//passwordAdmin = "ADMINPASSWORD"; + +// Auto-admin +admins[] = {""}; + +// Server Slots +maxPlayers = 32; + +// Logfile +logFile = "arma3server.log"; + +// Minimum Required Client Build +//requiredBuild = 95691 + +class Missions +{ + class Mission1 + { + template = ; + difficulty = "Regular"; + class Params {}; + }; + class Mission2 + { + template = ; + difficulty = "Regular"; + class Params {}; + }; + class Mission3 + { + template = ; + difficulty = "Regular"; + class Params {}; + }; + class Mission4 + { + template = ; + difficulty = "Regular"; + class Params {}; + }; +}; + +// Message of the Day (MOTD) +motd[] = { + "Welcome to My Arma 3 Server", + "TS3 Server: teamspeak.somewhere.com", + "Web: www.example.com" +}; + +// MOTD Interval (Seconds) +motdInterval = 30; + + +// VOTING + +// Server Mission Start +// minimum number of clients before server starts mission +voteMissionPlayers = 1; + +// Accepted Vote Threshold +// 0.33 = 33% clients. +voteThreshold = 0.33; + +// INGAME SETTINGS + +// Disable Voice over Net (VoN) +// 0 = voice enabled. +// 1 = voice disabled. +disableVoN = 0; + +// VoN Codec Quality +// 0-10 = 8kHz (narrowband). +// 11-20 = 16kHz (wideband). +// 21-30 = 32kHz (ultrawideband). +vonCodecQuality = 3; + +// Persistent Battlefield +// 0 = disable. +// 1 = enable. +persistent = 1; + +// Time Stamp Format +// none, short, full +timeStampFormat = "short"; + +// Server Statistics +// Set this to 0 to opt-out! More info: https://community.bistudio.com/wiki/Arma_3_Analytics +statisticsEnabled = 1; + +// SERVER SECURITY/ANTI HACK + +// Verify Signitures for Client Addons +// 0 = off. +// 1 = weak protection (depricated). +// 2 = full protection. +verifySignatures = 2; + +// Secure Player ID +// 1 = Server warning message. +// 2 = Kick client. +requiredSecureId = 2; + +// Kick Duplicate Player IDs +kickDuplicate = 1; + +// BattlEye Anti-Cheat +// 0 = disable +// 1 = enable +BattlEye = 1; + +// Allowed File Extentions +allowedLoadFileExtensions[] = {"hpp","sqs","sqf","fsm","cpp","paa","txt","xml","inc","ext","sqm","ods","fxy","lip","csv","kb","bik","bikb","html","htm","biedi"}; +allowedPreprocessFileExtensions[] = {"hpp","sqs","sqf","fsm","cpp","paa","txt","xml","inc","ext","sqm","ods","fxy","lip","csv","kb","bik","bikb","html","htm","biedi"}; +allowedHTMLLoadExtensions[] = {"htm","html","xml","txt"}; + +// SCRIPTING ISSUES +onUserConnected = ""; +onUserDisconnected = ""; +doubleIdDetected = ""; + +// SIGNATURE VERIFICATION +// kick = kick (_this select 0) +// ban = ban (_this select 0) +onUnsignedData = "kick (_this select 0)"; +onHackedData = "kick (_this select 0)"; +onDifferentData = ""; + +// HEADLESS CLIENT SUPPORT +// specify ip-adresses of allowed headless clients +headlessClients[] = {"127.0.0.1", "172.18.0.1"}; +localClient[] = {"127.0.0.1", "172.18.0.1"}; + +// BattlEye Anti-Cheat License +// 0 = decline +// 1 = accept +battleyeLicense = 1; From f941e8ca50373af30bf2d2c5bd5ac196dadb82a3 Mon Sep 17 00:00:00 2001 From: Terrahost Date: Fri, 20 Nov 2020 10:15:45 -0600 Subject: [PATCH 018/104] Update readme --- README.md | 114 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 74 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index 18a3e67f0..8ecb768e4 100644 --- a/README.md +++ b/README.md @@ -24,13 +24,15 @@ If you are reading this it looks like you are looking to add an egg to your serv ## Please read the CONTRIBUTING.md before submitting PRs -## Bot Eggs +## [Bots](/bots/) [Discord](/bots/discord/) * [ATL Bot](/bots/discord/atlbot/) Node JS * [Bastion](/bots/discord/bastion/) * [CorpBot](/bots/discord/corpbot/) Python * [discord.js](bots/discord/discord.js/) Node JS generic +* [discord.py](bots/discord/discord.py/) Python generic +* [discordgo](bots/discord/discordgo/) golang generic * [fragbot](/bots/discord/fragbot/) Golang * [jmusicbot](/bots/discord/jmusicbot) Java * [parkertron](/bots/discord/parkertron/) Golang @@ -38,21 +40,36 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Red](/bots/discord/redbot/) Python * [Sinusbot](/bots/discord/sinusbot/) -[Twitch](/bots/twitch) -* [PhantomBot](/bots/twitch/phantombot/) +* [Twitch](/bots/twitch) + * [PhantomBot](/bots/twitch/phantombot/) + * [sogeBot](/bots/twitch/sogebot/) + +[Other](/bots/other/) +* [Big Brother Bot](/bots/other/bigbrotherbot) -[TeamSpeak3](bots/teamspeak3) -* [JTS3ServerMod](/bots/teamspeak3/jts3servermod/) - -## Database Eggs -### SQL Databases -[MariaDB](/database/mariadb/) -[PostgreSQL](/database/postgres/) +* [TeamSpeak3](bots/teamspeak3) + * [JTS3ServerMod](/bots/teamspeak3/jts3servermod/) +## [Database](/database/) ### In-Memory Databases [Redis](/database/redis/) +* [Redis 5](/database/redis/redis-5) +* [Redis 6](/database/redis/redis-6) + +### noSQL +* [mongoDB](/database/nosql/mongodb) + +### SQL Databases +* [MariaDB](/database/sql/mariadb/) +* [PostgreSQL](/database/sql/postgres/) + +## Voice Servers +* [Lavalink](/voice_servers/lavalink) +* [teaspeak](/voice_servers/teaspeak) ## Game Eggs +[Among Us Impostor Server](/among_us/impostor_server) + [ET Legacy](/enemy_territory/etlegacy/) [Factorio](/factorio/factorio/) @@ -66,33 +83,41 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Multi Theft Auto](/gta/mtasa/) * [SA-MP](/gta/samp/) -[Mindusrty](/mindustry/) - -[Minecraft Bedrock](/minecraft_bedrock/) -* [Bedrock](/minecraft_bedrock/bedrock/) -* [DragonProxy](/minecraft_bedrock/dragonproxy/) -* [Nukkit](/minecraft_bedrock/nukkit/) -* [PocketMine MP](/minecraft_bedrock/pocketmine_mp/) - -[Minecraft Java](/minecraft_java/) Servers for Java Minecraft -* [Cuberite](/minecraft_java/cuberite/) -* [feather](/minecraft/feather/) -* [Feed The Beast](/minecraft_java/ftb/) -* [Forge](/minecraft_java/forge/) -* [Magma](/minecraft_java/magma/) - -* [Paper](/minecraft_java/paper) -* [Spigot](/minecraft_java/spigot/) -* [spongeforge](/minecraft_java/spongeforge/) -* [SpongeVanilla](/minecraft_java/spongevanilla/) -* [Technic](/minecraft_java/technic/) -* [VanillaCord](/minecraft_java/vanillacord/) -* [Tuinity](/minecraft_java/tuinity/) - -[Minecraft Proxies](/minecraft_proxy/) (these are for the java version of minecraft) -* [Waterfall](/minecraft_proxy/waterfall/) -* [TyphoonLimbo](/minecraft_proxy/typhoonlimbo/) -* [Velocity](/minecraft_proxy/velocity/) +[Mindustry](/mindustry/) + +[Minecraft](/minecraft/) +* [Bedrock](/minecraft/bedrock/) + * [Bedrock](/minecraft/bedrock/bedrock/) + * [DragonProxy](/minecraft/bedrock/dragonproxy/) + * [Nukkit](/minecraft/bedrock/nukkit/) + * [PocketMine MP](/minecraft/bedrock/pocketmine_mp/) + +* [Java](/minecraft/java/) Servers for Java Minecraft + * [Cuberite](/minecraft/java/cuberite/) + * [feather](/minecraft/feather/) + * [Feed The Beast](/minecraft/java/ftb/) + * [Forge](/minecraft/java/forge/) + * [Magma](/minecraft/java/magma/) + * [Paper](/minecraft/java/paper) + * [Spigot](/minecraft/java/spigot/) + * [spongeforge](/minecraft/java/spongeforge/) + * [SpongeVanilla](/minecraft/java/spongevanilla/) + * [Technic](/minecraft/java/technic/) + * [Tuinity](/minecraft/java/tuinity/) + * [VanillaCord](/minecraft/java/vanillacord/) + +* [Proxies](/minecraft/proxy/) (these are for the java version of minecraft) + * [TyphoonLimbo](/minecraft/proxy/typhoonlimbo/) + * [Travertine](/minecraft/proxy/travertine/) Java + * [Velocity](/minecraft/proxy/velocity/) + * [Waterdog](/minecraft/proxy/waterdog/) Java/Bedrock + * [Waterfall](/minecraft/proxy/waterfall/) + +[OpenRA](/openra/) +* [OpenRA Dune2000](/openra/openra_dune2000) +* [OpenRA Red Alert](/openra/openra_red_alert) +* [OpenRA Tiberian Dawn](/openra/openra_tiberian_dawn) + [Red Dead Redemption](/rdr/) * [RedM](/rdr/redm/) @@ -103,30 +128,37 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Arma](/steamcmd_servers/arma/) * [Arma 3](/steamcmd_servers/arma/arma3/) * [Arma 3 HC](/steamcmd_servers/arma/arma3_headless_client/) - * [Arma 3 x64](/steamcmd_servers/arma/arma3_x64/) + * [Arma 3 HC](/steamcmd_servers/arma/arma3_x64/) +* [Avorion](/steamcmd_servers/avorion/) * [Citadel: Forged with Fire](/steamcmd_servers/citadel) * [Conan Exiles](/steamcmd_servers/conan_exiles) * [Don't Starve](/steamcmd_servers/dont_starve) * [ECO](/steamcmd_servers/eco/) * [HLDS server](/steamcmd_servers/hlds_server) * [Hurtworld](/steamcmd_servers/hurtworld) +* [Insurgency: Sandstorm](/steamcmd_servers/insurgency_sandstorm) +* [Killing Floor 2](/steamcmd_servers/killingfloor2) * [Mordhau](/steamcmd_servers/mordhau) * [Onset](/steamcmd_servers/onset) * [PixARK](/steamcmd_servers/pixark/) * [Project Zomboid](/steamcmd_servers/project_zomboid/) +* [Rising World](/steamcmd_servers/rising_world) * [Rust Staging Branch](/steamcmd_servers/rust_staging/) * [SCP: Secret Laboratory](/steamcmd_servers/scpsl/) * [dedicated](/steamcmd_servers/scpsl/dedicated/) * [multiadmin](/steamcmd_servers/scpsl/multiadmin/) -* [SSoldat](/steamcmd_servers/soldat/) +* [Soldat](/steamcmd_servers/soldat/) * [Starbound](/steamcmd_servers/starbound) * [Stationeers](/steamcmd_servers/stationeers/) +* [Stormworks](/steamcmd_servers/stormworks/) * [Sven Co-op](/steamcmd_servers/svencoop) * [Squad](/steamcmd_servers/squad/) * [Unturned](/steamcmd_servers/unturned/) - * [RocketMod](/steamcmd_servers/unturned/rocketmod/) * [Unturned](/steamcmd_servers/unturned/unturned/) +[Teeworlds](/teeworlds/) +* [teeworlds](/teeworlds/teeworlds/) + [Terraria](/terraria/) * [vanilla](/terraria/vanilla) * [tmodloader](/terraria/tmodloader) @@ -142,3 +174,5 @@ If you are reading this it looks like you are looking to add an egg to your serv [Vintage Story](/vintage_story/vintage_story/) [Xonotic](/xonotic/xonotic/) + +[Cryofall](/cryofall/) \ No newline at end of file From 1dd42d8bd2951373ae5db651436e92f2cdc9e9ca Mon Sep 17 00:00:00 2001 From: TekExplorer Date: Fri, 20 Nov 2020 14:17:29 -0500 Subject: [PATCH 019/104] Restructured Minecraft Proxy folder restructured the minecraft proxy folder and added a geysermc readme to indicate the geyser official eggs. updated readmes to match. --- .gitignore | 3 ++- README.md | 21 ++++++++++++------- minecraft/README.md | 18 +++++++++------- minecraft/bedrock/README.md | 4 ---- minecraft/proxy/README.md | 12 +++++++++++ minecraft/proxy/bedrock/README.md | 9 ++++++++ .../bedrock/dragon_proxy/README.md | 0 .../dragon_proxy/egg-dragon-proxy.json | 0 minecraft/proxy/bedrock/geyser/README.md | 6 ++++++ minecraft/proxy/cross_platform/README.md | 5 +++++ .../{ => cross_platform}/waterdog/README.md | 0 .../waterdog/egg-waterdog.json | 0 minecraft/proxy/java/README.md | 17 +++++++++++++++ .../proxy/{ => java}/travertine/README.md | 0 .../{ => java}/travertine/egg-travertine.json | 0 .../proxy/{ => java}/typhoonlimbo/README.md | 0 .../typhoonlimbo/egg-typhoon-limbo.json | 0 minecraft/proxy/{ => java}/velocity/README.md | 0 .../{ => java}/velocity/egg-velocity.json | 0 .../proxy/{ => java}/velocity/velocity.toml | 0 .../proxy/{ => java}/waterfall/README.md | 0 .../proxy/{ => java}/waterfall/config.yml | 0 .../{ => java}/waterfall/egg-waterfall.json | 0 23 files changed, 75 insertions(+), 20 deletions(-) create mode 100644 minecraft/proxy/README.md create mode 100644 minecraft/proxy/bedrock/README.md rename minecraft/{ => proxy}/bedrock/dragon_proxy/README.md (100%) rename minecraft/{ => proxy}/bedrock/dragon_proxy/egg-dragon-proxy.json (100%) create mode 100644 minecraft/proxy/bedrock/geyser/README.md create mode 100644 minecraft/proxy/cross_platform/README.md rename minecraft/proxy/{ => cross_platform}/waterdog/README.md (100%) rename minecraft/proxy/{ => cross_platform}/waterdog/egg-waterdog.json (100%) create mode 100644 minecraft/proxy/java/README.md rename minecraft/proxy/{ => java}/travertine/README.md (100%) rename minecraft/proxy/{ => java}/travertine/egg-travertine.json (100%) rename minecraft/proxy/{ => java}/typhoonlimbo/README.md (100%) rename minecraft/proxy/{ => java}/typhoonlimbo/egg-typhoon-limbo.json (100%) rename minecraft/proxy/{ => java}/velocity/README.md (100%) rename minecraft/proxy/{ => java}/velocity/egg-velocity.json (100%) rename minecraft/proxy/{ => java}/velocity/velocity.toml (100%) rename minecraft/proxy/{ => java}/waterfall/README.md (100%) rename minecraft/proxy/{ => java}/waterfall/config.yml (100%) rename minecraft/proxy/{ => java}/waterfall/egg-waterfall.json (100%) diff --git a/.gitignore b/.gitignore index 615b2764a..74893bfdc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.DS_Store node_modules/ -.vuepress/* \ No newline at end of file +.vuepress/* +.vscode \ No newline at end of file diff --git a/README.md b/README.md index 8fcfa050f..c2233a72d 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,6 @@ If you are reading this it looks like you are looking to add an egg to your serv [Minecraft](/minecraft/) * [Bedrock](/minecraft/bedrock/) * [Bedrock](/minecraft/bedrock/bedrock/) - * [DragonProxy](/minecraft/bedrock/dragonproxy/) * [Nukkit](/minecraft/bedrock/nukkit/) * [PocketMine MP](/minecraft/bedrock/pocketmine_mp/) @@ -106,12 +105,18 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Tuinity](/minecraft/java/tuinity/) * [VanillaCord](/minecraft/java/vanillacord/) -* [Proxies](/minecraft/proxy/) (these are for the java version of minecraft) - * [TyphoonLimbo](/minecraft/proxy/typhoonlimbo/) - * [Travertine](/minecraft/proxy/travertine/) Java - * [Velocity](/minecraft/proxy/velocity/) - * [Waterdog](/minecraft/proxy/waterdog/) Java/Bedrock - * [Waterfall](/minecraft/proxy/waterfall/) +* [Proxies](/minecraft/proxy/) Minecraft Server Proxies + * [Java](/minecraft/proxy/java/) + * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo/) + * [Waterfall](/minecraft/proxy/java/waterfall/) + * [Travertine](/minecraft/proxy/java/travertine/) + * [Velocity](/minecraft/proxy/java/velocity/) + * [Bedrock](/minecraft/proxy/bedrock/) + * [DragonProxy](/minecraft/proxy/bedrock/dragonproxy/) + * [GeyserMC](/minecraft/proxy/bedrock/geyser/) + * [Cross Platform](/minecraft/proxy/cross_platform) + * [Waterdog](/minecraft/proxy/cross_platform/waterdog/) + [OpenRA](/openra/) * [OpenRA Dune2000](/openra/openra_dune2000) @@ -174,4 +179,4 @@ If you are reading this it looks like you are looking to add an egg to your serv [Xonotic](/xonotic/xonotic/) -[Cryofall](/cryofall/) \ No newline at end of file +[Cryofall](/cryofall/) diff --git a/minecraft/README.md b/minecraft/README.md index fa00debac..9d3b4ed79 100644 --- a/minecraft/README.md +++ b/minecraft/README.md @@ -6,7 +6,6 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, [Bedrock](/minecraft/bedrock/) Servers for Bedrock Minecraft (Windows 10, mobile, console) * [Bedrock](/minecraft/bedrock/bedrock/) -* [DragonProxy](/minecraft/bedrock/dragon_proxy/) * [Nukkit](/minecraft/bedrock/nukkit/) * [PocketMine MP](/minecraft/bedrock/pocketmine_mp/) @@ -24,9 +23,14 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [Tuinity](/minecraft/java/tuinity/) * [VanillaCord](/minecraft/java/vanillacord/) -[Proxies](/minecraft/proxy/) Minecraft Server Proxies -* [TyphoonLimbo](/minecraft/proxy/typhoonlimbo/) Java -* [Travertine](/minecraft/proxy/travertine/) Java -* [Velocity](/minecraft/proxy/velocity/) Java -* [Waterdog](/minecraft/proxy/waterdog/) Java/Bedrock -* [Waterfall](/minecraft/proxy/waterfall/) Java \ No newline at end of file +* [Proxies](/minecraft/proxy/) Minecraft Server Proxies + * [Java](/minecraft/proxy/java/) + * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo/) + * [Waterfall](/minecraft/proxy/java/waterfall/) + * [Travertine](/minecraft/proxy/java/travertine/) + * [Velocity](/minecraft/proxy/java/velocity/) + * [Bedrock](/minecraft/proxy/bedrock/) + * [DragonProxy](/minecraft/proxy/bedrock/dragonproxy/) + * [GeyserMC](/minecraft/proxy/bedrock/geyser/) + * [Cross Platform](/minecraft/proxy/cross_platform) + * [Waterdog](/minecraft/proxy/cross_platform/waterdog/) diff --git a/minecraft/bedrock/README.md b/minecraft/bedrock/README.md index 629356994..5dd20afa8 100644 --- a/minecraft/bedrock/README.md +++ b/minecraft/bedrock/README.md @@ -4,10 +4,6 @@ [Minecraft Bedrock Server](https://minecraft.net/en-us/download/server/bedrock/) The official Minecraft Bedrock (Formerly Minecraft Pocket Edition) server. -#### DragonProxy -[DragonProxy Github](https://github.com/DragonetMC/DragonProxy) -A proxy to allow Minecraft: Bedrock clients to connect to Minecraft: Java Edition servers. - #### Nukkit [Nukkit GitHub](https://github.com/Nukkit/Nukkit) Nukkit is a Nuclear-Powered Server Software For Minecraft: Pocket Edition diff --git a/minecraft/proxy/README.md b/minecraft/proxy/README.md new file mode 100644 index 000000000..f92c4a8d1 --- /dev/null +++ b/minecraft/proxy/README.md @@ -0,0 +1,12 @@ +# Minecraft Proxies + +* [Java](/minecraft/proxy/java/) + * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo/) + * [Waterfall](/minecraft/proxy/java/waterfall/) + * [Travertine](/minecraft/proxy/java/travertine/) + * [Velocity](/minecraft/proxy/java/velocity/) +* [Bedrock](/minecraft/proxy/bedrock/) + * [DragonProxy](/minecraft/proxy/bedrock/dragonproxy/) + * [GeyserMC](/minecraft/proxy/bedrock/geyser/) +* [Cross Platform](/minecraft/proxy/cross_platform) + * [Waterdog](/minecraft/proxy/waterdog/) \ No newline at end of file diff --git a/minecraft/proxy/bedrock/README.md b/minecraft/proxy/bedrock/README.md new file mode 100644 index 000000000..a87851743 --- /dev/null +++ b/minecraft/proxy/bedrock/README.md @@ -0,0 +1,9 @@ +# Bedrock Proxies/Bridges + +#### DragonProxy (Abandoned in favor of Geyser) +[DragonProxy](https://github.com/DragonetMC/DragonProxy) +A proxy to allow Minecraft: Bedrock clients to connect to Minecraft: Java Edition servers. + +#### GeyserMC +[GeyserMC](https://geysermc.org/) +A bridge/proxy allowing you to connect to Minecraft: Java Edition servers with Minecraft: Bedrock edition. diff --git a/minecraft/bedrock/dragon_proxy/README.md b/minecraft/proxy/bedrock/dragon_proxy/README.md similarity index 100% rename from minecraft/bedrock/dragon_proxy/README.md rename to minecraft/proxy/bedrock/dragon_proxy/README.md diff --git a/minecraft/bedrock/dragon_proxy/egg-dragon-proxy.json b/minecraft/proxy/bedrock/dragon_proxy/egg-dragon-proxy.json similarity index 100% rename from minecraft/bedrock/dragon_proxy/egg-dragon-proxy.json rename to minecraft/proxy/bedrock/dragon_proxy/egg-dragon-proxy.json diff --git a/minecraft/proxy/bedrock/geyser/README.md b/minecraft/proxy/bedrock/geyser/README.md new file mode 100644 index 000000000..10c01c340 --- /dev/null +++ b/minecraft/proxy/bedrock/geyser/README.md @@ -0,0 +1,6 @@ +# Geyser + +A bridge/proxy allowing you to connect to Minecraft: Java Edition servers with Minecraft: Bedrock edition. + +### Eggs +GeyserMC maintains their own eggs on their github: [GeyserMC pterodactyl eggs](https://github.com/GeyserMC/pterodactyl-stuff) diff --git a/minecraft/proxy/cross_platform/README.md b/minecraft/proxy/cross_platform/README.md new file mode 100644 index 000000000..8b4cedc81 --- /dev/null +++ b/minecraft/proxy/cross_platform/README.md @@ -0,0 +1,5 @@ +# Mineraft Cross Platform Proxies + +#### Waterdog +[Waterdog](https://github.com/yesdog/Waterdog) +Waterdog provides native support for the Minecraft Bedrock protocols along with the existing java protocols. It is capable of using the ProtocolSupport PE encapsulation protocol over TCP, or it can use the native RakNet Bedrock protocol for traditional downstream Bedrock servers such as Nukkit, Pocketmine, Bedrock Alpha Server, MiNET, and others. \ No newline at end of file diff --git a/minecraft/proxy/waterdog/README.md b/minecraft/proxy/cross_platform/waterdog/README.md similarity index 100% rename from minecraft/proxy/waterdog/README.md rename to minecraft/proxy/cross_platform/waterdog/README.md diff --git a/minecraft/proxy/waterdog/egg-waterdog.json b/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json similarity index 100% rename from minecraft/proxy/waterdog/egg-waterdog.json rename to minecraft/proxy/cross_platform/waterdog/egg-waterdog.json diff --git a/minecraft/proxy/java/README.md b/minecraft/proxy/java/README.md new file mode 100644 index 000000000..920b99185 --- /dev/null +++ b/minecraft/proxy/java/README.md @@ -0,0 +1,17 @@ +# Minecraft Java Proxies + +#### Waterfall +[Waterfall](https://papermc.io/downloads#Waterfall) +Paper fork of the BungeeCord software, with improved Forge support and more features. + +#### Travertine +[Travertine](https://papermc.io/downloads#Travertine) +Waterfall, with additional support for Minecraft 1.7.10. + +#### Velocity +[Velocity](https://velocitypowered.com/) +Velocity is a Minecraft server proxy with unparalleled server support, scalability, and flexibility. + +#### Typhoonlimbo +[TyphoonLimbo](https://github.com/TyphoonMC/TyphoonLimbo) +Lightweight Minecraft limbo server diff --git a/minecraft/proxy/travertine/README.md b/minecraft/proxy/java/travertine/README.md similarity index 100% rename from minecraft/proxy/travertine/README.md rename to minecraft/proxy/java/travertine/README.md diff --git a/minecraft/proxy/travertine/egg-travertine.json b/minecraft/proxy/java/travertine/egg-travertine.json similarity index 100% rename from minecraft/proxy/travertine/egg-travertine.json rename to minecraft/proxy/java/travertine/egg-travertine.json diff --git a/minecraft/proxy/typhoonlimbo/README.md b/minecraft/proxy/java/typhoonlimbo/README.md similarity index 100% rename from minecraft/proxy/typhoonlimbo/README.md rename to minecraft/proxy/java/typhoonlimbo/README.md diff --git a/minecraft/proxy/typhoonlimbo/egg-typhoon-limbo.json b/minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json similarity index 100% rename from minecraft/proxy/typhoonlimbo/egg-typhoon-limbo.json rename to minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json diff --git a/minecraft/proxy/velocity/README.md b/minecraft/proxy/java/velocity/README.md similarity index 100% rename from minecraft/proxy/velocity/README.md rename to minecraft/proxy/java/velocity/README.md diff --git a/minecraft/proxy/velocity/egg-velocity.json b/minecraft/proxy/java/velocity/egg-velocity.json similarity index 100% rename from minecraft/proxy/velocity/egg-velocity.json rename to minecraft/proxy/java/velocity/egg-velocity.json diff --git a/minecraft/proxy/velocity/velocity.toml b/minecraft/proxy/java/velocity/velocity.toml similarity index 100% rename from minecraft/proxy/velocity/velocity.toml rename to minecraft/proxy/java/velocity/velocity.toml diff --git a/minecraft/proxy/waterfall/README.md b/minecraft/proxy/java/waterfall/README.md similarity index 100% rename from minecraft/proxy/waterfall/README.md rename to minecraft/proxy/java/waterfall/README.md diff --git a/minecraft/proxy/waterfall/config.yml b/minecraft/proxy/java/waterfall/config.yml similarity index 100% rename from minecraft/proxy/waterfall/config.yml rename to minecraft/proxy/java/waterfall/config.yml diff --git a/minecraft/proxy/waterfall/egg-waterfall.json b/minecraft/proxy/java/waterfall/egg-waterfall.json similarity index 100% rename from minecraft/proxy/waterfall/egg-waterfall.json rename to minecraft/proxy/java/waterfall/egg-waterfall.json From 78e64b906463601503c99b1143643771e60ca2a0 Mon Sep 17 00:00:00 2001 From: TekExplorer Date: Fri, 20 Nov 2020 14:33:10 -0500 Subject: [PATCH 020/104] Update java proxy eggs to use new gh location for config files config files pulled from this repo have their url's updated in the eggs --- minecraft/proxy/cross_platform/waterdog/egg-waterdog.json | 2 +- minecraft/proxy/java/travertine/egg-travertine.json | 2 +- minecraft/proxy/java/velocity/egg-velocity.json | 2 +- minecraft/proxy/java/waterfall/egg-waterfall.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json b/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json index 007dc04b0..e366448ed 100644 --- a/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json +++ b/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl\r\n\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n# Adding '.jar' if it isn't part of the file name\r\nif [[ \"${SERVER_JARFILE}\" == \"*\\.jar\" ]]; then\r\n echo -e \"adding.jar to server file name\"\r\n SERVER_JARFILE=\"${SERVER_JARFILE}.jar\"\r\nfi\r\n\r\nif [ -z \"${WATERDOG_VERSION}\" ] || [ \"${WATERDOG_VERSION}\" == \"latest\" ]; then\r\n echo -e \"downloading latest waterdog build\\n\"\r\n curl -sSL -o ${SERVER_JARFILE} https:\/\/ci.codemc.io\/job\/yesdog\/job\/Waterdog\/lastSuccessfulBuild\/artifact\/Waterfall-Proxy\/bootstrap\/target\/Waterdog.jar\r\nelse \r\n echo -e \"downloading waterdog build ${WATERDOG_VERSION}\\n\"\r\n curl -sSL -o ${SERVER_JARFILE} https:\/\/ci.codemc.io\/job\/yesdog\/job\/Waterdog\/${WATERDOG_VERSION}\/artifact\/Waterfall-Proxy\/bootstrap\/target\/Waterdog.jar\r\nfi\r\n\r\nif [ ! -f config.yml ]; then\r\n echo -e \"Downloading waterfall config.yml\"\r\n curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_proxy\/waterfall\/config.yml\r\nelse\r\n echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi", + "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl\r\n\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n# Adding '.jar' if it isn't part of the file name\r\nif [[ \"${SERVER_JARFILE}\" == \"*\\.jar\" ]]; then\r\n echo -e \"adding.jar to server file name\"\r\n SERVER_JARFILE=\"${SERVER_JARFILE}.jar\"\r\nfi\r\n\r\nif [ -z \"${WATERDOG_VERSION}\" ] || [ \"${WATERDOG_VERSION}\" == \"latest\" ]; then\r\n echo -e \"downloading latest waterdog build\\n\"\r\n curl -sSL -o ${SERVER_JARFILE} https:\/\/ci.codemc.io\/job\/yesdog\/job\/Waterdog\/lastSuccessfulBuild\/artifact\/Waterfall-Proxy\/bootstrap\/target\/Waterdog.jar\r\nelse \r\n echo -e \"downloading waterdog build ${WATERDOG_VERSION}\\n\"\r\n curl -sSL -o ${SERVER_JARFILE} https:\/\/ci.codemc.io\/job\/yesdog\/job\/Waterdog\/${WATERDOG_VERSION}\/artifact\/Waterfall-Proxy\/bootstrap\/target\/Waterdog.jar\r\nfi\r\n\r\nif [ ! -f config.yml ]; then\r\n echo -e \"Downloading waterfall config.yml\"\r\n curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/cross_platform\/waterfall\/config.yml\r\nelse\r\n echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi", "container": "debian:buster-slim", "entrypoint": "bash" } diff --git a/minecraft/proxy/java/travertine/egg-travertine.json b/minecraft/proxy/java/travertine/egg-travertine.json index 904e4fb99..053189f1a 100644 --- a/minecraft/proxy/java/travertine/egg-travertine.json +++ b/minecraft/proxy/java/travertine/egg-travertine.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nmkdir -p \/mnt\/server\/\r\ncd \/mnt\/server\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n echo -e \"using supplied download url\"\r\n DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n if [ -z \"$VANILLA_VERSION\" ] || [ \"${MINECRAFT_VERSION}\" == \"latest\" ]; then\r\n echo -e \"getting latest supported mc version and latest paper build\"\r\n MINECRAFT_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/travertine | jq -r '.versions[0]')\r\n BUILD_NUMBER=$(curl -sSL https:\/\/papermc.io\/api\/v1\/travertine\/${MINECRAFT_VERSION} | jq -r '.builds.latest')\r\n VER_EXISTS=true\r\n else\r\n echo -e \"checking if version ${MINECRAFT_VERSION} exists\"\r\n VER_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v1\/travertine | jq -r --arg VERSION ${MINECRAFT_VERSION} '.versions[] | contains($VERSION)' | grep true)\r\n fi\r\n \r\n if [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n else\r\n echo -e \"Using the latest travertine version\"\r\n MINECRAFT_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/travertine | jq -r '.versions[0]')\r\n fi\r\n \r\n BUILD_EXISTS=$(curl -sSL https:\/\/papermc.io\/api\/v1\/travertine\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all[] | contains($BUILD)' | grep true)\r\n \r\n if [ \"${BUILD_EXISTS}\" == \"true\" ] || [ ${BUILD_NUMBER} == \"latest\" ]; then\r\n echo -e \"Build is valid. Using version ${BUILD_NUMBER}\"\r\n else\r\n echo -e \"Using the latest paper build for version ${MINECRAFT_VERSION}\"\r\n BUILD_NUMBER=$(curl -sSL https:\/\/papermc.io\/api\/v1\/travertine\/${MINECRAFT_VERSION} | jq -r '.builds.latest')\r\n fi\r\n \r\n echo \"Version being downloaded\"\r\n echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n echo -e \"Build: ${BUILD_NUMBER}\"\r\n DOWNLOAD_URL=https:\/\/papermc.io\/api\/v1\/travertine\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download \r\nfi\r\n\r\nif [ -z ${SERVER_JARFILE} ]; then\r\n SERVER_JARFILE=server.jar\r\nfi\r\n\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\necho -e \"running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f config.yml ]; then\r\n echo -e \"Downloading travertine config.yml\"\r\n curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/travertine\/config.yml\r\nelse\r\n echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi", + "script": "#!\/bin\/bash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nmkdir -p \/mnt\/server\/\r\ncd \/mnt\/server\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n echo -e \"using supplied download url\"\r\n DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n if [ -z \"$VANILLA_VERSION\" ] || [ \"${MINECRAFT_VERSION}\" == \"latest\" ]; then\r\n echo -e \"getting latest supported mc version and latest paper build\"\r\n MINECRAFT_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/travertine | jq -r '.versions[0]')\r\n BUILD_NUMBER=$(curl -sSL https:\/\/papermc.io\/api\/v1\/travertine\/${MINECRAFT_VERSION} | jq -r '.builds.latest')\r\n VER_EXISTS=true\r\n else\r\n echo -e \"checking if version ${MINECRAFT_VERSION} exists\"\r\n VER_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v1\/travertine | jq -r --arg VERSION ${MINECRAFT_VERSION} '.versions[] | contains($VERSION)' | grep true)\r\n fi\r\n \r\n if [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n else\r\n echo -e \"Using the latest travertine version\"\r\n MINECRAFT_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/travertine | jq -r '.versions[0]')\r\n fi\r\n \r\n BUILD_EXISTS=$(curl -sSL https:\/\/papermc.io\/api\/v1\/travertine\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all[] | contains($BUILD)' | grep true)\r\n \r\n if [ \"${BUILD_EXISTS}\" == \"true\" ] || [ ${BUILD_NUMBER} == \"latest\" ]; then\r\n echo -e \"Build is valid. Using version ${BUILD_NUMBER}\"\r\n else\r\n echo -e \"Using the latest paper build for version ${MINECRAFT_VERSION}\"\r\n BUILD_NUMBER=$(curl -sSL https:\/\/papermc.io\/api\/v1\/travertine\/${MINECRAFT_VERSION} | jq -r '.builds.latest')\r\n fi\r\n \r\n echo \"Version being downloaded\"\r\n echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n echo -e \"Build: ${BUILD_NUMBER}\"\r\n DOWNLOAD_URL=https:\/\/papermc.io\/api\/v1\/travertine\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download \r\nfi\r\n\r\nif [ -z ${SERVER_JARFILE} ]; then\r\n SERVER_JARFILE=server.jar\r\nfi\r\n\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\necho -e \"running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f config.yml ]; then\r\n echo -e \"Downloading travertine config.yml\"\r\n curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/java\/travertine\/config.yml\r\nelse\r\n echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi", "container": "debian:buster-slim", "entrypoint": "bash" } diff --git a/minecraft/proxy/java/velocity/egg-velocity.json b/minecraft/proxy/java/velocity/egg-velocity.json index 7cfc22063..b8c444959 100644 --- a/minecraft/proxy/java/velocity/egg-velocity.json +++ b/minecraft/proxy/java/velocity/egg-velocity.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Velocity Proxy Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napk add --no-cache curl\r\n\r\nmkdir -p \/mnt\/server\/\r\n\r\ncd \/mnt\/server\/\r\n\r\nif [ -z ${VELOCITY_VERSION} ] || [ ${VELOCITY_VERSION} == \"latest\" ]; then\r\n\tVELOCITY_VERSION=\/lastStableBuild\r\nfi\r\n\r\necho -e \"Getting download link\"\r\nDOWNLOAD_ENDPOINT=$(curl https:\/\/ci.velocitypowered.com\/job\/velocity\/${VELOCITY_VERSION}\/ | grep -Eo 'href=\"[^\\\"]+\"' | grep -vE \"view|fingerprint\" | grep \".jar\" | sed -n 's\/.*href=\"\\([^\"]*\\).*\/\\1\/p')\r\nDOWNLOAD_LINK=https:\/\/ci.velocitypowered.com\/job\/velocity\/lastStableBuild\/${DOWNLOAD_ENDPOINT}\r\n\r\necho -e \"Downloading ${DOWNLOAD_LINK}\"\r\ncurl ${DOWNLOAD_LINK} -o ${SERVER_JARFILE}\r\n\r\nif [ -f velocity.toml ]; then\r\n echo -e \"velocity config file exists\"\r\nelse\r\n echo -e \"downloading velocity config file.\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/velocity\/velocity.toml -o velocity.toml\r\nfi\r\n\r\necho -e \"install complete\"", + "script": "#!\/bin\/ash\r\n# Velocity Proxy Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napk add --no-cache curl\r\n\r\nmkdir -p \/mnt\/server\/\r\n\r\ncd \/mnt\/server\/\r\n\r\nif [ -z ${VELOCITY_VERSION} ] || [ ${VELOCITY_VERSION} == \"latest\" ]; then\r\n\tVELOCITY_VERSION=\/lastStableBuild\r\nfi\r\n\r\necho -e \"Getting download link\"\r\nDOWNLOAD_ENDPOINT=$(curl https:\/\/ci.velocitypowered.com\/job\/velocity\/${VELOCITY_VERSION}\/ | grep -Eo 'href=\"[^\\\"]+\"' | grep -vE \"view|fingerprint\" | grep \".jar\" | sed -n 's\/.*href=\"\\([^\"]*\\).*\/\\1\/p')\r\nDOWNLOAD_LINK=https:\/\/ci.velocitypowered.com\/job\/velocity\/lastStableBuild\/${DOWNLOAD_ENDPOINT}\r\n\r\necho -e \"Downloading ${DOWNLOAD_LINK}\"\r\ncurl ${DOWNLOAD_LINK} -o ${SERVER_JARFILE}\r\n\r\nif [ -f velocity.toml ]; then\r\n echo -e \"velocity config file exists\"\r\nelse\r\n echo -e \"downloading velocity config file.\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/proxy\/velocity\/velocity.toml -o velocity.toml\r\nfi\r\n\r\necho -e \"install complete\"", "container": "alpine:3.10", "entrypoint": "ash" } diff --git a/minecraft/proxy/java/waterfall/egg-waterfall.json b/minecraft/proxy/java/waterfall/egg-waterfall.json index 1454f996b..664263661 100644 --- a/minecraft/proxy/java/waterfall/egg-waterfall.json +++ b/minecraft/proxy/java/waterfall/egg-waterfall.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nmkdir -p \/mnt\/server\/\r\ncd \/mnt\/server\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n echo -e \"using supplied download url\"\r\n DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n if [ -z \"$VANILLA_VERSION\" ] || [ \"${MINECRAFT_VERSION}\" == \"latest\" ]; then\r\n echo -e \"getting latest supported mc version and latest paper build\"\r\n MINECRAFT_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall | jq -r '.versions[0]')\r\n BUILD_NUMBER=$(curl -sSL https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION} | jq -r '.builds.latest')\r\n VER_EXISTS=true\r\n else\r\n echo -e \"checking if version ${MINECRAFT_VERSION} exists\"\r\n VER_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall | jq -r --arg VERSION ${MINECRAFT_VERSION} '.versions[] | contains($VERSION)' | grep true)\r\n fi\r\n \r\n if [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n else\r\n echo -e \"Using the latest waterfall version\"\r\n MINECRAFT_VERSION=${LATEST_WATERFALL_VERSION}\r\n fi\r\n \r\n BUILD_EXISTS=$(curl -sSL https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all[] | contains($BUILD)' | grep true)\r\n \r\n if [ \"${BUILD_EXISTS}\" == \"true\" ] || [ ${BUILD_NUMBER} == \"latest\" ]; then\r\n echo -e \"Build is valid. Using version ${BUILD_NUMBER}\"\r\n else\r\n echo -e \"Using the latest paper build for version ${MINECRAFT_VERSION}\"\r\n BUILD_NUMBER=$(curl -sSL https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION} | jq -r '.builds.latest')\r\n fi\r\n \r\n echo \"Version being downloaded\"\r\n echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n echo -e \"Build: ${BUILD_NUMBER}\"\r\n DOWNLOAD_URL=https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download \r\nfi\r\n\r\nif [ -z ${SERVER_JARFILE} ]; then\r\n SERVER_JARFILE=server.jar\r\nfi\r\n\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\necho -e \"running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f config.yml ]; then\r\n echo -e \"Downloading waterfall config.yml\"\r\n curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/waterfall\/config.yml\r\nelse\r\n echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi", + "script": "#!\/bin\/bash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nmkdir -p \/mnt\/server\/\r\ncd \/mnt\/server\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n echo -e \"using supplied download url\"\r\n DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n if [ -z \"$VANILLA_VERSION\" ] || [ \"${MINECRAFT_VERSION}\" == \"latest\" ]; then\r\n echo -e \"getting latest supported mc version and latest paper build\"\r\n MINECRAFT_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall | jq -r '.versions[0]')\r\n BUILD_NUMBER=$(curl -sSL https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION} | jq -r '.builds.latest')\r\n VER_EXISTS=true\r\n else\r\n echo -e \"checking if version ${MINECRAFT_VERSION} exists\"\r\n VER_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall | jq -r --arg VERSION ${MINECRAFT_VERSION} '.versions[] | contains($VERSION)' | grep true)\r\n fi\r\n \r\n if [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n else\r\n echo -e \"Using the latest waterfall version\"\r\n MINECRAFT_VERSION=${LATEST_WATERFALL_VERSION}\r\n fi\r\n \r\n BUILD_EXISTS=$(curl -sSL https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all[] | contains($BUILD)' | grep true)\r\n \r\n if [ \"${BUILD_EXISTS}\" == \"true\" ] || [ ${BUILD_NUMBER} == \"latest\" ]; then\r\n echo -e \"Build is valid. Using version ${BUILD_NUMBER}\"\r\n else\r\n echo -e \"Using the latest paper build for version ${MINECRAFT_VERSION}\"\r\n BUILD_NUMBER=$(curl -sSL https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION} | jq -r '.builds.latest')\r\n fi\r\n \r\n echo \"Version being downloaded\"\r\n echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n echo -e \"Build: ${BUILD_NUMBER}\"\r\n DOWNLOAD_URL=https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download \r\nfi\r\n\r\nif [ -z ${SERVER_JARFILE} ]; then\r\n SERVER_JARFILE=server.jar\r\nfi\r\n\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\necho -e \"running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f config.yml ]; then\r\n echo -e \"Downloading waterfall config.yml\"\r\n curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/java\/waterfall\/config.yml\r\nelse\r\n echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi", "container": "debian:buster-slim", "entrypoint": "bash" } From 897109b07b9b285dfb2d59707f2216bc152d31e2 Mon Sep 17 00:00:00 2001 From: Omar Kamel <30291302+TekExplorer@users.noreply.github.com> Date: Fri, 20 Nov 2020 14:52:23 -0500 Subject: [PATCH 021/104] Small change to proxy readme --- minecraft/proxy/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/minecraft/proxy/README.md b/minecraft/proxy/README.md index f92c4a8d1..6be307ca4 100644 --- a/minecraft/proxy/README.md +++ b/minecraft/proxy/README.md @@ -1,12 +1,12 @@ # Minecraft Proxies * [Java](/minecraft/proxy/java/) - * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo/) * [Waterfall](/minecraft/proxy/java/waterfall/) * [Travertine](/minecraft/proxy/java/travertine/) * [Velocity](/minecraft/proxy/java/velocity/) + * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo/) * [Bedrock](/minecraft/proxy/bedrock/) - * [DragonProxy](/minecraft/proxy/bedrock/dragonproxy/) + * [DragonProxy](/minecraft/proxy/bedrock/dragonproxy/) (Abandoned in favor of GeyserMC) * [GeyserMC](/minecraft/proxy/bedrock/geyser/) * [Cross Platform](/minecraft/proxy/cross_platform) - * [Waterdog](/minecraft/proxy/waterdog/) \ No newline at end of file + * [Waterdog](/minecraft/proxy/waterdog/) From caf7f3b4b372b409945e09bb1df3b71bd80772a5 Mon Sep 17 00:00:00 2001 From: DiscoverSquishy <26318936+DiscoverSquishy@users.noreply.github.com> Date: Sat, 21 Nov 2020 22:21:31 +0300 Subject: [PATCH 022/104] Updated Compatibility with Velocity 1.1.x --- .../proxy/java/velocity/egg-velocity.json | 18 +- minecraft/proxy/java/velocity/velocity.toml | 185 ++++++++++-------- 2 files changed, 116 insertions(+), 87 deletions(-) diff --git a/minecraft/proxy/java/velocity/egg-velocity.json b/minecraft/proxy/java/velocity/egg-velocity.json index b8c444959..f201603d0 100644 --- a/minecraft/proxy/java/velocity/egg-velocity.json +++ b/minecraft/proxy/java/velocity/egg-velocity.json @@ -3,33 +3,33 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-07-14T20:36:29-04:00", + "exported_at": "2020-11-21T14:09:45-05:00", "name": "Velocity", "author": "parker@parkervcp.com", "description": "Velocity is a Minecraft server proxy with unparalleled server support, scalability, and flexibility.", + "features": null, "image": "quay.io\/pterodactyl\/core:java", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"velocity.toml\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"bind = \": \"bind = \\\"0.0.0.0:{{server.build.default.port}}\\\"\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Done (\"\r\n}", "logs": "{}", - "stop": "shutdown" + "stop": "end" }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Velocity Proxy Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napk add --no-cache curl\r\n\r\nmkdir -p \/mnt\/server\/\r\n\r\ncd \/mnt\/server\/\r\n\r\nif [ -z ${VELOCITY_VERSION} ] || [ ${VELOCITY_VERSION} == \"latest\" ]; then\r\n\tVELOCITY_VERSION=\/lastStableBuild\r\nfi\r\n\r\necho -e \"Getting download link\"\r\nDOWNLOAD_ENDPOINT=$(curl https:\/\/ci.velocitypowered.com\/job\/velocity\/${VELOCITY_VERSION}\/ | grep -Eo 'href=\"[^\\\"]+\"' | grep -vE \"view|fingerprint\" | grep \".jar\" | sed -n 's\/.*href=\"\\([^\"]*\\).*\/\\1\/p')\r\nDOWNLOAD_LINK=https:\/\/ci.velocitypowered.com\/job\/velocity\/lastStableBuild\/${DOWNLOAD_ENDPOINT}\r\n\r\necho -e \"Downloading ${DOWNLOAD_LINK}\"\r\ncurl ${DOWNLOAD_LINK} -o ${SERVER_JARFILE}\r\n\r\nif [ -f velocity.toml ]; then\r\n echo -e \"velocity config file exists\"\r\nelse\r\n echo -e \"downloading velocity config file.\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/proxy\/velocity\/velocity.toml -o velocity.toml\r\nfi\r\n\r\necho -e \"install complete\"", + "script": "#!\/bin\/ash\r\n# Velocity Proxy Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napk add --no-cache curl\r\n\r\nmkdir -p \/mnt\/server\/\r\n\r\ncd \/mnt\/server\/\r\n\r\nif [ -z ${VELOCITY_VERSION} ] || [ ${VELOCITY_VERSION} == \"latest\" ]; then\r\n\tVELOCITY_VERSION=\/latest\r\nfi\r\n\r\necho -e \"Getting download link\"\r\nDOWNLOAD_ENDPOINT=$(curl https:\/\/versions.velocitypowered.com\/download\/${VELOCITY_VERSION}\/ | grep -Eo 'href=\"[^\\\"]+\"' | grep -vE \"view|fingerprint\" | grep \".jar\" | sed -n 's\/.*href=\"\\([^\"]*\\).*\/\\1\/p')\r\nDOWNLOAD_LINK=https:\/\/versions.velocitypowered.com\/download\/${DOWNLOAD_ENDPOINT}\r\n\r\necho -e \"Downloading ${DOWNLOAD_LINK}\"\r\ncurl ${DOWNLOAD_LINK} -o ${SERVER_JARFILE}\r\n\r\nif [ -f velocity.toml ]; then\r\n echo -e \"velocity config file exists\"\r\nelse\r\n echo -e \"downloading velocity config file.\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/proxy\/velocity\/velocity.toml -o velocity.toml\r\nfi\r\n\r\necho -e \"install complete\"", "container": "alpine:3.10", "entrypoint": "ash" } }, - "variables": [ - { + "variables": [{ "name": "Velocity Version", "description": "The Velocity Proxy version to download.\r\n\r\nset to 'latest ' the download the last stable build.", "env_variable": "VELOCITY_VERSION", "default_value": "latest", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "required|string|max:20" }, { @@ -37,8 +37,8 @@ "description": "Server Jar File name", "env_variable": "SERVER_JARFILE", "default_value": "velocity.jar", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "required|string|max:20" } ] diff --git a/minecraft/proxy/java/velocity/velocity.toml b/minecraft/proxy/java/velocity/velocity.toml index 1221a6963..cc736d411 100644 --- a/minecraft/proxy/java/velocity/velocity.toml +++ b/minecraft/proxy/java/velocity/velocity.toml @@ -1,106 +1,135 @@ # Config version. Do not change this config-version = "1.0" - # What port should the proxy be bound to? By default, we'll bind to all addresses on port 25577. bind = "0.0.0.0:25577" - # What should be the MOTD? This gets displayed when the player adds your server to # their server list. Legacy color codes and JSON are accepted. motd = "&3A Velocity Server" - # What should we display for the maximum number of players? (Velocity does not support a cap # on the number of players online.) show-max-players = 500 - # Should we authenticate players with Mojang? By default, this is on. online-mode = true - +# If client's ISP/AS sent from this proxy is different from the one from Mojang's +# authentication server, the player is kicked. This disallows some VPN and proxy +# connections but is a weak form of protection. +prevent-client-proxy-connections = false # Should we forward IP addresses and other data to backend servers? # Available options: -# - "none": No forwarding will be done. All players will appear to be connecting from the -# proxy and will have offline-mode UUIDs. -# - "legacy": Forward player IPs and UUIDs in a BungeeCord-compatible format. Use this if -# you run servers using Minecraft 1.12 or lower. -# - "modern": Forward player IPs and UUIDs as part of the login process using Velocity's -# native forwarding. Only applicable for Minecraft 1.13 or higher. +# - "none": No forwarding will be done. All players will appear to be connecting +# from the proxy and will have offline-mode UUIDs. +# - "legacy": Forward player IPs and UUIDs in a BungeeCord-compatible format. Use this +# if you run servers using Minecraft 1.12 or lower. +# - "bungeeguard": Forward player IPs and UUIDs in a format supported by the BungeeGuard +# plugin. Use this if you run servers using Minecraft 1.12 or lower, and are +# unable to implement network level firewalling (on a shared host). +# - "modern": Forward player IPs and UUIDs as part of the login process using +# Velocity's native forwarding. Only applicable for Minecraft 1.13 or higher. player-info-forwarding-mode = "NONE" - -# If you are using modern IP forwarding, configure an unique secret here. -forwarding-secret = "FrP42MxySW6Y" - +# If you are using modern or BungeeGuard IP forwarding, configure an unique secret here. +forwarding-secret = "pNuOOnPLzGd4" # Announce whether or not your server supports Forge. If you run a modded server, we # suggest turning this on. +# +# If your network runs one modpack consistently, consider using ping-passthrough = "mods" +# instead for a nicer display in the server list. announce-forge = false +# If enabled (default is false) and the proxy is in online mode, Velocity will kick +# any existing player who is online if a duplicate connection attempt is made. +kick-existing-players = false +# Should Velocity pass server list ping requests to a backend server? +# Available options: +# - "disabled": No pass-through will be done. The velocity.toml and server-icon.png +# will determine the initial server list ping response. +# - "mods": Passes only the mod list from your backend server into the response. +# The first server in your try list (or forced host) with a mod list will be +# used. If no backend servers can be contacted, Velocity won't display any +# mod information. +# - "description": Uses the description and mod list from the backend server. The first +# server in the try (or forced host) list that responds is used for the +# description and mod list. +# - "all": Uses the backend server's response as the proxy response. The Velocity +# configuration is used if no servers could be contacted. +ping-passthrough = "DISABLED" [servers] -# Configure your servers here. Each key represents the server's name, and the value -# represents the IP address of the server to connect to. -lobby = "127.0.0.1:30066" -minigames = "127.0.0.1:30068" -factions = "127.0.0.1:30067" - -# In what order we should try servers when a player logs in or is kicked from aserver. -try = [ - "lobby" -] + # Configure your servers here. Each key represents the server's name, and the value + # represents the IP address of the server to connect to. + lobby = "127.0.0.1:30066" + minigames = "127.0.0.1:30068" + # In what order we should try servers when a player logs in or is kicked from aserver. + try = ["lobby"] + factions = "127.0.0.1:30067" [forced-hosts] -# Configure your forced hosts here. -"minigames.example.com" = [ - "minigames" -] -"lobby.example.com" = [ - "lobby" -] -"factions.example.com" = [ - "factions" -] + "minigames.example.com" = ["minigames"] + # Configure your forced hosts here. + "lobby.example.com" = ["lobby"] + "factions.example.com" = ["factions"] [advanced] -# How large a Minecraft packet has to be before we compress it. Setting this to zero will -# compress all packets, and setting it to -1 will disable compression entirely. -compression-threshold = 256 - -# How much compression should be done (from 0-9). The default is -1, which uses the -# default level of 6. -compression-level = -1 - -# How fast (in milliseconds) are clients allowed to connect after the last connection? By -# default, this is three seconds. Disable this by setting this to 0. -login-ratelimit = 3000 - -# Specify a custom timeout for connection timeouts here. The default is five seconds. -connection-timeout = 5000 - -# Specify a read timeout for connections here. The default is 30 seconds. -read-timeout = 30000 - -# Enables compatibility with HAProxy. -proxy-protocol = false + # Specify a custom timeout for connection timeouts here. The default is five seconds. + connection-timeout = 5000 + # Enables BungeeCord plugin messaging channel support on Velocity. + bungee-plugin-message-channel = true + # Specify a read timeout for connections here. The default is 30 seconds. + read-timeout = 30000 + # Enables compatibility with HAProxy. + proxy-protocol = false + # Enables TCP fast open support on the proxy. Requires the proxy to run on Linux. + tcp-fast-open = false + # Shows ping requests to the proxy from clients. + show-ping-requests = false + # By default, Velocity will attempt to gracefully handle situations where the user unexpectedly + # loses connection to the server without an explicit disconnect message by attempting to fall the + # user back, except in the case of read timeouts. BungeeCord will disconnect the user instead. You + # can disable this setting to use the BungeeCord behavior. + failover-on-unexpected-server-disconnect = true + # How much compression should be done (from 0-9). The default is -1, which uses the + # default level of 6. + compression-level = -1 + # Declares the proxy commands to 1.13+ clients. + announce-proxy-commands = true + # Enables the logging of commands + log-command-executions = false + # How large a Minecraft packet has to be before we compress it. Setting this to zero will + # compress all packets, and setting it to -1 will disable compression entirely. + compression-threshold = 256 + # How fast (in milliseconds) are clients allowed to connect after the last connection? By + # default, this is three seconds. Disable this by setting this to 0. + login-ratelimit = 3000 [query] -# Whether to enable responding to GameSpy 4 query responses or not. -enabled = false - -# If query is enabled, on what port should the query protocol listen on? -port = 25577 - -# This is the map name that is reported to the query services. -map = "Velocity" - -# Whether plugins should be shown in query response by default or not -show-plugins = false + # If query is enabled, on what port should the query protocol listen on? + port = 25577 + # Whether plugins should be shown in query response by default or not + show-plugins = false + # This is the map name that is reported to the query services. + map = "Velocity" + # Whether to enable responding to GameSpy 4 query responses or not. + enabled = false [metrics] -# Whether metrics will be reported to bStats (https://bstats.org). -# bStats collects some basic information, like how many people use Velocity and their -# player count. We recommend keeping bStats enabled, but if you're not comfortable with -# this, you can turn this setting off. There is no performance penalty associated with -# having metrics enabled, and data sent to bStats can't identify your server. -enabled = true - -# A unique, anonymous ID to identify this proxy with. -id = "b12f2e77-133c-4a5f-b288-d8833be3dc4d" - -log-failure = false - + # A unique, anonymous ID to identify this proxy with. + id = "" + log-failure = false + # Whether metrics will be reported to bStats (https://bstats.org). + # bStats collects some basic information, like how many people use Velocity and their + # player count. We recommend keeping bStats enabled, but if you're not comfortable with + # this, you can turn this setting off. There is no performance penalty associated with + # having metrics enabled, and data sent to bStats can't identify your server. + enabled = true + +# Legacy color codes and JSON are accepted in all messages. +[messages] + generic-connection-error = "&cAn internal error occurred in your connection." + already-connected = "&cYou are already connected to this proxy!" + online-mode-only = "&cThis server only accepts connections from online-mode clients.\n\n&7Did you change your username? Sign out of Minecraft, sign back in, and try again." + # Prefix when the player is disconnected from a server. + # First argument '%s': the server name + disconnect-prefix = "&cCan't connect to %s: " + no-available-servers = "&cThere are no available servers." + # Prefix when the player gets kicked from a server. + # First argument '%s': the server name + kick-prefix = "&cKicked from %s: " + moved-to-new-server-prefix = "&cThe server you were on kicked you: " \ No newline at end of file From b1300b310bbb4c24ae95f53a2e01b4f24df54c72 Mon Sep 17 00:00:00 2001 From: tmunsch Date: Sun, 22 Nov 2020 00:11:37 -0500 Subject: [PATCH 023/104] Added latest version curl from parker Added Parker's genius one liner --- minecraft/java/fabric/egg-fabric.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/minecraft/java/fabric/egg-fabric.json b/minecraft/java/fabric/egg-fabric.json index 29fe81a43..22bf5fe7d 100644 --- a/minecraft/java/fabric/egg-fabric.json +++ b/minecraft/java/fabric/egg-fabric.json @@ -20,8 +20,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Fabric MC Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq unzip dos2unix wget\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\nwget https:\/\/maven.fabricmc.net\/net\/fabricmc\/fabric-installer\/$FABRIC_VERSION\/fabric-installer-$FABRIC_VERSION.jar\r\njava -jar fabric-installer-$FABRIC_VERSION.jar server -downloadMinecraft\r\necho -e \"Install Complete\"", - "container": "openjdk:8-jdk-slim", + "script": "#!\/bin\/bash\r\n# Fabric MC Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq unzip dos2unix wget\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\nif [ -z \"$FABRIC_VERSION\" ] || [ \"$FABRIC_VERSION\" == \"latest\" ]; then\r\nFABRIC_VERSION=$(curl https:\/\/maven.fabricmc.net\/net\/fabricmc\/fabric-installer\/ | grep -Po '(?<=href=\")[^\"]*' | sort -h | tail -1 | sed 's,\/,,g')\r\nwget https:\/\/maven.fabricmc.net\/net\/fabricmc\/fabric-installer\/$FABRIC_VERSION\/fabric-installer-$FABRIC_VERSION.jar\r\nelse\r\nwget https:\/\/maven.fabricmc.net\/net\/fabricmc\/fabric-installer\/$FABRIC_VERSION\/fabric-installer-$FABRIC_VERSION.jar\r\nfi\r\njava -jar fabric-installer-$FABRIC_VERSION.jar server -downloadMinecraft\r\necho -e \"Install Complete\"", "container": "openjdk:8-jdk-slim", "entrypoint": "bash" } }, From 054b3e79c99658337aedc9cf7de952d2dde8a2da Mon Sep 17 00:00:00 2001 From: DiscoverSquishy <26318936+DiscoverSquishy@users.noreply.github.com> Date: Sun, 22 Nov 2020 09:51:01 +0300 Subject: [PATCH 024/104] Fixed download mechanism --- minecraft/proxy/java/velocity/egg-velocity.json | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/minecraft/proxy/java/velocity/egg-velocity.json b/minecraft/proxy/java/velocity/egg-velocity.json index f201603d0..cc014c614 100644 --- a/minecraft/proxy/java/velocity/egg-velocity.json +++ b/minecraft/proxy/java/velocity/egg-velocity.json @@ -3,13 +3,13 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-11-21T14:09:45-05:00", + "exported_at": "2020-11-22T01:50:29-05:00", "name": "Velocity", "author": "parker@parkervcp.com", "description": "Velocity is a Minecraft server proxy with unparalleled server support, scalability, and flexibility.", "features": null, - "image": "quay.io\/pterodactyl\/core:java", - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", + "image": "quay.io\/discoversquishy\/dockerimages:openjdk-15-hostpot", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -XX:MaxInlineLevel=15 -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"velocity.toml\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"bind = \": \"bind = \\\"0.0.0.0:{{server.build.default.port}}\\\"\"\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Done (\"\r\n}", @@ -18,14 +18,15 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Velocity Proxy Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napk add --no-cache curl\r\n\r\nmkdir -p \/mnt\/server\/\r\n\r\ncd \/mnt\/server\/\r\n\r\nif [ -z ${VELOCITY_VERSION} ] || [ ${VELOCITY_VERSION} == \"latest\" ]; then\r\n\tVELOCITY_VERSION=\/latest\r\nfi\r\n\r\necho -e \"Getting download link\"\r\nDOWNLOAD_ENDPOINT=$(curl https:\/\/versions.velocitypowered.com\/download\/${VELOCITY_VERSION}\/ | grep -Eo 'href=\"[^\\\"]+\"' | grep -vE \"view|fingerprint\" | grep \".jar\" | sed -n 's\/.*href=\"\\([^\"]*\\).*\/\\1\/p')\r\nDOWNLOAD_LINK=https:\/\/versions.velocitypowered.com\/download\/${DOWNLOAD_ENDPOINT}\r\n\r\necho -e \"Downloading ${DOWNLOAD_LINK}\"\r\ncurl ${DOWNLOAD_LINK} -o ${SERVER_JARFILE}\r\n\r\nif [ -f velocity.toml ]; then\r\n echo -e \"velocity config file exists\"\r\nelse\r\n echo -e \"downloading velocity config file.\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/proxy\/velocity\/velocity.toml -o velocity.toml\r\nfi\r\n\r\necho -e \"install complete\"", + "script": "#!\/bin\/ash\r\n# Velocity Proxy Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napk add --no-cache curl\r\n\r\nmkdir -p \/mnt\/server\/\r\n\r\ncd \/mnt\/server\/\r\n\r\nif [ -z ${VELOCITY_VERSION} ] || [ ${VELOCITY_VERSION} == \"latest\" ]; then\r\n\tVELOCITY_VERSION=\"latest\"\r\nfi\r\n\r\necho -e \"Getting download link\"\r\nDOWNLOAD_LINK=https:\/\/versions.velocitypowered.com\/download\/${VELOCITY_VERSION}\r\n\r\necho -e \"Downloading ${DOWNLOAD_LINK}\"\r\ncurl ${DOWNLOAD_LINK} -o ${SERVER_JARFILE}\r\n\r\nif [ -f velocity.toml ]; then\r\n echo -e \"velocity config file exists\"\r\nelse\r\n echo -e \"downloading velocity config file.\"\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/java\/velocity\/velocity.toml -o velocity.toml\r\nfi\r\n\r\necho -e \"install complete\"", "container": "alpine:3.10", "entrypoint": "ash" } }, - "variables": [{ + "variables": [ + { "name": "Velocity Version", - "description": "The Velocity Proxy version to download.\r\n\r\nset to 'latest ' the download the last stable build.", + "description": "The Velocity Proxy version to download.\r\n\r\nSet to 'latest ' the download the last stable build.\r\nSet to '1.1.x-SNAPSHOT' to get the latest dev build.", "env_variable": "VELOCITY_VERSION", "default_value": "latest", "user_viewable": true, @@ -34,7 +35,7 @@ }, { "name": "Server Jar File", - "description": "Server Jar File name", + "description": "Server Jarfile, by default this is set to 'velocity.jar'.\r\nSet it to otherwise if you wish to have a different jarfile name.", "env_variable": "SERVER_JARFILE", "default_value": "velocity.jar", "user_viewable": true, From 025588b2df933915064451d49f6ab56ce578584d Mon Sep 17 00:00:00 2001 From: DiscoverSquishy <26318936+DiscoverSquishy@users.noreply.github.com> Date: Sun, 22 Nov 2020 09:55:47 +0300 Subject: [PATCH 025/104] Tweaked some values Enabled TCP fast open as the container runs on debian. Cleared the forwarding secret, security measure. Renamed forwarding mode to LEGACY so users don't get the initial startup error, and would work out of the box. --- minecraft/proxy/java/velocity/velocity.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/minecraft/proxy/java/velocity/velocity.toml b/minecraft/proxy/java/velocity/velocity.toml index cc736d411..0e5741ac0 100644 --- a/minecraft/proxy/java/velocity/velocity.toml +++ b/minecraft/proxy/java/velocity/velocity.toml @@ -25,12 +25,12 @@ prevent-client-proxy-connections = false # unable to implement network level firewalling (on a shared host). # - "modern": Forward player IPs and UUIDs as part of the login process using # Velocity's native forwarding. Only applicable for Minecraft 1.13 or higher. -player-info-forwarding-mode = "NONE" +player-info-forwarding-mode = "legacy" # If you are using modern or BungeeGuard IP forwarding, configure an unique secret here. -forwarding-secret = "pNuOOnPLzGd4" +forwarding-secret = "" # Announce whether or not your server supports Forge. If you run a modded server, we # suggest turning this on. -# +# # If your network runs one modpack consistently, consider using ping-passthrough = "mods" # instead for a nicer display in the server list. announce-forge = false @@ -77,7 +77,7 @@ ping-passthrough = "DISABLED" # Enables compatibility with HAProxy. proxy-protocol = false # Enables TCP fast open support on the proxy. Requires the proxy to run on Linux. - tcp-fast-open = false + tcp-fast-open = true # Shows ping requests to the proxy from clients. show-ping-requests = false # By default, Velocity will attempt to gracefully handle situations where the user unexpectedly @@ -118,7 +118,7 @@ ping-passthrough = "DISABLED" # player count. We recommend keeping bStats enabled, but if you're not comfortable with # this, you can turn this setting off. There is no performance penalty associated with # having metrics enabled, and data sent to bStats can't identify your server. - enabled = true + enabled = false # Legacy color codes and JSON are accepted in all messages. [messages] From e4f31e91a6aaa1657d15c1c0058ad6de18a0f651 Mon Sep 17 00:00:00 2001 From: DiscoverSquishy <26318936+DiscoverSquishy@users.noreply.github.com> Date: Sun, 22 Nov 2020 19:38:50 +0300 Subject: [PATCH 026/104] Moved from my Quay Image --- minecraft/proxy/java/velocity/egg-velocity.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft/proxy/java/velocity/egg-velocity.json b/minecraft/proxy/java/velocity/egg-velocity.json index cc014c614..68a3f826a 100644 --- a/minecraft/proxy/java/velocity/egg-velocity.json +++ b/minecraft/proxy/java/velocity/egg-velocity.json @@ -8,7 +8,7 @@ "author": "parker@parkervcp.com", "description": "Velocity is a Minecraft server proxy with unparalleled server support, scalability, and flexibility.", "features": null, - "image": "quay.io\/discoversquishy\/dockerimages:openjdk-15-hostpot", + "image": "quay.io\/parkervcp\/pterodactyl-images:adoptopenjdk-15-hotspot", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -XX:MaxInlineLevel=15 -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"velocity.toml\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"bind = \": \"bind = \\\"0.0.0.0:{{server.build.default.port}}\\\"\"\r\n }\r\n }\r\n}", From 8b72fb81326e32f513ca35872f66ca37c63b24c5 Mon Sep 17 00:00:00 2001 From: Pedro Arenas Date: Tue, 24 Nov 2020 11:06:43 -0300 Subject: [PATCH 027/104] Update egg-paper.json The version of paper API used in this egg has been deprecated for the v2 of the API. --- minecraft/java/paper/egg-paper.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft/java/paper/egg-paper.json b/minecraft/java/paper/egg-paper.json index 6dda06d6d..f273935b5 100644 --- a/minecraft/java/paper/egg-paper.json +++ b/minecraft/java/paper/egg-paper.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache --update curl jq\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n echo -e \"using supplied download url\"\r\n DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n VER_EXISTS=`curl -s https:\/\/papermc.io\/api\/v1\/paper | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | IN($VERSION)' | grep true`\r\n LATEST_PAPER_VERSION=`curl -s https:\/\/papermc.io\/api\/v1\/paper | jq -r '.versions' | jq -r '.[0]'`\r\n \r\n if [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n else\r\n echo -e \"Using the latest paper version\"\r\n MINECRAFT_VERSION=${LATEST_PAPER_VERSION}\r\n fi\r\n \r\n BUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v1\/paper\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all[] | IN($BUILD)' | grep true`\r\n LATEST_PAPER_BUILD=`curl -s https:\/\/papermc.io\/api\/v1\/paper\/${MINECRAFT_VERSION} | jq -r '.builds.latest'`\r\n \r\n if [ \"${BUILD_EXISTS}\" == \"true\" ] || [ ${BUILD_NUMBER} == \"latest\" ]; then\r\n echo -e \"Build is valid. Using version ${BUILD_NUMBER}\"\r\n else\r\n echo -e \"Using the latest paper build\"\r\n BUILD_NUMBER=${LATEST_PAPER_BUILD}\r\n fi\r\n \r\n echo \"Version being downloaded\"\r\n echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n echo -e \"Build: ${BUILD_NUMBER}\"\r\n DOWNLOAD_URL=https:\/\/papermc.io\/api\/v1\/paper\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download \r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n mv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"Downloading MC server.properties\"\r\n curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", + "script": "#!\/bin\/bash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n echo -e \"using supplied download url\"\r\n DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n VER_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n LATEST_PAPER_VERSION=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper | jq -r '.versions' | jq -r '.[-1]'`\r\n \r\n if [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n else\r\n echo -e \"Using the latest paper version\"\r\n MINECRAFT_VERSION=${LATEST_PAPER_VERSION}\r\n fi\r\n \r\n BUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper\/versions\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | contains($BUILD)' | grep true`\r\n LATEST_PAPER_BUILD=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper\/versions\/${MINECRAFT_VERSION} | jq -r '.builds' | jq -r '.[-1]'`\r\n \r\n if [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n echo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n else\r\n echo -e \"Using the latest paper build for version ${MINECRAFT_VERSION}\"\r\n BUILD_NUMBER=${LATEST_PAPER_BUILD}\r\n fi\r\n \r\n\tJAR_NAME=paper-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n echo \"Version being downloaded\"\r\n echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n echo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name: ${JAR_NAME}\"\r\n DOWNLOAD_URL=https:\/\/papermc.io\/api\/v2\/projects\/paper\/versions\/${MINECRAFT_VERSION}\/builds\/${BUILD_NUMBER}\/downloads\/${JAR_NAME}\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n mv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"Downloading MC server.properties\"\r\n curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", "container": "alpine:3.9", "entrypoint": "ash" } From e75806737c3ae0e8dc43a29a5fbb8fe31265c64c Mon Sep 17 00:00:00 2001 From: Pedro Arenas Date: Tue, 24 Nov 2020 14:41:43 -0300 Subject: [PATCH 028/104] Fix issues with updated egg-paper.json - Fixed issue with code of "BUILD_EXISTS" where cant check correctly if build is valid in paper API - Little change in texts --- minecraft/java/paper/egg-paper.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft/java/paper/egg-paper.json b/minecraft/java/paper/egg-paper.json index f273935b5..0c1d9ec94 100644 --- a/minecraft/java/paper/egg-paper.json +++ b/minecraft/java/paper/egg-paper.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n echo -e \"using supplied download url\"\r\n DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n VER_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n LATEST_PAPER_VERSION=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper | jq -r '.versions' | jq -r '.[-1]'`\r\n \r\n if [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n else\r\n echo -e \"Using the latest paper version\"\r\n MINECRAFT_VERSION=${LATEST_PAPER_VERSION}\r\n fi\r\n \r\n BUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper\/versions\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | contains($BUILD)' | grep true`\r\n LATEST_PAPER_BUILD=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper\/versions\/${MINECRAFT_VERSION} | jq -r '.builds' | jq -r '.[-1]'`\r\n \r\n if [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n echo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n else\r\n echo -e \"Using the latest paper build for version ${MINECRAFT_VERSION}\"\r\n BUILD_NUMBER=${LATEST_PAPER_BUILD}\r\n fi\r\n \r\n\tJAR_NAME=paper-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n echo \"Version being downloaded\"\r\n echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n echo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name: ${JAR_NAME}\"\r\n DOWNLOAD_URL=https:\/\/papermc.io\/api\/v2\/projects\/paper\/versions\/${MINECRAFT_VERSION}\/builds\/${BUILD_NUMBER}\/downloads\/${JAR_NAME}\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n mv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"Downloading MC server.properties\"\r\n curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", + "script": "#!\/bin\/bash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n echo -e \"using supplied download url\"\r\n DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n VER_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n LATEST_PAPER_VERSION=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper | jq -r '.versions' | jq -r '.[-1]'`\r\n \r\n if [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n else\r\n echo -e \"Using the latest paper version\"\r\n MINECRAFT_VERSION=${LATEST_PAPER_VERSION}\r\n fi\r\n \r\n BUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper\/versions\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | tostring | contains($BUILD)' | grep true`\r\n LATEST_PAPER_BUILD=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper\/versions\/${MINECRAFT_VERSION} | jq -r '.builds' | jq -r '.[-1]'`\r\n \r\n if [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n echo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n else\r\n echo -e \"Using the latest paper build for version ${MINECRAFT_VERSION}\"\r\n BUILD_NUMBER=${LATEST_PAPER_BUILD}\r\n fi\r\n \r\n\tJAR_NAME=paper-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n echo \"Version being downloaded\"\r\n echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n echo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n DOWNLOAD_URL=https:\/\/papermc.io\/api\/v2\/projects\/paper\/versions\/${MINECRAFT_VERSION}\/builds\/${BUILD_NUMBER}\/downloads\/${JAR_NAME}\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n mv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"Downloading MC server.properties\"\r\n curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", "container": "alpine:3.9", "entrypoint": "ash" } From 73615fb05ba8687afd4c02d4c43e4854df2f44b3 Mon Sep 17 00:00:00 2001 From: Pedro Arenas Date: Tue, 24 Nov 2020 14:54:40 -0300 Subject: [PATCH 029/104] Update egg-paper.json - Add info about download url --- minecraft/java/paper/egg-paper.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft/java/paper/egg-paper.json b/minecraft/java/paper/egg-paper.json index 0c1d9ec94..802ee80d3 100644 --- a/minecraft/java/paper/egg-paper.json +++ b/minecraft/java/paper/egg-paper.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n echo -e \"using supplied download url\"\r\n DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n VER_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n LATEST_PAPER_VERSION=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper | jq -r '.versions' | jq -r '.[-1]'`\r\n \r\n if [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n else\r\n echo -e \"Using the latest paper version\"\r\n MINECRAFT_VERSION=${LATEST_PAPER_VERSION}\r\n fi\r\n \r\n BUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper\/versions\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | tostring | contains($BUILD)' | grep true`\r\n LATEST_PAPER_BUILD=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper\/versions\/${MINECRAFT_VERSION} | jq -r '.builds' | jq -r '.[-1]'`\r\n \r\n if [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n echo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n else\r\n echo -e \"Using the latest paper build for version ${MINECRAFT_VERSION}\"\r\n BUILD_NUMBER=${LATEST_PAPER_BUILD}\r\n fi\r\n \r\n\tJAR_NAME=paper-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n echo \"Version being downloaded\"\r\n echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n echo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n DOWNLOAD_URL=https:\/\/papermc.io\/api\/v2\/projects\/paper\/versions\/${MINECRAFT_VERSION}\/builds\/${BUILD_NUMBER}\/downloads\/${JAR_NAME}\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n mv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"Downloading MC server.properties\"\r\n curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", + "script": "#!\/bin\/bash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n echo -e \"Using supplied download url: ${DL_PATH}\"\r\n DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n VER_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n LATEST_PAPER_VERSION=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper | jq -r '.versions' | jq -r '.[-1]'`\r\n \r\n if [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n else\r\n echo -e \"Using the latest paper version\"\r\n MINECRAFT_VERSION=${LATEST_PAPER_VERSION}\r\n fi\r\n \r\n BUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper\/versions\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | tostring | contains($BUILD)' | grep true`\r\n LATEST_PAPER_BUILD=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper\/versions\/${MINECRAFT_VERSION} | jq -r '.builds' | jq -r '.[-1]'`\r\n \r\n if [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n echo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n else\r\n echo -e \"Using the latest paper build for version ${MINECRAFT_VERSION}\"\r\n BUILD_NUMBER=${LATEST_PAPER_BUILD}\r\n fi\r\n \r\n\tJAR_NAME=paper-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n echo \"Version being downloaded\"\r\n echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n echo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n DOWNLOAD_URL=https:\/\/papermc.io\/api\/v2\/projects\/paper\/versions\/${MINECRAFT_VERSION}\/builds\/${BUILD_NUMBER}\/downloads\/${JAR_NAME}\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n mv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"Downloading MC server.properties\"\r\n curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", "container": "alpine:3.9", "entrypoint": "ash" } From c7c33245a4e87ce8424453dba9708691a2dd8a4c Mon Sep 17 00:00:00 2001 From: Pedro Arenas Date: Tue, 24 Nov 2020 15:10:26 -0300 Subject: [PATCH 030/104] Update egg-paper.json --- minecraft/java/paper/egg-paper.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft/java/paper/egg-paper.json b/minecraft/java/paper/egg-paper.json index 802ee80d3..37fab96d8 100644 --- a/minecraft/java/paper/egg-paper.json +++ b/minecraft/java/paper/egg-paper.json @@ -18,8 +18,8 @@ "scripts": { "installation": { "script": "#!\/bin\/bash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n echo -e \"Using supplied download url: ${DL_PATH}\"\r\n DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n VER_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n LATEST_PAPER_VERSION=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper | jq -r '.versions' | jq -r '.[-1]'`\r\n \r\n if [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n else\r\n echo -e \"Using the latest paper version\"\r\n MINECRAFT_VERSION=${LATEST_PAPER_VERSION}\r\n fi\r\n \r\n BUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper\/versions\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | tostring | contains($BUILD)' | grep true`\r\n LATEST_PAPER_BUILD=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper\/versions\/${MINECRAFT_VERSION} | jq -r '.builds' | jq -r '.[-1]'`\r\n \r\n if [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n echo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n else\r\n echo -e \"Using the latest paper build for version ${MINECRAFT_VERSION}\"\r\n BUILD_NUMBER=${LATEST_PAPER_BUILD}\r\n fi\r\n \r\n\tJAR_NAME=paper-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n echo \"Version being downloaded\"\r\n echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n echo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n DOWNLOAD_URL=https:\/\/papermc.io\/api\/v2\/projects\/paper\/versions\/${MINECRAFT_VERSION}\/builds\/${BUILD_NUMBER}\/downloads\/${JAR_NAME}\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n mv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"Downloading MC server.properties\"\r\n curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", - "container": "alpine:3.9", - "entrypoint": "ash" + "container": "debian:buster-slim", + "entrypoint": "bash" } }, "variables": [ From 71d17ccd00eb4ab7125a7b98b3750118efb4be84 Mon Sep 17 00:00:00 2001 From: tmunsch Date: Fri, 27 Nov 2020 20:02:38 -0500 Subject: [PATCH 031/104] Create minio.sh --- storage/minio.sh | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 storage/minio.sh diff --git a/storage/minio.sh b/storage/minio.sh new file mode 100644 index 000000000..889c4f026 --- /dev/null +++ b/storage/minio.sh @@ -0,0 +1,63 @@ +#!/bin/bash +################################## +echo Starting up.... +echo "Startup Type: (normal/rotate)" +echo Detected $STARTUP_TYPE +if [ -f "key.txt" ]; then +echo "Key file detected..." +export MINIO_ACCESS_KEY=`cat key.txt` +else +echo minioadmin > key.txt +echo "No key file detected...Preparing First Time Boot" +fi +if [ -f "secret.txt" ]; then +echo "Secret file detected..." +export MINIO_SECRET_KEY=`cat secret.txt` +else +echo minioadmin > secret.txt +echo "No secret file detected...Preparing First Time Boot" +fi +if [ -f "oldsecret.txt" ]; then +echo "Old secret file detected..." +export MINIO_SECRET_KEY_OLD=`cat oldsecret.txt` +else +echo ".." +fi +if [ -f "oldkey.txt" ]; then +echo "Old key file detected..." +export MINIO_ACCESS_KEY_OLD=`cat oldkey.txt` +else +echo "......" +fi +if [ -f "justrotated.txt" ]; then +echo "Previous key rotation detected...." +echo "Clearing the Lanes...." +unset MINIO_ACCESS_KEY_OLD +unset MINIO_SECRET_KEY_OLD +STARTUP_TYPE=normal +rm justrotated.txt +rm oldsecret.txt +rm oldkey.txt +else +echo "......" +fi +########################################## +if [ -z "$STARTUP_TYPE" ] || [ "$STARTUP_TYPE" == "rotate" ]; then +touch justrotated.txt +export MINIO_ACCESS_KEY_OLD=$MINIO_ACCESS_KEY +echo $MINIO_ACCESS_KEY_OLD > oldkey.txt +export MINIO_SECRET_KEY_OLD=$MINIO_SECRET_KEY +echo $MINIO_SECRET_KEY_OLD > oldsecret.txt +export MINIO_ACCESS_KEY=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1) +echo $MINIO_ACCESS_KEY > key.txt +export MINIO_SECRET_KEY=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1) +echo $MINIO_SECRET_KEY > secret.txt +echo Your New Access Key is: $MINIO_ACCESS_KEY +echo Your New Secret Key is: $MINIO_SECRET_KEY +echo Your Old Access Key is: $MINIO_ACCESS_KEY_OLD +echo Your Old Access Key is: $MINIO_SECRET_KEY_OLD +echo Booting... +./minio server data --address 0.0.0.0:$SERVER_PORT +else +./minio server data --address 0.0.0.0:$SERVER_PORT +fi From ee4c054d27cc4f465a4e22b0ba865ea918b69ece Mon Sep 17 00:00:00 2001 From: tmunsch Date: Fri, 27 Nov 2020 20:33:10 -0500 Subject: [PATCH 032/104] Cleaned up Key file locations Moved all keys to keys folder --- storage/minio.sh | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/storage/minio.sh b/storage/minio.sh index 889c4f026..97441d059 100644 --- a/storage/minio.sh +++ b/storage/minio.sh @@ -3,55 +3,55 @@ echo Starting up.... echo "Startup Type: (normal/rotate)" echo Detected $STARTUP_TYPE -if [ -f "key.txt" ]; then +if [ -f "keys/key.txt" ]; then echo "Key file detected..." -export MINIO_ACCESS_KEY=`cat key.txt` +export MINIO_ACCESS_KEY=`cat keys/key.txt` else -echo minioadmin > key.txt +echo minioadmin > keys/key.txt echo "No key file detected...Preparing First Time Boot" fi -if [ -f "secret.txt" ]; then +if [ -f "keys/secret.txt" ]; then echo "Secret file detected..." -export MINIO_SECRET_KEY=`cat secret.txt` +export MINIO_SECRET_KEY=`cat keys/secret.txt` else -echo minioadmin > secret.txt +echo minioadmin > keys/secret.txt echo "No secret file detected...Preparing First Time Boot" fi -if [ -f "oldsecret.txt" ]; then +if [ -f "keys/oldsecret.txt" ]; then echo "Old secret file detected..." -export MINIO_SECRET_KEY_OLD=`cat oldsecret.txt` +export MINIO_SECRET_KEY_OLD=`cat keys/oldsecret.txt` else echo ".." fi -if [ -f "oldkey.txt" ]; then +if [ -f "keys/oldkey.txt" ]; then echo "Old key file detected..." -export MINIO_ACCESS_KEY_OLD=`cat oldkey.txt` +export MINIO_ACCESS_KEY_OLD=`cat keys/oldkey.txt` else echo "......" fi -if [ -f "justrotated.txt" ]; then +if [ -f "keys/justrotated.txt" ]; then echo "Previous key rotation detected...." echo "Clearing the Lanes...." unset MINIO_ACCESS_KEY_OLD unset MINIO_SECRET_KEY_OLD STARTUP_TYPE=normal -rm justrotated.txt -rm oldsecret.txt -rm oldkey.txt +rm keys/justrotated.txt +rm keys/oldsecret.txt +rm keys/oldkey.txt else echo "......" fi ########################################## if [ -z "$STARTUP_TYPE" ] || [ "$STARTUP_TYPE" == "rotate" ]; then -touch justrotated.txt +touch keys/justrotated.txt export MINIO_ACCESS_KEY_OLD=$MINIO_ACCESS_KEY -echo $MINIO_ACCESS_KEY_OLD > oldkey.txt +echo $MINIO_ACCESS_KEY_OLD > keys/oldkey.txt export MINIO_SECRET_KEY_OLD=$MINIO_SECRET_KEY -echo $MINIO_SECRET_KEY_OLD > oldsecret.txt +echo $MINIO_SECRET_KEY_OLD > keys/oldsecret.txt export MINIO_ACCESS_KEY=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1) -echo $MINIO_ACCESS_KEY > key.txt +echo $MINIO_ACCESS_KEY > keys/key.txt export MINIO_SECRET_KEY=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1) -echo $MINIO_SECRET_KEY > secret.txt +echo $MINIO_SECRET_KEY > keys/secret.txt echo Your New Access Key is: $MINIO_ACCESS_KEY echo Your New Secret Key is: $MINIO_SECRET_KEY echo Your Old Access Key is: $MINIO_ACCESS_KEY_OLD From b42ff750d25306d2102803f1f9e5dbdc35b84933 Mon Sep 17 00:00:00 2001 From: tmunsch Date: Fri, 27 Nov 2020 20:46:17 -0500 Subject: [PATCH 033/104] Cleaned up startup --- storage/minio.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/storage/minio.sh b/storage/minio.sh index 97441d059..ba131cb90 100644 --- a/storage/minio.sh +++ b/storage/minio.sh @@ -20,14 +20,10 @@ fi if [ -f "keys/oldsecret.txt" ]; then echo "Old secret file detected..." export MINIO_SECRET_KEY_OLD=`cat keys/oldsecret.txt` -else -echo ".." fi if [ -f "keys/oldkey.txt" ]; then echo "Old key file detected..." export MINIO_ACCESS_KEY_OLD=`cat keys/oldkey.txt` -else -echo "......" fi if [ -f "keys/justrotated.txt" ]; then echo "Previous key rotation detected...." @@ -38,8 +34,6 @@ STARTUP_TYPE=normal rm keys/justrotated.txt rm keys/oldsecret.txt rm keys/oldkey.txt -else -echo "......" fi ########################################## if [ -z "$STARTUP_TYPE" ] || [ "$STARTUP_TYPE" == "rotate" ]; then From af8982f6c6213b88abd9a214d0e9add2ed498777 Mon Sep 17 00:00:00 2001 From: tmunsch Date: Fri, 27 Nov 2020 20:49:45 -0500 Subject: [PATCH 034/104] Cleaning up still --- storage/minio.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/storage/minio.sh b/storage/minio.sh index ba131cb90..48b5818ee 100644 --- a/storage/minio.sh +++ b/storage/minio.sh @@ -1,8 +1,7 @@ #!/bin/bash ################################## echo Starting up.... -echo "Startup Type: (normal/rotate)" -echo Detected $STARTUP_TYPE +echo "Startup Type: $STARTUP_TYPE" if [ -f "keys/key.txt" ]; then echo "Key file detected..." export MINIO_ACCESS_KEY=`cat keys/key.txt` From b3275943ca5496f4bd0a16c75222192ac4367a12 Mon Sep 17 00:00:00 2001 From: tmunsch Date: Fri, 27 Nov 2020 21:30:39 -0500 Subject: [PATCH 035/104] Added Egg file --- storage/egg-minio-s3.json | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 storage/egg-minio-s3.json diff --git a/storage/egg-minio-s3.json b/storage/egg-minio-s3.json new file mode 100644 index 000000000..e7ce05de9 --- /dev/null +++ b/storage/egg-minio-s3.json @@ -0,0 +1,37 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2020-11-27T21:24:29-05:00", + "name": "Minio S3", + "author": "accounts@bofanodes.io", + "description": "MinIO is a cloud storage server compatible with Amazon S3, released under Apache License v2. As an object store, MinIO can store unstructured data such as photos, videos, log files, backups and container images. The maximum size of an object is 5TB.", + "features": null, + "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu", + "startup": ".\/minio.sh", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"guide\"\r\n}", + "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#\r\n#\r\napt update\r\napt install -y wget\r\ncd \/mnt\/server\r\nwget https:\/\/dl.min.io\/server\/minio\/release\/linux-amd64\/minio\r\nchmod +x minio\r\nmkdir data\r\nmkdir keys\r\nwget https:\/\/github.com\/tmunsch\/eggs\/raw\/minio\/storage\/minio.sh\r\nchmod +x minio.sh\r\nexport MINIO_ACCESS_KEY=$(cat \/dev\/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)\r\necho $MINIO_ACCESS_KEY > keys\/key.txt\r\nexport MINIO_SECRET_KEY=$(cat \/dev\/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)\r\necho $MINIO_SECRET_KEY > keys\/secret.txt\r\necho done", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Startup Type", + "description": "normal or rotate", + "env_variable": "STARTUP_TYPE", + "default_value": "normal", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:normal,rotate" + } + ] +} \ No newline at end of file From 1fde6e08ea76f9ec5ec8fe653d6d4df71702363b Mon Sep 17 00:00:00 2001 From: tmunsch Date: Fri, 27 Nov 2020 21:32:54 -0500 Subject: [PATCH 036/104] Create minio.sh --- storage/minio/minio.sh | 56 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 storage/minio/minio.sh diff --git a/storage/minio/minio.sh b/storage/minio/minio.sh new file mode 100644 index 000000000..48b5818ee --- /dev/null +++ b/storage/minio/minio.sh @@ -0,0 +1,56 @@ +#!/bin/bash +################################## +echo Starting up.... +echo "Startup Type: $STARTUP_TYPE" +if [ -f "keys/key.txt" ]; then +echo "Key file detected..." +export MINIO_ACCESS_KEY=`cat keys/key.txt` +else +echo minioadmin > keys/key.txt +echo "No key file detected...Preparing First Time Boot" +fi +if [ -f "keys/secret.txt" ]; then +echo "Secret file detected..." +export MINIO_SECRET_KEY=`cat keys/secret.txt` +else +echo minioadmin > keys/secret.txt +echo "No secret file detected...Preparing First Time Boot" +fi +if [ -f "keys/oldsecret.txt" ]; then +echo "Old secret file detected..." +export MINIO_SECRET_KEY_OLD=`cat keys/oldsecret.txt` +fi +if [ -f "keys/oldkey.txt" ]; then +echo "Old key file detected..." +export MINIO_ACCESS_KEY_OLD=`cat keys/oldkey.txt` +fi +if [ -f "keys/justrotated.txt" ]; then +echo "Previous key rotation detected...." +echo "Clearing the Lanes...." +unset MINIO_ACCESS_KEY_OLD +unset MINIO_SECRET_KEY_OLD +STARTUP_TYPE=normal +rm keys/justrotated.txt +rm keys/oldsecret.txt +rm keys/oldkey.txt +fi +########################################## +if [ -z "$STARTUP_TYPE" ] || [ "$STARTUP_TYPE" == "rotate" ]; then +touch keys/justrotated.txt +export MINIO_ACCESS_KEY_OLD=$MINIO_ACCESS_KEY +echo $MINIO_ACCESS_KEY_OLD > keys/oldkey.txt +export MINIO_SECRET_KEY_OLD=$MINIO_SECRET_KEY +echo $MINIO_SECRET_KEY_OLD > keys/oldsecret.txt +export MINIO_ACCESS_KEY=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1) +echo $MINIO_ACCESS_KEY > keys/key.txt +export MINIO_SECRET_KEY=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1) +echo $MINIO_SECRET_KEY > keys/secret.txt +echo Your New Access Key is: $MINIO_ACCESS_KEY +echo Your New Secret Key is: $MINIO_SECRET_KEY +echo Your Old Access Key is: $MINIO_ACCESS_KEY_OLD +echo Your Old Access Key is: $MINIO_SECRET_KEY_OLD +echo Booting... +./minio server data --address 0.0.0.0:$SERVER_PORT +else +./minio server data --address 0.0.0.0:$SERVER_PORT +fi From 55dc57901dd3c02516e1be97c71ba193706913ca Mon Sep 17 00:00:00 2001 From: tmunsch Date: Fri, 27 Nov 2020 21:33:35 -0500 Subject: [PATCH 037/104] Add files via upload --- storage/minio/egg-minio-s3.json | 37 +++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 storage/minio/egg-minio-s3.json diff --git a/storage/minio/egg-minio-s3.json b/storage/minio/egg-minio-s3.json new file mode 100644 index 000000000..e7ce05de9 --- /dev/null +++ b/storage/minio/egg-minio-s3.json @@ -0,0 +1,37 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2020-11-27T21:24:29-05:00", + "name": "Minio S3", + "author": "accounts@bofanodes.io", + "description": "MinIO is a cloud storage server compatible with Amazon S3, released under Apache License v2. As an object store, MinIO can store unstructured data such as photos, videos, log files, backups and container images. The maximum size of an object is 5TB.", + "features": null, + "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu", + "startup": ".\/minio.sh", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"guide\"\r\n}", + "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#\r\n#\r\napt update\r\napt install -y wget\r\ncd \/mnt\/server\r\nwget https:\/\/dl.min.io\/server\/minio\/release\/linux-amd64\/minio\r\nchmod +x minio\r\nmkdir data\r\nmkdir keys\r\nwget https:\/\/github.com\/tmunsch\/eggs\/raw\/minio\/storage\/minio.sh\r\nchmod +x minio.sh\r\nexport MINIO_ACCESS_KEY=$(cat \/dev\/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)\r\necho $MINIO_ACCESS_KEY > keys\/key.txt\r\nexport MINIO_SECRET_KEY=$(cat \/dev\/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)\r\necho $MINIO_SECRET_KEY > keys\/secret.txt\r\necho done", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Startup Type", + "description": "normal or rotate", + "env_variable": "STARTUP_TYPE", + "default_value": "normal", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:normal,rotate" + } + ] +} \ No newline at end of file From 199e482a380e69d673b967a910dfcc93221908a3 Mon Sep 17 00:00:00 2001 From: tmunsch Date: Fri, 27 Nov 2020 21:34:55 -0500 Subject: [PATCH 038/104] Delete egg-minio-s3.json --- storage/egg-minio-s3.json | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 storage/egg-minio-s3.json diff --git a/storage/egg-minio-s3.json b/storage/egg-minio-s3.json deleted file mode 100644 index e7ce05de9..000000000 --- a/storage/egg-minio-s3.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2020-11-27T21:24:29-05:00", - "name": "Minio S3", - "author": "accounts@bofanodes.io", - "description": "MinIO is a cloud storage server compatible with Amazon S3, released under Apache License v2. As an object store, MinIO can store unstructured data such as photos, videos, log files, backups and container images. The maximum size of an object is 5TB.", - "features": null, - "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu", - "startup": ".\/minio.sh", - "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"guide\"\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", - "stop": "^C" - }, - "scripts": { - "installation": { - "script": "#\r\n#\r\napt update\r\napt install -y wget\r\ncd \/mnt\/server\r\nwget https:\/\/dl.min.io\/server\/minio\/release\/linux-amd64\/minio\r\nchmod +x minio\r\nmkdir data\r\nmkdir keys\r\nwget https:\/\/github.com\/tmunsch\/eggs\/raw\/minio\/storage\/minio.sh\r\nchmod +x minio.sh\r\nexport MINIO_ACCESS_KEY=$(cat \/dev\/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)\r\necho $MINIO_ACCESS_KEY > keys\/key.txt\r\nexport MINIO_SECRET_KEY=$(cat \/dev\/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)\r\necho $MINIO_SECRET_KEY > keys\/secret.txt\r\necho done", - "container": "debian:buster-slim", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Startup Type", - "description": "normal or rotate", - "env_variable": "STARTUP_TYPE", - "default_value": "normal", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|in:normal,rotate" - } - ] -} \ No newline at end of file From 476c67e25dd193d93cd3e4e032e196091eb1dd17 Mon Sep 17 00:00:00 2001 From: tmunsch Date: Fri, 27 Nov 2020 21:35:03 -0500 Subject: [PATCH 039/104] Delete minio.sh --- storage/minio.sh | 56 ------------------------------------------------ 1 file changed, 56 deletions(-) delete mode 100644 storage/minio.sh diff --git a/storage/minio.sh b/storage/minio.sh deleted file mode 100644 index 48b5818ee..000000000 --- a/storage/minio.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash -################################## -echo Starting up.... -echo "Startup Type: $STARTUP_TYPE" -if [ -f "keys/key.txt" ]; then -echo "Key file detected..." -export MINIO_ACCESS_KEY=`cat keys/key.txt` -else -echo minioadmin > keys/key.txt -echo "No key file detected...Preparing First Time Boot" -fi -if [ -f "keys/secret.txt" ]; then -echo "Secret file detected..." -export MINIO_SECRET_KEY=`cat keys/secret.txt` -else -echo minioadmin > keys/secret.txt -echo "No secret file detected...Preparing First Time Boot" -fi -if [ -f "keys/oldsecret.txt" ]; then -echo "Old secret file detected..." -export MINIO_SECRET_KEY_OLD=`cat keys/oldsecret.txt` -fi -if [ -f "keys/oldkey.txt" ]; then -echo "Old key file detected..." -export MINIO_ACCESS_KEY_OLD=`cat keys/oldkey.txt` -fi -if [ -f "keys/justrotated.txt" ]; then -echo "Previous key rotation detected...." -echo "Clearing the Lanes...." -unset MINIO_ACCESS_KEY_OLD -unset MINIO_SECRET_KEY_OLD -STARTUP_TYPE=normal -rm keys/justrotated.txt -rm keys/oldsecret.txt -rm keys/oldkey.txt -fi -########################################## -if [ -z "$STARTUP_TYPE" ] || [ "$STARTUP_TYPE" == "rotate" ]; then -touch keys/justrotated.txt -export MINIO_ACCESS_KEY_OLD=$MINIO_ACCESS_KEY -echo $MINIO_ACCESS_KEY_OLD > keys/oldkey.txt -export MINIO_SECRET_KEY_OLD=$MINIO_SECRET_KEY -echo $MINIO_SECRET_KEY_OLD > keys/oldsecret.txt -export MINIO_ACCESS_KEY=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1) -echo $MINIO_ACCESS_KEY > keys/key.txt -export MINIO_SECRET_KEY=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1) -echo $MINIO_SECRET_KEY > keys/secret.txt -echo Your New Access Key is: $MINIO_ACCESS_KEY -echo Your New Secret Key is: $MINIO_SECRET_KEY -echo Your Old Access Key is: $MINIO_ACCESS_KEY_OLD -echo Your Old Access Key is: $MINIO_SECRET_KEY_OLD -echo Booting... -./minio server data --address 0.0.0.0:$SERVER_PORT -else -./minio server data --address 0.0.0.0:$SERVER_PORT -fi From 971cd784642aacb3232fb946965ef28395cdd80f Mon Sep 17 00:00:00 2001 From: tmunsch Date: Fri, 27 Nov 2020 21:39:18 -0500 Subject: [PATCH 040/104] Delete egg-minio-s3.json --- storage/minio/egg-minio-s3.json | 37 --------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 storage/minio/egg-minio-s3.json diff --git a/storage/minio/egg-minio-s3.json b/storage/minio/egg-minio-s3.json deleted file mode 100644 index e7ce05de9..000000000 --- a/storage/minio/egg-minio-s3.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2020-11-27T21:24:29-05:00", - "name": "Minio S3", - "author": "accounts@bofanodes.io", - "description": "MinIO is a cloud storage server compatible with Amazon S3, released under Apache License v2. As an object store, MinIO can store unstructured data such as photos, videos, log files, backups and container images. The maximum size of an object is 5TB.", - "features": null, - "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu", - "startup": ".\/minio.sh", - "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"guide\"\r\n}", - "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", - "stop": "^C" - }, - "scripts": { - "installation": { - "script": "#\r\n#\r\napt update\r\napt install -y wget\r\ncd \/mnt\/server\r\nwget https:\/\/dl.min.io\/server\/minio\/release\/linux-amd64\/minio\r\nchmod +x minio\r\nmkdir data\r\nmkdir keys\r\nwget https:\/\/github.com\/tmunsch\/eggs\/raw\/minio\/storage\/minio.sh\r\nchmod +x minio.sh\r\nexport MINIO_ACCESS_KEY=$(cat \/dev\/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)\r\necho $MINIO_ACCESS_KEY > keys\/key.txt\r\nexport MINIO_SECRET_KEY=$(cat \/dev\/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)\r\necho $MINIO_SECRET_KEY > keys\/secret.txt\r\necho done", - "container": "debian:buster-slim", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Startup Type", - "description": "normal or rotate", - "env_variable": "STARTUP_TYPE", - "default_value": "normal", - "user_viewable": true, - "user_editable": true, - "rules": "required|string|in:normal,rotate" - } - ] -} \ No newline at end of file From e1d9bb1fbcbc15f292be6b768479e540745aebc8 Mon Sep 17 00:00:00 2001 From: tmunsch Date: Fri, 27 Nov 2020 21:39:36 -0500 Subject: [PATCH 041/104] Add files via upload --- storage/minio/egg-minio-s3.json | 37 +++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 storage/minio/egg-minio-s3.json diff --git a/storage/minio/egg-minio-s3.json b/storage/minio/egg-minio-s3.json new file mode 100644 index 000000000..246cf00fd --- /dev/null +++ b/storage/minio/egg-minio-s3.json @@ -0,0 +1,37 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2020-11-27T21:39:14-05:00", + "name": "Minio S3", + "author": "accounts@bofanodes.io", + "description": "MinIO is a cloud storage server compatible with Amazon S3, released under Apache License v2. As an object store, MinIO can store unstructured data such as photos, videos, log files, backups and container images. The maximum size of an object is 5TB.", + "features": null, + "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu", + "startup": ".\/minio.sh", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"guide\"\r\n}", + "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#\r\n#\r\napt update\r\napt install -y wget\r\ncd \/mnt\/server\r\nwget https:\/\/dl.min.io\/server\/minio\/release\/linux-amd64\/minio\r\nchmod +x minio\r\nmkdir data\r\nmkdir keys\r\nwget https:\/\/github.com\/tmunsch\/eggs\/raw\/minio\/storage\/minio\/minio.sh\r\nchmod +x minio.sh\r\nexport MINIO_ACCESS_KEY=$(cat \/dev\/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)\r\necho $MINIO_ACCESS_KEY > keys\/key.txt\r\nexport MINIO_SECRET_KEY=$(cat \/dev\/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)\r\necho $MINIO_SECRET_KEY > keys\/secret.txt\r\necho done", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Startup Type", + "description": "normal or rotate", + "env_variable": "STARTUP_TYPE", + "default_value": "normal", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:normal,rotate" + } + ] +} \ No newline at end of file From c9040395ca572285a462002001c941bbe832399d Mon Sep 17 00:00:00 2001 From: tmunsch Date: Fri, 27 Nov 2020 21:42:59 -0500 Subject: [PATCH 042/104] Added storage for s3 minio --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8fcfa050f..b59d6471d 100644 --- a/README.md +++ b/README.md @@ -174,4 +174,8 @@ If you are reading this it looks like you are looking to add an egg to your serv [Xonotic](/xonotic/xonotic/) -[Cryofall](/cryofall/) \ No newline at end of file +[Cryofall](/cryofall/) + +## [Storage](/storage/) +### S3 Storage +* [minio](/storage/minio) From 413f221b6b74f8f53ce2f3e1d7baed9af124ce2a Mon Sep 17 00:00:00 2001 From: tmunsch Date: Fri, 27 Nov 2020 21:46:27 -0500 Subject: [PATCH 043/104] Create README.md --- storage/minio/README.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 storage/minio/README.md diff --git a/storage/minio/README.md b/storage/minio/README.md new file mode 100644 index 000000000..a3751189b --- /dev/null +++ b/storage/minio/README.md @@ -0,0 +1,8 @@ +# minio s3 + +## Known Issues +Double encryption may occur if you manually manipulate files in the /keys directory + +##Required Server Ports + +#### Key rotation is handled automatically, DO NOT manually delete files in /keys From eed9c06a7e3994a6d581784b3738564805484743 Mon Sep 17 00:00:00 2001 From: tmunsch Date: Fri, 27 Nov 2020 21:47:12 -0500 Subject: [PATCH 044/104] Update README.md --- storage/minio/README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/storage/minio/README.md b/storage/minio/README.md index a3751189b..eb3f0eaee 100644 --- a/storage/minio/README.md +++ b/storage/minio/README.md @@ -3,6 +3,4 @@ ## Known Issues Double encryption may occur if you manually manipulate files in the /keys directory -##Required Server Ports - #### Key rotation is handled automatically, DO NOT manually delete files in /keys From 4e4d9898adab27c605b1bc326055520a0ae30308 Mon Sep 17 00:00:00 2001 From: tmunsch Date: Fri, 27 Nov 2020 21:52:58 -0500 Subject: [PATCH 045/104] Update README.md --- storage/minio/README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/storage/minio/README.md b/storage/minio/README.md index eb3f0eaee..1983fcbed 100644 --- a/storage/minio/README.md +++ b/storage/minio/README.md @@ -1,6 +1,22 @@ # minio s3 +## Features +Auto generate keys on server creation bypassing default minio keys + + +Automatic Key rotation using "rotate" startup feature + +## Auto Rotate +It's possible to rotate your keys by changing the startup option to "rotate" + + +Once this is changed restart your server and it will automatically move your current keys to old and create your new keys + + +Be sure to change your startup back to "normal" once you have started your server using "rotate". This will ensure that you don't accidentally rotate your keys twice + ## Known Issues + Double encryption may occur if you manually manipulate files in the /keys directory #### Key rotation is handled automatically, DO NOT manually delete files in /keys From ed3159b34bc79bd6268758cd044ad7a88698c3a0 Mon Sep 17 00:00:00 2001 From: tmunsch Date: Fri, 27 Nov 2020 21:53:36 -0500 Subject: [PATCH 046/104] Update README.md --- storage/minio/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/minio/README.md b/storage/minio/README.md index 1983fcbed..da88976a3 100644 --- a/storage/minio/README.md +++ b/storage/minio/README.md @@ -17,6 +17,6 @@ Be sure to change your startup back to "normal" once you have started your serve ## Known Issues -Double encryption may occur if you manually manipulate files in the /keys directory +Double encryption may occur if you manually manipulate files in the keys directory -#### Key rotation is handled automatically, DO NOT manually delete files in /keys +#### Key rotation is handled automatically, DO NOT manually delete files in keys directory From 9b13e1cd98360edaabdc03caed7c2b5e06fc4fd9 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 28 Nov 2020 06:01:54 +0100 Subject: [PATCH 047/104] Added missing pacjkages and use nodejs14 --- bots/twitch/sogebot/egg-soge-bot.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bots/twitch/sogebot/egg-soge-bot.json b/bots/twitch/sogebot/egg-soge-bot.json index a173034ef..bdb354568 100644 --- a/bots/twitch/sogebot/egg-soge-bot.json +++ b/bots/twitch/sogebot/egg-soge-bot.json @@ -3,11 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-09-06T10:51:50+02:00", + "exported_at": "2020-11-28T06:01:04+01:00", "name": "SogeBot", "author": "info@goover.de", "description": "sogeBot - Free Twitch Bot built on Node.js https:\/\/sogebot.xyz\/", - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-12", + "features": null, + "image": "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-14", "startup": "npm start", "config": { "files": "{\r\n \".env\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"PORT\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", @@ -17,8 +18,8 @@ }, "scripts": { "installation": { - "script": "#\/bin\/bash\r\napt -y update\r\napt -y upgrade\r\napt install -y curl unzip sqlite jq wget\r\n#export NODE_OPTIONS=--max-old-space-size=8192\r\n\r\ncd \/mnt\/server\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\nelse\r\n VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n if [ \"${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n DOWNLOAD_LINK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH})\r\n else\r\n echo -e \"defaulting to latest release\"\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\n#echo $DOWNLOAD_LINK\r\nwget -N $DOWNLOAD_LINK\r\nunzip $MATCH-*.zip\r\nrm -fR unzip $MATCH-*.zip\r\n\r\nnpm install -g npm@latest\r\n\/usr\/local\/bin\/npm ci\r\n\r\nexit 0", - "container": "node:12-buster-slim", + "script": "#\/bin\/bash\r\napt -y update\r\napt -y upgrade\r\napt install -y curl unzip sqlite jq wget python3 build-essential\r\nexport NODE_OPTIONS=--max-old-space-size=8192\r\n\r\ncd \/mnt\/server\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\nelse\r\n VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n if [ \"${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n DOWNLOAD_LINK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH})\r\n else\r\n echo -e \"defaulting to latest release\"\r\n DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\n#echo $DOWNLOAD_LINK\r\nwget -N $DOWNLOAD_LINK\r\nunzip -o $MATCH-*.zip\r\nrm -fR $MATCH-*.zip\r\n\r\necho \"Installing depencies...\"\r\n\/usr\/local\/bin\/npm ci 2>&1 | tee npmlog.txt\r\n\r\nexit 0", + "container": "node:14-buster-slim", "entrypoint": "bash" } }, @@ -51,4 +52,4 @@ "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From c14f6b5b980160be97b5616bcf354dc105f2a99f Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Mon, 30 Nov 2020 16:57:07 +0100 Subject: [PATCH 048/104] Update DOtNet to recommended DotNet5 --- steamcmd_servers/eco/egg-eco.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/steamcmd_servers/eco/egg-eco.json b/steamcmd_servers/eco/egg-eco.json index 5ae987050..4b57f7b85 100644 --- a/steamcmd_servers/eco/egg-eco.json +++ b/steamcmd_servers/eco/egg-eco.json @@ -3,11 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-09-15T15:37:08+02:00", + "exported_at": "2020-11-30T16:56:23+01:00", "name": "Eco", "author": "info@goover.de", "description": "Eco is an online world from Strange Loop Games where players must build civilization using resources from an ecosystem that can be damaged and destroyed. The world of Eco is an incredibly reactive one, and whatever any player does in the world affects the underlying ecosystem.", - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_dotnet", + "features": null, + "image": "quay.io\/parkervcp\/pterodactyl-images:debian_dotnet-5", "startup": "export DOTNET_BUNDLE_EXTRACT_BASE_DIR=.\/dotnet-bundle && .\/EcoServer", "config": { "files": "{\r\n \"Configs\/Network.eco\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"GameServerPort\": \"{{server.build.default.port}}\",\r\n \"WebServerPort\": \"{{server.build.env.WEB_PORT}}\",\r\n \"PublicServer\": \"{{server.build.env.PUB_SRV}}\",\r\n \"Password\": \"{{server.build.env.SRV_PWD}}\",\r\n \"UPnPEnabled\": \"{{server.build.env.UPNP}}\",\r\n \"Description\": \"{{server.build.env.SRV_DES}}\"\r\n }\r\n }\r\n}", From f9fd36d9f98ca8aae7a20a7ecf3ca9e87a3a00e0 Mon Sep 17 00:00:00 2001 From: Michael <28601081+clrxbl@users.noreply.github.com> Date: Tue, 1 Dec 2020 10:29:17 +0100 Subject: [PATCH 049/104] Add flags to prevent this issue --- stock-eggs/minecraft/egg-bungeecord.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stock-eggs/minecraft/egg-bungeecord.json b/stock-eggs/minecraft/egg-bungeecord.json index 3f28d96b2..7c34decec 100644 --- a/stock-eggs/minecraft/egg-bungeecord.json +++ b/stock-eggs/minecraft/egg-bungeecord.json @@ -8,7 +8,7 @@ "author": "support@pterodactyl.io", "description": "For a long time, Minecraft server owners have had a dream that encompasses a free, easy, and reliable way to connect multiple Minecraft servers together. BungeeCord is the answer to said dream. Whether you are a small server wishing to string multiple game-modes together, or the owner of the ShotBow Network, BungeeCord is the ideal solution for you. With the help of BungeeCord, you will be able to unlock your community's full potential.", "image": "quay.io\/pterodactyl\/core:java", - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"config.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"listeners[0].query_enabled\": true,\r\n \"listeners[0].query_port\": \"{{server.build.default.port}}\",\r\n \"listeners[0].host\": \"0.0.0.0:{{server.build.default.port}}\",\r\n \"servers.*.address\": {\r\n \"regex:^(127\\\\.0\\\\.0\\\\.1|localhost)(:\\\\d{1,5})?$\": \"{{config.docker.interface}}$2\"\r\n }\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Listening on \",\r\n \"userInteraction\": [\r\n \"Listening on \/0.0.0.0:25577\"\r\n ]\r\n}", @@ -42,4 +42,4 @@ "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" } ] -} \ No newline at end of file +} From c3b9050ed80a723c62ca25d2813f76a8c1dfa391 Mon Sep 17 00:00:00 2001 From: Michael <28601081+clrxbl@users.noreply.github.com> Date: Tue, 1 Dec 2020 10:35:41 +0100 Subject: [PATCH 050/104] Apply the same workaround to Travertine --- minecraft/proxy/java/travertine/egg-travertine.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft/proxy/java/travertine/egg-travertine.json b/minecraft/proxy/java/travertine/egg-travertine.json index 053189f1a..1de388663 100644 --- a/minecraft/proxy/java/travertine/egg-travertine.json +++ b/minecraft/proxy/java/travertine/egg-travertine.json @@ -8,7 +8,7 @@ "author": "parker@parkervcp.com", "description": "Travertine is a fork of the well-known Waterfall server teleportation suite.", "image": "quay.io\/pterodactyl\/core:java", - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"config.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"listeners[0].host\": \"0.0.0.0:{{server.build.default.port}}\",\r\n \"servers.*.address\": {\r\n \"127.0.0.1\": \"{{config.docker.interface}}\",\r\n \"localhost\": \"{{config.docker.interface}}\"\r\n }\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Listening on \",\r\n \"userInteraction\": [\r\n \"Listening on \/0.0.0.0:\"\r\n ]\r\n}", @@ -60,4 +60,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From d36eb98ead98941686c5c8802cafca3f66a6e227 Mon Sep 17 00:00:00 2001 From: Michael <28601081+clrxbl@users.noreply.github.com> Date: Tue, 1 Dec 2020 10:35:54 +0100 Subject: [PATCH 051/104] Apply the same workaround to the Waterfall egg --- minecraft/proxy/java/waterfall/egg-waterfall.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft/proxy/java/waterfall/egg-waterfall.json b/minecraft/proxy/java/waterfall/egg-waterfall.json index 664263661..8d170e29d 100644 --- a/minecraft/proxy/java/waterfall/egg-waterfall.json +++ b/minecraft/proxy/java/waterfall/egg-waterfall.json @@ -8,7 +8,7 @@ "author": "hostmaster@waterfallgaming.net", "description": "Waterfall is a fork of the well-known BungeeCord server teleportation suite.", "image": "quay.io\/pterodactyl\/core:java", - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", + "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"config.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"listeners[0].host\": \"0.0.0.0:{{server.build.default.port}}\",\r\n \"servers.*.address\": {\r\n \"127.0.0.1\": \"{{config.docker.interface}}\",\r\n \"localhost\": \"{{config.docker.interface}}\"\r\n }\r\n }\r\n }\r\n}", "startup": "{\r\n \"done\": \"Listening on \",\r\n \"userInteraction\": [\r\n \"Listening on \/0.0.0.0:\"\r\n ]\r\n}", From 6410510abcfe1f0dbcb66012167f2b8bd0af5e3f Mon Sep 17 00:00:00 2001 From: Ethan Jones Date: Tue, 1 Dec 2020 08:58:43 -0700 Subject: [PATCH 052/104] "Ballte" Eye -> Battle Eye --- .../ark_survival_evolved/egg-ark--survival-evolved.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json b/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json index b64e0cd26..78614403b 100644 --- a/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json +++ b/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json @@ -105,7 +105,7 @@ "rules": "required|boolean" }, { - "name": "Ballte Eye", + "name": "Battle Eye", "description": "Enable BattleEye\r\n\r\n0 to disable\r\n1 to enable\r\n\r\ndefault=\"1\"", "env_variable": "BATTLE_EYE", "default_value": "1", @@ -114,4 +114,4 @@ "rules": "required|boolean" } ] -} \ No newline at end of file +} From 2c2fcf6e6f5455929af1708e2552d2a3258a18bf Mon Sep 17 00:00:00 2001 From: parkervcp Date: Tue, 1 Dec 2020 21:02:04 -0500 Subject: [PATCH 053/104] update bedrock install resolves #809 --- minecraft/bedrock/bedrock/egg-vanilla-bedrock.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/minecraft/bedrock/bedrock/egg-vanilla-bedrock.json b/minecraft/bedrock/bedrock/egg-vanilla-bedrock.json index e05438c2a..c0f53a63e 100644 --- a/minecraft/bedrock/bedrock/egg-vanilla-bedrock.json +++ b/minecraft/bedrock/bedrock/egg-vanilla-bedrock.json @@ -3,10 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-10-16T15:10:46+00:00", + "exported_at": "2020-12-01T21:01:12-05:00", "name": "Vanilla Bedrock", "author": "parker@parkervcp.com", "description": "Bedrock Edition (also known as the Bedrock Version, Bedrock Codebase, Bedrock Engine or just Bedrock) refers to the multi-platform family of editions of Minecraft developed by Mojang AB, Microsoft Studios, 4J Studios, and SkyBox Labs. Prior to this term, as the engine originated with Pocket Edition, this entire product family was referred to as \"Pocket Edition\", \"MCPE\", or \"Pocket\/Windows 10 Edition\".", + "features": null, "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", "startup": ".\/bedrock_server", "config": { @@ -17,7 +18,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 \"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 \"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\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 whitlist.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 whitlist.json\r\n\r\necho -e \"Done\"", "container": "debian:buster-slim", "entrypoint": "bash" } From 419a1f26424a3c3036ce1539d06c5eb27be0348a Mon Sep 17 00:00:00 2001 From: BMGHosting <63407777+ankit2951@users.noreply.github.com> Date: Wed, 2 Dec 2020 20:34:45 -0600 Subject: [PATCH 054/104] Add files via upload --- Holdfast/Dockerfile.txt | 35 ++++++++ Holdfast/README.md.txt | 19 +++++ Holdfast/egg-holdfast-na-w.json | 144 ++++++++++++++++++++++++++++++++ Holdfast/entrypoint.sh | 31 +++++++ 4 files changed, 229 insertions(+) create mode 100644 Holdfast/Dockerfile.txt create mode 100644 Holdfast/README.md.txt create mode 100644 Holdfast/egg-holdfast-na-w.json create mode 100644 Holdfast/entrypoint.sh diff --git a/Holdfast/Dockerfile.txt b/Holdfast/Dockerfile.txt new file mode 100644 index 000000000..1b61d2cd7 --- /dev/null +++ b/Holdfast/Dockerfile.txt @@ -0,0 +1,35 @@ +# ---------------------------------- +# Environment: ubuntu +# Minimum Panel Version: 0.7.X +# ---------------------------------- +FROM ubuntu:18.04 + +LABEL author="Ankit Patel" maintainer="ankit@bmghosting.com" + +ENV DEBIAN_FRONTEND noninteractive + +## add container user +RUN useradd -m -d /home/container -s /bin/bash container + +## update base packages +RUN apt update \ + && apt upgrade -y + +## install dependencies +RUN apt install -y gcc g++ libgcc1 lib32gcc1 gdb libc6 libstdc++6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 bzip2 zlib1g iproute2 net-tools netcat telnet libatomic1 libsdl1.2debian libsdl2-2.0-0 \ + libfontconfig libicu60 libiculx60 icu-devtools libunwind8 libssl1.0.0 libssl1.0-dev sqlite3 libsqlite3-dev libmariadbclient-dev libduktape202 libzip4 locales ffmpeg apt-transport-https + +## Steamclient.so Link +RUN ln -s "/home/container/steamcmd/linux64/steamclient.so" "/usr/lib/x86_64-linux-gnu/steamclient.so" + +## configure locale +RUN update-locale lang=en_US.UTF-8 \ + && dpkg-reconfigure --frontend noninteractive locales + +USER container +ENV USER=container HOME=/home/container + +WORKDIR /home/container + +COPY ./entrypoint.sh /entrypoint.sh +CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/Holdfast/README.md.txt b/Holdfast/README.md.txt new file mode 100644 index 000000000..d97a40828 --- /dev/null +++ b/Holdfast/README.md.txt @@ -0,0 +1,19 @@ +# What is Holdfast: Nations At War ? +Fight on multiple fronts in Holdfast: Nations At War - A competitive multiplayer first and third person shooter set during the great Napoleonic Era. Charge into battle with over 150 players per server! + +> [Holdfast: NaW](https://store.steampowered.com/app/589290/Holdfast_Nations_At_War/) + +logo + +# How to import an egg in [Pterodactyl](https://pterodactyl.io/) + +1. Download [egg-holdfast-na-w.json](https://github.com/ankit2951/pterodactyl-holdfast/blob/main/egg-holdfast-na-w.json). +> It's easiest to right click the raw button and save as. +2. In your panel go to the Nests section in the admin part of the panel +3. Click the green Import Egg button +4. Browse to the json file you saved earlier +5. Select what nest you want to put the egg in. +> If you want a new nest you need to create it before importing the egg. +6. Restart the daemon on your node before creating a server using the new egg(s). + +# You must restart your daemon after importing an egg diff --git a/Holdfast/egg-holdfast-na-w.json b/Holdfast/egg-holdfast-na-w.json new file mode 100644 index 000000000..f04c4fcd1 --- /dev/null +++ b/Holdfast/egg-holdfast-na-w.json @@ -0,0 +1,144 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2020-10-18T19:13:53-04:00", + "name": "Holdfast NaW", + "author": "ankit@bmghosting.com", + "description": "Holdfast: Nations at War", + "image": "bmghosting\/pterodactyl-holdfast", + "startup": "\".\/holdfastnaw-dedicated\/Holdfast NaW\" -startserver -batchmode -nographics -screen-width 320 -screen-height 240 -screen-quality Fastest -framerate {{FPSMAX}} --serverheadless -serverConfigFilePath holdfastnaw-dedicated\/configs\/{{SERVER_CONFIG_PATH}} -logFile holdfastnaw-dedicated\/logs_output\/output_{{SERVER_CONFIG_PATH}} -logArchivesDirectory holdfastnaw-dedicated\/{{SERVER_LOG_ARCHIVE_PATH}}\/ -adminCommandsLogFilePath holdfastnaw-dedicated\/logs_adminactions\/admin_{{SERVER_CONFIG_PATH}} -playersLogFilePath holdfastnaw-dedicated\/logs_playerlogin\/players_{{SERVER_CONFIG_PATH}} -scoreboardLogFilePath holdfastnaw-dedicated\/logs_score\/scorelog_{{SERVER_CONFIG_PATH}} -chatLogFilePath holdfastnaw-dedicated\/logs_chat\/chatlog_{{SERVER_CONFIG_PATH}} -workshopDataPath holdfastnaw-dedicated\/workshop -micSpammersPlayersFilePath holdfastnaw-dedicated\/micspammers.txt -mutedVoipPlayersFilePath holdfastnaw-dedicated\/mutedplayersvoip.txt -mutedChatPlayersFilePath holdfastnaw-dedicated\/mutedplayerschat.txt -bannedPlayersFilePath holdfastnaw-dedicated\/bannedplayers.txt -p {{SERVER_PORT}} -l \"94.130.66.231\" -o 7101", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"STEAMAPPS_INTERFACE_VERSION008\",\r\n \"userInteraction\": []\r\n}", + "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id ffound here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# EXTRA_FLAGS - when a server has extra glas for things like beta installs or updates.\r\n#\r\n##\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates git\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server\/holdfastnaw-dedicated +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## copy config to the configs folder - avoid rewrite from steamCMD update\r\ncd \/mnt\/server\/holdfastnaw-dedicated\r\nmkdir -p configs \r\ngit clone https:\/\/github.com\/ankit2951\/holdfast-config.git configs\r\ncp serverconfig_default.txt configs\/serverconfig_default.txt\r\n \r\n## Read\/Write access\r\nchmod -R 777 \/mnt\/server\/*", + "container": "ubuntu:18.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Config Name", + "description": "Tells the server which config to load in the configs folder. Put .txt at the end of the config name or else the server will not launch.", + "env_variable": "SERVER_CONFIG_PATH", + "default_value": "serverconfig_default.txt", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:200" + }, + { + "name": "Server Name", + "description": "Server name that shows up on the server browser.", + "env_variable": "SERVER_NAME", + "default_value": "Server Hosted by BMGHosting.com", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:200" + }, + { + "name": "Welcome Message", + "description": "Welcome Message in text chat.", + "env_variable": "MOTD", + "default_value": "Welcome!", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:500" + }, + { + "name": "Server Region", + "description": "Region of the world the server is located in. \r\nOptions: europe \/ usa \/ australia \/ brazil \/ china \/ japan \/ russia \/ southkorea", + "env_variable": "REGION", + "default_value": "europe", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:50" + }, + { + "name": "Admin Password", + "description": "Password for Admin Login (F1).", + "env_variable": "ADMIN_PASS", + "default_value": "ChangeMe123", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:50" + }, + { + "name": "Server Password", + "description": "Server Password to lock the server. Leave blank if you want the server public.", + "env_variable": "SERVER_PASS", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|max:50" + }, + { + "name": "Max Players", + "description": "Max Players", + "env_variable": "PLAYERS", + "default_value": "", + "user_viewable": true, + "user_editable": false, + "rules": "required|numeric" + }, + { + "name": "Server Comm Port", + "description": "Server Comm Port", + "env_variable": "SERVER_COMM_PORT", + "default_value": "", + "user_viewable": true, + "user_editable": false, + "rules": "required|numeric" + }, + { + "name": "Server Query Port", + "description": "Server Query Port", + "env_variable": "SERVER_QUERY_PORT", + "default_value": "", + "user_viewable": true, + "user_editable": false, + "rules": "required|numeric" + }, + { + "name": "Server FPS", + "description": "Server FPS", + "env_variable": "FPSMAX", + "default_value": "", + "user_viewable": true, + "user_editable": false, + "rules": "required|numeric" + }, + { + "name": "Server Log Archive", + "description": "Server Log Archive", + "env_variable": "SERVER_LOG_ARCHIVE_PATH", + "default_value": "logs_archive", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:200" + }, + { + "name": "Steam App ID", + "description": "Steam CMD App ID", + "env_variable": "SRCDS_APPID", + "default_value": "1424230", + "user_viewable": false, + "user_editable": false, + "rules": "required|numeric" + }, + { + "name": "Holdfast Build", + "description": "To apply a beta branch, do -beta.\r\nIf you are wanting to specify a beta branch, do -beta .\r\nIf the beta branch has a password, do -beta -betapassword .", + "env_variable": "EXTRA_FLAGS", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|max:100" + } + ] +} \ No newline at end of file diff --git a/Holdfast/entrypoint.sh b/Holdfast/entrypoint.sh new file mode 100644 index 000000000..06deaca88 --- /dev/null +++ b/Holdfast/entrypoint.sh @@ -0,0 +1,31 @@ +#!/bin/bash +cd /home/container + +# Make internal Docker IP address available to processes. +export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` + +# Modify the configuration variables using sed +pushd holdfastnaw-dedicated/configs/ +if [ -f "$SERVER_CONFIG_PATH" ]; then + echo "Found configuration file - replacing variables" + sed -i "s/^server_name .*/server_name $(printf '%s\n' "$SERVER_NAME" | sed -e 's/[\/&]/\\&/g')/g" "$SERVER_CONFIG_PATH" + sed -i "s/^maximum_players .*/maximum_players $(printf '%s\n' "$PLAYERS" | sed -e 's/[\/&]/\\&/g')/g" "$SERVER_CONFIG_PATH" + sed -i "s/^server_welcome_message .*/server_welcome_message $(printf '%s\n' "$MOTD" | sed -e 's/[\/&]/\\&/g')/g" "$SERVER_CONFIG_PATH" + sed -i "s/^server_region .*/server_region $(printf '%s\n' "$REGION" | sed -e 's/[\/&]/\\&/g')/g" "$SERVER_CONFIG_PATH" + sed -i "s/^server_admin_password .*/server_admin_password $(printf '%s\n' "$ADMIN_PASS" | sed -e 's/[\/&]/\\&/g')/g" "$SERVER_CONFIG_PATH" + sed -i "s/^#\{0,1\}server_password .*/server_password $(printf '%s\n' "$SERVER_PASS" | sed -e 's/[\/&]/\\&/g')/g" "$SERVER_CONFIG_PATH" + sed -i "s/^server_port .*/server_port $(printf '%s\n' "$SERVER_PORT" | sed -e 's/[\/&]/\\&/g')/g" "$SERVER_CONFIG_PATH" + sed -i "s/^steam_communications_port .*/steam_communications_port $(printf '%s\n' "$SERVER_COMM_PORT" | sed -e 's/[\/&]/\\&/g')/g" "$SERVER_CONFIG_PATH" + sed -i "s/^steam_query_port .*/steam_query_port $(printf '%s\n' "$SERVER_QUERY_PORT" | sed -e 's/[\/&]/\\&/g')/g" "$SERVER_CONFIG_PATH" +else + echo "Configuration file not found: $SERVER_CONFIG_PATH" +fi +popd + +# Replace Startup Variables +MODIFIED_STARTUP=$(echo $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')) +START_COMMAND=$(echo -e ${MODIFIED_STARTUP}) +echo -e ":/home/container$ ${START_COMMAND}" + +# Run the Server +eval ${MODIFIED_STARTUP} \ No newline at end of file From 6c0441bb374d380b30c8f458ee60271f9b4e91e0 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Thu, 3 Dec 2020 08:16:13 -0500 Subject: [PATCH 055/104] update for java 11 --- minecraft/java/paper/egg-paper.json | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/minecraft/java/paper/egg-paper.json b/minecraft/java/paper/egg-paper.json index 37fab96d8..df6fb5759 100644 --- a/minecraft/java/paper/egg-paper.json +++ b/minecraft/java/paper/egg-paper.json @@ -3,11 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-08-01T04:49:37-04:00", + "exported_at": "2020-12-03T13:14:51+00:00", "name": "Paper", "author": "parker@pterodactyl.io", "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", - "image": "quay.io\/pterodactyl\/core:java", + "features": null, + "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", @@ -28,8 +29,8 @@ "description": "The version of minecraft to download. \r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.", "env_variable": "MINECRAFT_VERSION", "default_value": "latest", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "nullable|string|max:20" }, { @@ -37,8 +38,8 @@ "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, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" }, { @@ -46,8 +47,8 @@ "description": "A URL to use to download a server.jar rather than the ones in the install script. This is not user viewable.", "env_variable": "DL_PATH", "default_value": "", - "user_viewable": 0, - "user_editable": 0, + "user_viewable": false, + "user_editable": false, "rules": "nullable|string" }, { @@ -55,9 +56,9 @@ "description": "The build number for the paper release.\r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.", "env_variable": "BUILD_NUMBER", "default_value": "latest", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From 1e1aceda81d6b254e3a7f4209275a21b0caddc78 Mon Sep 17 00:00:00 2001 From: TASelwyn <37274951+TASelwyn@users.noreply.github.com> Date: Fri, 4 Dec 2020 11:38:38 -0500 Subject: [PATCH 056/104] paper api update Paper Spigot & Waterfall & Travertine --- minecraft/java/paper/egg-paper.json | 4 +- .../proxy/java/travertine/egg-travertine.json | 37 ++++++++++--------- .../proxy/java/waterfall/egg-waterfall.json | 31 ++++++++-------- 3 files changed, 37 insertions(+), 35 deletions(-) diff --git a/minecraft/java/paper/egg-paper.json b/minecraft/java/paper/egg-paper.json index df6fb5759..b05690d42 100644 --- a/minecraft/java/paper/egg-paper.json +++ b/minecraft/java/paper/egg-paper.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-12-03T13:14:51+00:00", + "exported_at": "2020-12-04T11:36:19-05:00", "name": "Paper", "author": "parker@pterodactyl.io", "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", @@ -18,7 +18,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n echo -e \"Using supplied download url: ${DL_PATH}\"\r\n DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n VER_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n LATEST_PAPER_VERSION=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper | jq -r '.versions' | jq -r '.[-1]'`\r\n \r\n if [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n else\r\n echo -e \"Using the latest paper version\"\r\n MINECRAFT_VERSION=${LATEST_PAPER_VERSION}\r\n fi\r\n \r\n BUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper\/versions\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | tostring | contains($BUILD)' | grep true`\r\n LATEST_PAPER_BUILD=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/paper\/versions\/${MINECRAFT_VERSION} | jq -r '.builds' | jq -r '.[-1]'`\r\n \r\n if [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n echo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n else\r\n echo -e \"Using the latest paper build for version ${MINECRAFT_VERSION}\"\r\n BUILD_NUMBER=${LATEST_PAPER_BUILD}\r\n fi\r\n \r\n\tJAR_NAME=paper-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n echo \"Version being downloaded\"\r\n echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n echo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n DOWNLOAD_URL=https:\/\/papermc.io\/api\/v2\/projects\/paper\/versions\/${MINECRAFT_VERSION}\/builds\/${BUILD_NUMBER}\/downloads\/${JAR_NAME}\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n mv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"Downloading MC server.properties\"\r\n curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", + "script": "#!\/bin\/bash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=paper\r\napt update\r\napt install -y curl jq\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\nif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\nelse\r\n\techo -e \"Using the latest ${PROJECT} version\"\r\n\tMINECRAFT_VERSION=${LATEST_VERSION}\r\nfi\r\nBUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | tostring | contains($BUILD)' | grep true`\r\nLATEST_BUILD=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION} | jq -r '.builds' | jq -r '.[-1]'`\r\nif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\nelse\r\n\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\tBUILD_NUMBER=${LATEST_BUILD}\r\nfi\r\nJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\necho \"Version being downloaded\"\r\necho -e \"MC Version: ${MINECRAFT_VERSION}\"\r\necho -e \"Build: ${BUILD_NUMBER}\"\r\necho -e \"JAR Name of Build: ${JAR_NAME}\"\r\nDOWNLOAD_URL=https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION}\/builds\/${BUILD_NUMBER}\/downloads\/${JAR_NAME}\r\n\r\ncd \/mnt\/server\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n\techo -e \"Downloading MC server.properties\"\r\n\tcurl -o server.properties 'https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties'\r\nelse\r\n\techo -e \"MC server.properties exists. Will not pull a new file\"\r\nfi", "container": "debian:buster-slim", "entrypoint": "bash" } diff --git a/minecraft/proxy/java/travertine/egg-travertine.json b/minecraft/proxy/java/travertine/egg-travertine.json index 1de388663..2ee6e8b38 100644 --- a/minecraft/proxy/java/travertine/egg-travertine.json +++ b/minecraft/proxy/java/travertine/egg-travertine.json @@ -3,11 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-08-11T15:24:12-04:00", + "exported_at": "2020-12-04T11:36:21-05:00", "name": "Travertine", "author": "parker@parkervcp.com", - "description": "Travertine is a fork of the well-known Waterfall server teleportation suite.", - "image": "quay.io\/pterodactyl\/core:java", + "description": "Travertine is a fork of Waterfall with 1.7 protocol support. Waterfall is a fork of the well-known BungeeCord server teleportation suite.", + "features": null, + "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"config.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"listeners[0].host\": \"0.0.0.0:{{server.build.default.port}}\",\r\n \"servers.*.address\": {\r\n \"127.0.0.1\": \"{{config.docker.interface}}\",\r\n \"localhost\": \"{{config.docker.interface}}\"\r\n }\r\n }\r\n }\r\n}", @@ -17,7 +18,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nmkdir -p \/mnt\/server\/\r\ncd \/mnt\/server\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n echo -e \"using supplied download url\"\r\n DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n if [ -z \"$VANILLA_VERSION\" ] || [ \"${MINECRAFT_VERSION}\" == \"latest\" ]; then\r\n echo -e \"getting latest supported mc version and latest paper build\"\r\n MINECRAFT_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/travertine | jq -r '.versions[0]')\r\n BUILD_NUMBER=$(curl -sSL https:\/\/papermc.io\/api\/v1\/travertine\/${MINECRAFT_VERSION} | jq -r '.builds.latest')\r\n VER_EXISTS=true\r\n else\r\n echo -e \"checking if version ${MINECRAFT_VERSION} exists\"\r\n VER_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v1\/travertine | jq -r --arg VERSION ${MINECRAFT_VERSION} '.versions[] | contains($VERSION)' | grep true)\r\n fi\r\n \r\n if [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n else\r\n echo -e \"Using the latest travertine version\"\r\n MINECRAFT_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/travertine | jq -r '.versions[0]')\r\n fi\r\n \r\n BUILD_EXISTS=$(curl -sSL https:\/\/papermc.io\/api\/v1\/travertine\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all[] | contains($BUILD)' | grep true)\r\n \r\n if [ \"${BUILD_EXISTS}\" == \"true\" ] || [ ${BUILD_NUMBER} == \"latest\" ]; then\r\n echo -e \"Build is valid. Using version ${BUILD_NUMBER}\"\r\n else\r\n echo -e \"Using the latest paper build for version ${MINECRAFT_VERSION}\"\r\n BUILD_NUMBER=$(curl -sSL https:\/\/papermc.io\/api\/v1\/travertine\/${MINECRAFT_VERSION} | jq -r '.builds.latest')\r\n fi\r\n \r\n echo \"Version being downloaded\"\r\n echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n echo -e \"Build: ${BUILD_NUMBER}\"\r\n DOWNLOAD_URL=https:\/\/papermc.io\/api\/v1\/travertine\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download \r\nfi\r\n\r\nif [ -z ${SERVER_JARFILE} ]; then\r\n SERVER_JARFILE=server.jar\r\nfi\r\n\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\necho -e \"running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f config.yml ]; then\r\n echo -e \"Downloading travertine config.yml\"\r\n curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/java\/travertine\/config.yml\r\nelse\r\n echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi", + "script": "#!\/bin\/bash\r\n# Travertine Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=travertine\r\napt update\r\napt install -y curl jq\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\nif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\nelse\r\n\techo -e \"Using the latest ${PROJECT} version\"\r\n\tMINECRAFT_VERSION=${LATEST_VERSION}\r\nfi\r\nBUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | tostring | contains($BUILD)' | grep true`\r\nLATEST_BUILD=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION} | jq -r '.builds' | jq -r '.[-1]'`\r\nif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\nelse\r\n\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\tBUILD_NUMBER=${LATEST_BUILD}\r\nfi\r\nJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\necho \"Version being downloaded\"\r\necho -e \"MC Version: ${MINECRAFT_VERSION}\"\r\necho -e \"Build: ${BUILD_NUMBER}\"\r\necho -e \"JAR Name of Build: ${JAR_NAME}\"\r\nDOWNLOAD_URL=https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION}\/builds\/${BUILD_NUMBER}\/downloads\/${JAR_NAME}\r\n\r\ncd \/mnt\/server\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -28,36 +29,36 @@ "description": "The version of Minecraft that water was built to support.", "env_variable": "MINECRAFT_VERSION", "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|alpha_num|between:1,6" }, { - "name": "Waterfall Jar File", - "description": "The name of the Jarfile to use when running Waterfall.", + "name": "Travertine Jar File", + "description": "The name of the jar file to use when running Travertine.", "env_variable": "SERVER_JARFILE", - "default_value": "waterfall.jar", - "user_viewable": 1, - "user_editable": 1, + "default_value": "travertine.jar", + "user_viewable": true, + "user_editable": true, "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" }, { "name": "Download Link", - "description": "A link to the server jar to download the waterfall jar.", + "description": "A link to the server jar to download the Travertine jar.", "env_variable": "DL_LINK", "default_value": "", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "nullable|string" }, { - "name": "Waterfall build number", + "name": "Travertine build number", "description": "Default is latest.\r\n\r\nif set to latest or an invalid version will grab the latest build number.", "env_variable": "BUILD_NUMBER", "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" } ] -} +} \ No newline at end of file diff --git a/minecraft/proxy/java/waterfall/egg-waterfall.json b/minecraft/proxy/java/waterfall/egg-waterfall.json index 8d170e29d..1dd8c1436 100644 --- a/minecraft/proxy/java/waterfall/egg-waterfall.json +++ b/minecraft/proxy/java/waterfall/egg-waterfall.json @@ -3,11 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-06-03T16:13:49-04:00", + "exported_at": "2020-12-04T11:36:20-05:00", "name": "Waterfall", "author": "hostmaster@waterfallgaming.net", "description": "Waterfall is a fork of the well-known BungeeCord server teleportation suite.", - "image": "quay.io\/pterodactyl\/core:java", + "features": null, + "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"config.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"listeners[0].host\": \"0.0.0.0:{{server.build.default.port}}\",\r\n \"servers.*.address\": {\r\n \"127.0.0.1\": \"{{config.docker.interface}}\",\r\n \"localhost\": \"{{config.docker.interface}}\"\r\n }\r\n }\r\n }\r\n}", @@ -17,7 +18,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nmkdir -p \/mnt\/server\/\r\ncd \/mnt\/server\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n echo -e \"using supplied download url\"\r\n DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n if [ -z \"$VANILLA_VERSION\" ] || [ \"${MINECRAFT_VERSION}\" == \"latest\" ]; then\r\n echo -e \"getting latest supported mc version and latest paper build\"\r\n MINECRAFT_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall | jq -r '.versions[0]')\r\n BUILD_NUMBER=$(curl -sSL https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION} | jq -r '.builds.latest')\r\n VER_EXISTS=true\r\n else\r\n echo -e \"checking if version ${MINECRAFT_VERSION} exists\"\r\n VER_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall | jq -r --arg VERSION ${MINECRAFT_VERSION} '.versions[] | contains($VERSION)' | grep true)\r\n fi\r\n \r\n if [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n else\r\n echo -e \"Using the latest waterfall version\"\r\n MINECRAFT_VERSION=${LATEST_WATERFALL_VERSION}\r\n fi\r\n \r\n BUILD_EXISTS=$(curl -sSL https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all[] | contains($BUILD)' | grep true)\r\n \r\n if [ \"${BUILD_EXISTS}\" == \"true\" ] || [ ${BUILD_NUMBER} == \"latest\" ]; then\r\n echo -e \"Build is valid. Using version ${BUILD_NUMBER}\"\r\n else\r\n echo -e \"Using the latest paper build for version ${MINECRAFT_VERSION}\"\r\n BUILD_NUMBER=$(curl -sSL https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION} | jq -r '.builds.latest')\r\n fi\r\n \r\n echo \"Version being downloaded\"\r\n echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n echo -e \"Build: ${BUILD_NUMBER}\"\r\n DOWNLOAD_URL=https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download \r\nfi\r\n\r\nif [ -z ${SERVER_JARFILE} ]; then\r\n SERVER_JARFILE=server.jar\r\nfi\r\n\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\necho -e \"running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f config.yml ]; then\r\n echo -e \"Downloading waterfall config.yml\"\r\n curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/java\/waterfall\/config.yml\r\nelse\r\n echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi", + "script": "#!\/bin\/bash\r\n# Waterfall Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=waterfall\r\napt update\r\napt install -y curl jq\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\nif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\nelse\r\n\techo -e \"Using the latest ${PROJECT} version\"\r\n\tMINECRAFT_VERSION=${LATEST_VERSION}\r\nfi\r\nBUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | tostring | contains($BUILD)' | grep true`\r\nLATEST_BUILD=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION} | jq -r '.builds' | jq -r '.[-1]'`\r\nif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\nelse\r\n\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\tBUILD_NUMBER=${LATEST_BUILD}\r\nfi\r\nJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\necho \"Version being downloaded\"\r\necho -e \"MC Version: ${MINECRAFT_VERSION}\"\r\necho -e \"Build: ${BUILD_NUMBER}\"\r\necho -e \"JAR Name of Build: ${JAR_NAME}\"\r\nDOWNLOAD_URL=https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION}\/builds\/${BUILD_NUMBER}\/downloads\/${JAR_NAME}\r\n\r\ncd \/mnt\/server\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f config.yml ]; then\r\n\techo -e \"Downloading ${PROJECT} config.yml\"\r\n\tcurl -o config.yml 'https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/java\/waterfall\/config.yml'\r\nelse\r\n\techo -e \"${PROJECT} config.yml exists. Will not pull a new file\"\r\nfi", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -25,29 +26,29 @@ "variables": [ { "name": "Minecraft Version", - "description": "The version of Minecraft that water was built to support.", + "description": "The version of Minecraft that Waterfall was built to support.", "env_variable": "MINECRAFT_VERSION", "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|alpha_num|between:1,6" }, { "name": "Waterfall Jar File", - "description": "The name of the Jarfile to use when running Waterfall.", + "description": "The name of the jar file to use when running Waterfall.", "env_variable": "SERVER_JARFILE", "default_value": "waterfall.jar", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" }, { "name": "Download Link", - "description": "A link to the server jar to download the waterfall jar.", + "description": "A link to the server jar to download the Waterfall jar.", "env_variable": "DL_LINK", "default_value": "", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "nullable|string" }, { @@ -55,9 +56,9 @@ "description": "Default is latest.\r\n\r\nif set to latest or an invalid version will grab the latest build number.", "env_variable": "BUILD_NUMBER", "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" } ] -} +} \ No newline at end of file From 583e3f8a03b2f7dcfcc0bd863946ba82c8ce352a Mon Sep 17 00:00:00 2001 From: TASelwyn <37274951+TASelwyn@users.noreply.github.com> Date: Fri, 4 Dec 2020 12:09:09 -0500 Subject: [PATCH 057/104] Fixes Fixed formatting :+1: --- minecraft/java/paper/egg-paper.json | 4 ++-- minecraft/proxy/java/travertine/egg-travertine.json | 4 ++-- minecraft/proxy/java/waterfall/egg-waterfall.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/minecraft/java/paper/egg-paper.json b/minecraft/java/paper/egg-paper.json index b05690d42..942b8f5dc 100644 --- a/minecraft/java/paper/egg-paper.json +++ b/minecraft/java/paper/egg-paper.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-12-04T11:36:19-05:00", + "exported_at": "2020-12-04T12:08:20-05:00", "name": "Paper", "author": "parker@pterodactyl.io", "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", @@ -18,7 +18,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=paper\r\napt update\r\napt install -y curl jq\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\nif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\nelse\r\n\techo -e \"Using the latest ${PROJECT} version\"\r\n\tMINECRAFT_VERSION=${LATEST_VERSION}\r\nfi\r\nBUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | tostring | contains($BUILD)' | grep true`\r\nLATEST_BUILD=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION} | jq -r '.builds' | jq -r '.[-1]'`\r\nif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\nelse\r\n\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\tBUILD_NUMBER=${LATEST_BUILD}\r\nfi\r\nJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\necho \"Version being downloaded\"\r\necho -e \"MC Version: ${MINECRAFT_VERSION}\"\r\necho -e \"Build: ${BUILD_NUMBER}\"\r\necho -e \"JAR Name of Build: ${JAR_NAME}\"\r\nDOWNLOAD_URL=https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION}\/builds\/${BUILD_NUMBER}\/downloads\/${JAR_NAME}\r\n\r\ncd \/mnt\/server\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n\techo -e \"Downloading MC server.properties\"\r\n\tcurl -o server.properties 'https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties'\r\nelse\r\n\techo -e \"MC server.properties exists. Will not pull a new file\"\r\nfi", + "script": "#!\/bin\/bash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=paper\r\n\r\napt update\r\napt install -y curl jq\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} version\"\r\n\t\tMINECRAFT_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\t\r\n\tBUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | tostring | contains($BUILD)' | grep true`\r\n\tLATEST_BUILD=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION} | jq -r '.builds' | jq -r '.[-1]'`\r\n\t\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\t\tBUILD_NUMBER=${LATEST_BUILD}\r\n\tfi\r\n\t\r\n\tJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n\techo \"Version being downloaded\"\r\n\techo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n\techo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\tDOWNLOAD_URL=https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION}\/builds\/${BUILD_NUMBER}\/downloads\/${JAR_NAME}\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n echo -e \"Downloading MC server.properties\"\r\n curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi", "container": "debian:buster-slim", "entrypoint": "bash" } diff --git a/minecraft/proxy/java/travertine/egg-travertine.json b/minecraft/proxy/java/travertine/egg-travertine.json index 2ee6e8b38..ce4eb137b 100644 --- a/minecraft/proxy/java/travertine/egg-travertine.json +++ b/minecraft/proxy/java/travertine/egg-travertine.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-12-04T11:36:21-05:00", + "exported_at": "2020-12-04T12:08:21-05:00", "name": "Travertine", "author": "parker@parkervcp.com", "description": "Travertine is a fork of Waterfall with 1.7 protocol support. Waterfall is a fork of the well-known BungeeCord server teleportation suite.", @@ -18,7 +18,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Travertine Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=travertine\r\napt update\r\napt install -y curl jq\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\nif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\nelse\r\n\techo -e \"Using the latest ${PROJECT} version\"\r\n\tMINECRAFT_VERSION=${LATEST_VERSION}\r\nfi\r\nBUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | tostring | contains($BUILD)' | grep true`\r\nLATEST_BUILD=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION} | jq -r '.builds' | jq -r '.[-1]'`\r\nif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\nelse\r\n\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\tBUILD_NUMBER=${LATEST_BUILD}\r\nfi\r\nJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\necho \"Version being downloaded\"\r\necho -e \"MC Version: ${MINECRAFT_VERSION}\"\r\necho -e \"Build: ${BUILD_NUMBER}\"\r\necho -e \"JAR Name of Build: ${JAR_NAME}\"\r\nDOWNLOAD_URL=https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION}\/builds\/${BUILD_NUMBER}\/downloads\/${JAR_NAME}\r\n\r\ncd \/mnt\/server\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}", + "script": "#!\/bin\/bash\r\n# Travertine Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=travertine\r\n\r\napt update\r\napt install -y curl jq\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} version\"\r\n\t\tMINECRAFT_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\t\r\n\tBUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | tostring | contains($BUILD)' | grep true`\r\n\tLATEST_BUILD=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION} | jq -r '.builds' | jq -r '.[-1]'`\r\n\t\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\t\tBUILD_NUMBER=${LATEST_BUILD}\r\n\tfi\r\n\t\r\n\tJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n\techo \"Version being downloaded\"\r\n\techo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n\techo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\tDOWNLOAD_URL=https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION}\/builds\/${BUILD_NUMBER}\/downloads\/${JAR_NAME}\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}", "container": "debian:buster-slim", "entrypoint": "bash" } diff --git a/minecraft/proxy/java/waterfall/egg-waterfall.json b/minecraft/proxy/java/waterfall/egg-waterfall.json index 1dd8c1436..4698ae4db 100644 --- a/minecraft/proxy/java/waterfall/egg-waterfall.json +++ b/minecraft/proxy/java/waterfall/egg-waterfall.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-12-04T11:36:20-05:00", + "exported_at": "2020-12-04T12:08:21-05:00", "name": "Waterfall", "author": "hostmaster@waterfallgaming.net", "description": "Waterfall is a fork of the well-known BungeeCord server teleportation suite.", @@ -18,7 +18,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Waterfall Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=waterfall\r\napt update\r\napt install -y curl jq\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\nif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\nelse\r\n\techo -e \"Using the latest ${PROJECT} version\"\r\n\tMINECRAFT_VERSION=${LATEST_VERSION}\r\nfi\r\nBUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | tostring | contains($BUILD)' | grep true`\r\nLATEST_BUILD=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION} | jq -r '.builds' | jq -r '.[-1]'`\r\nif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\nelse\r\n\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\tBUILD_NUMBER=${LATEST_BUILD}\r\nfi\r\nJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\necho \"Version being downloaded\"\r\necho -e \"MC Version: ${MINECRAFT_VERSION}\"\r\necho -e \"Build: ${BUILD_NUMBER}\"\r\necho -e \"JAR Name of Build: ${JAR_NAME}\"\r\nDOWNLOAD_URL=https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION}\/builds\/${BUILD_NUMBER}\/downloads\/${JAR_NAME}\r\n\r\ncd \/mnt\/server\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f config.yml ]; then\r\n\techo -e \"Downloading ${PROJECT} config.yml\"\r\n\tcurl -o config.yml 'https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/java\/waterfall\/config.yml'\r\nelse\r\n\techo -e \"${PROJECT} config.yml exists. Will not pull a new file\"\r\nfi", + "script": "#!\/bin\/bash\r\n# Waterfall Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=waterfall\r\n\r\napt update\r\napt install -y curl jq\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} version\"\r\n\t\tMINECRAFT_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\t\r\n\tBUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | tostring | contains($BUILD)' | grep true`\r\n\tLATEST_BUILD=`curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION} | jq -r '.builds' | jq -r '.[-1]'`\r\n\t\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\t\tBUILD_NUMBER=${LATEST_BUILD}\r\n\tfi\r\n\t\r\n\tJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n\techo \"Version being downloaded\"\r\n\techo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n\techo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\tDOWNLOAD_URL=https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${MINECRAFT_VERSION}\/builds\/${BUILD_NUMBER}\/downloads\/${JAR_NAME}\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f config.yml ]; then\r\n\techo -e \"Downloading ${PROJECT} config.yml\"\r\n\tcurl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/java\/waterfall\/config.yml\r\nelse\r\n\techo -e \"${PROJECT} config.yml exists. Will not pull a new file\"\r\nfi", "container": "debian:buster-slim", "entrypoint": "bash" } From 4980369696357764611f15ba2c2c0d7f781913ea Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Fri, 4 Dec 2020 16:35:31 -0500 Subject: [PATCH 058/104] update holdfast locations Changes the holdfast location --- Holdfast/Dockerfile.txt | 35 ------------------- Holdfast/entrypoint.sh | 31 ---------------- README.md | 1 + steamcmd_servers/README.md | 3 ++ .../holdfast/README.md | 0 .../holdfast}/egg-holdfast-na-w.json | 0 6 files changed, 4 insertions(+), 66 deletions(-) delete mode 100644 Holdfast/Dockerfile.txt delete mode 100644 Holdfast/entrypoint.sh rename Holdfast/README.md.txt => steamcmd_servers/holdfast/README.md (100%) rename {Holdfast => steamcmd_servers/holdfast}/egg-holdfast-na-w.json (100%) diff --git a/Holdfast/Dockerfile.txt b/Holdfast/Dockerfile.txt deleted file mode 100644 index 1b61d2cd7..000000000 --- a/Holdfast/Dockerfile.txt +++ /dev/null @@ -1,35 +0,0 @@ -# ---------------------------------- -# Environment: ubuntu -# Minimum Panel Version: 0.7.X -# ---------------------------------- -FROM ubuntu:18.04 - -LABEL author="Ankit Patel" maintainer="ankit@bmghosting.com" - -ENV DEBIAN_FRONTEND noninteractive - -## add container user -RUN useradd -m -d /home/container -s /bin/bash container - -## update base packages -RUN apt update \ - && apt upgrade -y - -## install dependencies -RUN apt install -y gcc g++ libgcc1 lib32gcc1 gdb libc6 libstdc++6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 bzip2 zlib1g iproute2 net-tools netcat telnet libatomic1 libsdl1.2debian libsdl2-2.0-0 \ - libfontconfig libicu60 libiculx60 icu-devtools libunwind8 libssl1.0.0 libssl1.0-dev sqlite3 libsqlite3-dev libmariadbclient-dev libduktape202 libzip4 locales ffmpeg apt-transport-https - -## Steamclient.so Link -RUN ln -s "/home/container/steamcmd/linux64/steamclient.so" "/usr/lib/x86_64-linux-gnu/steamclient.so" - -## configure locale -RUN update-locale lang=en_US.UTF-8 \ - && dpkg-reconfigure --frontend noninteractive locales - -USER container -ENV USER=container HOME=/home/container - -WORKDIR /home/container - -COPY ./entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/Holdfast/entrypoint.sh b/Holdfast/entrypoint.sh deleted file mode 100644 index 06deaca88..000000000 --- a/Holdfast/entrypoint.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -cd /home/container - -# Make internal Docker IP address available to processes. -export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` - -# Modify the configuration variables using sed -pushd holdfastnaw-dedicated/configs/ -if [ -f "$SERVER_CONFIG_PATH" ]; then - echo "Found configuration file - replacing variables" - sed -i "s/^server_name .*/server_name $(printf '%s\n' "$SERVER_NAME" | sed -e 's/[\/&]/\\&/g')/g" "$SERVER_CONFIG_PATH" - sed -i "s/^maximum_players .*/maximum_players $(printf '%s\n' "$PLAYERS" | sed -e 's/[\/&]/\\&/g')/g" "$SERVER_CONFIG_PATH" - sed -i "s/^server_welcome_message .*/server_welcome_message $(printf '%s\n' "$MOTD" | sed -e 's/[\/&]/\\&/g')/g" "$SERVER_CONFIG_PATH" - sed -i "s/^server_region .*/server_region $(printf '%s\n' "$REGION" | sed -e 's/[\/&]/\\&/g')/g" "$SERVER_CONFIG_PATH" - sed -i "s/^server_admin_password .*/server_admin_password $(printf '%s\n' "$ADMIN_PASS" | sed -e 's/[\/&]/\\&/g')/g" "$SERVER_CONFIG_PATH" - sed -i "s/^#\{0,1\}server_password .*/server_password $(printf '%s\n' "$SERVER_PASS" | sed -e 's/[\/&]/\\&/g')/g" "$SERVER_CONFIG_PATH" - sed -i "s/^server_port .*/server_port $(printf '%s\n' "$SERVER_PORT" | sed -e 's/[\/&]/\\&/g')/g" "$SERVER_CONFIG_PATH" - sed -i "s/^steam_communications_port .*/steam_communications_port $(printf '%s\n' "$SERVER_COMM_PORT" | sed -e 's/[\/&]/\\&/g')/g" "$SERVER_CONFIG_PATH" - sed -i "s/^steam_query_port .*/steam_query_port $(printf '%s\n' "$SERVER_QUERY_PORT" | sed -e 's/[\/&]/\\&/g')/g" "$SERVER_CONFIG_PATH" -else - echo "Configuration file not found: $SERVER_CONFIG_PATH" -fi -popd - -# Replace Startup Variables -MODIFIED_STARTUP=$(echo $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')) -START_COMMAND=$(echo -e ${MODIFIED_STARTUP}) -echo -e ":/home/container$ ${START_COMMAND}" - -# Run the Server -eval ${MODIFIED_STARTUP} \ No newline at end of file diff --git a/README.md b/README.md index dd3c79680..704a0c4e8 100644 --- a/README.md +++ b/README.md @@ -142,6 +142,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Don't Starve](/steamcmd_servers/dont_starve) * [ECO](/steamcmd_servers/eco/) * [HLDS server](/steamcmd_servers/hlds_server) +* [Holdfast](/steamcmd_servers/holdfast) * [Hurtworld](/steamcmd_servers/hurtworld) * [Insurgency: Sandstorm](/steamcmd_servers/insurgency_sandstorm) * [Killing Floor 2](/steamcmd_servers/killingfloor2) diff --git a/steamcmd_servers/README.md b/steamcmd_servers/README.md index e121ce10e..4c11cd3b6 100644 --- a/steamcmd_servers/README.md +++ b/steamcmd_servers/README.md @@ -31,6 +31,9 @@ This is a collection of servers that use steamcmd to install. ## HLDS Server [hlds](hlds_server/) +## Holdfast +[holdfast](holdfast/) + ## Hurtworld [hurtworld](hurtworld/) diff --git a/Holdfast/README.md.txt b/steamcmd_servers/holdfast/README.md similarity index 100% rename from Holdfast/README.md.txt rename to steamcmd_servers/holdfast/README.md diff --git a/Holdfast/egg-holdfast-na-w.json b/steamcmd_servers/holdfast/egg-holdfast-na-w.json similarity index 100% rename from Holdfast/egg-holdfast-na-w.json rename to steamcmd_servers/holdfast/egg-holdfast-na-w.json From 8cd7f2bd560958c41747914df56d8a07f930c96f Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 5 Dec 2020 08:52:54 +0100 Subject: [PATCH 059/104] add/TS3 Manager Egg --- README.md | 5 +- voice_servers/ts3_manager/README.md | 15 +++++ .../ts3_manager/egg-t-s3-manager.json | 55 +++++++++++++++++++ 3 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 voice_servers/ts3_manager/README.md create mode 100644 voice_servers/ts3_manager/egg-t-s3-manager.json diff --git a/README.md b/README.md index 704a0c4e8..0724132ac 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Twitch](/bots/twitch) * [PhantomBot](/bots/twitch/phantombot/) * [sogeBot](/bots/twitch/sogebot/) - + [Other](/bots/other/) * [Big Brother Bot](/bots/other/bigbrotherbot) @@ -65,7 +65,8 @@ If you are reading this it looks like you are looking to add an egg to your serv ## Voice Servers * [Lavalink](/voice_servers/lavalink) -* [teaspeak](/voice_servers/teaspeak) +* [TeaSpeak](/voice_servers/teaspeak) +* [TS3-Manager](/voice_servers/ts3_manager) ## Game Eggs [Among Us Impostor Server](/among_us/impostor_server) diff --git a/voice_servers/ts3_manager/README.md b/voice_servers/ts3_manager/README.md new file mode 100644 index 000000000..8d64dd67c --- /dev/null +++ b/voice_servers/ts3_manager/README.md @@ -0,0 +1,15 @@ +# TS3 Manager +### [Website](https://www.ts3.app/) + +TS3 Manager is a simple and lightwight webbased Teamspeak Webinterface + +### Install notes + +Connect with your IP from your Pteroserver and the assigned Port. Add your IP to TS Server Withlist + +### Server Ports +Ports required to run the server in a table format. + +| Port | default | +|---------|---------| +| Game | 3000 | diff --git a/voice_servers/ts3_manager/egg-t-s3-manager.json b/voice_servers/ts3_manager/egg-t-s3-manager.json new file mode 100644 index 000000000..49e673681 --- /dev/null +++ b/voice_servers/ts3_manager/egg-t-s3-manager.json @@ -0,0 +1,55 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2020-12-05T08:50:02+01:00", + "name": "TS3 Manager", + "author": "info@goover.de", + "description": "The Open Source Webinterface For TeamSpeak Servers", + "features": null, + "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", + "startup": ".\/start_ts3-manager -p ${SERVER_PORT}", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Server listening on\",\r\n \"userInteraction\": []\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "apt -y update\r\napt -y upgrade\r\napt install -y git unzip jq wget tar curl\r\n\r\nexport HOME=\/mnt\/server\r\ncd $HOME\r\n\r\n## get release info and download links\r\nLATEST_RELEASE=$(curl -L -s -H 'Accept: application\/json' https:\/\/github.com\/${GITHUB_PACKAGE}\/releases\/latest)\r\nLATEST_VERSION=$(echo $LATEST_RELEASE | sed -e 's\/.*\"tag_name\":\"\\([^\"]*\\)\".*\/\\1\/')\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_LINK=\"https:\/\/github.com\/${GITHUB_PACKAGE}\/releases\/download\/$LATEST_VERSION\/$MATCH-$LATEST_VERSION\"\r\nelse \r\n DOWNLOAD_LINK=\"https:\/\/github.com\/${GITHUB_PACKAGE}\/releases\/download\/v$VERSION\/$MATCH-$VERSION-v$VERSION\"\r\nfi\r\n\r\necho $DOWNLOAD_LINK\r\nwget $DOWNLOAD_LINK\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n mv -f $MATCH-$LATEST_VERSION $HOME\/start_ts3-manager\r\n chmod +x start_ts3-manager\r\nelse\r\n mv -f $MATCH-v$VERSION $HOME\/start_ts3-manager\r\n chmod start_ts3-manager\r\nfi", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "GITHUB_PACKAGE", + "description": "", + "env_variable": "GITHUB_PACKAGE", + "default_value": "joni1802\/ts3-manager", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:50" + }, + { + "name": "VERSION", + "description": "", + "env_variable": "VERSION", + "default_value": "latest", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:30" + }, + { + "name": "MATCH", + "description": "", + "env_variable": "MATCH", + "default_value": "ts3-manager-linux-x64", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:50" + } + ] +} \ No newline at end of file From c7f1649cb5dec879623c6b29fb1e2aa115ccb3be Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 5 Dec 2020 08:58:49 +0100 Subject: [PATCH 060/104] small fix --- voice_servers/ts3_manager/egg-t-s3-manager.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/voice_servers/ts3_manager/egg-t-s3-manager.json b/voice_servers/ts3_manager/egg-t-s3-manager.json index 49e673681..c20c8b536 100644 --- a/voice_servers/ts3_manager/egg-t-s3-manager.json +++ b/voice_servers/ts3_manager/egg-t-s3-manager.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-12-05T08:50:02+01:00", + "exported_at": "2020-12-05T08:58:33+01:00", "name": "TS3 Manager", "author": "info@goover.de", "description": "The Open Source Webinterface For TeamSpeak Servers", @@ -38,8 +38,8 @@ "description": "", "env_variable": "VERSION", "default_value": "latest", - "user_viewable": false, - "user_editable": false, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:30" }, { From 49bbc4720a2a5140e2fabe7849569c54781e78f6 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 5 Dec 2020 10:35:17 +0100 Subject: [PATCH 061/104] Update TeaSpeak Egg to be able to install latest Beta --- voice_servers/teaspeak/egg-tea-speak.json | 29 ++++++++++++----------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/voice_servers/teaspeak/egg-tea-speak.json b/voice_servers/teaspeak/egg-tea-speak.json index fe395b61d..beb3707a9 100644 --- a/voice_servers/teaspeak/egg-tea-speak.json +++ b/voice_servers/teaspeak/egg-tea-speak.json @@ -3,10 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-03-28T13:50:13-04:00", + "exported_at": "2020-12-05T10:34:29+01:00", "name": "TeaSpeak", "author": "parker@parkervcp.com", "description": "TeaSpeak is a free to use client and server software for VoIP communication.\r\n\r\nIts the ideal deal software for everyone who is annoyed about limits and restrictions.", + "features": null, "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", "startup": ".\/TeaSpeakServer --property:binding.query.port={{QUERY_PORT}} --property:binding.file.port={{FILE_PORT}} --property:voice.default_port={{SERVER_PORT}}", "config": { @@ -17,7 +18,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n \r\n## install required packages\r\napt update\r\napt upgrade -y\r\napt install curl -y\r\n\r\n## make and change to directory\r\nmkdir \/mnt\/server\r\ncd \/mnt\/server\/\r\n\r\n## get download link\r\nif [ \"${VERSION}\" == \"\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/TeaSpeak-$(curl -sSLk https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/latest).tar.gz\")\r\nelse\r\n DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/TeaSpeak-${VERSION}.tar.gz\")\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\n## download files\r\necho -e \"running: curl -sSL -o teaspeak.tar.gz ${DOWNLOAD_LINK}\"\r\ncurl -sSL -o teaspeak.tar.gz ${DOWNLOAD_LINK}\r\n\r\n## unpack files\r\necho -e \"unpacking files\"\r\ntar xzvf teaspeak.tar.gz\r\n\r\necho -e \"install complete\"", + "script": "#!\/bin\/bash\r\n \r\n## install required packages\r\napt update\r\napt upgrade -y\r\napt install curl -y\r\n\r\n## make and change to directory\r\nmkdir \/mnt\/server\r\ncd \/mnt\/server\/\r\n\r\n## get download link\r\nif [ \"${VERSION}\" == \"\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/TeaSpeak-$(curl -sSLk https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/latest).tar.gz\")\r\nelif [ \"${VERSION}\" == \"\" ] || [ \"${VERSION}\" == \"beta\" ]; then\r\n DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64_nightly\/TeaSpeak-$(curl -sSLk https:\/\/repo.teaspeak.de\/server\/linux\/amd64_nightly\/latest).tar.gz\")\r\nelse\r\n DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/TeaSpeak-${VERSION}.tar.gz\")\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\n## download files\r\necho -e \"running: curl -sSL -o teaspeak.tar.gz ${DOWNLOAD_LINK}\"\r\ncurl -sSL -o teaspeak.tar.gz ${DOWNLOAD_LINK}\r\n\r\n## unpack files\r\necho -e \"unpacking files\"\r\ntar xzvf teaspeak.tar.gz\r\n\r\necho -e \"install complete\"", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -28,8 +29,8 @@ "description": "The query port for TeaSpeak", "env_variable": "QUERY_PORT", "default_value": "10101", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|numeric|max:65535" }, { @@ -37,8 +38,8 @@ "description": "The TeaSpeak File Transfer Port", "env_variable": "FILE_PORT", "default_value": "30303", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|numeric|max:65535" }, { @@ -46,8 +47,8 @@ "description": "The TeaSpeak Server MOTD", "env_variable": "SERVER_MOTD", "default_value": "TeaSpeak\\n\\rHosted on pterodactyl!", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:128" }, { @@ -55,8 +56,8 @@ "description": "Don't touch this if you want the server to start", "env_variable": "LD_LIBRARY_PATH", "default_value": ".\/libs\/", - "user_viewable": 0, - "user_editable": 0, + "user_viewable": false, + "user_editable": false, "rules": "required|string" }, { @@ -64,8 +65,8 @@ "description": "Don't touch this if you want the server to start", "env_variable": "LD_PRELOAD", "default_value": ".\/libs\/libjemalloc.so.2", - "user_viewable": 0, - "user_editable": 0, + "user_viewable": false, + "user_editable": false, "rules": "required|string" }, { @@ -73,8 +74,8 @@ "description": "What version of teaspeak to install", "env_variable": "VERSION", "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" } ] From 46767f0bbfa5cd703f8e9f86b8476240f9a32d95 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 5 Dec 2020 11:42:29 +0100 Subject: [PATCH 062/104] updated description --- voice_servers/teaspeak/egg-tea-speak.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/voice_servers/teaspeak/egg-tea-speak.json b/voice_servers/teaspeak/egg-tea-speak.json index beb3707a9..b58a23ec8 100644 --- a/voice_servers/teaspeak/egg-tea-speak.json +++ b/voice_servers/teaspeak/egg-tea-speak.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-12-05T10:34:29+01:00", + "exported_at": "2020-12-05T11:42:04+01:00", "name": "TeaSpeak", "author": "parker@parkervcp.com", "description": "TeaSpeak is a free to use client and server software for VoIP communication.\r\n\r\nIts the ideal deal software for everyone who is annoyed about limits and restrictions.", @@ -71,7 +71,7 @@ }, { "name": "Teaspeak Version", - "description": "What version of teaspeak to install", + "description": "What version of teaspeak to install: latest = latest stable ; beta = latest beta", "env_variable": "VERSION", "default_value": "latest", "user_viewable": true, From 9067806d3252fb63bc73a2004839e2290cde7556 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 5 Dec 2020 12:51:36 +0100 Subject: [PATCH 063/104] Waterdog - Add missing config.yml --- .../proxy/cross_platform/waterdog/config.yml | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 minecraft/proxy/cross_platform/waterdog/config.yml diff --git a/minecraft/proxy/cross_platform/waterdog/config.yml b/minecraft/proxy/cross_platform/waterdog/config.yml new file mode 100644 index 000000000..77f6aa04a --- /dev/null +++ b/minecraft/proxy/cross_platform/waterdog/config.yml @@ -0,0 +1,72 @@ +groups: + md_5: + - admin +bedrock_encryption: true +disabled_commands: +- disabledcommandhere +use_xuid_for_uuid: true +timeout: 30000 +online_mode: true +servers: + lobby: + raknet: false + motd: '&1Just another Waterfall - Forced Host' + transfer_group: default + address: localhost:25565 + restricted: false +server_connect_timeout: 5000 +listeners: +- query_port: 25577 + motd: '&1Another Bungee server' + tab_list: GLOBAL_PING + query_enabled: false + proxy_protocol: false + forced_hosts: &id036 + pvp.md-5.net: pvp + ping_passthrough: false + raknet: false + priorities: + - lobby + bind_local_address: true + host: 0.0.0.0:25577 + max_players: 1 + tab_size: 60 + force_default_server: false +- query_port: 19132 + motd: '&1Another Bungee server' + tab_list: GLOBAL_PING + query_enabled: true + proxy_protocol: false + forced_hosts: *id036 + ping_passthrough: false + raknet: true + priorities: + - lobby + bind_local_address: true + host: 0.0.0.0:19132 + max_players: 1 + tab_size: 60 + force_default_server: false +stats: 7c40d2a8-2cbc-43da-9d39-61de6c475988 +network_compression_threshold: 256 +log_pings: true +permissions: + default: + - bungeecord.command.server + - bungeecord.command.list + admin: + - bungeecord.command.alert + - bungeecord.command.end + - bungeecord.command.ip + - bungeecord.command.reload +max_mtu: -1 +ip_forward: false +player_limit: -1 +log_commands: false +connection_throttle_limit: 3 +connection_throttle: 4000 +replace_username_spaces: true +prevent_proxy_connections: false +remote_ping_timeout: 5000 +forge_support: true +remote_ping_cache: -1 From 7f6d5dbf51386a155bf2f1ea73fd325bf6da5126 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 5 Dec 2020 13:12:27 +0100 Subject: [PATCH 064/104] Waterdog - Fix path --- .../proxy/cross_platform/waterdog/config.yml | 72 ------------------- .../cross_platform/waterdog/egg-waterdog.json | 5 +- 2 files changed, 3 insertions(+), 74 deletions(-) delete mode 100644 minecraft/proxy/cross_platform/waterdog/config.yml diff --git a/minecraft/proxy/cross_platform/waterdog/config.yml b/minecraft/proxy/cross_platform/waterdog/config.yml deleted file mode 100644 index 77f6aa04a..000000000 --- a/minecraft/proxy/cross_platform/waterdog/config.yml +++ /dev/null @@ -1,72 +0,0 @@ -groups: - md_5: - - admin -bedrock_encryption: true -disabled_commands: -- disabledcommandhere -use_xuid_for_uuid: true -timeout: 30000 -online_mode: true -servers: - lobby: - raknet: false - motd: '&1Just another Waterfall - Forced Host' - transfer_group: default - address: localhost:25565 - restricted: false -server_connect_timeout: 5000 -listeners: -- query_port: 25577 - motd: '&1Another Bungee server' - tab_list: GLOBAL_PING - query_enabled: false - proxy_protocol: false - forced_hosts: &id036 - pvp.md-5.net: pvp - ping_passthrough: false - raknet: false - priorities: - - lobby - bind_local_address: true - host: 0.0.0.0:25577 - max_players: 1 - tab_size: 60 - force_default_server: false -- query_port: 19132 - motd: '&1Another Bungee server' - tab_list: GLOBAL_PING - query_enabled: true - proxy_protocol: false - forced_hosts: *id036 - ping_passthrough: false - raknet: true - priorities: - - lobby - bind_local_address: true - host: 0.0.0.0:19132 - max_players: 1 - tab_size: 60 - force_default_server: false -stats: 7c40d2a8-2cbc-43da-9d39-61de6c475988 -network_compression_threshold: 256 -log_pings: true -permissions: - default: - - bungeecord.command.server - - bungeecord.command.list - admin: - - bungeecord.command.alert - - bungeecord.command.end - - bungeecord.command.ip - - bungeecord.command.reload -max_mtu: -1 -ip_forward: false -player_limit: -1 -log_commands: false -connection_throttle_limit: 3 -connection_throttle: 4000 -replace_username_spaces: true -prevent_proxy_connections: false -remote_ping_timeout: 5000 -forge_support: true -remote_ping_cache: -1 diff --git a/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json b/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json index e366448ed..a29404301 100644 --- a/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json +++ b/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json @@ -3,10 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-10-15T03:54:24+00:00", + "exported_at": "2020-12-05T13:11:06+01:00", "name": "Waterdog", "author": "parker@pterodactyl.io", "description": "Waterdog is fork of the well-known Waterfall, which is a fork of the well-known BungeeCord, server teleportation suite.", + "features": null, "image": "quay.io\/pterodactyl\/core:java", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { @@ -17,7 +18,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl\r\n\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n# Adding '.jar' if it isn't part of the file name\r\nif [[ \"${SERVER_JARFILE}\" == \"*\\.jar\" ]]; then\r\n echo -e \"adding.jar to server file name\"\r\n SERVER_JARFILE=\"${SERVER_JARFILE}.jar\"\r\nfi\r\n\r\nif [ -z \"${WATERDOG_VERSION}\" ] || [ \"${WATERDOG_VERSION}\" == \"latest\" ]; then\r\n echo -e \"downloading latest waterdog build\\n\"\r\n curl -sSL -o ${SERVER_JARFILE} https:\/\/ci.codemc.io\/job\/yesdog\/job\/Waterdog\/lastSuccessfulBuild\/artifact\/Waterfall-Proxy\/bootstrap\/target\/Waterdog.jar\r\nelse \r\n echo -e \"downloading waterdog build ${WATERDOG_VERSION}\\n\"\r\n curl -sSL -o ${SERVER_JARFILE} https:\/\/ci.codemc.io\/job\/yesdog\/job\/Waterdog\/${WATERDOG_VERSION}\/artifact\/Waterfall-Proxy\/bootstrap\/target\/Waterdog.jar\r\nfi\r\n\r\nif [ ! -f config.yml ]; then\r\n echo -e \"Downloading waterfall config.yml\"\r\n curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/cross_platform\/waterfall\/config.yml\r\nelse\r\n echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi", + "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl\r\n\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n# Adding '.jar' if it isn't part of the file name\r\nif [[ \"${SERVER_JARFILE}\" == \"*\\.jar\" ]]; then\r\n echo -e \"adding.jar to server file name\"\r\n SERVER_JARFILE=\"${SERVER_JARFILE}.jar\"\r\nfi\r\n\r\nif [ -z \"${WATERDOG_VERSION}\" ] || [ \"${WATERDOG_VERSION}\" == \"latest\" ]; then\r\n echo -e \"downloading latest waterdog build\\n\"\r\n curl -sSL -o ${SERVER_JARFILE} https:\/\/ci.codemc.io\/job\/yesdog\/job\/Waterdog\/lastSuccessfulBuild\/artifact\/Waterfall-Proxy\/bootstrap\/target\/Waterdog.jar\r\nelse \r\n echo -e \"downloading waterdog build ${WATERDOG_VERSION}\\n\"\r\n curl -sSL -o ${SERVER_JARFILE} https:\/\/ci.codemc.io\/job\/yesdog\/job\/Waterdog\/${WATERDOG_VERSION}\/artifact\/Waterfall-Proxy\/bootstrap\/target\/Waterdog.jar\r\nfi\r\n\r\nif [ ! -f config.yml ]; then\r\n echo -e \"Downloading waterfall config.yml\"\r\n curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/java\/waterfall\/config.yml\r\nelse\r\n echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi", "container": "debian:buster-slim", "entrypoint": "bash" } From 846a4d4819dd938955112632db4682642d675965 Mon Sep 17 00:00:00 2001 From: TASelwyn <37274951+TASelwyn@users.noreply.github.com> Date: Sat, 5 Dec 2020 13:42:37 -0500 Subject: [PATCH 065/104] Cleaning up proxies Geyser is actually cross platform, not just bedrock. Also, dragonproxy is entirely abandoned in favour of geyser so removed all instances of dragonproxy and just left a msg saying use geyser in the top level readme. --- README.md | 58 +++++++++-------- minecraft/proxy/bedrock/README.md | 9 --- .../proxy/bedrock/dragon_proxy/README.md | 15 ----- .../dragon_proxy/egg-dragon-proxy.json | 63 ------------------- .../geyser/README.md | 0 steamcmd_servers/unturned/unturned/README.md | 16 ----- .../unturned/unturned/egg-unturned.json | 63 ------------------- 7 files changed, 28 insertions(+), 196 deletions(-) delete mode 100644 minecraft/proxy/bedrock/README.md delete mode 100644 minecraft/proxy/bedrock/dragon_proxy/README.md delete mode 100644 minecraft/proxy/bedrock/dragon_proxy/egg-dragon-proxy.json rename minecraft/proxy/{bedrock => cross_platform}/geyser/README.md (100%) delete mode 100644 steamcmd_servers/unturned/unturned/README.md delete mode 100644 steamcmd_servers/unturned/unturned/egg-unturned.json diff --git a/README.md b/README.md index 704a0c4e8..ad14bff2f 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [sogeBot](/bots/twitch/sogebot/) [Other](/bots/other/) -* [Big Brother Bot](/bots/other/bigbrotherbot) +* [Big Brother Bot](/bots/other/bigbrotherbot/) * [TeamSpeak3](bots/teamspeak3) * [JTS3ServerMod](/bots/teamspeak3/jts3servermod/) @@ -53,22 +53,22 @@ If you are reading this it looks like you are looking to add an egg to your serv ## [Database](/database/) ### In-Memory Databases [Redis](/database/redis/) -* [Redis 5](/database/redis/redis-5) -* [Redis 6](/database/redis/redis-6) +* [Redis 5](/database/redis/redis-5/) +* [Redis 6](/database/redis/redis-6/) ### noSQL -* [mongoDB](/database/nosql/mongodb) +* [mongoDB](/database/nosql/mongodb/) ### SQL Databases * [MariaDB](/database/sql/mariadb/) * [PostgreSQL](/database/sql/postgres/) ## Voice Servers -* [Lavalink](/voice_servers/lavalink) -* [teaspeak](/voice_servers/teaspeak) +* [Lavalink](/voice_servers/lavalink/) +* [teaspeak](/voice_servers/teaspeak/) ## Game Eggs -[Among Us Impostor Server](/among_us/impostor_server) +[Among Us Impostor Server](/among_us/impostor_server/) [ET Legacy](/enemy_territory/etlegacy/) @@ -95,13 +95,13 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Java](/minecraft/java/) Servers for Java Minecraft * [Cuberite](/minecraft/java/cuberite/) - * [feather](/minecraft/feather/) + * [feather](/minecraft/java/feather/) * [Feed The Beast](/minecraft/java/ftb/) * [Forge](/minecraft/java/forge/) * [Magma](/minecraft/java/magma/) * [Paper](/minecraft/java/paper) * [Spigot](/minecraft/java/spigot/) - * [spongeforge](/minecraft/java/spongeforge/) + * [SpongeForge](/minecraft/java/spongeforge/) * [SpongeVanilla](/minecraft/java/spongevanilla/) * [Technic](/minecraft/java/technic/) * [Tuinity](/minecraft/java/tuinity/) @@ -113,17 +113,16 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Waterfall](/minecraft/proxy/java/waterfall/) * [Travertine](/minecraft/proxy/java/travertine/) * [Velocity](/minecraft/proxy/java/velocity/) - * [Bedrock](/minecraft/proxy/bedrock/) - * [DragonProxy](/minecraft/proxy/bedrock/dragonproxy/) - * [GeyserMC](/minecraft/proxy/bedrock/geyser/) - * [Cross Platform](/minecraft/proxy/cross_platform) + * [Cross Platform](/minecraft/proxy/cross_platform/) + * [GeyserMC] (/minecraft/proxy/cross_platform/geyser/) * [Waterdog](/minecraft/proxy/cross_platform/waterdog/) - + * DragonProxy abandoned in favour of GeyserMC. + [OpenRA](/openra/) -* [OpenRA Dune2000](/openra/openra_dune2000) -* [OpenRA Red Alert](/openra/openra_red_alert) -* [OpenRA Tiberian Dawn](/openra/openra_tiberian_dawn) +* [OpenRA Dune2000](/openra/openra_dune2000/) +* [OpenRA Red Alert](/openra/openra_red_alert/) +* [OpenRA Tiberian Dawn](/openra/openra_tiberian_dawn/) [Red Dead Redemption](/rdr/) @@ -137,40 +136,39 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Arma 3 HC](/steamcmd_servers/arma/arma3_headless_client/) * [Arma 3 HC](/steamcmd_servers/arma/arma3_x64/) * [Avorion](/steamcmd_servers/avorion/) -* [Citadel: Forged with Fire](/steamcmd_servers/citadel) -* [Conan Exiles](/steamcmd_servers/conan_exiles) -* [Don't Starve](/steamcmd_servers/dont_starve) +* [Citadel: Forged with Fire](/steamcmd_servers/citadel/) +* [Conan Exiles](/steamcmd_servers/conan_exiles/) +* [Don't Starve](/steamcmd_servers/dont_starve/) * [ECO](/steamcmd_servers/eco/) * [HLDS server](/steamcmd_servers/hlds_server) * [Holdfast](/steamcmd_servers/holdfast) * [Hurtworld](/steamcmd_servers/hurtworld) -* [Insurgency: Sandstorm](/steamcmd_servers/insurgency_sandstorm) -* [Killing Floor 2](/steamcmd_servers/killingfloor2) -* [Mordhau](/steamcmd_servers/mordhau) -* [Onset](/steamcmd_servers/onset) +* [Insurgency: Sandstorm](/steamcmd_servers/insurgency_sandstorm/) +* [Killing Floor 2](/steamcmd_servers/killingfloor2/) +* [Mordhau](/steamcmd_servers/mordhau/) +* [Onset](/steamcmd_servers/onset/) * [PixARK](/steamcmd_servers/pixark/) * [Project Zomboid](/steamcmd_servers/project_zomboid/) -* [Rising World](/steamcmd_servers/rising_world) +* [Rising World](/steamcmd_servers/rising_world/) * [Rust Staging Branch](/steamcmd_servers/rust_staging/) * [SCP: Secret Laboratory](/steamcmd_servers/scpsl/) * [dedicated](/steamcmd_servers/scpsl/dedicated/) * [multiadmin](/steamcmd_servers/scpsl/multiadmin/) * [Soldat](/steamcmd_servers/soldat/) -* [Starbound](/steamcmd_servers/starbound) +* [Starbound](/steamcmd_servers/starbound/) * [Stationeers](/steamcmd_servers/stationeers/) * [Stormworks](/steamcmd_servers/stormworks/) -* [Sven Co-op](/steamcmd_servers/svencoop) +* [Sven Co-op](/steamcmd_servers/svencoop/) * [Squad](/steamcmd_servers/squad/) * [Team Fortress 2 Classic](/steamcmd_servers/team_fortress_2_classic/) * [Unturned](/steamcmd_servers/unturned/) - * [Unturned](/steamcmd_servers/unturned/unturned/) [Teeworlds](/teeworlds/) * [teeworlds](/teeworlds/teeworlds/) [Terraria](/terraria/) -* [vanilla](/terraria/vanilla) -* [tmodloader](/terraria/tmodloader) +* [vanilla](/terraria/vanilla/) +* [tmodloader](/terraria/tmodloader/) * [tshock](/terraria/tshock/) [Tycoon Games](/tycoon_games/) diff --git a/minecraft/proxy/bedrock/README.md b/minecraft/proxy/bedrock/README.md deleted file mode 100644 index a87851743..000000000 --- a/minecraft/proxy/bedrock/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# Bedrock Proxies/Bridges - -#### DragonProxy (Abandoned in favor of Geyser) -[DragonProxy](https://github.com/DragonetMC/DragonProxy) -A proxy to allow Minecraft: Bedrock clients to connect to Minecraft: Java Edition servers. - -#### GeyserMC -[GeyserMC](https://geysermc.org/) -A bridge/proxy allowing you to connect to Minecraft: Java Edition servers with Minecraft: Bedrock edition. diff --git a/minecraft/proxy/bedrock/dragon_proxy/README.md b/minecraft/proxy/bedrock/dragon_proxy/README.md deleted file mode 100644 index 05889c657..000000000 --- a/minecraft/proxy/bedrock/dragon_proxy/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# DragonProxy - -A proxy to allow Minecraft: Bedrock clients to connect to Minecraft: Java Edition servers. - -### Server Ports - -DragonProxy need 2 port (default 19132) - -| Port | default | -|---------|----------| -| Bind | 19132 | -| Remote | 25565 | - -### Known Issues -Also see the [DragonProxy Github](https://github.com/DragonetMC/DragonProxy) diff --git a/minecraft/proxy/bedrock/dragon_proxy/egg-dragon-proxy.json b/minecraft/proxy/bedrock/dragon_proxy/egg-dragon-proxy.json deleted file mode 100644 index 0dcfcd271..000000000 --- a/minecraft/proxy/bedrock/dragon_proxy/egg-dragon-proxy.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2020-04-20T12:13:53+02:00", - "name": "DragonProxy", - "author": "info@goover.de", - "description": "A proxy made to allow Minecraft: Bedrock Edition clients to connect to Minecraft: Java Edition servers.", - "image": "quay.io\/pterodactyl\/core:java", - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar DragonProxy.jar", - "config": { - "files": "{\r\n \"config.yml\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"bind-port:\": \"bind-port: {{server.build.default.port}}\",\r\n \"max-players:\": \"max-players: {{server.build.env.MAX_PLAYERS}}\",\r\n \"remote-port:\": \"remote-port: {{server.build.env.RPORT}}\",\r\n \"remote-auth:\": \"remote-auth: {{server.build.env.REMOTE_AUTH}}\",\r\n \"xbox-auth:\": \"xbox-auth: {{server.build.env.XBOX_AUTH}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Done\",\r\n \"userInteraction\": []\r\n}", - "logs": "[]", - "stop": "stop" - }, - "scripts": { - "installation": { - "script": "apk update\r\napk --no-cache --update add curl jq wget\r\n\r\ncd \/mnt\/server\r\nrm -rf DragonProxy.jar\r\nwget https:\/\/ci.codemc.io\/job\/DragonetMC\/job\/DragonProxy\/lastBuild\/artifact\/bootstrap\/standalone\/target\/DragonProxy.jar\r\n\r\nrm -rf \/mnt\/server\/config.yml\r\ncat < \/mnt\/server\/config.yml\r\n# -----------------------------------------------\r\n# DragonProxy Configuration (25\/03\/20)\r\n# https:\/\/github.com\/DragonetMC\/DragonProxy\r\n# -----------------------------------------------\r\n# DO NOT CHANGE THIS VARIABLE!!!!!!\r\nconfig-version: 2\r\n# DO NOT CHANGE THIS VARIABLE!!!!!!\r\n\r\nlocale: 'EN'\r\n\r\n# The IP and port the proxy will listen for connections on\r\n# '0.0.0.0' will bind to all IP addresses available on your device\r\nbind-address: '0.0.0.0'\r\nbind-port: 19132\r\n\r\n# The MOTD that will be shown on the MCPE server list\r\nmotd: 'DragonProxy'\r\nmotd2: 'https:\/\/github.com\/DragonetMC\/DragonProxy'\r\n\r\n# The maximum amount of players that can join the proxy\r\nmax-players: 1\r\n\r\n# The IP and port of the remote server to connect to\r\nremote-address: '127.0.0.1'\r\nremote-port: 25565\r\n\r\n# The authentication method used for connecting to the remote server.\r\n# Accepted values:\r\n# credentials : This will display a form when you join the proxy asking you to enter your Mojang credentials\r\n# offline : No authentication, cant join premium servers such as Hypixel\r\nremote-auth: credentials\r\n\r\n# Whether or not Bedrock clients should be authenticated with xbox live\r\nxbox-auth: false\r\n\r\n# Whether or not to use the motd and player count of the primary remote server\r\nping-passthrough: true\r\n\r\n# Player gameplay related settings\r\nplayer-settings:\r\n # Whether or not to translate commands sent from the remote server and display\r\n # them on the Bedrock client. This is currently experimental.\r\n enable-commands: false\r\n\r\n # Whether or not to enable auto jump\r\n auto-jump: true\r\n\r\n # Whether or not to fetch skins from Mojang's servers\r\n fetch-skins: true\r\n\r\nmetrics:\r\n enabled: true\r\n # DO NOT CHANGE\r\n server-uuid: donotchange_serveruuid\r\n\r\n# The amount of threads that will be used.\r\n# Only change if you know what you are doing\r\nthread-pool-size: 8\r\nEOT", - "container": "openjdk:8-jre-alpine", - "entrypoint": "ash" - } - }, - "variables": [ - { - "name": "Remote Port", - "description": "", - "env_variable": "RPORT", - "default_value": "25565", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:20" - }, - { - "name": "Remote Auth", - "description": "The authentication method used for connecting to the remote server.\r\nAccepted values:\r\ncredentials : This will display a form when you join the proxy asking you to enter your Mojang credentials\r\noffline : No authentication, cant join premium servers such as Hypixel", - "env_variable": "REMOTE_AUTH", - "default_value": "credentials", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:20" - }, - { - "name": "XBox Auth", - "description": "Whether or not Bedrock clients should be authenticated with xbox live\r\n\r\nTRUE or FALSE", - "env_variable": "XBOX_AUTH", - "default_value": "false", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:20" - }, - { - "name": "Max Players", - "description": "The maximum amount of players that can join the proxy", - "env_variable": "MAX_PLAYERS", - "default_value": "1", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:20" - } - ] -} \ No newline at end of file diff --git a/minecraft/proxy/bedrock/geyser/README.md b/minecraft/proxy/cross_platform/geyser/README.md similarity index 100% rename from minecraft/proxy/bedrock/geyser/README.md rename to minecraft/proxy/cross_platform/geyser/README.md diff --git a/steamcmd_servers/unturned/unturned/README.md b/steamcmd_servers/unturned/unturned/README.md deleted file mode 100644 index 32b69f987..000000000 --- a/steamcmd_servers/unturned/unturned/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# Unturned - -Steam Description -You're one of the few not yet turned zombie. Keeping it that way will be a challenge. -- Go in guns blazing and attract the attention of everything, living and dead. -- Take a subtle approach sneaking around and making use of distractions. -- Confront and learn to counter special abilities ranging from invisibility to fire breathing to lightning attacks. - -### Server Ports -Rocketmod requires 3 ports to run properly. - -| Port | default | -|---------|---------| -| Game | 27015 | -| Game +1 | 27016 | -| Game +2 | 27017 | diff --git a/steamcmd_servers/unturned/unturned/egg-unturned.json b/steamcmd_servers/unturned/unturned/egg-unturned.json deleted file mode 100644 index df6abd659..000000000 --- a/steamcmd_servers/unturned/unturned/egg-unturned.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2020-07-12T22:04:47-04:00", - "name": "Unturned", - "author": "parker@parkervcp.com", - "description": "Vanilla Unturned with the included RockerMod.", - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_source", - "startup": ".\/Unturned_Headless.x86_64 -batchmode -nographics -bind 0.0.0.0 -port {{SERVER_PORT}}", - "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"Loading level: 100%\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"latest.log\"\r\n}", - "stop": "shutdown" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n\r\nDEBIAN_FRONTEND=noninteractive\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so\r\n\r\n## Specific to Unturned\r\ncd \/mnt\/server\/\r\nln -s ..\/..\/..\/steamcmd\/linux64\/steamclient.so Unturned_Headless_Data\/Plugins\/x86_64\/steamclient.so\r\nln -s ..\/Extras\/Rocket.Unturned\/ Modules\/", - "container": "debian:buster-slim", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Steam App ID", - "description": "Steam App ID require for install and startup update", - "env_variable": "SRCDS_APPID", - "default_value": "1110390", - "user_viewable": 0, - "user_editable": 0, - "rules": "required|string|max:20" - }, - { - "name": "ld lib path", - "description": "This is needed to load specific libraries", - "env_variable": "LD_LIBRARY_PATH", - "default_value": ".\/Unturned_Headless_Data\/Plugins\/x86_64\/", - "user_viewable": 0, - "user_editable": 0, - "rules": "required|string" - }, - { - "name": "Steam User", - "description": "Should be left blank for anon user", - "env_variable": "STEAM_USER", - "default_value": "", - "user_viewable": 1, - "user_editable": 1, - "rules": "nullable|string" - }, - { - "name": "Steam Password", - "description": "", - "env_variable": "STEAM_PASS", - "default_value": "", - "user_viewable": 1, - "user_editable": 1, - "rules": "nullable|string" - } - ] -} \ No newline at end of file From 3a8deca69b106b91c1df84bc75ed21c2af545903 Mon Sep 17 00:00:00 2001 From: TASelwyn <37274951+TASelwyn@users.noreply.github.com> Date: Sat, 5 Dec 2020 13:45:54 -0500 Subject: [PATCH 066/104] Cleans up readme Removes trailing slash to be consistent (added for missing ones in previous commit) --- README.md | 244 +++++++++++++++++++------------------- minecraft/proxy/README.md | 15 ++- 2 files changed, 129 insertions(+), 130 deletions(-) diff --git a/README.md b/README.md index ad14bff2f..fcd2661a5 100644 --- a/README.md +++ b/README.md @@ -24,162 +24,162 @@ If you are reading this it looks like you are looking to add an egg to your serv ## Please read the CONTRIBUTING.md before submitting PRs -## [Bots](/bots/) - -[Discord](/bots/discord/) -* [ATL Bot](/bots/discord/atlbot/) Node JS -* [Bastion](/bots/discord/bastion/) -* [CorpBot](/bots/discord/corpbot/) Python -* [discord.js](bots/discord/discord.js/) Node JS generic -* [discord.py](bots/discord/discord.py/) Python generic -* [discordgo](bots/discord/discordgo/) golang generic -* [fragbot](/bots/discord/fragbot/) Golang +## [Bots](/bots) + +[Discord](/bots/discord) +* [ATL Bot](/bots/discord/atlbot) Node JS +* [Bastion](/bots/discord/bastion) +* [CorpBot](/bots/discord/corpbot) Python +* [discord.js](bots/discord/discord.js) Node JS generic +* [discord.py](bots/discord/discord.py) Python generic +* [discordgo](bots/discord/discordgo) golang generic +* [fragbot](/bots/discord/fragbot) Golang * [jmusicbot](/bots/discord/jmusicbot) Java -* [parkertron](/bots/discord/parkertron/) Golang -* [pixel-bot](/bots/discord/pixelbot/) Python -* [Red](/bots/discord/redbot/) Python -* [Sinusbot](/bots/discord/sinusbot/) +* [parkertron](/bots/discord/parkertron) Golang +* [pixel-bot](/bots/discord/pixelbot) Python +* [Red](/bots/discord/redbot) Python +* [Sinusbot](/bots/discord/sinusbot) * [Twitch](/bots/twitch) - * [PhantomBot](/bots/twitch/phantombot/) - * [sogeBot](/bots/twitch/sogebot/) + * [PhantomBot](/bots/twitch/phantombot) + * [sogeBot](/bots/twitch/sogebot) -[Other](/bots/other/) -* [Big Brother Bot](/bots/other/bigbrotherbot/) +[Other](/bots/other) +* [Big Brother Bot](/bots/other/bigbrotherbot) * [TeamSpeak3](bots/teamspeak3) - * [JTS3ServerMod](/bots/teamspeak3/jts3servermod/) + * [JTS3ServerMod](/bots/teamspeak3/jts3servermod) -## [Database](/database/) +## [Database](/database) ### In-Memory Databases -[Redis](/database/redis/) -* [Redis 5](/database/redis/redis-5/) -* [Redis 6](/database/redis/redis-6/) +[Redis](/database/redis) +* [Redis 5](/database/redis/redis-5) +* [Redis 6](/database/redis/redis-6) ### noSQL -* [mongoDB](/database/nosql/mongodb/) +* [mongoDB](/database/nosql/mongodb) ### SQL Databases -* [MariaDB](/database/sql/mariadb/) -* [PostgreSQL](/database/sql/postgres/) +* [MariaDB](/database/sql/mariadb) +* [PostgreSQL](/database/sql/postgres) ## Voice Servers -* [Lavalink](/voice_servers/lavalink/) -* [teaspeak](/voice_servers/teaspeak/) +* [Lavalink](/voice_servers/lavalink) +* [teaspeak](/voice_servers/teaspeak) ## Game Eggs -[Among Us Impostor Server](/among_us/impostor_server/) +[Among Us Impostor Server](/among_us/impostor_server) -[ET Legacy](/enemy_territory/etlegacy/) +[ET Legacy](/enemy_territory/etlegacy) -[Factorio](/factorio/factorio/) +[Factorio](/factorio/factorio) -[Grand Theft Auto](/gta/) +[Grand Theft Auto](/gta) * GTA V - * [FiveM](/gta/fivem/) - * [RageMP](/gta/ragemp/) - * [alt:V](/gta/altv/) + * [FiveM](/gta/fivem) + * [RageMP](/gta/ragemp) + * [alt:V](/gta/altv) * GTA SA - * [Multi Theft Auto](/gta/mtasa/) - * [SA-MP](/gta/samp/) + * [Multi Theft Auto](/gta/mtasa) + * [SA-MP](/gta/samp) -[Mindustry](/mindustry/) +[Mindustry](/mindustry) -[Minetest](/minetest/) (including MTG) +[Minetest](/minetest) (including MTG) -[Minecraft](/minecraft/) -* [Bedrock](/minecraft/bedrock/) - * [Bedrock](/minecraft/bedrock/bedrock/) - * [Nukkit](/minecraft/bedrock/nukkit/) - * [PocketMine MP](/minecraft/bedrock/pocketmine_mp/) +[Minecraft](/minecraft) +* [Bedrock](/minecraft/bedrock) + * [Bedrock](/minecraft/bedrock/bedrock) + * [Nukkit](/minecraft/bedrock/nukkit) + * [PocketMine MP](/minecraft/bedrock/pocketmine_mp) -* [Java](/minecraft/java/) Servers for Java Minecraft - * [Cuberite](/minecraft/java/cuberite/) - * [feather](/minecraft/java/feather/) - * [Feed The Beast](/minecraft/java/ftb/) - * [Forge](/minecraft/java/forge/) - * [Magma](/minecraft/java/magma/) +* [Java](/minecraft/java) Servers for Java Minecraft + * [Cuberite](/minecraft/java/cuberite) + * [feather](/minecraft/java/feather) + * [Feed The Beast](/minecraft/java/ftb) + * [Forge](/minecraft/java/forge) + * [Magma](/minecraft/java/magma) * [Paper](/minecraft/java/paper) - * [Spigot](/minecraft/java/spigot/) - * [SpongeForge](/minecraft/java/spongeforge/) - * [SpongeVanilla](/minecraft/java/spongevanilla/) - * [Technic](/minecraft/java/technic/) - * [Tuinity](/minecraft/java/tuinity/) - * [VanillaCord](/minecraft/java/vanillacord/) - -* [Proxies](/minecraft/proxy/) Minecraft Server Proxies - * [Java](/minecraft/proxy/java/) - * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo/) - * [Waterfall](/minecraft/proxy/java/waterfall/) - * [Travertine](/minecraft/proxy/java/travertine/) - * [Velocity](/minecraft/proxy/java/velocity/) - * [Cross Platform](/minecraft/proxy/cross_platform/) - * [GeyserMC] (/minecraft/proxy/cross_platform/geyser/) - * [Waterdog](/minecraft/proxy/cross_platform/waterdog/) + * [Spigot](/minecraft/java/spigot) + * [SpongeForge](/minecraft/java/spongeforge) + * [SpongeVanilla](/minecraft/java/spongevanilla) + * [Technic](/minecraft/java/technic) + * [Tuinity](/minecraft/java/tuinity) + * [VanillaCord](/minecraft/java/vanillacord) + +* [Proxies](/minecraft/proxy) Minecraft Server Proxies + * [Java](/minecraft/proxy/java) + * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) + * [Waterfall](/minecraft/proxy/java/waterfall) + * [Travertine](/minecraft/proxy/java/travertine) + * [Velocity](/minecraft/proxy/java/velocity) + * [Cross Platform](/minecraft/proxy/cross_platform) + * [GeyserMC](/minecraft/proxy/cross_platform/geyser) + * [Waterdog](/minecraft/proxy/cross_platform/waterdog) * DragonProxy abandoned in favour of GeyserMC. -[OpenRA](/openra/) -* [OpenRA Dune2000](/openra/openra_dune2000/) -* [OpenRA Red Alert](/openra/openra_red_alert/) -* [OpenRA Tiberian Dawn](/openra/openra_tiberian_dawn/) - - -[Red Dead Redemption](/rdr/) -* [RedM](/rdr/redm/) - -[steamcmd servers](/steamcmd_servers/) These eggs use steamcmd to install -* [7 Days to Die](/steamcmd_servers/7_days_to_die/) -* [ARK Survival Evolved](/steamcmd_servers/ark_survival_evolved/) -* [Arma](/steamcmd_servers/arma/) - * [Arma 3](/steamcmd_servers/arma/arma3/) - * [Arma 3 HC](/steamcmd_servers/arma/arma3_headless_client/) - * [Arma 3 HC](/steamcmd_servers/arma/arma3_x64/) -* [Avorion](/steamcmd_servers/avorion/) -* [Citadel: Forged with Fire](/steamcmd_servers/citadel/) -* [Conan Exiles](/steamcmd_servers/conan_exiles/) -* [Don't Starve](/steamcmd_servers/dont_starve/) -* [ECO](/steamcmd_servers/eco/) +[OpenRA](/openra) +* [OpenRA Dune2000](/openra/openra_dune2000) +* [OpenRA Red Alert](/openra/openra_red_alert) +* [OpenRA Tiberian Dawn](/openra/openra_tiberian_dawn) + + +[Red Dead Redemption](/rdr) +* [RedM](/rdr/redm) + +[steamcmd servers](/steamcmd_servers) These eggs use steamcmd to install +* [7 Days to Die](/steamcmd_servers/7_days_to_die) +* [ARK Survival Evolved](/steamcmd_servers/ark_survival_evolved) +* [Arma](/steamcmd_servers/arma) + * [Arma 3](/steamcmd_servers/arma/arma3) + * [Arma 3 HC](/steamcmd_servers/arma/arma3_headless_client) + * [Arma 3 HC](/steamcmd_servers/arma/arma3_x64) +* [Avorion](/steamcmd_servers/avorion) +* [Citadel: Forged with Fire](/steamcmd_servers/citadel) +* [Conan Exiles](/steamcmd_servers/conan_exiles) +* [Don't Starve](/steamcmd_servers/dont_starve) +* [ECO](/steamcmd_servers/eco) * [HLDS server](/steamcmd_servers/hlds_server) * [Holdfast](/steamcmd_servers/holdfast) * [Hurtworld](/steamcmd_servers/hurtworld) -* [Insurgency: Sandstorm](/steamcmd_servers/insurgency_sandstorm/) -* [Killing Floor 2](/steamcmd_servers/killingfloor2/) -* [Mordhau](/steamcmd_servers/mordhau/) -* [Onset](/steamcmd_servers/onset/) -* [PixARK](/steamcmd_servers/pixark/) -* [Project Zomboid](/steamcmd_servers/project_zomboid/) -* [Rising World](/steamcmd_servers/rising_world/) -* [Rust Staging Branch](/steamcmd_servers/rust_staging/) -* [SCP: Secret Laboratory](/steamcmd_servers/scpsl/) - * [dedicated](/steamcmd_servers/scpsl/dedicated/) - * [multiadmin](/steamcmd_servers/scpsl/multiadmin/) -* [Soldat](/steamcmd_servers/soldat/) -* [Starbound](/steamcmd_servers/starbound/) -* [Stationeers](/steamcmd_servers/stationeers/) -* [Stormworks](/steamcmd_servers/stormworks/) -* [Sven Co-op](/steamcmd_servers/svencoop/) -* [Squad](/steamcmd_servers/squad/) -* [Team Fortress 2 Classic](/steamcmd_servers/team_fortress_2_classic/) -* [Unturned](/steamcmd_servers/unturned/) - -[Teeworlds](/teeworlds/) -* [teeworlds](/teeworlds/teeworlds/) - -[Terraria](/terraria/) -* [vanilla](/terraria/vanilla/) -* [tmodloader](/terraria/tmodloader/) -* [tshock](/terraria/tshock/) - -[Tycoon Games](/tycoon_games/) -* [OpenTTD](/tycoon_games/openttd/) +* [Insurgency: Sandstorm](/steamcmd_servers/insurgency_sandstorm) +* [Killing Floor 2](/steamcmd_servers/killingfloor2) +* [Mordhau](/steamcmd_servers/mordhau) +* [Onset](/steamcmd_servers/onset) +* [PixARK](/steamcmd_servers/pixark) +* [Project Zomboid](/steamcmd_servers/project_zomboid) +* [Rising World](/steamcmd_servers/rising_world) +* [Rust Staging Branch](/steamcmd_servers/rust_staging) +* [SCP: Secret Laboratory](/steamcmd_servers/scpsl) + * [dedicated](/steamcmd_servers/scpsl/dedicated) + * [multiadmin](/steamcmd_servers/scpsl/multiadmin) +* [Soldat](/steamcmd_servers/soldat) +* [Starbound](/steamcmd_servers/starbound) +* [Stationeers](/steamcmd_servers/stationeers) +* [Stormworks](/steamcmd_servers/stormworks) +* [Sven Co-op](/steamcmd_servers/svencoop) +* [Squad](/steamcmd_servers/squad) +* [Team Fortress 2 Classic](/steamcmd_servers/team_fortress_2_classic) +* [Unturned](/steamcmd_servers/unturned) + +[Teeworlds](/teeworlds) +* [teeworlds](/teeworlds/teeworlds) + +[Terraria](/terraria) +* [vanilla](/terraria/vanilla) +* [tmodloader](/terraria/tmodloader) +* [tshock](/terraria/tshock) + +[Tycoon Games](/tycoon_games) +* [OpenTTD](/tycoon_games/openttd) [Unreal Engine](/unreal_engine) -* [Tower Unite](/unreal_engine/tower_unite/) -* [Tower Unite](/steamcmd_servers/tower_unite/) +* [Tower Unite](/unreal_engine/tower_unite) +* [Tower Unite](/steamcmd_servers/tower_unite) -[Vintage Story](/vintage_story/vintage_story/) +[Vintage Story](/vintage_story/vintage_story) -[Xonotic](/xonotic/xonotic/) +[Xonotic](/xonotic/xonotic) -[Cryofall](/cryofall/) +[Cryofall](/cryofall) diff --git a/minecraft/proxy/README.md b/minecraft/proxy/README.md index 6be307ca4..b5bfa102b 100644 --- a/minecraft/proxy/README.md +++ b/minecraft/proxy/README.md @@ -1,12 +1,11 @@ # Minecraft Proxies * [Java](/minecraft/proxy/java/) - * [Waterfall](/minecraft/proxy/java/waterfall/) - * [Travertine](/minecraft/proxy/java/travertine/) - * [Velocity](/minecraft/proxy/java/velocity/) - * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo/) -* [Bedrock](/minecraft/proxy/bedrock/) - * [DragonProxy](/minecraft/proxy/bedrock/dragonproxy/) (Abandoned in favor of GeyserMC) - * [GeyserMC](/minecraft/proxy/bedrock/geyser/) + * [Waterfall](/minecraft/proxy/java/waterfall) + * [Travertine](/minecraft/proxy/java/travertine) + * [Velocity](/minecraft/proxy/java/velocity) + * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) * [Cross Platform](/minecraft/proxy/cross_platform) - * [Waterdog](/minecraft/proxy/waterdog/) + * [GeyserMC](/minecraft/proxy/cross_platform/geyser) + * [Waterdog](/minecraft/proxy/cross_platform/waterdog) + * DragonProxy abandoned in favour of GeyserMC. From 998c24bddfdbe7af2cb2c78b6886dc91507d3637 Mon Sep 17 00:00:00 2001 From: TASelwyn <37274951+TASelwyn@users.noreply.github.com> Date: Sat, 5 Dec 2020 13:50:05 -0500 Subject: [PATCH 067/104] Updates Readme Adds tuinity readme & updates the original /minecraft/ readme to indicate the proxy changes. --- minecraft/README.md | 9 ++++----- minecraft/java/tuinity/README.MD | 11 +++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 minecraft/java/tuinity/README.MD diff --git a/minecraft/README.md b/minecraft/README.md index 9d3b4ed79..04344ff5d 100644 --- a/minecraft/README.md +++ b/minecraft/README.md @@ -29,8 +29,7 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [Waterfall](/minecraft/proxy/java/waterfall/) * [Travertine](/minecraft/proxy/java/travertine/) * [Velocity](/minecraft/proxy/java/velocity/) - * [Bedrock](/minecraft/proxy/bedrock/) - * [DragonProxy](/minecraft/proxy/bedrock/dragonproxy/) - * [GeyserMC](/minecraft/proxy/bedrock/geyser/) - * [Cross Platform](/minecraft/proxy/cross_platform) - * [Waterdog](/minecraft/proxy/cross_platform/waterdog/) +* [Cross Platform](/minecraft/proxy/cross_platform) + * [GeyserMC](/minecraft/proxy/cross_platform/geyser) + * [Waterdog](/minecraft/proxy/cross_platform/waterdog) + * DragonProxy abandoned in favour of GeyserMC. diff --git a/minecraft/java/tuinity/README.MD b/minecraft/java/tuinity/README.MD new file mode 100644 index 000000000..02345900f --- /dev/null +++ b/minecraft/java/tuinity/README.MD @@ -0,0 +1,11 @@ +# Tuinity + +Fork of Paper aimed at improving server performance at high playercounts. + +## Server Ports +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. + + +| Port | default | +|-------|---------| +| Game | 25565 | \ No newline at end of file From 7a4b18851875cb0178b2838bb9342ba5e9f8ea02 Mon Sep 17 00:00:00 2001 From: TASelwyn <37274951+TASelwyn@users.noreply.github.com> Date: Sat, 5 Dec 2020 13:51:37 -0500 Subject: [PATCH 068/104] Update README.md Fixed bad indenting --- minecraft/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft/README.md b/minecraft/README.md index 04344ff5d..9a0433aa6 100644 --- a/minecraft/README.md +++ b/minecraft/README.md @@ -29,7 +29,7 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [Waterfall](/minecraft/proxy/java/waterfall/) * [Travertine](/minecraft/proxy/java/travertine/) * [Velocity](/minecraft/proxy/java/velocity/) -* [Cross Platform](/minecraft/proxy/cross_platform) + * [Cross Platform](/minecraft/proxy/cross_platform) * [GeyserMC](/minecraft/proxy/cross_platform/geyser) * [Waterdog](/minecraft/proxy/cross_platform/waterdog) * DragonProxy abandoned in favour of GeyserMC. From 65609dac8584089dfae1e32760b58bfb74034aa5 Mon Sep 17 00:00:00 2001 From: TASelwyn <37274951+TASelwyn@users.noreply.github.com> Date: Sat, 5 Dec 2020 13:54:45 -0500 Subject: [PATCH 069/104] Update README.md Adds geysermc to cross platform readme --- minecraft/proxy/cross_platform/README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/minecraft/proxy/cross_platform/README.md b/minecraft/proxy/cross_platform/README.md index 8b4cedc81..d8442840c 100644 --- a/minecraft/proxy/cross_platform/README.md +++ b/minecraft/proxy/cross_platform/README.md @@ -1,5 +1,12 @@ # Mineraft Cross Platform Proxies +### GeyserMC +[GeyserMC](https://github.com/GeyserMC/) +A bridge/proxy allowing you to connect to Minecraft: Java Edition servers with Minecraft: Bedrock edition. + + #### Waterdog [Waterdog](https://github.com/yesdog/Waterdog) -Waterdog provides native support for the Minecraft Bedrock protocols along with the existing java protocols. It is capable of using the ProtocolSupport PE encapsulation protocol over TCP, or it can use the native RakNet Bedrock protocol for traditional downstream Bedrock servers such as Nukkit, Pocketmine, Bedrock Alpha Server, MiNET, and others. \ No newline at end of file + +Waterdog provides native support for the Minecraft Bedrock protocols along with the existing java protocols. It is capable of using the ProtocolSupport PE encapsulation protocol over TCP, or it can use the native RakNet Bedrock protocol for traditional downstream Bedrock servers such as Nukkit, Pocketmine, Bedrock Alpha Server, MiNET, and others. + From 54c0594430abbb83fd1696eac8d69368bc931700 Mon Sep 17 00:00:00 2001 From: TASelwyn <37274951+TASelwyn@users.noreply.github.com> Date: Sat, 5 Dec 2020 13:59:34 -0500 Subject: [PATCH 070/104] Adds bedrock server readme's --- minecraft/bedrock/nukkit/README.md | 5 +++++ minecraft/bedrock/pocketmine_mp/README.md | 5 +++++ minecraft/java/tuinity/.gitignore | 1 - 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 minecraft/bedrock/nukkit/README.md create mode 100644 minecraft/bedrock/pocketmine_mp/README.md delete mode 100644 minecraft/java/tuinity/.gitignore diff --git a/minecraft/bedrock/nukkit/README.md b/minecraft/bedrock/nukkit/README.md new file mode 100644 index 000000000..e09ac94b7 --- /dev/null +++ b/minecraft/bedrock/nukkit/README.md @@ -0,0 +1,5 @@ +# Nukkit + +[Nukkit GitHub](https://github.com/Nukkit/Nukkit) + +Nukkit is a Nuclear-Powered Server Software For Minecraft: Pocket Edition \ No newline at end of file diff --git a/minecraft/bedrock/pocketmine_mp/README.md b/minecraft/bedrock/pocketmine_mp/README.md new file mode 100644 index 000000000..2dff56a3f --- /dev/null +++ b/minecraft/bedrock/pocketmine_mp/README.md @@ -0,0 +1,5 @@ +# PocketMine MP + +[PocketMine MP](https://github.com/pmmp/PocketMine-MP) + +A server software for Minecraft: Bedrock Edition in PHP diff --git a/minecraft/java/tuinity/.gitignore b/minecraft/java/tuinity/.gitignore deleted file mode 100644 index 8b1378917..000000000 --- a/minecraft/java/tuinity/.gitignore +++ /dev/null @@ -1 +0,0 @@ - From e38ab1c1e304bfc74f1f23ec13958e712ea12bcd Mon Sep 17 00:00:00 2001 From: TASelwyn <37274951+TASelwyn@users.noreply.github.com> Date: Sat, 5 Dec 2020 14:09:49 -0500 Subject: [PATCH 071/104] Update README.md --- minecraft/proxy/cross_platform/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/minecraft/proxy/cross_platform/README.md b/minecraft/proxy/cross_platform/README.md index d8442840c..51553d00c 100644 --- a/minecraft/proxy/cross_platform/README.md +++ b/minecraft/proxy/cross_platform/README.md @@ -2,6 +2,7 @@ ### GeyserMC [GeyserMC](https://github.com/GeyserMC/) + A bridge/proxy allowing you to connect to Minecraft: Java Edition servers with Minecraft: Bedrock edition. From a2956ba5cf4c1e23ed85037100e02a15093ca56c Mon Sep 17 00:00:00 2001 From: TASelwyn <37274951+TASelwyn@users.noreply.github.com> Date: Sat, 5 Dec 2020 14:42:04 -0500 Subject: [PATCH 072/104] Nukkit deprecation warning Please use NukkitX by Cloudburst. https://github.com/CloudburstMC/Nukkit --- minecraft/bedrock/nukkit/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/minecraft/bedrock/nukkit/README.md b/minecraft/bedrock/nukkit/README.md index e09ac94b7..87b26676a 100644 --- a/minecraft/bedrock/nukkit/README.md +++ b/minecraft/bedrock/nukkit/README.md @@ -1,5 +1,8 @@ +# Now abandoned. Please use NukkitX by Cloudburst. +[NukkitX](https://github.com/CloudburstMC/Nukkit) # Nukkit [Nukkit GitHub](https://github.com/Nukkit/Nukkit) -Nukkit is a Nuclear-Powered Server Software For Minecraft: Pocket Edition \ No newline at end of file +Nukkit is a Nuclear-Powered Server Software For Minecraft: Pocket Edition + From 8e3767e50f4736722e5ded21bc3264b0e0e25d62 Mon Sep 17 00:00:00 2001 From: Thomas Selwyn <37274951+TASelwyn@users.noreply.github.com> Date: Sat, 5 Dec 2020 14:52:01 -0500 Subject: [PATCH 073/104] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fcd2661a5..c182909da 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Cross Platform](/minecraft/proxy/cross_platform) * [GeyserMC](/minecraft/proxy/cross_platform/geyser) * [Waterdog](/minecraft/proxy/cross_platform/waterdog) - * DragonProxy abandoned in favour of GeyserMC. + * DragonProxy abandoned in favour of GeyserMC. [OpenRA](/openra) From a259c38fc0980f3ab6bb80908696b1bf636c5fac Mon Sep 17 00:00:00 2001 From: Thomas Selwyn <37274951+TASelwyn@users.noreply.github.com> Date: Sat, 5 Dec 2020 21:12:30 -0500 Subject: [PATCH 074/104] Update README.md --- minecraft/README.md | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/minecraft/README.md b/minecraft/README.md index 9a0433aa6..f2ddf4706 100644 --- a/minecraft/README.md +++ b/minecraft/README.md @@ -4,31 +4,32 @@ It’s a game about placing blocks and going on adventures It’s set in infinitely-generated worlds of wide open terrain - icy mountains, swampy bayous, vast pastures and much more - filled with secrets, wonders and peril! -[Bedrock](/minecraft/bedrock/) Servers for Bedrock Minecraft (Windows 10, mobile, console) -* [Bedrock](/minecraft/bedrock/bedrock/) -* [Nukkit](/minecraft/bedrock/nukkit/) -* [PocketMine MP](/minecraft/bedrock/pocketmine_mp/) +[Bedrock](/minecraft/bedrock) Servers for Bedrock Minecraft (Windows 10, mobile, console) +* [Bedrock](/minecraft/bedrock/bedrock) +* [Nukkit](/minecraft/bedrock/nukkit) +* [PocketMine MP](/minecraft/bedrock/pocketmine_mp) [Java](/minecraft/java/) Servers for Java Minecraft -* [Cuberite](/minecraft/java/cuberite/) -* [Feather](/minecraft/java/feather/) -* [Feed The Beast](/minecraft/java/ftb/) -* [Forge](/minecraft/java/forge/) -* [Magma](/minecraft/java/magma/) +* [Cuberite](/minecraft/java/cuberite) +* [Fabric](/minecraft/java/fabric) +* [Feather](/minecraft/java/feather) +* [Feed The Beast](/minecraft/java/ftb) +* [Forge](/minecraft/java/forge) +* [Magma](/minecraft/java/magma) * [Paper](/minecraft/java/paper) -* [Spigot](/minecraft/java/spigot/) -* [spongeforge](/minecraft/java/spongeforge/) -* [SpongeVanilla](/minecraft/java/spongevanilla/) -* [Technic](/minecraft/java/technic/) -* [Tuinity](/minecraft/java/tuinity/) -* [VanillaCord](/minecraft/java/vanillacord/) +* [Spigot](/minecraft/java/spigot) +* [SpongeForge](/minecraft/java/spongeforge) +* [SpongeVanilla](/minecraft/java/spongevanilla) +* [Technic](/minecraft/java/technic) +* [Tuinity](/minecraft/java/tuinity) +* [VanillaCord](/minecraft/java/vanillacord) -* [Proxies](/minecraft/proxy/) Minecraft Server Proxies - * [Java](/minecraft/proxy/java/) - * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo/) - * [Waterfall](/minecraft/proxy/java/waterfall/) - * [Travertine](/minecraft/proxy/java/travertine/) - * [Velocity](/minecraft/proxy/java/velocity/) +* [Proxies](/minecraft/proxy) Minecraft Server Proxies + * [Java](/minecraft/proxy/java) + * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) + * [Waterfall](/minecraft/proxy/java/waterfall) + * [Travertine](/minecraft/proxy/java/travertine) + * [Velocity](/minecraft/proxy/java/velocity) * [Cross Platform](/minecraft/proxy/cross_platform) * [GeyserMC](/minecraft/proxy/cross_platform/geyser) * [Waterdog](/minecraft/proxy/cross_platform/waterdog) From 735ff75a4ff71dd31a6aad59cc36a59b3175272f Mon Sep 17 00:00:00 2001 From: Alex <11708877+acl1704@users.noreply.github.com> Date: Sun, 6 Dec 2020 02:09:56 -0800 Subject: [PATCH 075/104] add mohist egg --- README.md | 1 + minecraft/README.md | 1 + minecraft/java/README.md | 4 ++ minecraft/java/mohist/README.MD | 15 ++++++++ minecraft/java/mohist/egg-mohist.json | 55 +++++++++++++++++++++++++++ 5 files changed, 76 insertions(+) create mode 100644 minecraft/java/mohist/README.MD create mode 100644 minecraft/java/mohist/egg-mohist.json diff --git a/README.md b/README.md index 5b591844e..f8f094a51 100644 --- a/README.md +++ b/README.md @@ -108,6 +108,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Technic](/minecraft/java/technic) * [Tuinity](/minecraft/java/tuinity) * [VanillaCord](/minecraft/java/vanillacord) + * [Mohist](/minecraft/java/mohist) * [Proxies](/minecraft/proxy) Minecraft Server Proxies * [Java](/minecraft/proxy/java) diff --git a/minecraft/README.md b/minecraft/README.md index f2ddf4706..6502f2e34 100644 --- a/minecraft/README.md +++ b/minecraft/README.md @@ -23,6 +23,7 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [Technic](/minecraft/java/technic) * [Tuinity](/minecraft/java/tuinity) * [VanillaCord](/minecraft/java/vanillacord) +* [Mohist](/minecraft/java/mohist) * [Proxies](/minecraft/proxy) Minecraft Server Proxies * [Java](/minecraft/proxy/java) diff --git a/minecraft/java/README.md b/minecraft/java/README.md index a2359f1f1..63a337cc9 100644 --- a/minecraft/java/README.md +++ b/minecraft/java/README.md @@ -94,3 +94,7 @@ The official Tekkit Classic modpack. Build factories, automate crafting! ## Tuinity Fork of Paper aimed at improving server performance at high playercounts. [Tuinity GitHub](https://github.com/Spottedleaf/Tuinity) + +## Mohist +Fork of Spigot focused on performance optimizations. +[Mohist Github](https://github.com/Mohist-Community) \ No newline at end of file diff --git a/minecraft/java/mohist/README.MD b/minecraft/java/mohist/README.MD new file mode 100644 index 000000000..48a79d059 --- /dev/null +++ b/minecraft/java/mohist/README.MD @@ -0,0 +1,15 @@ +# Mohist + +Mohist is a Spigot fork that prioritizes performance optimizations. + +## Server Ports +The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server. + + +| Port | default | +|-------|---------| +| Game | 25565 | + +## Server Specific + +Limited to version 1.12.2 (1.16.4 cannot run headless as of 12/6/2020) \ No newline at end of file diff --git a/minecraft/java/mohist/egg-mohist.json b/minecraft/java/mohist/egg-mohist.json new file mode 100644 index 000000000..c21f35de5 --- /dev/null +++ b/minecraft/java/mohist/egg-mohist.json @@ -0,0 +1,55 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2020-12-06T02:04:44-08:00", + "name": "Mohist", + "author": "alex.chang-lam@protonmail.com", + "description": "Spigot fork with performance optimizations.", + "features": null, + "image": "quay.io\/pterodactyl\/core:java", + "startup": "java -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}} pause", + "config": { + "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \")! For help, type \",\r\n \"userInteraction\": [\r\n \"Go to eula.txt for more info.\"\r\n ]\r\n}", + "logs": "{}", + "stop": "stop" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# Mohistmc Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt update\r\napt install -y curl\r\n\r\ncd \/mnt\/server\r\n\r\ncurl -sSL \"https:\/\/mohistmc.com\/api\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download\" -o ${SERVER_JARFILE}", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Minecraft Version", + "description": "The version of minecraft to download. \r\n\r\nInvalid versions will default to 1.12.2.", + "env_variable": "MINECRAFT_VERSION", + "default_value": "1.12.2", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|max:20" + }, + { + "name": "Server Jar File", + "description": "The name of the server jarfile to run the server with.", + "env_variable": "SERVER_JARFILE", + "default_value": "server.jar", + "user_viewable": true, + "user_editable": false, + "rules": "required|string|max:20" + }, + { + "name": "Build Number", + "description": "The build number for the Mohist release.\r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.", + "env_variable": "BUILD_NUMBER", + "default_value": "latest", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + } + ] +} \ No newline at end of file From 9152114fcc4f69b561d2afe62a25930409139d1f Mon Sep 17 00:00:00 2001 From: Alex <11708877+acl1704@users.noreply.github.com> Date: Sun, 6 Dec 2020 02:18:59 -0800 Subject: [PATCH 076/104] update terraria to base_debian --- terraria/vanilla/egg-terraria-vanilla.json | 29 +++++++++++----------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/terraria/vanilla/egg-terraria-vanilla.json b/terraria/vanilla/egg-terraria-vanilla.json index d4761a281..221f5218c 100644 --- a/terraria/vanilla/egg-terraria-vanilla.json +++ b/terraria/vanilla/egg-terraria-vanilla.json @@ -3,11 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-05-21T09:11:45-04:00", + "exported_at": "2020-12-06T02:18:03-08:00", "name": "Terraria Vanilla", "author": "iamkubi@gmail.com", "description": "Dig, fight, explore, build! Nothing is impossible in this action-packed adventure game.", - "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu", + "features": null, + "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", "startup": ".\/TerrariaServer.bin.x86_64 -config serverconfig.txt", "config": { "files": "{\r\n \"serverconfig.txt\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"worldpath\": \"\/home\/container\/saves\/Worlds\",\r\n \"worldname\": \"{{server.build.env.WORLD_NAME}}\",\r\n \"world\": \"\/home\/container\/saves\/Worlds\/{{server.build.env.WORLD_NAME}}.wld\",\r\n \"difficulty\": \"{{server.build.env.WORLD_DIFFICULTY}}\",\r\n \"autocreate\": \"{{server.build.env.WORLD_SIZE}}\",\r\n \"port\": \"{{server.build.default.port}}\",\r\n \"maxplayers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n \"motd\": \"{{server.build.env.SERVER_MOTD}}\"\r\n }\r\n }\r\n}", @@ -28,8 +29,8 @@ "description": "the version of Terraria that is to be used.\r\n\r\nYou can use the full version number or the file number. (ex. 1.3.5.3 or 1353)\r\n\r\nGet version numbers here - https:\/\/terraria.gamepedia.com\/Server#Downloads", "env_variable": "TERRARIA_VERSION", "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" }, { @@ -37,8 +38,8 @@ "description": "The name for the world file.", "env_variable": "WORLD_NAME", "default_value": "world", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" }, { @@ -46,8 +47,8 @@ "description": "The maximum number of players a server will hold.", "env_variable": "MAX_PLAYERS", "default_value": "8", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "required|numeric|digits_between:1,3" }, { @@ -55,8 +56,8 @@ "description": "Defines the worlds size. 3 sizes 1 (small), 2 (medium), 3 (large).", "env_variable": "WORLD_SIZE", "default_value": "1", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|numeric|digits_between:1,3" }, { @@ -64,8 +65,8 @@ "description": "World Difficulty\r\n\r\nOptions: 0(normal), 1(expert), 2(master), 3(journey)", "env_variable": "WORLD_DIFFICULTY", "default_value": "3", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" }, { @@ -73,8 +74,8 @@ "description": "Server MOTD", "env_variable": "SERVER_MOTD", "default_value": "Welcome!", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:128" } ] From 84985b4a93112f2704da9ff7bc5797532c95b9c8 Mon Sep 17 00:00:00 2001 From: tmunsch Date: Sun, 6 Dec 2020 11:45:51 -0500 Subject: [PATCH 077/104] Update fabric Set latest to default version value --- minecraft/java/fabric/egg-fabric.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft/java/fabric/egg-fabric.json b/minecraft/java/fabric/egg-fabric.json index 22bf5fe7d..76904fe2a 100644 --- a/minecraft/java/fabric/egg-fabric.json +++ b/minecraft/java/fabric/egg-fabric.json @@ -38,7 +38,7 @@ "name": "Fabric Version", "description": "The version of Fabric to install.", "env_variable": "FABRIC_VERSION", - "default_value": "0.6.1.51", + "default_value": "latest", "user_viewable": true, "user_editable": true, "rules": "required|string|between:3,15" From b5668289f5031c533a1230816aad0a7bf103e880 Mon Sep 17 00:00:00 2001 From: Dominika Jadowska Date: Sun, 6 Dec 2020 21:47:57 +0100 Subject: [PATCH 078/104] Add League Sandbox Egg --- README.md | 2 ++ leaguesandbox/LeagueSandbox_Egg.json | 36 ++++++++++++++++++++++++++++ leaguesandbox/README.md | 19 +++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 leaguesandbox/LeagueSandbox_Egg.json create mode 100644 leaguesandbox/README.md diff --git a/README.md b/README.md index f8f094a51..2d92c5a82 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,8 @@ If you are reading this it looks like you are looking to add an egg to your serv [Mindustry](/mindustry) +[LeagueSandbox](/leaguesandbox) + [Minetest](/minetest) (including MTG) [Minecraft](/minecraft) diff --git a/leaguesandbox/LeagueSandbox_Egg.json b/leaguesandbox/LeagueSandbox_Egg.json new file mode 100644 index 000000000..73ce9a957 --- /dev/null +++ b/leaguesandbox/LeagueSandbox_Egg.json @@ -0,0 +1,36 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2020-11-10T17:07:44-05:00", + "name": "LeagueSandbox", + "author": "domi@imagine.team", + "description": "A simple egg to run LeagueSandbox server in pterodactyl", + "image": "quay.io\/parkervcp\/pterodactyl-images:debian_dotnet", + "startup": ".\/GameServerConsole", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Game is ready.\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "apk update && apk add git\r\ngit clone $GIT_URL\r\nrm .git -rf\r\ncd GameServer\r\ngit submodule init\r\ngit submodule update\r\ndotnet build .\r\ncp -r GameServerConsole\/bin\/Debug\/netcoreapp3.0\/* \/mnt\/server\/\r\ncp -r Content \/mnt\/server\/Content", + "container": "mcr.microsoft.com\/dotnet\/sdk:5.0", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Git Url", + "description": "This is where the install script will clone the server files from", + "env_variable": "GIT_URL", + "default_value": "https:\/\/github.com\/LeagueSandbox\/GameServer", + "user_viewable": true, + "user_editable": false, + "rules": "required|string|max:90|url" + } + ] +} \ No newline at end of file diff --git a/leaguesandbox/README.md b/leaguesandbox/README.md new file mode 100644 index 000000000..e50224668 --- /dev/null +++ b/leaguesandbox/README.md @@ -0,0 +1,19 @@ +# League Sandbox +### From their [Github](https://github.com/parkervcp/eggs) +[![Build status](https://ci.appveyor.com/api/projects/status/7olahkndcs3r295p/branch/indev?svg=true)](https://ci.appveyor.com/project/MythicManiac/gameserver/branch/indev) +[![Build Status](https://travis-ci.org/LeagueSandbox/GameServer.svg?branch=indev)](https://travis-ci.org/LeagueSandbox/GameServer) + +Project website along with more specifications can be found from: https://leaguesandbox.github.io/ +Project chat on Discord: https://discord.gg/Bz3znAM + +### Install notes +Post install you are required to set +- `/home/container/Settings/GameInfo.json` `CONTENT_PATH` to just `Content` +- `/home/container/Settings/GameServerSettings.json` `autoStartClient` to `false` + +### Server Ports +Ports required to run the server in a table format. + +| Port | default | +| ---- | ------- | +| Game | 5119 | \ No newline at end of file From f9719d76f91fec048e2766d71fc0b0025ef7cdf3 Mon Sep 17 00:00:00 2001 From: Alex <11708877+acl1704@users.noreply.github.com> Date: Sun, 6 Dec 2020 19:32:15 -0800 Subject: [PATCH 079/104] Add EULA feature flag add flag and rename forge version --- .../java/forge/forge/egg-forge-enhanced.json | 23 ++++++++++--------- minecraft/java/paper/egg-paper.json | 4 ++-- minecraft/java/spigot/egg-spigot.json | 15 ++++++------ .../java/spongeforge/egg-sponge-forge.json | 11 +++++---- .../spongevanilla/egg-sponge-vanilla.json | 11 +++++---- minecraft/java/tuinity/egg-tuinity.json | 9 ++++---- .../java/vanillacord/egg-vanilla-cord.json | 13 ++++++----- 7 files changed, 46 insertions(+), 40 deletions(-) diff --git a/minecraft/java/forge/forge/egg-forge-enhanced.json b/minecraft/java/forge/forge/egg-forge-enhanced.json index a0d7fac3c..36f4b2ead 100644 --- a/minecraft/java/forge/forge/egg-forge-enhanced.json +++ b/minecraft/java/forge/forge/egg-forge-enhanced.json @@ -3,10 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-06-01T21:19:06-04:00", + "exported_at": "2020-12-06T19:03:10-08:00", "name": "Forge Enhanced", "author": "parker@parkervcp.com", "description": "Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.", + "features": ["eula"], "image": "quay.io\/pterodactyl\/core:java", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { @@ -28,17 +29,17 @@ "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, + "user_viewable": true, + "user_editable": true, "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" }, { - "name": "Forge version", + "name": "Minecraft Version", "description": "The version of minecraft you want to install for.\r\n\r\nLeaving latest will install the latest recommended version.", "env_variable": "MC_VERSION", "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:9" }, { @@ -46,8 +47,8 @@ "description": "The type of server jar to download from forge.\r\n\r\nValid types are \"recommended\" and \"latest\".", "env_variable": "BUILD_TYPE", "default_value": "recommended", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" }, { @@ -55,9 +56,9 @@ "description": "Gets an exact version.\r\n\r\nEx. 1.15.2-31.2.4\r\n\r\nOverrides MC_VERSION and BUILD_TYPE. If it fails to download the server files it will fail to install.", "env_variable": "FORGE_VERSION", "default_value": "", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "nullable|string|max:20" } ] -} +} \ No newline at end of file diff --git a/minecraft/java/paper/egg-paper.json b/minecraft/java/paper/egg-paper.json index 942b8f5dc..63d37a013 100644 --- a/minecraft/java/paper/egg-paper.json +++ b/minecraft/java/paper/egg-paper.json @@ -3,11 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-12-04T12:08:20-05:00", + "exported_at": "2020-12-06T18:34:01-08:00", "name": "Paper", "author": "parker@pterodactyl.io", "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", - "features": null, + "features": ["eula"], "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { diff --git a/minecraft/java/spigot/egg-spigot.json b/minecraft/java/spigot/egg-spigot.json index c6e06f610..f270f799b 100644 --- a/minecraft/java/spigot/egg-spigot.json +++ b/minecraft/java/spigot/egg-spigot.json @@ -3,10 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-03-29T13:00:51-04:00", + "exported_at": "2020-12-06T19:20:29-08:00", "name": "Spigot", "author": "support@pterodactyl.io", "description": "Spigot is the most widely-used modded Minecraft server software in the world. It powers many of the top Minecraft server networks around to ensure they can cope with their huge player base and ensure the satisfaction of their players. Spigot works by reducing and eliminating many causes of lag, as well as adding in handy features and settings that help make your job of server administration easier.", + "features": ["eula"], "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-8-jre", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { @@ -28,8 +29,8 @@ "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, + "user_viewable": true, + "user_editable": true, "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" }, { @@ -37,8 +38,8 @@ "description": "A URL to use to download Spigot rather than building it on the server. This is not user viewable. Use {{DL_VERSION}}<\/code> in the URL to automatically insert the assigned version into the URL. If you do not enter a URL Spigot will build directly in the container (this will fail on low memory containers).", "env_variable": "DL_PATH", "default_value": "", - "user_viewable": 0, - "user_editable": 0, + "user_viewable": false, + "user_editable": false, "rules": "nullable|string" }, { @@ -46,8 +47,8 @@ "description": "The version of Spigot to download (using the --rev tag). Use \"latest\" for latest.", "env_variable": "DL_VERSION", "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|between:3,7" } ] diff --git a/minecraft/java/spongeforge/egg-sponge-forge.json b/minecraft/java/spongeforge/egg-sponge-forge.json index 91c1d828a..3ba615a1f 100644 --- a/minecraft/java/spongeforge/egg-sponge-forge.json +++ b/minecraft/java/spongeforge/egg-sponge-forge.json @@ -3,10 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-12-11T01:44:03+03:00", + "exported_at": "2020-12-06T18:50:01-08:00", "name": "SpongeForge", "author": "parker@parkervcp.com", "description": "A community-driven open source Minecraft: Java Edition modding platform.", + "features": ["eula"], "image": "quay.io\/pterodactyl\/core:java", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { @@ -28,8 +29,8 @@ "description": "Example 1.12.2-2825-7.1.6\r\n\r\nIf the version fails it defaults to recommended", "env_variable": "SF_VERSION", "default_value": "recommended", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string" }, { @@ -37,8 +38,8 @@ "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, + "user_viewable": true, + "user_editable": true, "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" } ] diff --git a/minecraft/java/spongevanilla/egg-sponge-vanilla.json b/minecraft/java/spongevanilla/egg-sponge-vanilla.json index 64b4e9dc7..8e1995bc8 100644 --- a/minecraft/java/spongevanilla/egg-sponge-vanilla.json +++ b/minecraft/java/spongevanilla/egg-sponge-vanilla.json @@ -3,10 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-09-13T21:18:48-04:00", + "exported_at": "2020-12-06T18:49:56-08:00", "name": "SpongeVanilla", "author": "parker@parkervcp.com", "description": "SpongeVanilla is the implementation of the Sponge API on top of Vanilla Minecraft.", + "features": ["eula"], "image": "quay.io\/pterodactyl\/core:java", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { @@ -28,8 +29,8 @@ "description": "Example 1.12.2-7.1.6\r\n\r\nIf the version fails it defaults to recommended", "env_variable": "SV_VERSION", "default_value": "recommended", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string" }, { @@ -37,8 +38,8 @@ "description": "The name of the Jarfile to use when running Mod.", "env_variable": "SERVER_JARFILE", "default_value": "server.jar", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" } ] diff --git a/minecraft/java/tuinity/egg-tuinity.json b/minecraft/java/tuinity/egg-tuinity.json index 9bf94c409..f4be0a160 100644 --- a/minecraft/java/tuinity/egg-tuinity.json +++ b/minecraft/java/tuinity/egg-tuinity.json @@ -3,10 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-03-27T00:25:53-04:00", + "exported_at": "2020-12-06T18:58:35-08:00", "name": "Tuinity", "author": "unknown@unknown.com", "description": "Fork of Paper aimed at improving server performance at high playercounts.", + "features": ["eula"], "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { @@ -28,9 +29,9 @@ "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, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" } ] -} +} \ No newline at end of file diff --git a/minecraft/java/vanillacord/egg-vanilla-cord.json b/minecraft/java/vanillacord/egg-vanilla-cord.json index 7df2d5c56..83acf7140 100644 --- a/minecraft/java/vanillacord/egg-vanilla-cord.json +++ b/minecraft/java/vanillacord/egg-vanilla-cord.json @@ -3,10 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-06-06T09:33:27-04:00", + "exported_at": "2020-12-06T18:58:33-08:00", "name": "VanillaCord", "author": "support@pterodactyl.io", "description": "Minecraft is a game about placing blocks and going on adventures. Explore randomly generated worlds and build amazing things from the simplest of homes to the grandest of castles. Play in Creative Mode with unlimited resources or mine deep in Survival Mode, crafting weapons and armor to fend off dangerous mobs. Do all this alone or with friends.\r\n\r\nVanillaCord adds support for BungeeCord's ip_forward setting.", + "features": ["eula"], "image": "quay.io\/pterodactyl\/core:java", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { @@ -28,8 +29,8 @@ "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, + "user_viewable": true, + "user_editable": true, "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" }, { @@ -37,9 +38,9 @@ "description": "The version of Minecraft Vanilla to install. Use \"latest\" to install the latest version.", "env_variable": "VANILLA_VERSION", "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|between:3,15" } ] -} +} \ No newline at end of file From 53063f742bb326910c8f10de976ef5c88a5721aa Mon Sep 17 00:00:00 2001 From: Alex <11708877+acl1704@users.noreply.github.com> Date: Sun, 6 Dec 2020 19:55:39 -0800 Subject: [PATCH 080/104] update fabric to java 11 --- minecraft/java/fabric/egg-fabric.json | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/minecraft/java/fabric/egg-fabric.json b/minecraft/java/fabric/egg-fabric.json index 76904fe2a..d8ebf272d 100644 --- a/minecraft/java/fabric/egg-fabric.json +++ b/minecraft/java/fabric/egg-fabric.json @@ -3,14 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-11-10T04:10:30-05:00", + "exported_at": "2020-12-06T19:54:35-08:00", "name": "Fabric", "author": "accounts@bofanodes.io", "description": "Fabric is a modular modding toolchain targeting Minecraft 1.14 and above, including snapshots.", - "features": [ - "eula" - ], - "image": "quay.io\/pterodactyl\/core:java", + "features": ["eula"], + "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"enable-query\": \"true\",\r\n \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", @@ -20,7 +18,8 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Fabric MC Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq unzip dos2unix wget\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\nif [ -z \"$FABRIC_VERSION\" ] || [ \"$FABRIC_VERSION\" == \"latest\" ]; then\r\nFABRIC_VERSION=$(curl https:\/\/maven.fabricmc.net\/net\/fabricmc\/fabric-installer\/ | grep -Po '(?<=href=\")[^\"]*' | sort -h | tail -1 | sed 's,\/,,g')\r\nwget https:\/\/maven.fabricmc.net\/net\/fabricmc\/fabric-installer\/$FABRIC_VERSION\/fabric-installer-$FABRIC_VERSION.jar\r\nelse\r\nwget https:\/\/maven.fabricmc.net\/net\/fabricmc\/fabric-installer\/$FABRIC_VERSION\/fabric-installer-$FABRIC_VERSION.jar\r\nfi\r\njava -jar fabric-installer-$FABRIC_VERSION.jar server -downloadMinecraft\r\necho -e \"Install Complete\"", "container": "openjdk:8-jdk-slim", + "script": "#!\/bin\/bash\r\n# Fabric MC Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq unzip dos2unix wget\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\nif [ -z \"$FABRIC_VERSION\" ] || [ \"$FABRIC_VERSION\" == \"latest\" ]; then\r\nFABRIC_VERSION=$(curl https:\/\/maven.fabricmc.net\/net\/fabricmc\/fabric-installer\/ | grep -Po '(?<=href=\")[^\"]*' | sort -h | tail -1 | sed 's,\/,,g')\r\nwget https:\/\/maven.fabricmc.net\/net\/fabricmc\/fabric-installer\/$FABRIC_VERSION\/fabric-installer-$FABRIC_VERSION.jar\r\nelse\r\nwget https:\/\/maven.fabricmc.net\/net\/fabricmc\/fabric-installer\/$FABRIC_VERSION\/fabric-installer-$FABRIC_VERSION.jar\r\nfi\r\njava -jar fabric-installer-$FABRIC_VERSION.jar server -downloadMinecraft\r\necho -e \"Install Complete\"", + "container": "openjdk:11-jdk-slim", "entrypoint": "bash" } }, @@ -44,4 +43,4 @@ "rules": "required|string|between:3,15" } ] -} +} \ No newline at end of file From 294494d95291e5ed91a277cc89c7b40fb8fea40e Mon Sep 17 00:00:00 2001 From: tmunsch Date: Mon, 7 Dec 2020 11:36:10 -0500 Subject: [PATCH 081/104] Update curseforge to reference a working modpack Update wording to reference a modpack that works out the box as opposed to sevtech ages which doesn't work. I added my BOFA mods modpack however we can use any modpack that works out the box. If used, I vow to not break this modpack and will leave it in it's current state to guarantee it will work when people use it as a test. --- .../egg-curseforge-generic.json | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json b/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json index 4b6e02db3..3b3a14b64 100644 --- a/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json +++ b/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json @@ -3,10 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-08-12T08:19:04-04:00", + "exported_at": "2020-12-07T11:33:04-05:00", "name": "Curseforge Generic", "author": "parker@parkervcp.com", "description": "A generic egg for a forge modpack", + "features": null, "image": "quay.io\/pterodactyl\/core:java", "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar server.jar", "config": { @@ -25,11 +26,11 @@ "variables": [ { "name": "modpack project ID", - "description": "The modpack project ID from the curseforge site on the pack page.\r\n\r\n(Ex. https:\/\/minecraft.curseforge.com\/projects\/sevtech-ages ID is 268208)", + "description": "The modpack project ID from the curseforge site on the pack page.\r\n\r\n(Ex. https:\/\/www.curseforge.com\/minecraft\/modpacks\/bofa-mods ID is 375152)", "env_variable": "MODPACK_ID", "default_value": "", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string" }, { @@ -37,9 +38,9 @@ "description": "Version of the modpack to use.", "env_variable": "MODPACK_VERSION", "default_value": "latest", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|string|max:20" } ] -} \ No newline at end of file +} From c3ec1c1a7c34a76568ee4ba287ee8eb09734c373 Mon Sep 17 00:00:00 2001 From: Alex <11708877+acl1704@users.noreply.github.com> Date: Tue, 8 Dec 2020 13:48:21 -0800 Subject: [PATCH 082/104] update mohist for new instllation process --- minecraft/java/mohist/README.MD | 7 ++++- minecraft/java/mohist/egg-mohist.json | 37 +++++++++++++++++---------- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/minecraft/java/mohist/README.MD b/minecraft/java/mohist/README.MD index 48a79d059..825d5523f 100644 --- a/minecraft/java/mohist/README.MD +++ b/minecraft/java/mohist/README.MD @@ -12,4 +12,9 @@ The minecraft server requires a single port for access (default 25565) but plugi ## Server Specific -Limited to version 1.12.2 (1.16.4 cannot run headless as of 12/6/2020) \ No newline at end of file +### Supported versions: +- 1.16.4 series build 132+ +- 1.12.x series +- 1.7.x series build 13+ + +Requires changing Minecraft_Version variable on each new Minecraft version release. \ No newline at end of file diff --git a/minecraft/java/mohist/egg-mohist.json b/minecraft/java/mohist/egg-mohist.json index c21f35de5..730273010 100644 --- a/minecraft/java/mohist/egg-mohist.json +++ b/minecraft/java/mohist/egg-mohist.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-12-06T02:04:44-08:00", + "exported_at": "2020-12-08T11:59:05-08:00", "name": "Mohist", "author": "alex.chang-lam@protonmail.com", "description": "Spigot fork with performance optimizations.", @@ -18,34 +18,43 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Mohistmc Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt update\r\napt install -y curl\r\n\r\ncd \/mnt\/server\r\n\r\ncurl -sSL \"https:\/\/mohistmc.com\/api\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download\" -o ${SERVER_JARFILE}", + "script": "#!\/bin\/bash\r\n# Mohist Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl\r\n\r\n#Go into main direction\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\nif [ ! -z ${BUILD_VERSION} ]; then\r\n DOWNLOAD_LINK=https:\/\/mohistmc.com\/api\/${MC_VERSION}\/${BUILD_VERSION}\/download\r\n \r\n #Downloading jars\r\n echo -e \"Download link is ${DOWNLOAD_LINK}\"\r\n echo -e \"Downloading build version ${BUILD_VERSION}\"\r\n if [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-server.jar; then\r\n echo -e \"Download link is valid.\"\r\n else\r\n echo -e \"Link is invalid closing out\"\r\n exit 2\r\n fi\r\n fi\r\n\r\n curl -s -o server.jar -sS ${DOWNLOAD_LINK}\r\n\r\n #Checking if downloaded jars exist\r\n if [ ! -f .\/server.jar ]; then\r\n echo \"!!! Error downloading build version ${BUILD_VERSION} !!!\"\r\n exit\r\n fi\r\nelse\r\n DOWNLOAD_LINK=https:\/\/mohistmc.com\/api\/${MC_VERSION}\/${BUILD_TYPE}\/download\r\n\r\n #Downloading jars\r\n echo -e \"Download link is ${DOWNLOAD_LINK}\"\r\n echo -e \"Downloading ${BUILD_TYPE} build version\"\r\n if [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-server.jar; then\r\n echo -e \"Download link is valid.\"\r\n else\r\n echo -e \"Link is invalid closing out\"\r\n exit 2\r\n fi\r\n fi\r\n\r\n curl -s -o server.jar -sS ${DOWNLOAD_LINK}\r\n\r\n #Checking if downloaded jars exist\r\n if [ ! -f .\/server.jar ]; then\r\n echo \"!!! Error downloading ${BUILD_TYPE} build !!!\"\r\n exit\r\n fi\r\nfi", "container": "debian:buster-slim", "entrypoint": "bash" } }, "variables": [ - { - "name": "Minecraft Version", - "description": "The version of minecraft to download. \r\n\r\nInvalid versions will default to 1.12.2.", - "env_variable": "MINECRAFT_VERSION", - "default_value": "1.12.2", - "user_viewable": true, - "user_editable": true, - "rules": "nullable|string|max:20" - }, { "name": "Server Jar File", - "description": "The name of the server jarfile to run the server with.", + "description": "The name of the jarfile to run the server with.", "env_variable": "SERVER_JARFILE", "default_value": "server.jar", "user_viewable": true, "user_editable": false, "rules": "required|string|max:20" }, + { + "name": "Minecraft Version", + "description": "The version of Minecraft to download.", + "env_variable": "MC_VERSION", + "default_value": "1.16.4", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + }, { "name": "Build Number", - "description": "The build number for the Mohist release.\r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.", - "env_variable": "BUILD_NUMBER", + "description": "Optional: \r\nThe build number for the Mohist release. Overrides Build Type.", + "env_variable": "BUILD_VERSION", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|max:20" + }, + { + "name": "Build Type", + "description": "The type of server jar to download from Mohist.\r\n\r\nValid types are \"recommended\" and \"latest\".", + "env_variable": "BUILD_TYPE", "default_value": "latest", "user_viewable": true, "user_editable": true, From d63f8ecfb7c4ed54d67912fd6fd58cd5638484f3 Mon Sep 17 00:00:00 2001 From: tmunsch Date: Tue, 8 Dec 2020 17:31:58 -0500 Subject: [PATCH 083/104] Update Curse Readme to reference Valid Modpack Updated Readme to include the Modpack that is referenced by default in the Curse Forge egg. --- minecraft/java/forge/curseforge-generic/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/minecraft/java/forge/curseforge-generic/README.md b/minecraft/java/forge/curseforge-generic/README.md index c92470c23..e136c371d 100644 --- a/minecraft/java/forge/curseforge-generic/README.md +++ b/minecraft/java/forge/curseforge-generic/README.md @@ -2,9 +2,9 @@ ### This is a generic egg for curseforge modpacks -You will need to give it a modpack ID. The ID for sevtech-ages is `268208` for example. +You will need to give it a modpack ID. The ID for BOFA mods is `375152` for example. This can be found on the modpack page in the `About Project` section in the upper right corner. -This will grabe the latest release when the version is set to latest. +This will grab the latest release when the version is set to latest. -It "should" grab versions of the pack based on the modpack version numbers \ No newline at end of file +It "should" grab versions of the pack based on the modpack version numbers From 08e2b6db97c700ac2662ed81b1acef10d9f95663 Mon Sep 17 00:00:00 2001 From: Alex <11708877+acl1704@users.noreply.github.com> Date: Tue, 8 Dec 2020 15:11:14 -0800 Subject: [PATCH 084/104] fix unpacking --- minecraft/java/cuberite/egg-cuberite.json | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/minecraft/java/cuberite/egg-cuberite.json b/minecraft/java/cuberite/egg-cuberite.json index 97949398c..71ac36493 100644 --- a/minecraft/java/cuberite/egg-cuberite.json +++ b/minecraft/java/cuberite/egg-cuberite.json @@ -3,10 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-12-14T12:24:30-05:00", + "exported_at": "2020-12-08T14:43:06-08:00", "name": "Cuberite", "author": "parker@parkervcp.com", "description": "A lightweight, fast and extensible game server for Minecraft", + "features": null, "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", "startup": ".\/Cuberite", "config": { @@ -17,7 +18,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Cuberite\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y wget\r\n\r\ncd \/mnt\/server\r\n\r\nwget https:\/\/download.cuberite.org\/linux-x86_64\/Cuberite.tar.gz\r\n\r\ntar --strip-components=1 -xf Cuberite.tar.gz", + "script": "#!\/bin\/ash\r\n# Cuberite\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y wget\r\n\r\ncd \/mnt\/server\r\n\r\nwget https:\/\/download.cuberite.org\/linux-x86_64\/Cuberite.tar.gz\r\n\r\ntar -xzf Cuberite.tar.gz", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -28,8 +29,8 @@ "description": "Server Description", "env_variable": "SERV_DESC", "default_value": "Cuberite on Pterodactyl!", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "nullable|string" }, { @@ -37,8 +38,8 @@ "description": "The password for the webadmin panel 'admin' user", "env_variable": "ADMIN_PASS", "default_value": "ChangeMe", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "nullable|string" }, { @@ -46,9 +47,9 @@ "description": "Port for the cuberite webadmin panel.", "env_variable": "WEB_PORT", "default_value": "8080", - "user_viewable": 1, - "user_editable": 0, + "user_viewable": true, + "user_editable": false, "rules": "required|integer|between:1,65535" } ] -} +} \ No newline at end of file From 796f27d94af41496647380f3115963a9fd0c282a Mon Sep 17 00:00:00 2001 From: Alex <11708877+acl1704@users.noreply.github.com> Date: Tue, 8 Dec 2020 17:25:57 -0800 Subject: [PATCH 085/104] fix startup --- minecraft/java/cuberite/egg-cuberite.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/minecraft/java/cuberite/egg-cuberite.json b/minecraft/java/cuberite/egg-cuberite.json index 71ac36493..a99ef76d1 100644 --- a/minecraft/java/cuberite/egg-cuberite.json +++ b/minecraft/java/cuberite/egg-cuberite.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-12-08T14:43:06-08:00", + "exported_at": "2020-12-08T17:25:20-08:00", "name": "Cuberite", "author": "parker@parkervcp.com", "description": "A lightweight, fast and extensible game server for Minecraft", @@ -11,8 +11,8 @@ "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", "startup": ".\/Cuberite", "config": { - "files": "{\r\n \"settings.ini\": {\r\n \"parser\": \"ini\",\r\n \"find\": {\r\n \"Server.Ports\": \"{{server.build.default.port}}\",\r\n \"Server.Description\": \"{{server.build.env.SERV_DESC}}\"\r\n }\r\n },\r\n \"webadmin.ini\": {\r\n \"parser\": \"ini\",\r\n \"find\": {\r\n \"User:admin.Password\": \"{{server.build.env.ADMIN_PASS}}\",\r\n \"WebAdmin.Ports\":\"{{server.build.env.WEB_PORT}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Startup complete \"\r\n}", + "files": "{\r\n \"settings.ini\": {\r\n \"parser\": \"ini\",\r\n \"find\": {\r\n \"Server.Ports\": \"{{server.build.default.port}}\",\r\n \"Server.Description\": \"{{server.build.env.SERV_DESC}}\"\r\n }\r\n },\r\n \"webadmin.ini\": {\r\n \"parser\": \"ini\",\r\n \"find\": {\r\n \"User:admin.Password\": \"{{server.build.env.ADMIN_PASS}}\",\r\n \"WebAdmin.Ports\": \"{{server.build.env.WEB_PORT}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Startup complete\"\r\n}", "logs": "{}", "stop": "stop" }, From f7860bf9997c3d0ebfb10d2698c35fca1b9b5c85 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sat, 12 Dec 2020 10:11:09 -0500 Subject: [PATCH 086/104] prep for gomint --- minecraft/bedrock/gomint/server.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 minecraft/bedrock/gomint/server.yml diff --git a/minecraft/bedrock/gomint/server.yml b/minecraft/bedrock/gomint/server.yml new file mode 100644 index 000000000..bddde4be0 --- /dev/null +++ b/minecraft/bedrock/gomint/server.yml @@ -0,0 +1,4 @@ +# The host and port to bind the server to +listener: + port: 19132 + ip: 0.0.0.0 \ No newline at end of file From 591086565e109d4fb6ef1823b264592c43194e53 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sat, 12 Dec 2020 11:16:01 -0500 Subject: [PATCH 087/104] add gomint resolves #827 --- README.md | 1 + minecraft/bedrock/README.md | 4 ++++ minecraft/bedrock/gomint/README.md | 11 +++++++++ minecraft/bedrock/gomint/egg-go-mint.json | 27 +++++++++++++++++++++++ 4 files changed, 43 insertions(+) create mode 100644 minecraft/bedrock/gomint/README.md create mode 100644 minecraft/bedrock/gomint/egg-go-mint.json diff --git a/README.md b/README.md index 2d92c5a82..0898f36c9 100644 --- a/README.md +++ b/README.md @@ -93,6 +93,7 @@ If you are reading this it looks like you are looking to add an egg to your serv [Minecraft](/minecraft) * [Bedrock](/minecraft/bedrock) * [Bedrock](/minecraft/bedrock/bedrock) + * [gomint](/minecraft/bedrock/gomint) * [Nukkit](/minecraft/bedrock/nukkit) * [PocketMine MP](/minecraft/bedrock/pocketmine_mp) diff --git a/minecraft/bedrock/README.md b/minecraft/bedrock/README.md index 5dd20afa8..7c5df3dfc 100644 --- a/minecraft/bedrock/README.md +++ b/minecraft/bedrock/README.md @@ -4,6 +4,10 @@ [Minecraft Bedrock Server](https://minecraft.net/en-us/download/server/bedrock/) The official Minecraft Bedrock (Formerly Minecraft Pocket Edition) server. +#### gomint +[Gomint Bedrock Server](https://github.com/gomint/gomint) +Easy-to-use, highly configurable Minecraft Bedrock Edition
 server software with the ability to sustain in a low-resource environment. + #### Nukkit [Nukkit GitHub](https://github.com/Nukkit/Nukkit) Nukkit is a Nuclear-Powered Server Software For Minecraft: Pocket Edition diff --git a/minecraft/bedrock/gomint/README.md b/minecraft/bedrock/gomint/README.md new file mode 100644 index 000000000..e5c5d0426 --- /dev/null +++ b/minecraft/bedrock/gomint/README.md @@ -0,0 +1,11 @@ +# gomint + +Easy-to-use, highly configurable Minecraft Bedrock Edition
 server software with the ability to sustain in a low-resource environment. + +### Server Ports + +Bedrock server require a single port (default 19132) + +| Port | default | +|---------|----------| +| Game | 19132 | \ No newline at end of file diff --git a/minecraft/bedrock/gomint/egg-go-mint.json b/minecraft/bedrock/gomint/egg-go-mint.json new file mode 100644 index 000000000..02fc7dd7d --- /dev/null +++ b/minecraft/bedrock/gomint/egg-go-mint.json @@ -0,0 +1,27 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2020-12-12T16:14:47+00:00", + "name": "GoMint", + "author": "parker@parkervcp.com", + "description": "A performant and stable Minecraft server software for the Bedrock Edition that comes with a modern API and support for Java 11 LTS.", + "features": null, + "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11", + "startup": "java --add-opens java.base\/java.nio=io.netty.common --add-exports java.base\/jdk.internal.misc=io.netty.common -p modules -m gomint.server\/io.gomint.server.Bootstrap", + "config": { + "files": "{\r\n \"server.yml\": {\r\n \"parser\": \"yml\",\r\n \"find\": {\r\n \"listener.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\":\"Done in \"\r\n}", + "logs": "{}", + "stop": "stop" + }, + "scripts": { + "installation": { + "script": "#! \/bin\/bash\r\n\r\nGITHUB_PACKAGE=gomint\/gomint\r\nVERSION=latest\r\nMATCH=modules\r\n\r\napt update\r\napt install -y curl jq file unzip\r\n\r\nif [ ! -d \/mnt\/server\/ ]; then\r\n mkdir -p \/mnt\/server\/\r\nfi\r\n\r\ncd \/mnt\/server\/\r\n\r\nif [ -z \"${GITHUB_USER}\" ] && [ -z \"${GITHUB_OAUTH_TOKEN}\" ] ; then\r\n echo -e \"using anon api call\"\r\nelse\r\n echo -e \"user and oauth token set\"\r\n alias curl='curl -u ${GITHUB_USER}:${GITHUB_OAUTH_TOKEN} '\r\nfi\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\nif [ \"$(echo ${LATEST_JSON} | jq -r '.message')\" != \"Not Found\" ] && [[ -z \"${VERSION}\" || \"${VERSION}\" == \"latest\" ]]; then\r\n echo -e \"grabbing latest version\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\nelif [ \"$(echo ${LATEST_JSON} | jq -r '.message')\" == \"Not Found\" ]; then\r\n ## emergency fallback if latest isn't found\r\n ## grabs the latest release even it it's a pre-release\r\n echo -e \"grabbing latest pre-release\"\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r '.[0].assets[].browser_download_url' | grep -i ${MATCH})\r\nelse\r\n echo -e \"grabbing version $VERSION\"\r\n VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n if [ \"${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH})\r\n else\r\n echo -e \"defaulting to latest release\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n VALIDATED_URL=${DOWNLOAD_URL}\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\ncurl -sSL -o ${VALIDATED_URL##*\/} ${VALIDATED_URL}\r\n\r\nFILETYPE=$(file -F ',' ${VALIDATED_URL##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${VALIDATED_URL##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip ${VALIDATED_URL##*\/} -d modules\/\r\nelif [ \"$FILETYPE\" == \"XZ\" ]; then\r\n tar xvf ${VALIDATED_URL##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exiting\"\r\n # exit 2 \r\nfi\r\n\r\nrm ${VALIDATED_URL##*\/}\r\n\r\nif [ ! -f server.yml ]; then\r\n curl -sSL -o server.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/bedrock\/gomint\/server.yml\r\nfi", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [] +} \ No newline at end of file From 031e94f5a75100d5e808ef8c6d0e8154cd4c4801 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sat, 12 Dec 2020 11:30:05 -0500 Subject: [PATCH 088/104] update feather agg --- minecraft/java/feather/egg-feather.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/minecraft/java/feather/egg-feather.json b/minecraft/java/feather/egg-feather.json index 636723231..add0b5d67 100644 --- a/minecraft/java/feather/egg-feather.json +++ b/minecraft/java/feather/egg-feather.json @@ -3,10 +3,11 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-03-08T20:35:40-04:00", + "exported_at": "2020-12-12T16:29:02+00:00", "name": "Feather", "author": "parker@parkervcp.com", "description": "An experimental Minecraft server implementation written in Rust.", + "features": null, "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", "startup": ".\/feather-server", "config": { @@ -17,7 +18,7 @@ }, "scripts": { "installation": { - "script": "#!\/usr\/bin\/env bash\r\napt update\r\napt install -y curl\r\n\r\nget_latest_release() {\r\n curl -sSL \"https:\/\/api.github.com\/repos\/$1\/releases\/latest\" |\r\n grep '\"tag_name\":' |\r\n sed -E 's\/.*\"([^\"]+)\".*\/\\1\/'\r\n}\r\n\r\nPACKAGE=\"feather-rs\/feather\"\r\nVERSION=`get_latest_release \"${PACKAGE}\"`\r\necho \"Latest version=${VERSION}\"\r\n\r\ncd \/mnt\/server\r\n\r\ncurl -sSLo feather.tar.gz https:\/\/github.com\/caelunshun\/feather\/releases\/download\/${VERSION}\/feather-${VERSION}-linux.tar.gz\r\n\r\ntar --strip-components=1 -xzvf feather.tar.gz\r\n\r\nrm feather.tar.gz", + "script": "#! \/bin\/bash\r\n\r\nGITHUB_PACKAGE=feather-rs\/feather\r\nMATCH=linux\r\n\r\napt update\r\napt install -y curl jq file unzip\r\n\r\nif [ ! -d \/mnt\/server\/ ]; then\r\n mkdir -p \/mnt\/server\/\r\nfi\r\n\r\ncd \/mnt\/server\/\r\n\r\nif [ -z \"${GITHUB_USER}\" ] && [ -z \"${GITHUB_OAUTH_TOKEN}\" ] ; then\r\n echo -e \"using anon api call\"\r\nelse\r\n echo -e \"user and oauth token set\"\r\n alias curl='curl -u ${GITHUB_USER}:${GITHUB_OAUTH_TOKEN} '\r\nfi\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\nif [ \"$(echo ${LATEST_JSON} | jq -r '.message')\" != \"Not Found\" ] && [[ -z \"${VERSION}\" || \"${VERSION}\" == \"latest\" ]]; then\r\n echo -e \"grabbing latest version\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\nelif [ \"$(echo ${LATEST_JSON} | jq -r '.message')\" == \"Not Found\" ]; then\r\n ## emergency fallback if latest isn't found\r\n ## grabs the latest release even it it's a pre-release\r\n echo -e \"grabbing latest pre-release\"\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r '.[0].assets[].browser_download_url' | grep -i ${MATCH})\r\nelse\r\n echo -e \"grabbing version $VERSION\"\r\n VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n if [ \"${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH})\r\n else\r\n echo -e \"defaulting to latest release\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n VALIDATED_URL=${DOWNLOAD_URL}\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\ncurl -sSL -o ${VALIDATED_URL##*\/} ${VALIDATED_URL}\r\n\r\nFILETYPE=$(file -F ',' ${VALIDATED_URL##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n tar xzvf ${VALIDATED_URL##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n unzip ${VALIDATED_URL##*\/}\r\nelif [ \"$FILETYPE\" == \"XZ\" ]; then\r\n tar xvf ${VALIDATED_URL##*\/}\r\nelse\r\n echo -e \"unknown filetype. Exiting\"\r\n # exit 2 \r\nfi\r\n\r\nrm ${VALIDATED_URL##*\/}\r\n\r\nchmod +x feather-server", "container": "debian:stable-slim", "entrypoint": "bash" } @@ -28,8 +29,8 @@ "description": "Do you want the installer to generate a world you you?", "env_variable": "GEN_WORLD", "default_value": "0", - "user_viewable": 1, - "user_editable": 1, + "user_viewable": true, + "user_editable": true, "rules": "required|boolean" } ] From c582e502839d4df62316ed2f816642c849faeae7 Mon Sep 17 00:00:00 2001 From: parkervcp Date: Sun, 13 Dec 2020 10:12:52 -0500 Subject: [PATCH 089/104] update feather toml to latest --- minecraft/java/feather/feather.toml | 39 ++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/minecraft/java/feather/feather.toml b/minecraft/java/feather/feather.toml index ee4ebe9d7..0307ee65d 100644 --- a/minecraft/java/feather/feather.toml +++ b/minecraft/java/feather/feather.toml @@ -1,28 +1,21 @@ # Configuration for the Feather server. -# Most of the options here are unimplented and have no effect. -# Those that are unimplemted have been labeled so. +# Many of the options here are unimplemented and have no effect. +# Those that are unimplemented have been labeled so. [io] # Packets with a size more than or equal to this value will be sent compressed. # Compressing packets reduces bandwidth usage but increases CPU activity. compression_threshold = 256 -# The number of worker threads used for asynchronous IO. -# Set to the number of cores on your CPU for optimal performance. -io_worker_threads = 8 - -[proxy] -# IP forwarding using either "bungee" (BungeeCord/Waterfall/Travertine) or "velocity" (Velocity) -proxy_mode = "none" # Unimplemented [server] online_mode = true motd = "A Feather server" max_players = 16 -default_gamemode = "survival" +default_gamemode = "creative" difficulty = "none" # Unimplemented view_distance = 6 -address = "127.0.0.1" +address = "0.0.0.0" port = 25565 [gameplay] @@ -44,4 +37,26 @@ level = "debug" # upon joining. Set this to an empty string to disable. url = "" # Optional SHA1 hash of the resource pack file. -hash = "" \ No newline at end of file +hash = "" + +[world] +# The name of the directory containing the world. +name = "world" +# The generator to use if the world does not exist. +# Implemented values are: default, flat +generator = "default" +# The seed to use if the world does not exist. +# Leaving this value empty will generate a random seed. +# If this value is not a valid integer (i64), the string +# will be converted using a hash function. +seed = "" +# Interval at which to save modified chunks. +save_interval = "1min" + +[proxy] +# Select the IP forwarding mode that is used by proxies like BungeeCord or Velocity. +# Valid values are +# - "None" - for usage without a proxy +# - "BungeeCord" - for BungeeCord/Waterfall/Travertine +# - "Velocity" - for Velocity style proxies (unimplemented) +proxy_mode = "None" \ No newline at end of file From e5577c7ce4e7a3de89c0bca39be4c0ae2de3cf32 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sun, 13 Dec 2020 17:00:49 +0100 Subject: [PATCH 090/104] rename beta to nightly --- voice_servers/teaspeak/egg-tea-speak.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/voice_servers/teaspeak/egg-tea-speak.json b/voice_servers/teaspeak/egg-tea-speak.json index b58a23ec8..af92f78ea 100644 --- a/voice_servers/teaspeak/egg-tea-speak.json +++ b/voice_servers/teaspeak/egg-tea-speak.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-12-05T11:42:04+01:00", + "exported_at": "2020-12-13T16:59:05+01:00", "name": "TeaSpeak", "author": "parker@parkervcp.com", "description": "TeaSpeak is a free to use client and server software for VoIP communication.\r\n\r\nIts the ideal deal software for everyone who is annoyed about limits and restrictions.", @@ -18,7 +18,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n \r\n## install required packages\r\napt update\r\napt upgrade -y\r\napt install curl -y\r\n\r\n## make and change to directory\r\nmkdir \/mnt\/server\r\ncd \/mnt\/server\/\r\n\r\n## get download link\r\nif [ \"${VERSION}\" == \"\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/TeaSpeak-$(curl -sSLk https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/latest).tar.gz\")\r\nelif [ \"${VERSION}\" == \"\" ] || [ \"${VERSION}\" == \"beta\" ]; then\r\n DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64_nightly\/TeaSpeak-$(curl -sSLk https:\/\/repo.teaspeak.de\/server\/linux\/amd64_nightly\/latest).tar.gz\")\r\nelse\r\n DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/TeaSpeak-${VERSION}.tar.gz\")\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\n## download files\r\necho -e \"running: curl -sSL -o teaspeak.tar.gz ${DOWNLOAD_LINK}\"\r\ncurl -sSL -o teaspeak.tar.gz ${DOWNLOAD_LINK}\r\n\r\n## unpack files\r\necho -e \"unpacking files\"\r\ntar xzvf teaspeak.tar.gz\r\n\r\necho -e \"install complete\"", + "script": "#!\/bin\/bash\r\n \r\n## install required packages\r\napt update\r\napt upgrade -y\r\napt install curl -y\r\n\r\n## make and change to directory\r\nmkdir \/mnt\/server\r\ncd \/mnt\/server\/\r\n\r\n## get download link\r\nif [ \"${VERSION}\" == \"\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/TeaSpeak-$(curl -sSLk https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/latest).tar.gz\")\r\nelif [ \"${VERSION}\" == \"\" ] || [ \"${VERSION}\" == \"nightly\" ]; then\r\n DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64_nightly\/TeaSpeak-$(curl -sSLk https:\/\/repo.teaspeak.de\/server\/linux\/amd64_nightly\/latest).tar.gz\")\r\nelse\r\n DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/TeaSpeak-${VERSION}.tar.gz\")\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n else \r\n echo -e \"link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\n## download files\r\necho -e \"running: curl -sSL -o teaspeak.tar.gz ${DOWNLOAD_LINK}\"\r\ncurl -sSL -o teaspeak.tar.gz ${DOWNLOAD_LINK}\r\n\r\n## unpack files\r\necho -e \"unpacking files\"\r\ntar xzvf teaspeak.tar.gz\r\n\r\necho -e \"install complete\"", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -71,7 +71,7 @@ }, { "name": "Teaspeak Version", - "description": "What version of teaspeak to install: latest = latest stable ; beta = latest beta", + "description": "What version of teaspeak to install: latest = latest stable ; nightly = latest nightly", "env_variable": "VERSION", "default_value": "latest", "user_viewable": true, From ab5467ab3815fffe47e45411138cc2df4fb853ef Mon Sep 17 00:00:00 2001 From: Softwarenoob Date: Sun, 13 Dec 2020 22:56:31 +0200 Subject: [PATCH 091/104] restructure ftb --- minecraft/java/ftb/README.md | 11 +++++++++++ .../egg-ftb-modpacksch-server.json | 0 .../egg-f-t-b-revelation.json | 0 .../egg-feed-the-beast.json | 0 4 files changed, 11 insertions(+) create mode 100644 minecraft/java/ftb/README.md rename minecraft/java/ftb/{feed-the-beast => }/egg-ftb-modpacksch-server.json (100%) rename minecraft/java/ftb/{ftb-revelation => outdated}/egg-f-t-b-revelation.json (100%) rename minecraft/java/ftb/{feed-the-beast => outdated}/egg-feed-the-beast.json (100%) diff --git a/minecraft/java/ftb/README.md b/minecraft/java/ftb/README.md new file mode 100644 index 000000000..9901b1cd5 --- /dev/null +++ b/minecraft/java/ftb/README.md @@ -0,0 +1,11 @@ +# Feed The Beast Modpacks + +Allows you to download official feed the beast modpacks. + +## Server Ports +The minecraft server requires a single port for access (default 25565) but some plugins may require extra ports to enabled for the server. + + +| Port | default | +|-------|---------| +| Game | 25565 | \ No newline at end of file diff --git a/minecraft/java/ftb/feed-the-beast/egg-ftb-modpacksch-server.json b/minecraft/java/ftb/egg-ftb-modpacksch-server.json similarity index 100% rename from minecraft/java/ftb/feed-the-beast/egg-ftb-modpacksch-server.json rename to minecraft/java/ftb/egg-ftb-modpacksch-server.json diff --git a/minecraft/java/ftb/ftb-revelation/egg-f-t-b-revelation.json b/minecraft/java/ftb/outdated/egg-f-t-b-revelation.json similarity index 100% rename from minecraft/java/ftb/ftb-revelation/egg-f-t-b-revelation.json rename to minecraft/java/ftb/outdated/egg-f-t-b-revelation.json diff --git a/minecraft/java/ftb/feed-the-beast/egg-feed-the-beast.json b/minecraft/java/ftb/outdated/egg-feed-the-beast.json similarity index 100% rename from minecraft/java/ftb/feed-the-beast/egg-feed-the-beast.json rename to minecraft/java/ftb/outdated/egg-feed-the-beast.json From 28d935aa0b8fb2fc6860f3760eeb518f850005ba Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 13 Dec 2020 22:59:53 +0200 Subject: [PATCH 092/104] remove outdated ftb eggs --- minecraft/java/README.md | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/minecraft/java/README.md b/minecraft/java/README.md index 63a337cc9..2e4dd186f 100644 --- a/minecraft/java/README.md +++ b/minecraft/java/README.md @@ -24,13 +24,7 @@ This is a direct fork of the default forge service A generic service to pull forge mod packs from the curseforge site. ## FTB Packs -[FTB](https://www.feed-the-beast.com/modpacks) -A generic service to pull forge mod packs from the FTB site. -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 Modpacks through modpacks.ch](https://api.modpacks.ch) +[FTB Modpacks](https://api.modpacks.ch) A generic service to pull FTB modpacks from api.modpacks.ch. There are 2 ways to install a server through this service. The first method only requires you to know the modpacks name and version. @@ -51,10 +45,7 @@ The second method requires you to know the id for both the modpack and version i **NOTE** **Not all FTB packs come with a server.properties file, due to this the server.properties file may not get updated with the correct ip address and port at first launch. -Please restart the server after first launch to fix this.** - -[FTB Revelation](https://www.feed-the-beast.com/projects/ftb-revelation) -Revelation is a general all-purpose modpack with optimal FPS, server performance and stability. +Please restart the server after first launch to fix this.** ## Magma [Magma](https://magmafoundation.org/) @@ -97,4 +88,4 @@ Fork of Paper aimed at improving server performance at high playercounts. ## Mohist Fork of Spigot focused on performance optimizations. -[Mohist Github](https://github.com/Mohist-Community) \ No newline at end of file +[Mohist Github](https://github.com/Mohist-Community) From 009db6c2fb09b8f331f3197b72644e90e38691e3 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 13 Dec 2020 23:01:00 +0200 Subject: [PATCH 093/104] Include FTB instructions --- minecraft/java/ftb/README.md | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/minecraft/java/ftb/README.md b/minecraft/java/ftb/README.md index 9901b1cd5..7b8ac5ac2 100644 --- a/minecraft/java/ftb/README.md +++ b/minecraft/java/ftb/README.md @@ -1,6 +1,26 @@ -# Feed The Beast Modpacks +## FTB Packs +[FTB Modpacks](https://api.modpacks.ch) +A generic service to pull FTB modpacks from api.modpacks.ch. +There are 2 ways to install a server through this service. +The first method only requires you to know the modpacks name and version. +The second method requires you to know the id for both the modpack and version in the api. -Allows you to download official feed the beast modpacks. +**Method 1 (Recommended)** +- FTB_SEARCH_TERM: the modpack name to query for, must be at least 4 characters long. + EX: for FTB: Interactions you would do "interactions". +- FTB_VERSION_STRING: the string version that you want to install. + EX: for FTB: Interactions 2.0.2, you would put "2.0.2". + +**Method 2** +- FTB_MODPACK_ID: the id that directs to the modpack in the api. + EX: for FTB: Interactions the id would be "5". https://api.modpacks.ch/public/modpack/5 +- FTB_MODPACK_VERSION_ID: the version id in the api. + EX: for FTB: Interactions 2.0.2 the id is "86". https://api.modpacks.ch/public/modpack/5/86 + +**NOTE** +**Not all FTB packs come with a server.properties file, due to this the server.properties file +may not get updated with the correct ip address and port at first launch. +Please restart the server after first launch to fix this.** ## Server Ports The minecraft server requires a single port for access (default 25565) but some plugins may require extra ports to enabled for the server. @@ -8,4 +28,5 @@ The minecraft server requires a single port for access (default 25565) but some | Port | default | |-------|---------| -| Game | 25565 | \ No newline at end of file +| Game | 25565 | + From d248cd83a378589225eb50b4abbdd3a10bac0f8e Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 13 Dec 2020 23:02:25 +0200 Subject: [PATCH 094/104] update text --- minecraft/java/ftb/README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/minecraft/java/ftb/README.md b/minecraft/java/ftb/README.md index 7b8ac5ac2..cce1799ee 100644 --- a/minecraft/java/ftb/README.md +++ b/minecraft/java/ftb/README.md @@ -1,5 +1,4 @@ -## FTB Packs -[FTB Modpacks](https://api.modpacks.ch) +## FTB Modpacks A generic service to pull FTB modpacks from api.modpacks.ch. There are 2 ways to install a server through this service. The first method only requires you to know the modpacks name and version. From 359cc6c35d155f2453197f8089b27d1102169be6 Mon Sep 17 00:00:00 2001 From: Softwarenoob Date: Mon, 14 Dec 2020 01:07:25 +0200 Subject: [PATCH 095/104] added the_forest egg --- steamcmd_servers/the_forest/README.md | 31 +++++ .../the_forest/egg-the-forest.json | 109 ++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 steamcmd_servers/the_forest/README.md create mode 100644 steamcmd_servers/the_forest/egg-the-forest.json diff --git a/steamcmd_servers/the_forest/README.md b/steamcmd_servers/the_forest/README.md new file mode 100644 index 000000000..cce1799ee --- /dev/null +++ b/steamcmd_servers/the_forest/README.md @@ -0,0 +1,31 @@ +## FTB Modpacks +A generic service to pull FTB modpacks from api.modpacks.ch. +There are 2 ways to install a server through this service. +The first method only requires you to know the modpacks name and version. +The second method requires you to know the id for both the modpack and version in the api. + +**Method 1 (Recommended)** +- FTB_SEARCH_TERM: the modpack name to query for, must be at least 4 characters long. + EX: for FTB: Interactions you would do "interactions". +- FTB_VERSION_STRING: the string version that you want to install. + EX: for FTB: Interactions 2.0.2, you would put "2.0.2". + +**Method 2** +- FTB_MODPACK_ID: the id that directs to the modpack in the api. + EX: for FTB: Interactions the id would be "5". https://api.modpacks.ch/public/modpack/5 +- FTB_MODPACK_VERSION_ID: the version id in the api. + EX: for FTB: Interactions 2.0.2 the id is "86". https://api.modpacks.ch/public/modpack/5/86 + +**NOTE** +**Not all FTB packs come with a server.properties file, due to this the server.properties file +may not get updated with the correct ip address and port at first launch. +Please restart the server after first launch to fix this.** + +## Server Ports +The minecraft server requires a single port for access (default 25565) but some plugins may require extra ports to enabled for the server. + + +| Port | default | +|-------|---------| +| Game | 25565 | + diff --git a/steamcmd_servers/the_forest/egg-the-forest.json b/steamcmd_servers/the_forest/egg-the-forest.json new file mode 100644 index 000000000..1126a01ae --- /dev/null +++ b/steamcmd_servers/the_forest/egg-the-forest.json @@ -0,0 +1,109 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2020-12-14T01:03:24+02:00", + "name": "The Forest", + "author": "admin@softwarenoob.com", + "description": "As the lone survivor of a passenger jet crash, you find yourself in a mysterious forest battling to stay alive against a society of cannibalistic mutants. Build, explore, survive in this terrifying first-person survival horror simulator.", + "features": null, + "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_wine-xvfb", + "startup": ".\/start.sh -serverip {{SERVER_IP}}:{{QUERY_PORT} -serversteamport {{STEAM_PORT}} -servergameport {{SERVER_PORT}} -serverqueryport {{QUERY_PORT}} -servername \"{{SERVER_NAME}}\" -serverplayers {{MAX_PLAYERS}} -difficulty {{SERVER_DIFFICULTY}}", + "config": { + "files": "{\r\n \"\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"serverIP\": \"serverIP {{server.build.default.ip}}:{{server.build.env.QUERY_PORT}}\",\r\n \"serverSteamPort\": \"serverSteamPort {{server.build.env.STEAM_PORT}}\",\r\n \"serverGamePort\": \"serverGamePort {{server.build.default.port}}\",\r\n \"serverName\": \"serverName {{server.build.env.SERVER_NAME}}\",\r\n \"serverPlayers\": \"serverPlayers {{server.build.env.MAX_PLAYERS}}\",\r\n \"serverPassword\": \"serverPassword {{server.build.env.SERVER_PASS}}\",\r\n \"serverPasswordAdmin\": \"serverPasswordAdmin {{server.build.env.ADMIN_PASS}}\",\r\n \"serverSteamAccount\": \"serverSteamAccount {{server.build.env.STEAM_ACC}}\",\r\n \"difficulty\": \"difficulty {{server.build.env.SERVER_DIFFICULTY}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Game autosave started\"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n# Install dependencies\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\r\n\r\n\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## Install game using steamcmd\r\n.\/steamcmd.sh +login anonymous +@sSteamCmdForcePlatformType windows +force_install_dir \/mnt\/server +app_update ${APPID} ${EXTRA_FLAGS} validate +quit\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## Configure wine and server startup config\r\nmkdir -p \/home\/container\/.wine64\r\necho \"#!\/bin\/sh\r\nexport WINEARCH=win64\r\nexport WINEPREFIX=\/home\/container\/.wine64\r\nxvfb-run --auto-servernum --server-args='-screen 0 640x480x24:32' wine64 \/home\/container\/TheForestDedicatedServer.exe -batchmode -nographics -nosteamclient -savefolderpath \/home\/container\/TheForestDedicatedServer_Data -configfilepath \/home\/container\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg |grep -v 'RenderTexture.Create failed: format unsupported - 2.'\" > \/mnt\/server\/start.sh\r\nchmod +x \/mnt\/server\/start.sh", + "container": "ubuntu:18.04", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "APP ID", + "description": "The ID corresponding to the game to download.", + "env_variable": "APPID", + "default_value": "556450", + "user_viewable": false, + "user_editable": false, + "rules": "required|numeric|digits_between:1,6" + }, + { + "name": "Server Name", + "description": "Name of the server, appears in Steam browser.", + "env_variable": "SERVER_NAME", + "default_value": "Pterodactyl Forest Server", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:64" + }, + { + "name": "Steam Port", + "description": "Steam port", + "env_variable": "STEAM_PORT", + "default_value": "8766", + "user_viewable": true, + "user_editable": false, + "rules": "required|string|max:20" + }, + { + "name": "Query Port", + "description": "Query port, this port is also used for connecting to the server", + "env_variable": "QUERY_PORT", + "default_value": "27016", + "user_viewable": true, + "user_editable": false, + "rules": "required|string|max:20" + }, + { + "name": "Max Players", + "description": "Server player cap", + "env_variable": "MAX_PLAYERS", + "default_value": "10", + "user_viewable": true, + "user_editable": false, + "rules": "required|string|max:20" + }, + { + "name": "Difficulty", + "description": "Server difficulty setting, Peaceful, Normal or Hard.", + "env_variable": "SERVER_DIFFICULTY", + "default_value": "Normal", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|in:Peaceful,Normal,Hard" + }, + { + "name": "Steam Account Token", + "description": "The Steam Account Token is required for the server to save player progress. Use APP ID 242760 for the token generation. \r\n\r\nYou can generate the token on steam at https:\/\/steamcommunity.com\/dev\/managegameservers", + "env_variable": "STEAM_ACC", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Server Password", + "description": "Password protects the server if set, any player must enter the password to join", + "env_variable": "SERVER_PASS", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|max:20" + }, + { + "name": "Admin Password", + "description": "A password that will be used to gain admin access to the server in-game", + "env_variable": "ADMIN_PASS", + "default_value": "cHanGetHePaSwWord", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:20" + } + ] +} \ No newline at end of file From e7a6007c1b0546f1019674af9a30d656c7486de0 Mon Sep 17 00:00:00 2001 From: Softwarenoob Date: Mon, 14 Dec 2020 01:16:13 +0200 Subject: [PATCH 096/104] add the_forest to readme files --- steamcmd_servers/README.md | 268 ++++++++++++++++++++++++++----------- 1 file changed, 187 insertions(+), 81 deletions(-) diff --git a/steamcmd_servers/README.md b/steamcmd_servers/README.md index 4c11cd3b6..bb7d1cfd4 100644 --- a/steamcmd_servers/README.md +++ b/steamcmd_servers/README.md @@ -1,86 +1,192 @@ -# steamcmd servers +# Parkers Pterodactyl eggs repo -This is a collection of servers that use steamcmd to install. +I am working on adding a large collection of public eggs for the Pterodactyl community. -## 7 Days To Die -[7dtd](7_days_to_die/) +With that I am also accepting PR's for new services and also updates to the current ones. -## ARK -[ark](ark_survival_evolved/) +If you are submitting PR's try and keep names and titles the same. -## ARMA -[arma](arma/) -* [arma 3](arma/arma3/) -* [arma 3 headless](arma/arma3_headless_client/) +## How to import an egg -## Avorion -[avorion](avorion/) - -## Citadel: Forged with Fire -[citadel](citadel/) - -## Conan Exiles -[conan_exiles](conan_exiles/) - -## Don't Starve -[dont_starve](dont_starve/) - -## ECO -[ECO](eco/) - -## HLDS Server -[hlds](hlds_server/) - -## Holdfast -[holdfast](holdfast/) - -## Hurtworld -[hurtworld](hurtworld/) - -## Insurgency: Sandstorm -[Insurgency: Sandstorm](insurgency_sandstorm/) - -## Mordhau -[mordhau](mordhau/) - -## Onset -[onset](onset/) - -## Project Zomboid -[project_zomboid](project_zomboid/) - -## Rising World -[rising_world](rising_world/) - -## Rust Staging -[rust staging](rust_staging/) - -## SCP: Secret Laboratory -[SCP: Secret Laboratory](/scpsl/) - -## Soldat -[soldat](soldat/) - -## Squad -[squad](squad/) - -## Starbound -[starbound](starbound/) - -## Stationeers -[Stationeers](/steamcmd_servers/stationeers/) - -## Stormworks: Build and Rescue -[Stormworks](/steamcmd_servers/stormworks/) - -## Sven coop -[svencoop](svencoop) - -## Team Fortress 2 Classic -[Team Fortress 2 Classic](team_fortress_2_classic) - -## Tower Unite -[Tower Unite](tower_unite) - -## Unturned - * [Unturned](unturned) +If you are reading this it looks like you are looking to add an egg to your server. + +1. Download any of the json files located in the folders below. + 1. It's easiest to right click the `raw` button and save as. +2. In your panel go to the `Nests` section in the admin part of the panel +3. Click the green `Import Egg` button +4. Browse to the json file you saved earlier +5. Select what nest you want to put the egg in. + 1. If you want a new nest you need to create it before importing the egg. +6. Restart the daemon on your node before creating a server using the new egg(s). + +# You must restart your daemon after importing an egg + + +## Please read the CONTRIBUTING.md before submitting PRs + +## [Bots](/bots) + +[Discord](/bots/discord) +* [ATL Bot](/bots/discord/atlbot) Node JS +* [Bastion](/bots/discord/bastion) +* [CorpBot](/bots/discord/corpbot) Python +* [discord.js](bots/discord/discord.js) Node JS generic +* [discord.py](bots/discord/discord.py) Python generic +* [discordgo](bots/discord/discordgo) golang generic +* [fragbot](/bots/discord/fragbot) Golang +* [jmusicbot](/bots/discord/jmusicbot) Java +* [parkertron](/bots/discord/parkertron) Golang +* [pixel-bot](/bots/discord/pixelbot) Python +* [Red](/bots/discord/redbot) Python +* [Sinusbot](/bots/discord/sinusbot) + +* [Twitch](/bots/twitch) + * [PhantomBot](/bots/twitch/phantombot) + * [sogeBot](/bots/twitch/sogebot) + +[Other](/bots/other) +* [Big Brother Bot](/bots/other/bigbrotherbot) + +* [TeamSpeak3](bots/teamspeak3) + * [JTS3ServerMod](/bots/teamspeak3/jts3servermod) + +## [Database](/database) +### In-Memory Databases +[Redis](/database/redis) +* [Redis 5](/database/redis/redis-5) +* [Redis 6](/database/redis/redis-6) + +### noSQL +* [mongoDB](/database/nosql/mongodb) + +### SQL Databases +* [MariaDB](/database/sql/mariadb) +* [PostgreSQL](/database/sql/postgres) + +## Voice Servers +* [Lavalink](/voice_servers/lavalink) +* [TeaSpeak](/voice_servers/teaspeak) +* [TS3-Manager](/voice_servers/ts3_manager) + +## Game Eggs +[Among Us Impostor Server](/among_us/impostor_server) + +[ET Legacy](/enemy_territory/etlegacy) + +[Factorio](/factorio/factorio) + +[Grand Theft Auto](/gta) +* GTA V + * [FiveM](/gta/fivem) + * [RageMP](/gta/ragemp) + * [alt:V](/gta/altv) +* GTA SA + * [Multi Theft Auto](/gta/mtasa) + * [SA-MP](/gta/samp) + +[Mindustry](/mindustry) + +[LeagueSandbox](/leaguesandbox) + +[Minetest](/minetest) (including MTG) + +[Minecraft](/minecraft) +* [Bedrock](/minecraft/bedrock) + * [Bedrock](/minecraft/bedrock/bedrock) + * [gomint](/minecraft/bedrock/gomint) + * [Nukkit](/minecraft/bedrock/nukkit) + * [PocketMine MP](/minecraft/bedrock/pocketmine_mp) + +* [Java](/minecraft/java) Servers for Java Minecraft + * [Cuberite](/minecraft/java/cuberite) + * [Fabric](/minecraft/java/fabric) + * [Feather](/minecraft/java/feather) + * [Feed The Beast](/minecraft/java/ftb) + * [Forge](/minecraft/java/forge) + * [Magma](/minecraft/java/magma) + * [Paper](/minecraft/java/paper) + * [Spigot](/minecraft/java/spigot) + * [SpongeForge](/minecraft/java/spongeforge) + * [SpongeVanilla](/minecraft/java/spongevanilla) + * [Technic](/minecraft/java/technic) + * [Tuinity](/minecraft/java/tuinity) + * [VanillaCord](/minecraft/java/vanillacord) + * [Mohist](/minecraft/java/mohist) + +* [Proxies](/minecraft/proxy) Minecraft Server Proxies + * [Java](/minecraft/proxy/java) + * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) + * [Waterfall](/minecraft/proxy/java/waterfall) + * [Travertine](/minecraft/proxy/java/travertine) + * [Velocity](/minecraft/proxy/java/velocity) + * [Cross Platform](/minecraft/proxy/cross_platform) + * [GeyserMC](/minecraft/proxy/cross_platform/geyser) + * [Waterdog](/minecraft/proxy/cross_platform/waterdog) + * DragonProxy abandoned in favour of GeyserMC. + + +[OpenRA](/openra) +* [OpenRA Dune2000](/openra/openra_dune2000) +* [OpenRA Red Alert](/openra/openra_red_alert) +* [OpenRA Tiberian Dawn](/openra/openra_tiberian_dawn) + + +[Red Dead Redemption](/rdr) +* [RedM](/rdr/redm) + +[steamcmd servers](/steamcmd_servers) These eggs use steamcmd to install +* [7 Days to Die](/steamcmd_servers/7_days_to_die) +* [ARK Survival Evolved](/steamcmd_servers/ark_survival_evolved) +* [Arma](/steamcmd_servers/arma) + * [Arma 3](/steamcmd_servers/arma/arma3) + * [Arma 3 HC](/steamcmd_servers/arma/arma3_headless_client) + * [Arma 3 HC](/steamcmd_servers/arma/arma3_x64) +* [Avorion](/steamcmd_servers/avorion) +* [Citadel: Forged with Fire](/steamcmd_servers/citadel) +* [Conan Exiles](/steamcmd_servers/conan_exiles) +* [Don't Starve](/steamcmd_servers/dont_starve) +* [ECO](/steamcmd_servers/eco) +* [HLDS server](/steamcmd_servers/hlds_server) +* [Holdfast](/steamcmd_servers/holdfast) +* [Hurtworld](/steamcmd_servers/hurtworld) +* [Insurgency: Sandstorm](/steamcmd_servers/insurgency_sandstorm) +* [Killing Floor 2](/steamcmd_servers/killingfloor2) +* [Mordhau](/steamcmd_servers/mordhau) +* [Onset](/steamcmd_servers/onset) +* [PixARK](/steamcmd_servers/pixark) +* [Project Zomboid](/steamcmd_servers/project_zomboid) +* [Rising World](/steamcmd_servers/rising_world) +* [Rust Staging Branch](/steamcmd_servers/rust_staging) +* [SCP: Secret Laboratory](/steamcmd_servers/scpsl) + * [dedicated](/steamcmd_servers/scpsl/dedicated) + * [multiadmin](/steamcmd_servers/scpsl/multiadmin) +* [Soldat](/steamcmd_servers/soldat) +* [Starbound](/steamcmd_servers/starbound) +* [Stationeers](/steamcmd_servers/stationeers) +* [Stormworks](/steamcmd_servers/stormworks) +* [Sven Co-op](/steamcmd_servers/svencoop) +* [Squad](/steamcmd_servers/squad) +* [Team Fortress 2 Classic](/steamcmd_servers/team_fortress_2_classic) +* [The Forest](/steamcmd_servers/the_forest) +* [Unturned](/steamcmd_servers/unturned) + +[Teeworlds](/teeworlds) +* [teeworlds](/teeworlds/teeworlds) + +[Terraria](/terraria) +* [vanilla](/terraria/vanilla) +* [tmodloader](/terraria/tmodloader) +* [tshock](/terraria/tshock) + +[Tycoon Games](/tycoon_games) +* [OpenTTD](/tycoon_games/openttd) + +[Unreal Engine](/unreal_engine) +* [Tower Unite](/unreal_engine/tower_unite) +* [Tower Unite](/steamcmd_servers/tower_unite) + +[Vintage Story](/vintage_story/vintage_story) + +[Xonotic](/xonotic/xonotic) + +[Cryofall](/cryofall) From 448b8c750ef7aaca4d8f760e1b865974595dcdae Mon Sep 17 00:00:00 2001 From: Softwarenoob Date: Mon, 14 Dec 2020 01:19:23 +0200 Subject: [PATCH 097/104] fix readme files --- steamcmd_servers/README.md | 271 ++++++++++++------------------------- 1 file changed, 84 insertions(+), 187 deletions(-) diff --git a/steamcmd_servers/README.md b/steamcmd_servers/README.md index bb7d1cfd4..39a511169 100644 --- a/steamcmd_servers/README.md +++ b/steamcmd_servers/README.md @@ -1,192 +1,89 @@ -# Parkers Pterodactyl eggs repo +# steamcmd servers -I am working on adding a large collection of public eggs for the Pterodactyl community. +This is a collection of servers that use steamcmd to install. -With that I am also accepting PR's for new services and also updates to the current ones. +## 7 Days To Die +[7dtd](7_days_to_die/) -If you are submitting PR's try and keep names and titles the same. +## ARK +[ark](ark_survival_evolved/) -## How to import an egg +## ARMA +[arma](arma/) +* [arma 3](arma/arma3/) +* [arma 3 headless](arma/arma3_headless_client/) -If you are reading this it looks like you are looking to add an egg to your server. - -1. Download any of the json files located in the folders below. - 1. It's easiest to right click the `raw` button and save as. -2. In your panel go to the `Nests` section in the admin part of the panel -3. Click the green `Import Egg` button -4. Browse to the json file you saved earlier -5. Select what nest you want to put the egg in. - 1. If you want a new nest you need to create it before importing the egg. -6. Restart the daemon on your node before creating a server using the new egg(s). - -# You must restart your daemon after importing an egg - - -## Please read the CONTRIBUTING.md before submitting PRs - -## [Bots](/bots) - -[Discord](/bots/discord) -* [ATL Bot](/bots/discord/atlbot) Node JS -* [Bastion](/bots/discord/bastion) -* [CorpBot](/bots/discord/corpbot) Python -* [discord.js](bots/discord/discord.js) Node JS generic -* [discord.py](bots/discord/discord.py) Python generic -* [discordgo](bots/discord/discordgo) golang generic -* [fragbot](/bots/discord/fragbot) Golang -* [jmusicbot](/bots/discord/jmusicbot) Java -* [parkertron](/bots/discord/parkertron) Golang -* [pixel-bot](/bots/discord/pixelbot) Python -* [Red](/bots/discord/redbot) Python -* [Sinusbot](/bots/discord/sinusbot) - -* [Twitch](/bots/twitch) - * [PhantomBot](/bots/twitch/phantombot) - * [sogeBot](/bots/twitch/sogebot) - -[Other](/bots/other) -* [Big Brother Bot](/bots/other/bigbrotherbot) - -* [TeamSpeak3](bots/teamspeak3) - * [JTS3ServerMod](/bots/teamspeak3/jts3servermod) - -## [Database](/database) -### In-Memory Databases -[Redis](/database/redis) -* [Redis 5](/database/redis/redis-5) -* [Redis 6](/database/redis/redis-6) - -### noSQL -* [mongoDB](/database/nosql/mongodb) - -### SQL Databases -* [MariaDB](/database/sql/mariadb) -* [PostgreSQL](/database/sql/postgres) - -## Voice Servers -* [Lavalink](/voice_servers/lavalink) -* [TeaSpeak](/voice_servers/teaspeak) -* [TS3-Manager](/voice_servers/ts3_manager) - -## Game Eggs -[Among Us Impostor Server](/among_us/impostor_server) - -[ET Legacy](/enemy_territory/etlegacy) - -[Factorio](/factorio/factorio) - -[Grand Theft Auto](/gta) -* GTA V - * [FiveM](/gta/fivem) - * [RageMP](/gta/ragemp) - * [alt:V](/gta/altv) -* GTA SA - * [Multi Theft Auto](/gta/mtasa) - * [SA-MP](/gta/samp) - -[Mindustry](/mindustry) - -[LeagueSandbox](/leaguesandbox) - -[Minetest](/minetest) (including MTG) - -[Minecraft](/minecraft) -* [Bedrock](/minecraft/bedrock) - * [Bedrock](/minecraft/bedrock/bedrock) - * [gomint](/minecraft/bedrock/gomint) - * [Nukkit](/minecraft/bedrock/nukkit) - * [PocketMine MP](/minecraft/bedrock/pocketmine_mp) - -* [Java](/minecraft/java) Servers for Java Minecraft - * [Cuberite](/minecraft/java/cuberite) - * [Fabric](/minecraft/java/fabric) - * [Feather](/minecraft/java/feather) - * [Feed The Beast](/minecraft/java/ftb) - * [Forge](/minecraft/java/forge) - * [Magma](/minecraft/java/magma) - * [Paper](/minecraft/java/paper) - * [Spigot](/minecraft/java/spigot) - * [SpongeForge](/minecraft/java/spongeforge) - * [SpongeVanilla](/minecraft/java/spongevanilla) - * [Technic](/minecraft/java/technic) - * [Tuinity](/minecraft/java/tuinity) - * [VanillaCord](/minecraft/java/vanillacord) - * [Mohist](/minecraft/java/mohist) - -* [Proxies](/minecraft/proxy) Minecraft Server Proxies - * [Java](/minecraft/proxy/java) - * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo) - * [Waterfall](/minecraft/proxy/java/waterfall) - * [Travertine](/minecraft/proxy/java/travertine) - * [Velocity](/minecraft/proxy/java/velocity) - * [Cross Platform](/minecraft/proxy/cross_platform) - * [GeyserMC](/minecraft/proxy/cross_platform/geyser) - * [Waterdog](/minecraft/proxy/cross_platform/waterdog) - * DragonProxy abandoned in favour of GeyserMC. - - -[OpenRA](/openra) -* [OpenRA Dune2000](/openra/openra_dune2000) -* [OpenRA Red Alert](/openra/openra_red_alert) -* [OpenRA Tiberian Dawn](/openra/openra_tiberian_dawn) - - -[Red Dead Redemption](/rdr) -* [RedM](/rdr/redm) - -[steamcmd servers](/steamcmd_servers) These eggs use steamcmd to install -* [7 Days to Die](/steamcmd_servers/7_days_to_die) -* [ARK Survival Evolved](/steamcmd_servers/ark_survival_evolved) -* [Arma](/steamcmd_servers/arma) - * [Arma 3](/steamcmd_servers/arma/arma3) - * [Arma 3 HC](/steamcmd_servers/arma/arma3_headless_client) - * [Arma 3 HC](/steamcmd_servers/arma/arma3_x64) -* [Avorion](/steamcmd_servers/avorion) -* [Citadel: Forged with Fire](/steamcmd_servers/citadel) -* [Conan Exiles](/steamcmd_servers/conan_exiles) -* [Don't Starve](/steamcmd_servers/dont_starve) -* [ECO](/steamcmd_servers/eco) -* [HLDS server](/steamcmd_servers/hlds_server) -* [Holdfast](/steamcmd_servers/holdfast) -* [Hurtworld](/steamcmd_servers/hurtworld) -* [Insurgency: Sandstorm](/steamcmd_servers/insurgency_sandstorm) -* [Killing Floor 2](/steamcmd_servers/killingfloor2) -* [Mordhau](/steamcmd_servers/mordhau) -* [Onset](/steamcmd_servers/onset) -* [PixARK](/steamcmd_servers/pixark) -* [Project Zomboid](/steamcmd_servers/project_zomboid) -* [Rising World](/steamcmd_servers/rising_world) -* [Rust Staging Branch](/steamcmd_servers/rust_staging) -* [SCP: Secret Laboratory](/steamcmd_servers/scpsl) - * [dedicated](/steamcmd_servers/scpsl/dedicated) - * [multiadmin](/steamcmd_servers/scpsl/multiadmin) -* [Soldat](/steamcmd_servers/soldat) -* [Starbound](/steamcmd_servers/starbound) -* [Stationeers](/steamcmd_servers/stationeers) -* [Stormworks](/steamcmd_servers/stormworks) -* [Sven Co-op](/steamcmd_servers/svencoop) -* [Squad](/steamcmd_servers/squad) -* [Team Fortress 2 Classic](/steamcmd_servers/team_fortress_2_classic) -* [The Forest](/steamcmd_servers/the_forest) -* [Unturned](/steamcmd_servers/unturned) - -[Teeworlds](/teeworlds) -* [teeworlds](/teeworlds/teeworlds) - -[Terraria](/terraria) -* [vanilla](/terraria/vanilla) -* [tmodloader](/terraria/tmodloader) -* [tshock](/terraria/tshock) - -[Tycoon Games](/tycoon_games) -* [OpenTTD](/tycoon_games/openttd) - -[Unreal Engine](/unreal_engine) -* [Tower Unite](/unreal_engine/tower_unite) -* [Tower Unite](/steamcmd_servers/tower_unite) - -[Vintage Story](/vintage_story/vintage_story) - -[Xonotic](/xonotic/xonotic) - -[Cryofall](/cryofall) +## Avorion +[avorion](avorion/) + +## Citadel: Forged with Fire +[citadel](citadel/) + +## Conan Exiles +[conan_exiles](conan_exiles/) + +## Don't Starve +[dont_starve](dont_starve/) + +## ECO +[ECO](eco/) + +## HLDS Server +[hlds](hlds_server/) + +## Holdfast +[holdfast](holdfast/) + +## Hurtworld +[hurtworld](hurtworld/) + +## Insurgency: Sandstorm +[Insurgency: Sandstorm](insurgency_sandstorm/) + +## Mordhau +[mordhau](mordhau/) + +## Onset +[onset](onset/) + +## Project Zomboid +[project_zomboid](project_zomboid/) + +## Rising World +[rising_world](rising_world/) + +## Rust Staging +[rust staging](rust_staging/) + +## SCP: Secret Laboratory +[SCP: Secret Laboratory](/scpsl/) + +## Soldat +[soldat](soldat/) + +## Squad +[squad](squad/) + +## Starbound +[starbound](starbound/) + +## Stationeers +[Stationeers](/steamcmd_servers/stationeers/) + +## Stormworks: Build and Rescue +[Stormworks](/steamcmd_servers/stormworks/) + +## Sven coop +[svencoop](svencoop) + +## Team Fortress 2 Classic +[Team Fortress 2 Classic](team_fortress_2_classic) + +## The Forest +[The Forest](the_forest) + +## Tower Unite +[Tower Unite](tower_unite) + +## Unturned + * [Unturned](unturned) From 6900e1f4acc989be3119adce5d19d4c2b53f5386 Mon Sep 17 00:00:00 2001 From: Softwarenoob Date: Mon, 14 Dec 2020 03:43:32 +0200 Subject: [PATCH 098/104] Add assetto_corsa --- steamcmd_servers/assetto_corsa/README.md | 12 +++ .../assetto_corsa/egg-assetto-corsa.json | 91 +++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 steamcmd_servers/assetto_corsa/README.md create mode 100644 steamcmd_servers/assetto_corsa/egg-assetto-corsa.json diff --git a/steamcmd_servers/assetto_corsa/README.md b/steamcmd_servers/assetto_corsa/README.md new file mode 100644 index 000000000..f6af24fc0 --- /dev/null +++ b/steamcmd_servers/assetto_corsa/README.md @@ -0,0 +1,12 @@ +# Assetto Corsa + +Assetto Corsa is a sim racing video game developed by the Italian video game developer Kunos Simulazioni. It is designed with an emphasis on a realistic racing experience with support for extensive customization and moddability. + +## Server Ports + +Asseto Corsa requires two ports, game port is UDP and WEB HTTP port is TCP. + +| Port | default | +|-------------|---------| +| Game | 9600 | +| HTTP | 8081 | diff --git a/steamcmd_servers/assetto_corsa/egg-assetto-corsa.json b/steamcmd_servers/assetto_corsa/egg-assetto-corsa.json new file mode 100644 index 000000000..84b8d2b62 --- /dev/null +++ b/steamcmd_servers/assetto_corsa/egg-assetto-corsa.json @@ -0,0 +1,91 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2020-12-14T03:20:46+02:00", + "name": "Assetto Corsa", + "author": "admin@softwarenoob.com", + "description": "Assetto Corsa (Italian for \"Race Setup\") is a sim racing video game developed by the Italian video game developer Kunos Simulazioni. It is designed with an emphasis on a realistic racing experience with support for extensive customization and moddability", + "features": null, + "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", + "startup": ".\/acServer", + "config": { + "files": "{\r\n \"cfg\/server_cfg.ini\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"NAME\": \"NAME={{server.build.env.HOSTNAME}}\",\r\n \"PASSWORD\": \"PASSWORD={{server.build.env.PASSWORD}}\",\r\n \"ADMIN_PASSWORD\": \"ADMIN_PASSWORD={{server.build.env.ADM_PASSWORD}}\",\r\n \"UDP_PORT\": \"UDP_PORT={{server.build.default.port}}\",\r\n \"TCP_PORT\": \"TCP_PORT={{server.build.default.port}}\",\r\n \"HTTP_PORT\": \"HTTP_PORT={{server.build.env.HTTP_PORT}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Server started\"\r\n}", + "logs": "{\r\n \"custom\": true,\r\n \"location\": \"logs\/latest.log\"\r\n}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"Downloading the game as Steam user ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +@sSteamCmdForcePlatformType windows +force_install_dir \/mnt\/server +app_update 302550 ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\nif [ \"${STEAM_USER}\" == \"anonymous\" ]; then\r\n echo -e \"ERROR - STEAM USER NOT SET\\n\"\r\n echo -e \"Steam account must have the dedicated server in his library in order to install and host the game\\n\"\r\n echo -e \"You must configure Steam account in the server startup variables, after that reinstall the server\\n\"\r\nfi", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Steam Username", + "description": "A steam username of an account that owns the game is required", + "env_variable": "STEAM_USER", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Steam Password", + "description": "Steam User Password", + "env_variable": "STEAM_PASS", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Steam Auth Code", + "description": "Steam Auth Code required if the Steam Account is using Steam Auth", + "env_variable": "STEAM_AUTH", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Server Name", + "description": "Name of the server", + "env_variable": "HOSTNAME", + "default_value": "Pterodactyl Server", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:45" + }, + { + "name": "Server Password", + "description": "If enabled players must enter the password to join the server", + "env_variable": "PASSWORD", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string|max:40" + }, + { + "name": "Admin Password", + "description": "Used to login as server administrator, type \/help in-game for more", + "env_variable": "ADMIN_PASSWORD", + "default_value": "4yRWj5vqr6zD", + "user_viewable": true, + "user_editable": true, + "rules": "required|string|max:40" + }, + { + "name": "HTTP Port", + "description": "HTTP Port", + "env_variable": "HTTP_PORT", + "default_value": "8081", + "user_viewable": false, + "user_editable": false, + "rules": "required|string|max:20" + } + ] +} \ No newline at end of file From c1c73cd002f4fbf847d1513ad336413264c0013a Mon Sep 17 00:00:00 2001 From: Softwarenoob Date: Mon, 14 Dec 2020 03:47:09 +0200 Subject: [PATCH 099/104] add assetto_corsa to readme files --- steamcmd_servers/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/steamcmd_servers/README.md b/steamcmd_servers/README.md index 4c11cd3b6..e6e12b54b 100644 --- a/steamcmd_servers/README.md +++ b/steamcmd_servers/README.md @@ -16,6 +16,9 @@ This is a collection of servers that use steamcmd to install. ## Avorion [avorion](avorion/) +## Assetto Corsa +[assetto_corsa](assetto_corsa/) + ## Citadel: Forged with Fire [citadel](citadel/) From a3bebea8ebf666b011902e8daaa10ce5d61b86af Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 14 Dec 2020 03:50:36 +0200 Subject: [PATCH 100/104] edit main readme list --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0898f36c9..e93dd92bf 100644 --- a/README.md +++ b/README.md @@ -142,6 +142,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Arma 3 HC](/steamcmd_servers/arma/arma3_headless_client) * [Arma 3 HC](/steamcmd_servers/arma/arma3_x64) * [Avorion](/steamcmd_servers/avorion) +* [Assetto Corsa](/steamcmd_servers/assetto_corsa) * [Citadel: Forged with Fire](/steamcmd_servers/citadel) * [Conan Exiles](/steamcmd_servers/conan_exiles) * [Don't Starve](/steamcmd_servers/dont_starve) From 51e17b3ec9190a3cb5df7f89061090048cc3bdc6 Mon Sep 17 00:00:00 2001 From: Softwarenoob Date: Mon, 14 Dec 2020 04:19:31 +0200 Subject: [PATCH 101/104] add barotrauma --- README.md | 1 + steamcmd_servers/README.md | 3 +++ steamcmd_servers/barotrauma/README.md | 26 ++++++++++++++++++ .../barotrauma/egg-barotrauma.json | 27 +++++++++++++++++++ 4 files changed, 57 insertions(+) create mode 100644 steamcmd_servers/barotrauma/README.md create mode 100644 steamcmd_servers/barotrauma/egg-barotrauma.json diff --git a/README.md b/README.md index 0898f36c9..6b45e1d5f 100644 --- a/README.md +++ b/README.md @@ -142,6 +142,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Arma 3 HC](/steamcmd_servers/arma/arma3_headless_client) * [Arma 3 HC](/steamcmd_servers/arma/arma3_x64) * [Avorion](/steamcmd_servers/avorion) +* [Barotrauma](/steamcmd_servers/barotrauma) * [Citadel: Forged with Fire](/steamcmd_servers/citadel) * [Conan Exiles](/steamcmd_servers/conan_exiles) * [Don't Starve](/steamcmd_servers/dont_starve) diff --git a/steamcmd_servers/README.md b/steamcmd_servers/README.md index 4c11cd3b6..2d440583a 100644 --- a/steamcmd_servers/README.md +++ b/steamcmd_servers/README.md @@ -16,6 +16,9 @@ This is a collection of servers that use steamcmd to install. ## Avorion [avorion](avorion/) +## Barotrauma +[barotrauma](barotrauma/) + ## Citadel: Forged with Fire [citadel](citadel/) diff --git a/steamcmd_servers/barotrauma/README.md b/steamcmd_servers/barotrauma/README.md new file mode 100644 index 000000000..555d2ec50 --- /dev/null +++ b/steamcmd_servers/barotrauma/README.md @@ -0,0 +1,26 @@ +# Barotrauma +### From their [Steam Description](https://store.steampowered.com/app/602960/Barotrauma/) +Barotrauma is a 2D co-op survival horror submarine simulator, inspired by games like FTL: Faster Than Light, Rimworld, Dwarf Fortress and Space Station 13. It’s a Sci-Fi game that combines ragdoll physics and alien sea monsters with teamwork and existential fear. + + +### Server Ports +Ports required to run the server in a table format. + +| Port | default | +|------------|---------| +| Game Port | 27015 | +| Query Port | 27016 | + +**WARNING** +** You must edit the port and server settings in serversettings.xml file or your server will not work!** + +### No console +Barotrauma server does not currently have server console, it will just spam random messages. You have to add yourself as admin and type commands in-game. Admin file is located at Data/clientpermissions.xml, example config is below. + +``` + + + \ No newline at end of file diff --git a/steamcmd_servers/barotrauma/egg-barotrauma.json b/steamcmd_servers/barotrauma/egg-barotrauma.json new file mode 100644 index 000000000..3db84636e --- /dev/null +++ b/steamcmd_servers/barotrauma/egg-barotrauma.json @@ -0,0 +1,27 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2020-12-14T04:12:32+02:00", + "name": "Barotrauma", + "author": "admin@softwarenoob.com", + "description": "Barotrauma is a 2D co-op survival horror submarine simulator, inspired by games like FTL: Faster Than Light, Rimworld, Dwarf Fortress and Space Station 13. It\u2019s a Sci-Fi game that combines ragdoll physics and alien sea monsters with teamwork and existential fear.", + "features": null, + "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", + "startup": ".\/DedicatedServer -batchmode", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Server started\"\r\n}", + "logs": "{\r\n \"custom\": false,\r\n \"location\": \"latest.log\"\r\n}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\nSRCDS_APPID=1026340\r\n\r\n## just in case someone removed the defaults.\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\n\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [] +} \ No newline at end of file From c583f4b2fee661bf8f26692d7244693a6829c245 Mon Sep 17 00:00:00 2001 From: Alex <11708877+acl1704@users.noreply.github.com> Date: Sun, 13 Dec 2020 18:26:28 -0800 Subject: [PATCH 102/104] reduce excess if block --- minecraft/java/mohist/egg-mohist.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/minecraft/java/mohist/egg-mohist.json b/minecraft/java/mohist/egg-mohist.json index 730273010..8b675b748 100644 --- a/minecraft/java/mohist/egg-mohist.json +++ b/minecraft/java/mohist/egg-mohist.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-12-08T11:59:05-08:00", + "exported_at": "2020-12-13T18:26:08-08:00", "name": "Mohist", "author": "alex.chang-lam@protonmail.com", "description": "Spigot fork with performance optimizations.", @@ -18,7 +18,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Mohist Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl\r\n\r\n#Go into main direction\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\nif [ ! -z ${BUILD_VERSION} ]; then\r\n DOWNLOAD_LINK=https:\/\/mohistmc.com\/api\/${MC_VERSION}\/${BUILD_VERSION}\/download\r\n \r\n #Downloading jars\r\n echo -e \"Download link is ${DOWNLOAD_LINK}\"\r\n echo -e \"Downloading build version ${BUILD_VERSION}\"\r\n if [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-server.jar; then\r\n echo -e \"Download link is valid.\"\r\n else\r\n echo -e \"Link is invalid closing out\"\r\n exit 2\r\n fi\r\n fi\r\n\r\n curl -s -o server.jar -sS ${DOWNLOAD_LINK}\r\n\r\n #Checking if downloaded jars exist\r\n if [ ! -f .\/server.jar ]; then\r\n echo \"!!! Error downloading build version ${BUILD_VERSION} !!!\"\r\n exit\r\n fi\r\nelse\r\n DOWNLOAD_LINK=https:\/\/mohistmc.com\/api\/${MC_VERSION}\/${BUILD_TYPE}\/download\r\n\r\n #Downloading jars\r\n echo -e \"Download link is ${DOWNLOAD_LINK}\"\r\n echo -e \"Downloading ${BUILD_TYPE} build version\"\r\n if [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-server.jar; then\r\n echo -e \"Download link is valid.\"\r\n else\r\n echo -e \"Link is invalid closing out\"\r\n exit 2\r\n fi\r\n fi\r\n\r\n curl -s -o server.jar -sS ${DOWNLOAD_LINK}\r\n\r\n #Checking if downloaded jars exist\r\n if [ ! -f .\/server.jar ]; then\r\n echo \"!!! Error downloading ${BUILD_TYPE} build !!!\"\r\n exit\r\n fi\r\nfi", + "script": "#!\/bin\/bash\r\n# Mohist Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl\r\n\r\n#Go into main direction\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\nif [ ! -z ${BUILD_VERSION} ]; then\r\n DOWNLOAD_LINK=https:\/\/mohistmc.com\/api\/${MC_VERSION}\/${BUILD_VERSION}\/download\r\nelse\r\n DOWNLOAD_LINK=https:\/\/mohistmc.com\/api\/${MC_VERSION}\/${BUILD_TYPE}\/download\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Download link is ${DOWNLOAD_LINK}\"\r\necho -e \"Downloading build version ${BUILD_VERSION}\"\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-server.jar; then\r\n echo -e \"Download link is valid.\"\r\n else\r\n echo -e \"Link is invalid closing out\"\r\n exit 2\r\n fi\r\nfi\r\n\r\ncurl -s -o server.jar -sS ${DOWNLOAD_LINK}\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/server.jar ]; then\r\n echo \"!!! Error downloading build version ${BUILD_VERSION} !!!\"\r\n exit\r\nfi", "container": "debian:buster-slim", "entrypoint": "bash" } @@ -29,7 +29,7 @@ "description": "The name of the jarfile to run the server with.", "env_variable": "SERVER_JARFILE", "default_value": "server.jar", - "user_viewable": true, + "user_viewable": false, "user_editable": false, "rules": "required|string|max:20" }, From 14f0c7e8b83acc60e67b65e59805c956aa0d078e Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 14 Dec 2020 04:27:16 +0200 Subject: [PATCH 103/104] serversettings.xml warning --- steamcmd_servers/barotrauma/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/steamcmd_servers/barotrauma/README.md b/steamcmd_servers/barotrauma/README.md index 555d2ec50..0e0f1cfa5 100644 --- a/steamcmd_servers/barotrauma/README.md +++ b/steamcmd_servers/barotrauma/README.md @@ -11,8 +11,8 @@ Ports required to run the server in a table format. | Game Port | 27015 | | Query Port | 27016 | -**WARNING** -** You must edit the port and server settings in serversettings.xml file or your server will not work!** +**WARNING +You must edit the port and server settings in serversettings.xml file or your server will not work!** ### No console Barotrauma server does not currently have server console, it will just spam random messages. You have to add yourself as admin and type commands in-game. Admin file is located at Data/clientpermissions.xml, example config is below. @@ -23,4 +23,4 @@ Barotrauma server does not currently have server console, it will just spam rand name="YOUR INGAME NAME HERE" steamid="YOUR STEAM64ID here" preset="Admin" /> - \ No newline at end of file + From a0d3b07f4964106ef6be510b0c3c1e6b403d73ac Mon Sep 17 00:00:00 2001 From: Softwarenoob Date: Mon, 14 Dec 2020 05:30:14 +0200 Subject: [PATCH 104/104] Fetch from master repo --- storage/minio/egg-minio-s3.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/minio/egg-minio-s3.json b/storage/minio/egg-minio-s3.json index 246cf00fd..9c48eb32d 100644 --- a/storage/minio/egg-minio-s3.json +++ b/storage/minio/egg-minio-s3.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-11-27T21:39:14-05:00", + "exported_at": "2020-12-14T05:29:26+02:00", "name": "Minio S3", "author": "accounts@bofanodes.io", "description": "MinIO is a cloud storage server compatible with Amazon S3, released under Apache License v2. As an object store, MinIO can store unstructured data such as photos, videos, log files, backups and container images. The maximum size of an object is 5TB.", @@ -18,7 +18,7 @@ }, "scripts": { "installation": { - "script": "#\r\n#\r\napt update\r\napt install -y wget\r\ncd \/mnt\/server\r\nwget https:\/\/dl.min.io\/server\/minio\/release\/linux-amd64\/minio\r\nchmod +x minio\r\nmkdir data\r\nmkdir keys\r\nwget https:\/\/github.com\/tmunsch\/eggs\/raw\/minio\/storage\/minio\/minio.sh\r\nchmod +x minio.sh\r\nexport MINIO_ACCESS_KEY=$(cat \/dev\/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)\r\necho $MINIO_ACCESS_KEY > keys\/key.txt\r\nexport MINIO_SECRET_KEY=$(cat \/dev\/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)\r\necho $MINIO_SECRET_KEY > keys\/secret.txt\r\necho done", + "script": "#\r\n#\r\napt update\r\napt install -y wget\r\ncd \/mnt\/server\r\nwget https:\/\/dl.min.io\/server\/minio\/release\/linux-amd64\/minio\r\nchmod +x minio\r\nmkdir data\r\nmkdir keys\r\n\r\nwget https:\/\/github.com\/\/parkervcp\/eggs\/raw\/master\/storage\/minio\/minio.sh\r\nchmod +x minio.sh\r\nexport MINIO_ACCESS_KEY=$(cat \/dev\/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)\r\necho $MINIO_ACCESS_KEY > keys\/key.txt\r\nexport MINIO_SECRET_KEY=$(cat \/dev\/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)\r\necho $MINIO_SECRET_KEY > keys\/secret.txt\r\necho done", "container": "debian:buster-slim", "entrypoint": "bash" }