Use filenames that reveal which pool a file belongs to

[mirror/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 8497166..f4e41da 100644 (file)
--- 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 = 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
@@ -173,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
@@ -186,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
@@ -199,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
@@ -216,28 +222,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                            #