X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fclient.pp;h=98ea8a6d2021332d804a3c15d1fe15e6a697a120;hb=30914d14c748dfd87a9854645b81454238ae3dad;hp=9d35c63f72b9fe4df6b817075f51d555bf364d2b;hpb=820c1c410cb381be3af94859695658cd093b8829;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 9d35c63f7..98ea8a6d2 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -3,47 +3,64 @@
 # this mostly configures the file daemon, but also firewall rules and
 # fragments to sent to the other servers.
 #
-# @param director_server  director server that controls this client's backups
-# @param storage_server   storage server to use for this client
+# @param director_server  director server (address) that controls this client's backups
+# @param storage_server   storage server (address) to use for this client
 # @param port_fd          port that bacula-fd listens on
 # @param client_name      bacula client name for this instance
 # @param ensure           present or absent
+# @param volume_retention_full  how long to keep volumes with full backups
+# @param volume_retention_diff  how long to keep volumes with differential backups
+# @param volume_retention_inc   how long to keep volumes with incremental backups
+# @param file_retention         how long to keep information about which files are in which volumes/jobs
+# @param job_retention          how long to keep job records
 class bacula::client(
   Stdlib::Host $director_server,
   Stdlib::Host $storage_server,
   Integer $port_fd = 9102,
   String $client_name = "${::fqdn}-fd",
   Enum['present', 'absent'] $ensure = defined(Class['bacula::not_a_client']) ? { true => 'absent', default => 'present' },
+  String $volume_retention_full = '100 days',
+  String $volume_retention_diff = '50 days',
+  String $volume_retention_inc  = '30 days',
+  String $file_retention = '30 days',
+  String $job_retention = $volume_retention_full,
 ) 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' }
+  $directory_ensure = $ensure ? { 'present' => 'directory', 'absent' => 'absent' }
 
   $client = $::fqdn
-  $client_secret = hkdf('/etc/puppet/secret', "bacula::director<->fd::${director_server}<->${client}")
+
+  file { '/etc/bacula/fd-conf.d':
+    ensure  => $directory_ensure,
+    mode    => '0755',
+    group   => bacula,
+    purge   => true,
+    force   => true,
+    recurse => true,
+    notify  => Exec['bacula-fd restart-when-idle'],
+  }
 
   if $ensure == 'present' {
-    @@bacula::director::client { $client:
-      port_fd       => $port_fd,
-      client        => $client,
-      client_name   => $client_name,
-      client_secret => $client_secret,
-      tag           => "bacula::to-director::${director_server}",
+    Bacula::Client::Director <<| tag == "bacula::to-fd::${director_server}" |>> {
+      before => Exec['bacula-fd restart-when-idle'],
     }
 
     @@bacula::storage::client { $client:
-      tag             => "bacula::to-storage::${storage_server}",
-      client          => $client,
-      director_server => $director_server,
+      tag                   => "bacula::to-storage::${storage_server}",
+      client                => $client,
+      director_server       => $director_server,
+      volume_retention_full => $volume_retention_full,
+      volume_retention_diff => $volume_retention_diff,
+      volume_retention_inc  => $volume_retention_inc,
     }
 
     @@concat::fragment { "bacula-dsa-client-list::${client}":
-      target  => $bacula::bacula_dsa_client_list ,
-      content => @("EOF"),
-          ${client}
-          | EOF
       tag     => $bacula::tag_bacula_dsa_client_list,
+      target  => $bacula::bacula_dsa_client_list,
+      content => $client,
     }
 
     # allow access from director
@@ -78,15 +95,24 @@ class bacula::client(
     ensure    => $service_ensure,
     enable    => $service_enable,
     hasstatus => true,
-    require   => Package['bacula-fd']
+  }
+  dsa_systemd::override { 'bacula-fd':
+    ensure  => $ensure,
+    content => @(EOF),
+      [Unit]
+      After=network-online.target unbound.service
+      [Service]
+      ExecStart=
+      ExecStart=/usr/sbin/bacula-fd -c $CONFIG -f -u bacula -k
+      | EOF
   }
 
   exec { 'bacula-fd restart-when-idle':
     path        => '/usr/bin:/usr/sbin:/bin:/sbin',
     command     => "sh -c 'setsid /usr/local/sbin/bacula-idle-restart ${port_fd} bacula-fd &'",
     refreshonly => true,
-    subscribe   => [ File[$bacula::bacula_ssl_server_cert], File[$bacula::bacula_ssl_client_cert] ],
-    require     => File['/usr/local/sbin/bacula-idle-restart'],
+    subscribe   => [ File[$bacula::ssl_server_cert], File[$bacula::ssl_client_cert] ],
+    require     => [ File['/usr/local/sbin/bacula-idle-restart'], File['/etc/bacula/fd-conf.d/empty.conf'] ],
   }
 
   file { '/etc/bacula/bacula-fd.conf':
@@ -95,7 +121,13 @@ class bacula::client(
     mode    => '0640',
     owner   => root,
     group   => bacula,
-    require => Package['bacula-fd'],
+    notify  => Exec['bacula-fd restart-when-idle'],
+  }
+  file { '/etc/bacula/fd-conf.d/empty.conf':
+    ensure  => $ensure,
+    content => '',
+    mode    => '0440',
+    group   => bacula,
     notify  => Exec['bacula-fd restart-when-idle'],
   }
   file { '/usr/local/sbin/bacula-backup-dirs':
@@ -114,20 +146,6 @@ class bacula::client(
     mode    => '0400',
     owner   => root,
     group   => root,
-    require => Package['bacula-fd'],
     notify  => Service['bacula-fd'],
   }
-  if (versioncmp($::lsbmajdistrelease, '9') >= 0 and $facts['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,
-    }
-  }
 }