X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fclient.pp;h=d28e8993245d40c9f210be2f6a6a4a6eae593b17;hb=090ae6d68f4c8e7d18cd4ddf855b2065182316c7;hp=94610a2e8b4ffc04e713abdcf629ca622b4cb775;hpb=3800134b7019fdc5d54cacb545ad71835471ce13;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 94610a2e8..d28e89932 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -1,4 +1,9 @@
 class bacula::client inherits bacula {
+	@@bacula::storage-per-node { $::fqdn: }
+
+	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: }
+	}
 
 	package { ['bacula-fd']:
 		ensure => installed
@@ -11,24 +16,56 @@ 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',
 		owner   => root,
 		group   => bacula,
 		require => Package['bacula-fd'],
-		notify  => Service['bacula-fd']
+		notify  => Service['bacula-fd'],
+	}
+	file { '/usr/local/sbin/postbaculajob':
+		mode    => '0775',
+		source  => 'puppet:///modules/bacula/postbaculajob',
+	}
+	file { '/etc/default/bacula-fd':
+		content => template('bacula/default.bacula-fd.erb'),
+		mode    => '0400',
+		owner   => root,
+		group   => root,
+		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)',
 		description => 'Allow bacula access from storage and director',
-		rule        => "proto tcp mod state state (NEW) dport (bacula-fd) saddr (${bacula_director_address}) ACCEPT",
+		rule        => "proto tcp mod state state (NEW) dport (bacula-fd) saddr (${bacula_director_ip}) ACCEPT",
 	}
 
-	@ferm::rule { 'dsa-bacula-fd-v6':
-		domain      => '(ip6)',
-		description => 'Allow bacula access from storage and director',
-		rule        => "proto tcp mod state state (NEW) dport (bacula-fd) saddr (${bacula_director_address}) ACCEPT",
-	}
+	#@ferm::rule { 'dsa-bacula-fd-v6':
+	#	domain      => '(ip6)',
+	#	description => 'Allow bacula access from storage and director',
+	#	rule        => "proto tcp mod state state (NEW) dport (bacula-fd) saddr (${bacula_director_ip6}) ACCEPT",
+	#}
 }