From ec1fa09c54aa7b7ec894577929e96ebe97a94508 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 22 Sep 2019 12:26:01 +0200 Subject: [PATCH] move the remaining virtualdomains to the mailrelay class --- modules/exim/manifests/init.pp | 6 ------ modules/exim/manifests/mailrelay.pp | 5 ++++- .../{virtualdomains.erb => virtualdomains-mailrelay.erb} | 2 -- 3 files changed, 4 insertions(+), 9 deletions(-) rename modules/exim/templates/{virtualdomains.erb => virtualdomains-mailrelay.erb} (97%) diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp index 45103629a..92fdc18ec 100644 --- a/modules/exim/manifests/init.pp +++ b/modules/exim/manifests/init.pp @@ -46,12 +46,6 @@ class exim ( Package['exim4-daemon-heavy']->Mailalias<| |> - concat::fragment { 'virtual_domain_template': - target => '/etc/exim4/virtualdomains', - content => template('exim/virtualdomains.erb'), - order => '05', - } - service { 'exim4': ensure => running, require => [ diff --git a/modules/exim/manifests/mailrelay.pp b/modules/exim/manifests/mailrelay.pp index 4296d3cc8..9d0f62577 100644 --- a/modules/exim/manifests/mailrelay.pp +++ b/modules/exim/manifests/mailrelay.pp @@ -10,7 +10,10 @@ class exim::mailrelay { @hourly root if [ ! -d /etc/exim4/email-virtualdomains ]; then cd /etc/exim4 && git clone mail-git:email-virtualdomains ; fi && cd /etc/exim4/email-virtualdomains && git pull --quiet --ff-only | EOF } - + concat::fragment { 'virtual_domain_template': + target => '/etc/exim4/virtualdomains', + content => template('exim/virtualdomains-mailrelay.erb'), + } concat { '/etc/exim4/manualroute': mode => '0444', diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains-mailrelay.erb similarity index 97% rename from modules/exim/templates/virtualdomains.erb rename to modules/exim/templates/virtualdomains-mailrelay.erb index 355247378..066d79f5c 100644 --- a/modules/exim/templates/virtualdomains.erb +++ b/modules/exim/templates/virtualdomains-mailrelay.erb @@ -1,4 +1,3 @@ -<% 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 @@ -19,4 +18,3 @@ debian.es: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/d debian.eu: 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 -%> -- 2.20.1