X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-fd.conf.erb;h=6d1901a4c694970448c2a3bcb0f551d8bd798898;hb=42e20fefad3765c8635a9144dda741c23fff4b81;hp=5e07c9fe6ffffac3ab8f7c9c60508653bb2a98d5;hpb=a3265133b4a390133b3fc306f866433a57fc793e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-fd.conf.erb b/modules/bacula/templates/bacula-fd.conf.erb
index 5e07c9fe6..6d1901a4c 100644
--- a/modules/bacula/templates/bacula-fd.conf.erb
+++ b/modules/bacula/templates/bacula-fd.conf.erb
@@ -11,17 +11,17 @@ FileDaemon {
     # 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'] -%>
+    <%- if @has_ipv4 -%>
     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 %>
+      addr = <%= @client %>
       port = <%= @port_fd %>
     }
     <%- end -%>
-    <%- scope.lookupvar('deprecated::nodeinfo')['misc']['v6_ldap'].each do |addr| -%>
+    <%- if @has_ipv6 -%>
     ipv6 = {
-      addr = <%= addr %>
+      addr = <%= @client %>
       port = <%= @port_fd %>
     }
     <%- end -%>