Don't fail if no local exclusion file exists

[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 ad433205121601fadc41f147d16deca4994fc871..cd8826c3444daecc9710f4f0173c96998dc522b5 100644 (file)
--- 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 = "\\|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"
   }
 }
 
@@ -160,7 +162,7 @@ JobDefs {
   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 +199,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 +244,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"
-  }
 }
 
 ########################################################################