diff --git a/templates/docker-compose.yml.twig b/templates/docker-compose.yml.twig index c53a3da8ff62a6135be43a781e9fa66abe1a954f..d0dfcf1c0573b34ce230a265ff6343eb766cbbab 100644 --- a/templates/docker-compose.yml.twig +++ b/templates/docker-compose.yml.twig @@ -181,15 +181,19 @@ services: {% endif %} {% if extradomains|default([]) and basicauth.enable %} traefik.http.routers.{{ webserver.type }}-{{ projectname }}.middlewares: {{ webserver.type }}-{{ projectname }}-middleware - traefik.http.middlewares.{{ webserver.type }}-{{ projectname }}-middleware.chain.middlewares: {{ webserver.type }}-{{ projectname }}-redirectregex@docker, {{ webserver.type }}-{{ projectname }}-auth@docker + traefik.http.middlewares.{{ webserver.type }}-{{ projectname }}-middleware.chain.middlewares: {% for domain in extradomains %}{% if loop.index > 1 %},{% endif %}{{ webserver.type }}-{{ projectname }}-redirectregex{{ loop.index }}@docker{% endfor %},{{ webserver.type }}-{{ projectname }}-auth@docker +{% elseif extradomains|default([])|length = 1 %} + traefik.http.routers.{{ webserver.type }}-{{ projectname }}.middlewares: {{ webserver.type }}-{{ projectname }}-redirectregex1@docker {% elseif extradomains|default([]) %} - traefik.http.routers.{{ webserver.type }}-{{ projectname }}.middlewares: {{ webserver.type }}-{{ projectname }}-redirectregex@docker + traefik.http.routers.{{ webserver.type }}-{{ projectname }}.middlewares: {{ webserver.type }}-{{ projectname }}-middleware + traefik.http.middlewares.{{ webserver.type }}-{{ projectname }}-middleware.chain.middlewares: {% for domain in extradomains %}{% if loop.index > 1 %},{% endif %}{{ webserver.type }}-{{ projectname }}-redirectregex{{ loop.index }}@docker{% endfor %} + {% elseif basicauth.enable %} traefik.http.routers.{{ webserver.type }}-{{ projectname }}.middlewares: {{ webserver.type }}-{{ projectname }}-auth@docker {% endif %} {% for domain in extradomains|default([]) %} - traefik.http.middlewares.{{ webserver.type }}-{{ projectname }}-redirectregex.redirectRegex.regex: "^https://{{ domain }}/(.*)" - traefik.http.middlewares.{{ webserver.type }}-{{ projectname }}-redirectregex.redirectRegex.replacement: "https://{{ projectdomain }}/$${1}" + traefik.http.middlewares.{{ webserver.type }}-{{ projectname }}-redirectregex{{ loop.index }}.redirectRegex.regex: "^https://{{ domain }}/(.*)" + traefik.http.middlewares.{{ webserver.type }}-{{ projectname }}-redirectregex{{ loop.index }}.redirectRegex.replacement: "https://{{ projectdomain }}/$${1}" {% endfor %} {% if varnish.enable %}