X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fvirtualdomains.erb;h=98086ff027696462378353a3a68910b88322f3ff;hb=e739bbe61de54a0b1fc01ba09f7802c9332c58fd;hp=a769b55369fc2d336a475579e1521cf27798fb39;hpb=1a07cbfa1cc6872b66aea9b68867af79f34f887e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index a769b5536..98086ff02 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -7,8 +7,6 @@ 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/"
@@ -30,7 +28,7 @@ packages.qa.debian.org: user=qa group=qa directory=/srv/packages.qa.debian.org/m
 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
@@ -39,13 +37,16 @@ women.debian.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdo
 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
 debian.gr: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian.star
 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.fi: 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 -%>