From 100ef46288340fd3699788e43bf1f374cc0dd369 Mon Sep 17 00:00:00 2001 From: saibotk Date: Thu, 13 Aug 2020 04:25:50 +0200 Subject: [PATCH] traefik/teamspeak: Remove priority from default redirect + set endpoint This patch removes the priority on the default HTTP->HTTPS redirect rule defined on the traefik container, as all traffic should always be redirected to HTTPS. So, to fix the teamspeak redirect, the endpoint for the redirect was also correctly set. --- roles/teamspeak/templates/docker-compose.yml | 1 + roles/traefik/templates/docker-compose.yml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/teamspeak/templates/docker-compose.yml b/roles/teamspeak/templates/docker-compose.yml index 2ede413..e2a742b 100644 --- a/roles/teamspeak/templates/docker-compose.yml +++ b/roles/teamspeak/templates/docker-compose.yml @@ -40,6 +40,7 @@ services: {% if teamspeak_traefik_redirect_enabled %} - "traefik.enable=true" - "traefik.http.routers.teamspeak.rule=Host(`{{ teamspeak_traefik_domain }}`)" + - "traefik.http.routers.teamspeak.entrypoints=websecure" - "traefik.http.routers.teamspeak.middlewares=ts3server-redirect" - "traefik.http.routers.teamspeak.tls.certresolver={{ teamspeak_traefik_certresolver }}" - "traefik.http.middlewares.ts3server-redirect.redirectscheme.scheme=ts3server" diff --git a/roles/traefik/templates/docker-compose.yml b/roles/traefik/templates/docker-compose.yml index 6f0c672..9b7dbc9 100644 --- a/roles/traefik/templates/docker-compose.yml +++ b/roles/traefik/templates/docker-compose.yml @@ -72,7 +72,6 @@ services: - "traefik.enable=true" {% if traefik_https_redirect_all %} - "traefik.http.routers.http_catchall.rule=HostRegexp(`{any:.+}`)" - - "traefik.http.routers.http_catchall.priority=1" - "traefik.http.routers.http_catchall.entrypoints=web" - "traefik.http.routers.http_catchall.middlewares=https_redirect" {% endif %}