X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fclient.pp;h=2918a7938a79c1bc28208192ceff636a4716dce9;hb=a964a55270d7645b19bab0c5d5b971d344575a56;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..2918a7938 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -1,6 +1,13 @@
 class bacula::client inherits bacula {
+	@@bacula::storage_per_node { $::fqdn: }
 
-	package { ['bacula-client', 'bacula-fd']:
+	if ! getfromhash($site::nodeinfo, 'not-bacula-client') {
+		@@bacula::node { $::fqdn:
+			bacula_client_port => $bacula::bacula_client_port,
+		}
+	}
+
+	package { ['bacula-fd']:
 		ensure => installed
 	}
 
@@ -11,24 +18,67 @@ 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[$bacula_ssl_server_cert], File[$bacula_ssl_client_cert] ],
+		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  => Exec['bacula-fd restart-when-idle'],
+	}
+	file { '/usr/local/sbin/bacula-backup-dirs':
+		mode    => '0775',
+		source  => 'puppet:///modules/bacula/bacula-backup-dirs',
+	}
+	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 (versioncmp($::lsbmajdistrelease, '9') >= 0 and $systemd) {
+		file { '/etc/systemd/system/bacula-fd.service.d':
+			ensure	=> directory,
+			mode	=> '0755',
+			owner	=> root,
+			group	=> root,
+		}
+		file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
+			source	=> 'puppet:///modules/bacula/bacula-fd-systemd',
+			mode	=> '0400',
+			owner	=> root,
+			group	=> root,
+			notify	=> Exec['systemctl daemon-reload'],
+		}
+	} else {
+		file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
+			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_client_port}) 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",
+	#}
 }