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

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 97b5f2126..3837699a2 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -3,14 +3,14 @@
 # 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
 class bacula::client(
-  String $director_server,
-  String $storage_server,
+  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' },
@@ -19,17 +19,23 @@ class bacula::client(
   $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:
@@ -78,7 +84,13 @@ 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
+      | EOF
   }
 
   exec { 'bacula-fd restart-when-idle':
@@ -86,7 +98,7 @@ class bacula::client(
     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'],
+    require     => [ File['/usr/local/sbin/bacula-idle-restart'], File['/etc/bacula/fd-conf.d/empty.conf'] ],
   }
 
   file { '/etc/bacula/bacula-fd.conf':
@@ -95,7 +107,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,7 +132,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']) {