Try to update Exclude list

[mirror/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 3b71f44..c9644ce 100644 (file)
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -39,32 +39,38 @@ Director {
 ########################################################################
 FileSet {
   Name = "Standard Set"
+  Ignore FileSet Changes = yes
   Include {
     Options {
       signature = SHA1
       compression = GZIP9
+      aclsupport = yes
+      xattrsupport = yes
+    }
+    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
-  }
 }
 
 ########################################################################
@@ -75,9 +81,9 @@ FileSet {
   Include {
     Options {
       signature = SHA1
-      compression = GZIP9
+      #compression = GZIP9
     }
-    File = "/var/lib/bacula/bacula.sql"
+    File = "/var/lib/bacula/bacula.sql.gz"
   }
 }
 
@@ -90,8 +96,10 @@ FileSet {
 #  and incremental backups other days
 Schedule {
   Name = "WeeklyCycle"
-  Run = Full 1st sat at 00:35
-  Run = Differential 2nd-5th sat at 00:35
+  # fulls are automatically run if the last full backup was 40 days ago
+  # for the current value of 40 look for "Max Full Interval" in this file.
+  # Run = Full 1st sat at 00:35
+  Run = Differential sat at 00:35
   Run = Incremental sun-fri at 00:35
 }
 
@@ -154,9 +162,10 @@ JobDefs {
   Type = Backup
   Level = Incremental
   FileSet = "Standard Set"
+  Accurate = yes
   Schedule = "WeeklyCycle"
   Messages = Standard
-  Max Full Interval = 1 month
+  Max Full Interval = 40 days
   Priority = 10
   Write Bootstrap = "/var/lib/bacula/%c.bsr"
   Maximum Concurrent Jobs = 20