X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fclient.pp;h=3837699a2e92ac274bb69a1361788ff84e0e024b;hb=69a42e4c538f99ba4882bc5ea89a4b687b8bc51c;hp=24f6908ddd48cca0424cc24d29d0170253ccb61f;hpb=d7bdf6cd78a6959a02ec40cdf70d37dadb655221;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 24f6908dd..3837699a2 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -34,7 +34,9 @@ class bacula::client(
   }
 
   if $ensure == 'present' {
-    Bacula::Client::Director <<| tag == "bacula::to-fd::${director_server}" |>>
+    Bacula::Client::Director <<| tag == "bacula::to-fd::${director_server}" |>> {
+      before => Exec['bacula-fd restart-when-idle'],
+    }
 
     @@bacula::storage::client { $client:
       tag             => "bacula::to-storage::${storage_server}",
@@ -83,13 +85,20 @@ class bacula::client(
     enable    => $service_enable,
     hasstatus => true,
   }
+  dsa_systemd::override { 'bacula-fd':
+    ensure  => $ensure,
+    content => @(EOF),
+      [Unit]
+      After=network-online.target
+      | EOF
+  }
 
   exec { 'bacula-fd restart-when-idle':
     path        => '/usr/bin:/usr/sbin:/bin:/sbin',
     command     => "sh -c 'setsid /usr/local/sbin/bacula-idle-restart ${port_fd} bacula-fd &'",
     refreshonly => true,
     subscribe   => [ File[$bacula::bacula_ssl_server_cert], File[$bacula::bacula_ssl_client_cert] ],
-    require     => File['/usr/local/sbin/bacula-idle-restart'],
+    require     => [ File['/usr/local/sbin/bacula-idle-restart'], File['/etc/bacula/fd-conf.d/empty.conf'] ],
   }
 
   file { '/etc/bacula/bacula-fd.conf':
@@ -105,7 +114,7 @@ class bacula::client(
     content => '',
     mode    => '0440',
     group   => bacula,
-    notify  => Exec['bacula-director reload']
+    notify  => Exec['bacula-fd restart-when-idle'],
   }
   file { '/usr/local/sbin/bacula-backup-dirs':
     ensure => $ensure,