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

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 8f5604595..3837699a2 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -19,11 +19,12 @@ class bacula::client(
   $service_ensure = $ensure ? { 'present' => 'running', 'absent'  => 'stopped' }
   $service_enable = $ensure ? { 'present' => true, 'absent' => false }
   $reverse_ensure = $ensure ? { 'present' => 'absent', 'absent' => 'present' }
+  $directory_ensure = $ensure ? { 'present' => 'directory', 'absent' => 'absent' }
 
   $client = $::fqdn
 
   file { '/etc/bacula/fd-conf.d':
-    ensure  => directory,
+    ensure  => $directory_ensure,
     mode    => '0755',
     group   => bacula,
     purge   => true,
@@ -33,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}",
@@ -81,7 +84,13 @@ class bacula::client(
     ensure    => $service_ensure,
     enable    => $service_enable,
     hasstatus => true,
-    require   => Package['bacula-fd']
+  }
+  dsa_systemd::override { 'bacula-fd':
+    ensure  => $ensure,
+    content => @(EOF),
+      [Unit]
+      After=network-online.target
+      | EOF
   }
 
   exec { 'bacula-fd restart-when-idle':
@@ -89,7 +98,7 @@ class bacula::client(
     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':
@@ -98,7 +107,13 @@ class bacula::client(
     mode    => '0640',
     owner   => root,
     group   => bacula,
-    require => Package['bacula-fd'],
+    notify  => Exec['bacula-fd restart-when-idle'],
+  }
+  file { '/etc/bacula/fd-conf.d/empty.conf':
+    ensure  => $ensure,
+    content => '',
+    mode    => '0440',
+    group   => bacula,
     notify  => Exec['bacula-fd restart-when-idle'],
   }
   file { '/usr/local/sbin/bacula-backup-dirs':
@@ -117,7 +132,6 @@ class bacula::client(
     mode    => '0400',
     owner   => root,
     group   => root,
-    require => Package['bacula-fd'],
     notify  => Service['bacula-fd'],
   }
   if (versioncmp($::lsbmajdistrelease, '9') >= 0 and $facts['systemd']) {