From: Peter Palfrader Date: Thu, 19 Dec 2013 09:19:08 +0000 (+0100) Subject: Add debian.gr to dns and mail and web X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=c4e401c9464862b4987da1f2fd0e7d5d870cda0b Add debian.gr to dns and mail and web --- diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb index 1d7ab770..3292c7f9 100644 --- a/modules/exim/templates/virtualdomains.erb +++ b/modules/exim/templates/virtualdomains.erb @@ -23,6 +23,7 @@ ftp-master.debian.org: user=dak group=debadmin directory=/srv/ftp-master.debian. when "master.debian.org" then "debian.org: user=debian group=Debian directory=/srv/debian.org/mail 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.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 3be09de5..c3b6fedf 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.gr" zones << "debian.us" zones << "debian.ch" diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb index 1578c894..96e71a13 100644 --- a/modules/roles/templates/apache-www.debian.org.erb +++ b/modules/roles/templates/apache-www.debian.org.erb @@ -89,7 +89,7 @@ > 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 debian.us www.debian.us + 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 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