From c41bef2e813b4a76f7cd5c92b612a72c22fbb474 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 16 Sep 2022 14:30:32 +0200 Subject: [PATCH] Traefik add / pathprefix --- 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 3e2cd5952..d79c2cb01 100644 --- a/apps/api/src/routes/webhooks/traefik/handlers.ts +++ b/apps/api/src/routes/webhooks/traefik/handlers.ts @@ -12,7 +12,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'] }; @@ -53,7 +53,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' @@ -64,7 +64,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' @@ -73,7 +73,7 @@ function configureMiddleware( }; traefik.http.routers[`${id}-secure`] = { entrypoints: ['websecure'], - rule: `Host(\`${nakedDomain}\`)`, + rule: `Host(\`${nakedDomain}\`) && PathPrefix(\`/\`)`, service: `${id}`, tls: { domains: { @@ -86,7 +86,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: { @@ -97,7 +97,7 @@ function configureMiddleware( }; traefik.http.routers[`${id}-secure`] = { entrypoints: ['websecure'], - rule: `Host(\`${domain}\`)`, + rule: `Host(\`${domain}\`) && PathPrefix(\`/\`)`, service: `${id}`, tls: { certresolver: 'letsencrypt' @@ -110,14 +110,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: {