]> git.donarmstrong.com Git - dsa-puppet.git/blobdiff - modules/bacula/manifests/client.pp
Make it work with jessie, II
[dsa-puppet.git] / modules / bacula / manifests / client.pp
index ed833d7592ffc16fe6a215085b4cc955521669a0..4e7592532f4a511954a4cc4ec0a106fe0b5e955b 100644 (file)
@@ -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'],
        }
 
@@ -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',