Try to move bacula fd port config to the client class

[mirror/dsa-puppet.git] / modules / bacula / manifests / client.pp

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index f46cc02..436d80e 100644 (file)
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -2,7 +2,11 @@
 #
 # this mostly configures the file daemon, but also firewall rules and
 # fragments to sent to the other servers.
+#
+# @param port_fd Port that bacula-fd listens on
+# @param ensure  present or absent
 class bacula::client(
+  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' }
@@ -14,7 +18,7 @@ class bacula::client(
     @@bacula::storage_per_node { $::fqdn: }
 
     @@bacula::node { $::fqdn:
-      bacula_client_port => $bacula::bacula_client_port,
+      port_fd => $port_fd,
     }
 
     @@concat::fragment { "bacula-dsa-client-list::${::fqdn}":
@@ -27,7 +31,7 @@ class bacula::client(
 
     # allow access from director
     Ferm::Rule::Simple <<| tag == "bacula::director-to-fd::${bacula::bacula_director_address}" |>> {
-      port => $bacula::bacula_client_port,
+      port => $port_fd,
     }
 
     # get access to the storage
@@ -62,7 +66,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 ${bacula::bacula_client_port} bacula-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'],