X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Fscripts%2Fbacula-dir.conf.errors.in;h=c4e9151039be353ab4c81a55d11b45f150d137e4;hb=4a05ef50f00b6bf79a6229ba6df2cf9815f6556f;hp=5c7179539bb632b6baa026b29b7496eb9b551501;hpb=4416a647f22169c1ca579acc017aacf778fdb1c7;p=bacula%2Fbacula

diff --git a/regress/scripts/bacula-dir.conf.errors.in b/regress/scripts/bacula-dir.conf.errors.in
index 5c7179539b..c4e9151039 100644
--- a/regress/scripts/bacula-dir.conf.errors.in
+++ b/regress/scripts/bacula-dir.conf.errors.in
@@ -14,7 +14,7 @@
 
 Director {                            # define myself
   Name = @hostname@-dir
-  DIRport = 8101                # where we listen for UA connections
+  DIRPort = @dirport@                # where we listen for UA connections
   QueryFile = "@scriptdir@/query.sql"
   WorkingDirectory = "@working_dir@"
   PidDirectory = "@piddir@"
@@ -22,14 +22,15 @@ Director {                            # define myself
   Maximum Concurrent Jobs = 4
   Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3"         # Console password
   Messages = Standard
-  fdconnecttimeout = 10
+  fdconnecttimeout = 20
+  sdconnecttimeout = 20
 }
 
 JobDefs {
   Name = "DefaultJob"
   Type = Backup
   Level = Incremental
-  Client = @hostname@-fd 
+  client=@hostname@-fd 
   Storage = File
   Messages = Standard
   Pool = Default
@@ -38,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"
@@ -50,21 +51,21 @@ Job {
 FileSet {
  Name = FS_TEST
  Include {
-   File=</tmp/file-list
+   File=<@tmpdir@/file-list
  }
 }
 
 FileSet {
- Name = FS_REMOTE_INC_ERROR
+ Name = FS_REMOTE_INC_ERR
  Include {
-   File="\</tmp/path/to/nowhere"
+   File="\<@tmpdir@/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"
@@ -72,22 +73,22 @@ Job {
 }
 
 FileSet {
- Name = FS_LOCAL_INC_ERROR
- Include { File=</tmp/path/to/nowhere }
+ Name = FS_LOCAL_INC_ERR
+ Include { File=<@tmpdir@/path/to/nowhere }
 }
 
 FileSet {
- Name = FS_LOCAL_EXCL_ERROR
- Include { File=</tmp/file-list }
+ Name = FS_LOCAL_EXCL_ERR
+ Include { File=<@tmpdir@/file-list }
  Exclude {
-   File=</tmp/path/to/nowhere
+   File=<@tmpdir@/path/to/nowhere
  }
 }
 
 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"
@@ -96,24 +97,24 @@ Job {
 
 
 FileSet {
- Name = FS_REMOTE_EXCL_ERROR
- Include { File=</tmp/file-list }
+ Name = FS_REMOTE_EXCL_ERR
+ Include { File=<@tmpdir@/file-list }
  Exclude {
-   File="\</tmp/path/to/nowhere"
+   File="\<@tmpdir@/path/to/nowhere"
  }
 }
 
 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_ERROR"
+  Name = "REMOTE_RUNSCRIPT_ERR"
   JobDefs = DefaultJob
   FileSet = FS_TEST
   RunBeforeJob = "/bin/echo RunBeforeJob"
@@ -122,7 +123,7 @@ Job {
   ClientRunAfterJob = "/bin/echo ClientRunAfterJob"
 }
 Job {
-  Name = "LOCAL_RUNSCRIPT_ERROR"
+  Name = "LOCAL_RUNSCRIPT_ERR"
   JobDefs = DefaultJob
   FileSet = FS_TEST
   RunBeforeJob = "/bin/false"
@@ -140,12 +141,23 @@ Job {
   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"
+  ClientRunAfterJob = "/bin/echo ClientRunAfterJob"
+}
 
 # Client (File Services) to backup
 Client {
   Name = @hostname@-fd
   Address = @hostname@
-  FDPort = 8102
+  FDPort = @fdport@
   Catalog = MyCatalog
   Password = "xevrjURYoCHhn26RaJoWbeWXEY/a3VqGKp/37tgWiuHc"          # password for FileDaemon
   File Retention = 30d                # 30 days
@@ -171,23 +183,36 @@ Client {
 Storage {
   Name = File
   Address = @hostname@                # N.B. Use a fully qualified name here
-  SDPort = 8103
+  SDPort = @sdport@
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
   Device = FileStorage
   Media Type = File
   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
-  dbname = regress; user = regress; password = ""
+  @libdbi@
+  dbname = @db_name@; user = @db_user@; password = "@db_password@"
 }
 
 
 Messages {
   Name = Standard
   console = all, !skipped, !saved
+  catalog = all, !skipped
 }
 
 # Default pool definition