X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-dir.conf.erb;h=ccbbc8ca19429e534c9c4d4a56a5ecfc6c388991;hb=376e06de22397db5d0c13b0d7561a84f177ac365;hp=175eb83c9b1c9d20028e8047ae2d5d752255cd5f;hpb=b13c9ec6470a77c5ab438945ffcc3b1a7bea3d40;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index 175eb83c9..ccbbc8ca1 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -39,10 +39,17 @@ Director {
 ########################################################################
 FileSet {
   Name = "Standard Set"
+  Ignore FileSet Changes = yes
   Include {
     Options {
       signature = SHA1
       compression = GZIP9
+      aclsupport = yes
+      xattrsupport = yes
+    }
+    Options {
+      wild = "/swapfile*"
+      exclude = yes
     }
     File = "\\|/usr/local/sbin/bacula-backup-dirs"
     # Dont backup directories that contain .nobackup files
@@ -50,21 +57,20 @@ 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
-    File = /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/bacula
     File = /var/lock
-    File = /dev
-    File = /srv/chroot
-    File = /home/buildd/build-trees
+    File = /var/run
     File = "\\|bash -c 'grep -s -v ^# /etc/bacula/local-exclude || true'"
   }
 }
@@ -92,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
 }
 
@@ -156,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