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

[mirror/dsa-puppet.git] / modules / bacula / templates / director / dir-per-client.erb

diff --git a/modules/bacula/templates/director/dir-per-client.erb b/modules/bacula/templates/director/dir-per-client.erb
index 713bc3e..23757a7 100644 (file)
--- a/modules/bacula/templates/director/dir-per-client.erb
+++ b/modules/bacula/templates/director/dir-per-client.erb
@@ -28,15 +28,14 @@ Client {
   FDPort = <%= @port_fd %>
   Catalog = MyCatalog
   Password = "<%= @client_secret %>"
-  File Retention = 30 days
-  Job Retention = 3 months
+  File Retention = <%= @file_retention %>
+  Job Retention = <%= @job_retention %>
   AutoPrune = yes
 
   TLS Enable = yes
   TLS Require = yes
-  TLS CA Certificate File = "<%= @bacula_ca_path %>"
-  # This is a client certificate, used by the director to connect to the client's file daemon
-  TLS Certificate = "<%= @bacula_ssl_client_cert %>"
-  TLS Key = "<%= @bacula_ssl_client_key %>"
+  <%= scope['bacula::bacula_tls_ca_certificate_file'] %>
+  <%= scope['bacula::bacula_tls_client_certificate'] %>
+  <%= scope['bacula::bacula_tls_client_key'] %>
 }