read ntfy secrets from .netrc

.gitignore

@@ -1,4 +1,5 @@
 rclone.conf
+.netrc
 
 /grafana
 /mysql

docker-compose.yml

@@ -9,10 +9,12 @@ volumes:
 secrets:
   minecraftrclone:
     file: rclone.conf
+  netrc:
+    file: .netrc
 
 services:
   spigot:
-    image: 'ghcr.io/zekrotja/papermc-docker:zulu-22'
+    image: 'ghcr.io/zekrotja/papermc-docker:zulu-23'
     restart: unless-stopped
     environment:
       VERSION: "1.21.10"
@@ -23,8 +25,8 @@ services:
       MAX_AGE_BACKUP_FILES: 12d
       PRE_START_BACKUP: "true"
       POST_START_BACKUP: "false"
-      BACKUP_SUCCESS_SCRIPT: 'curl -X PUT -u "minecraft_backups:dn89v573w490852348905b3c2458" -H "Title: ✅ Minecraft Backup Successfull" "https://ntfy.zekro.de/minecraft_backups"'
+      BACKUP_SUCCESS_SCRIPT: 'curl -X PUT --netrc-file /run/secrets/.netrc -H "Title: ✅ Minecraft Backup Successfull" "https://ntfy.zekro.de/minecraft_backups"'
-      BACKUP_FAILED_SCRIPT: 'curl -X PUT -u "minecraft_backups:dn89v573w490852348905b3c2458" -H "Title: ❌ Minecraft Backup Failed" -d "$$MESSAGE" "https://ntfy.zekro.de/minecraft_backups"'
+      BACKUP_FAILED_SCRIPT: 'curl -X PUT --netrc-file /run/secrets/.netrc -H "Title: ❌ Minecraft Backup Failed" -d "$$MESSAGE" "https://ntfy.zekro.de/minecraft_backups"'
       DEBUG_MODE: "true"
     ports:
       - '24693:25565'
@@ -41,6 +43,8 @@ services:
     secrets:
       - source: minecraftrclone
         target: rcloneconfig
+      - source: netrc
+        target: .netrc
     healthcheck:
       test: > 
         /usr/bin/healthcheck -addr localhost:25565 -validateResponse
@@ -76,19 +80,20 @@ services:
       traefik.http.routers.caddy.priority: "10"
  
   spigot_staging:
-    image: 'ghcr.io/zekrotja/papermc-docker'
+    image: 'ghcr.io/zekrotja/papermc-docker:zulu-23'
     restart: unless-stopped
     environment:
       VERSION: "1.21.10"
       BUILD: "latest"
       CACHE_DOWNLOAD: "true"
+      DEBUG_MODE: "true"
       XMS: 2G
       XMX: 4G
-      # MAX_AGE_BACKUP_FILES: 15d
+      MAX_AGE_BACKUP_FILES: 90d
       # PRE_START_BACKUP: "true"
       # POST_START_BACKUP: "false"
-      # BACKUP_SUCCESS_SCRIPT: 'curl -X PUT -u "minecraft_backups:dn89v573w490852348905b3c2458" "https://ntfy.zekro.de/minecraft_backups?title=✅ Minecraft Backup Successfull"'
+      BACKUP_SUCCESS_SCRIPT: 'curl -X PUT --netrc-file /run/secrets/.netrc -H "Title: ✅ STAGING Minecraft Backup Successfull" "https://ntfy.zekro.de/minecraft_backups"'
-      # BACKUP_FAILED_SCRIPT: 'curl -X PUT -u "minecraft_backups:dn89v573w490852348905b3c2458" -d "$$MESSAGE" "https://ntfy.zekro.de/minecraft_backups?title=❌ Minecraft Backup Failed"'
+      BACKUP_FAILED_SCRIPT: 'curl -X PUT --netrc-file /run/secrets/.netrc -H "Title: ❌ STAGING Minecraft Backup Failed" -d "$$MESSAGE" "https://ntfy.zekro.de/minecraft_backups"'
     ports:
       - '24694:25565'
       # - '25575:25575'
@@ -100,9 +105,11 @@ services:
       - './spigot_staging/plugins:/etc/mcserver/plugins'
       - './spigot_staging/worlds:/etc/mcserver/worlds'
       - './spigot_staging/locals:/etc/mcserver/locals'
