use bacula service

[dsa-puppet.git] / modules / bacula / templates / bacula-dir.conf.erb

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index 862cb6a3ac126b2f721b55dcb0e478731f9abf8b..66ff569f9d4600bd98ef6cec4b0256b0c3b6d0da 100644 (file)
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -97,9 +97,9 @@ Schedule {
 ########################################################################
 Catalog {
   Name = MyCatalog
-  dbname = bacula;
-  DB Address = "<%= bacula_db_address %>";
-  DB Port = <%= bacula_db_port %>;
+  dbname = "service = bacula";
+  #DB Address = "<%= bacula_db_address %>";
+  #DB Port = <%= bacula_db_port %>;
   dbuser = "bacula";
   dbpassword = "<%= bacula_db_secret %>"
 }
@@ -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
@@ -159,7 +159,6 @@ JobDefs {
   Level = Incremental
   FileSet = "Standard Set"
   Schedule = "WeeklyCycle"
-  Storage = <%=bacula_filestor_name%>
   Messages = Standard
   Pool = <%=bacula_pool_name%>
   Differential Backup Pool = <%=bacula_pool_name%>diff
@@ -168,6 +167,21 @@ JobDefs {
   Priority = 10
   Write Bootstrap = "/var/lib/bacula/%c.bsr"
   Maximum Concurrent Jobs = 20
+  Client Run After Job = "/usr/local/sbin/postbaculajob -c \"%c\" -d \"%d\" -i \"%i\" -l \"%l\" -n \"%n\" -o /var/log/bacula-main.log"
+}
+
+########################################################################
+# Standard Restore template, to be changed by Console program          #
+#  Only one such job is needed for all Jobs/Clients/Storage ...        #
+########################################################################
+Job {
+  Name = "RestoreFiles"
+  Type = Restore
+  Client = draghi.debian.org-fd
+  FileSet = "Standard Set"
+  Pool = <%=bacula_pool_name%>
+  Messages = Standard
+  Where = /var/tmp/bacula-restores
 }
 
 ########################################################################
@@ -176,12 +190,13 @@ JobDefs {
 Pool {
   Name = <%= bacula_pool_name %>
   Pool Type = Backup
+  Storage = <%=bacula_filestor_name%>
   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 = "<%= 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
 }
@@ -189,12 +204,13 @@ Pool {
 Pool {
   Name = <%= bacula_pool_name %>diff
   Pool Type = Backup
+  Storage = <%=bacula_filestor_name%>
   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 = "<%= 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
 }
@@ -202,12 +218,13 @@ Pool {
 Pool {
   Name = <%= bacula_pool_name %>inc
   Pool Type = Backup
+  Storage = <%=bacula_filestor_name%>
   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 = "<%= 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
 }