diff options
| author | qiuchengxuan <qiuchengxuan@gmail.com> | 2019-06-22 21:38:43 +0800 |
|---|---|---|
| committer | qiuchengxuan <qiuchengxuan@gmail.com> | 2019-06-25 16:05:21 +0800 |
| commit | 31f2887a69eda5b630165c288b0759e3540681cd (patch) | |
| tree | 7f0c9624bd2dafac7e10adec5e61e8b502185fe1 | |
| parent | b2ff9bfbf71334d477b47d8312a54ba71bc0cc68 (diff) | |
| download | vyos-1x-31f2887a69eda5b630165c288b0759e3540681cd.tar.gz vyos-1x-31f2887a69eda5b630165c288b0759e3540681cd.zip | |
[pdns-recursor] T1469 - replace forward-zones with forward-zones-recurse
forward-zones-recurse behaves identically to dnsmasq server option
in legacy vyos 1.1.8, while forward-zones option disallow recursive
name resolving, which leads to dns lookup failure
| -rwxr-xr-x | src/conf_mode/dns_forwarding.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/conf_mode/dns_forwarding.py b/src/conf_mode/dns_forwarding.py index 7559a0af6..c7e362d07 100755 --- a/src/conf_mode/dns_forwarding.py +++ b/src/conf_mode/dns_forwarding.py @@ -60,16 +60,6 @@ export-etc-hosts={{ export_hosts_file }} # listen-on local-address={{ listen_on | join(',') }} -# domain ... server ... -{% if domains -%} - -forward-zones={% for d in domains %} -{{ d.name }}={{ d.servers | join(";") }} -{{- "," if not loop.last -}} -{% endfor %} - -{% endif %} - # dnssec dnssec={{ dnssec }} @@ -80,6 +70,16 @@ forward-zones-recurse=.={{ name_servers | join(';') }} # no name-servers specified - start full recursor {% endif %} +# domain ... server ... +{% if domains -%} + +forward-zones-recurse={% for d in domains %} +{{ d.name }}={{ d.servers | join(";") }} +{{- "," if not loop.last -}} +{% endfor %} + +{% endif %} + """ default_config_data = { |