X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fbacula%2Fmanifests%2Fclient.pp;h=227f1b13520d1bde0329880915b83fcf8a6e3996;hb=ef17392d4ee5a13bf4107e6cc6dac0a19ddf6086;hp=8b2bb4e098ac8754c0eeb2cdcb86a9471878549c;hpb=a5ffcf93be9b9c03cb2cb20ddcfbfd32b56a8634;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 8b2bb4e09..227f1b135 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -1,7 +1,7 @@
 class bacula::client inherits bacula {
 	@@bacula::storage-per-node { $::fqdn: }
 
-	if $::hostname in [beethoven, berlioz, biber, diabelli, dinis, draghi, geo3, kaufmann, lully, master, new-master, reger, schumann, soler, vento, vieuxtemps, wilder, wolkenstein] {
+	if ! getfromhash($site::nodeinfo, 'not-bacula-client') {
 		@@bacula::node { $::fqdn: }
 	}
 
@@ -18,7 +18,7 @@ class bacula::client inherits bacula {
 
 	exec { 'bacula-fd restart-when-idle':
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
-		command     => '(setsid /usr/local/sbin/bacula-idle-restart fd &)',
+		command     => 'sh -c "setsid /usr/local/sbin/bacula-idle-restart fd &"',
 		refreshonly => true,
 		subscribe   => File['/etc/ssl/debian/certs/thishost.crt'],
 		require     => File['/usr/local/sbin/bacula-idle-restart'],
@@ -32,6 +32,10 @@ class bacula::client inherits bacula {
 		require => Package['bacula-fd'],
 		notify  => Service['bacula-fd'],
 	}
+	file { '/usr/local/sbin/bacula-backup-dirs':
+		mode    => '0775',
+		source  => 'puppet:///modules/bacula/bacula-backup-dirs',
+	}
 	file { '/usr/local/sbin/postbaculajob':
 		mode    => '0775',
 		source  => 'puppet:///modules/bacula/postbaculajob',