X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-dir.conf.erb;h=06bd634b09a44dd23b222e19d24c53ea6d984d94;hb=dd58830d6f8557e2f442905a655ca78bfe69dfe4;hp=88411e7abd7a369453175906fb72eabaa1423cf0;hpb=f0fe31ec5496fe75fced127a80aa5989a5edbced;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index 88411e7ab..06bd634b0 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -39,13 +39,17 @@ Director {
 ########################################################################
 FileSet {
   Name = "Standard Set"
+  Ignore FileSet Changes = yes
   Include {
     Options {
       signature = SHA1
       compression = GZIP9
       aclsupport = yes
       xattrsupport = yes
-      Ignore FileSet Changes = yes
+    }
+    Options {
+      wild = "/swapfile*"
+      exclude = yes
     }
     File = "\\|/usr/local/sbin/bacula-backup-dirs"
     # Dont backup directories that contain .nobackup files
@@ -53,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
-    wild = "/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'"
   }
 }