projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
no more widor
[mirror/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
fe2d5ee
..
4555005
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
}
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
}
# 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"
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
operator = <%= bacula_operator_email %> = mount
console = all, !skipped, !saved
- append = "/var/lib/bacula/log" = all
, !skipped
+ append = "/var/lib/bacula/log" = all
catalog = 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"
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
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"
Type = Restore
Client = <%=bacula_director_address%>-fd
FileSet = "Standard Set"
- Pool = full-<%=bacula_pool_name%>-<%=bacula_director_address%>
+ Pool =
pool
full-<%=bacula_pool_name%>-<%=bacula_director_address%>
Messages = Standard
Where = /var/tmp/bacula-restores
}
Messages = Standard
Where = /var/tmp/bacula-restores
}