2 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: HarmlessHarm/Season-4#1
2024-03-18 15:31:15 +01:00
3 changed files with 4 additions and 9 deletions

View File

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

View File

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

View File

@@ -16,7 +16,8 @@ services:
API_BINDING: ":25564" API_BINDING: ":25564"
MAPPING: | MAPPING: |
omb4.marijndoeve.nl=omb4:25565 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 10.0.0.21=omb4:25565
omb4: omb4:
@@ -43,7 +44,6 @@ services:
MEMORY: 6G MEMORY: 6G
SEED: "-1412583731547517931" SEED: "-1412583731547517931"
MOTD: "Harmitcraft Season 4!"
ENABLE_AUTOPAUSE: true ENABLE_AUTOPAUSE: true
@@ -82,7 +82,7 @@ services:
- 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 # 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.entrypoints=websecure
- traefik.http.routers.harmitcraftweb.tls.certresolver=marijndoeve - traefik.http.routers.harmitcraftweb.tls.certresolver=marijndoeve