Move admin.d.o setup to template

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index b8bce8c43d009b72af6cef4db80e73b14c56bdbf..1d7ab770cb49efe1afcee5c0a8c98ad8fb0a5759 100644 (file)
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -51,4 +51,5 @@ 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
 <% end -%>

diff --git a/modules/roles/manifests/mailrelay.pp b/modules/roles/manifests/mailrelay.pp
index 5ef8f9608dfe952cccf245fc6a8dd5e98efbfb08..57e2f4461f69183848406dba069db05310a6045a 100644 (file)
--- a/modules/roles/manifests/mailrelay.pp
+++ b/modules/roles/manifests/mailrelay.pp
@@ -1,7 +1,2 @@
 class roles::mailrelay {
-       exim::vdomain { 'admin.debian.org':
-               user       => mail_admin,
-               group      => mail_admin,
-               alias_file => 'puppet:///modules/exim/admin.debian.org/aliases'
-       }
 }