s/bacula_ca_path/bacula_ssl_ca_path/

[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..c836c72 100644 (file)
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -28,7 +28,7 @@ Director {
   TLS Require = yes
   TLS Verify Peer = yes
   TLS Allowed CN = "clientcerts/<%= @director_address %>"
-  TLS CA Certificate File = "<%= @bacula_ca_path %>"
+  TLS CA Certificate File = "<%= @bacula_ssl_ca_path %>"
   # This is a server certificate, used for incoming console connections.
   TLS Certificate = "<%= @bacula_ssl_server_cert %>"
   TLS Key = "<%= @bacula_ssl_server_key %>"
@@ -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"
-  #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
@@ -119,7 +118,7 @@ Messages {
 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