Compare commits

..

1 Commits

Author SHA1 Message Date
b538fa1509 feat: error pages
See coop-cloud/organising#115 (comment).
2021-11-14 00:34:57 +01:00
6 changed files with 21 additions and 16 deletions

View File

@ -52,8 +52,6 @@ COMPOSE_FILE="compose.yml"
#COMPOSE_FILE="$COMPOSE_FILE:compose.keycloak.yml" #COMPOSE_FILE="$COMPOSE_FILE:compose.keycloak.yml"
#KEYCLOAK_MIDDLEWARE_ENABLED=1 #KEYCLOAK_MIDDLEWARE_ENABLED=1
#KEYCLOAK_TFA_SERVICE=traefik-forward-auth_app #KEYCLOAK_TFA_SERVICE=traefik-forward-auth_app
#KEYCLOAK_MIDDLEWARE_2_ENABLED=1
#KEYCLOAK_TFA_SERVICE_2=traefik-forward-auth_app
##################################################################### #####################################################################
# Prometheus metrics # # Prometheus metrics #

View File

@ -7,11 +7,11 @@
<!-- metadata --> <!-- metadata -->
* **Category**: Utilities * **Category**: Utilities
* **Status**: ? * **Status**: ?
* **Image**: [`traefik`](https://hub.docker.com/_/traefik), 4, upstream * **Image**: [`traefik`](https://hub.docker.com/_/traefik), ❶💚, upstream
* **Healthcheck**: Yes * **Healthcheck**: Yes
* **Backups**: No * **Backups**: No
* **Email**: N/A * **Email**: N/A
* **Tests**: 2 * **Tests**: ❷💛
* **SSO**: ? (Keycloak) * **SSO**: ? (Keycloak)
<!-- endmetadata --> <!-- endmetadata -->

View File

@ -1,3 +1,3 @@
export TRAEFIK_YML_VERSION=v12 export TRAEFIK_YML_VERSION=v12
export FILE_PROVIDER_YML_VERSION=v6 export FILE_PROVIDER_YML_VERSION=v3
export ENTRYPOINT_VERSION=v2 export ENTRYPOINT_VERSION=v2

View File

@ -5,9 +5,7 @@ services:
app: app:
deploy: deploy:
labels: labels:
- "traefik.http.routers.${STACK_NAME}.middlewares=keycloak@file" - "traefik.http.routers.traefik.middlewares=keycloak@file"
environment: environment:
- KEYCLOAK_MIDDLEWARE_ENABLED - KEYCLOAK_MIDDLEWARE_ENABLED
- KEYCLOAK_TFA_SERVICE - KEYCLOAK_TFA_SERVICE
- KEYCLOAK_MIDDLEWARE_2_ENABLED
- KEYCLOAK_TFA_SERVICE_2

View File

@ -49,6 +49,23 @@ services:
- "traefik.http.routers.traefik.middlewares=security@file" - "traefik.http.routers.traefik.middlewares=security@file"
- "coop-cloud.${STACK_NAME}.version=1.0.0+v2.5.2" - "coop-cloud.${STACK_NAME}.version=1.0.0+v2.5.2"
web:
image: tarampampam/error-pages:2.2.0
environment:
- TEMPLATE_NAME=shuffle
networks:
- proxy
labels:
- "traefik.enable=true"
- "traefik.http.services.error-pages-service.loadbalancer.server.port=8080"
- "traefik.http.routers.error-router.entrypoints=web-secure"
- "traefik.http.routers.error-router.rule=HostRegexp(`{host:.+}`)"
- "traefik.http.routers.error-router.priority=10"
- "traefik.http.routers.error-router.middlewares=error-pages-middleware@docker"
- "traefik.http.middlewares.error-pages-middleware.errors.status=400-599"
- "traefik.http.middlewares.error-pages-middleware.errors.service=error-pages-service@docker"
- "traefik.http.middlewares.error-pages-middleware.errors.query=/{status}.html"
networks: networks:
proxy: proxy:
external: true external: true

View File

@ -9,14 +9,6 @@ http:
authResponseHeaders: authResponseHeaders:
- X-Forwarded-User - X-Forwarded-User
{{ end }} {{ end }}
{{ if eq (env "KEYCLOAK_MIDDLEWARE_2_ENABLED") "1" }}
keycloak2:
forwardAuth:
address: "http://{{ env "KEYCLOAK_TFA_SERVICE_2" }}:4181"
trustForwardHeader: true
authResponseHeaders:
- X-Forwarded-User
{{ end }}
security: security:
headers: headers:
frameDeny: true frameDeny: true