X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Froundcube-core.postrm;h=6659a77323de7f8f232ee8043f09ff70fbfdd33f;hb=9d358bb749203c1c4cb278a01e51f79754aa643a;hp=9159d97567af6b530494149a3babf4defebf9637;hpb=58041fc77c3079bfab9002c5f59cd72cb584baed;p=roundcube.git

diff --git a/debian/roundcube-core.postrm b/debian/roundcube-core.postrm
index 9159d97..6659a77 100644
--- a/debian/roundcube-core.postrm
+++ b/debian/roundcube-core.postrm
@@ -13,6 +13,29 @@ if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
         dbc_go roundcube $@
 fi
 
+lighttpd_remove() {
+	if [ -f /etc/lighttpd/conf-available/50-roundcube.conf ] ; then
+		rm -f /etc/lighttpd/conf-available/50-roundcube.conf
+		if [ ! -x /usr/sbin/lighty-disable-mod ] ; then
+			echo "Lighttpd not installed, skipping"
+		else
+			lighty-disable-mod roundcube
+		fi
+		# See bug #448682
+		if [ -h /etc/lighttpd/conf-enabled/50-roundcube.conf ] ; then
+		    echo 'Manually deleting lighttpd/roundcube configuration link'
+		    rm /etc/lighttpd/conf-enabled/50-roundcube.conf
+		fi
+	fi
+}
+
+apache_remove() {
+	if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/roundcube ]; then
+		rm -f /etc/$webserver/conf.d/roundcube
+	fi
+}
+
+
 case "$1" in
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
     ;;
@@ -28,14 +51,20 @@ case "$1" in
             webserver=${webserver%,}
         
             case "$webserver" in
-                apache|apache-perl|apache-ssl|apache2)
-                    rm -f /etc/$webserver/conf.d/roundcube
-                    test -x /usr/sbin/$webserver || continue
-                    restart="$restart $webserver"
-                    ;;
+                apache*)
+		    apache_remove $webserver
+		    ;;
+		lighttpd)
+		    lighttpd_remove
+		    ;;
                 *)
+		    echo "Unknown webserver $webserver"
                     ;;
             esac
+
+            test -x /usr/sbin/$webserver || continue
+            restart="$restart $webserver"
+
         done
         
         db_get roundcube/restart-webserver
@@ -44,10 +73,12 @@ case "$1" in
         if [ "$res" = "true" ]; then
             for webserver in $restart; do
                 webserver=${webserver%,}
+                # Redirection of 3 is needed because Debconf uses it and it might
+                # be inherited by webserver. See bug #446324.
                 if [ -x /usr/sbin/invoke-rc.d ]; then
-                    invoke-rc.d $webserver restart
+                    invoke-rc.d $webserver reload 3>/dev/null || true
                 else
-                    /etc/init.d/$webserver restart
+                    /etc/init.d/$webserver reload 3>/dev/null || true
                 fi
             done
         fi