Add regex to FileSet + fix ACL crash + gnome1 Makefile + 30 second retry for DB

[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 37f415e4a2d6e1eca2d7b7173f8a08a1218af21f..a083e3b5f35a551939d7135a31533a76611cc74a 100644 (file)
--- a/bacula/src/stored/bacula-sd.conf.in
+++ b/bacula/src/stored/bacula-sd.conf.in
@@ -15,7 +15,7 @@ Storage {                             # definition of myself
   SDPort = @sd_port@                  # Director's port      
   WorkingDirectory = "@working_dir@"
   Pid Directory = "@piddir@"
-  Subsys Directory = "@subsysdir@"
+  Maximum Concurrent Jobs = 1
 }
 
 #
@@ -36,40 +36,65 @@ Device {
   Name = FileStorage
   Media Type = File
   Archive Device = /tmp
-  LabelMedia = yes;                   # lets Bacula label unlabelled media
+  LabelMedia = yes;                   # lets Bacula label unlabeled media
   Random Access = Yes;
   AutomaticMount = yes;               # when device opened, read it
   RemovableMedia = no;
   AlwaysOpen = no;
 }
 
+#
+# A Linux or Solaris tape drive
+#
 #Device {
-#  Name = "HP DLT 80"
-#  Media Type = DLT8000
+#  Name = DDS-4                        # 
+#  Media Type = DDS-4
 #  Archive Device = @TAPEDRIVE@
 #  AutomaticMount = yes;               # when device opened, read it
 #  AlwaysOpen = yes;
 #  RemovableMedia = yes;
+#  RandomAccess = no;
 #}
 
+#
+# A FreeBSD tape drive
+#
 #Device {
-#  Name = SDT-7000                     # 
-#  Media Type = DDS-2
-#  Archive Device = @TAPEDRIVE@
+#  Name = DDS-4 
+#  Description = "DDS-4 for FreeBSD"
+#  Media Type = DDS-4
+#  Archive Device = /dev/nsa1
 #  AutomaticMount = yes;               # when device opened, read it
-#  AlwaysOpen = yes;
-#  RemovableMedia = yes;
+#  AlwaysOpen = yes
+#  Offline On Unmount = no
+#  Hardware End of Medium = no
+#  BSF at EOM = yes
+#  Backward Space Record = no
+#  Fast Forward Space File = no
+#  TWO EOF = yes
 #}
 
+#
+# A OnStream tape drive. 
+# You need the kernel osst driver 0.9.14 or later, and
+#   do "mt -f /dev/nosst0 defblksize 32768" once as root.
+#
 #Device {
-#  Name = Floppy
-#  Media Type = Floppy
-#  Archive Device = /mnt/floppy
-#  RemovableMedia = yes;
-#  Random Access = Yes;
+#  Name = OnStream
+#  Description = "OnStream drive on Linux"
+#  Media Type = OnStream
+#  Archive Device = @TAPEDRIVE@
 #  AutomaticMount = yes;               # when device opened, read it
-#  AlwaysOpen = no;
+#  AlwaysOpen = yes
+#  Offline On Unmount = no
+## The min/max blocksizes of 32768 are *required*
+#  Minimum Block Size = 32768
+#  Maximum Block Size = 32768
 #}
+ 
+
+ 
+
 
 #
 # A very old Exabyte with no end of media detection
@@ -82,6 +107,7 @@ Device {
 #  AutomaticMount = yes;               # when device opened, read it
 #  AlwaysOpen = Yes;
 #  RemovableMedia = yes;
+#  RandomAccess = no;
 #}
 
 #