projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Also collect entries that only knew the port
[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
92cafa8
..
43a8323
100644
(file)
--- a/
modules/bacula/templates/bacula-dir.conf.erb
+++ b/
modules/bacula/templates/bacula-dir.conf.erb
@@
-103,15
+103,15
@@
Catalog {
########################################################################
Messages {
Name = <%= @messages_name %>
########################################################################
Messages {
Name = <%= @messages_name %>
- 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"
+ mailcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"%r\" -s \"Bacula: %t %e of %c %l\" %r"
+ operatorcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"%r\" -s \"Bacula: Intervention needed for %j\" %r"
<% if @email_all %>
mail = <%= @email_all %> = all
<% end %>
<% if @email_all %>
mail = <%= @email_all %> = all
<% end %>
-<% if @
real_
email_error != @email_all %>
- mail on error = <%= @
real_
email_error %> = all
+<% if @email_error != @email_all %>
+ mail on error = <%= @email_error %> = all
<% end %>
<% end %>
- operator = <%= @
real_
email_operator %> = mount
+ operator = <%= @email_operator %> = mount
console = all, !skipped, !saved
syslog = all
append = "/var/lib/bacula/log" = all
console = all, !skipped, !saved
syslog = all
append = "/var/lib/bacula/log" = all
@@
-121,8
+121,8
@@
Messages {
# Message delivery for daemon messages (no job).
Messages {
Name = Daemon
# Message delivery for daemon messages (no job).
Messages {
Name = Daemon
- mailcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"
\(Bacula\)
%r\" -s \"Bacula daemon message\" %r"
- mail = <%= @
real_
email_daemon %> = all
+ mailcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"%r\" -s \"Bacula daemon message\" %r"
+ mail = <%= @email_daemon %> = all
console = all, !skipped, !saved
syslog = all
append = "/var/lib/bacula/log" = all
console = all, !skipped, !saved
syslog = all
append = "/var/lib/bacula/log" = all