ebl update for next-vol test

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

diff --git a/regress/scripts/test-bacula-dir.conf.in b/regress/scripts/test-bacula-dir.conf.in
index 7a4d72bf34b13e2aea0f2a8916c18acdbc342391..69833a437486946071aac564f965700a2e366e15 100644 (file)
--- a/regress/scripts/test-bacula-dir.conf.in
+++ b/regress/scripts/test-bacula-dir.conf.in
@@ -5,7 +5,7 @@
 #   file or directory names in the Include directive of the
 #   FileSet resource.
 #
-#  For Bacula release 1.33 
+#  For Bacula release 2.2.2
 #
 #  You might also want to change the default email address
 #   from root to your address.  See the "mail" and "operator"
@@ -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@"
@@ -26,7 +26,7 @@ Director {                            # define myself
 
 #
 # Define the main nightly save backup job
-#   By default, this job will back up to disk in /tmp
+#   By default, this job will back up to disk in @tmpdir@
 Job {
   Name = "NightlySave"
   Type = Backup
@@ -127,7 +127,7 @@ Job {
   Storage = File
   Messages = Standard
   Pool = Default
-  Where = /tmp/bacula-restores
+  Where = @tmpdir@/bacula-restores
 }
 
 
@@ -135,14 +135,14 @@ Job {
 FileSet {
   Name = "Full Set"
   Include  { Options { signature=MD5 }
-    File = </tmp/file-list
+    File = <@tmpdir@/file-list
   }
 }
 
 FileSet {
   Name = "SparseSet"
   Include { Options { signature=MD5; sparse=yes }
-    File=</tmp/file-list
+    File=<@tmpdir@/file-list
   }
 }
 
@@ -150,7 +150,7 @@ FileSet {
   Name = "CompressedSet"
   Include {
     Options { signature=MD5; compression=GZIP }
-    File =</tmp/file-list
+    File =<@tmpdir@/file-list
   }
 }
 
@@ -160,7 +160,7 @@ FileSet {
     Options {
       signature=MD5; compression=GZIP
     }
-    File= </tmp/file-list
+    File= <@tmpdir@/file-list
   }
 }
 
@@ -195,7 +195,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
@@ -208,7 +208,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
@@ -218,7 +218,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
@@ -230,7 +230,7 @@ Storage {
 #Storage {
 #  Name = DLTDrive
 #  Address = @hostname@                # N.B. Use a fully qualified name here
-#  SDPort = 8103
+#  SDPort = @sdport@
 #  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"          # password for Storage daemon
 #  Device = "HP DLT 80"                # must be same as Device in Storage daemon
 #  Media Type = DLT8000                # must be same as MediaType in Storage daemon
@@ -240,7 +240,7 @@ Storage {
 #Storage {
 #  Name = SDT-10000
 #  Address = @hostname@                # N.B. Use a fully qualified name here
-#  SDPort = 8103
+#  SDPort = @sdport@
 #  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"          # password for Storage daemon
 #  Device = SDT-10000                  # must be same as Device in Storage daemon
 #  Media Type = DDS-4                  # must be same as MediaType in Storage daemon
@@ -250,7 +250,7 @@ Storage {
 #Storage {
 #  Name = "8mmDrive"
 #  Address = @hostname@                # N.B. Use a fully qualified name here
-#  SDPort = 8103
+#  SDPort = @sdport@
 #  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
 #  Device = "Exabyte 8mm"
 #  MediaType = "8mm"
@@ -260,17 +260,18 @@ 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
 #  and to the console
 Messages {
   Name = Standard
-  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
-  operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
-  MailOnError = @job_email@ = all
-  operator = @job_email@ = mount
+  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
+# operator = @job_email@ = mount
   console = all, !skipped, !terminate, !restored
 #
 # WARNING! the following will create a file that you must cycle from
@@ -282,7 +283,7 @@ Messages {
 
 Messages {
   Name = NoEmail
-  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
+  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula regression\) %r\" -s \"Regression: %t %e of %c %l\" %r"
   console = all, !skipped, !terminate
 #
 # WARNING! the following will create a file that you must cycle from
@@ -296,8 +297,8 @@ Messages {
 # Message delivery for daemon messages (no job).
 Messages {
   Name = Daemon
-  mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r"
-  mail = @job_email@ = all, !skipped            
+  mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula regression\) %r\" -s \"Regression daemon message\" %r"
+# mail = @job_email@ = all, !skipped            
   console = all, !skipped, !saved
   append = "@working_dir@/log" = all, !skipped
 }