about summary refs log tree commit diff
path: root/nixos/modules/services/misc
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2020-05-14 14:55:43 +0200
committerGitHub <noreply@github.com>2020-05-14 14:55:43 +0200
commit4a85559ffcbe5af70c28a69de47f4276ffca6cdd (patch)
tree6b70f5943567385ae68cc1e351b703e55019fb6e /nixos/modules/services/misc
parent0ffc85d64b081f0210787435122ef7f42b81d791 (diff)
parent23ba50611321035e02f5bfc2f5f809600ccc2f7b (diff)
downloadnixlib-4a85559ffcbe5af70c28a69de47f4276ffca6cdd.tar
nixlib-4a85559ffcbe5af70c28a69de47f4276ffca6cdd.tar.gz
nixlib-4a85559ffcbe5af70c28a69de47f4276ffca6cdd.tar.bz2
nixlib-4a85559ffcbe5af70c28a69de47f4276ffca6cdd.tar.lz
nixlib-4a85559ffcbe5af70c28a69de47f4276ffca6cdd.tar.xz
nixlib-4a85559ffcbe5af70c28a69de47f4276ffca6cdd.tar.zst
nixlib-4a85559ffcbe5af70c28a69de47f4276ffca6cdd.zip
Merge pull request #87016 from flokli/nsswitch-cleanup
nixos/nsswitch cleanup nss modules
Diffstat (limited to 'nixos/modules/services/misc')
-rw-r--r--nixos/modules/services/misc/sssd.nix10
1 files changed, 3 insertions, 7 deletions
diff --git a/nixos/modules/services/misc/sssd.nix b/nixos/modules/services/misc/sssd.nix
index 77f6ccfe64f0..3da99a3b38c1 100644
--- a/nixos/modules/services/misc/sssd.nix
+++ b/nixos/modules/services/misc/sssd.nix
@@ -42,11 +42,6 @@ in {
   };
   config = mkMerge [
     (mkIf cfg.enable {
-      assertions = singleton {
-        assertion = nscd.enable;
-        message = "nscd must be enabled through `services.nscd.enable` for SSSD to work.";
-      };
-
       systemd.services.sssd = {
         description = "System Security Services Daemon";
         wantedBy    = [ "multi-user.target" ];
@@ -74,11 +69,12 @@ in {
         mode = "0400";
       };
 
-      system.nssModules = optional cfg.enable pkgs.sssd;
+      system.nssModules = pkgs.sssd;
       system.nssDatabases = {
+        group = [ "sss" ];
         passwd = [ "sss" ];
-        shadow = [ "sss" ];
         services = [ "sss" ];
+        shadow = [ "sss" ];
       };
       services.dbus.packages = [ pkgs.sssd ];
     })