From ed4a92d374920021e422afeb011980b96d86efc4 Mon Sep 17 00:00:00 2001 From: DerGrumpf Date: Wed, 27 Nov 2024 00:55:50 +0100 Subject: [PATCH 1/5] Changed Network stack --- proxy/velocity/velocity.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/velocity/velocity.toml b/proxy/velocity/velocity.toml index 4a10c07..bf6f1db 100644 --- a/proxy/velocity/velocity.toml +++ b/proxy/velocity/velocity.toml @@ -73,7 +73,7 @@ enable-player-address-logging = true # Configure your servers here. Each key represents the server's name, and the value # represents the IP address of the server to connect to. main = "100.80.35.55:30000" -fallback = "100.113.167.128:30000" +fallback = "100.99.68.47:30000" # In what order we should try servers when a player logs in or is kicked from a server. From acba38b8f9dff20a523a5e453eb07792e7b1d3eb Mon Sep 17 00:00:00 2001 From: Phil Keier Date: Wed, 27 Nov 2024 00:00:41 +0000 Subject: [PATCH 2/5] Added deployment for main server --- deployment/cloud.cyperpunk.de.compose.yml | 2 ++ main/compose.yml | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 deployment/cloud.cyperpunk.de.compose.yml diff --git a/deployment/cloud.cyperpunk.de.compose.yml b/deployment/cloud.cyperpunk.de.compose.yml new file mode 100644 index 0000000..da9ae9a --- /dev/null +++ b/deployment/cloud.cyperpunk.de.compose.yml @@ -0,0 +1,2 @@ +include: + - ../main/compose.yml diff --git a/main/compose.yml b/main/compose.yml index 62a098b..0e47f2c 100644 --- a/main/compose.yml +++ b/main/compose.yml @@ -1,7 +1,7 @@ services: server: image: itzg/minecraft-server - container_name: new + container_name: mc-server restart: always environment: # What Server @@ -33,7 +33,7 @@ services: # World & Mod Data #WORLD: - SEED: 795488740 + SEED: -2202949464251781243 MODS_FILE: /extras/mods.txt # Whitelisting Players WHITELIST_FILE: https://git.cyperpunk.de/Garde-Studios/Uno-MC/raw/branch/main/whitelist.json @@ -44,7 +44,7 @@ services: OPS_FILE: https://git.cyperpunk.de/Garde-Studios/Uno-MC/raw/branch/main/ops.json SYNC_SKIP_NEWER_IN_DESTINATION: false ports: - - 30066:25565 # Connection Port + - 30000:25565 # Connection Port - 31066:25575 # Rcon - 8090:8080 # Squaremap - 9001:25585 # Fabric Exporter From b21458b192054be007bb6ac36764aaee72123f49 Mon Sep 17 00:00:00 2001 From: Phil Keier Date: Wed, 27 Nov 2024 00:16:41 +0000 Subject: [PATCH 3/5] Added changed port for exporter --- main/compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/compose.yml b/main/compose.yml index 0e47f2c..6033889 100644 --- a/main/compose.yml +++ b/main/compose.yml @@ -47,7 +47,7 @@ services: - 30000:25565 # Connection Port - 31066:25575 # Rcon - 8090:8080 # Squaremap - - 9001:25585 # Fabric Exporter + - 9100:91000 # unified Exporter volumes: - ./data:/data - ./squaremap:/data/squaremap From 595051211e11b5fd9b0223f3f8f5c929e30b242e Mon Sep 17 00:00:00 2001 From: DerGrumpf Date: Wed, 27 Nov 2024 01:19:44 +0100 Subject: [PATCH 4/5] Changed scraping ips --- monitoring/prometheus/prometheus.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/monitoring/prometheus/prometheus.yml b/monitoring/prometheus/prometheus.yml index 07ef7f3..7964916 100644 --- a/monitoring/prometheus/prometheus.yml +++ b/monitoring/prometheus/prometheus.yml @@ -11,9 +11,9 @@ scrape_configs: # Server Scrapers - job_name: 'mc-server' static_configs: - - targets: ['100.113.167.128:9100'] - labels: - instance: 'Fallback' - targets: ['100.80.35.55:9100'] + labels: + instance: 'Fallback' + - targets: ['100.99.68.47:9100'] labels: instance: 'Main' From f37d559f9142ea775d654c6bd953ed284f7ca4f1 Mon Sep 17 00:00:00 2001 From: Phil Keier Date: Wed, 27 Nov 2024 00:20:37 +0000 Subject: [PATCH 5/5] fixed typo --- main/compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/compose.yml b/main/compose.yml index 6033889..e314caa 100644 --- a/main/compose.yml +++ b/main/compose.yml @@ -47,7 +47,7 @@ services: - 30000:25565 # Connection Port - 31066:25575 # Rcon - 8090:8080 # Squaremap - - 9100:91000 # unified Exporter + - 9100:9100 # unified Exporter volumes: - ./data:/data - ./squaremap:/data/squaremap