Merge remote-tracking branch 'origin/master' into staging

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

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 13e7595..c5f6f28 100644 (file)
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -89,12 +89,27 @@ class bacula::director inherits bacula {
                recurse => true,
                source  => 'puppet:///files/empty/',
        }
+       file { '/usr/local/sbin/dsa-bacula-scheduler':
+               source  => 'puppet:///modules/bacula/dsa-bacula-scheduler',
+               mode    => '0555',
+       }
+
        file { "/etc/cron.d/puppet-bacula-stuff": 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
+                       */3 * * * * root sleep $(( $RANDOM \% 60 )); flock -w 0 -e /usr/local/sbin/dsa-bacula-scheduler /usr/local/sbin/dsa-bacula-scheduler
                        | EOF
        }
+
+       concat { $bacula::bacula_dsa_client_list:
+       }
+       concat::fragment { 'bacula-dsa-client-list::header' :
+               target => $bacula::bacula_dsa_client_list,
+               content  => "",
+               order  => '00',
+       }
+       Concat::Fragment <<| tag == $bacula::tag_bacula_dsa_client_list |>>
 }