diff options
| author | Marco Rebhan <me@dblsaiko.net> | 2023-07-13 01:21:59 +0200 |
|---|---|---|
| committer | Marco Rebhan <me@dblsaiko.net> | 2023-12-21 11:34:59 +0100 |
| commit | 92a541c0ed590db1e8bee7436a6130cb5d589a6c (patch) | |
| tree | 82c07078c0150627be7319e4ed21a6d0801844dd /nixos/modules/services | |
| parent | 808d2bd0ae2bdcf60685f3335d2229221c3d2b8d (diff) | |
| download | nixlib-92a541c0ed590db1e8bee7436a6130cb5d589a6c.tar nixlib-92a541c0ed590db1e8bee7436a6130cb5d589a6c.tar.gz nixlib-92a541c0ed590db1e8bee7436a6130cb5d589a6c.tar.bz2 nixlib-92a541c0ed590db1e8bee7436a6130cb5d589a6c.tar.lz nixlib-92a541c0ed590db1e8bee7436a6130cb5d589a6c.tar.xz nixlib-92a541c0ed590db1e8bee7436a6130cb5d589a6c.tar.zst nixlib-92a541c0ed590db1e8bee7436a6130cb5d589a6c.zip | |
nixos/krb5: cleanup, fix and RFC42-ify
This replaces the krb5 module's options with RFC 42-style krb5.settings option, while greatly simplifying the code and fixing a few bugs, namely: - #243068 krb5: Configuration silently gets ignored when set by multiple modules - not being able to use mkIf etc. inside subattributes of krb5.libdefaults, e.g. krb5.libdefaults.default_realm = mkIf ... See #144575. Closes #243068. Co-authored-by: h7x4 <h7x4@nani.wtf>
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/system/kerberos/default.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/system/kerberos/heimdal.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/system/kerberos/mit.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/system/kerberos/default.nix b/nixos/modules/services/system/kerberos/default.nix index 4ed48e463741..e3185eb6409c 100644 --- a/nixos/modules/services/system/kerberos/default.nix +++ b/nixos/modules/services/system/kerberos/default.nix @@ -3,7 +3,7 @@ let inherit (lib) mkOption mkIf types length attrNames; cfg = config.services.kerberos_server; - kerberos = config.krb5.kerberos; + kerberos = config.krb5.package; aclEntry = { options = { diff --git a/nixos/modules/services/system/kerberos/heimdal.nix b/nixos/modules/services/system/kerberos/heimdal.nix index 837c59caa562..c9a951caa1ae 100644 --- a/nixos/modules/services/system/kerberos/heimdal.nix +++ b/nixos/modules/services/system/kerberos/heimdal.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf concatStringsSep concatMapStrings toList mapAttrs mapAttrsToList; cfg = config.services.kerberos_server; - kerberos = config.krb5.kerberos; + kerberos = config.krb5.package; stateDir = "/var/heimdal"; aclFiles = mapAttrs (name: {acl, ...}: pkgs.writeText "${name}.acl" (concatMapStrings (( diff --git a/nixos/modules/services/system/kerberos/mit.nix b/nixos/modules/services/system/kerberos/mit.nix index 112000140453..5f8ac6b7fa34 100644 --- a/nixos/modules/services/system/kerberos/mit.nix +++ b/nixos/modules/services/system/kerberos/mit.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf concatStrings concatStringsSep concatMapStrings toList mapAttrs mapAttrsToList; cfg = config.services.kerberos_server; - kerberos = config.krb5.kerberos; + kerberos = config.krb5.package; stateDir = "/var/lib/krb5kdc"; PIDFile = "/run/kdc.pid"; aclMap = { |