X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-fd.conf.erb;h=0be7a28d8730e3c343cfdab64ab067dbbfee0d0f;hb=49f7c90c52341e0a0666e578f6ca09c7d2d5d55b;hp=116d3c585d20353008739c85e994e54182778b8c;hpb=249b713a08d35bffb1cd52739be6f5808baa5a5f;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..0be7a28d8 100644
--- a/modules/bacula/templates/bacula-fd.conf.erb
+++ b/modules/bacula/templates/bacula-fd.conf.erb
@@ -22,11 +22,28 @@ 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('site::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('site::nodeinfo')['misc']['v6_ldap'].each do |addr| -%>
+    ipv6 = {
+      addr = <%= addr %>
+      port = <%= @bacula_client_port %>
+    }
+    <%- end -%>
+  }
   WorkingDirectory = /var/lib/bacula
   Pid Directory = /var/run/bacula
   Maximum Concurrent Jobs = 20
-  FDAddress = <%= @fqdn %>
   #Maximum Network Buffer Size = 524288
 
   TLS Enable = yes
@@ -38,7 +55,7 @@ FileDaemon {
 
 <%- if scope.lookupvar('site::nodeinfo')['hoster']['name'] == "brown" -%>
   # broken firewall
-  Heartbeat Interval = 300
+  Heartbeat Interval = 60
 <%- end -%>
 }