[debian-edu-commits] debian-edu/ 01/01: debian/debian-edu-config.postrm: Also remove a generated cfengine3 config file.

[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 d546bf780e37e2d1d5492fbd078805d206a041f2
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Fri Jan 19 16:58:01 2018 +0100

    debian/debian-edu-config.postrm: Also remove a generated cfengine3 config file.
    
     Thanks to Holger Levsen. (Closes: #887726).
    
    Amend wording in two previous changelog entries.
---
 debian/changelog                | 12 ++++++++++--
 debian/debian-edu-config.postrm |  4 +++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 640227b..1bce664 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debian-edu-config (1.947) UNRELEASED; urgency=medium
+
+  * debian/debian-edu-config.postrm: Also remove a generated cfengine3 config
+    file. Thanks to Holger Levsen. (Closes: #887726).
+  * Amend wording in two previous changelog entries.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Fri, 19 Jan 2018 16:42:59 +0100
+
 debian-edu-config (1.946) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
@@ -9,7 +17,7 @@ debian-edu-config (1.946) unstable; urgency=medium
       Use class 'di' to avoid running LDAP setup upon upgrades.
     - cf3/cf.squid:
       Use class 'squidcache' to run 'dpkg-reconfigure' only if needed.
-    - Add cfengine3 setup code to debian-edu-config.postinstall.
+    - Add cfengine3 setup code to debian-edu-config.postinst.
   * Adjust debian/debian-edu-config.lintian-overrides.
 
   [ Holger Levsen ]
@@ -73,7 +81,7 @@ debian-edu-config (1.943) unstable; urgency=medium
   [ Wolfgang Schweer ]
   * Adjust LTSP related configuration and scripts to work with ltsp 5.5.10:
     - Replace /var/cache/ltsp with /run/ltsp in share/ltsp/get-ldap-ltsp-config
-      and because lts.conf is now generated in /run/ltsp.
+      because lts.conf is now generated in /run/ltsp.
     - Calling 'hostname -f' in share/ltsp/get-ldap-ltsp-config doesn't work at
       the time the script runs; use 'update-hostname-from-ip' instead to
       generate the hostname.
diff --git a/debian/debian-edu-config.postrm b/debian/debian-edu-config.postrm
index 3e0da2b..097d85c 100644
--- a/debian/debian-edu-config.postrm
+++ b/debian/debian-edu-config.postrm
@@ -28,10 +28,12 @@ case "$1" in
 	    rm -f /var/lib/dovecot/auth_success
 	fi
 
-        # Cfengine3 setup files copied at installation time
+        # Cfengine3 setup files copied / generated at installation time
+        # via '/usr/share/debian-edu-config/tools/setup-cfengine3'
 	if [ -e /var/lib/cfengine3/inputs/debian-edu ] ; then
 	    rm -rf /var/lib/cfengine3/inputs/debian-edu
 	    rm -rf /var/lib/cfengine3/inputs/
+	    rm /var/lib/cfengine3/policy_server.dat
 	fi
 
         # Don't leave Cfengine3 log files behind

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