X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fvirtualdomains.erb;h=82c20a62e5dcc7d6b8060c6db9a78ff325e07310;hb=adce2ab022b6b71cc3b592a4eb3e65f6a92bcd02;hp=d969960dd96315b9d169d3905de42bd767e4acca;hpb=3561e0cdfcd7bb773c6431f56409002f632ad083;p=dsa-puppet.git

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index d969960d..82c20a62 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -17,7 +17,7 @@
 #    Finally the email will bounce.
 
 <%=
-vdoms = case fqdn
+vdoms = case scope.lookupvar('::fqdn')
 
         when "bellini.debian.org" then "popcon.debian.org: user=popcon group=popcon directory=/org/popcon.debian.org/mail/"
 
@@ -32,6 +32,8 @@ vdoms = case fqdn
         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 "gombert.debian.org" then "gobby.debian.org: user=gobby group=gobby directory=/srv/gobby.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"
 
@@ -40,21 +42,22 @@ 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 "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
 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 "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 "bizet.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=/srv/nm.debian.org/mail/"
 
+        when "popov.debian.org" then "popcon.debian.org: user=popcon group=popcon directory=/srv/popcon.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=/srv/qa.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"
 
         when "ravel.debian.org" then "women.debian.org: user=nobody group=mujeres directory=/org/women.debian.org/mail"
 
@@ -64,9 +67,10 @@ debian.net: user=nobody group=Debian directory=/org/star.debian.star/"
 
         when "tartini.debian.org" then "forums.debian.net: user=forums group=forums directory=/srv/forums.debian.net/mail"
 
-        when "tye.debian.org" then "i18n.debian.org: user=debian-i18n group=debian-i18n directory=/srv/i18n.debian.org/mail"
+        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 "valente.debian.org" then "volatile.debian.org: user=volatile group=volatile directory=/srv/volatile-master.debian.org/mail"
+	when "vento.debian.org" then "vote.debian.org: user=secretary group=debvote directory=/org/vote.debian.org/mail/"
 
         when "wolkenstein.debian.org" then "www-master.debian.org: user=debwww group=debwww directory=/srv/www.debian.org/mail/"
 end