From 932d221f11de1bd4614c669c3f613d4c29213c7a Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 25 Dec 2017 12:11:02 +0100 Subject: [PATCH] Move crontab bacula-director into dsa-puppet-stuff --- modules/bacula/files/crontab-director | 2 -- modules/bacula/manifests/director.pp | 9 ++++++++- 2 files changed, 8 insertions(+), 3 deletions(-) delete mode 100644 modules/bacula/files/crontab-director diff --git a/modules/bacula/files/crontab-director b/modules/bacula/files/crontab-director deleted file mode 100644 index baa31f0f6..000000000 --- a/modules/bacula/files/crontab-director +++ /dev/null @@ -1,2 +0,0 @@ -@daily root chronic /etc/bacula/scripts/volume-purge-action -v -@daily root chronic /etc/bacula/scripts/volumes-delete-old -v diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp index 2d3033b61..7e923f879 100644 --- a/modules/bacula/manifests/director.pp +++ b/modules/bacula/manifests/director.pp @@ -90,6 +90,13 @@ class bacula::director inherits bacula { source => 'puppet:///files/empty/', } file { "/etc/cron.d/puppet-bacula-stuff": - source => 'puppet:///modules/bacula/crontab-director', + ensure => absent, + } + concat::fragment { 'dsa-puppet-stuff--bacula-director': + target => '/etc/cron.d/dsa-puppet-stuff', + content => @(EOF) + @daily root chronic /etc/bacula/scripts/volume-purge-action -v + @daily root chronic /etc/bacula/scripts/volumes-delete-old -v + | EOF } } -- 2.20.1