X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fdirector%2Fdir-per-client-from-storage.erb;h=70e87e43a8066606faaa4a14d22da8df7a44ec55;hb=63016bb3a6b7266c022f7d7e2398a0360d476fd5;hp=8a634430ecef63b06c6dac81f88180a852c87d76;hpb=e272b442942830a6eed50748eb63aa3b6318ca2b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/director/dir-per-client-from-storage.erb b/modules/bacula/templates/director/dir-per-client-from-storage.erb
index 8a634430e..70e87e43a 100644
--- a/modules/bacula/templates/director/dir-per-client-from-storage.erb
+++ b/modules/bacula/templates/director/dir-per-client-from-storage.erb
@@ -19,10 +19,9 @@ Storage {
 
   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 storage 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'] %>
 }
 
 ########################################################################
@@ -33,7 +32,7 @@ Pool {
   Pool Type = Backup
   Storage = "<%= @storage_name %>"
   AutoPrune = yes
-  Volume Retention = 100 days
+  Volume Retention = <%= @volume_retention_full %>
   Label Format = "<%= @pool_name %>-full.${Year}-${Month:p/2/0/r}-${Day:p/2/0/r}_${Hour:p/2/0/r}:${Minute:p/2/0/r}"
   Volume Use Duration = 23h
   Maximum Volume Jobs = 1
@@ -48,7 +47,7 @@ Pool {
   Pool Type = Backup
   Storage = "<%= @storage_name %>"
   AutoPrune = yes
-  Volume Retention = 50 days
+  Volume Retention = <%= @volume_retention_diff %>
   Label Format = "<%= @pool_name %>-diff.${Year}-${Month:p/2/0/r}-${Day:p/2/0/r}_${Hour:p/2/0/r}:${Minute:p/2/0/r}"
   Volume Use Duration = 23h
   Maximum Volume Jobs = 1
@@ -63,7 +62,7 @@ Pool {
   Pool Type = Backup
   Storage = "<%= @storage_name %>"
   AutoPrune = yes
-  Volume Retention = 30 days
+  Volume Retention = <%= @volume_retention_inc %>
   Label Format = "<%= @pool_name %>-inc.${Year}-${Month:p/2/0/r}-${Day:p/2/0/r}_${Hour:p/2/0/r}:${Minute:p/2/0/r}"
   Volume Use Duration = 23h
   Maximum Volume Jobs = 1