X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-dir.conf.erb;h=d12aafbc9c1a147b67eecdeaae1090500271faee;hb=6b183cf204cd8df9a8a967f1e709832968c50cbb;hp=9132a553f32068e54f5a95590b29dc2ea8a38692;hpb=3794acefe67b3857583e63dab7dd53ae0ea1a2d7;p=dsa-puppet.git

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index 9132a553..d12aafbc 100644
--- 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 = "\\|bash -c '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"
   }
 }
 
@@ -90,8 +92,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,11 +160,11 @@ JobDefs {
   FileSet = "Standard Set"
   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
-  Client Run After Job = "/usr/local/sbin/postbaculajob -c \"%c\" -d \"%d\" -i \"%i\" -l \"%l\" -n \"%n\" -o /var/log/bacula-main.log"
+  Client Run After Job = "/usr/local/sbin/postbaculajob -c \"%c\" -d \"%d\" -i \"%i\" -l \"%l\" -n \"%n\" -o /var/log/bacula/client-after.state"
 }
 
 ########################################################################
@@ -242,11 +246,6 @@ Job {
   Write Bootstrap = "/var/lib/bacula/%n.bsr"
   Priority = 15    # run after main backup
   Pool = "poolcatalog-<%=bacula_pool_name%>"
-  RunScript {
-    RunsWhen=After
-    RunsOnClient=No
-    Console = "purge volume action=all allpools storage=%w"
-  }
 }
 
 ########################################################################