12 files changed, 94 insertions, 92 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 %}
diff --git a/data/templates/dynamic-dns/ddclient.conf.j2 b/data/templates/dynamic-dns/ddclient.conf.j2
new file mode 100644
index 000000000..3c2d17cbb
--- /dev/null
+++ b/data/templates/dynamic-dns/ddclient.conf.j2
@@ -0,0 +1,51 @@
+### Autogenerated by dynamic_dns.py ###
+daemon=1m
+syslog=yes
+ssl=yes
+
+{% if interface is vyos_defined %}
+{%     for iface, iface_config in interface.items() %}
+# ddclient configuration for interface "{{ iface }}"
+{%         if iface_config.use_web is vyos_defined %}
+{%             set web_skip = ", web-skip='" ~ iface_config.use_web.skip ~ "'" if iface_config.use_web.skip is vyos_defined else '' %}
+use=web, web='{{ iface_config.use_web.url }}'{{ web_skip }}
+{%         else %}
+{{ 'usev6=if' if iface_config.ipv6_enable is vyos_defined else 'use=if' }}, if={{ iface }}
+{%         endif %}
+
+{%         if iface_config.rfc2136 is vyos_defined %}
+{%             for rfc2136, config in iface_config.rfc2136.items() %}
+{%                 for dns_record in config.record if config.record is vyos_defined %}
+# RFC2136 dynamic DNS configuration for {{ rfc2136 }}, {{ config.zone }}, {{ dns_record }}
+server={{ config.server }}
+protocol=nsupdate
+password={{ config.key }}
+ttl={{ config.ttl }}
+zone={{ config.zone }}
+{{ dns_record }}
+
+{%                 endfor %}
+{%             endfor %}
+{%         endif %}
+
+{%         if iface_config.service is vyos_defined %}
+{%             for service, config in iface_config.service.items() %}
+{%                 for dns_record in config.host_name %}
+# DynDNS provider configuration for {{ service }}, {{ dns_record }}
+protocol={{ config.protocol }},
+max-interval=28d,
+login={{ config.login }},
+password='{{ config.password }}',
+{%                     if config.server is vyos_defined %}
+server={{ config.server }},
+{%                     endif %}
+{%                     if config.zone is vyos_defined %}
+zone={{ config.zone }},
+{%                     endif %}
+{{ dns_record }}
+
+{%                 endfor %}
+{%             endfor %}
+{%         endif %}
+{%     endfor %}
+{% endif %}
diff --git a/data/templates/dynamic-dns/ddclient.conf.tmpl b/data/templates/dynamic-dns/ddclient.conf.tmpl
deleted file mode 100644
index ee55c9fa6..000000000
--- a/data/templates/dynamic-dns/ddclient.conf.tmpl
+++ /dev/null
@@ -1,51 +0,0 @@
-### Autogenerated by dynamic_dns.py ###
-daemon=1m
-syslog=yes
-ssl=yes
-
-{% if interface is vyos_defined %}
-{%   for iface, iface_config in interface.items() %}
-# ddclient configuration for interface "{{ iface }}"
-{%     if iface_config.use_web is vyos_defined %}
-{%       set web_skip = ", web-skip='" ~ iface_config.use_web.skip ~ "'" if iface_config.use_web.skip is vyos_defined else '' %}
-use=web, web='{{ iface_config.use_web.url }}'{{ web_skip }}
-{%     else %}
-{{ 'usev6=if' if iface_config.ipv6_enable is vyos_defined else 'use=if' }}, if={{ iface }}
-{%     endif %}
-
-{%     if iface_config.rfc2136 is vyos_defined %}
-{%       for rfc2136, config in iface_config.rfc2136.items() %}
-{%         for dns_record in config.record if config.record is vyos_defined %}
-# RFC2136 dynamic DNS configuration for {{ rfc2136 }}, {{ config.zone }}, {{ dns_record }}
-server={{ config.server }}
-protocol=nsupdate
-password={{ config.key }}
-ttl={{ config.ttl }}
-zone={{ config.zone }}
-{{ dns_record }}
-
-{%         endfor %}
-{%       endfor %}
-{%     endif %}
-
-{%     if iface_config.service is vyos_defined %}
-{%       for service, config in iface_config.service.items() %}
-{%         for dns_record in config.host_name %}
-# DynDNS provider configuration for {{ service }}, {{ dns_record }}
-protocol={{ config.protocol }},
-max-interval=28d,
-login={{ config.login }},
-password='{{ config.password }}',
-{%           if config.server is vyos_defined %}
-server={{ config.server }},
-{%           endif %}
-{%           if config.zone is vyos_defined %}
-zone={{ config.zone }},
-{%           endif %}
-{{ dns_record }}
-
-{%         endfor %}
-{%       endfor %}
-{%     endif %}
-{%   endfor %}
-{% endif %}
diff --git a/data/templates/vyos-hostsd/hosts.tmpl b/data/templates/vyos-hostsd/hosts.j2
index bc75d384e..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 ###
 
