projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move operator_email to hiera
[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
13912fd
..
b1cdedd
100644
(file)
--- a/
modules/bacula/templates/bacula-dir.conf.erb
+++ b/
modules/bacula/templates/bacula-dir.conf.erb
@@
-106,9
+106,8
@@
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"
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"
- #mail on error = <%= @bacula_operator_email %> = all, !skipped
- mail = <%= @bacula_operator_email %> = all
- operator = <%= @bacula_operator_email %> = mount
+ mail = <%= @operator_email %> = all
+ operator = <%= @operator_email %> = 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
@@
-119,7
+118,7
@@
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
+ mail = <%= @operator_email %> = 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