[debian-edu-commits] debian-edu/ 01/01: Adjust apache d-e configuration files to make apache2 work.

[Wolfgang Schweer]

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

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit e603ebffa910056da24660364c3e6e993116d158
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Tue Aug 26 16:24:32 2014 +0200

    Adjust apache d-e configuration files to make apache2 work.
---
 debian/changelog                                        | 7 +++++++
 etc/apache2/sites-available/debian-edu-default.conf     | 3 ++-
 etc/apache2/sites-available/debian-edu-ssl-default.conf | 3 +--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 15af8d1..fb6e0d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,13 @@ debian-edu-config (1.722) UNRELEASED; urgency=low
     the jessie default (AD DC) just for testing:
     - adjust /etc/samba/smb.conf.
     - adjust /usr/bin/ldap-debian-edu-install.
+  * Adjust configuration files to make apache2 work.
+    - /etc/apache2/sites-available/debian-edu-default.conf:
+      + add 'Require all granted' to allow access to /etc/debian-edu/www/.
+      + treat all options the same way (leading +/-).
+    - /etc/apache2/sites-available/debian-edu-ssl-default.conf:
+      + remove deprecated 'NameVirtualHost' statement.
+      + treat all options the same way (leading +/-).
 
   [ Petter Reinholdtsen ]
   * Mention possible cause of the failing webcache test in the error
diff --git a/etc/apache2/sites-available/debian-edu-default.conf b/etc/apache2/sites-available/debian-edu-default.conf
index e6f4780..598a889 100644
--- a/etc/apache2/sites-available/debian-edu-default.conf
+++ b/etc/apache2/sites-available/debian-edu-default.conf
@@ -6,6 +6,7 @@
 	<Directory />
 		Options FollowSymLinks
 		AllowOverride None
+		Require all granted
 	</Directory>
 	<Directory /etc/debian-edu/www/ >
 		Options Indexes FollowSymLinks MultiViews
@@ -28,7 +29,7 @@
 	ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
 	<Directory "/usr/lib/cgi-bin">
 		AllowOverride None
-		Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
+		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
 		Order allow,deny
 		Allow from all
 	</Directory>
diff --git a/etc/apache2/sites-available/debian-edu-ssl-default.conf b/etc/apache2/sites-available/debian-edu-ssl-default.conf
index 34bd527..d8c9930 100644
--- a/etc/apache2/sites-available/debian-edu-ssl-default.conf
+++ b/etc/apache2/sites-available/debian-edu-ssl-default.conf
@@ -1,4 +1,3 @@
-NameVirtualHost *:443
 <VirtualHost *:443>
 
 	SSLEngine on
@@ -27,7 +26,7 @@ NameVirtualHost *:443
 	ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
 	<Directory "/usr/lib/cgi-bin">
 		AllowOverride None
-		Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
+		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
 		Order allow,deny
 		Allow from all
 	</Directory>

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