X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fdirector.pp;h=ca065c7d0a06e246f17fd28a96c908a68ce3dc3c;hb=92461482f97287c63b614ae7338594023711ce12;hp=bb6901dba8705534db0d9650ed45424305792a17;hpb=70cfaa97690aa58e4aed61a2f790e56b1ef0842c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index bb6901dba..ca065c7d0 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -8,6 +8,7 @@
 # @param port_dir       Port that the director should listen on
 # @param db_sslca       SSL CA store for DB access
 # @param director_name  bacula name of this dir instance
+# @param director_address  address of this sd instance that other instances should connect to (dns name)
 class bacula::director(
   String  $db_address,
   Integer $db_port,
@@ -16,14 +17,16 @@ class bacula::director(
   String  $pool_name = 'bacula',
   Integer $port_dir = 9101,
   Optional[String] $db_sslca = undef,
-  #String $storage_name    = "${::fqdn}-dir",
+  #String $director_name    = "${::fqdn}-dir",
   String $director_name = $bacula::bacula_director_name,
+  Stdlib::Host $director_address = $::fqdn,
 ) inherits bacula {
 
   # used by e.g. bconsole
   $director_secret = hkdf('/etc/puppet/secret', "bacula-dir-${::fqdn}")
-  # the RestoreFiles Job needs a Pool.  Any valid pool.
-  $some_pool_name = "poolfull-${pool_name}-${bacula::bacula_director_address}"
+  # the RestoreFiles Job needs a Pool and a client.  Any valid pool and client.
+  $some_pool_name = "poolfull-${pool_name}-${director_address}"
+  $some_client_name = "${director_address}-fd"
 
   ensure_packages ( [
     'bacula-director-pgsql',
@@ -144,7 +147,7 @@ class bacula::director(
     saddr       => $bacula::public_addresses,
   }
   @@ferm::rule::simple { "bacula::director-to-storage::${::fqdn}":
-    tag         => "bacula::director-to-storage::${::fqdn}",
+    tag         => 'bacula::director-to-storage',
     description => 'Allow bacula-storage access from the bacula-director',
     chain       => 'bacula-sd',
     saddr       => $bacula::public_addresses,