master does not handle @d.o mail any longer

[dsa-puppet.git] / modules / exim / templates / virtualdomains.erb

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index b8bce8c43d009b72af6cef4db80e73b14c56bdbf..b93a93221eff4d0a7cf2729fa694c17f7e1f90e7 100644 (file)
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -12,7 +12,6 @@ ftp-master.debian.org: user=dak group=debadmin directory=/srv/ftp-master.debian.
 
         when "gombert.debian.org" then "gobby.debian.org: user=gobby group=gobby directory=/srv/gobby.debian.org/mail"
 
-        when "grieg.debian.org" then "buildd.debian.org: user=wbadm group=wbadm directory=/srv/buildd.debian.org/mail"
         when "wuiet.debian.org" then "buildd.debian.org: user=wbadm group=wbadm directory=/srv/buildd.debian.org/mail"
 #logs.buildd.debian.org: user=wbadm group=wbadm directory=/srv/logs.buildd.debian.org/mail"
 
@@ -20,9 +19,11 @@ ftp-master.debian.org: user=dak group=debadmin directory=/srv/ftp-master.debian.
 
         when "kaufmann.debian.org" then "keyring.debian.org: user=keyring group=Debian directory=/srv/keyring.debian.org/mail"
 
-        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/
+        when "master.debian.org" then "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/"
@@ -51,4 +52,5 @@ vdoms
 %>
 <% if classes.include?("roles::mailrelay") -%>
 debian.org: user=nobody group=Debian directory=/etc/exim4/email-virtualdomains/debian.org/mail
+admin.debian.org: user=mail_admin group=mail_admin directory=/etc/exim4/email-virtualdomains/admin.debian.org/mail
 <% end -%>