From bdd5ae38eadcba5cb2621a49c44977e73f159c2a Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Mon, 1 Jun 2015 20:46:41 +0200
Subject: jenkins.d.n jessie upgrade: use 'Require all granted' as needed for
 apache 2.4 - thanks deki

---
 etc/apache2/sites-available/jenkins.debian.net | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'etc/apache2')

diff --git a/etc/apache2/sites-available/jenkins.debian.net b/etc/apache2/sites-available/jenkins.debian.net
index cc42db85..91c93fe1 100644
--- a/etc/apache2/sites-available/jenkins.debian.net
+++ b/etc/apache2/sites-available/jenkins.debian.net
@@ -8,8 +8,7 @@ NameVirtualHost *:443
 		CustomLog /var/log/apache2/access.log combined
 		ErrorLog /var/log/apache2/error.log
 		<Proxy *>
-			Order deny,allow
-			Allow from all
+			Require all granted
 		</Proxy>
 		ProxyPreserveHost on
 		AllowEncodedSlashes NoDecode
@@ -47,15 +46,13 @@ NameVirtualHost *:443
 	<Directory /var/www/>
 		Options Indexes FollowSymLinks MultiViews
 		AllowOverride None
-		Order allow,deny
-		allow from all
+		Require all granted
 		AddType text/plain .log
 	</Directory>
 	<Directory /var/lib/jenkins/userContent>
 		Options Indexes FollowSymLinks MultiViews
 		AllowOverride None
-		Order allow,deny
-		allow from all
+		Require all granted
 		AddType text/plain .log
 	</Directory>
 
@@ -136,8 +133,7 @@ Use common-debian-service-https-redirect reproducible.debian.net
 	RewriteRule ^/?(.*) https://reproducible.debian.net/$1 [R=301,L]
 
 	<Proxy *>
-		Order deny,allow
-		Allow from all
+		Require all granted
 	</Proxy>
 	ProxyPreserveHost on
 	AllowEncodedSlashes NoDecode
@@ -250,4 +246,8 @@ Use common-debian-service-https-redirect reproducible.debian.net
 	RewriteCond %{REQUEST_URI} ^/(testing|unstable|experimental)/$
 	RewriteRule ^/(.*) /$1index_suite_stats.html [R,L]
 
+	<Proxy *>
+		Require all granted
+	</Proxy>
+
 </VirtualHost>
-- 
cgit v1.2.3-70-g09d2