X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-dir.conf.erb;h=007e916b5b5db8d92cddd3bc80760fef9ba97091;hb=2fc76fdf7b368a560901ee3578bd3abf47ab2365;hp=98d0cf12157b9155b76c777e5f50c15481f7b371;hpb=eaf1930a1be5fe410877727b8f6a353568344c3f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index 98d0cf121..007e916b5 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -39,12 +39,19 @@ Director {
 ########################################################################
 FileSet {
   Name = "Standard Set"
+  Ignore FileSet Changes = yes
   Include {
     Options {
       signature = SHA1
       compression = GZIP9
+      aclsupport = yes
+      xattrsupport = yes
     }
-    File = "\\|bash -c \"df -Pkl -x tmpfs -x iso9660 | tail -n +2 | awk '{print \$NF}' \""
+    Options {
+      wild = "/swapfile*"
+      exclude = yes
+    }
+    File = "\\|/usr/local/sbin/bacula-backup-dirs"
     # Dont backup directories that contain .nobackup files
     Exclude Dir Containing = .nobackup
   }
@@ -64,6 +71,7 @@ FileSet {
     File = /dev
     File = /srv/chroot
     File = /home/buildd/build-trees
+    File = "\\|bash -c 'grep -s -v ^# /etc/bacula/local-exclude || true'"
   }
 }
 
@@ -75,9 +83,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 +98,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 +164,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