Use rentrant mysql lib, eliminate race in sql_list, Win32 streams, misc see kes-1.31

[bacula/bacula] / bacula / src / stored / bacula-sd.conf.in

diff --git a/bacula/src/stored/bacula-sd.conf.in b/bacula/src/stored/bacula-sd.conf.in
index 0e936dd705fffbb5b22faa39ee707f1d461e255f..6db6582f7b76f6005230c9ffce9c9175f758b9d2 100644 (file)
--- a/bacula/src/stored/bacula-sd.conf.in
+++ b/bacula/src/stored/bacula-sd.conf.in
@@ -15,7 +15,6 @@ Storage {                             # definition of myself
   SDPort = @sd_port@                  # Director's port      
   WorkingDirectory = "@working_dir@"
   Pid Directory = "@piddir@"
-  Subsys Directory = "@subsysdir@"
 }
 
 #
@@ -31,15 +30,27 @@ Director {
 # To connect, the Director's bacula-dir.conf must have the
 #  same Name and MediaType. 
 #
+
 Device {
-  Name = "HP DLT 80"
-  Media Type = DLT8000
-  Archive Device = @TAPEDRIVE@
+  Name = FileStorage
+  Media Type = File
+  Archive Device = /tmp
+  LabelMedia = yes;                   # lets Bacula label unlabelled media
+  Random Access = Yes;
   AutomaticMount = yes;               # when device opened, read it
-  AlwaysOpen = yes;
-  RemovableMedia = yes;
+  RemovableMedia = no;
+  AlwaysOpen = no;
 }
 
+#Device {
+#  Name = "HP DLT 80"
+#  Media Type = DLT8000
+#  Archive Device = @TAPEDRIVE@
+#  AutomaticMount = yes;               # when device opened, read it
+#  AlwaysOpen = yes;
+#  RemovableMedia = yes;
+#}
+
 #Device {
 #  Name = SDT-7000                     # 
 #  Media Type = DDS-2
@@ -59,17 +70,6 @@ Device {
 #  AlwaysOpen = no;
 #}
 
-#Device {
-#  Name = FileStorage
-#  Media Type = File
-#  Archive Device = /tmp
-#  LabelMedia = yes;                   # lets Bacula label unlabelled media
-#  Random Access = Yes;
-#  AutomaticMount = yes;               # when device opened, read it
-#  RemovableMedia = no;
-#  AlwaysOpen = no;
-#}
-
 #
 # A very old Exabyte with no end of media detection
 #
@@ -90,5 +90,4 @@ Device {
 Messages {
   Name = Standard
   director = @hostname@-dir = all
-# operator = @job_email@ = mount
 }