From c298155ceb46e185c2e2a4a95a810ece3c1f5518 Mon Sep 17 00:00:00 2001 From: Florian Zirker Date: Tue, 15 Oct 2024 11:42:01 +0000 Subject: [PATCH] Set DOMAIN correctly --- push/docker-compose.yaml | 4 ++-- www/docker-compose.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/push/docker-compose.yaml b/push/docker-compose.yaml index 4f1936d..5bd7925 100644 --- a/push/docker-compose.yaml +++ b/push/docker-compose.yaml @@ -3,13 +3,13 @@ services: ntfy: image: binwiederhier/ntfy:${NTFY_VERSION} restart: unless-stopped - networks: + networks: - web command: - serve environment: - TZ=UTC - - NTFY_BASE_URL=https://push.florianzirker.de + - NTFY_BASE_URL=https://push.${DOMAIN} - NTFY_LISTEN_HTTP=0.0.0.0:80 - NTFY_CACHE_FILE=/var/cache/ntfy/cache.db - NTFY_CACHE_DURATION=24h diff --git a/www/docker-compose.yaml b/www/docker-compose.yaml index c6e9958..0be9957 100644 --- a/www/docker-compose.yaml +++ b/www/docker-compose.yaml @@ -19,8 +19,8 @@ services: - "traefik.http.routers.webroot.tls.certresolver=netcup" - "traefik.http.routers.webroot.tls.options=intermediate@file" - "traefik.http.routers.webroot.middlewares=redirect-to-www" - - "traefik.http.middlewares.redirect-to-www.redirectregex.regex=^https?://florianzirker.de/(.*)" - - "traefik.http.middlewares.redirect-to-www.redirectregex.replacement=https://www.florianzirker.de/$${1}" + - "traefik.http.middlewares.redirect-to-www.redirectregex.regex=^https?://${DOMAIN}/(.*)" + - "traefik.http.middlewares.redirect-to-www.redirectregex.replacement=https://www.${DOMAIN}/$${1}" - "traefik.http.middlewares.redirect-to-www.redirectregex.permanent=true" - "traefik.http.routers.www-secure.entrypoints=websecure" - "traefik.http.routers.www-secure.rule=Host(`www.${DOMAIN}`)"