X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fclient.pp;h=98af74a4a893ce1dff00c6e42625cb608c15421c;hb=04788f2ec54bcdf3b7db4954665ed70caf7ed9a5;hp=1f2500c5fbc8b31f4dc077b550bcf65cc8bd3758;hpb=010327a6ed81f5aa701a3830ea6bda19777dd3a4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 1f2500c5f..98af74a4a 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,18 +48,6 @@ class bacula::client inherits bacula {
 		require => Package['bacula-fd'],
 		notify  => Service['bacula-fd'],
 	}
-	if $::lsbmajdistrelease < 7 {
-		file { '/etc/apt/preferences.d/dsa-bacula-client':
-			content => template('bacula/apt.preferences.bacula-client.erb'),
-			mode    => '0444',
-			owner   => root,
-			group   => root,
-		}
-	} else {
-		file { '/etc/apt/preferences.d/dsa-bacula-client':
-			ensure => absent
-		}
-	}
 
 	@ferm::rule { 'dsa-bacula-fd-v4':
 		domain      => '(ip)',