Fix infinite redirection when path root contains query params (#203)

* rebase from #168 * update traefik redirection rules
georchestra · May 5, 2023 · 8d4acde · 8d4acde
1 parent c78b7dd
commit 8d4acde
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
@@ -109,7 +109,7 @@ services:
         )
       - "traefik.http.routers.traefik-redirect.priority=10"
       - "traefik.http.routers.traefik-redirect.middlewares=add-trailing-slash@docker"
-      - "traefik.http.middlewares.add-trailing-slash.redirectregex.regex=^https?://(.*)/(.+)"
+      - "traefik.http.middlewares.add-trailing-slash.redirectregex.regex=^https?://^[^?]+$/(.+)"
       - "traefik.http.middlewares.add-trailing-slash.redirectregex.replacement=https://$${1}/$${2}/"
       - "traefik.http.middlewares.add-trailing-slash.redirectregex.permanent=false"
 
@@ -119,6 +119,7 @@ services:
 #      - "traefik.enable=true"
 #      - "traefik.http.routers.cas.tls=true"
 #      - "traefik.http.routers.cas.rule=Host(`georchestra-127-0-1-1.traefik.me`) && PathPrefix(`/cas`)"
+
   smtp:
     image: camptocamp/smtp-sink:latest
     volumes:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -94,7 +94,6 @@ services:
       - .envs-hosts
       - .envs-database-georchestra
 
-
 # uncomment for oauth 2.0
 #  cas:
 #    image: georchestra/cas:latest