From 2a452735414b94486159ddcada2026e94936a573 Mon Sep 17 00:00:00 2001
From: Moritz <moritz.m@local-it.org>
Date: Wed, 31 May 2023 15:50:55 +0200
Subject: [PATCH] fix second oidc configuration

---
 compose.keycloak2.yml | 2 ++
 homeserver.yaml.tmpl  | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/compose.keycloak2.yml b/compose.keycloak2.yml
index a956e61..971b6cc 100644
--- a/compose.keycloak2.yml
+++ b/compose.keycloak2.yml
@@ -6,8 +6,10 @@ services:
     secrets:
       - keycloak2_client_secret
     environment:
+      - KEYCLOAK2_ALLOW_EXISTING_USERS
       - KEYCLOAK2_CLIENT_ID
       - KEYCLOAK2_ENABLED
+      - KEYCLOAK2_ID
       - KEYCLOAK2_NAME
       - KEYCLOAK2_URL
 
diff --git a/homeserver.yaml.tmpl b/homeserver.yaml.tmpl
index 5f3d7ae..aa20354 100644
--- a/homeserver.yaml.tmpl
+++ b/homeserver.yaml.tmpl
@@ -609,12 +609,13 @@ oidc_providers:
   {{ end }}
 
   {{ if eq (env "KEYCLOAK2_ENABLED") "1" }}
-  - idp_id: keycloak2
+  - idp_id: {{ env "KEYCLOAK2_ID" }}
     idp_name: {{ env "KEYCLOAK2_NAME" }}
     issuer: "{{ env "KEYCLOAK2_URL" }}"
     client_id: "{{ env "KEYCLOAK2_CLIENT_ID" }}"
     client_secret: "{{ secret "keycloak2_client_secret" }}"
     scopes: ["openid", "profile"]
+    allow_existing_users: {{ env "KEYCLOAK2_ALLOW_EXISTING_USERS" }}
     user_mapping_provider:
       config:
         localpart_template: "{{ "{{ user.preferred_username }}" }}"
@@ -622,12 +623,13 @@ oidc_providers:
   {{ end }}
 
   {{ if eq (env "KEYCLOAK3_ENABLED") "1" }}
-  - idp_id: keycloak3
+  - idp_id: {{ env "KEYCLOAK3_ID" }}
     idp_name: {{ env "KEYCLOAK3_NAME" }}
     issuer: "{{ env "KEYCLOAK3_URL" }}"
     client_id: "{{ env "KEYCLOAK3_CLIENT_ID" }}"
     client_secret: "{{ secret "keycloak3_client_secret" }}"
     scopes: ["openid", "profile"]
+    allow_existing_users: {{ env "KEYCLOAK3_ALLOW_EXISTING_USERS" }}
     user_mapping_provider:
       config:
         localpart_template: "{{ "{{ user.preferred_username }}" }}"