@@ -14,12 +15,12 @@ ff02::2         ip6-allrouters
 
 {% 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 vyos_defined %}
-{%       for addr in hostprops.address %}
-{{ "%-15s" | format(addr) }} {{ host }} {{ hostprops.aliases|join(' ') if hostprops.aliases is vyos_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 %}
diff --git a/src/conf_mode/dns_forwarding.py b/src/conf_mode/dns_forwarding.py
index fa9b21f20..f1c2d1f43 100755
--- a/src/conf_mode/dns_forwarding.py
+++ b/src/conf_mode/dns_forwarding.py
@@ -279,10 +279,10 @@ def generate(dns):
     if not dns:
         return None
 
-    render(pdns_rec_config_file, 'dns-forwarding/recursor.conf.tmpl',
+    render(pdns_rec_config_file, 'dns-forwarding/recursor.conf.j2',
             dns, user=pdns_rec_user, group=pdns_rec_group)
 
-    render(pdns_rec_lua_conf_file, 'dns-forwarding/recursor.conf.lua.tmpl',
+    render(pdns_rec_lua_conf_file, 'dns-forwarding/recursor.conf.lua.j2',
             dns, user=pdns_rec_user, group=pdns_rec_group)
 
     for zone_filename in glob(f'{pdns_rec_run_dir}/zone.*.conf'):
@@ -290,7 +290,7 @@ def generate(dns):
 
     if 'authoritative_zones' in dns:
         for zone in dns['authoritative_zones']:
-            render(zone['file'], 'dns-forwarding/recursor.zone.conf.tmpl',
+            render(zone['file'], 'dns-forwarding/recursor.zone.conf.j2',
                     zone, user=pdns_rec_user, group=pdns_rec_group)
 
 
diff --git a/src/conf_mode/dynamic_dns.py b/src/conf_mode/dynamic_dns.py
index a31e5ed75..06a2f7e15 100755
--- a/src/conf_mode/dynamic_dns.py
+++ b/src/conf_mode/dynamic_dns.py
@@ -131,7 +131,7 @@ def generate(dyndns):
     if not dyndns:
         return None
 
-    render(config_file, 'dynamic-dns/ddclient.conf.tmpl', dyndns)
+    render(config_file, 'dynamic-dns/ddclient.conf.j2', dyndns)
     return None
 
 def apply(dyndns):
diff --git a/src/services/vyos-hostsd b/src/services/vyos-hostsd
index df9f18d2d..9ae7b1ea9 100755
--- a/src/services/vyos-hostsd
+++ b/src/services/vyos-hostsd
@@ -421,12 +421,12 @@ def pdns_rec_control(command):
 
 def make_resolv_conf(state):
     logger.info(f"Writing {RESOLV_CONF_FILE}")
-    render(RESOLV_CONF_FILE, 'vyos-hostsd/resolv.conf.tmpl', state,
+    render(RESOLV_CONF_FILE, 'vyos-hostsd/resolv.conf.j2', state,
             user='root', group='root')
 
 def make_hosts(state):
     logger.info(f"Writing {HOSTS_FILE}")
-    render(HOSTS_FILE, 'vyos-hostsd/hosts.tmpl', state,
+    render(HOSTS_FILE, 'vyos-hostsd/hosts.j2', state,
             user='root', group='root')
 
 def make_pdns_rec_conf(state):
@@ -437,12 +437,12 @@ def make_pdns_rec_conf(state):
     chmod_755(PDNS_REC_RUN_DIR)
 
     render(PDNS_REC_LUA_CONF_FILE,
-            'dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl',
+            'dns-forwarding/recursor.vyos-hostsd.conf.lua.j2',
             state, user=PDNS_REC_USER, group=PDNS_REC_GROUP)
 
     logger.info(f"Writing {PDNS_REC_ZONES_FILE}")
     render(PDNS_REC_ZONES_FILE,
-            'dns-forwarding/recursor.forward-zones.conf.tmpl',
+            'dns-forwarding/recursor.forward-zones.conf.j2',
             state, user=PDNS_REC_USER, group=PDNS_REC_GROUP)
 
 def set_host_name(state, data):