From e7f8bfc8f9f5fb2c0be2171495572e335f83a42b Mon Sep 17 00:00:00 2001
From: ibizaman <ibizapeanut@gmail.com>
Date: Sun, 19 Feb 2023 13:36:18 -0800
Subject: [PATCH] use correct subdomain for keycloak

---
 keycloak/unit.nix       | 3 ++-
 oauth2-proxy/unit.nix   | 5 +++--
 ttrss/default.nix       | 2 +-
 vaultwarden/default.nix | 5 +++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/keycloak/unit.nix b/keycloak/unit.nix
index 8e8829e..95871a6 100644
--- a/keycloak/unit.nix
+++ b/keycloak/unit.nix
@@ -15,6 +15,7 @@
 , logLevel ? "INFO"
 , metricsEnabled ? false
 , hostname
+, subdomain
 
 , dbUsername ? "keycloak"
 , dbHost ? x: "localhost"
@@ -39,7 +40,7 @@ in
   inherit name;
 
   inherit initialAdminUsername;
-  inherit hostname listenPort;
+  inherit hostname subdomain listenPort;
 
   systemdUnitFile = "${name}.service";
 
diff --git a/oauth2-proxy/unit.nix b/oauth2-proxy/unit.nix
index 1c0f98d..70fd654 100644
--- a/oauth2-proxy/unit.nix
+++ b/oauth2-proxy/unit.nix
@@ -4,8 +4,9 @@
 }:
 { name
 , serviceName
-, keycloakSubdomain ? "keycloak"
 , domain
+, keycloakSubdomain ? "keycloak"
+, keycloakDomain ? domain
 , realm
 , allowed_roles ? []
 
@@ -45,7 +46,7 @@ rec {
         scope="openid"
         
         redirect_url = "https://${serviceName}.${domain}/oauth2/callback"
-        oidc_issuer_url = "https://${keycloakSubdomain}.${domain}/realms/${realm}"
+        oidc_issuer_url = "https://${keycloakSubdomain}.${keycloakDomain}/realms/${realm}"
         
         email_domains = [ "*" ]
         allowed_roles = ${formatted_allowed_roles}
diff --git a/ttrss/default.nix b/ttrss/default.nix
index 148bcd1..0869d12 100644
--- a/ttrss/default.nix
+++ b/ttrss/default.nix
@@ -35,7 +35,7 @@ let
   feed_icons_directory = "${persistent_dir}/feed-icons";
 in
 rec {
-  dnsmasqSubdomains = [subdomain];
+  inherit subdomain;
 
   db = customPkgs.mkPostgresDB {
     name = "${serviceName}PostgresDB";
diff --git a/vaultwarden/default.nix b/vaultwarden/default.nix
index 5401a7b..94831f1 100644
--- a/vaultwarden/default.nix
+++ b/vaultwarden/default.nix
@@ -38,8 +38,7 @@ let
 in
 rec {
   inherit user group;
-
-  dnsmasqSubdomains = [subdomain];
+  inherit subdomain;
 
   db = customPkgs.mkPostgresDB {
     name = "${serviceName}PostgresDB";
@@ -183,6 +182,8 @@ rec {
       inherit name;
       serviceName = subdomain;
       domain = utils.getDomain distribution name;
+      keycloakSubdomain = KeycloakService.subdomain;
+      keycloakDomain = utils.getDomain distribution "KeycloakService";
       ingress = "127.0.0.1:${toString ssoIngress}";
       egress = [ "http://127.0.0.1:${toString serviceIngress}" ];
       realm = sso.realm;