Only restart once we have at least one file in the .d dir

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

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 12f334e..3505300 100644 (file)
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -82,7 +82,6 @@ class bacula::client(
     ensure    => $service_ensure,
     enable    => $service_enable,
     hasstatus => true,
-    require   => Package['bacula-fd']
   }
 
   exec { 'bacula-fd restart-when-idle':
@@ -90,7 +89,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':
@@ -99,7 +98,6 @@ 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':
@@ -107,8 +105,7 @@ class bacula::client(
     content => '',
     mode    => '0440',
     group   => bacula,
-    require => Package['bacula-director-pgsql'],
-    notify  => Exec['bacula-director reload']
+    notify  => Exec['bacula-fd restart-when-idle'],
   }
   file { '/usr/local/sbin/bacula-backup-dirs':
     ensure => $ensure,
@@ -126,7 +123,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']) {