X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-vhost.conf.erb;h=9b76aef63b40ade0fa4d8fa4d4a3b6629ab068fc;hb=cb3ab1bb31e1112f69df7db9cdd454aa5d194a32;hp=584b5bcc199047326a9d1b41374b5b394b36ad40;hpb=6c647a0d2c8dc3f9e5c4e70863aae8e3011038ea;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 584b5bcc1..9b76aef63 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -8,8 +8,7 @@
 
 	DocumentRoot /srv/static.debian.org/mirrors/$name/cur
 	<Directory /srv/static.debian.org/mirrors/$name/cur>
-		AllowOverride FileInfo
-		Options Multiviews Indexes FollowSymLinks
+		AllowOverride FileInfo Indexes Options=Multiviews
 		IndexOptions FancyIndexing NameWidth=*
 		Order allow,deny
 		Allow from all
@@ -53,4 +52,29 @@
 </Macro>
 
 
+<Macro common-static-vhost-ssl $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>
+
+	<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
+
+		Use common-debian-service-ssl $name
+		Use common-ssl-HSTS
+
+		Use common-static-base $name
+	</VirtualHost>
+</Macro>
+
 # vim:ft=apache: