From 7a549522f2621be4f416ce1e3fbbece3e4fcdd04 Mon Sep 17 00:00:00 2001 From: Tyler Adam Martinez Date: Mon, 17 Aug 2026 09:35:12 -0500 Subject: [PATCH] fix(docker-compose): Add the hostname the permanent redirects --- docker-compose.development.yml | 14 ++++++++++++++ docker-compose.production.yml | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/docker-compose.development.yml b/docker-compose.development.yml index 6564fd35..0cb58262 100644 --- a/docker-compose.development.yml +++ b/docker-compose.development.yml @@ -19,11 +19,25 @@ services: - traefik labels: - "traefik.enable=true" + + # Current PVACD hostname - "traefik.http.routers.frontend.rule=Host(`metermanager-dev.pvacd.com`)" - "traefik.http.routers.frontend.entrypoints=websecure,web" - "traefik.http.routers.frontend.tls=true" - "traefik.http.routers.frontend.tls.certresolver=myresolver" + # Old PVACD hostname + - "traefik.http.routers.pvacd-old.rule=Host(`pvacd-dev.newmexicowaterdata.org`)" + - "traefik.http.routers.pvacd-old.entrypoints=websecure" + - "traefik.http.routers.pvacd-old.tls=true" + - "traefik.http.routers.pvacd-old.tls.certresolver=myresolver" + - "traefik.http.routers.pvacd-old.middlewares=pvacd-redirect" + + # Permanent redirect to new hostname + - "traefik.http.middlewares.pvacd-redirect.redirectregex.regex=^https://pvacd-dev\\.newmexicowaterdata\\.org/(.*)" + - "traefik.http.middlewares.pvacd-redirect.redirectregex.replacement=https://metermanager-dev.pvacd.com/$${1}" + - "traefik.http.middlewares.pvacd-redirect.redirectregex.permanent=true" + # - "traefik.http.routers.frontend-insecure.middlewares=force-secure" # - "traefik.http.middlewares.force-secure.redirectscheme.scheme=https" # - "traefik.http.middlewares.force-secure.redirectscheme.permanent=true" diff --git a/docker-compose.production.yml b/docker-compose.production.yml index 0ad883ab..4dea88eb 100644 --- a/docker-compose.production.yml +++ b/docker-compose.production.yml @@ -19,11 +19,25 @@ services: - traefik labels: - "traefik.enable=true" + + # Current PVACD hostname - "traefik.http.routers.frontend.rule=Host(`metermanager.pvacd.com`)" - "traefik.http.routers.frontend.entrypoints=websecure,web" - "traefik.http.routers.frontend.tls=true" - "traefik.http.routers.frontend.tls.certresolver=myresolver" + # Old PVACD hostname + - "traefik.http.routers.pvacd-old.rule=Host(`pvacd.newmexicowaterdata.org`)" + - "traefik.http.routers.pvacd-old.entrypoints=websecure" + - "traefik.http.routers.pvacd-old.tls=true" + - "traefik.http.routers.pvacd-old.tls.certresolver=myresolver" + - "traefik.http.routers.pvacd-old.middlewares=pvacd-redirect" + + # Permanent redirect to new hostname + - "traefik.http.middlewares.pvacd-redirect.redirectregex.regex=^https://pvacd\\.newmexicowaterdata\\.org/(.*)" + - "traefik.http.middlewares.pvacd-redirect.redirectregex.replacement=https://metermanager.pvacd.com/$${1}" + - "traefik.http.middlewares.pvacd-redirect.redirectregex.permanent=true" + # - "traefik.http.routers.frontend-insecure.middlewares=force-secure" # - "traefik.http.middlewares.force-secure.redirectscheme.scheme=https" # - "traefik.http.middlewares.force-secure.redirectscheme.permanent=true"