X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fbacula%2Fmanifests%2Fstorage.pp;h=7b1c1a8341a79ced3333f645a5fb1095758b8dde;hb=e96e72674696752c5a15e7618677b704919f4dc8;hp=e6738672d67f902a6d4798539fb3bbb0498bf00b;hpb=3bfd10b2f5ebe131a16bf540e7d0f8de4fe17988;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index e6738672d..7b1c1a834 100644
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -9,6 +9,16 @@ class bacula::storage inherits bacula {
 		enable    => true,
 		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':
+		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+		command     => 'true',
+		refreshonly => true,
+	}
+
 	file { '/etc/bacula/bacula-sd.conf':
 		content => template('bacula/bacula-sd.conf.erb'),
 		mode    => '0640',
@@ -16,6 +26,17 @@ class bacula::storage inherits bacula {
 		notify  => Service['bacula-sd']
 	}
 
+	file { '/etc/bacula/storage-conf.d':
+		ensure  => directory,
+		mode    => '0755',
+		group   => bacula,
+		purge   => true,
+		force   => true,
+		recurse => true,
+		source  => 'puppet:///files/empty/',
+		notify  => Exec['bacula-sd reload']
+	}
+
 	@ferm::rule { 'dsa-bacula-sd-v4':
 		domain      => '(ip)',
 		description => 'Allow bacula-sd access from director and clients',
@@ -29,4 +50,14 @@ class bacula::storage inherits bacula {
 		rule        => 'proto tcp mod state state (NEW) dport (bacula-sd) @subchain \'bacula-sd\' { saddr ($HOST_DEBIAN_V6) ACCEPT; }',
 		notarule    => true,
 	}
+
+	file { '/etc/bacula/storage-conf.d/empty.conf':
+		content => '',
+		mode    => '0440',
+		group   => bacula,
+		notify  => Exec['bacula-sd reload']
+	}
+
+	Bacula::Storage-per-Node<<| |>>
+
 }