X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fclient%2Ffd-per-director.conf.erb;h=7e8f8f96342f5425dc17b2fc8029039783b6f727;hb=8af635702921a5ae19a067043421a9b4fa8c3f58;hp=25daf0a2e1ffa7d38fe14c9e3f697400a847d51a;hpb=a3265133b4a390133b3fc306f866433a57fc793e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/client/fd-per-director.conf.erb b/modules/bacula/templates/client/fd-per-director.conf.erb
index 25daf0a2e..7e8f8f963 100644
--- a/modules/bacula/templates/client/fd-per-director.conf.erb
+++ b/modules/bacula/templates/client/fd-per-director.conf.erb
@@ -13,14 +13,13 @@ Director {
   TLS Require = yes
   TLS Verify Peer = yes
   TLS Allowed CN = "clientcerts/<%= @director_address %>"
-  TLS CA Certificate File = "<%= scope['bacula::bacula_ca_path'] %>"
-  # This is a server certificate, used for incoming director connections.
-  TLS Certificate = "<%= scope['bacula::bacula_ssl_server_cert'] %>"
-  TLS Key = "<%= scope['bacula::bacula_ssl_server_key'] %>"
+  <%= scope['bacula::bacula_tls_ca_certificate_file'] %>
+  <%= scope['bacula::bacula_tls_server_certificate'] %>
+  <%= scope['bacula::bacula_tls_server_key'] %>
 }
 
 # Send all messages except skipped files back to Director
 Messages {
-  Name = Msg-<%= scope['bacula::client::client_name'] %>-<%= @director_name %>
+  Name = <%= @messages_name %>
   director = <%= @director_name %> = all, !skipped, !restored
 }