X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-fd.conf.erb;h=6f930d56979dd13866c9c24c2d4d955ed2715dbe;hb=9e27d3f0aaa21b93d9d256414dcd6335b07c0f53;hp=6d1901a4c694970448c2a3bcb0f551d8bd798898;hpb=0399c6165ed6ff265f460e8e8dde99a322615b77;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-fd.conf.erb b/modules/bacula/templates/bacula-fd.conf.erb
index 6d1901a4c..6f930d569 100644
--- a/modules/bacula/templates/bacula-fd.conf.erb
+++ b/modules/bacula/templates/bacula-fd.conf.erb
@@ -37,15 +37,11 @@ FileDaemon {
 
   TLS Enable = yes
   TLS Require = yes
-  TLS CA Certificate File = "<%= @bacula_ca_path %>"
-  # This is a client certificate, used by the client to connect to the storage daemon
-  TLS Certificate = "<%= @bacula_ssl_client_cert %>"
-  TLS Key = "<%= @bacula_ssl_client_key %>"
+  <%= scope['bacula::bacula_tls_ca_certificate_file'] %>
+  <%= scope['bacula::bacula_tls_client_certificate'] %>
+  <%= scope['bacula::bacula_tls_client_key'] %>
 
-<%- if scope.lookupvar('deprecated::nodeinfo')['hoster']['name'] == "brown" -%>
-  # broken firewall
   Heartbeat Interval = 60
-<%- end -%>
 }
 
 @|"sh -c 'for f in /etc/bacula/fd-conf.d/*.conf ; do echo @${f} ; done'"