Sanitize mailrelay virtualdomain paths

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

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 3aace480f64d7186af7757061e7ffbbbde25b7a0..5f5c8432c80bbdd0d022e9d056019b39f7c9a9f3 100644 (file)
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -50,7 +50,7 @@ end
 vdoms
 %>
 <% if classes.include?("roles::mailrelay") -%>
-debian.org: user=nobody group=Debian directory=/etc/exim4/email-virtualdomains/debian.org/mail
-admin.debian.org: user=mail_admin group=mail_admin directory=/etc/exim4/email-virtualdomains/admin.debian.org/mail
-ftp-master.debian.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/ftp-master.debian.org/mail
+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
 <% end -%>