X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-dir.conf.erb;h=c9644cebf8d4408e6b88e5027a2fde0f252d7bfa;hb=2b213a07466209440b7d628a63a28ab489728889;hp=ad433205121601fadc41f147d16deca4994fc871;hpb=dfe971b9964020f8a61e9d9e5513cb83e13728c0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index ad4332051..c9644cebf 100644
--- 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
     }
-    File = "\\|bash -c \"df -Pkl -x tmpfs -x iso9660 | tail -n +2 | awk '{print \$NF}' \""
+    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,13 +162,14 @@ 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
-  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"
 }
 
 ########################################################################
@@ -197,12 +206,12 @@ Storage {
   Media Type = "<%= bacula_filestor_name %>-catalog"
   Maximum Concurrent Jobs = 10
 
-#  TLS Enable = yes
-#  TLS Require = yes
-#  TLS CA Certificate File = "<%= bacula_ca_path %>"
-#  # This is a client certificate, used by the director to connect to the storage daemon
-#  TLS Certificate = "<%= bacula_ssl_client_cert %>"
-#  TLS Key = "<%= bacula_ssl_client_key %>"
+  TLS Enable = yes
+  TLS Require = yes
+  TLS CA Certificate File = "<%= bacula_ca_path %>"
+  # This is a client certificate, used by the director to connect to the storage daemon
+  TLS Certificate = "<%= bacula_ssl_client_cert %>"
+  TLS Key = "<%= bacula_ssl_client_key %>"
 }
 Pool {
   Name = "poolcatalog-<%=bacula_pool_name%>"
@@ -242,11 +251,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"
-  }
 }
 
 ########################################################################