-    # secrets:
+    secrets:
-    #  - source: minecraftrclone
+      - source: minecraftrclone
-    #    target: rcloneconfig
+        target: rcloneconfig
+      - source: netrc
+        target: .netrc
     healthcheck:
       test: > 
         /usr/bin/healthcheck -addr localhost:25565 -validateResponse

spigot/config/spigot.yml

@@ -99,12 +99,12 @@ world-settings:
       ignore-spectators: false
     # The range in which entities will be visible
     entity-tracking-range:
-      display: 128
+      display: 256 # 128
-      players: 128
+      players: 256 # 128
-      animals: 48
+      animals: 256 # 48
-      monsters: 128
+      monsters: 256 # 128
-      misc: 32
+      misc: 256 # 32
-      other: 64
+      other: 256 # 64
     ticks-per:
       hopper-transfer: 8
       hopper-check: 1

spigot/locals/server.properties

@@ -1,5 +1,5 @@
 #Minecraft server properties
-#Tue Nov 25 07:00:17 UTC 2025
+#Sun Dec 07 17:14:49 UTC 2025
 accepts-transfers=false
 allow-flight=false
 broadcast-console-to-ops=true

spigot/mrpm.project.toml

@@ -11,9 +11,11 @@ artifacts_dir = "plugins"
 [dependencies]
 pl3xmapextras = "1.21.8-c0cbaa9"
 imageframe = "1.8.7.2"
-pl3xmap = "1.21.10-537"
-stairsit = "1.7.1"
-simple-voice-chat = "bukkit-2.6.6"
 luckperms = "v5.5.17-bukkit"
-worldguard = "7.0.15-beta-01"
+pl3xmap = "1.21.10-537"
+typewriter = "0.9.0-beta-164"
 worldedit = "7.4.0-beta-01"
+simple-voice-chat = "bukkit-2.6.6"
+calcmod = "1.4.3"
+worldguard = "7.0.15-beta-01"
+stairsit = "1.7.1"

spigot/plugins/WorldGuard/worlds/world/regions.yml

@@ -14,8 +14,8 @@ regions:
         min: {x: 2612, y: -64, z: -1416}
         max: {x: 2867, y: 319, z: -1040}
         members: {}
-        flags: {other-explosion: deny, ice-form: deny, wither-damage: deny, breeze-charge-explosion: allow,
+        flags: {other-explosion: deny, wither-damage: deny, ice-form: deny, breeze-charge-explosion: allow,
-            snow-fall: deny, block-trampling: allow, lighter: allow, enderman-grief: deny,
+            block-trampling: allow, snow-fall: deny, lighter: allow, enderman-grief: deny,
             mob-spawning: deny, enderdragon-block-damage: deny, creeper-explosion: deny,
             mob-damage: deny, item-frame-rotation: deny, snow-melt: deny, ghast-fireball: deny}
         owners:
@@ -127,7 +127,7 @@ regions:
                 b7d57e48-f73c-46e2-9761-3c471327fb31, 5fdf7eee-58b0-4fe3-9647-7236017cbedf,
                 b6708a23-96b5-480b-90f9-c242bba54ac5, d6381dc3-59c9-4c0e-97cd-6e9a682a5d51,
                 715a6b4e-ad28-4bd2-a04e-8e900c4d7106, 5e377bd1-cbfe-45a5-9c73-8eccdac749e5]
-        flags: {creeper-explosion: deny, mob-damage: deny}
+        flags: {creeper-explosion: deny}
         owners:
             unique-ids: [c3371e36-f288-4eae-b9d5-b90e47258444]
         type: cuboid
@@ -148,7 +148,7 @@ regions:
             unique-ids: [c3371e36-f288-4eae-b9d5-b90e47258444, 715a6b4e-ad28-4bd2-a04e-8e900c4d7106,
                 b6708a23-96b5-480b-90f9-c242bba54ac5, 74e73b86-723c-404b-898f-0d1952c8e08b,
                 6f7aed3e-29fe-4517-9a7c-2911a57bceba, d6381dc3-59c9-4c0e-97cd-6e9a682a5d51]
