Merge branch 'main' of https://git.cyperpunk.de/Garde-Studios/minecraft-docker-server

deployment/cloud.cyperpunk.de.compose.yml

@@ -0,0 +1,2 @@
+include:
+  - ../main/compose.yml

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,10 +44,10 @@ 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
+      - 9100:9100 # unified Exporter
     volumes:
       - ./data:/data
       - ./squaremap:/data/squaremap

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'

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.