From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 28 Oct 2017 08:45:39 +0000 (+0200)
Subject: redirect www.d.o to https
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=0b0985303005faaaf35449348575f119c62117cc;p=mirror%2Fdsa-puppet.git

redirect www.d.o to https
---

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index a26b91e7f..20652770a 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -265,7 +265,8 @@
    ErrorLog /var/log/apache2/www.debian.org-error.log
    CustomLog /var/log/apache2/www.debian.org-access.log privacy
 
-   Use common-www.d.o
+   #Use common-www.d.o
+   Redirect / https://www.debian.org/
 </VirtualHost>
 <VirtualHost <%= @vhost_listen_443 %> >
    ErrorLog /var/log/apache2/www.debian.org-error.log