From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 8 Feb 2016 17:50:36 +0000 (+0100)
Subject: Revert "Try to update Exclude list"
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=bfc937287be217dfb2e0701d3aba52f5af072a36;p=mirror%2Fdsa-puppet.git

Revert "Try to update Exclude list"

This reverts commit 2b213a07466209440b7d628a63a28ab489728889.
---

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index c9644cebf..007e916b5 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -49,28 +49,30 @@ FileSet {
     }
     Options {
       wild = "/swapfile*"
-      File = /.fsck
-      File = /.journal
-      File = /dev
-      File = /lib/init/rw
-      File = /nonexistant
-      File = /proc
-      File = /srv/chroot
-      File = /sys
-      File = /tmp
-      File = /var/cache/apt
-      File = /var/lib/apt
-      File = /var/lib/bacula
-      File = /var/lock
-      File = /var/log/samhaim
-      File = /var/run
-      File = "\\|bash -c 'grep -s -v ^# /etc/bacula/local-exclude || true'"
       exclude = yes
     }
     File = "\\|/usr/local/sbin/bacula-backup-dirs"
     # Dont backup directories that contain .nobackup files
     Exclude Dir Containing = .nobackup
   }
+
+  Exclude {
+    File = /var/lib/bacula
+    File = /var/cache/apt/
+    File = /nonexistant
+    File = /proc
+    File = /tmp
+    File = /.journal
+    File = /.fsck
+    File = /sys
+    File = /lib/init/rw
+    File = /var/run
+    File = /var/lock
+    File = /dev
+    File = /srv/chroot
+    File = /home/buildd/build-trees
+    File = "\\|bash -c 'grep -s -v ^# /etc/bacula/local-exclude || true'"
+  }
 }
 
 ########################################################################