Have the vote role declare its exim virtualdomain

[mirror/dsa-puppet.git] / modules / exim / templates / virtualdomains.erb

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 06b68d7..b2f02c4 100644 (file)
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -22,13 +22,11 @@ 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"
 
-       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
 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
@@ -47,7 +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.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 -%>