From 263b9c4b3e2770ea6d391a802e7b2257a81a3e8d Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 1 Sep 2022 14:41:29 +0200 Subject: [PATCH] fix: traefik --- apps/api/src/routes/webhooks/traefik/handlers.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/api/src/routes/webhooks/traefik/handlers.ts b/apps/api/src/routes/webhooks/traefik/handlers.ts index 8cb09ba24..419b3b346 100644 --- a/apps/api/src/routes/webhooks/traefik/handlers.ts +++ b/apps/api/src/routes/webhooks/traefik/handlers.ts @@ -11,7 +11,7 @@ function configureMiddleware( if (isHttps) { traefik.http.routers[id] = { entrypoints: ['web'], - rule: `Host(\`${nakedDomain}\`) || Host(\`www.${nakedDomain}\`)`, + rule: `Host(\`${nakedDomain}\`) || Host(\`www.${nakedDomain}\`) && PathPrefix(\`/\`)`, service: `${id}`, middlewares: ['redirect-to-https'] }; @@ -52,7 +52,7 @@ function configureMiddleware( if (isDualCerts) { traefik.http.routers[`${id}-secure`] = { entrypoints: ['websecure'], - rule: `Host(\`${nakedDomain}\`) || Host(\`www.${nakedDomain}\`)`, + rule: `Host(\`${nakedDomain}\`) || Host(\`www.${nakedDomain}\`) && PathPrefix(\`/\`)`, service: `${id}`, tls: { certresolver: 'letsencrypt' @@ -63,7 +63,7 @@ function configureMiddleware( if (isWWW) { traefik.http.routers[`${id}-secure-www`] = { entrypoints: ['websecure'], - rule: `Host(\`www.${nakedDomain}\`)`, + rule: `Host(\`www.${nakedDomain}\`) && PathPrefix(\`/\`)`, service: `${id}`, tls: { certresolver: 'letsencrypt' @@ -72,7 +72,7 @@ function configureMiddleware( }; traefik.http.routers[`${id}-secure`] = { entrypoints: ['websecure'], - rule: `Host(\`${nakedDomain}\`)`, + rule: `Host(\`${nakedDomain}\`) && PathPrefix(\`/\`)`, service: `${id}`, tls: { domains: { @@ -85,7 +85,7 @@ function configureMiddleware( } else { traefik.http.routers[`${id}-secure-www`] = { entrypoints: ['websecure'], - rule: `Host(\`www.${nakedDomain}\`)`, + rule: `Host(\`www.${nakedDomain}\`) && PathPrefix(\`/\`)`, service: `${id}`, tls: { domains: { @@ -96,7 +96,7 @@ function configureMiddleware( }; traefik.http.routers[`${id}-secure`] = { entrypoints: ['websecure'], - rule: `Host(\`${domain}\`)`, + rule: `Host(\`${domain}\`) && PathPrefix(\`/\`)`, service: `${id}`, tls: { certresolver: 'letsencrypt' @@ -109,14 +109,14 @@ function configureMiddleware( } else { traefik.http.routers[id] = { entrypoints: ['web'], - rule: `Host(\`${nakedDomain}\`) || Host(\`www.${nakedDomain}\`)`, + rule: `Host(\`${nakedDomain}\`) || Host(\`www.${nakedDomain}\`) && PathPrefix(\`/\`)`, service: `${id}`, middlewares: [] }; traefik.http.routers[`${id}-secure`] = { entrypoints: ['websecure'], - rule: `Host(\`${nakedDomain}\`) || Host(\`www.${nakedDomain}\`)`, + rule: `Host(\`${nakedDomain}\`) || Host(\`www.${nakedDomain}\`) && PathPrefix(\`/\`)`, service: `${id}`, tls: { domains: {