X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fclient.pp;h=db93aa72c8410dcdc6b08d408c2ee386556796bc;hb=9fcf4bb136ea38918c495570860360925884f857;hp=474b22e9265726ea16237ca96b80094ea2cb6205;hpb=728ce3b3be78cb18eec6d1bb10b4323f34e67cfb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 474b22e92..db93aa72c 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, new-master, reger, schumann, soler, vento, vieuxtemps, wilder, wolkenstein] {
+		@@bacula::node { $::fqdn: }
+	}
 
 	package { ['bacula-fd']:
 		ensure => installed
@@ -11,30 +16,48 @@ class bacula::client inherits bacula {
 		require   => Package['bacula-fd']
 	}
 
-	file {
-		'/etc/bacula/bacula-fd.conf':
-			content => template('bacula/bacula-fd.conf.erb'),
-			mode    => '0640',
+	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'],
+	}
+	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   => bacula,
-			require => Package['bacula-fd'],
-			notify  => Service['bacula-fd'],
-			;
-		'/usr/local/sbin/postbaculajob':
-			mode    => '0775',
-			source  => 'puppet:///modules/bacula/postbaculajob',
-			;
+			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",
+	#	rule        => "proto tcp mod state state (NEW) dport (bacula-fd) saddr (${bacula_director_ip6}) ACCEPT",
 	#}
 }