From 0db2d341b0f38b6df7c24b4c6696700d3042b74b Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Tue, 1 Nov 2022 00:33:30 -0700
Subject: [PATCH] #36 for Keycloak

---
 server/config/keycloak/.env                    | 10 ----------
 server/config/keycloak/docker-compose.yml      | 16 ++++++----------
 server/config/keycloak/forwardauth.env         |  3 +++
 server/config/keycloak/forwardauth_secrets.env |  3 +++
 server/config/keycloak/keycloak.env            |  5 +++++
 server/config/keycloak/keycloak_secrets.env    |  1 +
 6 files changed, 18 insertions(+), 20 deletions(-)
 delete mode 100644 server/config/keycloak/.env
 create mode 100644 server/config/keycloak/forwardauth.env
 create mode 100644 server/config/keycloak/forwardauth_secrets.env
 create mode 100644 server/config/keycloak/keycloak.env
 create mode 100644 server/config/keycloak/keycloak_secrets.env

diff --git a/server/config/keycloak/.env b/server/config/keycloak/.env
deleted file mode 100644
index eaf24a2..0000000
--- a/server/config/keycloak/.env
+++ /dev/null
@@ -1,10 +0,0 @@
-KEYCLOAK_ADMIN="jafner"
-KEYCLOAK_ADMIN_PASSWORD="iEKfrgdTLfbdqtMkH&FMrL3#t8^qfy%eSY5G94tfnUdQB3G!%CUaoFJuhCUN"
-KEYCLOAK_DATA="/home/joey/data/keycloak/data"
-
-SECRET="ry6CUSs3m5vVkKcdKmCBFkxxbWNQqak5SzNo7Vx2gZDakcycyXoGa2u93BA7"
-ENCRYPTION_KEY="72883626635979678254688349258592"
-PROVIDER_URI="https://keycloak.jafner.net/realms/Jafner.net"
-CLIENT_ID="traefik-forward-auth"
-CLIENT_SECRET="iwN2f2LAm2Kqr89Js2qylitgg3ZXM4Sy"
-LOG_LEVEL="debug"
\ No newline at end of file
diff --git a/server/config/keycloak/docker-compose.yml b/server/config/keycloak/docker-compose.yml
index f189690..b2514ab 100644
--- a/server/config/keycloak/docker-compose.yml
+++ b/server/config/keycloak/docker-compose.yml
@@ -20,9 +20,9 @@ services:
           - keycloak
     restart: "no"
     command: start-dev --hostname-url=https://keycloak.jafner.net --proxy=passthrough
-    environment:
-      - KEYCLOAK_ADMIN=$KEYCLOAK_ADMIN
-      - KEYCLOAK_ADMIN_PASSWORD=$KEYCLOAK_ADMIN_PASSWORD
+    env_file:
+      - keycloak.env
+      - keycloak_secrets.env
     labels:
       traefik.http.routers.keycloak.rule: Host(`keycloak.jafner.net`)
       traefik.http.routers.keycloak.tls.certresolver: lets-encrypt
@@ -45,13 +45,9 @@ services:
         aliases:
           - forwardauth
     restart: "no"
-    environment:
-      - SECRET=$SECRET
-      - ENCRYPTION_KEY=$ENCRYPTION_KEY
-      - PROVIDER_URI=$PROVIDER_URI
-      - CLIENT_ID=$CLIENT_ID
-      - CLIENT_SECRET=$CLIENT_SECRET
-      - LOG_LEVEL=$LOG_LEVEL
+    env_file:
+      - forwardauth.env
+      - forwardauth_secrets.env
     labels:
       #- "traefik.enable=true"
       #- "traefik.docker.network=web"
diff --git a/server/config/keycloak/forwardauth.env b/server/config/keycloak/forwardauth.env
new file mode 100644
index 0000000..8e713f8
--- /dev/null
+++ b/server/config/keycloak/forwardauth.env
@@ -0,0 +1,3 @@
+PROVIDER_URI="https://keycloak.jafner.net/realms/Jafner.net"
+CLIENT_ID="traefik-forward-auth"
+LOG_LEVEL="debug"
\ No newline at end of file
diff --git a/server/config/keycloak/forwardauth_secrets.env b/server/config/keycloak/forwardauth_secrets.env
new file mode 100644
index 0000000..1f04409
--- /dev/null
+++ b/server/config/keycloak/forwardauth_secrets.env
@@ -0,0 +1,3 @@
+CLIENT_SECRET="iwN2f2LAm2Kqr89Js2qylitgg3ZXM4Sy"
+SECRET="ry6CUSs3m5vVkKcdKmCBFkxxbWNQqak5SzNo7Vx2gZDakcycyXoGa2u93BA7"
+ENCRYPTION_KEY="72883626635979678254688349258592"
\ No newline at end of file
diff --git a/server/config/keycloak/keycloak.env b/server/config/keycloak/keycloak.env
new file mode 100644
index 0000000..328418f
--- /dev/null
+++ b/server/config/keycloak/keycloak.env
@@ -0,0 +1,5 @@
+# Volumes
+KEYCLOAK_DATA="/home/joey/data/keycloak/data"
+
+# Env
+KEYCLOAK_ADMIN="jafner"
\ No newline at end of file
diff --git a/server/config/keycloak/keycloak_secrets.env b/server/config/keycloak/keycloak_secrets.env
new file mode 100644
index 0000000..0430076
--- /dev/null
+++ b/server/config/keycloak/keycloak_secrets.env
@@ -0,0 +1 @@
+KEYCLOAK_ADMIN_PASSWORD="iEKfrgdTLfbdqtMkH&FMrL3#t8^qfy%eSY5G94tfnUdQB3G!%CUaoFJuhCUN"
\ No newline at end of file