X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fvirtualdomains.erb;h=eb0301fb48c5fdbc7320690173c39c894b7fb48b;hb=6492ddd94a7ca8f8e63d63a046af694d6f4bd0e8;hp=253a8fcfdf641ff0044925b458e811a08224b57f;hpb=8d4a891042525b76ce6c1f05d590baf4d6d2ffdc;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 253a8fcfd..eb0301fb4 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -21,6 +21,10 @@ vdoms = case fqdn
 
         when "bellini.debian.org" then "popcon.debian.org: user=popcon group=popcon directory=/org/popcon.debian.org/mail/"
 
+        when "byrd.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 "cimarosa.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"
 
@@ -28,8 +32,7 @@ vdoms = case fqdn
 
         when "handel.debian.org" then "puppet.debian.org: user=sgran group=Debian directory=/srv/puppet.debian.org/mail"
 
-        when "klecker.debian.org" then "security.debian.org: user=mail_security group=nogroup directory=/org/security.debian.org/mail/
-non-us.debian.org: user=katie group=debadmin directory=/org/non-us.debian.org/mail/
+        when "klecker.debian.org" then "non-us.debian.org: user=katie group=debadmin directory=/org/non-us.debian.org/mail/
 www-master.debian.org: user=debwww group=debwww directory=/org/www.debian.org/mail/"
 
         when "master.debian.org" then "vote.debian.org: user=secretary group=debvote directory=/org/vote.debian.org/mail