From 0d64688da0014111dff042789faaf8485d0c74bc Mon Sep 17 00:00:00 2001 From: Marijn Doeve Date: Sun, 17 Mar 2024 19:39:01 +0100 Subject: [PATCH 1/9] Remove old hosts --- compose.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/compose.yaml b/compose.yaml index 5fceaae..1b0ab9b 100644 --- a/compose.yaml +++ b/compose.yaml @@ -13,8 +13,7 @@ services: TZ: Europe/Amsterdam API_BINDING: ":25564" MAPPING: | - mc.marijndoeve.nl=omb4:25565 - omb.marijndoeve.nl=omb4:25565 + omb4.marijndoeve.nl=omb4:25565 harmitcraft.nl=omb4:25565 10.0.0.21=omb4:25565 @@ -73,7 +72,7 @@ services: - internal labels: - traefik.enable=true - - traefik.http.routers.ombweb.rule=Host(`mc.marijndoeve.nl`, `omb.marijndoeve.nl`, `harmitcraft.nl`) + - traefik.http.routers.ombweb.rule=Host(`omb4.marijndoeve.nl`, `harmitcraft.nl`) - traefik.http.routers.ombweb.entrypoints=websecure - traefik.http.routers.ombweb.tls.certresolver=marijndoeve db: -- 2.49.1 From d9e082e8a6cc078b1ffdf5a65df7250fa1c14e76 Mon Sep 17 00:00:00 2001 From: Marijn Doeve Date: Sun, 17 Mar 2024 19:55:10 +0100 Subject: [PATCH 2/9] Change shulker+ version --- compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yaml b/compose.yaml index 1b0ab9b..72d16c2 100644 --- a/compose.yaml +++ b/compose.yaml @@ -56,7 +56,7 @@ services: audioplayer:alpha dynmap:beta no-trial-chambers - shulker+ + shulker+:4WoxRZtH MODRINTH_DOWNLOAD_DEPENDENCIES: required web: -- 2.49.1 From c20a86df52ddebf06e48f3451ab5f01732656d87 Mon Sep 17 00:00:00 2001 From: Marijn Doeve Date: Sun, 17 Mar 2024 20:15:19 +0100 Subject: [PATCH 3/9] Fix db maybe --- compose.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compose.yaml b/compose.yaml index 72d16c2..c46e3e3 100644 --- a/compose.yaml +++ b/compose.yaml @@ -24,6 +24,7 @@ services: tty: true stdin_open: true depends_on: + - db - router ports: - "24454:24454/udp" # Voice mod @@ -77,7 +78,7 @@ services: - traefik.http.routers.ombweb.tls.certresolver=marijndoeve db: image: postgres:16 - container_name: mc-db4 + container_name: mc-db environment: TZ: Europe/Amsterdam POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} @@ -99,6 +100,7 @@ services: networks: - internal - web + networks: internal: internal: true -- 2.49.1 From eb7804f371e2df357bbbb60c65a107a1e018b7a3 Mon Sep 17 00:00:00 2001 From: Marijn Doeve Date: Sun, 17 Mar 2024 20:27:29 +0100 Subject: [PATCH 4/9] Fix db maybee --- compose.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compose.yaml b/compose.yaml index c46e3e3..1df6d35 100644 --- a/compose.yaml +++ b/compose.yaml @@ -31,6 +31,8 @@ services: volumes: - /srv/omb4/data:/data - dynmap-data:/data/dynmap/web + networks: + - internal environment: EULA: "TRUE" VERSION: 1.20.4 @@ -76,6 +78,7 @@ services: - traefik.http.routers.ombweb.rule=Host(`omb4.marijndoeve.nl`, `harmitcraft.nl`) - traefik.http.routers.ombweb.entrypoints=websecure - traefik.http.routers.ombweb.tls.certresolver=marijndoeve + db: image: postgres:16 container_name: mc-db -- 2.49.1 From 3bdfee84b8cddfb70fdac2fa60474cc57ea1a69b Mon Sep 17 00:00:00 2001 From: Marijn Doeve Date: Sun, 17 Mar 2024 20:33:09 +0100 Subject: [PATCH 5/9] Fix db maybeee --- compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose.yaml b/compose.yaml index 1df6d35..bd3abc7 100644 --- a/compose.yaml +++ b/compose.yaml @@ -33,6 +33,7 @@ services: - dynmap-data:/data/dynmap/web networks: - internal + - web environment: EULA: "TRUE" VERSION: 1.20.4 -- 2.49.1 From ec56715e7955d8922de178530a2fc99a5508f74e Mon Sep 17 00:00:00 2001 From: Marijn Doeve Date: Sun, 17 Mar 2024 20:45:18 +0100 Subject: [PATCH 6/9] Router --- compose.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compose.yaml b/compose.yaml index bd3abc7..571dfc8 100644 --- a/compose.yaml +++ b/compose.yaml @@ -9,6 +9,8 @@ services: - "127.0.0.1:25564:25564" networks: - internal + depends_on: + - omb4 environment: TZ: Europe/Amsterdam API_BINDING: ":25564" @@ -25,7 +27,6 @@ services: stdin_open: true depends_on: - db - - router ports: - "24454:24454/udp" # Voice mod volumes: -- 2.49.1 From 95d7f7069269233efd5e27994b6cd49bdcafbcd5 Mon Sep 17 00:00:00 2001 From: Marijn Doeve Date: Sun, 17 Mar 2024 20:59:15 +0100 Subject: [PATCH 7/9] Fix networking --- compose.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/compose.yaml b/compose.yaml index 571dfc8..e652001 100644 --- a/compose.yaml +++ b/compose.yaml @@ -34,7 +34,6 @@ services: - dynmap-data:/data/dynmap/web networks: - internal - - web environment: EULA: "TRUE" VERSION: 1.20.4 @@ -108,7 +107,7 @@ services: networks: internal: - internal: true + external: false web: external: true -- 2.49.1 From 7a257c1336fb2ebf4eb01e72187867050d951046 Mon Sep 17 00:00:00 2001 From: Marijn Doeve Date: Sun, 17 Mar 2024 21:09:27 +0100 Subject: [PATCH 8/9] Split out web routers --- compose.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/compose.yaml b/compose.yaml index e652001..0762ec7 100644 --- a/compose.yaml +++ b/compose.yaml @@ -76,9 +76,14 @@ services: - internal labels: - traefik.enable=true - - traefik.http.routers.ombweb.rule=Host(`omb4.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(`harmitcraft.nl`) + - traefik.http.routers.harmitcraftweb.entrypoints=websecure + - traefik.http.routers.harmitcraftweb.tls.certresolver=marijndoeve db: image: postgres:16 -- 2.49.1 From 37a867faf0cea2173a81963cb1d5731ae0fe55ac Mon Sep 17 00:00:00 2001 From: HarmlessHarm Date: Mon, 18 Mar 2024 15:32:04 +0100 Subject: [PATCH 9/9] Update compose.yaml --- compose.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compose.yaml b/compose.yaml index 0762ec7..46e9b85 100644 --- a/compose.yaml +++ b/compose.yaml @@ -16,7 +16,8 @@ services: API_BINDING: ":25564" MAPPING: | omb4.marijndoeve.nl=omb4:25565 - harmitcraft.nl=omb4:25565 + server.harmitcraft.nl=omb4:25565 + www.harmitcraft.nl=omb4:25565 10.0.0.21=omb4:25565 omb4: @@ -81,7 +82,7 @@ services: - 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.rule=Host(`map.harmitcraft.nl`) - traefik.http.routers.harmitcraftweb.entrypoints=websecure - traefik.http.routers.harmitcraftweb.tls.certresolver=marijndoeve -- 2.49.1