public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/ldap: move nss database configuration into ldap module

Browse Source 
now that passwdArray and shadowArray aren't used anymore, these can be
folded.
This commit is contained in:
Florian Klink 2020-05-06 00:09:59 +02:00
parent 36b6e26d40
commit 4f9c8ef791
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/config/ldap.nix
View File

@ -244,6 +244,10 @@ in
if cfg.daemon.enable then nss_pam_ldapd else nss_ldap if cfg.daemon.enable then nss_pam_ldapd else nss_ldap
); );
system.nssDatabases.group = optional cfg.nsswitch "ldap";
system.nssDatabases.passwd = optional cfg.nsswitch "ldap";
system.nssDatabases.shadow = optional cfg.nsswitch "ldap";
users = mkIf cfg.daemon.enable { users = mkIf cfg.daemon.enable {
groups.nslcd = { groups.nslcd = {
gid = config.ids.gids.nslcd; gid = config.ids.gids.nslcd;

17
nixos/modules/config/nsswitch.nix
View File

@ -11,7 +11,6 @@ let
# XXX Move these to their respective modules # XXX Move these to their respective modules
nssmdns = canLoadExternalModules && config.services.avahi.nssmdns; nssmdns = canLoadExternalModules && config.services.avahi.nssmdns;
nsswins = canLoadExternalModules && config.services.samba.nsswins; nsswins = canLoadExternalModules && config.services.samba.nsswins;
ldap = canLoadExternalModules && (config.users.ldap.enable && config.users.ldap.nsswitch);
hostArray = mkMerge [ hostArray = mkMerge [
(mkBefore [ "files" ]) (mkBefore [ "files" ])
@ -21,16 +20,6 @@ let
(mkIf nssmdns (mkOrder 1501 [ "mdns" ])) # 1501 to ensure it's after dns (mkIf nssmdns (mkOrder 1501 [ "mdns" ])) # 1501 to ensure it's after dns
]; ];
passwdArray = mkMerge [
(mkBefore [ "files" ])
(mkIf ldap [ "ldap" ])
];
shadowArray = mkMerge [
(mkBefore [ "files" ])
(mkIf ldap [ "ldap" ])
];
in { in {
options = { options = {
@ -145,9 +134,9 @@ in {
''; '';
system.nssDatabases = { system.nssDatabases = {
passwd = passwdArray; passwd = mkBefore [ "files" ];
group = passwdArray; group = mkBefore [ "files" ];
shadow = shadowArray; shadow = mkBefore [ "files" ];
hosts = hostArray; hosts = hostArray;
services = mkBefore [ "files" ]; services = mkBefore [ "files" ];
}; };