[debian-edu-commits] debian-edu/ 01/01: etc/apache2/*: Adjust conf files to use new directives.

[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 8b6e8d9daa1217b4d71b358ed4ad32ce729c60d0
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sat Oct 11 17:25:40 2014 +0200

    etc/apache2/*: Adjust conf files to use new directives.
---
 debian/changelog                                       |  1 +
 etc/apache2/conf-available/debian-edu-config-doc.conf  |  6 +-----
 etc/apache2/sites-available/debian-edu-default.conf    | 18 +++++-------------
 .../sites-available/debian-edu-ssl-default.conf        | 12 ++++--------
 4 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d24e0bb..f9ef675 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ debian-edu-config (1.810) UNRELEASED; urgency=high
   * ltsp-build-client/Debian-custom/032-edu-pkgs:
     - Purge package modemmanager after checking that this has no side
       effects.
+  * etc/apache2/*: Adjust conf files to use new directives.
 
   [ Petter Reinholdtsen ]
   * Enable the auto flag in the PXE installation, to allow more settings
diff --git a/etc/apache2/conf-available/debian-edu-config-doc.conf b/etc/apache2/conf-available/debian-edu-config-doc.conf
index 451f7f6..ecd81bc 100644
--- a/etc/apache2/conf-available/debian-edu-config-doc.conf
+++ b/etc/apache2/conf-available/debian-edu-config-doc.conf
@@ -8,9 +8,5 @@ Alias /debian-edu-doc /usr/share/doc/debian-edu-doc/
 <Directory /usr/share/doc/debian-edu-doc/>
     AllowOverride None
     Options Indexes FollowSymLinks MultiViews 
-
-    # everyone have access to the docs
-    Order deny,allow
-    Deny from none
-    Allow from all
+    Require all granted
 </Directory>
diff --git a/etc/apache2/sites-available/debian-edu-default.conf b/etc/apache2/sites-available/debian-edu-default.conf
index 598a889..855f838 100644
--- a/etc/apache2/sites-available/debian-edu-default.conf
+++ b/etc/apache2/sites-available/debian-edu-default.conf
@@ -3,16 +3,11 @@
 	ServerAdmin webmaster at postoffice.intern
 
 	DocumentRoot /etc/debian-edu/www/
-	<Directory />
-		Options FollowSymLinks
-		AllowOverride None
-		Require all granted
-	</Directory>
+
 	<Directory /etc/debian-edu/www/ >
 		Options Indexes FollowSymLinks MultiViews
 		AllowOverride None
-		Order allow,deny
-		allow from all
+		Require all granted
 	</Directory>
         # Workaround for Spanish pages, making sure they get text/html
         # and not application/ecmascript as their mime type
@@ -30,8 +25,7 @@
 	<Directory "/usr/lib/cgi-bin">
 		AllowOverride None
 		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-		Order allow,deny
-		Allow from all
+		Require all granted
 	</Directory>
 
 	ErrorLog /var/log/apache2/error.log
@@ -47,8 +41,7 @@
     <Directory "/usr/share/doc/">
         Options Indexes MultiViews FollowSymLinks
         AllowOverride None
-        Order deny,allow
-        Deny from all
+	Require all denied
         Allow from 127.0.0.0/255.0.0.0 ::1/128
     </Directory>
 
@@ -58,7 +51,6 @@
     <Directory /var/cache/munin/www/ >
 	Options Indexes FollowSymLinks MultiViews
 	AllowOverride None
-	Order allow,deny
-	allow from all
+	Require all granted
     </Directory>
 </VirtualHost>
diff --git a/etc/apache2/sites-available/debian-edu-ssl-default.conf b/etc/apache2/sites-available/debian-edu-ssl-default.conf
index d8c9930..cfcd0a8 100644
--- a/etc/apache2/sites-available/debian-edu-ssl-default.conf
+++ b/etc/apache2/sites-available/debian-edu-ssl-default.conf
@@ -15,8 +15,7 @@
 	<Directory /etc/debian-edu/www/ >
 		Options Indexes FollowSymLinks MultiViews
 		AllowOverride None
-		Order allow,deny
-		allow from all
+		Require all granted
 	</Directory>
 	#Workaround for spanish pages
         <Files *.html.es>
@@ -27,8 +26,7 @@
 	<Directory "/usr/lib/cgi-bin">
 		AllowOverride None
 		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-		Order allow,deny
-		Allow from all
+		Require all granted
 	</Directory>
 
 	ErrorLog /var/log/apache2/error.log
@@ -44,8 +42,7 @@
     <Directory "/usr/share/doc/">
         Options Indexes MultiViews FollowSymLinks
         AllowOverride None
-        Order deny,allow
-        Deny from all
+	Require all denied
         Allow from 127.0.0.0/255.0.0.0 ::1/128
     </Directory>
 
@@ -55,8 +52,7 @@
 	<Directory /etc/debian-edu/www/ >
 		Options Indexes FollowSymLinks MultiViews
 		AllowOverride None
-		Order allow,deny
-		allow from all
+		Require all granted
 	</Directory>
 
 </VirtualHost>

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