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=2e79bcbdd96deea22fa5d76654bd282d44a79ab2;hpb=898ea78774b44c2023e8ea91869b3af23a82c416;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 2e79bcbdd..cc9ff05b0 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -1,4 +1,27 @@
 # puppet maintained
+<Macro common-dsa-vhost-https-redirect $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 permanent / https://$name/
+	</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>
@@ -9,15 +32,20 @@
 	DocumentRoot /srv/static.debian.org/mirrors/$name/cur
 	<Directory /srv/static.debian.org/mirrors/$name/cur>
 		AllowOverride FileInfo Indexes Options=Multiviews
-		Options Multiviews Indexes FollowSymLinks Includes
+		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
-	AddOutputFilter INCLUDES .xhtml
 </Macro>
 
 
@@ -34,24 +62,26 @@
 	</VirtualHost>
 </Macro>
 
-<Macro common-static-vhost-publiclog $name>
-	<Virtualhost <%= vhost_listen %> >
+<Macro common-static-vhost $name>
+	Use common-static-vhost-with-extra $name "# nada"
+</Macro>
+
+
+<Macro common-static-vhost-ssl $name>
+	Use common-dsa-vhost-https-redirect $name
+
+	<Virtualhost <%= vhost_listen_443 %> >
 		ServerName $name
 		ServerAdmin debian-admin@lists.debian.org
 
 		ErrorLog /var/log/apache2/$name-error.log
-		CustomLog /var/log/apache2/$name-access.log privacy
-		<IfModule mod_geoip.c>
-			CustomLog /var/log/apache2/$name-public-access.log privacy+geo
-		</IfModule>
+		CustomLog /var/log/apache2/$name-access.log privacyssl
+
+		Use common-debian-service-ssl $name
+		Use common-ssl-HSTS
 
 		Use common-static-base $name
 	</VirtualHost>
 </Macro>
 
-<Macro common-static-vhost $name>
-	Use common-static-vhost-with-extra $name "# nada"
-</Macro>
-
-
 # vim:ft=apache: