X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-fd.conf.erb;h=16a89e088ccdbef9982aa18be281ad0a0a558aae;hb=21657d292015274ef9ab7619d2214e65998ccb69;hp=de60e38a54ec2360f269651fe859eee5fba0e6f4;hpb=750b505fa68a21ad51d2db5454364e6df70e2cec;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-fd.conf.erb b/modules/bacula/templates/bacula-fd.conf.erb
index de60e38a5..16a89e088 100644
--- a/modules/bacula/templates/bacula-fd.conf.erb
+++ b/modules/bacula/templates/bacula-fd.conf.erb
@@ -12,7 +12,7 @@ Director {
   TLS Enable = yes
   TLS Require = yes
   TLS Verify Peer = yes
-  TLS Allowed CN = "clientcerts/<%= @bacula_director_address %>"
+  TLS Allowed CN = "clientcerts/<%= @director_server %>"
   TLS CA Certificate File = "<%= @bacula_ca_path %>"
   # This is a server certificate, used for incoming director connections.
   TLS Certificate = "<%= @bacula_ssl_server_cert %>"
@@ -23,28 +23,32 @@ Director {
 FileDaemon {
   Name = <%= @bacula_client_name %>
   FDAddresses = {
-    # bacula, on Debian 9 (stretch) does not resolve a single name
+    # bacula, on Debian 9 (stretch), does not resolve a single name
     # to both v4 and v6 addresses.  Se we can't just say
     # ip = { addr = <hostname> }.  Boo.
-    <%- if scope.lookupvar('site::nodeinfo')['misc']['has_v4_ldap'] -%>
+    <%- if scope.lookupvar('deprecated::nodeinfo')['misc']['has_v4_ldap'] -%>
     ipv4 = {
       # use the hostname rather than the IP address from LDAP,
       # as /etc/hosts might have a better answer in case of natted hosts.
       addr = <%= @fqdn %>
-      port = <%= @bacula_client_port %>
+      port = <%= @port_fd %>
     }
     <%- end -%>
-    <%- if scope.lookupvar('site::nodeinfo')['misc']['has_v6_ldap'] -%>
+    <%- scope.lookupvar('deprecated::nodeinfo')['misc']['v6_ldap'].each do |addr| -%>
     ipv6 = {
-      addr = <%= @fqdn %>
-      port = <%= @bacula_client_port %>
+      addr = <%= addr %>
+      port = <%= @port_fd %>
     }
     <%- end -%>
   }
   WorkingDirectory = /var/lib/bacula
+<%- if scope.call_function('versioncmp', [@lsbmajdistrelease, '8']) <= 0 -%>
   Pid Directory = /var/run/bacula
+<%- else -%>
+  Pid Directory = /run/bacula
+  Plugin Directory = /usr/lib/bacula
+<%- end -%>
   Maximum Concurrent Jobs = 20
-  #Maximum Network Buffer Size = 524288
 
   TLS Enable = yes
   TLS Require = yes
@@ -53,7 +57,7 @@ FileDaemon {
   TLS Certificate = "<%= @bacula_ssl_client_cert %>"
   TLS Key = "<%= @bacula_ssl_client_key %>"
 
-<%- if scope.lookupvar('site::nodeinfo')['hoster']['name'] == "brown" -%>
+<%- if scope.lookupvar('deprecated::nodeinfo')['hoster']['name'] == "brown" -%>
   # broken firewall
   Heartbeat Interval = 60
 <%- end -%>