[debian-edu-commits] debian-edu/upstream/ 01/01: Fix d/sitesummary.postinst:

[Wolfgang Schweer]

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

schweer-guest pushed a commit to branch master
in repository sitesummary.

commit db43d62a4189d64bf27490232b9809e07a158c73
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sat Nov 19 12:57:47 2016 +0100

    Fix d/sitesummary.postinst:
    
    - Drop apache2 restart call as it doesn't seem to work inside chroots.
    - Use maintscript-helper to enable the cgi(d) module and sitesummary
      configuration instead of calling a2enmod and a2enconf directly.
---
 debian/changelog            |  9 +++++++++
 debian/sitesummary.postinst | 13 +++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0ea799e..f713d9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sitesummary (0.1.24) UNRELEASED; urgency=medium
+
+  * Fix d/sitesummary.postinst:
+    - Drop apache2 restart call as it doesn't seem to work inside chroots.
+    - Use maintscript-helper to enable the cgi(d) module and sitesummary
+      configuration instead of calling a2enmod and a2enconf directly.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Sat, 19 Nov 2016 12:43:05 +0100
+
 sitesummary (0.1.23) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
diff --git a/debian/sitesummary.postinst b/debian/sitesummary.postinst
index 257da8b..83eff31 100644
--- a/debian/sitesummary.postinst
+++ b/debian/sitesummary.postinst
@@ -89,14 +89,11 @@ case "$1" in
 
   triggered)
 
-	if [ -x /usr/sbin/a2enmod ] ; then
-		a2enmod -m -q cgid
-		a2enmod -m -q cgi
-	fi
-	if [ -x /usr/sbin/a2enconf ] ; then
-		a2enconf sitesummary
-		service apache2 restart
-	fi
+        if [ -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
 
         ;;
 

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