From 360f5c2f16d2fb6b06cdebe4c839bce5a392087b Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 18 Aug 2012 21:11:52 +0200
Subject: [PATCH] Try to reload bacula-director on changes instead of restart

---
 modules/bacula/manifests/director.pp | 13 ++++++++++---
 modules/bacula/manifests/node.pp     |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 65ed6058a..5e9550f67 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -11,6 +11,13 @@ class bacula::director inherits bacula {
 		require   => Package['bacula-director-pgsql']
 	}
 
+	exec { 'bacula-director reload':
+		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+		command     => 'service bacula-director reload',
+		refreshonly => true,
+        }
+
+
 	file { '/etc/bacula/conf.d':
 		ensure  => directory,
 		mode    => '0755',
@@ -19,7 +26,7 @@ class bacula::director inherits bacula {
 		force   => true,
 		recurse => true,
 		source  => 'puppet:///files/empty/',
-		notify  => Service['bacula-director']
+		notify  => Exec['bacula-director reload']
 	}
 
 	file { '/etc/bacula/bacula-dir.conf':
@@ -27,7 +34,7 @@ class bacula::director inherits bacula {
 		mode    => '0440',
 		group   => bacula,
 		require => Package['bacula-director-pgsql'],
-		notify  => Service['bacula-director']
+		notify  => Exec['bacula-director reload']
 	}
 
 	@ferm::rule { 'dsa-bacula-dir':
@@ -41,7 +48,7 @@ class bacula::director inherits bacula {
 		mode    => '0440',
 		group   => bacula,
 		require => Package['bacula-director-pgsql'],
-		notify  => Service['bacula-director']
+		notify  => Exec['bacula-director reload']
 	}
 
 	Bacula::Node<<| |>>
diff --git a/modules/bacula/manifests/node.pp b/modules/bacula/manifests/node.pp
index d73c34e90..ac4be838a 100644
--- a/modules/bacula/manifests/node.pp
+++ b/modules/bacula/manifests/node.pp
@@ -12,7 +12,7 @@ define bacula::node() {
 		content => template('bacula/per-client.conf.erb'),
 		mode    => '0440',
 		group   => bacula,
-		notify  => Service['bacula-director']
+		notify  => Exec['bacula-director reload']
 	}
 }
 
-- 
2.20.1