Since the conditional does not work for default values for params, fall back to sane...

[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 b2a2093..92cafa8 100644 (file)
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -108,10 +108,10 @@ Messages {
 <% if @email_all %>
   mail = <%= @email_all %> = all
 <% end %>
-<% if @email_error != @email_all %>
-  mail on error = <%= @email_error %> = all
+<% if @real_email_error != @email_all %>
+  mail on error = <%= @real_email_error %> = all
 <% end %>
-  operator = <%= @email_operator %> = mount
+  operator = <%= @real_email_operator %> = mount
   console = all, !skipped, !saved
   syslog = all
   append = "/var/lib/bacula/log" = all
@@ -122,7 +122,7 @@ Messages {
 Messages {
   Name = Daemon
   mailcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r"
-  mail = <%= @email_daemon %> = all
+  mail = <%= @real_email_daemon %> = all
   console = all, !skipped, !saved
   syslog = all
   append = "/var/lib/bacula/log" = all