split out some exim::mx config into a new exim::mailrelay

diff --git a/modules/exim/manifests/mailrelay.pp b/modules/exim/manifests/mailrelay.pp
new file mode 100644 (file)
index 0000000..f0feedb
--- /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 20ba1a3..0157b14 100644 (file)
--- 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 a3812d9..b17bb01 100644 (file)
--- 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