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

diff --git a/regress/scripts/bacula-dir.conf.errors.in b/regress/scripts/bacula-dir.conf.errors.in
index b83c91cf3c..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@"
@@ -51,14 +51,14 @@ Job {
 FileSet {
  Name = FS_TEST
  Include {
-   File=</tmp/file-list
+   File=<@tmpdir@/file-list
  }
 }
 
 FileSet {
  Name = FS_REMOTE_INC_ERR
  Include {
-   File="\</tmp/path/to/nowhere"
+   File="\<@tmpdir@/path/to/nowhere"
  }
 }
 
@@ -74,14 +74,14 @@ Job {
 
 FileSet {
  Name = FS_LOCAL_INC_ERR
- Include { File=</tmp/path/to/nowhere }
+ Include { File=<@tmpdir@/path/to/nowhere }
 }
 
 FileSet {
  Name = FS_LOCAL_EXCL_ERR
- Include { File=</tmp/file-list }
+ Include { File=<@tmpdir@/file-list }
  Exclude {
-   File=</tmp/path/to/nowhere
+   File=<@tmpdir@/path/to/nowhere
  }
 }
 
@@ -98,9 +98,9 @@ Job {
 
 FileSet {
  Name = FS_REMOTE_EXCL_ERR
- Include { File=</tmp/file-list }
+ Include { File=<@tmpdir@/file-list }
  Exclude {
-   File="\</tmp/path/to/nowhere"
+   File="\<@tmpdir@/path/to/nowhere"
  }
 }
 
@@ -157,7 +157,7 @@ Job {
 Client {
   Name = @hostname@-fd
   Address = @hostname@
-  FDPort = 8102
+  FDPort = @fdport@
   Catalog = MyCatalog
   Password = "xevrjURYoCHhn26RaJoWbeWXEY/a3VqGKp/37tgWiuHc"          # password for FileDaemon
   File Retention = 30d                # 30 days
@@ -183,7 +183,7 @@ 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
@@ -204,13 +204,15 @@ Storage {
 # 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