From 59b0f8d645e15d1d0d38a9d8423129dc81875ef3 Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Tue, 23 Nov 2021 12:22:22 +0200
Subject: [PATCH] Make sure variable names align, fix template

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

diff --git a/abra.sh b/abra.sh
index 088f253..70b2693 100644
--- 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
diff --git a/compose.keycloak.yml b/compose.keycloak.yml
index 666baec..e8678e1 100644
--- a/compose.keycloak.yml
+++ b/compose.keycloak.yml
@@ -10,4 +10,4 @@ services:
       - KEYCLOAK_MIDDLEWARE_ENABLED
       - KEYCLOAK_TFA_SERVICE
       - KEYCLOAK_MIDDLEWARE_2_ENABLED
-      - KEYCLOAK_MIDDLEWARE_2_SERVICE
+      - KEYCLOAK_TFA_SERVICE_2
diff --git a/file-provider.yml.tmpl b/file-provider.yml.tmpl
index eba6130..d12761e 100644
--- a/file-provider.yml.tmpl
+++ b/file-provider.yml.tmpl
@@ -12,7 +12,7 @@ http:
     {{ if eq (env "KEYCLOAK_MIDDLEWARE_2_ENABLED") "1" }}
     keycloak2:
       forwardAuth:
-        address: "http://${KEYCLOAK_TFA_SERVICE_2}:4181"
+        address: "http://{{ env "KEYCLOAK_TFA_SERVICE_2" }}:4181"
         trustForwardHeader: true
         authResponseHeaders:
           - X-Forwarded-User