X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fdirector%2Fclient.pp;h=09117c66b5c6f0cd867681c3948cfcba098bb005;hb=6ae58e7c927c8ce440ad7eb7728f548c0ff8c754;hp=dc4dafc5e62090ba7d21866c08464d501424923f;hpb=60e3d192b636a817ee75524e75d4e8c953841a49;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/director/client.pp b/modules/bacula/manifests/director/client.pp
index dc4dafc5e..09117c66b 100644
--- a/modules/bacula/manifests/director/client.pp
+++ b/modules/bacula/manifests/director/client.pp
@@ -2,27 +2,25 @@
 #
 # This is stored config by a client, collected on the director
 #
-# @param port_fd   port that this node's bacula-fd is listening on
-# @param client The name of the client (relevant for device names, media type names, etc.)
+# @param port_fd       port that this node's bacula-fd is listening on
+# @param client        name of the client (relevant for device names, media type names, etc.)
+# @param client_name   bacula client name
+# @param client_secret shared secret between director and client
 define bacula::director::client (
-  Integer $port_fd = 9102,
-  String $client = $name,
+  Integer $port_fd,
+  Stdlib::Host $client = $name,
+  String $client_name,
+  String $client_secret,
 ) {
-  include bacula
+  include bacula::director
 
-  $bacula_pool_name         = $bacula::bacula_pool_name
-  $bacula_filestor_name     = $bacula::bacula_filestor_name
-  $bacula_filestor_device   = $bacula::bacula_filestor_device
-  $bacula_storage_address   = $bacula::bacula_storage_address
-  $bacula_storage_port      = $bacula::bacula_storage_port
-  $bacula_storage_secret    = $bacula::bacula_storage_secret
-
-  $bacula_ca_path       = $bacula::bacula_ca_path
+  $bacula_ca_path         = $bacula::bacula_ca_path
   $bacula_ssl_client_cert = $bacula::bacula_ssl_client_cert
   $bacula_ssl_client_key  = $bacula::bacula_ssl_client_key
 
-  $bacula_client_name   = "${client}-fd"
-  $bacula_client_secret = hkdf('/etc/puppet/secret', "bacula-fd-${client}")
+  # we define this in both bacula::director::client_from_storage and
+  # bacula::director::client and it needs to match.
+  $pool_name     = "${bacula::director::pool_name}-${client}"
 
   file { "/etc/bacula/conf.d/${client}.conf":
     content => template('bacula/director/dir-per-client.erb'),
@@ -30,12 +28,5 @@ define bacula::director::client (
     group   => bacula,
     notify  => Exec['bacula-director reload']
   }
-
-  file { "/etc/bacula/storages-list.d/${client}.storage":
-    content => "${bacula::bacula_filestor_client}-${client}\n",
-    mode    => '0440',
-    group   => bacula,
-    notify  => Exec['bacula-director reload']
-  }
 }