Tweak get_os

[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 c4fcdda7aed5665edebc80a9fe1a2789ec9c35c5..f10344215faccb33d479f5bb08f119cfbe7848df 100644 (file)
--- a/regress/scripts/new-test-bacula-dir.conf.in
+++ b/regress/scripts/new-test-bacula-dir.conf.in
@@ -14,7 +14,7 @@
 
 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@"
@@ -26,7 +26,7 @@ Director {                            # define myself
 
 #
 # Define the main nightly save backup job
-#   By default, this job will back up to disk in /tmp
+#   By default, this job will back up to disk in @tmpdir@
 Job {
   Name = "NightlySave"
   Type = Backup
@@ -166,7 +166,7 @@ Job {
   Storage = File
   Messages = Standard
   Pool = Default
-  Where = /tmp/bacula-restores
+  Where = @tmpdir@/bacula-restores
 }
 
 
@@ -174,7 +174,7 @@ Job {
 FileSet {
   Name = "Full Set"
   Include {  Options { signature=MD5 }
-     File =  </tmp/file-list
+     File =  <@tmpdir@/file-list
   }
 }
 
@@ -185,7 +185,7 @@ FileSet {
       signature=MD5
       sparse=yes
     }
-    File = </tmp/file-list
+    File = <@tmpdir@/file-list
   }
 }
 
@@ -196,7 +196,7 @@ FileSet {
       signature=MD5 
       compression=GZIP 
     }
-    File = </tmp/file-list
+    File = <@tmpdir@/file-list
   }
 }
 
@@ -207,7 +207,7 @@ FileSet {
       readfifo = yes
       signature=MD5 
     }
-    File = </tmp/file-list
+    File = <@tmpdir@/file-list
   }
 }
 
@@ -220,7 +220,7 @@ FileSet {
       compression=GZIP
       sparse=yes
     }
-    File = </tmp/file-list
+    File = <@tmpdir@/file-list
   }
 }
 
@@ -258,7 +258,7 @@ FileSet {
 Client {
   Name = @hostname@-fd
   Address = @hostname@
-  FDPort = 8102
+  FDPort = @fdport@
   Catalog = MyCatalog
   Password = "xevrjURYoCHhn26RaJoWbeWXEY/a3VqGKp/37tgWiuHc"          # password for FileDaemon
   File Retention = 30d                # 30 days
@@ -271,7 +271,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
@@ -281,7 +281,7 @@ Storage {
 Storage {
   Name = File1
   Address = @hostname@                # N.B. Use a fully qualified name here
-  SDPort = 8103
+  SDPort = @sdport@
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
   Device = FileStorage1
   Media Type = File1
@@ -293,7 +293,7 @@ Storage {
 #Storage {
 #  Name = DLTDrive
 #  Address = @hostname@                # N.B. Use a fully qualified name here
-#  SDPort = 8103
+#  SDPort = @sdport@
 #  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"          # password for Storage daemon
 #  Device = "HP DLT 80"                # must be same as Device in Storage daemon
 #  Media Type = DLT8000                # must be same as MediaType in Storage daemon
@@ -303,7 +303,7 @@ Storage {
 #Storage {
 #  Name = SDT-10000
 #  Address = @hostname@                # N.B. Use a fully qualified name here
-#  SDPort = 8103
+#  SDPort = @sdport@
 #  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"          # password for Storage daemon
 #  Device = SDT-10000                  # must be same as Device in Storage daemon
 #  Media Type = DDS-4                  # must be same as MediaType in Storage daemon
@@ -313,7 +313,7 @@ Storage {
 #Storage {
 #  Name = "8mmDrive"
 #  Address = @hostname@                # N.B. Use a fully qualified name here
-#  SDPort = 8103
+#  SDPort = @sdport@
 #  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
 #  Device = "Exabyte 8mm"
 #  MediaType = "8mm"