diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-07-03 18:28:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-03 18:28:04 +0200 |
| commit | 5a20fd657f1d4603eb5f49a01b9f3ae30278d0fd (patch) | |
| tree | e35d557e06c2c91cca99dec819ace5e92ef3680f /src/conf_mode | |
| parent | 6b759f81fec573859798a6d3f971bfaa0b1960c6 (diff) | |
| parent | 99cca9bea1a23c396b4b3121f759b3e21240fbd0 (diff) | |
| download | vyos-1x-5a20fd657f1d4603eb5f49a01b9f3ae30278d0fd.tar.gz vyos-1x-5a20fd657f1d4603eb5f49a01b9f3ae30278d0fd.zip | |
Merge pull request #78 from qiuchengxuan/current
[pdns-recursor] T1469 - specified dns forwarding not work
Diffstat (limited to 'src/conf_mode')
| -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 b9a5b99e9..aab389074 100755 --- a/src/conf_mode/dns_forwarding.py +++ b/src/conf_mode/dns_forwarding.py @@ -62,16 +62,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 }} @@ -82,6 +72,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 = { |