regress: tweak regress-win32 output

[bacula/bacula] / regress / scripts / win32-bacula-dir-tape.conf.in

diff --git a/regress/scripts/win32-bacula-dir-tape.conf.in b/regress/scripts/win32-bacula-dir-tape.conf.in
index 00a9364bb4632746a7dca213599d4be89eaf9d52..9086d5b29d1cae949ee9e916dbb255cbe9cfcc70 100644 (file)
--- a/regress/scripts/win32-bacula-dir-tape.conf.in
+++ b/regress/scripts/win32-bacula-dir-tape.conf.in
@@ -31,7 +31,7 @@ Job {
   Type = Backup
   Client=@win32_client@
   FileSet="Full Set"
-  Storage = DDS-4
+  Storage = tape
   Messages = Standard
   Pool = Default
   Write Bootstrap = "@working_dir@/NightlySave.bsr"
@@ -46,7 +46,7 @@ Job {
   Type = Restore
   Client=@win32_client@
   FileSet="Full Set"
-  Storage = DDS-4
+  Storage = tape
   Messages = Standard
   Pool = Default
   Where = @tmpdir@/bacula-restores
@@ -103,12 +103,12 @@ Client {
 
 # Definition of DDS tape storage device
 Storage {
-  Name = DDS-4
+  Name = tape
   Address = @hostname@-sd            # N.B. Use a fully qualified name here
   SDPort = @sdport@
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"          # password for Storage daemon
-  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
   AutoChanger = yes
   Maximum Concurrent Jobs = 4
 }
@@ -118,7 +118,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
@@ -136,6 +136,7 @@ Messages {
 #          also keep all your messages if the scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
 #
@@ -146,6 +147,7 @@ Messages {
 # mail = @job_email@ = all, !skipped            
   console = all, !skipped, !saved
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }