Move bacula::bacula_ssl_ca_path to hiera

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

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 8a63443..7a5b433 100644 (file)
--- a/modules/bacula/templates/director/dir-per-client-from-storage.erb
+++ b/modules/bacula/templates/director/dir-per-client-from-storage.erb
@@ -19,7 +19,7 @@ Storage {
 
   TLS Enable = yes
   TLS Require = yes
-  TLS CA Certificate File = "<%= @bacula_ca_path %>"
+  <%= scope['bacula::bacula_tls_ca_certificate_file'] %>
   # 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 %>"
@@ -33,7 +33,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 +48,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 +63,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