From e573761fb20de1721ac4ec8d5e7e96d3293d7b6f Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 28 Dec 2013 14:32:26 +0100 Subject: [PATCH] Re-order debian.org ServerAliases --- .../roles/templates/apache-www.debian.org.erb | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb index 96e71a13..92566cff 100644 --- a/modules/roles/templates/apache-www.debian.org.erb +++ b/modules/roles/templates/apache-www.debian.org.erb @@ -87,9 +87,30 @@ > - ServerName www.nl.debian.org + ServerName 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 debian.us www.debian.us debian.gr www.debian.gr + + ServerAlias www.*.debian.org + + ServerAlias www.debian.net + ServerAlias debian.net + + ServerAlias www.debian.eu + ServerAlias debian.eu + + ServerAlias www.debian.com + ServerAlias debian.com + + ServerAlias debian.us + ServerAlias www.debian.us + + ServerAlias debian.gr + ServerAlias www.debian.gr + + ServerAlias www.debian.at + ServerAlias www.debian.de + ServerAlias newwww.deb.at + 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 -- 2.39.2