Commit win32 regression patch from Michael Short

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

diff --git a/regress/scripts/bacula-dir.conf.regexwhere.in b/regress/scripts/bacula-dir.conf.regexwhere.in
index ffac01395c8774e9883d563519a076bb8b3c8da1..d2e79e634d6a26b18d69ef976c9ed8b0a936a1b0 100644 (file)
--- a/regress/scripts/bacula-dir.conf.regexwhere.in
+++ b/regress/scripts/bacula-dir.conf.regexwhere.in
@@ -1,20 +1,10 @@
-#
-# Default Bacula Director Configuration file
-#
-#  The only thing that MUST be changed is to add one or more
-#   file or directory names in the Include directive of the
-#   FileSet resource.
-#
-#  For Bacula release 1.39.27 (24 October 2006) -- debian testing/unstable
-#
-#  You might also want to change the default email address
-#   from root to your address.  See the "mail" and "operator"
-#   directives in the Messages resource.
-#
+# TODO
+# Orphaned buffer:  localhost-dir     40 bytes buf=80e9a70 allocated at dird_conf.c:1338
+# bacula-dir: dird.c:656 Hey something is wrong. p=0x135174768
 
 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@"
@@ -24,10 +14,10 @@ Director {                            # define myself
   Messages = Standard
 }
 
-JobDefs {
-  Name = "DefaultJob"
+Job {
+  Name = "backup"
   Type = Backup
-  Level = Incremental
+  Level = Full
   Client = @hostname@-fd 
   FileSet = FS_TESTJOB
   Storage = File
@@ -40,7 +30,7 @@ JobDefs {
 FileSet {
  Name = FS_TESTJOB
  Include {
-   File=</tmp/file-list
+   File=<@tmpdir@/file-list
  }
 }
 
@@ -48,10 +38,11 @@ JobDefs {
   Name = "DefaultRestore"
   Type = Restore
   Storage = File
-  Client=localhost-fd 
+  Client=@hostname@-fd
   FileSet="FS_TESTJOB"
   Messages = Standard
   Pool = Default
+  Replace = Always
 }
 
 Job {
@@ -63,96 +54,47 @@ Job {
 Job {
   Name = JobB
   JobDefs = DefaultRestore
-  add prefix = /tmp/bacula-restore
+  add prefix = @tmpdir@/bacula-restore
   add suffix = .old
-  strip prefix = /build 
+  strip prefix = /build
 }
 
 Job {
   Name = JobC
-  JobDefs = DefaultRestoreWhere
-}
-
-JobDefs {
-  Name = "DefaultRestoreWhere"
-  Type = Restore
-  Storage = File
-  Client=localhost-fd 
-  FileSet="FS_TESTJOB"
-  Messages = Standard
-  Pool = Default
-  Where = /tmp/bacula-restores
-}
-
-JobDefs {
-  Name = "DefaultRestoreRegexWhere"
-  Type = Restore
-  Storage = File
-  Client=localhost-fd 
-  FileSet="FS_TESTJOB"
-  Messages = Standard
-  Pool = Default
-  RegexWhere = !po$!old.po!
-}
-
-JobDefs {
-  Name = "DefaultRestoreOther"
-  Type = Restore
-  Storage = File
-  Client=localhost-fd 
-  FileSet="FS_TESTJOB"
-  Messages = Standard
-  Pool = Default
-  add suffix = .old 
-}
-
-Job {
-  Name = Job1
-  JobDefs = DefaultRestoreWhere
-  RegexWhere = !po$!old.po!
-}
-
-Job {
-  Name = Job2
-  JobDefs = DefaultRestoreWhere
-  add suffix = .old
+  JobDefs = DefaultRestore
+  Where = @tmpdir@/bacula-restore
 }
 
 Job {
-  Name = Job3
-  JobDefs = DefaultRestoreRegexWhere
-  Where = /tmp/bacula-restore
+  Name = JobD
+  JobDefs = DefaultRestore
+  RegexWhere = "doesnt work"
 }
 
-# TODO
-# Orphaned buffer:  localhost-dir     40 bytes buf=80e9a70 allocated at dird_conf.c:1338
-# bacula-dir: dird.c:656 Hey something is wrong. p=0x135174768
 Job {
-  Name = Job4
-  JobDefs = DefaultRestoreRegexWhere
-  add suffix = .old
+  Name = JobE
+  JobDefs = DefaultRestore
+  RegexWhere = "/BUILD/tmp/i,!po/!!"
 }
 
 Job {
-  Name = Job5
-  JobDefs = DefaultRestoreOther
-  Where = /tmp/bacula-restore
+  Name = JobF
+  JobDefs = DefaultRestore
+  RegexWhere = "/something witch doesn't match/tmp/i"
 }
 
 Job {
-  Name = Job6
-  JobDefs = DefaultRestoreOther
-  add suffix = .temp
+  Name = JobG
+  JobDefs = DefaultRestore
+  Where = @tmpdir@/bacula-restore
 }
 
 
-
-
 # Client (File Services) to backup
 Client {
   Name = @hostname@-fd
   Address = @hostname@
-  FDPort = 8102
+  FDPort = @fdport@
   Catalog = MyCatalog
   Password = "xevrjURYoCHhn26RaJoWbeWXEY/a3VqGKp/37tgWiuHc"          # password for FileDaemon
   File Retention = 30d                # 30 days
@@ -165,7 +107,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