X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fclient.pp;h=be27ccf9c82f509500cd6f5fd441408166a8f78b;hb=d2f41d6cc64287591ac5c97a1fae9adb4f848d36;hp=8fbfb0d3e3e653132d86cbef56629af62d2e177a;hpb=6a6f323df04506d53a2d5fb8e30765ec216877d9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 8fbfb0d3e..be27ccf9c 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -1,6 +1,11 @@
 class bacula::client inherits bacula {
+	@@bacula::storage-per-node { $::fqdn: }
 
-	package { ['bacula-client', 'bacula-fd']:
+	if $::hostname in [beethoven, berlioz, biber, diabelli, dinis, draghi, geo3, schumann, soler, widor, wolkenstein] {
+		@@bacula::node { $::fqdn: }
+	}
+
+	package { ['bacula-fd']:
 		ensure => installed
 	}
 
@@ -11,24 +16,45 @@ class bacula::client inherits bacula {
 		require   => Package['bacula-fd']
 	}
 
-	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 {
+		'/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'],
+			;
+		'/usr/local/sbin/postbaculajob':
+			mode    => '0775',
+			source  => 'puppet:///modules/bacula/postbaculajob',
+			;
+		'/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'],
+			;
+		'/etc/apt/preferences.d/dsa-bacula-client':
+			content => template('bacula/apt.preferences.bacula-client.erb'),
+			mode    => '0444',
+			owner   => root,
+			group   => root,
+			;
+
 	}
 
 	@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",
+	#}
 }