X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-dir.conf.erb;h=4555005ff0231324f5bdcf3d63c7864926fa1372;hb=7df87f1f9903d5a71751a9000d8b0a893991ee8a;hp=fe2d5ee2a4e9ea35b57ace16d068adb9b4e9bb34;hpb=e96e72674696752c5a15e7618677b704919f4dc8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index fe2d5ee2a..4555005ff 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 | tail -n +2 | awk '{print \$NF}' \""
+    File = "\\|bash -c \"df -Pkl -x tmpfs -x iso9660 | tail -n +2 | awk '{print \$NF}' \""
     # Dont backup directories that contain .nobackup files
     Exclude Dir Containing = .nobackup
   }
@@ -120,10 +120,11 @@ Messages {
   Name = Standard
   mailcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
   operatorcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
-  mail on error = <%= bacula_operator_email %> = all, !skipped
+  #mail on error = <%= bacula_operator_email %> = all, !skipped
+  mail = <%= bacula_operator_email %> = all
   operator = <%= bacula_operator_email %> = mount
   console = all, !skipped, !saved
-  append = "/var/lib/bacula/log" = all, !skipped
+  append = "/var/lib/bacula/log" = all
   catalog = all
 }
 
@@ -131,9 +132,9 @@ Messages {
 Messages {
   Name = Daemon
   mailcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r"
-  mail = <%= bacula_operator_email %> = all, !skipped
+  mail = <%= bacula_operator_email %> = all
   console = all, !skipped, !saved
-  append = "/var/lib/bacula/log" = all, !skipped
+  append = "/var/lib/bacula/log" = all
 }
 
 ########################################################################
@@ -171,7 +172,7 @@ Job {
   Type = Restore
   Client = <%=bacula_director_address%>-fd
   FileSet = "Standard Set"
-  Pool = full-<%=bacula_pool_name%>-<%=bacula_director_address%>
+  Pool = poolfull-<%=bacula_pool_name%>-<%=bacula_director_address%>
   Messages = Standard
   Where = /var/tmp/bacula-restores
 }