gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(keycloak): hostname option patch

Browse source 
part of a flake update
This commit is contained in:
arcnmx 2024-06-23 19:27:47 -07:00
parent af760a543a
commit 0bcfd82a60
3 changed files with 35 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

23
packages/nixpkgs-keycloak-nullhostname.patch
View file

@ -1,14 +1,23 @@
diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix
--- a/nixos/modules/services/web-apps/keycloak.nix
+++ b/nixos/modules/services/web-apps/keycloak.nix
@@ -480,10 +480,6 @@ in
@@ -328,7 +328,7 @@ in
};
hostname = mkOption {
- type = str;
+ type = nullOr str;
example = "keycloak.example.com";
description = ''
The hostname part of the public URL used as base for
@@ -477,6 +477,10 @@ in
assertion = createLocalPostgreSQL -> config.services.postgresql.settings.standard_conforming_strings or true;
message = "Setting up a local PostgreSQL db for Keycloak requires `standard_conforming_strings` turned on to work reliably";
}
- {
- assertion = cfg.settings.hostname != null || cfg.settings.hostname-url or null != null;
- message = "Setting the Keycloak hostname is required, see `services.keycloak.settings.hostname`";
- }
+ {
+ assertion = cfg.settings.hostname != null || ! cfg.settings.hostname-strict or true;
+ message = "Setting the Keycloak hostname is required, see `services.keycloak.settings.hostname`";
+ }
{
assertion = !(cfg.settings.hostname != null && cfg.settings.hostname-url or null != null);
message = "`services.keycloak.settings.hostname` and `services.keycloak.settings.hostname-url` are mutually exclusive";
assertion = cfg.settings.hostname-url or null == null;
message = ''