11 Commits

Author SHA1 Message Date
HarmlessHarm
37a867faf0 Update compose.yaml 2024-03-18 15:32:04 +01:00
HarmlessHarm
bb5660ad33 Merge pull request 'main' (#1) from Harmitcraft/Season-4:main into upstream
Reviewed-on: #1
2024-03-18 15:31:15 +01:00
7a257c1336 Split out web routers 2024-03-17 21:09:27 +01:00
95d7f70692 Fix networking 2024-03-17 20:59:15 +01:00
ec56715e79 Router 2024-03-17 20:45:18 +01:00
3bdfee84b8 Fix db maybeee 2024-03-17 20:33:09 +01:00
eb7804f371 Fix db maybee 2024-03-17 20:27:29 +01:00
c20a86df52 Fix db maybe 2024-03-17 20:15:19 +01:00
d9e082e8a6 Change shulker+ version 2024-03-17 19:55:10 +01:00
0d64688da0 Remove old hosts 2024-03-17 19:39:01 +01:00
9a4a0728e6 Merge pull request 'Added vanillatweaks sharecode, harmitcraft.nl domain, and shulker+' (#1) from HarmlessHarm/Season-4:main into main
Reviewed-on: Harmitcraft/Season-4#1
2024-03-17 19:36:54 +01:00

View File

@@ -9,12 +9,13 @@ services:
- "127.0.0.1:25564:25564" - "127.0.0.1:25564:25564"
networks: networks:
- internal - internal
depends_on:
- omb4
environment: environment:
TZ: Europe/Amsterdam TZ: Europe/Amsterdam
API_BINDING: ":25564" API_BINDING: ":25564"
MAPPING: | MAPPING: |
mc.marijndoeve.nl=omb4:25565 omb4.marijndoeve.nl=omb4:25565
omb.marijndoeve.nl=omb4:25565
server.harmitcraft.nl=omb4:25565 server.harmitcraft.nl=omb4:25565
www.harmitcraft.nl=omb4:25565 www.harmitcraft.nl=omb4:25565
10.0.0.21=omb4:25565 10.0.0.21=omb4:25565
@@ -26,12 +27,14 @@ services:
tty: true tty: true
stdin_open: true stdin_open: true
depends_on: depends_on:
- router - db
ports: ports:
- "24454:24454/udp" # Voice mod - "24454:24454/udp" # Voice mod
volumes: volumes:
- /srv/omb4/data:/data - /srv/omb4/data:/data
- dynmap-data:/data/dynmap/web - dynmap-data:/data/dynmap/web
networks:
- internal
environment: environment:
EULA: "TRUE" EULA: "TRUE"
VERSION: 1.20.4 VERSION: 1.20.4
@@ -58,7 +61,7 @@ services:
audioplayer:alpha audioplayer:alpha
dynmap:beta dynmap:beta
no-trial-chambers no-trial-chambers
shulker+ shulker+:4WoxRZtH
MODRINTH_DOWNLOAD_DEPENDENCIES: required MODRINTH_DOWNLOAD_DEPENDENCIES: required
web: web:
@@ -74,12 +77,18 @@ services:
- internal - internal
labels: labels:
- traefik.enable=true - 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.entrypoints=websecure
- traefik.http.routers.ombweb.tls.certresolver=marijndoeve - 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: db:
image: postgres:16 image: postgres:16
container_name: mc-db4 container_name: mc-db
environment: environment:
TZ: Europe/Amsterdam TZ: Europe/Amsterdam
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
@@ -101,9 +110,10 @@ services:
networks: networks:
- internal - internal
- web - web
networks: networks:
internal: internal:
internal: true external: false
web: web:
external: true external: true