FreeBSD fixes; manual updates

[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 603fd489701410573a1c2bcd69e58e615a627646..e584b9f5d3e4521850c0ae51a9b8a6f41177b367 100644 (file)
--- a/regress/scripts/test-bacula-dir.conf.in
+++ b/regress/scripts/test-bacula-dir.conf.in
@@ -13,13 +13,13 @@
 #
 
 Director {                            # define myself
-  Name = rufus-dir
+  Name = @hostname@-dir
   DIRport = 8101                # where we listen for UA connections
   QueryFile = "@scriptdir@/query.sql"
   WorkingDirectory = "@working_dir@"
   PidDirectory = "@piddir@"
   SubSysDirectory = "@subsysdir@"
-  Maximum Concurrent Jobs = 1
+  Maximum Concurrent Jobs = 4
   Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3"         # Console password
   Messages = Standard
 }
@@ -30,18 +30,44 @@ Director {                            # define myself
 Job {
   Name = "NightlySave"
   Type = Backup
-  Client=rufus-fd 
+  Client=@hostname@-fd 
   FileSet="Full Set"
   Storage = File
   Messages = Standard
   Pool = Default
   Write Bootstrap = "@working_dir@/NightlySave.bsr"
+  Maximum Concurrent Jobs = 4
 }
 
+Job {
+  Name = "MonsterSave"
+  Type = Backup
+  Client=@hostname@-fd 
+  FileSet="Full Set"
+  Storage = File1
+  Messages = Standard
+  Pool = Default
+  Write Bootstrap = "@working_dir@/NightlySave.bsr"
+}
+
+
+Job {
+  Name = "VerifyVolume"
+  Type = Verify
+  Level = VolumeToCatalog
+  Client=@hostname@-fd 
+  FileSet="Full Set"
+  Storage = File
+  Messages = Standard
+  Pool = Default
+  Write Bootstrap = "@working_dir@/NightlySave.bsr"
+}
+
+
 Job {
   Name = "SparseTest"
   Type = Backup
-  Client=rufus-fd 
+  Client=@hostname@-fd 
   FileSet="SparseSet"
   Storage = File
   Messages = Standard
@@ -52,18 +78,19 @@ Job {
 Job {
   Name = "CompressedTest"
   Type = Backup
-  Client=rufus-fd 
+  Client=@hostname@-fd 
   FileSet="CompressedSet"
   Storage = File
   Messages = Standard
   Pool = Default
+  Maximum Concurrent Jobs = 4
   Write Bootstrap = "@working_dir@/NightlySave.bsr"
 }
 
 Job {
   Name = "SparseCompressedTest"
   Type = Backup
-  Client=rufus-fd 
+  Client=@hostname@-fd 
   FileSet="SparseCompressedSet"
   Storage = File
   Messages = Standard
@@ -72,13 +99,11 @@ Job {
 }
 
 
-
-
 # Backup the catalog database (after the nightly save)
 Job {
   Name = "BackupCatalog"
   Type = Backup
-  Client=rufus-fd 
+  Client=@hostname@-fd 
   FileSet="Catalog"
 #  Schedule = "WeeklyCycleAfterBackup"
   Storage = File
@@ -95,7 +120,7 @@ Job {
 Job {
   Name = "RestoreFiles"
   Type = Restore
-  Client=rufus-fd 
+  Client=@hostname@-fd 
   FileSet="Full Set"
   Storage = File
   Messages = Standard
@@ -162,30 +187,43 @@ FileSet {
 
 # Client (File Services) to backup
 Client {
-  Name = rufus-fd
-  Address = rufus
+  Name = @hostname@-fd
+  Address = @hostname@
   FDPort = 8102
   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
-  Address = rufus                # N.B. Use a fully qualified name here
+  Address = @hostname@                # N.B. Use a fully qualified name here
   SDPort = 8103
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
   Device = FileStorage
   Media Type = File
+  Maximum Concurrent Jobs = 4
 }
 
+Storage {
+  Name = File1
+  Address = @hostname@                # N.B. Use a fully qualified name here
+  SDPort = 8103
+  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
+  Device = FileStorage1
+  Media Type = File1
+  Maximum Concurrent Jobs = 4
+}
+
+
 # Definition of DLT tape storage device
 #Storage {
 #  Name = DLTDrive
-#  Address = rufus                # N.B. Use a fully qualified name here
+#  Address = @hostname@                # N.B. Use a fully qualified name here
 #  SDPort = 8103
 #  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"          # password for Storage daemon
 #  Device = "HP DLT 80"                # must be same as Device in Storage daemon
@@ -195,7 +233,7 @@ Storage {
 # Definition of DDS tape storage device
 #Storage {
 #  Name = SDT-10000
-#  Address = rufus                # N.B. Use a fully qualified name here
+#  Address = @hostname@                # N.B. Use a fully qualified name here
 #  SDPort = 8103
 #  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"          # password for Storage daemon
 #  Device = SDT-10000                  # must be same as Device in Storage daemon
@@ -205,7 +243,7 @@ Storage {
 # Definition of 8mm tape storage device
 #Storage {
 #  Name = "8mmDrive"
-#  Address = rufus                # N.B. Use a fully qualified name here
+#  Address = @hostname@                # N.B. Use a fully qualified name here
 #  SDPort = 8103
 #  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
 #  Device = "Exabyte 8mm"
@@ -223,10 +261,22 @@ Catalog {
 #  and to the console
 Messages {
   Name = Standard
-  mailcommand = "@sbindir@/smtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
-  operatorcommand = "@sbindir@/smtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
-  MailOnError = kern+ok@sibbald.com = all
-  operator = kern+ok@sibbald.com = mount
+  mailcommand = "@sbindir@/smtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
+  operatorcommand = "@sbindir@/smtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
+  MailOnError = @job_email@ = all
+  operator = @job_email@ = mount
+  console = all, !skipped
+#
+# WARNING! the following will create a file that you must cycle from
+#          time to time as it will grow indefinitely. However, it will
+#          also keep all your messages if the scroll off the console.
+#
+  append = "@working_dir@/log" = all, !skipped
+}
+
+Messages {
+  Name = NoEmail
+  mailcommand = "@sbindir@/smtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
   console = all, !skipped
 #
 # WARNING! the following will create a file that you must cycle from
@@ -235,6 +285,7 @@ Messages {
 #
   append = "@working_dir@/log" = all, !skipped
 }
+
     
 # Default pool definition
 Pool {