mirrors_public/oddlama_nix-config
1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-11 07:10:39 +02:00
Code Activity

chore: update kanidm module

Browse source
This commit is contained in:
oddlama 2024-03-12 16:42:36 +01:00
parent bec8f5f50f
commit 0ec4a8ebe8
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
10 changed files with 68 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

21
modules/kanidm.nix
View file

@ -19,8 +19,10 @@
flip
foldl'
getExe
hasInfix
hasPrefix
isStorePath
last
mapAttrsToList
mdDoc
mkEnableOption
@ -31,6 +33,7 @@
mkPackageOption
optional
optionalString
splitString
subtractLists
types
unique
@ -112,6 +115,17 @@
inherit (cfg.provision) groups persons systems;
});
serverPort =
# ipv6:
if hasInfix "]:" cfg.serverSettings.bindaddress
then last (splitString "]:" cfg.serverSettings.bindaddress)
else
# ipv4:
if hasInfix "." cfg.serverSettings.bindaddress
then last (splitString ":" cfg.serverSettings.bindaddress)
# default is 8443
else "8443";
# Only recover the admin account if a password should explicitly be provisioned
# for the account. Otherwise it is not needed for provisioning.
maybeRecoverAdmin = optionalString (cfg.provision.adminPasswordFile != null) ''
@ -324,7 +338,8 @@ in {
instanceUrl = mkOption {
description = "The instance url to which the provisioning tool should connect.";
default = "https://localhost";
default = "https://localhost:${serverPort}";
defaultText = ''"https://localhost:<port from serverSettings.bindaddress>"'';
type = types.str;
};
@ -335,8 +350,8 @@ in {
dangerous when used with an external URL.
'';
type = types.bool;
default = cfg.provision.instanceUrl == "https://localhost";
defaultText = ''services.kanidm.provision.instanceUrl == "https://localhost"'';
default = hasPrefix "https://localhost:" cfg.provision.instanceUrl;
defaultText = ''hasPrefix "https://localhost:" cfg.provision.instanceUrl'';
};
adminPasswordFile = mkOption {