Apply Martin Simmons patch to bacula-dir.conf.in

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1501 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/dird/bacula-dir.conf.in b/bacula/src/dird/bacula-dir.conf.in
index 25e719882b027b6064f73f1bbe0f0d0ebadd4924..fe51c4b156804e2ec93f606963414b198ff38369 100644 (file)
--- a/bacula/src/dird/bacula-dir.conf.in
+++ b/bacula/src/dird/bacula-dir.conf.in
@@ -77,12 +77,15 @@ Job {
 # List of files to be backed up
 FileSet {
   Name = "Full Set"
-  Include = signature=MD5 { 
+  Include {
+    Options {
+      signature = MD5
+    }
 #    
-#  Put your list of files here, one per line or include an
-#    external list with:
+#  Put your list of files here, preceded by 'File =', one per line
+#    or include an external list with:
 #
-#    <file-name
+#    File = <file-name
 #
 #  Note: / backs up everything on the root partition.
 #    if you have other partitons such as /usr or /home
@@ -92,14 +95,19 @@ FileSet {
 #    directory to give a reasonable FileSet to backup to
 #    disk storage during initial testing.
 #
-    @BUILD_DIR@
+    File = @BUILD_DIR@
   }
 
 #
 # If you backup the root directory, the following two excluded
 #   files can be useful
 #
-  Exclude = { /proc /tmp /.journal /.fsck }
+  Exclude {
+    File = /proc
+    File = /tmp
+    File = /.journal
+    File = /.fsck
+  }
 }
 
 #
@@ -122,8 +130,11 @@ Schedule {
 # This is the backup of the catalog
 FileSet {
   Name = "Catalog"
-  Include = signature=MD5 {
-     @working_dir@/bacula.sql
+  Include {
+    Options {
+      signature = MD5
+    }
+    File = @working_dir@/bacula.sql
   }
 }