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=c3c52f70e82c8ebe6d9521638e51cb53ece8159a;hp=58cfb1d88444703844d9e6373954eac05565284e;hpb=bf16c9dd36884ae478a783b14bc51b2fe26fcb08;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 58cfb1d88..cc9ff05b0 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -11,6 +11,18 @@
 	</VirtualHost>
 </Macro>
 
+<Macro common-dsa-vhost-https-redirect-temp $name>
+	<VirtualHost <%= vhost_listen %> >
+		ServerName $name
+		ServerAdmin debian-admin@lists.debian.org
+
+		CustomLog /var/log/apache2/$name-access.log privacy
+		ErrorLog /var/log/apache2/$name-error.log
+
+		Redirect / https://$name/
+	</VirtualHost>
+</Macro>
+
 <Macro common-static-base $name>
 	<IfModule mod_userdir.c>
 		UserDir disabled
@@ -20,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>