[debian-edu-commits] debian-edu/upstream/ 01/03: Adjust Apache configuration. Use 'Require all granted' instead of Order/Deny/Allow, and enable cgi.load module when installing the sitesummary server to get it working out of the box.

[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 c361ba3ec934982a7f25d7f7aa5157253cfd334c
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu Aug 21 22:01:33 2014 +0200

    Adjust Apache configuration.
    Use 'Require all granted' instead of Order/Deny/Allow, and
    enable cgi.load module when installing the sitesummary server
    to get it working out of the box.
---
 apache.conf                 | 4 +---
 debian/changelog            | 8 ++++++++
 debian/sitesummary.postinst | 1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/apache.conf b/apache.conf
index 4938b51..9d5859a 100644
--- a/apache.conf
+++ b/apache.conf
@@ -11,7 +11,5 @@ ScriptAlias /cgi-bin/sitesummary-collector.cgi /usr/lib/cgi-bin/sitesummary-coll
     Options +SymLinksIfOwnerMatch -MultiViews
 
     # everyone have access
-    Order deny,allow
-    Deny from none
-    Allow from all
+    Require all granted
 </Directory>
diff --git a/debian/changelog b/debian/changelog
index 456b964..752eed7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sitesummary (0.1.12) UNRELEASED; urgency=low
+
+  * Adjust Apache configuration, use 'Require all granted' instead of
+    Order/Deny/Allow, and enable cgi.load module when installing the
+    sitesummary server to get it working out of the box.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Thu, 21 Aug 2014 16:09:13 +0200
+
 sitesummary (0.1.11) unstable; urgency=medium
 
   * Migrate setup to Apache 2.4 (Closes: #669782).  Rename conffile
diff --git a/debian/sitesummary.postinst b/debian/sitesummary.postinst
index 4a2ed69..a108559 100644
--- a/debian/sitesummary.postinst
+++ b/debian/sitesummary.postinst
@@ -46,6 +46,7 @@ case "$1" in
 	    [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
 	    . /usr/share/apache2/apache2-maintscript-helper
 	    apache2_invoke enconf sitesummary.conf
+	    apache2_invoke enmod cgi.load
 	fi
 
         # Make sure the cgi script can write to the storage area

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