From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 25 Sep 2019 06:56:00 +0000 (+0200)
Subject: Only restart once we have at least one file in the .d dir
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=02c4cbe3e1477139f9bec26ef8a0a90b0ff3529f;p=mirror%2Fdsa-puppet.git

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

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 0034322f6..3505300c1 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -89,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':
@@ -105,7 +105,7 @@ class bacula::client(
     content => '',
     mode    => '0440',
     group   => bacula,
-    notify  => Exec['bacula-fd restart-when-idle']
+    notify  => Exec['bacula-fd restart-when-idle'],
   }
   file { '/usr/local/sbin/bacula-backup-dirs':
     ensure => $ensure,