Add debian.gr to dns and mail and web

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 1d7ab770cb49efe1afcee5c0a8c98ad8fb0a5759..3292c7f98bafcbf6da121d6bab90161b6e2c70f7 100644 (file)
--- 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 3be09de5b1314dfc20452486932f10108f18f08a..c3b6fedfb9314d5aae9b95ff66a63f07de3defae 100644 (file)
--- 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 1578c8948cae03c937c76eeff9eee92b3551571b..96e71a138dd2c8cfb948e21f00578ceef7434c17 100644 (file)
--- 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 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