X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fvirtualdomains.erb;h=4ad06748dfcbb77348ea21814b661b3d6143148b;hb=755d7470838a052d1042e46e5f9cd3ae1009bdd6;hp=1e493446223db4d18beb8661598ec069aee49cb5;hpb=51a9f1d23e0903ba97bea0978b9eb2340f8f3d8d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 1e4934462..4ad06748d 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -37,8 +37,6 @@ 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 "klecker.debian.org" then "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
@@ -46,23 +44,21 @@ 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 "merkel.debian.org" then "nm.debian.org: user=nm group=nm directory=/org/nm.debian.org/mail/"
 
         when "morricone.debian.org" then "backports.debian.org: user=dak group=backports directory=/srv/backports-master.debian.org/mail/"
 
-        when "nono.debian.org" then "nm.debian.org: user=nm group=nm directory=/org/nm.debian.org/mail/"
+        when "nono.debian.org" then "nm.debian.org: user=nm group=nm directory=/srv/nm.debian.org/mail/"
 
         when "powell.debian.org" then "packages.debian.org: user=pkg_user group=Debian directory=/org/packages.debian.org/mail/"
 
-        when "quantz.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/"
+        when "quantz.debian.org" then "qa.debian.org: user=qa group=qa directory=/srv/qa.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
-admin.debian.org: user=mail_admin group=mail_admin directory=/org/admin.debian.org/mail/"
+	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"