2 files changed, 15 insertions, 14 deletions
diff --git a/data/templates/vyos-hostsd/hosts.tmpl b/data/templates/vyos-hostsd/hosts.j2
index 03662d562..5cad983b4 100644
--- a/data/templates/vyos-hostsd/hosts.tmpl
+++ b/data/templates/vyos-hostsd/hosts.j2
@@ -1,3 +1,4 @@
+{# j2lint: disable=single-statement-per-line #}
 ### Autogenerated by VyOS ###
 ### Do not edit, your changes will get overwritten ###
 
@@ -12,14 +13,14 @@ ff00::0         ip6-mcastprefix
 ff02::1         ip6-allnodes
 ff02::2         ip6-allrouters
 
-{% if hosts is defined and hosts is not none %}
+{% if hosts is vyos_defined %}
 # From 'system static-host-mapping' and DHCP server
-{%   for tag, taghosts in hosts.items() %}
+{%     for tag, taghosts in hosts.items() %}
 # {{ tag }}
-{%     for host, hostprops in taghosts.items() if hostprops.address is defined %}
-{%       for addr in hostprops.address %}
-{{ "%-15s" | format(addr) }} {{ host }} {{ hostprops.aliases|join(' ') if hostprops.aliases is defined }}
-{%       endfor %}
+{%         for host, hostprops in taghosts.items() if hostprops.address is vyos_defined %}
+{%             for addr in hostprops.address %}
+{{ "%-15s" | format(addr) }} {{ host }} {{ hostprops.aliases | join(' ') if hostprops.aliases is vyos_defined }}
+{%             endfor %}
+{%         endfor %}
 {%     endfor %}
-{%   endfor %}
 {% endif %}
diff --git a/data/templates/vyos-hostsd/resolv.conf.tmpl b/data/templates/vyos-hostsd/resolv.conf.j2
index 58a5f9312..5f651f1a1 100644
--- a/data/templates/vyos-hostsd/resolv.conf.tmpl
+++ b/data/templates/vyos-hostsd/resolv.conf.j2
@@ -5,12 +5,12 @@
 {# the order of tags, then by the order of nameservers within that tag #}
 
 {% for tag in name_server_tags_system %}
-{%   if tag in name_servers %}
+{%     if tag in name_servers %}
 # {{ tag }}
-{%     for ns in name_servers[tag] %}
+{%         for ns in name_servers[tag] %}
 nameserver {{ ns }}
-{%     endfor %}
-{%   endif %}
+{%         endfor %}
+{%     endif %}
 {% endfor %}
 
 {% if domain_name %}
@@ -18,8 +18,8 @@ domain {{ domain_name }}
 {% endif %}
 
 {% for tag in name_server_tags_system %}
-{%   if tag in search_domains %}
+{%     if tag in search_domains %}
 # {{ tag }}
-search {{ search_domains[tag]|join(' ') }}
-{%   endif %}
+search {{ search_domains[tag] | join(' ') }}
+{%     endif %}
 {% endfor %}