s/bacula_ca_path/bacula_ssl_ca_path/

[mirror/dsa-puppet.git] / modules / bacula / templates / client / fd-per-director.conf.erb

diff --git a/modules/bacula/templates/client/fd-per-director.conf.erb b/modules/bacula/templates/client/fd-per-director.conf.erb
index 25daf0a..45eedf3 100644 (file)
--- a/modules/bacula/templates/client/fd-per-director.conf.erb
+++ b/modules/bacula/templates/client/fd-per-director.conf.erb
@@ -13,7 +13,7 @@ Director {
   TLS Require = yes
   TLS Verify Peer = yes
   TLS Allowed CN = "clientcerts/<%= @director_address %>"
-  TLS CA Certificate File = "<%= scope['bacula::bacula_ca_path'] %>"
+  TLS CA Certificate File = "<%= scope['bacula::bacula_ssl_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'] %>"
@@ -21,6 +21,6 @@ Director {
 
 # 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
 }