diff --git a/.env.sample b/.env.sample index 584387e..9408a2d 100644 --- a/.env.sample +++ b/.env.sample @@ -9,6 +9,10 @@ ENABLE_BACKUPS=true DOMAIN=authentik.example.com ## Domain aliases #EXTRA_DOMAINS=', `www.authentik.example.com`' +# Redirects +# All redirect domains have to be added to extra_domains as well) +# multiple redirects can be added by seperating them with a | character +#REDIRECTS=www.authentik.example.com COMPOSE_FILE="compose.yml" AUTHENTIK_DEFAULT_USER_CHANGE_USERNAME=false AUTHENTIK_LOG_LEVEL=info diff --git a/compose.matrix.yml b/compose.matrix.yml index dd2075f..ffb82d6 100644 --- a/compose.matrix.yml +++ b/compose.matrix.yml @@ -3,7 +3,7 @@ services: app: deploy: labels: - - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect-matrix-well-known" + - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect,${STACK_NAME}-frameOptions,${STACK_NAME}-redirect,${STACK_NAME}-redirect-matrix-well-known" - "traefik.http.middlewares.${STACK_NAME}-redirect-matrix-well-known.redirectregex.regex=^https://(.*)/.well-known/matrix/(.*)" - "traefik.http.middlewares.${STACK_NAME}-redirect-matrix-well-known.redirectregex.replacement=https://${MATRIX_DOMAIN}/.well-known/matrix/$$2" worker: diff --git a/compose.yml b/compose.yml index dbdcb68..9971698 100644 --- a/compose.yml +++ b/compose.yml @@ -68,12 +68,13 @@ services: - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})" - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" - - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect,${STACK_NAME}-frameOptions" - - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true" - - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}" + - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect,${STACK_NAME}-frameOptions,${STACK_NAME}-redirect" - "traefik.http.middlewares.${STACK_NAME}-frameOptions.headers.customFrameOptionsValue=SAMEORIGIN" - "traefik.http.middlewares.${STACK_NAME}-frameOptions.headers.contentSecurityPolicy=frame-ancestors ${X_FRAME_OPTIONS_ALLOW_FROM}" - "coop-cloud.${STACK_NAME}.version=7.3.2+2025.6.2" + - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.regex=^https://(${REDIRECTS})/(.*)" + - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.replacement=https://${DOMAIN}/$${2}" + - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.permanent=true" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" worker: