Skip to content

Commit 2062b5b

Browse files
authored
🔥 Simplify Traefik, remove www-redirects that add complexity (#1343)
1 parent 07b568b commit 2062b5b

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

docker-compose.yml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -88,22 +88,16 @@ services:
8888

8989
- traefik.http.services.${STACK_NAME?Variable not set}-backend.loadbalancer.server.port=80
9090

91-
- traefik.http.routers.${STACK_NAME?Variable not set}-backend-http.rule=(Host(`${DOMAIN?Variable not set}`) || Host(`www.${DOMAIN?Variable not set}`)) && (PathPrefix(`/api`) || PathPrefix(`/docs`) || PathPrefix(`/redoc`))
91+
- traefik.http.routers.${STACK_NAME?Variable not set}-backend-http.rule=Host(`${DOMAIN?Variable not set}`) && (PathPrefix(`/api`) || PathPrefix(`/docs`) || PathPrefix(`/redoc`))
9292
- traefik.http.routers.${STACK_NAME?Variable not set}-backend-http.entrypoints=http
9393

94-
- traefik.http.routers.${STACK_NAME?Variable not set}-backend-https.rule=(Host(`${DOMAIN?Variable not set}`) || Host(`www.${DOMAIN?Variable not set}`)) && (PathPrefix(`/api`) || PathPrefix(`/docs`) || PathPrefix(`/redoc`))
94+
- traefik.http.routers.${STACK_NAME?Variable not set}-backend-https.rule=Host(`${DOMAIN?Variable not set}`) && (PathPrefix(`/api`) || PathPrefix(`/docs`) || PathPrefix(`/redoc`))
9595
- traefik.http.routers.${STACK_NAME?Variable not set}-backend-https.entrypoints=https
9696
- traefik.http.routers.${STACK_NAME?Variable not set}-backend-https.tls=true
9797
- traefik.http.routers.${STACK_NAME?Variable not set}-backend-https.tls.certresolver=le
9898

99-
# Define Traefik Middleware to handle domain with and without "www" to redirect to only one
100-
- traefik.http.middlewares.${STACK_NAME?Variable not set}-www-redirect.redirectregex.regex=^http(s)?://www.(${DOMAIN?Variable not set})/(.*)
101-
# Redirect a domain with www to non-www
102-
- traefik.http.middlewares.${STACK_NAME?Variable not set}-www-redirect.redirectregex.replacement=http$${1}://${DOMAIN?Variable not set}/$${3}
103-
104-
# Enable www redirection for HTTP and HTTPS
105-
- traefik.http.routers.${STACK_NAME?Variable not set}-backend-http.middlewares=https-redirect,${STACK_NAME?Variable not set}-www-redirect
106-
- traefik.http.routers.${STACK_NAME?Variable not set}-backend-https.middlewares=${STACK_NAME?Variable not set}-www-redirect
99+
# Enable redirection for HTTP and HTTPS
100+
- traefik.http.routers.${STACK_NAME?Variable not set}-backend-http.middlewares=https-redirect
107101

108102
frontend:
109103
image: '${DOCKER_IMAGE_FRONTEND?Variable not set}:${TAG-latest}'
@@ -123,17 +117,16 @@ services:
123117

124118
- traefik.http.services.${STACK_NAME?Variable not set}-frontend.loadbalancer.server.port=80
125119

126-
- traefik.http.routers.${STACK_NAME?Variable not set}-frontend-http.rule=Host(`${DOMAIN?Variable not set}`) || Host(`www.${DOMAIN?Variable not set}`)
120+
- traefik.http.routers.${STACK_NAME?Variable not set}-frontend-http.rule=Host(`${DOMAIN?Variable not set}`)
127121
- traefik.http.routers.${STACK_NAME?Variable not set}-frontend-http.entrypoints=http
128122

129-
- traefik.http.routers.${STACK_NAME?Variable not set}-frontend-https.rule=Host(`${DOMAIN?Variable not set}`) || Host(`www.${DOMAIN?Variable not set}`)
123+
- traefik.http.routers.${STACK_NAME?Variable not set}-frontend-https.rule=Host(`${DOMAIN?Variable not set}`)
130124
- traefik.http.routers.${STACK_NAME?Variable not set}-frontend-https.entrypoints=https
131125
- traefik.http.routers.${STACK_NAME?Variable not set}-frontend-https.tls=true
132126
- traefik.http.routers.${STACK_NAME?Variable not set}-frontend-https.tls.certresolver=le
133127

134-
# Enable www redirection for HTTP and HTTPS
135-
- traefik.http.routers.${STACK_NAME?Variable not set}-frontend-https.middlewares=${STACK_NAME?Variable not set}-www-redirect
136-
- traefik.http.routers.${STACK_NAME?Variable not set}-frontend-http.middlewares=https-redirect,${STACK_NAME?Variable not set}-www-redirect
128+
# Enable redirection for HTTP and HTTPS
129+
- traefik.http.routers.${STACK_NAME?Variable not set}-frontend-http.middlewares=https-redirect
137130
volumes:
138131
app-db-data:
139132

0 commit comments

Comments
 (0)