X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Fscripts%2Fbacula-dir-2d.conf.in;h=5177704370aa65e2824e2aaa40fe43aefae8e68a;hb=c99909eacca3fe7383aebaf0c99c4b8b58e71c39;hp=8a4080bff809c29097e001e8b3cc3582cf3c53b8;hpb=bbbb74d4ce338cee9af5d0db1e16265224b64ddb;p=bacula%2Fbacula

diff --git a/regress/scripts/bacula-dir-2d.conf.in b/regress/scripts/bacula-dir-2d.conf.in
index 8a4080bff8..5177704370 100644
--- a/regress/scripts/bacula-dir-2d.conf.in
+++ b/regress/scripts/bacula-dir-2d.conf.in
@@ -30,13 +30,14 @@ Job {
   Type = Backup
   Client=@hostname@-fd
   FileSet="Full Set"
-  Storage = DDS-4
+  Storage = tape
   Messages = Standard
   Pool = Default
   Write Bootstrap = "@working_dir@/NightlySave.bsr"
   Maximum Concurrent Jobs = 4
   SpoolData = yes
 # Prefer Mounted Volumes = no
+  Max Run Time = 30min
 }
 
 # Standard Restore template, to be changed by Console program
@@ -45,10 +46,11 @@ Job {
   Type = Restore
   Client=@hostname@-fd
   FileSet="Full Set"
-  Storage = DDS-4
+  Storage = tape
   Messages = Standard
   Pool = Default
   Where = @tmpdir@/bacula-restores
+  Max Run Time = 30min
 }
 
 
@@ -87,12 +89,12 @@ Client {
 
 # Definition of DDS tape storage device
 Storage {
-  Name = DDS-4
+  Name = tape
   Address = @hostname@               # N.B. Use a fully qualified name here
   SDPort = @sdport@
   Password = "storage-pw"
-  Device = DDS-4                      # must be same as Device in Storage daemon
-  Media Type = DDS-4                  # must be same as MediaType in Storage daemon
+  Device = tape                      # must be same as Device in Storage daemon
+  Media Type = tape                  # must be same as MediaType in Storage daemon
   Maximum Concurrent Jobs = 4
   Autochanger = yes
 }
@@ -132,6 +134,7 @@ Messages {
 #          also keep all your messages if the scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
 #
@@ -142,6 +145,7 @@ Messages {
 # mail = @job_email@ = all, !skipped            
   console = all, !skipped, !saved
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }