From 53d4eeef534be151a7194e0a43b75879e205a01f Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Thu, 12 Dec 2013 09:16:32 +0100 Subject: [PATCH] Move admin.d.o setup to template --- modules/exim/templates/virtualdomains.erb | 1 + modules/roles/manifests/mailrelay.pp | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb index b8bce8c4..1d7ab770 100644 --- 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 5ef8f960..57e2f446 100644 --- 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' - } } -- 2.39.2