diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-04-10 10:08:05 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2022-04-10 10:08:05 +0200 |
| commit | aa4cb50bdf9932ff54776ee222f3caecb4a26b28 (patch) | |
| tree | 9777a998d7c5324d7bd00acf8484f059f95109d7 /data/templates/dns-forwarding | |
| parent | 17586e0f0698d65f4910ebb480997d768118311c (diff) | |
| download | vyos-1x-aa4cb50bdf9932ff54776ee222f3caecb4a26b28.tar.gz vyos-1x-aa4cb50bdf9932ff54776ee222f3caecb4a26b28.zip | |
dns: T4333: migrate to new vyos_defined Jinja2 test
Diffstat (limited to 'data/templates/dns-forwarding')
3 files changed, 7 insertions, 7 deletions
diff --git a/data/templates/dns-forwarding/recursor.conf.tmpl b/data/templates/dns-forwarding/recursor.conf.tmpl index d4ec80a3a..385bef94b 100644 --- a/data/templates/dns-forwarding/recursor.conf.tmpl +++ b/data/templates/dns-forwarding/recursor.conf.tmpl @@ -23,7 +23,7 @@ max-negative-ttl={{ negative_ttl }} network-timeout={{ timeout }} # ignore-hosts-file -export-etc-hosts={{ 'no' if ignore_hosts_file is defined else 'yes' }} +export-etc-hosts={{ 'no' if ignore_hosts_file is vyos_defined else 'yes' }} # listen-address local-address={{ listen_address | join(',') }} @@ -32,7 +32,7 @@ local-address={{ listen_address | join(',') }} dnssec={{ dnssec }} # serve rfc1918 records -serve-rfc1918={{ 'no' if no_serve_rfc1918 is defined else 'yes' }} +serve-rfc1918={{ 'no' if no_serve_rfc1918 is vyos_defined else 'yes' }} # zones auth-zones={% for z in authoritative_zones %}{{ z.name }}={{ z.file }}{{- "," if not loop.last -}}{% endfor %} diff --git a/data/templates/dns-forwarding/recursor.forward-zones.conf.tmpl b/data/templates/dns-forwarding/recursor.forward-zones.conf.tmpl index 3ab0c804d..96cbc35a5 100644 --- a/data/templates/dns-forwarding/recursor.forward-zones.conf.tmpl +++ b/data/templates/dns-forwarding/recursor.forward-zones.conf.tmpl @@ -19,10 +19,10 @@ +.={{ n.dot_zone_ns }} {% endif %} -{% if forward_zones is defined %} +{% if forward_zones is vyos_defined %} # zones added via 'service dns forwarding domain' {% for zone, zonedata in forward_zones.items() %} -{{ "+" if zonedata['recursion_desired'] is defined }}{{ zone | replace('_', '-') }}={{ zonedata['server']|join(', ') }} +{{ "+" if zonedata.recursion_desired is vyos_defined }}{{ zone | replace('_', '-') }}={{ zonedata.server | join(', ') }} {% endfor %} {% endif %} diff --git a/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl b/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl index 7f29c387e..04fb72121 100644 --- a/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl +++ b/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl @@ -13,16 +13,16 @@ addNTA("{{ a }}.", "{{ tag }} alias") {% endfor %} {% endif %} -{% if forward_zones is defined %} +{% if forward_zones is vyos_defined %} -- from 'service dns forwarding domain' {% for zone, zonedata in forward_zones.items() %} -{% if zonedata['addnta'] is defined %} +{% if zonedata.addnta is vyos_defined %} addNTA("{{ zone }}", "static") {% endif %} {% endfor %} {% endif %} -{% if authoritative_zones is defined %} +{% if authoritative_zones is vyos_defined %} -- from 'service dns forwarding authoritative-domain' {% for zone in authoritative_zones %} addNTA("{{ zone }}", "static") |