X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fclient.pp;h=98ea8a6d2021332d804a3c15d1fe15e6a697a120;hb=HEAD;hp=3837699a2e92ac274bb69a1361788ff84e0e024b;hpb=69a42e4c538f99ba4882bc5ea89a4b687b8bc51c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 3837699a2..98ea8a6d2 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -8,12 +8,22 @@
 # @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' }
@@ -39,17 +49,18 @@ class bacula::client(
     }
 
     @@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
@@ -89,7 +100,10 @@ class bacula::client(
     ensure  => $ensure,
     content => @(EOF),
       [Unit]
-      After=network-online.target
+      After=network-online.target unbound.service
+      [Service]
+      ExecStart=
+      ExecStart=/usr/sbin/bacula-fd -c $CONFIG -f -u bacula -k
       | EOF
   }
 
@@ -97,7 +111,7 @@ class bacula::client(
     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] ],
+    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'] ],
   }
 
@@ -134,17 +148,4 @@ class bacula::client(
     group   => root,
     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,
-    }
-  }
 }