X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Fmx.pp;h=2ef980b7939af7df5751542384e4a756fb9b816d;hb=6fc846c125d25ba5da2e7e5c668ef338edd63700;hp=59852d0a0c75c8ba2df1c9b76bf80cee3f7de6cf;hpb=7d961995db18550eaf69682a49736101d2f91257;p=mirror%2Fdsa-puppet.git diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp index 59852d0a0..2ef980b79 100644 --- a/modules/exim/manifests/mx.pp +++ b/modules/exim/manifests/mx.pp @@ -35,12 +35,14 @@ class exim::mx inherits exim { } if has_role('mailrelay') { - file { '/etc/cron.d/dsa-email-virtualdomains': - source => 'puppet:///modules/exim/dsa-email-virtualdomains.cron', - } - } else { - file { '/etc/cron.d/dsa-email-virtualdomains': - ensure => absent, + concat::fragment { 'dsa-puppet-stuff--email-virtualdomains': + target => '/etc/cron.d/dsa-puppet-stuff', + 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, + } }