Commit 04e1d97f authored by Wolfgang Schweer's avatar Wolfgang Schweer
Browse files

Fix cleanup code in debian/debian-edu-config.postrm (Closes: #904516). 

Move cfengine3 related cleanup code from remove to purge case.
Thanks to Andreas Beckmann.
parent fee19313

debian/changelog

+8 −0
Original line number Diff line number Diff line 
debian-edu-config (2.10.32) UNRELEASED; urgency=medium



  * debian/debian-edu-config.postrm:

    - Move cfengine3 related cleanup code from remove to purge case.

      Thanks to Andreas Beckmann. (Closes: #904516).



 -- Wolfgang Schweer <wschweer@arcor.de>  Wed, 25 Jul 2018 10:28:23 +0200



debian-edu-config (2.10.31) unstable; urgency=medium



  [ Wolfgang Schweer ]

debian/debian-edu-config.postrm

+10 −10
Original line number Diff line number Diff line
@@ -18,16 +18,6 @@ case "$1" in 
	    dpkg-divert --package debian-edu-config --rename --remove /usr/bin/gtick

	    rm /usr/bin/gtick.ltsp

	fi



        # 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/

	fi

	if [ -e /var/lib/cfengine3/policy_server.dat ] ; then

	    rm /var/lib/cfengine3/policy_server.dat

	fi

	;;

    purge)

	# Generated in the postinst
@@ -41,6 +31,16 @@ case "$1" in 
	    rm /var/log/cfengine3/*.log

	fi



        # 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/

	fi

	if [ -e /var/lib/cfengine3/policy_server.dat ] ; then

	    rm /var/lib/cfengine3/policy_server.dat

	fi



        # Don't leave copied ldapscripts files behind

	if [ -e /etc/ldapscripts/debian-edu.addmachine.template ] ; then

	    rm /etc/ldapscripts/debian-edu.*