Add JobId to all Dmsg() output.

[bacula/bacula] / regress / scripts / test-bacula-sd.conf.in

diff --git a/regress/scripts/test-bacula-sd.conf.in b/regress/scripts/test-bacula-sd.conf.in
index 113f54fa475358f834333254b3cedaaf553d9718..390e0fb0ac34a932f2407c709f47ab017e1980e8 100644 (file)
--- a/regress/scripts/test-bacula-sd.conf.in
+++ b/regress/scripts/test-bacula-sd.conf.in
@@ -1,7 +1,7 @@
 #
 # Default Bacula Storage Daemon Configuration file
 #
-#  For Bacula release 1.30 (12 April 2003) -- redhat 7.3
+#  For Bacula release 1.33
 #
 # You may need to change the name of your tape drive
 #   on the "Archive Device" directive in the Device
@@ -11,7 +11,7 @@
 #
 
 Storage {                             # definition of myself
-  Name = rufus-sd
+  Name = @hostname@-sd
   SDPort = 8103                  # Director's port      
   WorkingDirectory = "@working_dir@"
   Pid Directory = "@piddir@"
@@ -22,7 +22,7 @@ Storage {                             # definition of myself
 # List Directors who are permitted to contact Storage daemon
 #
 Director {
-  Name = rufus-dir
+  Name = @hostname@-dir
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
 }
 
@@ -35,14 +35,27 @@ Director {
 Device {
   Name = FileStorage
   Media Type = File
-  Archive Device = /tmp
+  Archive Device = @tmpdir@
   LabelMedia = yes;                   # lets Bacula label unlabelled media
   Random Access = Yes;
   AutomaticMount = yes;               # when device opened, read it
   RemovableMedia = no;
   AlwaysOpen = no;
+# Maximum File Size = 10KB
 }
 
+Device {
+  Name = FileStorage1
+  Media Type = File1
+  Archive Device = @tmpdir@
+  LabelMedia = yes;                   # lets Bacula label unlabelled media
+  Random Access = Yes;
+  AutomaticMount = yes;               # when device opened, read it
+  RemovableMedia = no;
+  AlwaysOpen = no;
+}
+
+
 #Device {
 #  Name = "HP DLT 80"
 #  Media Type = DLT8000
@@ -90,5 +103,5 @@ Device {
 #
 Messages {
   Name = Standard
-  director = rufus-dir = all
+  director = @hostname@-dir = all, !terminate
 }