From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 16 Aug 2012 14:23:18 +0000 (+0200)
Subject: Use filenames that reveal which pool a file belongs to
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f25d299bc65544b47e1eab5494139761ebbfcc46;p=mirror%2Fdsa-puppet.git

Use filenames that reveal which pool a file belongs to
---

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index 34d6c99d4..f4e41daa2 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -179,7 +179,7 @@ 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}"
+  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 %>"
   Volume Use Duration = 23h
   Maximum Volume Jobs = 1
   Maximum Volume Bytes = 50G
@@ -192,7 +192,7 @@ 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}"
+  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"
   Volume Use Duration = 23h
   Maximum Volume Jobs = 1
   Maximum Volume Bytes = 50G
@@ -205,7 +205,7 @@ 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}"
+  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"
   Volume Use Duration = 23h
   Maximum Volume Jobs = 1
   Maximum Volume Bytes = 50G