From f0e6892d771022a2d5cb7b53862f229e0bcb868d Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Tue, 8 Oct 2024 21:33:23 +0200
Subject: [PATCH] Fix: Keycloak

---
 templates/compose/keycloak-with-postgres.yaml | 11 ++++++-----
 templates/compose/keycloak.yaml               |  9 +++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/templates/compose/keycloak-with-postgres.yaml b/templates/compose/keycloak-with-postgres.yaml
index 91c97c75e..eaa48f74d 100644
--- a/templates/compose/keycloak-with-postgres.yaml
+++ b/templates/compose/keycloak-with-postgres.yaml
@@ -10,6 +10,7 @@ services:
     command:
       - start
     environment:
+      - SERVICE_FQDN_KEYCLOAK_8080
       - TZ=${TIMEZONE:-UTC}
       - KEYCLOAK_ADMIN=${SERVICE_USER_ADMIN}
       - KEYCLOAK_ADMIN_PASSWORD=${SERVICE_PASSWORD_ADMIN}
@@ -18,10 +19,10 @@ services:
       - KC_DB_PASSWORD=${SERVICE_PASSWORD_64_DATABASE}
       - KC_DB_URL_PORT=5432
       - KC_DB_URL=jdbc:postgresql://postgres/${POSTGRESQL_DATABASE:-keycloak}
-      - KC_HOSTNAME=${SERVICE_FQDN_KEYCLOAK_8080}
-      - KC_HTTP_ENABLED=true
-      - KC_HEALTH_ENABLED=true
-      - KC_PROXY_HEADERS=xforwarded
+      - KC_HOSTNAME=${SERVICE_FQDN_KEYCLOAK}
+      - KC_HTTP_ENABLED=${KC_HTTP_ENABLED:-true}
+      - KC_HEALTH_ENABLED=${KC_HEALTH_ENABLED:-true}
+      - KC_PROXY_HEADERS=${KC_PROXY_HEADERS:-xforwarded}
     volumes:
       - keycloak-data:/opt/keycloak/data
     depends_on:
@@ -39,7 +40,7 @@ services:
   postgres:
     image: postgres:16-alpine
     volumes:
-      - postgresql-data:/var/lib/postgresql/data
+      - keycloak-postgresql-data:/var/lib/postgresql/data
     environment:
       - POSTGRES_USER=${SERVICE_USER_DATABASE}
       - POSTGRES_PASSWORD=${SERVICE_PASSWORD_64_DATABASE}
diff --git a/templates/compose/keycloak.yaml b/templates/compose/keycloak.yaml
index 7007d1fae..aebe83b58 100644
--- a/templates/compose/keycloak.yaml
+++ b/templates/compose/keycloak.yaml
@@ -10,13 +10,14 @@ services:
     command:
       - start
     environment:
+      - SERVICE_FQDN_KEYCLOAK_8080
       - TZ=${TIMEZONE:-UTC}
       - KEYCLOAK_ADMIN=${SERVICE_USER_ADMIN}
       - KEYCLOAK_ADMIN_PASSWORD=${SERVICE_PASSWORD_ADMIN}
-      - KC_HOSTNAME=${SERVICE_FQDN_KEYCLOAK_8080}
-      - KC_HTTP_ENABLED=true
-      - KC_HEALTH_ENABLED=true
-      - KC_PROXY_HEADERS=xforwarded
+      - KC_HOSTNAME=${SERVICE_FQDN_KEYCLOAK}
+      - KC_HTTP_ENABLED=${KC_HTTP_ENABLED:-true}
+      - KC_HEALTH_ENABLED=${KC_HEALTH_ENABLED:-true}
+      - KC_PROXY_HEADERS=${KC_PROXY_HEADERS:-xforwarded}
     volumes:
       - keycloak-data:/opt/keycloak/data
     healthcheck: