X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fbacula%2Ftemplates%2Fbacula-fd.conf.erb;h=51624af5c626024fea8259fe5770e1a331634e53;hb=f038008e8029f30cdfd5c1c911596ff70a20fbff;hp=116d3c585d20353008739c85e994e54182778b8c;hpb=6f2e5fc86e49c12b12eef39fc69e0e810a32c318;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-fd.conf.erb b/modules/bacula/templates/bacula-fd.conf.erb
index 116d3c585..51624af5c 100644
--- a/modules/bacula/templates/bacula-fd.conf.erb
+++ b/modules/bacula/templates/bacula-fd.conf.erb
@@ -7,12 +7,12 @@
 # List Directors who are permitted to contact this File daemon
 Director {
   Name = <%= @bacula_director_name %>
-  Password = "<%= @bacula_client_secret %>"
+  Password = "<%= @client_secret %>"
 
   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 %>"
@@ -21,13 +21,34 @@ Director {
 
 # "Global" File daemon configuration specifications
 FileDaemon {
-  Name = <%= @bacula_client_name %>
-  FDport = <%= @bacula_client_port %>
+  Name = <%= @client_name %>
+  FDAddresses = {
+    # 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('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 = <%= @port_fd %>
+    }
+    <%- end -%>
+    <%- scope.lookupvar('deprecated::nodeinfo')['misc']['v6_ldap'].each do |addr| -%>
+    ipv6 = {
+      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
-  FDAddress = <%= @fqdn %>
-  #Maximum Network Buffer Size = 524288
 
   TLS Enable = yes
   TLS Require = yes
@@ -36,9 +57,9 @@ 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 = 300
+  Heartbeat Interval = 60
 <%- end -%>
 }