From: Martin Zobel-Helas <zobel@debian.org>
Date: Fri, 6 Sep 2013 20:36:15 +0000 (+0200)
Subject: let our apaches answer to {www,}.debian.us requests
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=678de195cb79b1a2297553fc17cbe042823e9044;p=dsa-puppet.git

let our apaches answer to {www,}.debian.us requests

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
---

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index db88d9c0..1578c894 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -89,7 +89,7 @@
 <VirtualHost <%= vhost_listen %> >
    ServerName www.nl.debian.org
    ServerAdmin webmaster@debian.org
-   ServerAlias www.debian.com www.debian.de www.*.debian.org newwww.deb.at www.debian.net debian.net debian.org www.debian.at www.debian.eu debian.eu debian.com
+   ServerAlias www.debian.com www.debian.de www.*.debian.org newwww.deb.at www.debian.net debian.net debian.org www.debian.at www.debian.eu debian.eu debian.com debian.us www.debian.us
    DocumentRoot <%= wwwdo_document_root %>/
    ErrorLog /var/log/apache2/www-other.debian.org-error.log
    CustomLog /var/log/apache2/www-other.debian.org-access.log privacy