Tweak git2changelog script

[bacula/bacula] / regress / scripts / test-bacula-dir.conf.in

diff --git a/regress/scripts/test-bacula-dir.conf.in b/regress/scripts/test-bacula-dir.conf.in
index e1fe75e18d631e52203ef85c5e869519f4fb33ca..9718e0796470a65ceceba6d0a76fee3774a535c8 100644 (file)
--- a/regress/scripts/test-bacula-dir.conf.in
+++ b/regress/scripts/test-bacula-dir.conf.in
@@ -38,6 +38,7 @@ Job {
   Write Bootstrap = "@working_dir@/NightlySave.bsr"
   Maximum Concurrent Jobs = 4
   SpoolData=yes
+  Max Run Time = 30min
 }
 
 Job {
@@ -49,6 +50,7 @@ Job {
   Messages = Standard
   Pool = Default
   Write Bootstrap = "@working_dir@/NightlySave.bsr"
+  Max Run Time = 30min
 }
 
 
@@ -62,6 +64,7 @@ Job {
   Messages = Standard
   Pool = Default
   Write Bootstrap = "@working_dir@/NightlySave.bsr"
+  Max Run Time = 30min
 }
 
 
@@ -74,6 +77,7 @@ Job {
   Messages = Standard
   Pool = Default
   Write Bootstrap = "@working_dir@/NightlySave.bsr"
+  Max Run Time = 30min
 }
 
 Job {
@@ -86,6 +90,7 @@ Job {
   Pool = Default
   Maximum Concurrent Jobs = 4
   Write Bootstrap = "@working_dir@/NightlySave.bsr"
+  Max Run Time = 30min
 # Max Run Time = 15 seconds
 }
 
@@ -98,6 +103,7 @@ Job {
   Messages = Standard
   Pool = Default
   Write Bootstrap = "@working_dir@/NightlySave.bsr"
+  Max Run Time = 30min
 }
 
 
@@ -116,6 +122,7 @@ Job {
   # This deletes the copy of the catalog
   RunAfterJob  = "@sbindir@/delete_catalog_backup"
   Write Bootstrap = "@working_dir@/BackupCatalog.bsr"
+  Max Run Time = 30min
 }
 
 # Standard Restore template, to be changed by Console program
@@ -128,6 +135,7 @@ Job {
   Messages = Standard
   Pool = Default
   Where = @tmpdir@/bacula-restores
+  Max Run Time = 30min
 }
 
 
@@ -243,7 +251,7 @@ Storage {
 #  SDPort = @sdport@
 #  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"          # password for Storage daemon
 #  Device = SDT-10000                  # must be same as Device in Storage daemon
-#  Media Type = DDS-4                  # must be same as MediaType in Storage daemon
+#  Media Type = tape                  # must be same as MediaType in Storage daemon
 #}
 
 # Definition of 8mm tape storage device
@@ -261,7 +269,7 @@ Storage {
 Catalog {
   Name = MyCatalog
   @libdbi@
-  dbname = regress; user = regress; password = ""
+  dbname = @db_name@; user = @db_user@; password = "@db_password@"
 }
 
 # Reasonable message delivery -- send most everything to email address
@@ -279,6 +287,7 @@ Messages {
 #          also keep all your messages if the scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
 Messages {
@@ -291,6 +300,7 @@ Messages {
 #          also keep all your messages if the scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
 #