[debian-edu-commits] debian-edu/upstream/ 01/02: Implement workaround for the failing installation when apache and sitesummary is installed at the same time, and apache is unpacked but not yet configured when the sitesummary postinst is running (bug #760084).

[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 4ca7369316edcfc3f3694ba949a2579d93cf63ca
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Tue Sep 2 15:23:58 2014 +0200

    Implement workaround for the failing installation when apache and sitesummary is installed at the same time, and apache is unpacked but not yet configured when the sitesummary postinst is running (bug #760084).
---
 debian/sitesummary.postinst | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/sitesummary.postinst b/debian/sitesummary.postinst
index c1dfaec..e489564 100644
--- a/debian/sitesummary.postinst
+++ b/debian/sitesummary.postinst
@@ -41,13 +41,16 @@ EOF
 
 case "$1" in
     configure)
-	# Enable it on fresh installations as before Apache 2.4.
-	if [ -z "$2" ] && \
-	    [ -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
+        # 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 \

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