diff options
| author | qiuchengxuan <qiuchengxuan@gmail.com> | 2019-06-25 15:55:55 +0800 |
|---|---|---|
| committer | qiuchengxuan <qiuchengxuan@gmail.com> | 2019-06-25 22:31:33 +0800 |
| commit | 99cca9bea1a23c396b4b3121f759b3e21240fbd0 (patch) | |
| tree | 269cbcaf2d0a7a3095fa62cc193877422d07ff2d | |
| parent | 745355d412ec1cd7de4303e19474d1b7c4f84489 (diff) | |
| download | vyos-1x-99cca9bea1a23c396b4b3121f759b3e21240fbd0.tar.gz vyos-1x-99cca9bea1a23c396b4b3121f759b3e21240fbd0.zip | |
[pdns-recursor] T1469 - specified dns forwarding not work
when conflict exists between forward-zone-recurse entry,
the lower one hides the upper one, which leads to inactive dns forwarding configuration
| -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 0ce2eee2c..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-recurse={% 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 = { |