X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-vhost.conf.erb;h=cc9ff05b0f2a8c84b8e1ce306d824265845574bc;hb=d4fb891a1a7d58fdeff2687e91f5e6faf822a96c;hp=1b1137d48daed8f43a609ad66f7f0d62d01caaf7;hpb=5e6d9dff0b2445ea867131e13d7a793cd8649e48;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index 1b1137d48..cc9ff05b0 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -32,11 +32,18 @@
 	DocumentRoot /srv/static.debian.org/mirrors/$name/cur
 	<Directory /srv/static.debian.org/mirrors/$name/cur>
 		AllowOverride FileInfo Indexes Options=Multiviews
+		Options Indexes SymLinksIfOwnerMatch
 		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 %>
+
 	DefaultType text/plain
 	AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
 </Macro>