From: Julien Cristau <jcristau@debian.org>
Date: Fri, 10 Nov 2017 13:00:51 +0000 (+0100)
Subject: Fix http://www.debian.org
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c9526f3b75201d0d5bbd4b21076731942f7168a8;p=mirror%2Fdsa-puppet.git

Fix http://www.debian.org

Thanks, paravoid
---

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