X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-dir.conf.erb;h=66ff569f9d4600bd98ef6cec4b0256b0c3b6d0da;hb=176461aa7cca59f5a33c1a58953886f52f11630b;hp=8497166f38e5fb44c2e18c688377a41bb3b8124d;hpb=906b5255d354084be68d77503a1b57639fc16376;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index 8497166f3..66ff569f9 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -53,6 +53,8 @@ FileSet {
     File = /var/run
     File = /var/lock
     File = /dev
+    File = /srv/chroot
+    File = /home/buildd/build-trees
   }
 }
 
@@ -95,7 +97,11 @@ Schedule {
 ########################################################################
 Catalog {
   Name = MyCatalog
-  dbname = bacula; DB Address = ""; dbuser = "bacula"; dbpassword = "s3kr1t"
+  dbname = "service = bacula";
+  #DB Address = "<%= bacula_db_address %>";
+  #DB Port = <%= bacula_db_port %>;
+  dbuser = "bacula";
+  dbpassword = "<%= bacula_db_secret %>"
 }
 
 ########################################################################
@@ -105,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
@@ -153,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
@@ -162,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
 }
 
 ########################################################################
@@ -170,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
 }
@@ -183,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
 }
@@ -196,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
 }
@@ -216,28 +239,26 @@ Pool {
 # Generic jobs                                                         #
 ########################################################################
 # Backup the catalog database (after the nightly save)
-Job {
-  Name = "BackupCatalog"
-  JobDefs = "Standardbackup"
-  Level = Full
-  FileSet="Catalog"
-  Schedule = "WeeklyCycleAfterBackup"
-  # This creates an ASCII copy of the catalog
-  # Arguments to make_catalog_backup.pl are:
-  #  make_catalog_backup.pl <catalog-name>
-  RunBeforeJob = "/etc/bacula/scripts/make_catalog_backup.pl MyCatalog"
-  # This deletes the copy of the catalog
-  RunAfterJob  = "/etc/bacula/scripts/delete_catalog_backup"
-  Write Bootstrap = "/var/lib/bacula/%n.bsr"
-  Priority = 15    # run after main backup
-  RunScript {
-        RunsWhen=After
-	    RunsOnClient=No
-	    Console = "purge volume action=all allpools storage=File"
-  }
- # Wonder how i can get this to be dynamic. FIXME.
- Client = barbrady-fd
-}
+#Job {
+#  Name = "BackupCatalog"
+#  JobDefs = "Standardbackup"
+#  Level = Full
+#  FileSet="Catalog"
+#  Schedule = "WeeklyCycleAfterBackup"
+#  # This creates an ASCII copy of the catalog
+#  # Arguments to make_catalog_backup.pl are:
+#  #  make_catalog_backup.pl <catalog-name>
+#  RunBeforeJob = "/etc/bacula/scripts/make_catalog_backup.pl MyCatalog"
+#  # This deletes the copy of the catalog
+#  RunAfterJob  = "/etc/bacula/scripts/delete_catalog_backup"
+#  Write Bootstrap = "/var/lib/bacula/%n.bsr"
+#  Priority = 15    # run after main backup
+#  RunScript {
+#        RunsWhen=After
+#	    RunsOnClient=No
+#	    Console = "purge volume action=all allpools storage=File"
+#  }
+#}
 
 ########################################################################
 # And now include all the generated configs                            #