X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fstorage.pp;h=91aee4194e6f12fa03dfc2221ac3c923b860602b;hb=a5ffcf93be9b9c03cb2cb20ddcfbfd32b56a8634;hp=5a0132d31352dd15ab81839c17f5a682e32657ea;hpb=1d007e1bac457d1fba22efc32bfef86ac3a5319d;p=dsa-puppet.git

diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index 5a0132d3..91aee419 100644
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -10,15 +10,15 @@ class bacula::storage inherits bacula {
 		hasstatus => true,
 	}
 
-	# should wait on -sd to finish current backups, then restart
-	# since it does not support reload and restarting kills running
-	# jobs
-	exec { 'bacula-sd reload':
+	exec { 'bacula-sd restart-when-idle':
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
-		command     => '/bin/true',
+		command     => '(setsid /usr/local/sbin/bacula-idle-restart sd &)',
 		refreshonly => true,
+		subscribe   => File['/etc/ssl/debian/certs/thishost.crt'],
+		require     => File['/usr/local/sbin/bacula-idle-restart'],
 	}
 
+
 	file { '/etc/bacula/bacula-sd.conf':
 		content => template('bacula/bacula-sd.conf.erb'),
 		mode    => '0640',
@@ -34,7 +34,7 @@ class bacula::storage inherits bacula {
 		force   => true,
 		recurse => true,
 		source  => 'puppet:///files/empty/',
-		notify  => Exec['bacula-sd reload']
+		notify  => Exec['bacula-sd restart-when-idle']
 	}
 
 	@ferm::rule { 'dsa-bacula-sd-v4':
@@ -55,7 +55,7 @@ class bacula::storage inherits bacula {
 		content => '',
 		mode    => '0440',
 		group   => bacula,
-		notify  => Exec['bacula-sd reload']
+		notify  => Exec['bacula-sd restart-when-idle']
 	}
 
 	Bacula::Storage-per-Node<<| |>>