From: Julien Cristau <jcristau@debian.org>
Date: Tue, 5 Mar 2019 19:33:24 +0000 (+0100)
Subject: Take over debconf.org with a redirect to www
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=70ae0a0c23d6d88d6c08e35485a33796e8b948e3;p=mirror%2Fdsa-puppet.git

Take over debconf.org with a redirect to www
---

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 bac115a27..8163323a4 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -406,6 +406,15 @@ Use common-dsa-vhost-https-redirect video.debconf.org
 </VirtualHost>
 <% end -%>
 
+Use common-dsa-vhost-https-redirect debconf.org
+<VirtualHost <%= @vhost_listen_443 %> >
+	ServerName debconf.org
+	ServerAdmin debian-admin@debian.org
+	Use common-debian-service-ssl debconf.org
+	Use common-ssl-HSTS
+	Redirect / https://www.debconf.org/
+</VirtualHost>
+
 # historical sites
 ##################
 # now only redirects remain