From 7ef624d74bac1f44e03bdc03d0cd75306375f8fd Mon Sep 17 00:00:00 2001
From: Haletran <bpasquier123@gmail.com>
Date: Tue, 3 Mar 2026 16:32:35 +0100
Subject: [PATCH] fix: correc domain name for keycloak according to the subject

---
 README.md                                 |  2 +-
 core/caddy/config/sites/auth.caddy        |  3 +++
 core/caddy/config/sites/keycloak.caddy    |  3 ---
 core/caddy/config/sites/outils.caddy      |  2 +-
 core/keycloak/{.gitkeep => buildtime.env} |  0
 core/keycloak/compose.yml                 | 12 ++++++------
 core/keycloak/runtime.env                 |  3 +++
 core/peertube/compose.yml                 |  2 +-
 8 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 core/caddy/config/sites/auth.caddy
 delete mode 100644 core/caddy/config/sites/keycloak.caddy
 rename core/keycloak/{.gitkeep => buildtime.env} (100%)
 create mode 100644 core/keycloak/runtime.env

diff --git a/README.md b/README.md
index 8e85a0b..526735f 100644
--- a/README.md
+++ b/README.md
@@ -78,7 +78,7 @@ ssh-copy-id -p 2222 bapasqui@localhost
 
 ## for peertube
 What you need to do in Keycloak
-1. Go to https://keycloak.chatons.duckdns.org > Admin Console
+1. Go to https://auth.chatons.duckdns.org > Admin Console
 2. Create realm chatons (if it doesn't exist)
 3. Go to Clients > Create client:
    - Client type: OpenID Connect
diff --git a/core/caddy/config/sites/auth.caddy b/core/caddy/config/sites/auth.caddy
new file mode 100644
index 0000000..0c41c12
--- /dev/null
+++ b/core/caddy/config/sites/auth.caddy
@@ -0,0 +1,3 @@
+auth.chatons.duckdns.org {
+	reverse_proxy keycloak:8080
+}
\ No newline at end of file
diff --git a/core/caddy/config/sites/keycloak.caddy b/core/caddy/config/sites/keycloak.caddy
deleted file mode 100644
index e7afa81..0000000
--- a/core/caddy/config/sites/keycloak.caddy
+++ /dev/null
@@ -1,3 +0,0 @@
-keycloak.chatons.duckdns.org {
-	reverse_proxy keycloak:8080
-}
\ No newline at end of file
diff --git a/core/caddy/config/sites/outils.caddy b/core/caddy/config/sites/outils.caddy
index 2e67095..d48dc01 100644
--- a/core/caddy/config/sites/outils.caddy
+++ b/core/caddy/config/sites/outils.caddy
@@ -49,7 +49,7 @@ outils.chatons.duckdns.org {
 						<li><a href="https://cloud.chatons.duckdns.org">Nextcloud</a></li>
 						<li><a href="https://peertube.chatons.duckdns.org">Nextcloud</a></li>
 						<li><a href="https://vogsphere.chatons.duckdns.org">Gitea</a></li>
-						<li><a href="https://keycloak.chatons.duckdns.org">Keycloak</a></li>
+						<li><a href="https://auth.chatons.duckdns.org">Keycloak</a></li>
 						<li><a href="https://diagrams.chatons.duckdns.org">Diagrams</a></li>
 					</ul>
 				</body>
diff --git a/core/keycloak/.gitkeep b/core/keycloak/buildtime.env
similarity index 100%
rename from core/keycloak/.gitkeep
rename to core/keycloak/buildtime.env
diff --git a/core/keycloak/compose.yml b/core/keycloak/compose.yml
index da40d97..af34ee5 100644
--- a/core/keycloak/compose.yml
+++ b/core/keycloak/compose.yml
@@ -2,18 +2,18 @@ services:
   keycloak:
     image: quay.io/keycloak/keycloak
     container_name: keycloak
-    ports:
-      - 8080
+    expose:
+      - "8080"
     networks:
       - proxy
+    env_file:
+      - runtime.env
     environment:
       KC_DB: postgres
       KC_DB_URL: jdbc:postgresql://postgres:3212/keycloak
       KC_DB_USERNAME: bapasqui
-      KC_DB_PASSWORD: ${KC_DB_PASSWORD}
-      KC_BOOTSTRAP_ADMIN_USERNAME: ${KC_BOOTSTRAP_ADMIN_USERNAME}
-      KC_BOOTSTRAP_ADMIN_PASSWORD: ${KC_BOOTSTRAP_ADMIN_PASSWORD}
-      KC_HOSTNAME: https://keycloak.chatons.duckdns.org
+      KC_HOSTNAME: https://auth.chatons.duckdns.org
+      KC_HEALTH_ENABLED: "true"
     command:
       - start-dev
     restart: unless-stopped
diff --git a/core/keycloak/runtime.env b/core/keycloak/runtime.env
new file mode 100644
index 0000000..703cad5
--- /dev/null
+++ b/core/keycloak/runtime.env
@@ -0,0 +1,3 @@
+KC_DB_PASSWORD=password
+KC_BOOTSTRAP_ADMIN_USERNAME=admin
+KC_BOOTSTRAP_ADMIN_PASSWORD=admin
diff --git a/core/peertube/compose.yml b/core/peertube/compose.yml
index 9269251..c4a9998 100644
--- a/core/peertube/compose.yml
+++ b/core/peertube/compose.yml
@@ -22,7 +22,7 @@ services:
       - PEERTUBE_SECRET=${PEERTUBE_SECRET}
       - PEERTUBE_ADMIN_EMAIL=${PEERTUBE_ADMIN_EMAIL}
       - PT_INITIAL_ROOT_PASSWORD=${PT_INITIAL_ROOT_PASSWORD}
-      - PEERTUBE_PLUGIN_AUTH_OPENID_CONNECT_DISCOVER_URL=https://keycloak.chatons.duckdns.org/realms/chatons/.well-known/openid-configuration
+      - PEERTUBE_PLUGIN_AUTH_OPENID_CONNECT_DISCOVER_URL=https://auth.chatons.duckdns.org/realms/chatons/.well-known/openid-configuration
       - PEERTUBE_PLUGIN_AUTH_OPENID_CONNECT_CLIENT_ID=peertube
       - PEERTUBE_PLUGIN_AUTH_OPENID_CONNECT_CLIENT_SECRET=${PEERTUBE_OIDC_CLIENT_SECRET}
       - PEERTUBE_PLUGIN_AUTH_OPENID_CONNECT_SCOPE=openid profile email