diff options
author | Christian Poessinger <christian@poessinger.com> | 2020-09-24 18:22:49 +0200 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2020-09-24 18:23:39 +0200 |
commit | 2b06653a824f21bf5b3a843f109f99096e7500ff (patch) | |
tree | 01934e9dbfbcba2928b90440aa5ba3aa53c1c6db /data/templates/dns-forwarding/recursor.forward-zones.conf.tmpl | |
parent | 92edd930c49b63247dbbcc370c9f93b3456cb855 (diff) | |
download | vyos-1x-2b06653a824f21bf5b3a843f109f99096e7500ff.tar.gz vyos-1x-2b06653a824f21bf5b3a843f109f99096e7500ff.zip |
dns: forwarding: T2921: template cleanup
Diffstat (limited to 'data/templates/dns-forwarding/recursor.forward-zones.conf.tmpl')
-rw-r--r-- | data/templates/dns-forwarding/recursor.forward-zones.conf.tmpl | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/data/templates/dns-forwarding/recursor.forward-zones.conf.tmpl b/data/templates/dns-forwarding/recursor.forward-zones.conf.tmpl index de5eaee00..e62b9bb81 100644 --- a/data/templates/dns-forwarding/recursor.forward-zones.conf.tmpl +++ b/data/templates/dns-forwarding/recursor.forward-zones.conf.tmpl @@ -3,26 +3,26 @@ # dot zone (catch-all): '+' indicates recursion is desired # (same as forward-zones-recurse) -{#- 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 #} -{%- 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 %} +{# 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 #} +{% 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 %} # {{ tag }}: {{ ns }} -{%- endfor %} +{% endfor %} -{%- if n.dot_zone_ns %} +{% if n.dot_zone_ns %} +.={{ n.dot_zone_ns }} -{%- endif %} +{% endif %} -{% if forward_zones -%} +{% if forward_zones %} # zones added via 'service dns forwarding domain' -{%- for zone, zonedata in forward_zones.items() %} -{% if zonedata['recursion-desired'] %}+{% endif %}{{ zone }}={{ zonedata['nslist']|join(', ') }} -{%- endfor %} -{%- endif %} +{% for zone, zonedata in forward_zones.items() %} +{% if zonedata['recursion-desired'] %}+{% endif %}{{ zone }}={{ zonedata['nslist']|join(', ') }} +{% endfor %} +{% endif %} |