From a8dfbb6c513f9bf76bbf01263339732566acaf81 Mon Sep 17 00:00:00 2001 From: okx-code Date: Sat, 20 Sep 2025 20:53:07 +0100 Subject: [PATCH] fix brewery and votes --- .../gamma-config/plugins/Votifier/config.yml | 25 ++++++++++++++++++ .../paper-config/plugins/Votifier/config.yml | 25 ++++++++++++++++++ ansible/src/gamma-plugins/BreweryX-3.4.10.jar | 1 + ansible/src/gamma-plugins/Votifier-2.7.3.jar | 1 - ansible/src/gamma-plugins/nuvotifier.jar | 1 + ansible/src/paper-plugins/nuvotifier.jar | 1 + .../nuvotifier.jar} | Bin ansible/templates/stacks/minecraft.yml.j2 | 21 ++++++++------- 8 files changed, 64 insertions(+), 11 deletions(-) create mode 100644 ansible/files/gamma-config/plugins/Votifier/config.yml create mode 100644 ansible/files/paper-config/plugins/Votifier/config.yml create mode 120000 ansible/src/gamma-plugins/BreweryX-3.4.10.jar delete mode 120000 ansible/src/gamma-plugins/Votifier-2.7.3.jar create mode 120000 ansible/src/gamma-plugins/nuvotifier.jar create mode 120000 ansible/src/paper-plugins/nuvotifier.jar rename ansible/src/{paper-plugins/Votifier-2.7.3.jar => proxy-plugins/nuvotifier.jar} (100%) diff --git a/ansible/files/gamma-config/plugins/Votifier/config.yml b/ansible/files/gamma-config/plugins/Votifier/config.yml new file mode 100644 index 000000000..ffb6a5a94 --- /dev/null +++ b/ansible/files/gamma-config/plugins/Votifier/config.yml @@ -0,0 +1,25 @@ +# The IP to listen to. Use 0.0.0.0 if you wish to listen to all interfaces on your server. (All IP addresses) +# This defaults to the IP you have configured your server to listen on, or 0.0.0.0 if you have not configured this. +host: "0.0.0.0" + +# Port to listen for new votes on +port: -1 + +# Setting this option to true will disable handling of Protocol v1 packets. While the old protocol is not secure, this +# option is currently not recommended as most voting sites only support the old protocol at present. However, if you are +# using NuVotifier's proxy forwarding mechanism, enabling this option will increase your server's security. +disable-v1-protocol: false + +# All tokens, labeled by the serviceName of each server list. +tokens: + # Default token for all server lists, if another isn't supplied. + default: "" + +# Configuration section for all vote forwarding to NuVotifier +forwarding: + # Sets whether to set up a remote method for fowarding. Supported methods: + # - none - Does not set up a forwarding method. + # - pluginMessaging - Sets up plugin messaging + method: pluginMessaging + pluginMessaging: + channel: nuvotifier:votes diff --git a/ansible/files/paper-config/plugins/Votifier/config.yml b/ansible/files/paper-config/plugins/Votifier/config.yml new file mode 100644 index 000000000..ffb6a5a94 --- /dev/null +++ b/ansible/files/paper-config/plugins/Votifier/config.yml @@ -0,0 +1,25 @@ +# The IP to listen to. Use 0.0.0.0 if you wish to listen to all interfaces on your server. (All IP addresses) +# This defaults to the IP you have configured your server to listen on, or 0.0.0.0 if you have not configured this. +host: "0.0.0.0" + +# Port to listen for new votes on +port: -1 + +# Setting this option to true will disable handling of Protocol v1 packets. While the old protocol is not secure, this +# option is currently not recommended as most voting sites only support the old protocol at present. However, if you are +# using NuVotifier's proxy forwarding mechanism, enabling this option will increase your server's security. +disable-v1-protocol: false + +# All tokens, labeled by the serviceName of each server list. +tokens: + # Default token for all server lists, if another isn't supplied. + default: "" + +# Configuration section for all vote forwarding to NuVotifier +forwarding: + # Sets whether to set up a remote method for fowarding. Supported methods: + # - none - Does not set up a forwarding method. + # - pluginMessaging - Sets up plugin messaging + method: pluginMessaging + pluginMessaging: + channel: nuvotifier:votes diff --git a/ansible/src/gamma-plugins/BreweryX-3.4.10.jar b/ansible/src/gamma-plugins/BreweryX-3.4.10.jar new file mode 120000 index 000000000..bf74be707 --- /dev/null +++ b/ansible/src/gamma-plugins/BreweryX-3.4.10.jar @@ -0,0 +1 @@ +../paper-plugins/BreweryX-3.4.10.jar \ No newline at end of file diff --git a/ansible/src/gamma-plugins/Votifier-2.7.3.jar b/ansible/src/gamma-plugins/Votifier-2.7.3.jar deleted file mode 120000 index 14c472624..000000000 --- a/ansible/src/gamma-plugins/Votifier-2.7.3.jar +++ /dev/null @@ -1 +0,0 @@ -../paper-plugins/Votifier-2.7.3.jar \ No newline at end of file diff --git a/ansible/src/gamma-plugins/nuvotifier.jar b/ansible/src/gamma-plugins/nuvotifier.jar new file mode 120000 index 000000000..619be1891 --- /dev/null +++ b/ansible/src/gamma-plugins/nuvotifier.jar @@ -0,0 +1 @@ +../proxy-plugins/nuvotifier.jar \ No newline at end of file diff --git a/ansible/src/paper-plugins/nuvotifier.jar b/ansible/src/paper-plugins/nuvotifier.jar new file mode 120000 index 000000000..619be1891 --- /dev/null +++ b/ansible/src/paper-plugins/nuvotifier.jar @@ -0,0 +1 @@ +../proxy-plugins/nuvotifier.jar \ No newline at end of file diff --git a/ansible/src/paper-plugins/Votifier-2.7.3.jar b/ansible/src/proxy-plugins/nuvotifier.jar similarity index 100% rename from ansible/src/paper-plugins/Votifier-2.7.3.jar rename to ansible/src/proxy-plugins/nuvotifier.jar diff --git a/ansible/templates/stacks/minecraft.yml.j2 b/ansible/templates/stacks/minecraft.yml.j2 index cf0b7e8e6..0a63da557 100644 --- a/ansible/templates/stacks/minecraft.yml.j2 +++ b/ansible/templates/stacks/minecraft.yml.j2 @@ -11,6 +11,10 @@ services: - minecraft_default ports: # Open port in host mode, to bypass swarm ingress + - target: 8192 + published: 8192 + protocol: tcp + mode: host - target: 25577 published: 25565 protocol: tcp @@ -43,6 +47,9 @@ services: # Config & Plugins - /opt/stacks/minecraft/proxy-config:/config - /opt/stacks/minecraft/proxy-plugins:/plugins + - /opt/PrivateConfig/proxy/config/Votifier/config.toml:/config/plugins/Votifier/config.yml + - /opt/PrivateConfig/proxy/config/Votifier/rsa/public.key:/config/plugins/Votifier/rsa/public.key + - /opt/PrivateConfig/proxy/config/Votifier/rsa/private.key:/config/plugins/Votifier/rsa/private.key paper: image: itzg/minecraft-server:stable-java24-graalvm @@ -53,10 +60,6 @@ services: networks: - minecraft_default ports: - - target: 8192 - published: 8192 - protocol: tcp - mode: host - target: 5004 published: 5004 protocol: tcp @@ -125,9 +128,6 @@ services: - /opt/PrivateConfig/paper/config/BreweryX/custom-items.yml:/config/plugins/BreweryX/custom-items.yml - /opt/PrivateConfig/paper/config/BreweryX/recipes.yml:/config/plugins/BreweryX/recipes.yml - /opt/PrivateConfig/paper/config/Terra/packs/CivMC:/config/plugins/Terra/packs/CivMC - - /opt/PrivateConfig/paper/config/Votifier/config.yml:/config/plugins/Votifier/config.yml - - /opt/PrivateConfig/paper/config/Votifier/rsa/public.key:/config/plugins/Votifier/rsa/public.key - - /opt/PrivateConfig/paper/config/Votifier/rsa/private.key:/config/plugins/Votifier/rsa/private.key - /opt/PrivateConfig/paper/config/DiscordSRV/config.yml:/config/plugins/DiscordSRV/config.yml - /opt/PrivateConfig/paper/config/DiscordSRV/alerts.yml:/config/plugins/DiscordSRV/alerts.yml - /opt/PrivateConfig/paper/config/MythicMobs:/config/plugins/MythicMobs @@ -224,9 +224,10 @@ services: - /opt/PrivateConfig/paper/plugins/Vulcan.jar:/config/plugins/Vulcan.jar - /opt/PrivateConfig/paper/plugins/packetevents-spigot-2.9.4.jar:/config/plugins/packetevents-spgiot-2.9.4.jar - /opt/PrivateConfig/paper/config/Vulcan/config.yml:/config/plugins/Vulcan/config.yml - - /opt/PrivateConfig/paper/config/Votifier/config.yml:/config/plugins/Votifier/config.yml - - /opt/PrivateConfig/paper/config/Votifier/rsa/public.key:/config/plugins/Votifier/rsa/public.key - - /opt/PrivateConfig/paper/config/Votifier/rsa/private.key:/config/plugins/Votifier/rsa/private.key + - /opt/PrivateConfig/gamma/config/BreweryX/config.yml:/config/plugins/BreweryX/config.yml + - /opt/PrivateConfig/gamma/config/BreweryX/cauldron.yml:/config/plugins/BreweryX/cauldron.yml + - /opt/PrivateConfig/gamma/config/BreweryX/custom-items.yml:/config/plugins/BreweryX/custom-items.yml + - /opt/PrivateConfig/gamma/config/BreweryX/recipes.yml:/config/plugins/BreweryX/recipes.yml deploy: placement: