Reload web server configuration instead of restart, thanks to a patch

[roundcube.git] / debian / roundcube-core.postinst

diff --git a/debian/roundcube-core.postinst b/debian/roundcube-core.postinst
index 33d691264f9babc88cf8f1e86c472f189c36aa7f..5e7e0e223a9f7a71b1c76dd7387eb67fe79a61cf 100644 (file)
--- a/debian/roundcube-core.postinst
+++ b/debian/roundcube-core.postinst
@@ -17,6 +17,25 @@ dbc_dbname=roundcube
 
 dbc_go roundcube $@
 
+lighttpd_install() {
+       if [ ! -f /etc/lighttpd/conf-available/50-roundcube.conf ] ; then
+               if [ ! -x /usr/sbin/lighty-enable-mod ] ; then
+                       echo "Lighttpd not installed, skipping"
+               else
+                       ln -s /etc/roundcube/lighttpd.conf /etc/lighttpd/conf-available/50-roundcube.conf
+                       lighty-enable-mod roundcube
+               fi
+       fi
+}
+
+apache_install() {
+       webserver=$1
+       if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/roundcube ]; then
+               ln -s /etc/roundcube/apache.conf /etc/$webserver/conf.d/roundcube
+       fi
+}
+
+
 case "$1" in
     configure)
 
@@ -117,11 +136,12 @@ EOF
 
        for webserver in $webservers; do
             webserver=${webserver%,}
+           if [ "$webserver" = "lighttpd" ] ; then
+               lighttpd_install
+           else
+               apache_install $webserver
+           fi
             test -x /usr/sbin/$webserver || continue
-        
-            if [ ! -f /etc/$webserver/conf.d/roundcube ] && [ ! -h /etc/$webserver/conf.d/roundcube ]; then
-               ln -s /etc/roundcube/apache.conf /etc/$webserver/conf.d/roundcube
-            fi
             restart="$restart $webserver"
         done
 
@@ -131,10 +151,12 @@ EOF
        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