-        flags: {creeper-explosion: deny, enderman-grief: deny, notify-enter: false,
+        flags: {creeper-explosion: deny, notify-enter: false, enderman-grief: deny,
             notify-leave: false}
         owners:
             unique-ids: [3cb054a7-828c-4a48-9bb4-15e9b4f29558]
@@ -168,10 +168,19 @@ regions:
         min: {x: -437, y: -64, z: 576}
         max: {x: -280, y: 319, z: 734}
         members:
-            unique-ids: [715a6b4e-ad28-4bd2-a04e-8e900c4d7106]
+            unique-ids: [715a6b4e-ad28-4bd2-a04e-8e900c4d7106, 66e5a48d-0c4a-4243-ad2e-73851b990814]
-        flags: {item-drop: allow, creeper-explosion: deny, exp-drops: allow, use: allow,
+        flags:
-            item-pickup: allow, block-trampling: deny, interact: allow, enderman-grief: deny,
+            item-drop: allow
-            chest-access: allow, pvp: deny}
+            creeper-explosion: deny
+            exp-drops: allow
+            use: allow
+            item-pickup: allow
+            block-trampling: deny
+            interact: allow
+            enderman-grief: deny
+            pvp: deny
+            chest-access: allow
+            deny-spawn: ['minecraft:bat', 'minecraft:spider']
         owners:
             unique-ids: [2b7a0b02-4b6d-4b67-a090-de0e40705578]
         type: cuboid
@@ -200,7 +209,8 @@ regions:
         min: {x: 147, y: -64, z: 380}
         max: {x: 222, y: 319, z: 436}
         members:
-            unique-ids: [715a6b4e-ad28-4bd2-a04e-8e900c4d7106]
+            unique-ids: [715a6b4e-ad28-4bd2-a04e-8e900c4d7106, b6708a23-96b5-480b-90f9-c242bba54ac5,
+                3cb054a7-828c-4a48-9bb4-15e9b4f29558]
         flags: {creeper-explosion: deny, use: allow, interact: allow, enderman-grief: deny,
             chest-access: allow, ride: allow}
         owners:
@@ -225,12 +235,12 @@ regions:
         flags:
             other-explosion: deny
             lava-fire: deny
+            greeting: Wilkommen in die Bude
             teleport: {world: world, x: 42.634285838953026, y: 71.0, z: 404.2897390664069,
                 pitch: 2.2246277, yaw: -176.06561}
-            greeting: Wilkommen in die Bude
             snow-fall: deny
-            firework-damage: deny
             weather-lock: clear
+            firework-damage: deny
             fire-spread: deny
             enderdragon-block-damage: deny
             snowman-trails: deny
@@ -245,13 +255,13 @@ regions:
             creeper-explosion: deny
             exp-drops: allow
             fall-damage: deny
-            item-frame-rotation: deny
             item-pickup: allow
+            item-frame-rotation: deny
             notify-enter: true
             ghast-fireball: deny
             entity-item-frame-destroy: deny
-            farewell: Bis denne
             notify-leave: true
+            farewell: Bis denne
         owners:
             unique-ids: [78fffe82-e08c-49e2-86c7-f0257708391e]
         type: cuboid
@@ -300,7 +310,7 @@ regions:
         members:
             unique-ids: [3cb054a7-828c-4a48-9bb4-15e9b4f29558]
         flags: {sleep: allow, item-drop: allow, creeper-explosion: deny, exp-drops: allow,
-            use: allow, mob-damage: allow, item-pickup: allow, damage-animals: allow,
+            use: allow, item-pickup: allow, mob-damage: allow, damage-animals: allow,
             interact: allow, chest-access: allow, use-anvil: allow}
         owners:
             unique-ids: [c3371e36-f288-4eae-b9d5-b90e47258444]
@@ -318,7 +328,7 @@ regions:
         priority: 0
     __global__:
         members: {}
-        flags: {enderman-grief: deny, notify-enter: false, notify-leave: false}
+        flags: {notify-enter: false, enderman-grief: deny, notify-leave: false}
         owners: {}
         type: global
         priority: 0

spigot_staging/locals/server.properties

@@ -1,5 +1,5 @@
 #Minecraft server properties
-#Sat Nov 15 01:11:48 UTC 2025
+#Sun Dec 07 17:13:41 UTC 2025
 accepts-transfers=false
 allow-flight=false
 broadcast-console-to-ops=true