From: Peter Palfrader Date: Sat, 28 Dec 2013 13:32:50 +0000 (+0100) Subject: Add debian.es X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=187cf42a3e36d825dd5fa16df5e0e88fbe63e7ab Add debian.es --- diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb index 60e041c3..dc735829 100644 --- a/modules/exim/templates/virtualdomains.erb +++ b/modules/exim/templates/virtualdomains.erb @@ -25,6 +25,7 @@ debian.com: user=nobody group=Debian directory=/srv/star.debian.star/ debian.net: user=nobody group=Debian directory=/srv/star.debian.star/ debian.gr: user=nobody group=Debian directory=/srv/star.debian.star/ debian.us: user=nobody group=Debian directory=/srv/star.debian.star/ +debian.es: user=nobody group=Debian directory=/srv/star.debian.star/ debian.eu: user=nobody group=Debian directory=/srv/star.debian.star/" when "nono.debian.org" then "nm.debian.org: user=nm group=nm directory=/srv/nm.debian.org/mail/" diff --git a/modules/named/templates/named.conf.debian-zones.erb b/modules/named/templates/named.conf.debian-zones.erb index c3b6fedf..f3136f2c 100644 --- a/modules/named/templates/named.conf.debian-zones.erb +++ b/modules/named/templates/named.conf.debian-zones.erb @@ -13,6 +13,7 @@ zones << "debian.net" zones << "mirror.debian.net" zones << "debian.com" zones << "debian.eu" +zones << "debian.es" zones << "debian.gr" zones << "debian.us" diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb index 92566cff..7775d968 100644 --- a/modules/roles/templates/apache-www.debian.org.erb +++ b/modules/roles/templates/apache-www.debian.org.erb @@ -107,6 +107,9 @@ ServerAlias debian.gr ServerAlias www.debian.gr + ServerAlias www.debian.es + ServerAlias debian.es + ServerAlias www.debian.at ServerAlias www.debian.de ServerAlias newwww.deb.at