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 1e83005da83f311942a204c32f4b615ccdd96357..59dbc6f287bc7ef1c5ee6856638178dee0977bd2 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.30 (12 April 2003) -- redhat 7.3
+#  For Bacula release 1.33 
 #
 #  You might also want to change the default email address
 #   from root to your address.  See the "mail" and "operator"
@@ -13,15 +13,15 @@
 #
 
 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
+  Messages = Daemon
 }
 
 #
@@ -30,18 +30,20 @@ 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
+  SpoolData=yes
 }
 
 Job {
   Name = "MonsterSave"
   Type = Backup
-  Client=rufus-fd 
+  Client=@hostname@-fd 
   FileSet="Full Set"
   Storage = File1
   Messages = Standard
@@ -54,7 +56,7 @@ Job {
   Name = "VerifyVolume"
   Type = Verify
   Level = VolumeToCatalog
-  Client=rufus-fd 
+  Client=@hostname@-fd 
   FileSet="Full Set"
   Storage = File
   Messages = Standard
@@ -66,7 +68,7 @@ Job {
 Job {
   Name = "SparseTest"
   Type = Backup
-  Client=rufus-fd 
+  Client=@hostname@-fd 
   FileSet="SparseSet"
   Storage = File
   Messages = Standard
@@ -77,18 +79,20 @@ 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"
+# Max Run Time = 15 seconds
 }
 
 Job {
   Name = "SparseCompressedTest"
   Type = Backup
-  Client=rufus-fd 
+  Client=@hostname@-fd 
   FileSet="SparseCompressedSet"
   Storage = File
   Messages = Standard
@@ -101,7 +105,7 @@ Job {
 Job {
   Name = "BackupCatalog"
   Type = Backup
-  Client=rufus-fd 
+  Client=@hostname@-fd 
   FileSet="Catalog"
 #  Schedule = "WeeklyCycleAfterBackup"
   Storage = File
@@ -118,7 +122,7 @@ Job {
 Job {
   Name = "RestoreFiles"
   Type = Restore
-  Client=rufus-fd 
+  Client=@hostname@-fd 
   FileSet="Full Set"
   Storage = File
   Messages = Standard
@@ -130,29 +134,33 @@ Job {
 # List of files to be backed up
 FileSet {
   Name = "Full Set"
-  Include = signature=MD5 { 
-    </tmp/file-list
+  Include  { Options { signature=MD5 }
+    File = </tmp/file-list
   }
 }
 
 FileSet {
   Name = "SparseSet"
-  Include = signature=MD5 sparse=yes { 
-    </tmp/file-list
+  Include { Options { signature=MD5; sparse=yes }
+    File=</tmp/file-list
   }
 }
 
 FileSet {
   Name = "CompressedSet"
-  Include = signature=MD5 compression=GZIP { 
-    </tmp/file-list
+  Include {
+    Options { signature=MD5; compression=GZIP }
+    File =</tmp/file-list
   }
 }
 
 FileSet {
   Name = "SparseCompressedSet"
-  Include = signature=MD5 compression=GZIP { 
-    </tmp/file-list
+  Include {
+    Options {
+      signature=MD5; compression=GZIP
+    }
+    File= </tmp/file-list
   }
 }
 
@@ -164,61 +172,64 @@ FileSet {
 #  and incremental backups other days
 Schedule {
   Name = "WeeklyCycle"
-  Run = Full 1st sun at 1:05
-  Run = Differential 2nd-5th sun at 1:05
-  Run = Incremental mon-sat at 1:05
+  Run = Level=Full 1st sun at 1:05
+  Run = Level=Differential 2nd-5th sun at 1:05
+  Run = Level=Incremental mon-sat at 1:05
 }
 
 # This schedule does the catalog. It starts after the WeeklyCycle
 Schedule {
   Name = "WeeklyCycleAfterBackup"
-  Run = Full sun-sat at 1:10
+  Run = Level=Full sun-sat at 1:10
 }
 
 # This is the backup of the catalog
 FileSet {
   Name = "Catalog"
-  Include = signature=MD5 {
-     /home/kern/bacula/regress/bin/working/bacula.sql
+  Include { Options { signature=MD5 }
+     File=/home/kern/bacula/regress/bin/working/bacula.sql
   }
 }
 
 # 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 = rufus                # N.B. Use a fully qualified name here
+  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
@@ -228,7 +239,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
@@ -238,7 +249,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"
@@ -256,11 +267,11 @@ Catalog {
 #  and to the console
 Messages {
   Name = Standard
-  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"
+  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
-  console = all, !skipped
+  console = all, !skipped, !terminate, !restored
 #
 # WARNING! the following will create a file that you must cycle from
 #          time to time as it will grow indefinitely. However, it will
@@ -271,8 +282,8 @@ Messages {
 
 Messages {
   Name = NoEmail
-  mailcommand = "@sbindir@/smtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
-  console = all, !skipped
+  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
+  console = all, !skipped, !terminate
 #
 # WARNING! the following will create a file that you must cycle from
 #          time to time as it will grow indefinitely. However, it will
@@ -281,6 +292,15 @@ Messages {
   append = "@working_dir@/log" = all, !skipped
 }
 
+#
+# 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            
+  console = all, !skipped, !saved
+  append = "@working_dir@/log" = all, !skipped
+}
     
 # Default pool definition
 Pool {
@@ -289,5 +309,4 @@ Pool {
   Recycle = yes                       # Bacula can automatically recycle Volumes
   AutoPrune = yes                     # Prune expired volumes
   Volume Retention = 365d             # one year
-  Accept Any Volume = yes             # write on any volume in the pool
 }