From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 17 Aug 2012 10:04:35 +0000 (+0200)
Subject: Get rid of per-client volumes.  It does not work correctly
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=097c966c4820fa3143d0d328a14ce9e60ec819e7

Get rid of per-client volumes.  It does not work correctly
---

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index f7f2b8dd..27ff8efb 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -193,9 +193,9 @@ Pool {
   Recycle = no
   AutoPrune = yes
   Volume Retention = 1 year
-  Label Format = "${Client}-${Year}-${Month:p/2/0/r}-${Day:p/2/0/r}_${Hour:p/2/0/r}:${Minute:p/2/0/r}.<%= bacula_pool_name %>"
+  Label Format = "<%= bacula_pool_name %>.${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 Jobs = 1
   Maximum Volume Bytes = 50G
   Action On Purge = Truncate
 }
@@ -206,9 +206,9 @@ Pool {
   Recycle = no
   AutoPrune = yes
   Volume Retention = 1 year
-  Label Format = "${Client}-${Year}-${Month:p/2/0/r}-${Day:p/2/0/r}_${Hour:p/2/0/r}:${Minute:p/2/0/r}.<%= bacula_pool_name %>diff"
+  Label Format = "<%= bacula_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
+  #Maximum Volume Jobs = 1
   Maximum Volume Bytes = 50G
   Action On Purge = Truncate
 }
@@ -219,9 +219,9 @@ Pool {
   Recycle = no
   AutoPrune = yes
   Volume Retention = 1 year
-  Label Format = "${Client}-${Year}-${Month:p/2/0/r}-${Day:p/2/0/r}_${Hour:p/2/0/r}:${Minute:p/2/0/r}.<%= bacula_pool_name %>inc"
+  Label Format = "<%= bacula_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
+  #Maximum Volume Jobs = 1
   Maximum Volume Bytes = 50G
   Action On Purge = Truncate
 }