X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fvirtualdomains.erb;h=627db680a2b5a1588f4720fcfd1036f13c784d67;hb=a576c8137feaea3598c4f70ed7e01953027c386e;hp=21f845ead9345f86c55d23e38b817fa58b79551c;hpb=8f0a7b502fb2ff6f8f2ae82b34a043fc4908f94d;p=dsa-puppet.git

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 21f845ea..627db680 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -40,18 +40,16 @@ 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 "master.debian.org" then "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/
-debian.eu: user=nobody group=Debian directory=/org/star.debian.star/"
-
-        when "morricone.debian.org" then "backports.debian.org: user=dak group=backports directory=/srv/backports-master.debian.org/mail/"
+        when "master.debian.org" then "debian.org: user=debian group=Debian directory=/srv/debian.org/mail
+debian.com: user=nobody group=Debian directory=/srv/star.debian.star/
+debian.net: user=nobody group=Debian directory=/srv/star.debian.star/
+debian.eu: user=nobody group=Debian directory=/srv/star.debian.star/"
 
         when "nono.debian.org" then "nm.debian.org: user=nm group=nm directory=/srv/nm.debian.org/mail/"
 
-        when "popov.debian.org" then "popcon.debian.org: user=popcon group=popcon directory=/srv/popcon.debian.org/mail/"
+	when "picconi.debian.org" then "packages.debian.org: user=pkg_user group=Debian directory=/srv/packages.debian.org/mail/"
 
-        when "powell.debian.org" then "packages.debian.org: user=pkg_user group=Debian directory=/org/packages.debian.org/mail/"
+        when "popov.debian.org" then "popcon.debian.org: user=popcon group=popcon directory=/srv/popcon.debian.org/mail/"
 
         when "quantz.debian.org" then "qa.debian.org: user=qa group=qa directory=/srv/qa.debian.org/mail/
 packages.qa.debian.org: user=qa group=qa directory=/srv/packages.qa.debian.org/mail"
@@ -67,7 +65,7 @@ packages.qa.debian.org: user=qa group=qa directory=/srv/packages.qa.debian.org/m
         when "tye.debian.org" then "i18n.debian.org: user=debian-i18n group=debian-i18n directory=/srv/i18n.debian.org/mail
 l10n.debian.org: user=debian-i18n group=debian-i18n directory=/srv/l10n.debian.org/mail"
 
-	when "vento.debian.org" then "vote.debian.org: user=secretary group=debvote directory=/org/vote.debian.org/mail/"
+	when "vento.debian.org" then "vote.debian.org: user=secretary group=debvote directory=/srv/vote.debian.org/mail/"
 
         when "wolkenstein.debian.org" then "www-master.debian.org: user=debwww group=debwww directory=/srv/www.debian.org/mail/"
 end