Move bacula::bacula_ssl_{server,client}_{cert,key} to hiera

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

diff --git a/modules/bacula/manifests/director/client.pp b/modules/bacula/manifests/director/client.pp
index 16ce4f5..0d356a6 100644 (file)
--- a/modules/bacula/manifests/director/client.pp
+++ b/modules/bacula/manifests/director/client.pp
@@ -2,22 +2,22 @@
 #
 # 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        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
+# @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
+# @param file_retention  how long to keep information about which files are in which volumes/jobs
+# @param job_retention   how long to keep job records
 define bacula::director::client (
   Integer $port_fd,
-  String $client = $name,
-  String $client_name = "${client}-fd", # XXX remove default
-  String $client_secret = hkdf('/etc/puppet/secret', "bacula-fd-${client}"), # XXX remove default
+  Stdlib::Host $client = $name,
+  String $client_name,
+  String $client_secret,
+  String $file_retention = '30 days', # XXX remove defaults
+  String $job_retention = '100 days', # XXX remove defaults
 ) {
   include bacula::director
 
-  $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
-
   # 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}"