From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 24 Sep 2019 22:35:48 +0000 (+0200)
Subject: Get the ssl variables from bacula:: as we have not inherited them
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6ae58e7c927c8ce440ad7eb7728f548c0ff8c754;p=mirror%2Fdsa-puppet.git

Get the ssl variables from bacula:: as we have not inherited them
---

diff --git a/modules/bacula/templates/storage/sd-per-director.conf.erb b/modules/bacula/templates/storage/sd-per-director.conf.erb
index 7b3e115f6..34f64232b 100644
--- a/modules/bacula/templates/storage/sd-per-director.conf.erb
+++ b/modules/bacula/templates/storage/sd-per-director.conf.erb
@@ -10,10 +10,10 @@ Director {
   TLS Require = yes
   TLS Verify Peer = yes
   TLS Allowed CN = "clientcerts/<%= @director_address %>"
-  TLS CA Certificate File = "<%= @bacula_ca_path %>"
+  TLS CA Certificate File = "<%= scope['bacula::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 %>"
+  TLS Certificate = "<%= scope['bacula::bacula_ssl_server_cert'] %>"
+  TLS Key = "<%= scope['bacula::bacula_ssl_server_key'] %>"
 }
 
 # Send all messages to the Director,