X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fbacula%2Ftemplates%2Fbacula-dir.conf.erb;h=43a83233ae41ed91dd72820954282330dd7a932b;hb=9e27d3f0aaa21b93d9d256414dcd6335b07c0f53;hp=8ad48d5a1c185332d649a43726947a2b2778e1d1;hpb=b00db688588f052e860f0ff461c0b787f9c5227b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index 8ad48d5a1..43a83233a 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -29,9 +29,8 @@ Director {
   TLS Verify Peer = yes
   TLS Allowed CN = "clientcerts/<%= @director_address %>"
   <%= scope['bacula::bacula_tls_ca_certificate_file'] %>
-  # This is a server certificate, used for incoming console connections.
-  TLS Certificate = "<%= @bacula_ssl_server_cert %>"
-  TLS Key = "<%= @bacula_ssl_server_key %>"
+  <%= scope['bacula::bacula_tls_server_certificate'] %>
+  <%= scope['bacula::bacula_tls_server_key'] %>
 
   Heartbeat Interval = 60
 }
@@ -91,8 +90,8 @@ Catalog {
   dbname = <%= @db_name %>;
   dbport = <%= @db_port %>;
   dbaddress = "<%= @db_address %>";
-  dbsslmode = verify-ca;
 <% if @db_sslca %>
+  dbsslmode = verify-ca;
   dbsslca = "<%= @db_sslca %>";
 <% end %>
   dbuser = "<%= @db_user %>";
@@ -104,10 +103,15 @@ Catalog {
 ########################################################################
 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 = <%= @operator_email %> = all
-  operator = <%= @operator_email %> = mount
+  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_error != @email_all %>
+  mail on error = <%= @email_error %> = all
+<% end %>
+  operator = <%= @email_operator %> = mount
   console = all, !skipped, !saved
   syslog = all
   append = "/var/lib/bacula/log" = all
@@ -117,8 +121,8 @@ Messages {
 # 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 = <%= @operator_email %> = 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