Make it clearer which nodes are not in bacula by using a blacklist

[mirror/dsa-puppet.git] / modules / bacula / manifests / client.pp

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 40a1eb3..227f1b1 100644 (file)
--- 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, picconi, 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',