From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 1 May 2015 06:53:31 +0000 (+0200)
Subject: Fix static hosts on jessie
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b164b7c6566980da38c4c26f22b083561eb95987;p=mirror%2Fdsa-puppet.git

Fix static hosts on jessie
---

diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index b2650744f..cfb35c0ba 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -33,8 +33,12 @@
 	<Directory /srv/static.debian.org/mirrors/$name/cur>
 		AllowOverride FileInfo Indexes Options=Multiviews
 		IndexOptions FancyIndexing NameWidth=*
-		Order allow,deny
-		Allow from all
+		<% if @lsbmajdistrelease > '7' -%>
+			Require all granted
+		<% else -%>
+			Order allow,deny
+			Allow from all
+		<% end -%>
 	</Directory>
 
 	Header set Surrogate-Key <%= hostname %>