X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fvirtualdomains.erb;h=90156d27303359d6d634461135e4f87508c5974f;hb=4c5c4151615376e493908971c838fd4ed397b99a;hp=dd682704d93fc7b031e5ea64f8b560e1db9ac4ff;hpb=6f2bd91e1a279132212835a17d9b0406cd34afa2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index dd682704d..90156d273 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -17,11 +17,12 @@
 #    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/"
 
         when "busoni.debian.org" then "bugs.debian.org: user=debbugs group=debbugs directory=/srv/bugs.debian.org/mail"
+        when "buxtehude.debian.org" then "bugs.debian.org: user=debbugs group=debbugs directory=/srv/bugs.debian.org/mail"
 
         when "chopin.debian.org" then "security.debian.org: user=mail_security group=nogroup directory=/srv/security-master.debian.org/mail/"
 
@@ -45,14 +46,14 @@ ftp-master.debian.org: user=dak group=debadmin directory=/srv/ftp-master.debian.
 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/"
+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 "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=/org/popcon.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/"
 
@@ -67,9 +68,10 @@ packages.qa.debian.org: user=qa group=qa directory=/srv/packages.qa.debian.org/m
 
         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