Merge branch 'main' of ssh://gitea.marijndoeve.nl:222/Harmitcraft/Season-4

Reviewed-on: Harmitcraft/Season-4#1

.gitea/workflows/release-tag.yml

@@ -12,6 +12,11 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          github-server-url: https://gitea.marijndoeve.nl
+          repository: ${{ github.repository }}
+          ref: ${{ github.ref }}
+
 
       - name: Set up Docker BuildX
         uses: docker/setup-buildx-action@v2

README.md

@@ -1,5 +1,5 @@
 # Season-4
-
+test
 ## Mods
 ### VanillaTweaks
 #### Data packs

compose.yaml

@@ -9,14 +9,14 @@ services:
       - "127.0.0.1:25564:25564"
     networks:
       - internal
+    depends_on:
+      - omb4
     environment:
       TZ: Europe/Amsterdam
       API_BINDING: ":25564"
       MAPPING: |
-        mc.marijndoeve.nl=omb4:25565
-        omb.marijndoeve.nl=omb4:25565
-        server.harmitcraft.nl=omb4:25565
-        www.harmitcraft.nl=omb4:25565
+        omb4.marijndoeve.nl=omb4:25565
+        harmitcraft.nl=omb4:25565
         10.0.0.21=omb4:25565
 
   omb4:
@@ -26,12 +26,14 @@ services:
     tty: true
     stdin_open: true
     depends_on:
-      - router
+      - db
     ports:
       - "24454:24454/udp" # Voice mod
     volumes:
       - /srv/omb4/data:/data
       - dynmap-data:/data/dynmap/web
+    networks:
+      - internal
     environment:
       EULA: "TRUE"
       VERSION: 1.20.4
@@ -41,6 +43,7 @@ services:
       MEMORY: 6G
 
       SEED: "-1412583731547517931"
+      MOTD: "Harmitcraft Season 4!"
 
       ENABLE_AUTOPAUSE: true
 
@@ -58,7 +61,7 @@ services:
         audioplayer:alpha
         dynmap:beta
         no-trial-chambers
-        shulker+
+        shulker+:4WoxRZtH
       MODRINTH_DOWNLOAD_DEPENDENCIES: required
 
   web:
@@ -74,12 +77,18 @@ services:
       - internal
     labels:
       - traefik.enable=true
-      - traefik.http.routers.ombweb.rule=Host(`mc.marijndoeve.nl`, `omb.marijndoeve.nl`, `map.harmitcraft.nl`)
+      # omb4
+      - traefik.http.routers.ombweb.rule=Host(`omb4.marijndoeve.nl`)
       - traefik.http.routers.ombweb.entrypoints=websecure
       - traefik.http.routers.ombweb.tls.certresolver=marijndoeve
+      # harmitcraft
+      - traefik.http.routers.harmitcraftweb.rule=Host(`harmitcraft.nl`)
+      - traefik.http.routers.harmitcraftweb.entrypoints=websecure
+      - traefik.http.routers.harmitcraftweb.tls.certresolver=marijndoeve
+
   db:
     image: postgres:16
-    container_name: mc-db4
+    container_name: mc-db
     environment:
       TZ: Europe/Amsterdam
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
@@ -101,9 +110,10 @@ services:
     networks:
       - internal
       - web
+
 networks:
   internal:
-    internal: true
+    external: false
   web:
     external: true