use correct subdomain for keycloak

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";
 

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}

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";

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;