diff options
| author | Janne Heß <janne@hess.ooo> | 2020-04-28 17:02:46 +0200 |
|---|---|---|
| committer | Janne Heß <janne@hess.ooo> | 2020-04-28 17:02:46 +0200 |
| commit | edddc7c82a848f1b1f23344a338b5d56b38178c0 (patch) | |
| tree | 48fcc9e0468c4e08cadd54f4f7365f417f5c304a /nixos/modules/config | |
| parent | bc2a4b341a5a49a5068e5b361b5862df5e1ae9f9 (diff) | |
| download | nixlib-edddc7c82a848f1b1f23344a338b5d56b38178c0.tar nixlib-edddc7c82a848f1b1f23344a338b5d56b38178c0.tar.gz nixlib-edddc7c82a848f1b1f23344a338b5d56b38178c0.tar.bz2 nixlib-edddc7c82a848f1b1f23344a338b5d56b38178c0.tar.lz nixlib-edddc7c82a848f1b1f23344a338b5d56b38178c0.tar.xz nixlib-edddc7c82a848f1b1f23344a338b5d56b38178c0.tar.zst nixlib-edddc7c82a848f1b1f23344a338b5d56b38178c0.zip | |
nixos/sss: Move nsswitch config into the module
Diffstat (limited to 'nixos/modules/config')
| -rw-r--r-- | nixos/modules/config/nsswitch.nix | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index 186dd7376e92..0acd8900e7b1 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -14,7 +14,6 @@ let nssmdns = canLoadExternalModules && config.services.avahi.nssmdns; nsswins = canLoadExternalModules && config.services.samba.nsswins; ldap = canLoadExternalModules && (config.users.ldap.enable && config.users.ldap.nsswitch); - sssd = canLoadExternalModules && config.services.sssd.enable; resolved = canLoadExternalModules && config.services.resolved.enable; googleOsLogin = canLoadExternalModules && config.security.googleOsLogin.enable; @@ -31,7 +30,6 @@ let passwdArray = mkMerge [ (mkBefore [ "files" ]) - (mkIf sssd [ "sss" ]) (mkIf ldap [ "ldap" ]) (mkIf mymachines [ "mymachines" ]) (mkIf googleOsLogin [ "cache_oslogin oslogin" ]) @@ -40,15 +38,9 @@ let shadowArray = mkMerge [ (mkBefore [ "files" ]) - (mkIf sssd [ "sss" ]) (mkIf ldap [ "ldap" ]) ]; - servicesArray = mkMerge [ - (mkBefore [ "files" ]) - (mkIf sssd [ "sss" ]) - ]; - in { options = { @@ -172,7 +164,7 @@ in { group = passwdArray; shadow = shadowArray; hosts = hostArray; - services = servicesArray; + services = mkBefore [ "files" ]; }; # Systemd provides nss-myhostname to ensure that our hostname |