X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-dir.conf.erb;h=43a83233ae41ed91dd72820954282330dd7a932b;hb=9e27d3f0aaa21b93d9d256414dcd6335b07c0f53;hp=13912fd0bff45dfde83464f8a50fadd33747e1d0;hpb=42e20fefad3765c8635a9144dda741c23fff4b81;p=mirror%2Fdsa-puppet.git diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb index 13912fd0b..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 %>"; @@ -104,11 +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 on error = <%= @bacula_operator_email %> = all, !skipped - mail = <%= @bacula_operator_email %> = all - operator = <%= @bacula_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 @@ -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