X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fclient.pp;h=f3443e37ff22cab5904d531f09bb55ee7934a1e3;hb=0d03fa1079842ae23ad85de4d3b806e2cf1d9f22;hp=1f2500c5fbc8b31f4dc077b550bcf65cc8bd3758;hpb=010327a6ed81f5aa701a3830ea6bda19777dd3a4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 1f2500c5f..f3443e37f 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -1,75 +1,102 @@
-class bacula::client inherits bacula {
-	@@bacula::storage-per-node { $::fqdn: }
+# our bacula client configuration
+#
+# this mostly configures the file daemon, but also firewall rules and
+# fragments to sent to the other servers.
+class bacula::client(
+  Enum['present', 'absent'] $ensure = defined(Class["bacula::not_a_client"]) ? { true => 'absent', default => 'present' },
+) inherits bacula {
+  $package_ensure = $ensure ? { 'present' => 'installed', 'absent' => 'purged' }
+  $service_ensure = $ensure ? { 'present' => 'running', 'absent'  => 'stopped' }
+  $service_enable = $ensure ? { 'present' => true, 'absent' => false }
+  $reverse_ensure = $ensure ? { 'present' => 'absent', 'absent' => 'present' }
 
-	if ! getfromhash($site::nodeinfo, 'not-bacula-client') {
-		@@bacula::node { $::fqdn: }
-	}
+  if $ensure == 'present' {
+    @@bacula::storage_per_node { $::fqdn: }
 
-	package { ['bacula-fd']:
-		ensure => installed
-	}
+    @@bacula::node { $::fqdn:
+      bacula_client_port => $bacula::bacula_client_port,
+    }
 
-	service { 'bacula-fd':
-		ensure    => running,
-		enable    => true,
-		hasstatus => true,
-		require   => Package['bacula-fd']
-	}
+    @@concat::fragment { "bacula-dsa-client-list::$fqdn":
+      target  => $bacula::bacula_dsa_client_list ,
+      content => @("EOF"),
+          ${fqdn}
+          | EOF
+      tag     => $bacula::tag_bacula_dsa_client_list,
+    }
+  } elsif $ensure == 'absent' {
+    file { '/etc/bacula':
+      ensure  => absent,
+      purge   => true,
+      force   => true,
+      recurse => true;
+    }
+  }
 
-	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],
-		require     => File['/usr/local/sbin/bacula-idle-restart'],
-	}
+  package { ['bacula-fd', 'bacula-common']:
+    ensure => $package_ensure
+  }
 
-	file { '/etc/bacula/bacula-fd.conf':
-		content => template('bacula/bacula-fd.conf.erb'),
-		mode    => '0640',
-		owner   => root,
-		group   => bacula,
-		require => Package['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 $::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
-		}
-	}
+  service { 'bacula-fd':
+    ensure    => $service_ensure,
+    enable    => $service_enable,
+    hasstatus => true,
+    require   => Package['bacula-fd']
+  }
 
-	@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_ip}) ACCEPT",
-	}
+  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'],
+  }
 
-	#@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",
-	#}
+  file { '/etc/bacula/bacula-fd.conf':
+    ensure  => $ensure,
+    content => template('bacula/bacula-fd.conf.erb'),
+    mode    => '0640',
+    owner   => root,
+    group   => bacula,
+    require => Package['bacula-fd'],
+    notify  => Exec['bacula-fd restart-when-idle'],
+  }
+  file { '/usr/local/sbin/bacula-backup-dirs':
+    ensure  => $ensure,
+    mode    => '0775',
+    source  => 'puppet:///modules/bacula/bacula-backup-dirs',
+  }
+  file { '/usr/local/sbin/postbaculajob':
+    ensure  => $ensure,
+    mode    => '0775',
+    source  => 'puppet:///modules/bacula/postbaculajob',
+  }
+  file { '/etc/default/bacula-fd':
+    ensure  => $ensure,
+    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) {
+    dsa_systemd::override { 'bacula-fd':
+      content => @(EOT)
+        [Service]
+        ExecStart=
+        ExecStart=/usr/sbin/bacula-fd -c $CONFIG -f -u bacula -k
+        | EOT
+    }
+  } else {
+    dsa_systemd::override { 'bacula-fd':
+      ensure  => absent,
+    }
+  }
+
+  ferm::rule { 'dsa-bacula-fd':
+    domain      => '(ip ip6)',
+    description => 'Allow bacula access from storage and director',
+    rule        => "proto tcp mod state state (NEW) dport (${bacula_client_port}) saddr (${bacula_director_ip_addrs}) ACCEPT",
+  }
 }