Update virtual regress comments

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

diff --git a/regress/scripts/testa-bacula-dir.conf.in b/regress/scripts/testa-bacula-dir.conf.in
index 2eb5a04c7a3c14a3bbcfee1749a4176355b58e27..84f1a4420dfa1ae8e9af0d65cd3b9d6272ae337d 100644 (file)
--- a/regress/scripts/testa-bacula-dir.conf.in
+++ b/regress/scripts/testa-bacula-dir.conf.in
@@ -6,7 +6,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@"
@@ -54,7 +54,7 @@ Job {
   Storage = File
   Messages = Standard
   Pool = Default
-  Where = /tmp/bacula-restores
+  Where = @tmpdir@/bacula-restores
 }
 
 
@@ -62,7 +62,7 @@ Job {
 FileSet {
   Name = "Full Set"
   Include { Options { signature=SHA1 }
-    File =</tmp/file-list
+    File =<@tmpdir@/file-list
   }
 }
 
@@ -71,7 +71,7 @@ FileSet {
 Client {
   Name = @hostname@-fd
   Address = @hostname@
-  FDPort = 8102
+  FDPort = @fdport@
   Catalog = MyCatalog
   Password = "xevrjURYoCHhn26RaJoWbeWXEY/a3VqGKp/37tgWiuHc"          # password for FileDaemon
   File Retention = 30d                # 30 days
@@ -83,7 +83,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
@@ -92,7 +92,7 @@ Storage {
 Storage {
   Name = File1
   Address = @hostname@                # N.B. Use a fully qualified name here
-  SDPort = 8103
+  SDPort = @sdport@
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
   Device = FileStorage1
   Media Type = File1
@@ -102,7 +102,8 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
-  dbname = regress; user = regress; password = ""
+  @libdbi@
+  dbname = @db_name@; user = @db_user@; password = "@db_password@"
 }
 
 # Reasonable message delivery -- send most everything to email address
@@ -111,11 +112,12 @@ Messages {
   Name = Standard
   mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula regression\) %r\" -s \"Regression: %t %e of %c %l\" %r"
   operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula regression\) %r\" -s \"Regression: Intervention needed for %j\" %r"
-  MailOnError = @job_email@ = all, !terminate
-  operator = @job_email@ = mount
+# MailOnError = @job_email@ = all, !terminate
+# operator = @job_email@ = mount
   console = all, !skipped, !terminate
 
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
 Messages {
@@ -123,6 +125,7 @@ Messages {
   mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula regression\) %r\" -s \"Regression: %t %e of %c %l\" %r"
   console = all, !skipped, !terminate, !restored
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }