From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 17 Feb 2014 06:49:21 +0000 (+0100)
Subject: Do not catch www.*. in the www vhost
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=dc1cd8cf2921db494b3b38350fe42aaf4c130628

Do not catch www.*. in the www vhost
---

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index aee7380b1..ff7ca6137 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -90,7 +90,24 @@
    ServerName debian.org
    ServerAdmin webmaster@debian.org
 
-   ServerAlias www.*.debian.org
+   ServerAlias www.at.debian.org
+   ServerAlias www.au.debian.org
+   ServerAlias www.bg.debian.org
+   ServerAlias www.br.debian.org
+   ServerAlias www.cn.debian.org
+   ServerAlias www.de.debian.org
+   ServerAlias www.es.debian.org
+   ServerAlias www.fr.debian.org
+   ServerAlias www.hk.debian.org
+   ServerAlias www.id.debian.org
+   ServerAlias www.jp.debian.org
+   ServerAlias www.nl.debian.org
+   ServerAlias www.pl.debian.org
+   ServerAlias www.ru.debian.org
+   ServerAlias www.ua.debian.org
+   ServerAlias www.uk.debian.org
+   ServerAlias www.us.debian.org
+   ServerAlias www.za.debian.org
 
    ServerAlias www.debian.net
    ServerAlias debian.net