summary refs log tree commit diff
path: root/nixos/modules/services/system/nscd.nix
diff options
context:
space:
mode:
authorAlexander Kahl <ak@sodosopa.io>2016-04-14 11:18:09 -0700
committerNikolay Amiantov <ab@fmap.me>2017-01-04 03:07:20 +0300
commit61d125b8425da501f07765197186ed7351a55f48 (patch)
treeb60774795ef94d8602539a089d9296e7e7183449 /nixos/modules/services/system/nscd.nix
parent40a9c37ff3ad179b18aae2d0309523312525de5b (diff)
downloadnixlib-61d125b8425da501f07765197186ed7351a55f48.tar
nixlib-61d125b8425da501f07765197186ed7351a55f48.tar.gz
nixlib-61d125b8425da501f07765197186ed7351a55f48.tar.bz2
nixlib-61d125b8425da501f07765197186ed7351a55f48.tar.lz
nixlib-61d125b8425da501f07765197186ed7351a55f48.tar.xz
nixlib-61d125b8425da501f07765197186ed7351a55f48.tar.zst
nixlib-61d125b8425da501f07765197186ed7351a55f48.zip
sssd: init at 1.14.2
perlPackages.TextWrapI18N: init at 0.06
perlPackages.Po4a: init at 0.47
jade: init at 1.2.1
ding-libs: init at 0.6.0

Switch nscd to no-caching mode if SSSD is enabled.

abbradar: disable jade parallel building.

Closes #21150
Diffstat (limited to 'nixos/modules/services/system/nscd.nix')
-rw-r--r--nixos/modules/services/system/nscd.nix13
1 files changed, 8 insertions, 5 deletions
diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix
index d98ef8a306d5..eb4b5281c7c6 100644
--- a/nixos/modules/services/system/nscd.nix
+++ b/nixos/modules/services/system/nscd.nix
@@ -9,8 +9,6 @@ let
 
   inherit (lib) singleton;
 
-  cfgFile = pkgs.writeText "nscd.conf" cfg.config;
-
 in
 
 {
@@ -41,6 +39,7 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
+    environment.etc."nscd.conf".text = cfg.config;
 
     users.extraUsers.nscd =
       { isSystemUser = true;
@@ -61,10 +60,14 @@ in
             mkdir -m 0755 -p /var/db/nscd
           '';
 
-        restartTriggers = [ config.environment.etc.hosts.source config.environment.etc."nsswitch.conf".source ];
+        restartTriggers = [
+          config.environment.etc.hosts.source
+          config.environment.etc."nsswitch.conf".source
+          config.environment.etc."nscd.conf".source
+        ];
 
         serviceConfig =
-          { ExecStart = "@${pkgs.glibc.bin}/sbin/nscd nscd -f ${cfgFile}";
+          { ExecStart = "@${pkgs.glibc.bin}/sbin/nscd nscd";
             Type = "forking";
             PIDFile = "/run/nscd/nscd.pid";
             Restart = "always";
@@ -79,7 +82,7 @@ in
         # its pid. So wait until it's ready.
         postStart =
           ''
-            while ! ${pkgs.glibc.bin}/sbin/nscd -g -f ${cfgFile} > /dev/null; do
+            while ! ${pkgs.glibc.bin}/sbin/nscd -g > /dev/null; do
               sleep 0.2
             done
           '';