dns: T4353: fix Jinja2 linting errors

5 files changed, 21 insertions, 20 deletions

diff --git a/data/templates/dns-forwarding/recursor.conf.tmpl b/data/templates/dns-forwarding/recursor.conf.j2
index 385bef94b..c1950e1bc 100644
--- a/data/templates/dns-forwarding/recursor.conf.tmpl
+++ b/data/templates/dns-forwarding/recursor.conf.j2
@@ -1,3 +1,4 @@
+{# j2lint: disable=single-statement-per-line #}
 ### Autogenerated by dns_forwarding.py ###
 
 # XXX: pdns recursor doesn't like whitespace near entry separators,
diff --git a/data/templates/dns-forwarding/recursor.conf.lua.tmpl b/data/templates/dns-forwarding/recursor.conf.lua.j2
index e2506238d..e2506238d 100644
--- a/data/templates/dns-forwarding/recursor.conf.lua.tmpl
+++ b/data/templates/dns-forwarding/recursor.conf.lua.j2
diff --git a/data/templates/dns-forwarding/recursor.forward-zones.conf.tmpl b/data/templates/dns-forwarding/recursor.forward-zones.conf.j2
index 96cbc35a5..de3269e47 100644
--- a/data/templates/dns-forwarding/recursor.forward-zones.conf.tmpl
+++ b/data/templates/dns-forwarding/recursor.forward-zones.conf.j2
@@ -1,3 +1,4 @@
+{# j2lint: disable=operator-enclosed-by-spaces #}
 # Autogenerated by VyOS (vyos-hostsd)
 # Do not edit, your changes will get overwritten
 
@@ -7,11 +8,11 @@
 {# the order of tags, then by the order of nameservers within that tag #}
 {% set n = namespace(dot_zone_ns='') %}
 {% for tag in name_server_tags_recursor %}
-{%   set ns = '' %}
-{%   if tag in name_servers %}
-{%     set ns = ns + name_servers[tag]|join(', ') %}
-{%     set n.dot_zone_ns = (n.dot_zone_ns, ns)|join(', ') if n.dot_zone_ns != '' else ns %}
-{%   endif %}
+{%     set ns = '' %}
+{%     if tag in name_servers %}
+{%         set ns = ns + name_servers[tag] | join(', ') %}
+{%         set n.dot_zone_ns = (n.dot_zone_ns, ns) | join(', ') if n.dot_zone_ns != '' else ns %}
+{%     endif %}
 # {{ tag }}: {{ ns }}
 {% endfor %}
 
@@ -21,8 +22,8 @@
 
 {% if forward_zones is vyos_defined %}
 # zones added via 'service dns forwarding domain'
-{%   for zone, zonedata in forward_zones.items() %}
+{%     for zone, zonedata in forward_zones.items() %}
 {{ "+" if zonedata.recursion_desired is vyos_defined }}{{ zone | replace('_', '-') }}={{ zonedata.server | join(', ') }}
-{%   endfor %}
+{%     endfor %}
 {% endif %}
 
diff --git a/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl b/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.j2
index 04fb72121..987c7de1f 100644
--- a/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl
+++ b/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.j2
@@ -3,28 +3,28 @@
 
 {% 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 %}
 {%     endfor %}
-{%   endfor %}
 {% endif %}
 
 {% if forward_zones is vyos_defined %}
 -- from 'service dns forwarding domain'
-{%   for zone, zonedata in forward_zones.items() %}
-{%     if zonedata.addnta is vyos_defined %}
+{%     for zone, zonedata in forward_zones.items() %}
+{%         if zonedata.addnta is vyos_defined %}
 addNTA("{{ zone }}", "static")
-{%     endif %}
-{%   endfor %}
+{%         endif %}
+{%     endfor %}
 {% endif %}
 
 {% if authoritative_zones is vyos_defined %}
 -- from 'service dns forwarding authoritative-domain'
-{%   for zone in authoritative_zones %}
+{%     for zone in authoritative_zones %}
 addNTA("{{ zone }}", "static")
-{%   endfor %}
+{%     endfor %}
 {% endif %}
diff --git a/data/templates/dns-forwarding/recursor.zone.conf.tmpl b/data/templates/dns-forwarding/recursor.zone.conf.j2
index 758871bef..25193c2ec 100644
--- a/data/templates/dns-forwarding/recursor.zone.conf.tmpl
+++ b/data/templates/dns-forwarding/recursor.zone.conf.j2
@@ -1,7 +1,6 @@
 ;
 ; Autogenerated by dns_forwarding.py
 ;
-;
 {% for r in records %}
-{{ r.name }}	{{ r.ttl }}	{{ r.type }}	{{ r.value }}
+{{ r.name }}    {{ r.ttl }}    {{ r.type }}    {{ r.value }}
 {% endfor %}