From 68f8acbaf44379173faaa8aa7cae6ee40024df88 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 16 Apr 2022 12:13:06 +0200
Subject: dns: T4353: fix Jinja2 linting errors

---
 data/templates/vyos-hostsd/hosts.j2         | 26 ++++++++++++++++++++++++++
 data/templates/vyos-hostsd/hosts.tmpl       | 25 -------------------------
 data/templates/vyos-hostsd/resolv.conf.j2   | 25 +++++++++++++++++++++++++
 data/templates/vyos-hostsd/resolv.conf.tmpl | 25 -------------------------
 4 files changed, 51 insertions(+), 50 deletions(-)
 create mode 100644 data/templates/vyos-hostsd/hosts.j2
 delete mode 100644 data/templates/vyos-hostsd/hosts.tmpl
 create mode 100644 data/templates/vyos-hostsd/resolv.conf.j2
 delete mode 100644 data/templates/vyos-hostsd/resolv.conf.tmpl

(limited to 'data/templates/vyos-hostsd')

diff --git a/data/templates/vyos-hostsd/hosts.j2 b/data/templates/vyos-hostsd/hosts.j2
new file mode 100644
index 000000000..5cad983b4
--- /dev/null
+++ b/data/templates/vyos-hostsd/hosts.j2
@@ -0,0 +1,26 @@
+{# j2lint: disable=single-statement-per-line #}
+### Autogenerated by VyOS ###
+### Do not edit, your changes will get overwritten ###
+
+# Local host
+127.0.0.1       localhost
+127.0.1.1       {{ host_name }}{% if domain_name %}.{{ domain_name }} {{ host_name }}{% endif %}
+
+# The following lines are desirable for IPv6 capable hosts
+::1             localhost ip6-localhost ip6-loopback
+fe00::0         ip6-localnet
+ff00::0         ip6-mcastprefix
+ff02::1         ip6-allnodes
+ff02::2         ip6-allrouters
+
+{% if hosts is vyos_defined %}
+# From 'system static-host-mapping' and DHCP server
+{%     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 %}
+{%         endfor %}
+{%     endfor %}
+{% endif %}
diff --git a/data/templates/vyos-hostsd/hosts.tmpl b/data/templates/vyos-hostsd/hosts.tmpl
deleted file mode 100644
index bc75d384e..000000000
--- a/data/templates/vyos-hostsd/hosts.tmpl
+++ /dev/null
@@ -1,25 +0,0 @@
-### Autogenerated by VyOS ###
-### Do not edit, your changes will get overwritten ###
-
-# Local host
-127.0.0.1       localhost
-127.0.1.1       {{ host_name }}{% if domain_name %}.{{ domain_name }} {{ host_name }}{% endif %}
-
-# The following lines are desirable for IPv6 capable hosts
-::1             localhost ip6-localhost ip6-loopback
-fe00::0         ip6-localnet
-ff00::0         ip6-mcastprefix
-ff02::1         ip6-allnodes
-ff02::2         ip6-allrouters
-
-{% if hosts is vyos_defined %}
-# From 'system static-host-mapping' and DHCP server
-{%   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 %}
-{%     endfor %}
-{%   endfor %}
-{% endif %}
diff --git a/data/templates/vyos-hostsd/resolv.conf.j2 b/data/templates/vyos-hostsd/resolv.conf.j2
new file mode 100644
index 000000000..5f651f1a1
--- /dev/null
+++ b/data/templates/vyos-hostsd/resolv.conf.j2
@@ -0,0 +1,25 @@
+### Autogenerated by VyOS ###
+### Do not edit, your changes will get overwritten ###
+
+{# the code below ensures the order of nameservers is determined first by #}
+{# 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 %}
+# {{ tag }}
+{%         for ns in name_servers[tag] %}
+nameserver {{ ns }}
+{%         endfor %}
+{%     endif %}
+{% endfor %}
+
+{% if domain_name %}
+domain {{ domain_name }}
+{% endif %}
+
+{% for tag in name_server_tags_system %}
+{%     if tag in search_domains %}
+# {{ tag }}
+search {{ search_domains[tag] | join(' ') }}
+{%     endif %}
+{% endfor %}
diff --git a/data/templates/vyos-hostsd/resolv.conf.tmpl b/data/templates/vyos-hostsd/resolv.conf.tmpl
deleted file mode 100644
index 58a5f9312..000000000
--- a/data/templates/vyos-hostsd/resolv.conf.tmpl
+++ /dev/null
@@ -1,25 +0,0 @@
-### Autogenerated by VyOS ###
-### Do not edit, your changes will get overwritten ###
-
-{# the code below ensures the order of nameservers is determined first by #}
-{# 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 %}
-# {{ tag }}
-{%     for ns in name_servers[tag] %}
-nameserver {{ ns }}
-{%     endfor %}
-{%   endif %}
-{% endfor %}
-
-{% if domain_name %}
-domain {{ domain_name }}
-{% endif %}
-
-{% for tag in name_server_tags_system %}
-{%   if tag in search_domains %}
-# {{ tag }}
-search {{ search_domains[tag]|join(' ') }}
-{%   endif %}
-{% endfor %}
-- 
cgit v1.2.3