summary refs log tree commit diff
diff options
context:
space:
mode:
authorArian van Putten <aeroboy94@gmail.com>2018-11-16 15:03:00 +0100
committerArian van Putten <aeroboy94@gmail.com>2018-12-12 15:35:40 +0100
commitde76c16f9c277c0a104ca7f9fa8d8be46ada6c9a (patch)
tree1e46b66cecd319752df83710705f3b4569575a72
parent335b41b3fbf1191e9310dc2717a68df2b0759b76 (diff)
downloadnixpkgs-de76c16f9c277c0a104ca7f9fa8d8be46ada6c9a.tar
nixpkgs-de76c16f9c277c0a104ca7f9fa8d8be46ada6c9a.tar.gz
nixpkgs-de76c16f9c277c0a104ca7f9fa8d8be46ada6c9a.tar.bz2
nixpkgs-de76c16f9c277c0a104ca7f9fa8d8be46ada6c9a.tar.lz
nixpkgs-de76c16f9c277c0a104ca7f9fa8d8be46ada6c9a.tar.xz
nixpkgs-de76c16f9c277c0a104ca7f9fa8d8be46ada6c9a.tar.zst
nixpkgs-de76c16f9c277c0a104ca7f9fa8d8be46ada6c9a.zip
nixos/nscd: Merge nscd and sssd-nscd config
-rw-r--r--nixos/modules/services/misc/nscd-sssd.conf36
-rw-r--r--nixos/modules/services/misc/sssd.nix1
-rw-r--r--nixos/modules/services/system/nscd.conf8
3 files changed, 8 insertions, 37 deletions
diff --git a/nixos/modules/services/misc/nscd-sssd.conf b/nixos/modules/services/misc/nscd-sssd.conf
deleted file mode 100644
index 92380f3e4ba..00000000000
--- a/nixos/modules/services/misc/nscd-sssd.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-server-user             nscd
-threads                 1
-paranoia                no
-debug-level             0
-
-enable-cache            passwd          yes
-positive-time-to-live   passwd          0
-negative-time-to-live   passwd          0
-suggested-size          passwd          211
-check-files             passwd          yes
-persistent              passwd          no
-shared                  passwd          yes
-
-enable-cache            group           yes
-positive-time-to-live   group           0
-negative-time-to-live   group           0
-suggested-size          group           211
-check-files             group           yes
-persistent              group           no
-shared                  group           yes
-
-enable-cache            hosts           yes
-positive-time-to-live   hosts           600
-negative-time-to-live   hosts           5
-suggested-size          hosts           211
-check-files             hosts           yes
-persistent              hosts           no
-shared                  hosts           yes
-
-enable-cache            services        yes
-positive-time-to-live   services        0
-negative-time-to-live   services        0
-suggested-size          services        211
-check-files             services        yes
-persistent              services        no
-shared                  services        yes
diff --git a/nixos/modules/services/misc/sssd.nix b/nixos/modules/services/misc/sssd.nix
index e818f4a4804..fe472a6c68e 100644
--- a/nixos/modules/services/misc/sssd.nix
+++ b/nixos/modules/services/misc/sssd.nix
@@ -75,7 +75,6 @@ in {
       };
 
       system.nssModules = optional cfg.enable pkgs.sssd;
-      services.nscd.config = builtins.readFile ./nscd-sssd.conf;
       services.dbus.packages = [ pkgs.sssd ];
     })
 
diff --git a/nixos/modules/services/system/nscd.conf b/nixos/modules/services/system/nscd.conf
index e860e153965..304be0942dc 100644
--- a/nixos/modules/services/system/nscd.conf
+++ b/nixos/modules/services/system/nscd.conf
@@ -26,3 +26,11 @@ suggested-size          hosts           211
 check-files             hosts           yes
 persistent              hosts           no
 shared                  hosts           yes
+
+enable-cache            services        yes
+positive-time-to-live   services        0
+negative-time-to-live   services        0
+suggested-size          services        211
+check-files             services        yes
+persistent              services        no
+shared                  services        yes