[debian-lan-devel] [debian-lan] 03/08: Switch autofs to sssd caching.

[Andreas B. Mundt]

This is an automated email from the git hooks/post-receive script.

andi pushed a commit to branch master
in repository debian-lan.

commit b360dc6cd40a7d4f6d04d955fdb7ff290e9429e2
Author: Andreas B. Mundt <andi at debian.org>
Date:   Tue Aug 9 09:05:28 2016 +0200

    Switch autofs to sssd caching.
---
 fai/config/files/etc/sssd/sssd.conf/CLIENT_A                  |  4 +++-
 fai/config/package_config/NFS_CLIENT                          |  1 +
 fai/config/scripts/NFS_CLIENT/20-autofs                       | 11 -----------
 .../scripts/{LDAP_CLIENT => NFS_CLIENT}/40-nsswitch.conf      |  2 +-
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/fai/config/files/etc/sssd/sssd.conf/CLIENT_A b/fai/config/files/etc/sssd/sssd.conf/CLIENT_A
index 97a3d19..2b7464f 100644
--- a/fai/config/files/etc/sssd/sssd.conf/CLIENT_A
+++ b/fai/config/files/etc/sssd/sssd.conf/CLIENT_A
@@ -2,7 +2,7 @@
 config_file_version = 2
 reconnection_retries = 3
 sbus_timeout = 30
-services = nss, pam
+services = nss, pam, autofs
 domains = intern
 
 [nss]
@@ -13,6 +13,8 @@ reconnection_retries = 3
 [pam]
 reconnection_retries = 3
 
+[autofs]
+
 [domain/intern]
 ; Using enumerate = true leads to high load and slow response
 enumerate = false
diff --git a/fai/config/package_config/NFS_CLIENT b/fai/config/package_config/NFS_CLIENT
index ef21be8..33eeee9 100644
--- a/fai/config/package_config/NFS_CLIENT
+++ b/fai/config/package_config/NFS_CLIENT
@@ -2,3 +2,4 @@
 ## Put all setup-dependent packages in the CLIENT_* class.
 PACKAGES aptitude
 autofs-ldap
+keyutils # cf. #830777
diff --git a/fai/config/scripts/NFS_CLIENT/20-autofs b/fai/config/scripts/NFS_CLIENT/20-autofs
deleted file mode 100755
index 033016c..0000000
--- a/fai/config/scripts/NFS_CLIENT/20-autofs
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/sbin/cfagent -f
-
-control:
-   any::
-   actionsequence = ( editfiles )
-   EditFileSize = ( 30000 )
-
-editfiles:
-	{ ${target}/etc/default/autofs
-	  AppendIfNoSuchLine "LDAPURI=ldap:///"
-	}
diff --git a/fai/config/scripts/LDAP_CLIENT/40-nsswitch.conf b/fai/config/scripts/NFS_CLIENT/40-nsswitch.conf
similarity index 75%
rename from fai/config/scripts/LDAP_CLIENT/40-nsswitch.conf
rename to fai/config/scripts/NFS_CLIENT/40-nsswitch.conf
index 5136995..4078b23 100755
--- a/fai/config/scripts/LDAP_CLIENT/40-nsswitch.conf
+++ b/fai/config/scripts/NFS_CLIENT/40-nsswitch.conf
@@ -10,5 +10,5 @@ control:
 editfiles:
    any::
         { ${target}/etc/nsswitch.conf
-            AppendIfNoSuchLine  "automount:      files ldap"
+            AppendIfNoSuchLine  "automount:      files sss"
         }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/debian-lan.git