Fix regression to not use absolute paths.

bareos · Jun 5, 2013 · 3b3e775 · 3b3e775
1 parent 39af4a9
commit 3b3e775
Showing 1 changed file with 5 additions and 26 deletions.
diff --git a/...test/bareos-dir.conf.status-schedule-test → ...t/bareos-dir.conf.status-schedule-test.in b/...test/bareos-dir.conf.status-schedule-test → ...t/bareos-dir.conf.status-schedule-test.in
@@ -12,11 +12,11 @@
 
 Director {                            # define myself
   Name = localhost-dir
-  DIRPort = 8101                # where we listen for UA connections
-  QueryFile = "/root/bareos-regress/bin/query.sql"
-  WorkingDirectory = "/root/bareos-regress/working"
-  PidDirectory = "/root/bareos-regress/working"
-  SubSysDirectory = "/root/bareos-regress/working"
+  DIRPort = @dirport@                # where we listen for UA connections
+  QueryFile = "@scriptdir@/query.sql"
+  WorkingDirectory = "@working_dir@"
+  PidDirectory = "@piddir@"
+  SubSysDirectory = "@subsysdir@"
   Maximum Concurrent Jobs = 4
   Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3"         # Console password
   Messages = Standard
@@ -42,7 +42,6 @@ Job {
   JobDefs = "DefaultJob"
 }
 
-
 FileSet {
  Name = FS_TESTJOB
  Include {
@@ -55,7 +54,6 @@ FileSet {
 #fd: ClientAfterJob: run command "/bin/echo ClientRunAfterJob"
 #dir: AfterJob: run command "/bin/echo RunAfterJob"
 
-
 # Client (File Services) to backup
 Client {
   Name = client
@@ -70,23 +68,6 @@ Client {
 
 }
 
-# second Client (File Services) to backup
-Client {
-  Name = localhost2-fd
-  Address = localhost
-  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
@@ -105,7 +86,6 @@ Catalog {
   dbname = regress; user = root; password = ""
 }
 
-
 Messages {
   Name = Standard
   console = all, !skipped, !saved
@@ -121,7 +101,6 @@ Pool {
   Volume Retention = 365d             # one year
 }
 
-
 Schedule {
    Name = TestSchedule
    Run = hourly