X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fclient.pp;h=d28e8993245d40c9f210be2f6a6a4a6eae593b17;hb=99934ebb3a97a64a0d995792f65362e3d6778227;hp=abd11b359bd975b9271b4667d380e3c6496e924d;hpb=02c23c5e48475028ab72af92e091936b345c1b66;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index abd11b359..d28e89932 100644
--- 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, new-master, reger, schumann, soler, vento, vieuxtemps, wilder, wolkenstein] {
+	if $::hostname in [beethoven, berlioz, biber, diabelli, dinis, draghi, geo3, kaufmann, lully, master, picconi, pejacevic, piu-slave-bm-a, reger, schumann, soler, vento, vieuxtemps, wilder, wolkenstein] {
 		@@bacula::node { $::fqdn: }
 	}
 
@@ -16,6 +16,14 @@ class bacula::client inherits bacula {
 		require   => Package['bacula-fd']
 	}
 
+	exec { 'bacula-fd restart-when-idle':
+		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'],
+		require     => File['/usr/local/sbin/bacula-idle-restart'],
+	}
+
 	file { '/etc/bacula/bacula-fd.conf':
 		content => template('bacula/bacula-fd.conf.erb'),
 		mode    => '0640',
@@ -36,11 +44,17 @@ class bacula::client inherits bacula {
 		require => Package['bacula-fd'],
 		notify  => Service['bacula-fd'],
 	}
-	file { '/etc/apt/preferences.d/dsa-bacula-client':
-		content => template('bacula/apt.preferences.bacula-client.erb'),
-		mode    => '0444',
-		owner   => root,
-		group   => root,
+	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':