X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fclient.pp;h=ed833d7592ffc16fe6a215085b4cc955521669a0;hb=ecf49986ffb2a593ab8d28b7c2e511fc84ef3cef;hp=b1384901e653ac8951ed56a7ee41455fa86671e4;hpb=7e2876d8f46b9f9ad760555447af97a147dc431d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index b1384901e..ed833d759 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, elgar, geo3, jenkins, kaufmann, lilburn, lully, master, picconi, pejacevic, piu-slave-bm-a, popov, reger, schumann, soler, vento, vieuxtemps, wilder, wolkenstein] {
+	if ! getfromhash($site::nodeinfo, 'not-bacula-client') {
 		@@bacula::node { $::fqdn: }
 	}
 
@@ -30,7 +30,11 @@ class bacula::client inherits bacula {
 		owner   => root,
 		group   => bacula,
 		require => Package['bacula-fd'],
-		notify  => Service['bacula-fd'],
+		notify  => Exec['bacula-fd restart-when-idle'],
+	}
+	file { '/usr/local/sbin/bacula-backup-dirs':
+		mode    => '0775',
+		source  => 'puppet:///modules/bacula/bacula-backup-dirs',
 	}
 	file { '/usr/local/sbin/postbaculajob':
 		mode    => '0775',