Add TLS for video.debian.net and the redirects within it

[mirror/dsa-puppet.git] / modules / roles / templates / static-mirroring / vhost / static-vhosts-simple.erb

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 1f7990a..21af9b1 100644 (file)
--- 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