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 0e936dd705fffbb5b22faa39ee707f1d461e255f..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
 }
 
 #
@@ -31,44 +31,70 @@ 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 unlabeled media
+  Random Access = Yes;
   AutomaticMount = yes;               # when device opened, read it
-  AlwaysOpen = yes;
-  RemovableMedia = yes;
+  RemovableMedia = no;
+  AlwaysOpen = no;
 }
 
+#
+# A Linux or Solaris tape drive
+#
 #Device {
-#  Name = SDT-7000                     # 
-#  Media Type = DDS-2
+#  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 = Floppy
-#  Media Type = Floppy
-#  Archive Device = /mnt/floppy
-#  RemovableMedia = yes;
-#  Random Access = Yes;
+#  Name = DDS-4 
+#  Description = "DDS-4 for FreeBSD"
+#  Media Type = DDS-4
+#  Archive Device = /dev/nsa1
 #  AutomaticMount = yes;               # when device opened, read it
-#  AlwaysOpen = no;
+#  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 = FileStorage
-#  Media Type = File
-#  Archive Device = /tmp
-#  LabelMedia = yes;                   # lets Bacula label unlabelled media
-#  Random Access = Yes;
+#  Name = OnStream
+#  Description = "OnStream drive on Linux"
+#  Media Type = OnStream
+#  Archive Device = @TAPEDRIVE@
 #  AutomaticMount = yes;               # when device opened, read it
-#  RemovableMedia = no;
-#  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
@@ -81,6 +107,7 @@ Device {
 #  AutomaticMount = yes;               # when device opened, read it
 #  AlwaysOpen = Yes;
 #  RemovableMedia = yes;
+#  RandomAccess = no;
 #}
 
 # 
@@ -90,5 +117,4 @@ Device {
 Messages {
   Name = Standard
   director = @hostname@-dir = all
-# operator = @job_email@ = mount
 }