From bb3c419ae3fb9387d5e91cf1e0dc9b82d167c728 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 21 Sep 2019 23:43:06 +0200
Subject: [PATCH] split out some exim::mx config into a new exim::mailrelay

---
 modules/exim/manifests/mailrelay.pp  | 13 +++++++++++++
 modules/exim/manifests/mx.pp         | 10 ----------
 modules/roles/manifests/mailrelay.pp |  4 +---
 3 files changed, 14 insertions(+), 13 deletions(-)
 create mode 100644 modules/exim/manifests/mailrelay.pp

diff --git a/modules/exim/manifests/mailrelay.pp b/modules/exim/manifests/mailrelay.pp
new file mode 100644
index 000000000..f0feedb59
--- /dev/null
+++ b/modules/exim/manifests/mailrelay.pp
@@ -0,0 +1,13 @@
+# our mailrelay exim class
+class exim::mailrelay {
+  class { 'exim::mx':
+    is_mailrelay  => true,
+  }
+
+  concat::fragment { 'puppet-crontab--email-virtualdomains':
+    target  => '/etc/cron.d/puppet-crontab',
+    content => @(EOF)
+      @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
+  }
+}
diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index 20ba1a36b..0157b1439 100644
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -43,14 +43,4 @@ class exim::mx(
   package { 'monitoring-plugins-standard':
     ensure => installed,
   }
-
-  if $exim::is_mailrelay {
-    concat::fragment { 'puppet-crontab--email-virtualdomains':
-      target  => '/etc/cron.d/puppet-crontab',
-      content => @(EOF)
-        @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
-    }
-  }
-  file { '/etc/cron.d/dsa-email-virtualdomains': ensure => absent, }
 }
diff --git a/modules/roles/manifests/mailrelay.pp b/modules/roles/manifests/mailrelay.pp
index a3812d988..b17bb019d 100644
--- a/modules/roles/manifests/mailrelay.pp
+++ b/modules/roles/manifests/mailrelay.pp
@@ -7,9 +7,7 @@
 #   include roles::mailrelay
 #
 class roles::mailrelay {
-  class { 'exim::mx':
-    is_mailrelay => true,
-  }
+  include exim::mailrelay
 
   include roles::pubsub::parameters
 
-- 
2.20.1