From 9067806d3252fb63bc73a2004839e2290cde7556 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Sat, 5 Dec 2020 12:51:36 +0100 Subject: [PATCH 1/2] 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 00000000..77f6aa04 --- /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 2/2] 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 77f6aa04..00000000 --- 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 e366448e..a2940430 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" }