X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fclient.pp;h=4e7592532f4a511954a4cc4ec0a106fe0b5e955b;hb=2d2d25eb5b5c376c5f73551fa11f5acaf866a60d;hp=1f2500c5fbc8b31f4dc077b550bcf65cc8bd3758;hpb=010327a6ed81f5aa701a3830ea6bda19777dd3a4;p=dsa-puppet.git

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 1f2500c5..4e759253 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -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[$bacula_ssl_server_cert],
+		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',