From 3048d09cd86b13a1610971c71492d07085866b7b Mon Sep 17 00:00:00 2001
From: decentral1se <lukewm@riseup.net>
Date: Thu, 14 Oct 2021 00:43:38 +0200
Subject: [PATCH] fix: support configurable tfa service

---
 .env.sample            | 1 +
 abra.sh                | 2 +-
 compose.keycloak.yml   | 1 +
 file-provider.yml.tmpl | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.env.sample b/.env.sample
index 1e19c25..117fba4 100644
--- a/.env.sample
+++ b/.env.sample
@@ -52,6 +52,7 @@ COMPOSE_FILE="compose.yml"
 ## Enable Keycloak
 #COMPOSE_FILE="$COMPOSE_FILE:compose.keycloak.yml"
 #KEYCLOAK_MIDDLEWARE_ENABLED=1
+#KEYCLOAK_TFA_SERVICE=traefik-forward-auth_app
 
 #####################################################################
 # Prometheus metrics                                                #
diff --git a/abra.sh b/abra.sh
index 4c03f07..088f253 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,3 +1,3 @@
 export TRAEFIK_YML_VERSION=v12
-export FILE_PROVIDER_YML_VERSION=v2
+export FILE_PROVIDER_YML_VERSION=v3
 export ENTRYPOINT_VERSION=v2
diff --git a/compose.keycloak.yml b/compose.keycloak.yml
index 8a069e6..7c5c853 100644
--- a/compose.keycloak.yml
+++ b/compose.keycloak.yml
@@ -8,3 +8,4 @@ services:
         - "traefik.http.routers.traefik.middlewares=keycloak@file"
     environment:
       - KEYCLOAK_MIDDLEWARE_ENABLED
+      - KEYCLOAK_TFA_SERVICE
diff --git a/file-provider.yml.tmpl b/file-provider.yml.tmpl
index f4c01c2..51b97d1 100644
--- a/file-provider.yml.tmpl
+++ b/file-provider.yml.tmpl
@@ -4,7 +4,7 @@ http:
     {{ if eq (env "KEYCLOAK_MIDDLEWARE_ENABLED") "1" }}
     keycloak:
       forwardAuth:
-        address: "http://traefik-forward-auth:4181"
+        address: "http://{{ env "KEYCLOAK_TFA_SERVICE" }}:4181"
         trustForwardHeader: true
         authResponseHeaders:
           - X-Forwarded-User