Make it work with jessie, II

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

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 4db324d0020cfca4425e02b3f89c95d698f4d80e..4e7592532f4a511954a4cc4ec0a106fe0b5e955b 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 getfromhash($site::nodeinfo, 'bacula-client') {
+       if ! getfromhash($site::nodeinfo, 'not-bacula-client') {
                @@bacula::node { $::fqdn: }
        }
 
@@ -20,7 +20,7 @@ class bacula::client inherits bacula {
                path        => '/usr/bin:/usr/sbin:/bin:/sbin',
                command     => 'sh -c "setsid /usr/local/sbin/bacula-idle-restart fd &"',
                refreshonly => true,
-               subscribe   => File['/etc/ssl/debian/certs/thishost.crt'],
+               subscribe   => [ File[$bacula_ssl_server_cert], File[$bacula_ssl_client_cert] ],
                require     => File['/usr/local/sbin/bacula-idle-restart'],
        }
 
@@ -30,7 +30,7 @@ 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',
@@ -48,7 +48,7 @@ class bacula::client inherits bacula {
                require => Package['bacula-fd'],
                notify  => Service['bacula-fd'],
        }
-       if $::lsbmajdistrelease < 7 {
+       if $::lsbmajdistrelease != "testing" and $::lsbmajdistrelease < 7 {
                file { '/etc/apt/preferences.d/dsa-bacula-client':
                        content => template('bacula/apt.preferences.bacula-client.erb'),
                        mode    => '0444',