X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-dir.conf.erb;h=f4e41daa2f27ee51f21a843c22c3166fe7cca257;hb=f25d299bc65544b47e1eab5494139761ebbfcc46;hp=862cb6a3ac126b2f721b55dcb0e478731f9abf8b;hpb=e812cb06d99be72f687b9df15d54448c334d77d5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index 862cb6a3a..f4e41daa2 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -111,7 +111,7 @@ Messages {
   Name = Standard
   mailcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
   operatorcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
-  mail = <%= bacula_operator_email %> = all, !skipped
+  mail on error = <%= bacula_operator_email %> = all, !skipped
   operator = <%= bacula_operator_email %> = mount
   console = all, !skipped, !saved
   append = "/var/lib/bacula/log" = all, !skipped
@@ -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