[debian-edu-commits] debian-edu/ 01/02: Update setup-roaming, adjust nsswitch.conf file generated to be closer to the one installed by Debian by default. Use compat instead of files for passwd, group and shadow, add gshadow and switch sssd for the sudoers database. Drop unused append_if_missing() function.

[Petter Reinholdtsen]

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

pere pushed a commit to branch master
in repository debian-edu-config.

commit eca9f9eee60e1fc179a4d4a7c2d79530893c84a4
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu Sep 11 14:06:32 2014 +0200

    Update setup-roaming, adjust nsswitch.conf file generated to be closer to the one installed by Debian by default.  Use compat instead of files for passwd, group and shadow, add gshadow and switch sssd for the sudoers database.  Drop unused append_if_missing() function.
---
 debian/changelog                            |  5 +++++
 share/debian-edu-config/tools/setup-roaming | 20 +++++---------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b9ca445..edf183f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,11 @@ debian-edu-config (1.727) UNRELEASED; urgency=low
   * Add cfengine rule to enable apache module cgi and configuration
     sitesummary.conf on the server.  Workaround for bug #760084.
   * Improve the text of the email sent by the test suite.
+  * Update setup-roaming, adjust nsswitch.conf file generated to be
+    closer to the one installed by Debian by default.  Use compat
+    instead of files for passwd, group and shadow, add gshadow and
+    switch sssd for the sudoers database.  Drop unused
+    append_if_missing() function.
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 10 Sep 2014 21:54:52 +0200
 
diff --git a/share/debian-edu-config/tools/setup-roaming b/share/debian-edu-config/tools/setup-roaming
index c880c16..aede237 100755
--- a/share/debian-edu-config/tools/setup-roaming
+++ b/share/debian-edu-config/tools/setup-roaming
@@ -6,16 +6,6 @@ set -e
 
 bindir=$(dirname $0)
 
-append_if_missing() {
-    file="$1"
-    string="$2"
-    if [ -e "$file" ] ; then
-        if ! grep -qxF "$string" "$file" ; then
-            echo "$string" >> $file
-        fi
-    fi
-}
-
 DEBIAN_FRONTEND=noninteractive
 export DEBIAN_FRONTEND
 
@@ -64,7 +54,6 @@ else
     rm /etc/krb5.conf.new
 fi
 
-# FIXME See if we can drop libnss-ldapd now that sssd support sudoers. (compatible LDAP schema?)
 # FIXME See if we can drop libnss-ldapd even if sssd do not support networks
 # This code is still needed even thought sssd since version 1.2-2
 # update nsswitch.conf during installation, because we want to disable
@@ -76,9 +65,10 @@ cat > /etc/nsswitch.conf <<'EOF'
 # If you have the `glibc-doc-reference' and `info' packages installed, try:
 # `info libc "Name Service Switch"' for information about this file.
 
-passwd:         files sss
-group:          files sss
-shadow:         files sss
+passwd:         compat sss
+group:          compat sss
+shadow:         compat sss
+gshadow:        files
 
 hosts:          files myhostname mdns4_minimal [NOTFOUND=return] dns mdns4
 networks:       files ldap
@@ -89,5 +79,5 @@ ethers:         db files
 rpc:            db files
 
 netgroup:       files sss
-sudoers:        files ldap
+sudoers:        files sss
 EOF

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git