Final changes

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

diff --git a/regress/scripts/new-test-bacula-dir.conf.in b/regress/scripts/new-test-bacula-dir.conf.in
index a91b7c43900d7bdd958eb090ff921412d0dd6624..f190724fc35bd726ae8728a8551db4d254a3e15a 100644 (file)
--- a/regress/scripts/new-test-bacula-dir.conf.in
+++ b/regress/scripts/new-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 1.39 or later
 #
 #  You might also want to change the default email address
 #   from root to your address.  See the "mail" and "operator"
@@ -117,6 +117,33 @@ Job {
   Write Bootstrap = "@working_dir@/BackupCatalog.bsr"
 }
 
+JobDefs {
+  Name = "BackupJob"
+  Type = Backup
+  Pool = Default
+  Storage = File
+  Messages = Standard
+  Priority = 10
+}
+
+Job {
+  JobDefs = "BackupJob"
+  Name = "bug621-job-1"
+  Client = @hostname@-fd
+  FileSet="Full Set"
+  ClientRunBeforeJob = "/bin/sleep 60"
+}
+
+Job {
+  JobDefs = "BackupJob"
+  Name = "bug621-job-2"
+  Client = @hostname@-fd
+  FileSet = "Full Set"
+  Max Run Time = 30
+  Priority = 15
+}
+
+
 # Standard Restore template, to be changed by Console program
 Job {
   Name = "RestoreFiles"
@@ -142,7 +169,8 @@ FileSet {
   Name = "SparseSet"
   Include {
     Options {
-      signature=MD5 sparse=yes
+      signature=MD5
+      sparse=yes
     }
     File = </tmp/file-list
   }
@@ -152,7 +180,8 @@ FileSet {
   Name = "CompressedSet"
   Include {
     Options {
-      signature=MD5 compression=GZIP 
+      signature=MD5 
+      compression=GZIP 
     }
     File = </tmp/file-list
   }
@@ -162,7 +191,9 @@ FileSet {
   Name = "SparseCompressedSet"
   Include {
     Options {
-      signature=MD5 compression=GZIP
+      signature=MD5 
+      compression=GZIP
+      sparse=yes
     }
     File = </tmp/file-list
   }
@@ -176,15 +207,15 @@ 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
@@ -307,6 +338,5 @@ 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
 # Label Format = "TEST-${Year}-${Month:p/2/0/r}-${Day:p/2/0/r}:${NumVols}"
 }