diff options
author | Florian Klink <flokli@flokli.de> | 2020-04-30 17:51:13 +0200 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2020-04-30 17:51:13 +0200 |
commit | 4b71b6f8fa5f7b06ea5d0dd37d44a73757c7f142 (patch) | |
tree | b53452a4ab393eefa4837ecaec6fba7d0a9b9aff /nixos/modules/config/nsswitch.nix | |
parent | 0510d599013c41fbc832eae1bfb6923b8b76a8ea (diff) |
nixos/google-oslogin: Move nsswitch config into the module
Motivation: #86350
Diffstat (limited to 'nixos/modules/config/nsswitch.nix')
-rw-r--r-- | nixos/modules/config/nsswitch.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index 0acd8900e7b11..77e47a350ecbe 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -15,7 +15,6 @@ let nsswins = canLoadExternalModules && config.services.samba.nsswins; ldap = canLoadExternalModules && (config.users.ldap.enable && config.users.ldap.nsswitch); resolved = canLoadExternalModules && config.services.resolved.enable; - googleOsLogin = canLoadExternalModules && config.security.googleOsLogin.enable; hostArray = mkMerge [ (mkBefore [ "files" ]) @@ -32,7 +31,6 @@ let (mkBefore [ "files" ]) (mkIf ldap [ "ldap" ]) (mkIf mymachines [ "mymachines" ]) - (mkIf googleOsLogin [ "cache_oslogin oslogin" ]) (mkIf canLoadExternalModules (mkAfter [ "systemd" ])) ]; @@ -172,7 +170,6 @@ in { # configured IP addresses, or ::1 and 127.0.0.2 as # fallbacks. Systemd also provides nss-mymachines to return IP # addresses of local containers. - system.nssModules = (optionals canLoadExternalModules [ config.systemd.package.out ]) - ++ optional googleOsLogin pkgs.google-compute-engine-oslogin.out; + system.nssModules = (optionals canLoadExternalModules [ config.systemd.package.out ]); }; } |