X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fstorage%2Fsd-per-director.conf.erb;h=5b568698dc695fb0fd76c26cbe85fbd51f4ca6e1;hb=11c5ee4c16d5782ce590995baabe054b969ce5a8;hp=7b3e115f63cf2d82f19c81d2cb39a6224f170389;hpb=c0a2aa7bfdcb0d56ec24e0ad98d5f248a995fd70;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/storage/sd-per-director.conf.erb b/modules/bacula/templates/storage/sd-per-director.conf.erb
index 7b3e115f6..5b568698d 100644
--- a/modules/bacula/templates/storage/sd-per-director.conf.erb
+++ b/modules/bacula/templates/storage/sd-per-director.conf.erb
@@ -10,15 +10,14 @@ 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 director 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'] %>
 }
 
 # Send all messages to the Director,
 #
 Messages {
-  Name = Standard
+  Name = <%= @messages_name %>
   director = <%= @director_name %> = all
 }