Update

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

diff --git a/regress/scripts/bacula-dir.conf.errors.in b/regress/scripts/bacula-dir.conf.errors.in
index 46bdc23db96a170f11dd04e1afb61279983b8b6f..b83c91cf3cb821eb308228495dedb29bb6b45633 100644 (file)
--- a/regress/scripts/bacula-dir.conf.errors.in
+++ b/regress/scripts/bacula-dir.conf.errors.in
@@ -22,13 +22,15 @@ Director {                            # define myself
   Maximum Concurrent Jobs = 4
   Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3"         # Console password
   Messages = Standard
+  fdconnecttimeout = 20
+  sdconnecttimeout = 20
 }
 
 JobDefs {
   Name = "DefaultJob"
   Type = Backup
   Level = Incremental
-  Client = @hostname@-fd 
+  client=@hostname@-fd 
   Storage = File
   Messages = Standard
   Pool = Default
@@ -37,9 +39,9 @@ JobDefs {
 }
 
 Job {
-  Name = "LOCAL_INC_ERROR"
+  Name = "LOCAL_INC_ERR"
   JobDefs = DefaultJob
-  FileSet = FS_LOCAL_INC_ERROR
+  FileSet = FS_LOCAL_INC_ERR
   RunBeforeJob = "/bin/echo RunBeforeJob"
   ClientRunBeforeJob = "/bin/echo ClientRunBeforeJob"
   Run After Job = "/bin/echo RunAfterJob"
@@ -47,16 +49,23 @@ Job {
 }
 
 FileSet {
- Name = FS_REMOTE_INC_ERROR
+ Name = FS_TEST
+ Include {
+   File=</tmp/file-list
+ }
+}
+
+FileSet {
+ Name = FS_REMOTE_INC_ERR
  Include {
    File="\</tmp/path/to/nowhere"
  }
 }
 
 Job {
-  Name = "REMOTE_INC_ERROR"
+  Name = "REMOTE_INC_ERR"
   JobDefs = DefaultJob
-  FileSet = FS_REMOTE_INC_ERROR
+  FileSet = FS_REMOTE_INC_ERR
   RunBeforeJob = "/bin/echo RunBeforeJob"
   ClientRunBeforeJob = "/bin/echo ClientRunBeforeJob"
   Run After Job = "/bin/echo RunAfterJob"
@@ -64,12 +73,12 @@ Job {
 }
 
 FileSet {
- Name = FS_LOCAL_INC_ERROR
+ Name = FS_LOCAL_INC_ERR
  Include { File=</tmp/path/to/nowhere }
 }
 
 FileSet {
- Name = FS_LOCAL_EXCL_ERROR
+ Name = FS_LOCAL_EXCL_ERR
  Include { File=</tmp/file-list }
  Exclude {
    File=</tmp/path/to/nowhere
@@ -77,9 +86,9 @@ FileSet {
 }
 
 Job {
-  Name = "LOCAL_EXCL_ERROR"
+  Name = "LOCAL_EXCL_ERR"
   JobDefs = DefaultJob
-  FileSet = FS_LOCAL_EXCL_ERROR
+  FileSet = FS_LOCAL_EXCL_ERR
   RunBeforeJob = "/bin/echo RunBeforeJob"
   ClientRunBeforeJob = "/bin/echo ClientRunBeforeJob"
   Run After Job = "/bin/echo RunAfterJob"
@@ -88,7 +97,7 @@ Job {
 
 
 FileSet {
- Name = FS_REMOTE_EXCL_ERROR
+ Name = FS_REMOTE_EXCL_ERR
  Include { File=</tmp/file-list }
  Exclude {
    File="\</tmp/path/to/nowhere"
@@ -96,9 +105,48 @@ FileSet {
 }
 
 Job {
-  Name = "REMOTE_EXCL_ERROR"
+  Name = "REMOTE_EXCL_ERR"
   JobDefs = DefaultJob
-  FileSet = FS_REMOTE_EXCL_ERROR
+  FileSet = FS_REMOTE_EXCL_ERR
+  RunBeforeJob = "/bin/echo RunBeforeJob"
+  ClientRunBeforeJob = "/bin/echo ClientRunBeforeJob"
+  Run After Job = "/bin/echo RunAfterJob"
+  ClientRunAfterJob = "/bin/echo ClientRunAfterJob"
+}
+Job {
+  Name = "REMOTE_RUNSCRIPT_ERR"
+  JobDefs = DefaultJob
+  FileSet = FS_TEST
+  RunBeforeJob = "/bin/echo RunBeforeJob"
+  ClientRunBeforeJob = "/bin/false"
+  Run After Job = "/bin/echo RunAfterJob"
+  ClientRunAfterJob = "/bin/echo ClientRunAfterJob"
+}
+Job {
+  Name = "LOCAL_RUNSCRIPT_ERR"
+  JobDefs = DefaultJob
+  FileSet = FS_TEST
+  RunBeforeJob = "/bin/false"
+  ClientRunBeforeJob = "/bin/echo ClientRunBeforeJob"
+  Run After Job = "/bin/echo RunAfterJob"
+  ClientRunAfterJob = "/bin/echo ClientRunAfterJob"
+}
+Job {
+  Name = "CLIENT_CONNECT_TIMEOUT"
+  JobDefs = DefaultJob
+  Client = @hostname@2-fd
+  FileSet = FS_TEST
+  RunBeforeJob = "/bin/echo RunBeforeJob"
+  ClientRunBeforeJob = "/bin/echo ClientRunBeforeJob"
+  Run After Job = "/bin/echo RunAfterJob"
+  ClientRunAfterJob = "/bin/echo ClientRunAfterJob"
+}
+Job {
+  Name = "SD_CONNECT_TIMEOUT"
+  JobDefs = DefaultJob
+  Client = @hostname@-fd
+  FileSet = FS_TEST
+  Storage = File2
   RunBeforeJob = "/bin/echo RunBeforeJob"
   ClientRunBeforeJob = "/bin/echo ClientRunBeforeJob"
   Run After Job = "/bin/echo RunAfterJob"
@@ -118,6 +166,19 @@ Client {
   Maximum Concurrent Jobs = 4
 }
 
+# Client (File Services) to backup
+Client {
+  Name = @hostname@2-fd
+  Address = @hostname@
+  FDPort = 7102
+  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
+}
+
 # Definiton of file storage device
 Storage {
   Name = File
@@ -129,6 +190,17 @@ Storage {
   Maximum Concurrent Jobs = 4
 }
 
+# Definiton of file storage device not responding
+Storage {
+  Name = File2
+  Address = @hostname@                # N.B. Use a fully qualified name here
+  SDPort = 7103
+  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
+  Device = FileStorage
+  Media Type = File2
+  Maximum Concurrent Jobs = 4
+}
+
 # Generic catalog service
 Catalog {
   Name = MyCatalog