X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-sd.conf.erb;h=0a0ef7998a925cdc8b604b5daa6c67e66efa2a03;hb=5419a3761db7fb6dbf42a0097275f9723f7fa910;hp=c1520390754ec7a04cb0a2cce0c63dc8c5c42139;hpb=820c1c410cb381be3af94859695658cd093b8829;p=mirror%2Fdsa-puppet.git diff --git a/modules/bacula/templates/bacula-sd.conf.erb b/modules/bacula/templates/bacula-sd.conf.erb index c15203907..0a0ef7998 100644 --- a/modules/bacula/templates/bacula-sd.conf.erb +++ b/modules/bacula/templates/bacula-sd.conf.erb @@ -10,7 +10,7 @@ Storage { # 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 = }. 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. @@ -18,7 +18,7 @@ Storage { port = <%= @port_sd %> } <%- end -%> - <%- if scope.lookupvar('deprecated::nodeinfo')['misc']['has_v6_ldap'] -%> + <%- if @has_ipv6 -%> ipv6 = { addr = <%= @storage_address %> port = <%= @port_sd %>