X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fper-client.conf.erb;h=32b440da4a098fecfdbe1b93ba668665290f46bc;hb=d3619a7f24c33ccb40bb762d31761c3c82d64922;hp=5451b460aa4e262d41387f4254ec5cdc444b9659;hpb=e96e72674696752c5a15e7618677b704919f4dc8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/per-client.conf.erb b/modules/bacula/templates/per-client.conf.erb
index 5451b460a..32b440da4 100644
--- a/modules/bacula/templates/per-client.conf.erb
+++ b/modules/bacula/templates/per-client.conf.erb
@@ -29,9 +29,9 @@ Client {
   FDPort = <%= bacula_client_port %>
   Catalog = MyCatalog
   Password = "<%= bacula_client_secret %>"
-  File Retention = 30 days            # 30 days
-  Job Retention = 6 months            # six months
-  AutoPrune = yes                     # Prune expired Jobs/Files
+  File Retention = 30 days
+  Job Retention = 3 months
+  AutoPrune = yes
 
   Heartbeat Interval = 180
 
@@ -71,40 +71,51 @@ Pool {
   Name = "poolfull-<%=bacula_pool_name%>-<%= client %>"
   Pool Type = Backup
   Storage = "<%=bacula_filestor_name%>-<%= client %>"
-  Recycle = no
   AutoPrune = yes
-  Volume Retention = 1 year
+  Volume Retention = 3 months
   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 = 50G
   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 %>"
-  Recycle = no
   AutoPrune = yes
-  Volume Retention = 1 year
+  Volume Retention = 2 months
   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 = 50G
   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 %>"
-  Recycle = no
   AutoPrune = yes
-  Volume Retention = 2 months
+  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 = 50G
   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 %>"
 }