ebl update for next-vol test

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

diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in
index 05bfa5b38eb4644e0abcc4691cc2a01eccec950b..5a581bbb8ebd71e045dd95c567762be46a93e36d 100644 (file)
--- a/regress/scripts/bacula-dir-tape.conf.in
+++ b/regress/scripts/bacula-dir-tape.conf.in
@@ -30,25 +30,7 @@ Director {                            # define myself
 Job {
   Name = "NightlySave"
   Type = Backup
-  Client=@hostname@-fd 
-  FileSet="Full Set"
-  Storage = DDS-4
-  Messages = Standard
-  Pool = Default
-  Write Bootstrap = "@working_dir@/NightlySave.bsr"
-  Maximum Concurrent Jobs = 4
-  SpoolData = yes
-# Prefer Mounted Volumes = no
-}
-
-#
-# Note, this client does not exist so the job will
-#   fail
-#
-Job {
-  Name = "Offline"
-  Type = Backup
-  Client=@hostname@-fd1
+  Client = @hostname@-fd 
   FileSet="Full Set"
   Storage = DDS-4
   Messages = Standard
@@ -63,7 +45,7 @@ Job {
 Job {
   Name = "NightlySave1"
   Type = Backup
-  Client=@hostname@-fd 
+  Client = @hostname@-fd 
   FileSet="Full Set"
   Storage = DDS-4
   Messages = Standard
@@ -178,19 +160,6 @@ Client {
   Maximum Concurrent Jobs = 4
 }
 
-Client {
-  Name = @hostname@-fd1
-  Address = @hostname@
-  FDPort = 1@fdport@                # nothing should be on this port!!!!!
-  Catalog = MyCatalog
-  Password = "xevrjURYoCHhn26RaJoWbeWXEY/a3VqGKp/37tgWiuHc"          # password for FileDaemon
-  File Retention = 30d                # 30 days
-  Job Retention = 180d                # six months
-  AutoPrune = yes                     # Prune expired Jobs/Files
-  Maximum Concurrent Jobs = 4
-}
-
-
 # Definition of DDS tape storage device
 Storage {
   Name = DDS-4
@@ -233,7 +202,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