From 6fc846c125d25ba5da2e7e5c668ef338edd63700 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 25 Dec 2017 13:10:47 +0100 Subject: [PATCH] Move crontab exim virtualdomains into dsa-puppet-stuff --- modules/exim/files/dsa-email-virtualdomains.cron | 7 ------- modules/exim/manifests/mx.pp | 14 ++++++++------ 2 files changed, 8 insertions(+), 13 deletions(-) delete mode 100644 modules/exim/files/dsa-email-virtualdomains.cron diff --git a/modules/exim/files/dsa-email-virtualdomains.cron b/modules/exim/files/dsa-email-virtualdomains.cron deleted file mode 100644 index 44c62c58a..000000000 --- a/modules/exim/files/dsa-email-virtualdomains.cron +++ /dev/null @@ -1,7 +0,0 @@ -## -## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. -## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git -## - -SHELL=/bin/bash -@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 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, + } } -- 2.20.1