X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-dir.conf.erb;h=43a83233ae41ed91dd72820954282330dd7a932b;hb=f5a5ce8713702acd7eec76d0aaa0168422e00ebd;hp=e94ce587ca4cb0590c371fa691ef0c74f377fa02;hpb=fa1f55f5cae79899e96c42865eef3878d0cbfb3d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index e94ce587c..43a83233a 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -28,10 +28,9 @@ Director {
   TLS Require = yes
   TLS Verify Peer = yes
   TLS Allowed CN = "clientcerts/<%= @director_address %>"
-  TLS CA Certificate File = "<%= @bacula_ca_path %>"
-  # 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_ca_certificate_file'] %>
+  <%= 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 %>";
@@ -103,12 +102,16 @@ Catalog {
 # Message delivery                                                     #
 ########################################################################
 Messages {
-  Name = Standard
-  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
+  Name = <%= @messages_name %>
+  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
@@ -118,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 = <%= @bacula_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
@@ -134,7 +137,7 @@ JobDefs {
   Level = Incremental
   FileSet = "Standard Set"
   Accurate = yes
-  Messages = Standard
+  Messages = <%= @messages_name %>
   Max Full Interval = 50 days
   Priority = 10
   Write Bootstrap = "/var/lib/bacula/%c.bsr"
@@ -152,7 +155,7 @@ Job {
   FileSet = "Standard Set"
   Client = <%= @some_client_name%>
   Pool = <%= @some_pool_name %>
-  Messages = Standard
+  Messages = <%= @messages_name %>
   Where = /var/tmp/bacula-restores
 }