Merge remote-tracking branch 'upstream/current' into current

1 files changed, 14 insertions, 14 deletions

diff --git a/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl b/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl
index b0d99d9ae..784d5c360 100644
--- a/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl
+++ b/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl
@@ -1,24 +1,24 @@
 -- Autogenerated by VyOS (vyos-hostsd) --
 -- Do not edit, your changes will get overwritten --
 
-{% if hosts -%}
+{% if hosts %}
 -- from 'system static-host-mapping' and DHCP server
-{%- for tag, taghosts in hosts.items() %}
-{%- for host, hostprops in taghosts.items() %}
+{%   for tag, taghosts in hosts.items() %}
+{%     for host, hostprops in taghosts.items() %}
 addNTA("{{ host }}.", "{{ tag }}")
-{%- for a in hostprops['aliases'] %}
+{%       for a in hostprops['aliases'] %}
 addNTA("{{ a }}.", "{{ tag }} alias")
-{%- endfor %}
-{%- endfor %}
-{%- endfor %}
-{%- endif %}
+{%       endfor %}
+{%     endfor %}
+{%   endfor %}
+{% endif %}
 
-{% if forward_zones -%}
+{% if forward_zones is defined %}
 -- from 'service dns forwarding domain'
-{%- for zone, zonedata in forward_zones.items() %}
-{%- if zonedata['addNTA'] %}
+{%   for zone, zonedata in forward_zones.items() %}
+{%     if zonedata['addnta'] is defined %}
 addNTA("{{ zone }}", "static")
-{%- endif %}
-{%- endfor %}
-{%- endif %}
+{%     endif %}
+{%   endfor %}
+{% endif %}