X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=21af9b111b0152d102029ab144fc2dce4c4cb5fa;hb=a7d6a1e81e9e43b0b87698e9309ab3ec66c5bccc;hp=1f7990a7221a77a2e54dc3b816219a471d5a1ecf;hpb=140e86b64590b93b769c2ae8b4355c3a6e55d728;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
index 1f7990a72..21af9b111 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -281,10 +281,20 @@ lines.join("\n")
 	RedirectPermanent / http://ftp.ports.debian.org/
 </VirtualHost>
 
-<VirtualHost <%= @vhost_listen %> >
+<Macro vstatic-vhost-video.debian.net>
 	ServerName video.debian.net
 	ServerAdmin debian-admin@debian.org
-	Redirect / http://meetings-archive.debian.net/pub/debian-meetings/
+	Redirect / https://meetings-archive.debian.net/pub/debian-meetings/
+</Macro>
+
+<VirtualHost <%= @vhost_listen %> >
+	Use vstatic-vhost-video.debian.net
+</VirtualHost>
+
+<VirtualHost <%= @vhost_listen_443 %> >
+	Use vstatic-vhost-video.debian.net
+	Use common-debian-service-ssl video.debian.net
+	Use common-ssl-HSTS
 </VirtualHost>
 
 # historical sites