diff options
Diffstat (limited to 'data/templates/vyos-hostsd')
-rw-r--r-- | data/templates/vyos-hostsd/hosts.tmpl | 16 | ||||
-rw-r--r-- | data/templates/vyos-hostsd/resolv.conf.tmpl | 25 |
2 files changed, 20 insertions, 21 deletions
diff --git a/data/templates/vyos-hostsd/hosts.tmpl b/data/templates/vyos-hostsd/hosts.tmpl index 566f9a5dd..be8692104 100644 --- a/data/templates/vyos-hostsd/hosts.tmpl +++ b/data/templates/vyos-hostsd/hosts.tmpl @@ -12,15 +12,15 @@ ff00::0 ip6-mcastprefix ff02::1 ip6-allnodes ff02::2 ip6-allrouters -{% if hosts -%} +{% if hosts %} # 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'] %} +{% for host, hostprops in taghosts.items() %} +{% if hostprops['address'] %} {{ hostprops['address'] }} {{ host }}{% for a in hostprops['aliases'] %} {{ a }}{% endfor %} -{%- endif %} -{%- endfor %} -{%- endfor %} -{%- endif %} +{% endif %} +{% endfor %} +{% endfor %} +{% endif %} 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 %} |