X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-vhost.conf.erb;h=6b857fc60a474bc2cacccd4d3f276c843bc1cd7d;hb=6b24dc4c7ddf589e6610f78c35f0fea4a488c100;hp=4b8640cee89bfab416d4796191c27e00db9c0a36;hpb=4433aee9a7832e8e64c93de3b9f5370519ebc221;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 4b8640cee..6b857fc60 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>
@@ -6,20 +29,26 @@
 	</IfModule>
 	ServerSignature On
 
-	DocumentRoot /srv/static.debian.org/cur/$name/
-	<Directory /srv/static.debian.org/cur/$name/>
-		AllowOverride FileInfo
-		Options Multiviews Indexes FollowSymLinks
+	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 %>
+
 	AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
 </Macro>
 
 
-<Macro common-static-vhost $name>
+<Macro common-static-vhost-with-extra $name $extra>
 	<Virtualhost <%= vhost_listen %> >
 		ServerName $name
 		ServerAdmin debian-admin@lists.debian.org
@@ -28,23 +57,30 @@
 		CustomLog /var/log/apache2/$name-access.log privacy
 
 		Use common-static-base $name
+		$extra
 	</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>
 
-
 # vim:ft=apache: