X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fvirtualdomains.erb;h=d7cfb08b409f8ff2c99da39b351667f95d25f3b7;hb=6e15bf83682748c31c4d369b960d88078bd474f0;hp=ebcbee7f53b4fabfff1f422ddcda26d54994c567;hpb=a619effaa1054b6c4456b30d0b95c5f6316181ee;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index ebcbee7f5..d7cfb08b4 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -19,44 +19,50 @@
 <%=
 vdoms = case fqdn
 
-        when "gluck.debian.org" then "ddtp.debian.org: user=grisu group=Debian directory=/org/ddtp.debian.org/mail
-admin.debian.org: user=mail_admin group=mail_admin directory=/org/admin.debian.org/mail/
-popcon.debian.org: user=popcon group=popcon directory=/org/popcon.debian.org/mail/
+        when "bellini.debian.org" then "popcon.debian.org: user=popcon group=popcon directory=/org/popcon.debian.org/mail/"
 
-debian.com: user=nobody group=Debian directory=/org/misc/star.debian.org/
-debian.net: user=nobody group=Debian directory=/org/misc/star.debian.org/"
+        when "busoni.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 "grieg.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 "draghi.debian.org" then "db.debian.org: user=mail_db group=nogroup directory=/srv/db.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 "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 "kaufmann.debian.org" then "keyring.debian.org: user=keyring group=Debian directory=/srv/keyring.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
 packages.qa.debian.org: user=qa group=qa directory=/org/packages.qa.debian.org/mail
-bugs.qa.debian.org: user=cjwatson group=qa directory=/org/bugs.qa.debian.org/mail"
+bugs.qa.debian.org: user=cjwatson group=qa directory=/org/bugs.qa.debian.org/mail
+debian.org: user=debian group=Debian directory=/org/debian.org/mail
+debian.com: user=nobody group=Debian directory=/org/star.debian.star/
+debian.net: user=nobody group=Debian directory=/org/star.debian.star/"
 
         when "merkel.debian.org" then "qa.debian.org: user=qa group=qa directory=/org/qa.debian.org/mail/
 bugs.qa.debian.org: user=nobody group=nogroup directory=/org/bugs.qa.debian.org/mail/
 nm.debian.org: user=nm group=nm directory=/org/nm.debian.org/mail/"
 
-        when "powell.debian.org" then "packages.debian.org: user=nobody group=Debian directory=/org/packages.debian.org/mail/"
-
-        when "raff.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 "ries.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.debian.org/mail group_writable=true"
+        when "morricone.debian.org" then "backports.debian.org: user=dak group=backports directory=/srv/backports-master.debian.org/mail/"
 
-        when "rietz.debian.org" then "bugs.debian.org: user=debbugs group=debbugs directory=/srv/bugs.debian.org/mail"
+        when "powell.debian.org" then "packages.debian.org: user=pkg_user group=Debian directory=/org/packages.debian.org/mail/"
 
-        when "samosa.debian.org" then "db.debian.org: user=mail_db group=nogroup directory=/org/db.debian.org/mail"
+        when "ravel.debian.org" then "women.debian.org: user=nobody group=mujeres directory=/org/women.debian.org/mail"
 
-        when "spohr.debian.org" then "rt.debian.org: user=rt group=rt directory=/srv/rt.debian.org/mail"
+        when "spohr.debian.org" then "rt.debian.org: user=rt group=rt directory=/srv/rt.debian.org/mail
+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 "widor.debian.org" then "wiki.debian.org: user=wiki group=wikiadm directory=/org/wiki.debian.org/mail"
+        when "valente.debian.org" then "volatile.debian.org: user=volatile group=volatile directory=/srv/volatile-master.debian.org/mail"
 end
 vdoms
 %>