X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fexim%2Ftemplates%2Fvirtualdomains.erb;h=004078801540fecb70e0f7e1cd5c1bf31685141d;hb=8ca7b04893c2f5b2980f39a68d949a49c0644362;hp=f25975088355b40b2afefc333b0ad3d7e3f3cec6;hpb=92457b979065ae6bd02ddde3f001db2cb7f74b43;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index f25975088..004078801 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -37,8 +37,9 @@ 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 "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 "klecker.debian.org" then "www-master.debian.org: user=debwww group=debwww directory=/org/www.debian.org/mail/"
+
+        when "wolkenstein.debian.org" then "www-master.debian.org: user=debwww group=debwww directory=/srv/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
@@ -51,15 +52,15 @@ debian.net: user=nobody group=Debian directory=/org/star.debian.star/"
 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 "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 "morricone.debian.org" then "backports.debian.org: user=dak group=backports directory=/srv/backports-master.debian.org/mail/"
 
         when "powell.debian.org" then "packages.debian.org: user=pkg_user group=Debian directory=/org/packages.debian.org/mail/"
 
         when "ravel.debian.org" then "women.debian.org: user=nobody group=mujeres directory=/org/women.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 "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/"