[debian-edu-commits] debian-edu/ 01/01: Properly remove cfengine2 related files upon upgrades.

[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 1be47e41bae6f9133e82c00eb7726b4720df10ef
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Wed Jan 10 14:39:02 2018 +0100

    Properly remove cfengine2 related files upon upgrades.
    
      Drop conffile remove statements from debian/debian-edu-config.maintscript
      (wildcards don't make sense).
      Add removal code to debian/debian-edu-config.postinst.
    
    Use apache2-maintscript-helper for apache2 mod debian-edu-userdir in
    debian/debian-edu-config.postinst, avoiding two lintian warnings.
    
    Adjust debian/debian-edu-config.lintian-overrides.
---
 debian/changelog                           | 10 ++++++++++
 debian/debian-edu-config.lintian-overrides |  2 +-
 debian/debian-edu-config.maintscript       |  3 ---
 debian/debian-edu-config.postinst          | 22 ++++++++++++++++++++--
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dcded97..63154ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,21 @@
 debian-edu-config (1.945) UNRELEASED; urgency=medium
 
+  [ Mike Gabriel ]
   * etc/gosa/gosa.conf: Properly single-quote '%dn' in password hook scripts.
     This fixes failing password syncs / locks / unlocks if user DNs have
     blanks in the DN string. (Closes: #886749).
   * etc/gosa/gosa.conf: Support pwreset plugin and schoolmanager plugin by
     default.
 
+  [ Wolfgang Schweer ]
+  * Properly remove cfengine2 related files upon upgrades.
+    - Drop conffile remove statements from debian/debian-edu-config.maintscript
+      (wildcards don't make sense).
+    - Add removal code to debian/debian-edu-config.postinst.
+  * Use apache2-maintscript-helper for apache2 mod debian-edu-userdir in
+    debian/debian-edu-config.postinst, avoiding two lintian warnings.
+  * Adjust debian/debian-edu-config.lintian-overrides.
+
  -- Mike Gabriel <sunweaver at debian.org>  Tue, 09 Jan 2018 15:19:15 +0100
 
 debian-edu-config (1.944) unstable; urgency=medium
diff --git a/debian/debian-edu-config.lintian-overrides b/debian/debian-edu-config.lintian-overrides
index 82af5d3..204c9c7 100644
--- a/debian/debian-edu-config.lintian-overrides
+++ b/debian/debian-edu-config.lintian-overrides
@@ -3,7 +3,7 @@ debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/f
 debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/hostname
 debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/wpad-proxy-update
 debian-edu-config binary: command-with-path-in-maintainer-script postinst:51 /usr/bin/etckeeper
-debian-edu-config binary: command-with-path-in-maintainer-script postinst:272 /usr/bin/etckeeper
+debian-edu-config binary: command-with-path-in-maintainer-script postinst:287 /usr/bin/etckeeper
 debian-edu-config binary: non-standard-apache2-configuration-name debian-edu-config-doc.conf != debian-edu-config.conf
 debian-edu-config binary: debconf-is-not-a-registry usr/bin/ldap-debian-edu-install
 debian-edu-config binary: debconf-is-not-a-registry usr/share/debian-edu-config/d-i/finish-install
diff --git a/debian/debian-edu-config.maintscript b/debian/debian-edu-config.maintscript
index 35565e9..76e4753 100644
--- a/debian/debian-edu-config.maintscript
+++ b/debian/debian-edu-config.maintscript
@@ -13,6 +13,3 @@ rm_conffile /etc/apt/apt.conf.d/99-edu-prefer-iceweasel 1.818+deb8u1
 rm_conffile /etc/init.d/iceweasel-ldapconf 1.818+deb8u1
 rm_conffile /etc/cfengine/debian-edu/cf.iceweasel 1.818+deb8u1
 rm_conffile /usr/share/debian-edu-config/iceweacel-networked-prefs.js 1.818+deb8u1
-rm_conffile /etc/cfengine/debian-edu/cf.* 1.943
-rm_conffile /etc/cfengine/inputs/*.conf 1.943
-rm_conffile /etc/cfengine/*.conf 1.943
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index b8abb3c..7ba594b 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -162,6 +162,22 @@ configure)
 	rm /usr/share/ltsp/init-ltsp.d/70-edu-client-core
     fi
 
+    # cleanup from cfengine2
+    if dpkg --compare-versions "$2" le "1.944" ; then
+        if [ -d /etc/cfengine/debian-edu ] ; then
+	    rm /etc/cfengine/debian-edu -rf
+        fi
+        if [ -d /etc/cfengine/inputs ] ; then
+	    rm /etc/cfengine/inputs -rf
+        fi
+        if [ -f /etc/cfengine/cfservd.conf ] ; then
+	    rm /etc/cfengine/cfservd.conf
+        fi
+        if [ -f /etc/cfengine/update.conf ] ; then
+	    rm /etc/cfengine/update.conf
+        fi
+    fi
+
     if dpkg --compare-versions "$2" le "1.929" && dpkg --compare-versions "$2" ge "1.926" && \
         egrep -q "(Main-Server)" /etc/debian-edu/config ; then
 	rm /etc/apache2/mods-available/userdir.load
@@ -170,8 +186,10 @@ configure)
 	if ! [ -L /etc/apache2/mods-available/debian-edu-userdir.load ] ; then
 	    ln -s /etc/apache2/mods-available/userdir.load /etc/apache2/mods-available/debian-edu-userdir.load
 	fi
-	a2enmod debian-edu-userdir
-        invoke-rc.d apache2 restart
+        if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+             . /usr/share/apache2/apache2-maintscript-helper
+             apache2_invoke enmod debian-edu-userdir
+        fi
     fi
 
     # sssd refuses to read the file if it has any other mode

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