X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-fd.conf.erb;h=29521958d9ed5d97996b672834db1a9d35cb7eb1;hb=8efc3cb29ac84aed50f87cc92ad50a6d21a10f8a;hp=9ef873ba93274374a210591d8a46af8a98094531;hpb=0521725518016bbccb7a7e65ada1200044e1fa79;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-fd.conf.erb b/modules/bacula/templates/bacula-fd.conf.erb
index 9ef873ba9..29521958d 100644
--- a/modules/bacula/templates/bacula-fd.conf.erb
+++ b/modules/bacula/templates/bacula-fd.conf.erb
@@ -22,11 +22,33 @@ Director {
 # "Global" File daemon configuration specifications
 FileDaemon {
   Name = <%= @bacula_client_name %>
-  FDport = <%= @bacula_client_port %>
+  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 = <%= @bacula_client_port %>
+    }
+    <%- end -%>
+    <%- scope.lookupvar('deprecated::nodeinfo')['misc']['v6_ldap'].each do |addr| -%>
+    ipv6 = {
+      addr = <%= addr %>
+      port = <%= @bacula_client_port %>
+    }
+    <%- 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
@@ -36,7 +58,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 -%>