Make sure variable names align, fix template

[ci skip]

.env.sample

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

README.md

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

abra.sh

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

compose.keycloak.yml

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

compose.yml

@@ -49,23 +49,6 @@ services:
         - "traefik.http.routers.traefik.middlewares=security@file"
         - "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:
   proxy:
     external: true

file-provider.yml.tmpl

@@ -9,6 +9,14 @@ http:
         authResponseHeaders:
           - X-Forwarded-User
     {{ 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:
       headers:
         frameDeny: true