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 3d6b277fced221a50e4d0093a08ee0b9a1a8b21e..a083e3b5f35a551939d7135a31533a76611cc74a 100644 (file)
--- a/bacula/src/stored/bacula-sd.conf.in
+++ b/bacula/src/stored/bacula-sd.conf.in
@@ -15,6 +15,7 @@ Storage {                             # definition of myself
   SDPort = @sd_port@                  # Director's port      
   WorkingDirectory = "@working_dir@"
   Pid Directory = "@piddir@"
+  Maximum Concurrent Jobs = 1
 }
 
 #
@@ -42,6 +43,9 @@ Device {
   AlwaysOpen = no;
 }
 
+#
+# A Linux or Solaris tape drive
+#
 #Device {
 #  Name = DDS-4                        # 
 #  Media Type = DDS-4
@@ -49,8 +53,49 @@ Device {
 #  AutomaticMount = yes;               # when device opened, read it
 #  AlwaysOpen = yes;
 #  RemovableMedia = yes;
+#  RandomAccess = no;
+#}
+
+#
+# A FreeBSD tape drive
+#
+#Device {
+#  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
+#  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 = OnStream
+#  Description = "OnStream drive on Linux"
+#  Media Type = OnStream
+#  Archive Device = @TAPEDRIVE@
+#  AutomaticMount = yes;               # when device opened, read it
+#  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
 #
@@ -62,6 +107,7 @@ Device {
 #  AutomaticMount = yes;               # when device opened, read it
 #  AlwaysOpen = Yes;
 #  RemovableMedia = yes;
+#  RandomAccess = no;
 #}
 
 #