From: Julien Cristau <jcristau@debian.org>
Date: Sat, 7 Apr 2018 08:45:59 +0000 (+0200)
Subject: Add video.debconf.org redirect on static (RT#7186)
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=798432833682d45b877dc7b48ebcbc08cecb91fd;p=mirror%2Fdsa-puppet.git

Add video.debconf.org redirect on static (RT#7186)
---

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index ebccd14fe..d9463666d 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -146,6 +146,7 @@ class roles::static_mirror {
 	ssl::service { 'es.debconf.org'                : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'fr.debconf.org'                : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'miniconf10.debconf.org'        : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'video.debconf.org'             : ensure => "present",  notify  => Exec['service apache2 reload'], key => true, }
 
 	if has_role('static_mirror_onion') {
 		if ! $onion_v4_addr {
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 74656a293..13c6626e4 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -307,6 +307,15 @@ Use common-dsa-vhost-https-redirect lists.alioth.debian.org
 	Redirect / https://alioth-lists.debian.net/
 </VirtualHost>
 
+Use common-dsa-vhost-https-redirect video.debconf.org
+<VirtualHost <%= @vhost_listen_443 %> >
+	ServerName video.debconf.org
+	ServerAdmin debian-admin@debian.org
+	Use common-debian-service-ssl video.debconf.org
+	Use common-ssl-HSTS
+	Redirect / https://debconf-video-team.pages.debian.net/docs/
+</VirtualHost>
+
 # historical sites
 ##################
 # now only redirects remain