From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 22 Sep 2019 10:26:01 +0000 (+0200)
Subject: move the remaining virtualdomains to the mailrelay class
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ec1fa09c54aa7b7ec894577929e96ebe97a94508;p=mirror%2Fdsa-puppet.git

move the remaining virtualdomains to the mailrelay class
---

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-mailrelay.erb b/modules/exim/templates/virtualdomains-mailrelay.erb
new file mode 100644
index 000000000..066d79f5c
--- /dev/null
+++ b/modules/exim/templates/virtualdomains-mailrelay.erb
@@ -0,0 +1,20 @@
+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
+security.debian.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/security.debian.org
+women.debian.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/women.debian.org
+release.debian.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/release.debian.org
+ports-master.debian.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/ports-master.debian.org
+
+debian-ports.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian-ports.org
+
+debconf.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debconf.org
+
+debian.com: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian.star
+debian.net: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian.star
+debian.gr: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian.star
+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.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
diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
deleted file mode 100644
index 355247378..000000000
--- a/modules/exim/templates/virtualdomains.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-<% 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
-security.debian.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/security.debian.org
-women.debian.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/women.debian.org
-release.debian.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/release.debian.org
-ports-master.debian.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/ports-master.debian.org
-
-debian-ports.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian-ports.org
-
-debconf.org: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debconf.org
-
-debian.com: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian.star
-debian.net: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian.star
-debian.gr: user=nobody group=nogroup directory=/etc/exim4/email-virtualdomains/debian.star
-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.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 -%>