diff options
author | Christian Poessinger <christian@poessinger.com> | 2020-11-27 23:23:30 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-27 23:23:30 +0100 |
commit | 41f79409c742b6a020318b196cbaa52439845d6d (patch) | |
tree | ba7ab03f6d670c4fab23be257fdcffb5dd31e05b /data/templates | |
parent | 0b06b4807887357b2b9eed6a35928bb343c41028 (diff) | |
download | vyos-1x-41f79409c742b6a020318b196cbaa52439845d6d.tar.gz vyos-1x-41f79409c742b6a020318b196cbaa52439845d6d.zip |
vyos.template: T2720: fix resolv.conf trim blocks
After commit a2ac9fac16eeb626d3969092fecf463650750640 remove no longer
required template trim block statements.
Diffstat (limited to 'data/templates')
-rw-r--r-- | data/templates/vyos-hostsd/resolv.conf.tmpl | 25 |
1 files changed, 12 insertions, 13 deletions
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 %} |