diff --git a/compose.yaml b/compose.yaml index 5fceaae..46e9b85 100644 --- a/compose.yaml +++ b/compose.yaml @@ -9,13 +9,15 @@ 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 - harmitcraft.nl=omb4:25565 + omb4.marijndoeve.nl=omb4:25565 + server.harmitcraft.nl=omb4:25565 + www.harmitcraft.nl=omb4:25565 10.0.0.21=omb4:25565 omb4: @@ -25,12 +27,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 @@ -57,7 +61,7 @@ services: audioplayer:alpha dynmap:beta no-trial-chambers - shulker+ + shulker+:4WoxRZtH MODRINTH_DOWNLOAD_DEPENDENCIES: required web: @@ -73,12 +77,18 @@ services: - internal labels: - traefik.enable=true - - traefik.http.routers.ombweb.rule=Host(`mc.marijndoeve.nl`, `omb.marijndoeve.nl`, `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(`map.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} @@ -100,9 +110,10 @@ services: networks: - internal - web + networks: internal: - internal: true + external: false web: external: true