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

from Tiago Bortoletto Vaz. Closes: #508633.

diff --git a/debian/changelog b/debian/changelog
index 5a69d33c96de0c64f6aaf876aa8f6d365f7073af..45ce4b95b87b2f9764a535ede45b71200b708fa7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ roundcube (0.2~alpha-4) UNRELEASED; urgency=low
   * Add missing ${misc:Depends} to make Lintian happy.
   * Add description to each patch.
   * Execute cron job only if the directory to clean exists.
+  * Reload web server configuration instead of restart, thanks to a patch
+    from Tiago Bortoletto Vaz. Closes: #508633.
 
- -- Vincent Bernat <bernat@debian.org>  Sun, 14 Dec 2008 10:37:47 +0100
+ -- Vincent Bernat <bernat@debian.org>  Mon, 15 Dec 2008 19:54:22 +0100
 
 roundcube (0.2~alpha-3) experimental; urgency=high
 

diff --git a/debian/roundcube-core.postinst b/debian/roundcube-core.postinst
index 80a085aaaa2c5065473e49250dd3e95636ce4558..5e7e0e223a9f7a71b1c76dd7387eb67fe79a61cf 100644 (file)
--- a/debian/roundcube-core.postinst
+++ b/debian/roundcube-core.postinst
@@ -151,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

diff --git a/debian/roundcube-core.postrm b/debian/roundcube-core.postrm
index 1e0467b93225dea7fa3a8e01facf61ff2a28a2c4..6659a77323de7f8f232ee8043f09ff70fbfdd33f 100644 (file)
--- a/debian/roundcube-core.postrm
+++ b/debian/roundcube-core.postrm
@@ -73,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