diff --git a/docker-compose.override.yml b/docker-compose.override.yml index e0af3f2..a03c571 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -110,7 +110,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" @@ -120,6 +120,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 index 7376de4..3480b47 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -95,7 +95,6 @@ services: - .envs-hosts - .envs-database-georchestra - # uncomment for oauth 2.0 # cas: # image: georchestra/cas:latest