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=5be6dadd7b8d59f5159b453f409acb1f156746fa;hp=d9b636706d3c782c3d4f0f9482763549da209ae9;hpb=f5006b286bd853a4224347c39898b09ce990904f;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 d9b636706..9b76aef63 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -53,9 +53,17 @@
 
 
 <Macro common-static-vhost-ssl $name>
-	Use common-debian-service-https-redirect <%= vhost_listen %> $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 >
+	<Virtualhost <%= vhost_listen_443 %> >
 		ServerName $name
 		ServerAdmin debian-admin@lists.debian.org