X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Fscripts%2Fbacula-dir-migration.conf.in;h=36fcfbff33383f8661cea83f55b05a2bafee54b7;hb=7ec6a7e8c7b6908e321883b18dbc64e244bc282a;hp=cd5309e0784926a413361b641ef97b22d82108fe;hpb=c060d696beebbaf1b38024f36935018fb6584676;p=bacula%2Fbacula

diff --git a/regress/scripts/bacula-dir-migration.conf.in b/regress/scripts/bacula-dir-migration.conf.in
index cd5309e078..36fcfbff33 100644
--- a/regress/scripts/bacula-dir-migration.conf.in
+++ b/regress/scripts/bacula-dir-migration.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@"
@@ -25,7 +25,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
@@ -110,7 +110,7 @@ Job {
   Storage = File
   Messages = Standard
   Pool = Default
-  Where = /tmp/bacula-restores
+  Where = @tmpdir@/bacula-restores
 }
 
 
@@ -118,7 +118,7 @@ Job {
 FileSet {
   Name = "Full Set"
   Include { Options { signature=MD5 }
-    File =  </tmp/file-list
+    File =  <@tmpdir@/file-list
   }
 }
 
@@ -138,7 +138,7 @@ Schedule {
 Client {
   Name = @hostname@-fd
   Address = @hostname@
-  FDPort = 8102
+  FDPort = @fdport@
   Catalog = MyCatalog
   Password = "xevrjURYoCHhn26RaJoWbeWXEY/a3VqGKp/37tgWiuHc"          # password for FileDaemon
   File Retention = 30d                # 30 days
@@ -151,10 +151,10 @@ Client {
 Storage {
   Name = DiskChanger
   Address = @hostname@                # N.B. Use a fully qualified name here
-  SDPort = 8103
+  SDPort = @sdport@
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"          # password for Storage daemon
   Device = DiskChanger                      # must be same as Device in Storage daemon
-  Media Type = DiskChanger                  # must be same as MediaType in Storage daemon
+  Media Type = DiskChangerMedia             # must be same as MediaType in Storage daemon
   Maximum Concurrent Jobs = 4
   Autochanger = yes
 }
@@ -163,7 +163,7 @@ Storage {
 Storage {           
   Name = File
   Address = @hostname@
-  SDPort = 8103
+  SDPort = @sdport@
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"          # password for Storage daemon
   Device = FileStorage
   Media Type = File
@@ -174,15 +174,15 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
-  dbname = bacula; user = bacula; password = ""
+  dbname = regress; user = regress; password = ""
 }
 
 # Reasonable message delivery -- send most everything to email address
 #  and to the console
 Messages {
   Name = Standard
-  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"
+  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula regression Job %j\) %r\" -s \"Regression: %t %e of %c %l\" %r"
+  operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula regression Job %j\) %r\" -s \"Regression: Intervention needed for %j\" %r"
   MailOnError = @job_email@ = all, !terminate
   operator = @job_email@ = mount
   console = all, !skipped, !terminate, !restored
@@ -198,7 +198,7 @@ Messages {
 # Message delivery for daemon messages (no job).
 Messages {
   Name = Daemon
-  mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r"
+  mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula regression\) %r\" -s \"Regression daemon message\" %r"
   mail = @job_email@ = all, !skipped            
   console = all, !skipped, !saved
   append = "@working_dir@/log" = all, !skipped