X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fdirector.pp;h=2d3033b61058eacb1ed5fc7ba7ac504ac4c279c5;hb=e59e95e12fd531b150a7e989c6401c0a2d38ed86;hp=4fd0f6dc3d29091cab4700de6e5c973b6286319d;hpb=8b8a274fd5293cc4c3d3d8dea0fc3f32d289d24d;p=mirror%2Fdsa-puppet.git diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp index 4fd0f6dc3..2d3033b61 100644 --- 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', @@ -63,11 +69,17 @@ class bacula::director inherits bacula { require => Package['bacula-console'] } + package { 'python3-psycopg2': ensure => installed } file { '/etc/bacula/scripts/volume-purge-action': mode => '0555', source => 'puppet:///modules/bacula/volume-purge-action', ; } + file { '/etc/bacula/scripts/volumes-delete-old': + mode => '0555', + source => 'puppet:///modules/bacula/volumes-delete-old', + ; + } file { '/etc/bacula/storages-list.d': ensure => directory, mode => '0755', @@ -78,6 +90,6 @@ class bacula::director inherits bacula { source => 'puppet:///files/empty/', } file { "/etc/cron.d/puppet-bacula-stuff": - content => "@daily root (cat /etc/bacula/storages-list.d/*.storage; echo '$bacula::bacula_filestor_name-catalog') | /etc/bacula/scripts/volume-purge-action\n"; + source => 'puppet:///modules/bacula/crontab-director', } }