X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fstorage.pp;h=5a0132d31352dd15ab81839c17f5a682e32657ea;hb=9fcf4bb136ea38918c495570860360925884f857;hp=f0a09df7a84b509b8a693e0df1e123ed476cf773;hpb=fbda07eb15845bda281002fe76352ba46e6c5dda;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index f0a09df7a..5a0132d31 100644
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -1,42 +1,63 @@
 class bacula::storage inherits bacula {
 
-  package {
-    "bacula-sd": ensure => installed;
-  }
-
-  service {
-    "bacula-sd":
-      ensure => running,
-      enable => true,
-      hasstatus => true,
-      ;
-  }
-  file {
-    "/etc/bacula/bacula-sd.conf":
-      content => template("bacula/bacula-sd.conf.erb"),
-      mode => 640,
-      group => bacula,
-      notify  => Exec["bacula-sd restart"]
-      ;
-  }
-
-  exec {
-    "bacula-sd restart":
-      path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-      refreshonly => true;
-  }
-
-  @ferm::rule { 'dsa-bacula-sd-v4':
-    domain      => '(ip)',
-    description => 'Allow bacula-sd access from director and clients',
-    rule         => 'proto tcp mod state state (NEW) dport (bacula-sd) @subchain \'bacula-sd\' { saddr ($HOST_DEBIAN_V4) ACCEPT; }',
-    notarule        => true,
-  }
-
-  @ferm::rule { 'dsa-bacula-sd-v6':
-    domain      => '(ip6)',
-    description => 'Allow bacula-sd access from director and clients',
-    rule         => 'proto tcp mod state state (NEW) dport (bacula-sd) @subchain \'bacula-sd\' { saddr ($HOST_DEBIAN_V6) ACCEPT; }',
-    notarule        => true,
-  }
+	package { 'bacula-sd':
+		ensure => installed
+	}
+
+	service { 'bacula-sd':
+		ensure    => running,
+		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     => '/bin/true',
+		refreshonly => true,
+	}
+
+	file { '/etc/bacula/bacula-sd.conf':
+		content => template('bacula/bacula-sd.conf.erb'),
+		mode    => '0640',
+		group   => 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',
+		rule        => 'proto tcp mod state state (NEW) dport (bacula-sd) @subchain \'bacula-sd\' { saddr ($HOST_DEBIAN_V4) ACCEPT; }',
+		notarule    => true,
+	}
+
+	@ferm::rule { 'dsa-bacula-sd-v6':
+		domain      => '(ip6)',
+		description => 'Allow bacula-sd access from director and clients',
+		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<<| |>>
+
 }