Move crontab bacula-director into dsa-puppet-stuff
authorPeter Palfrader <peter@palfrader.org>
Mon, 25 Dec 2017 11:11:02 +0000 (12:11 +0100)
committerPeter Palfrader <peter@palfrader.org>
Mon, 25 Dec 2017 11:11:18 +0000 (12:11 +0100)
modules/bacula/files/crontab-director [deleted file]
modules/bacula/manifests/director.pp

diff --git a/modules/bacula/files/crontab-director b/modules/bacula/files/crontab-director
deleted file mode 100644 (file)
index baa31f0..0000000
+++ /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
index 2d3033b..7e923f8 100644 (file)
@@ -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
        }
 }