X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fexim%2Ftemplates%2Fvirtualdomains.erb;h=b93a93221eff4d0a7cf2729fa694c17f7e1f90e7;hb=7125f653d50c51fcf7c2e4bfe8022ef453cd5b33;hp=7296d175e45896ce89f85f7869d6e842fa263c17;hpb=34017d07929662aa40a511cf9993cbf33a70ace7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 7296d175e..b93a93221 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -1,30 +1,29 @@
 <%=
 vdoms = case @fqdn
 
-        when "busoni.debian.org" then "bugs.debian.org: user=debbugs group=debbugs directory=/srv/bugs.debian.org/mail"
         when "buxtehude.debian.org" then "bugs.debian.org: user=debbugs group=debbugs directory=/srv/bugs.debian.org/mail"
 
         when "chopin.debian.org" then "security.debian.org: user=mail_security group=nogroup directory=/srv/security-master.debian.org/mail/"
 
         when "draghi.debian.org" then "db.debian.org: user=mail_db group=nogroup directory=/srv/db.debian.org/mail"
 
-        when "dukas.debian.org" then "ddtp.debian.org: user=ddtp group=ddtp directory=/srv/ddtp.debian.org/mail/"
-
         when "franck.debian.org" then "release.debian.org: user=release group=debian-release directory=/org/release.debian.org/mail
 ftp-master.debian.org: user=dak group=debadmin directory=/srv/ftp-master.debian.org/mail group_writable=true"
 
         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"
 
         when "handel.debian.org" then "puppet.debian.org: user=sgran group=Debian directory=/srv/puppet.debian.org/mail"
 
         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/"
@@ -40,8 +39,6 @@ packages.qa.debian.org: user=qa group=qa directory=/srv/packages.qa.debian.org/m
 
 	when "reger.debian.org" then "rt.debian.org: user=rt group=rt directory=/srv/rt.debian.org/mail"
 
-        when "spohr.debian.org" then "admin.debian.org: user=mail_admin group=mail_admin directory=/org/admin.debian.org/mail/"
-
         when "tartini.debian.org" then "forums.debian.net: user=forums group=forums directory=/srv/forums.debian.net/mail"
 
         when "tye.debian.org" then "i18n.debian.org: user=debian-i18n group=debian-i18n directory=/srv/i18n.debian.org/mail
@@ -53,3 +50,7 @@ l10n.debian.org: user=debian-i18n group=debian-i18n directory=/srv/l10n.debian.o
 end
 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 -%>