Make sure variable names align, fix template

Align traefik-forward-auth 2nd var name with existing
Add a slot for a second traefik-forward-auth instance
2021-11-23 12:40:17 +02:00 · 2021-11-23 12:40:17 +02:00 · 2021-11-23 12:40:17 +02:00 · 2021-11-23 12:23:23 +02:00
5 changed files with 16 additions and 4 deletions
--- a/.env.sample
+++ b/.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                                                #
--- a/README.md
+++ b/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 -->

--- a/abra.sh
+++ b/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
--- a/compose.keycloak.yml
+++ b/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
--- a/file-provider.yml.tmpl
+++ b/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
Author	SHA1	Message	Date
3wc	59b0f8d645	Make sure variable names align, fix template	2021-11-23 12:40:17 +02:00
3wc	556c448c05	Align traefik-forward-auth 2nd var name with existing	2021-11-23 12:40:17 +02:00
3wc	26fcaaea69	Add a slot for a second traefik-forward-auth instance	2021-11-23 12:40:17 +02:00
3wc	02ebb1412f	Goodbye, emojis! 😢 [ci skip]	2021-11-23 12:23:23 +02:00