X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fvirtualdomains.erb;h=752c9fe5ac6dd539fe36e47ebda429321de0feda;hb=76bd84e8cb84a445026004bf75a37fb81906be92;hp=bb1ad7166d907bb5e82eececa15bfdeedfe53ec4;hpb=bc72a2a447dccde97416aa55b984935face12e7f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index bb1ad7166..752c9fe5a 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -18,11 +18,12 @@
 
 <%=
 vdoms = case fqdn
+	
+	when "bellini.debian.org" then "popcon.debian.org: user=popcon group=popcon directory=/org/popcon.debian.org/mail/"
+        
+	when "draghi.debian.org" then "db.debian.org: user=mail_db group=nogroup directory=/srv/db.debian.org/mail"
 
-        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 "gluck.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/"
 
@@ -50,9 +51,8 @@ ftp-master.debian.org: user=dak group=debadmin directory=/srv/ftp.debian.org/mai
 
         when "rietz.debian.org" then "bugs.debian.org: user=debbugs group=debbugs directory=/srv/bugs.debian.org/mail"
 
-        when "draghi.debian.org" then "db.debian.org: user=mail_db group=nogroup directory=/org/db.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"