X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fexim%2Fmanifests%2Fmx.pp;h=0157b1439ce72edcc1ecb3624860fa044b100c2b;hb=bb3c419ae3fb9387d5e91cf1e0dc9b82d167c728;hp=2db5c8d304bbd1c5dbde477989292ba7146ca818;hpb=57941781f6b6d34892c872ecbecdc37706a020b6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index 2db5c8d30..0157b1439 100644
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -1,7 +1,11 @@
 # our heavy exim class
-class exim::mx {
+# @param is_mailrelay this system is a mailrelay, both in and out, for debian hosts
+class exim::mx(
+  Boolean $is_mailrelay = false,
+){
   class { 'exim':
-    smarthost => undef,
+    use_smarthost => false,
+    is_mailrelay  => $is_mailrelay,
   }
 
   include clamav
@@ -39,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, }
 }