X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fbacula%2Fmanifests%2Fdirector.pp;h=5f7fba43c3b9f195dfffd9523f5896d73f59b5d1;hb=164eea6bf3512ee252e7c61be60ed7a96d12ec54;hp=d16166ab38dc59429bbfb8ec067b49bc5b1e1fde;hpb=bee54f04e6d5c14f933df45425a5cd56215689db;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index d16166ab3..5f7fba43c 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -19,8 +19,7 @@ class bacula::director(
   String  $pool_name = 'bacula',
   Integer $port_dir = 9101,
   Optional[String] $db_sslca = undef,
-  #String $director_name    = "${::fqdn}-dir",
-  String $director_name = $bacula::bacula_director_name,
+  String $director_name = "${::fqdn}-dir",
   Stdlib::Host $director_address = $::fqdn,
 ) inherits bacula {
 
@@ -137,10 +136,10 @@ class bacula::director(
   file { '/etc/cron.d/puppet-bacula-stuff': ensure => absent, }
   concat::fragment { 'puppet-crontab--bacula-director':
     target  => '/etc/cron.d/puppet-crontab',
-    content => @(EOF)
+    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
+      @daily root chronic /etc/bacula/scripts/volumes-delete-old -v --token '${pool_name}'
+      */3 * * * * root sleep $(( \$RANDOM \\% 60 )); flock -w 0 -e /usr/local/sbin/dsa-bacula-scheduler /usr/local/sbin/dsa-bacula-scheduler
       | EOF
   }