X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-fd.conf.erb;h=29521958d9ed5d97996b672834db1a9d35cb7eb1;hb=d0c098685b92334a611a0c596a35f538b95ead47;hp=c5478eb2bd138054d83c69c56ac9df4774cf0142;hpb=2b86e88b1cdbc434dfef58fa78c86361a3c1a279;p=mirror%2Fdsa-puppet.git diff --git a/modules/bacula/templates/bacula-fd.conf.erb b/modules/bacula/templates/bacula-fd.conf.erb index c5478eb2b..29521958d 100644 --- a/modules/bacula/templates/bacula-fd.conf.erb +++ b/modules/bacula/templates/bacula-fd.conf.erb @@ -26,7 +26,7 @@ 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 = }. Boo. - <%- if scope.lookupvar('site::nodeinfo')['misc']['has_v4_ldap'] -%> + <%- 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. @@ -34,7 +34,7 @@ FileDaemon { port = <%= @bacula_client_port %> } <%- end -%> - <%- scope.lookupvar('site::nodeinfo')['misc']['v6_ldap'].each do |addr| -%> + <%- scope.lookupvar('deprecated::nodeinfo')['misc']['v6_ldap'].each do |addr| -%> ipv6 = { addr = <%= addr %> port = <%= @bacula_client_port %> @@ -58,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 -%>