hosting/selfhostblocks
1
0
Fork 0
Code Issues Activity

use correct subdomain for keycloak

Browse source
This commit is contained in:
ibizaman 2023-02-19 13:36:18 -08:00
parent 52af93898c
commit e7f8bfc8f9
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
keycloak/unit.nix
View file

@ -15,6 +15,7 @@
, logLevel ? "INFO" , logLevel ? "INFO"
, metricsEnabled ? false , metricsEnabled ? false
, hostname , hostname
, subdomain
, dbUsername ? "keycloak" , dbUsername ? "keycloak"
, dbHost ? x: "localhost" , dbHost ? x: "localhost"
@ -39,7 +40,7 @@ in
inherit name; inherit name;
inherit initialAdminUsername; inherit initialAdminUsername;
inherit hostname listenPort; inherit hostname subdomain listenPort;
systemdUnitFile = "${name}.service"; systemdUnitFile = "${name}.service";

5
oauth2-proxy/unit.nix
View file

@ -4,8 +4,9 @@
}: }:
{ name { name
, serviceName , serviceName
, keycloakSubdomain ? "keycloak"
, domain , domain
, keycloakSubdomain ? "keycloak"
, keycloakDomain ? domain
, realm , realm
, allowed_roles ? [] , allowed_roles ? []
@ -45,7 +46,7 @@ rec {
scope="openid" scope="openid"
redirect_url = "https://${serviceName}.${domain}/oauth2/callback" 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 = [ "*" ] email_domains = [ "*" ]
allowed_roles = ${formatted_allowed_roles} allowed_roles = ${formatted_allowed_roles}

2
ttrss/default.nix
View file

@ -35,7 +35,7 @@ let
feed_icons_directory = "${persistent_dir}/feed-icons"; feed_icons_directory = "${persistent_dir}/feed-icons";
in in
rec { rec {
dnsmasqSubdomains = [subdomain]; inherit subdomain;
db = customPkgs.mkPostgresDB { db = customPkgs.mkPostgresDB {
name = "${serviceName}PostgresDB"; name = "${serviceName}PostgresDB";

5
vaultwarden/default.nix
View file

@ -38,8 +38,7 @@ let
in in
rec { rec {
inherit user group; inherit user group;
inherit subdomain;
dnsmasqSubdomains = [subdomain];
db = customPkgs.mkPostgresDB { db = customPkgs.mkPostgresDB {
name = "${serviceName}PostgresDB"; name = "${serviceName}PostgresDB";
@ -183,6 +182,8 @@ rec {
inherit name; inherit name;
serviceName = subdomain; serviceName = subdomain;
domain = utils.getDomain distribution name; domain = utils.getDomain distribution name;
keycloakSubdomain = KeycloakService.subdomain;
keycloakDomain = utils.getDomain distribution "KeycloakService";
ingress = "127.0.0.1:${toString ssoIngress}"; ingress = "127.0.0.1:${toString ssoIngress}";
egress = [ "http://127.0.0.1:${toString serviceIngress}" ]; egress = [ "http://127.0.0.1:${toString serviceIngress}" ];
realm = sso.realm; realm = sso.realm;