X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fbacula%2Ftemplates%2Fbacula-dir.conf.erb;h=06bd634b09a44dd23b222e19d24c53ea6d984d94;hb=276a9b003a02fe813d16a928dc8676eb5176f186;hp=d12aafbc9c1a147b67eecdeaae1090500271faee;hpb=032729c62e06ba91465cdb0025ca20310653b126;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index d12aafbc9..06bd634b0 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -39,10 +39,17 @@ Director {
 ########################################################################
 FileSet {
   Name = "Standard Set"
+  Ignore FileSet Changes = yes
   Include {
     Options {
       signature = SHA1
       compression = GZIP9
+      aclsupport = yes
+      xattrsupport = yes
+    }
+    Options {
+      wild = "/swapfile*"
+      exclude = yes
     }
     File = "\\|/usr/local/sbin/bacula-backup-dirs"
     # Dont backup directories that contain .nobackup files
@@ -50,21 +57,23 @@ FileSet {
   }
 
   Exclude {
-    File = /var/lib/bacula
-    File = /var/cache/apt/
+    File = /.fsck
+    File = /.journal
+    File = /dev
+    File = /home/buildd/build-trees
+    File = /lib/init/rw
     File = /nonexistant
-    File = /swapfile
     File = /proc
-    File = /tmp
-    File = /.journal
-    File = /.fsck
+    File = /srv/chroot
     File = /sys
-    File = /lib/init/rw
-    File = /var/run
+    File = /tmp
+    File = /var/cache/apt
+    File = /var/lib/apt
+    File = /var/lib/bacula
+    File = /var/lib/munin-async
     File = /var/lock
-    File = /dev
-    File = /srv/chroot
-    File = /home/buildd/build-trees
+    File = /var/log/samhain
+    File = /var/run
     File = "\\|bash -c 'grep -s -v ^# /etc/bacula/local-exclude || true'"
   }
 }
@@ -158,6 +167,7 @@ JobDefs {
   Type = Backup
   Level = Incremental
   FileSet = "Standard Set"
+  Accurate = yes
   Schedule = "WeeklyCycle"
   Messages = Standard
   Max Full Interval = 40 days