X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fexim%2Ftemplates%2Fvirtualdomains.erb;h=b2f02c4b981a8371ba256372a9c380c5d7c7a627;hb=360fc0400695d6798f2009b069d50734bace069e;hp=6dcce901c69d311f0c3c2ace41fc531e83b2463f;hpb=98a0aa027db8cdada21f6896ae0c08ba8e1530aa;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 6dcce901c..b2f02c4b9 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -7,34 +7,37 @@ vdoms = case @fqdn
 
         when "wuiet.debian.org" then "buildd.debian.org: user=wbadm group=wbadm directory=/srv/buildd.debian.org/mail"
 
-        when "handel.debian.org" then "puppet.debian.org: user=sgran group=Debian directory=/srv/puppet.debian.org/mail"
-
         when "nono.debian.org" then "nm.debian.org: user=nm group=nm directory=/srv/nm.debian.org/mail/"
 
 	when "picconi.debian.org" then "packages.debian.org: user=pkg_user group=Debian directory=/srv/packages.debian.org/mail/"
 
-        when "popov.debian.org" then "popcon.debian.org: user=popcon group=popcon directory=/srv/popcon.debian.org/mail/"
+        when "pinel.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"
 
 	when "reger.debian.org" then "rt.debian.org: user=rt group=rt directory=/srv/rt.debian.org/mail"
 
-        when "tye.debian.org" then "i18n.debian.org: user=debian-i18n group=debian-i18n directory=/srv/i18n.debian.org/mail"
+	when "ticharich.debian.org" then "tracker.debian.org: user=qa group=qa directory=/srv/tracker.debian.org/mail"
 
-	when "vento.debian.org" then "vote.debian.org: user=secretary group=debvote directory=/srv/vote.debian.org/mail/"
+        when "tye.debian.org" then "i18n.debian.org: user=debian-i18n group=debian-i18n directory=/srv/i18n.debian.org/mail"
 
         when "wolkenstein.debian.org" then "www-master.debian.org: user=debwww group=debwww directory=/srv/www.debian.org/mail/"
 end
 vdoms
 %>
-<% if classes.include?("roles::mailrelay") -%>
+<% if @is_mailrelay -%>
 debian.org: user=nobody group=Debian directory=/etc/exim4/email-virtualdomains/debian.org
 admin.debian.org: user=mail_admin group=mail_admin directory=/etc/exim4/email-virtualdomains/admin.debian.org
 ftp-master.debian.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/ftp-master.debian.org
 security.debian.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/security.debian.org
 women.debian.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/women.debian.org
 release.debian.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/release.debian.org
+ports-master.debian.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/ports-master.debian.org
+
+debian-ports.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian-ports.org
+
+debconf.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debconf.org
 
 debian.com: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian.star
 debian.net: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian.star
@@ -42,4 +45,6 @@ debian.gr: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/d
 debian.us: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian.star
 debian.es: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian.star
 debian.eu: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian.star
+debian.nl: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian.star
+debian.org.tw: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian.star
 <% end -%>