X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fdirector%2Fdir-per-client.erb;h=713bc3e132fedd64a8a004c184b43c2fb4644aa4;hb=e272b442942830a6eed50748eb63aa3b6318ca2b;hp=213bfe2e194a52f8d14f6ad3e8254325a9ebda08;hpb=3bd8e749b9f67f269b6be35438a7b9f34fbd1e02;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/director/dir-per-client.erb b/modules/bacula/templates/director/dir-per-client.erb
index 213bfe2e1..713bc3e13 100644
--- a/modules/bacula/templates/director/dir-per-client.erb
+++ b/modules/bacula/templates/director/dir-per-client.erb
@@ -7,11 +7,11 @@
 Job {
   Name = "<%= @client %>"
   JobDefs = "Standardbackup"
-  Client = <%= @bacula_client_name %>
+  Client = <%= @client_name %>
 
-  Pool = "poolfull-<%= @bacula_pool_name %>-<%= @client %>"
-  Differential Backup Pool = "pooldiff-<%= @bacula_pool_name %>-<%= @client %>"
-  Incremental Backup Pool = "poolinc-<%= @bacula_pool_name %>-<%= @client %>"
+  Pool = "poolfull-<%= @pool_name %>"
+  Differential Backup Pool = "pooldiff-<%= @pool_name %>"
+  Incremental Backup Pool = "poolinc-<%= @pool_name %>"
 
   Reschedule On Error = yes
   Reschedule Interval = 4 hours
@@ -23,11 +23,11 @@ Job {
 
 # Client (File Services) to backup
 Client {
-  Name = <%= @bacula_client_name %>
+  Name = <%= @client_name %>
   Address = <%= @client %>
   FDPort = <%= @port_fd %>
   Catalog = MyCatalog
-  Password = "<%= @bacula_client_secret %>"
+  Password = "<%= @client_secret %>"
   File Retention = 30 days
   Job Retention = 3 months
   AutoPrune = yes
@@ -40,79 +40,3 @@ Client {
   TLS Key = "<%= @bacula_ssl_client_key %>"
 }
 
-########################################################################
-# Storage config                                                       #
-########################################################################
-
-Storage {
-  Name = "<%= @bacula_filestor_name %>-<%= @client %>"
-  Address = <%= @bacula_storage_address %>
-  SDPort = <%= @bacula_storage_port %>
-  Password = "<%= @bacula_storage_secret %>"
-  Device = "<%= @bacula_filestor_device %>-<%= @client %>"
-  Media Type = "<%= @bacula_filestor_name %>-<%= @client %>"
-  Maximum Concurrent Jobs = 10
-
-  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 %>"
-}
-
-########################################################################
-# Pool definition                                                      #
-########################################################################
-Pool {
-  Name = "poolfull-<%=@bacula_pool_name%>-<%= @client %>"
-  Pool Type = Backup
-  Storage = "<%=@bacula_filestor_name%>-<%= @client %>"
-  AutoPrune = yes
-  Volume Retention = 100 days
-  Label Format = "<%= @bacula_pool_name %>-full-<%= @client %>.${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
-  Maximum Volume Bytes = 500G
-  Action On Purge = Truncate
-  Recycle = yes
-  RecyclePool = "poolgraveyard-<%=@bacula_pool_name%>-<%= @client %>"
-}
-
-Pool {
-  Name = "pooldiff-<%=@bacula_pool_name%>-<%= @client %>"
-  Pool Type = Backup
-  Storage = "<%=@bacula_filestor_name%>-<%= @client %>"
-  AutoPrune = yes
-  Volume Retention = 50 days
-  Label Format = "<%= @bacula_pool_name %>-diff-<%= @client %>.${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
-  Maximum Volume Bytes = 500G
-  Action On Purge = Truncate
-  Recycle = yes
-  RecyclePool = "poolgraveyard-<%=@bacula_pool_name%>-<%= @client %>"
-}
-
-Pool {
-  Name = "poolinc-<%=@bacula_pool_name%>-<%= @client %>"
-  Pool Type = Backup
-  Storage = "<%=@bacula_filestor_name%>-<%= @client %>"
-  AutoPrune = yes
-  Volume Retention = 30 days
-  Label Format = "<%= @bacula_pool_name %>-inc-<%= @client %>.${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
-  Maximum Volume Bytes = 500G
-  Action On Purge = Truncate
-  Recycle = yes
-  RecyclePool = "poolgraveyard-<%=@bacula_pool_name%>-<%= @client %>"
-}
-
-Pool {
-  Name = "poolgraveyard-<%=@bacula_pool_name%>-<%= @client %>"
-  Pool Type = Backup
-  Storage = "<%=@bacula_filestor_name%>-<%= @client %>"
-  Recycle = yes
-  RecyclePool = "poolgraveyard-<%=@bacula_pool_name%>-<%= @client %>"
-}