X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fclient.pp;h=2b7c35f085ce67221aae643df17b72ff0edaf7fc;hb=e272b442942830a6eed50748eb63aa3b6318ca2b;hp=4172224231b4ba99fb226261b2a231cd9c3f0c8f;hpb=29cf2dcb6fdc15644b443d76b00098420f0bf67c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 417222423..2b7c35f08 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -2,7 +2,15 @@
 #
 # this mostly configures the file daemon, but also firewall rules and
 # fragments to sent to the other servers.
+#
+# @param director_server The director server that controls this client's backups
+# @param storage_server The storage server to use for this client
+# @param port_fd Port that bacula-fd listens on
+# @param ensure  present or absent
 class bacula::client(
+  String $director_server,
+  String $storage_server,
+  Integer $port_fd = 9102,
   Enum['present', 'absent'] $ensure = defined(Class['bacula::not_a_client']) ? { true => 'absent', default => 'present' },
 ) inherits bacula {
   $package_ensure = $ensure ? { 'present' => 'installed', 'absent' => 'purged' }
@@ -11,10 +19,14 @@ class bacula::client(
   $reverse_ensure = $ensure ? { 'present' => 'absent', 'absent' => 'present' }
 
   if $ensure == 'present' {
-    @@bacula::storage_per_node { $::fqdn: }
+    @@bacula::director::client { $::fqdn:
+      port_fd => $port_fd,
+      tag     => "bacula::to-director::${director_server}",
+    }
 
-    @@bacula::node { $::fqdn:
-      bacula_client_port => $bacula::bacula_client_port,
+    @@bacula::storage::client { $::fqdn:
+      tag             => "bacula::to-storage::${storage_server}",
+      director_server => $director_server,
     }
 
     @@concat::fragment { "bacula-dsa-client-list::${::fqdn}":
@@ -26,8 +38,16 @@ class bacula::client(
     }
 
     # allow access from director
-    Ferm::Rule::Simple <<| tag == "bacula::director-to-fd::${bacula::bacula_director_address}" |>> {
-      port => $bacula::bacula_client_port,
+    Ferm::Rule::Simple <<| tag == "bacula::director-to-fd::${director_server}" |>> {
+      port => $port_fd,
+    }
+
+    # get access to the storage
+    @@ferm::rule::simple { "bacula::fd-to-storage::${::fqdn}":
+      tag         => "bacula::fd-to-storage::${storage_server}",
+      description => 'Allow bacula-fd access to the bacula-storage',
+      chain       => 'bacula-sd',
+      saddr       => $bacula::public_addresses,
     }
   } elsif $ensure == 'absent' {
     file { '/etc/bacula':
@@ -54,7 +74,7 @@ class bacula::client(
 
   exec { 'bacula-fd restart-when-idle':
     path        => '/usr/bin:/usr/sbin:/bin:/sbin',
-    command     => 'sh -c "setsid /usr/local/sbin/bacula-idle-restart fd &"',
+    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'],