[debian-edu-commits] debian-edu/pkg-team/ 05/10: debian/gosa.postrm: Handle apache2 config symlink removal on package purgal properly. (Closes: #744151).

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository gosa.

commit a225df7da0d94b5d64206f0d46a63ab276affa3e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun May 18 14:49:17 2014 +0200

    debian/gosa.postrm: Handle apache2 config symlink removal on package purgal properly. (Closes: #744151).
---
 debian/gosa.postrm | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/debian/gosa.postrm b/debian/gosa.postrm
index f7569ef..2661c12 100755
--- a/debian/gosa.postrm
+++ b/debian/gosa.postrm
@@ -21,10 +21,12 @@ case "$1" in
 		find /usr/share/gosa -depth -type d -empty -exec rmdir "{}" \;
 	;;
 
-	remove)
+	remove|purge)
 		if [ -d /etc/apache2/conf.d ]; then
 			# Remove GOsa include
-			[ -L /etc/apache2/conf.d/gosa.conf ] && rm -f /etc/apache2/conf.d/gosa.conf
+			if [ -L /etc/apache2/conf.d/gosa.conf ]; then
+				rm -f /etc/apache2/conf.d/gosa.conf
+			fi
 
 			# Restart servers
 			if [ -x /usr/sbin/apache2 ]; then
@@ -36,9 +38,33 @@ case "$1" in
 			fi
 		fi
 
+		if [ -d /etc/apache2/conf-available ] ; then
+			if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+				. /usr/share/apache2/apache2-maintscript-helper
+				apache2_invoke disconf gosa
+			elif [ -L /etc/apache2/conf-enabled/gosa.conf ]; then
+				rm -f /etc/apache2/conf-enabled/gosa.conf
+			fi
+
+			if [ -L /etc/apache2/conf-available/gosa.conf ]; then
+				rm -f /etc/apache2/conf-available/gosa.conf
+			fi
+
+			# Finally restart servers
+			if [ -x /usr/sbin/apache2 ]; then
+				if [ -x /usr/sbin/invoke-rc.d ]; then
+					invoke-rc.d apache2 reload
+				else
+					/etc/init.d/apache2 reload
+				fi
+			fi
+		fi
+
 		if [ -d /etc/lighttpd/conf-available ]; then
 			# Remove GOsa include
-			[ -L /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf ] && rm -f /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf
+			if [ -L /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf ]; then
+				rm -f /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf
+			fi
 
 			# Restart servers
 			if [ -x /usr/sbin/lighttpd ]; then

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