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=1d38f07a195a8d69a7f2fd1892ccf4b3ac080449;hp=ea0d2acb1b2a817e745c9e6b9b6c9505201b2d60;hpb=927f9ca9bed8928ea91ba1a599857c483ae4994e;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 ea0d2acb1..6b857fc60 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -1,35 +1,86 @@
 # puppet maintained
+<Macro common-dsa-vhost-https-redirect $name>
+	<VirtualHost <%= vhost_listen %> >
+		ServerName $name
+		ServerAdmin debian-admin@lists.debian.org
 
-<Macro common-static-vhost $name>
-<Macro common-$name>
+		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>
 		UserDir disabled
 	</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>
 
-<Virtualhost <%= vhost_listen %> >
-	ServerName $name
-	ServerAdmin debian-admin@lists.debian.org
 
+<Macro common-static-vhost-with-extra $name $extra>
+	<Virtualhost <%= vhost_listen %> >
+		ServerName $name
+		ServerAdmin debian-admin@lists.debian.org
+
+		ErrorLog /var/log/apache2/$name-error.log
+		CustomLog /var/log/apache2/$name-access.log privacy
+
+		Use common-static-base $name
+		$extra
+	</VirtualHost>
+</Macro>
+
+<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 combined
+		ErrorLog /var/log/apache2/$name-error.log
+		CustomLog /var/log/apache2/$name-access.log privacyssl
 
-	Use common-$name
-</VirtualHost>
+		Use common-debian-service-ssl $name
+		Use common-ssl-HSTS
 
+		Use common-static-base $name
+	</VirtualHost>
 </Macro>
 
 # vim:ft=apache: