Move bacula::bacula_ssl_{server,client}_{cert,key} to hiera

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

diff --git a/modules/bacula/templates/storage/sd-per-director.conf.erb b/modules/bacula/templates/storage/sd-per-director.conf.erb
index 34f6423..5b56869 100644 (file)
--- 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 = "<%= 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 to the Director,
 #
 Messages {
-  Name = Standard
+  Name = <%= @messages_name %>
   director = <%= @director_name %> = all
 }