[debian-edu-commits] debian-edu/ 01/01: Add script sbin/debian-edu-nscd-netgroup-cache (workaround for #791562).

[Wolfgang Schweer]

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

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

commit dc859c8a4f451d9a6e46732dd2a15991744c85a6
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Mon May 23 12:05:43 2016 +0200

    Add script sbin/debian-edu-nscd-netgroup-cache (workaround for #791562).
    
    (cherry picked from commit 929400c94765df8211048cd3528f4342ecab40dc)
    
    Conflicts:
    	debian/changelog
---
 Makefile                            |  1 +
 debian/changelog                    |  9 +++++++++
 sbin/debian-edu-nscd-netgroup-cache | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/Makefile b/Makefile
index bc835fd..e649818 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ SPROGS = cfengine-debian-edu \
 	debian-edu-hwsetup \
 	debian-edu-ltsp \
 	debian-edu-ltsp-audiodivert \
+	debian-edu-nscd-netgroup-cache \
 	debian-edu-pxeinstall \
 	debian-edu-restart-services \
 	debian-edu-test-install \
diff --git a/debian/changelog b/debian/changelog
index aa62e78..37529f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -164,7 +164,16 @@ debian-edu-config (1.819) unstable; urgency=medium
     as empty lists. Thus, all systems can be blocked from waking-up by placing
     an empty NIS netgroup s-a-n-wakeup-hosts into LDAP.
 
+<<<<<<< HEAD
  -- Petter Reinholdtsen <pere at debian.org>  Mon, 28 Mar 2016 18:26:23 +0000
+=======
+  [ Wolfgang Schweer ]
+  * Adjust tools/subnet-change for squid3. (Closes: #800654)
+  * Fix XML syntax error in gosa.conf. (Closes: #820551).
+  * Add script sbin/debian-edu-nscd-netgroup-cache (workaround for #791562).
+
+ -- Petter Reinholdtsen <pere at debian.org>  Sat, 16 May 2015 23:12:06 +0200
+>>>>>>> 929400c... Add script sbin/debian-edu-nscd-netgroup-cache (workaround for #791562).
 
 debian-edu-config (1.818) unstable; urgency=high
 
diff --git a/sbin/debian-edu-nscd-netgroup-cache b/sbin/debian-edu-nscd-netgroup-cache
new file mode 100755
index 0000000..f0987af
--- /dev/null
+++ b/sbin/debian-edu-nscd-netgroup-cache
@@ -0,0 +1,32 @@
+#!/bin/bash -e
+# debian-edu-nscd-netgroup-cache
+#
+# 2016-23-05, workaround for bug #791562
+
+if [ -z $1 ] ; then
+  echo "usage: $0 (disable|enable)"
+  exit 0
+fi
+
+# Get profile.
+. /etc/debian-edu/config
+
+# Disable/enable nscd netgroup caching.
+if echo "$PROFILE" | grep -q 'Main-Server' ; then
+    systemctl stop nscd.service
+    sleep 1
+    case "$1" in
+	disable)
+	    if [ -e /var/cache/nscd/netgroup ] ; then
+		rm /var/cache/nscd/netgroup
+	    fi
+	    sed -i '/netgroup/ s=yes=no=' /etc/nscd.conf
+	;;
+	enable)
+	    sed -i '/netgroup/ s=no=yes=' /etc/nscd.conf
+	;;
+    esac
+    systemctl start nscd.service
+fi
+
+# Further information:  https://wiki.debian.org/DebianEdu/Status/Jessie

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