[debian-edu-commits] debian-edu/upstream/ 01/05: Call db_stop before apache restart

[Petter Reinholdtsen]

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

pere pushed a commit to branch master
in repository sitesummary.

commit 69e610aff23e3c047b2ea5b3bbd262a0303e769c
Author: Dominik George <nik at naturalnet.de>
Date:   Wed May 13 16:28:54 2015 +0200

    Call db_stop before apache restart
---
 debian/sitesummary.postinst | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/debian/sitesummary.postinst b/debian/sitesummary.postinst
index 031b9f4..910d81a 100644
--- a/debian/sitesummary.postinst
+++ b/debian/sitesummary.postinst
@@ -41,21 +41,6 @@ EOF
 
 case "$1" in
     configure)
-        # Enable it on fresh installations as before Apache 2.4.  Check for
-        # cgi.load existence to avoid trying to configure when installed after
-        # apache2 is unpacked but not yet configured (bug #760084).
-        if [ -z "$2" ] && \
-            [ -e /etc/apache2/mods-available/cgi.load ] && \
-            [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
-            . /usr/share/apache2/apache2-maintscript-helper
-            apache2_invoke enmod cgi.load
-            apache2_invoke enconf sitesummary.conf
-        fi
-
-        # Make sure the cgi script can write to the storage area
-	chown www-data /var/lib/sitesummary/tmpstorage \
-	    /var/lib/sitesummary/entries 
-
         # If the config file is missing, check debconf to see if the
         # munin configuration feature should be enabled.  This hidden
         # debconf question allow preseeding during installation.
@@ -82,6 +67,24 @@ case "$1" in
 		update-rc.d -f sitesummary-client remove >/dev/null 2>&1 || :
 	fi
 
+        # Close debconf file handles before restarting Apache
+        db_stop
+
+        # Enable it on fresh installations as before Apache 2.4.  Check for
+        # cgi.load existence to avoid trying to configure when installed after
+        # apache2 is unpacked but not yet configured (bug #760084).
+        if [ -z "$2" ] && \
+            [ -e /etc/apache2/mods-available/cgi.load ] && \
+            [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+            . /usr/share/apache2/apache2-maintscript-helper
+            apache2_invoke enmod cgi.load
+            apache2_invoke enconf sitesummary.conf
+        fi
+
+        # Make sure the cgi script can write to the storage area
+	chown www-data /var/lib/sitesummary/tmpstorage \
+	    /var/lib/sitesummary/entries 
+
 	;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/upstream/sitesummary.git