Don't fail if no local exclusion file exists

[dsa-puppet.git] / modules / bacula / templates / bacula-dir.conf.erb

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index 98d0cf12157b9155b76c777e5f50c15481f7b371..cd8826c3444daecc9710f4f0173c96998dc522b5 100644 (file)
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -44,7 +44,7 @@ FileSet {
       signature = SHA1
       compression = GZIP9
     }
-    File = "\\|bash -c \"df -Pkl -x tmpfs -x iso9660 | tail -n +2 | awk '{print \$NF}' \""
+    File = "\\|/usr/local/sbin/bacula-backup-dirs"
     # Dont backup directories that contain .nobackup files
     Exclude Dir Containing = .nobackup
   }
@@ -53,6 +53,7 @@ FileSet {
     File = /var/lib/bacula
     File = /var/cache/apt/
     File = /nonexistant
+    File = /swapfile
     File = /proc
     File = /tmp
     File = /.journal
@@ -64,6 +65,7 @@ FileSet {
     File = /dev
     File = /srv/chroot
     File = /home/buildd/build-trees
+    File = "\\|grep -s -v ^# /etc/bacula/local-exclude || true"
   }
 }
 
@@ -75,9 +77,9 @@ FileSet {
   Include {
     Options {
       signature = SHA1
-      compression = GZIP9
+      #compression = GZIP9
     }
-    File = "/var/lib/bacula/bacula.sql"
+    File = "/var/lib/bacula/bacula.sql.gz"
   }
 }