From 41f79409c742b6a020318b196cbaa52439845d6d Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 27 Nov 2020 23:23:30 +0100 Subject: vyos.template: T2720: fix resolv.conf trim blocks After commit a2ac9fac16eeb626d3969092fecf463650750640 remove no longer required template trim block statements. --- data/templates/vyos-hostsd/resolv.conf.tmpl | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'data/templates/vyos-hostsd') diff --git a/data/templates/vyos-hostsd/resolv.conf.tmpl b/data/templates/vyos-hostsd/resolv.conf.tmpl index b920b2e5f..58a5f9312 100644 --- a/data/templates/vyos-hostsd/resolv.conf.tmpl +++ b/data/templates/vyos-hostsd/resolv.conf.tmpl @@ -1,26 +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 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 %} +{% for tag in name_server_tags_system %} +{% if tag in name_servers %} # {{ tag }} -{%- for ns in name_servers[tag] %} +{% for ns in name_servers[tag] %} nameserver {{ ns }} -{%- endfor %} -{%- endif %} -{%- endfor %} +{% endfor %} +{% endif %} +{% endfor %} -{%- if domain_name %} +{% if domain_name %} domain {{ domain_name }} -{%- endif %} +{% 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 %} -{%- endfor %} - +{% endif %} +{% endfor %} -- cgit v1.2.3