Move crontab bacula-director into dsa-puppet-stuff

[mirror/dsa-puppet.git] / modules / bacula / manifests / director.pp

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 63b77a9..7e923f8 100644 (file)
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -10,6 +10,12 @@ class bacula::director inherits bacula {
                hasstatus => true,
                require   => Package['bacula-director-pgsql']
        }
+       systemd::override { 'bacula-director':
+               content => @(EOT)
+                       [Unit]
+                       After=unbound.service
+                       | EOT
+       }
 
        exec { 'bacula-director reload':
                path        => '/usr/bin:/usr/sbin:/bin:/sbin',
@@ -84,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
        }
 }