Try after unbound.service instead of network-online.target

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

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index ff41e1b..5f7fba4 100644 (file)
--- 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 {
 
@@ -36,6 +35,12 @@ class bacula::director(
     director_name    => $director_name,
     director_address => $director_address,
   }
+  # let FDs know we exist
+  @@bacula::client::director{ $::fqdn:
+    tag              => "bacula::to-fd::${director_address}",
+    director_name    => $director_name,
+    director_address => $director_address,
+  }
 
   ensure_packages ( [
     'bacula-director-pgsql',
@@ -71,7 +76,6 @@ class bacula::director(
     purge   => true,
     force   => true,
     recurse => true,
-    source  => 'puppet:///files/empty/',
     notify  => Exec['bacula-director reload']
   }
 
@@ -123,7 +127,6 @@ class bacula::director(
     purge   => true,
     force   => true,
     recurse => true,
-    source  => 'puppet:///files/empty/',
   }
   file { '/usr/local/sbin/dsa-bacula-scheduler':
     source => 'puppet:///modules/bacula/dsa-bacula-scheduler',
@@ -133,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
   }