Handle the old stream using the old system call just to be safe for now.

[bacula/bacula] / bacula / src / filed / bacula-fd.conf.in

diff --git a/bacula/src/filed/bacula-fd.conf.in b/bacula/src/filed/bacula-fd.conf.in
index 549f20c5e62286076641c0a51ccd9c55acd34c5b..36f1061b5d38c0301de9cf5533e3309e0df337ee 100644 (file)
--- a/bacula/src/filed/bacula-fd.conf.in
+++ b/bacula/src/filed/bacula-fd.conf.in
@@ -11,23 +11,33 @@
 # List Directors who are permitted to contact this File daemon
 #
 Director {
-  Name = @hostname@-dir
+  Name = @basename@-dir
   Password = "@fd_password@"
 }
 
+#
+# Restricted Director, used by tray-monitor to get the
+#   status of the file daemon
+#
+Director {
+  Name = @basename@-mon
+  Password = "@mon_fd_password@"
+  Monitor = yes
+}
+
 #
 # "Global" File daemon configuration specifications
 #
 FileDaemon {                          # this is me
-  Name = @hostname@-fd
+  Name = @basename@-fd
   FDport = @fd_port@                  # where we listen for the director
   WorkingDirectory = @working_dir@
   Pid Directory = @piddir@
-  SubSys Directory = @subsysdir@
+  Maximum Concurrent Jobs = 20
 }
 
 # Send all messages except skipped files back to Director
 Messages {
   Name = Standard
-  director = @hostname@-dir = all, !skipped
+  director = @basename@-dir = all, !skipped, !restored
 }