Changed harmitcraft urls to server.harmitcraft and map.harmitcraft

.gitea/workflows/release-tag.yml

@@ -12,11 +12,6 @@ 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: |
-        omb4.marijndoeve.nl=omb4:25565
-        harmitcraft.nl=omb4:25565
+        mc.marijndoeve.nl=omb4:25565
+        omb.marijndoeve.nl=omb4:25565
+        server.harmitcraft.nl=omb4:25565
+        www.harmitcraft.nl=omb4:25565
         10.0.0.21=omb4:25565
 
   omb4:
@@ -26,14 +26,12 @@ services:
     tty: true
     stdin_open: true
     depends_on:
-      - db
+      - router
     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
@@ -43,7 +41,6 @@ services:
       MEMORY: 6G
 
       SEED: "-1412583731547517931"
-      MOTD: "Harmitcraft Season 4!"
 
       ENABLE_AUTOPAUSE: true
 
@@ -61,7 +58,7 @@ services:
         audioplayer:alpha
         dynmap:beta
         no-trial-chambers
-        shulker+:4WoxRZtH
+        shulker+
       MODRINTH_DOWNLOAD_DEPENDENCIES: required
 
   web:
@@ -77,18 +74,12 @@ services:
       - internal
     labels:
       - traefik.enable=true
-      # omb4
-      - traefik.http.routers.ombweb.rule=Host(`omb4.marijndoeve.nl`)
+      - traefik.http.routers.ombweb.rule=Host(`mc.marijndoeve.nl`, `omb.marijndoeve.nl`, `map.harmitcraft.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-db
+    container_name: mc-db4
     environment:
       TZ: Europe/Amsterdam
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
@@ -110,10 +101,9 @@ services:
     networks:
       - internal
       - web
-
 networks:
   internal:
-    external: false
+    internal: true
   web:
     external: true