diff options
author | Daniil Baturin <daniil@vyos.io> | 2020-06-22 13:24:30 +0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-22 13:24:30 +0700 |
commit | 1d09b1a788cc91ff64134d853f063dc0a364ad50 (patch) | |
tree | 1dca2298b55d26ba24347a14dfc5a837d92aefff /data/templates/dns-forwarding/recursor.conf.tmpl | |
parent | a8041aa4a9e70c267c17451c14c7dcf9ca887023 (diff) | |
parent | 0ccdf15c0acb0be128fa2346b72cfdd8ce16b694 (diff) | |
download | vyos-1x-1d09b1a788cc91ff64134d853f063dc0a364ad50.tar.gz vyos-1x-1d09b1a788cc91ff64134d853f063dc0a364ad50.zip |
Merge pull request #452 from jjakob/T2486-dns-hostsd-fixes
T2486: DNS, vyos-hostsd fixes
Diffstat (limited to 'data/templates/dns-forwarding/recursor.conf.tmpl')
-rw-r--r-- | data/templates/dns-forwarding/recursor.conf.tmpl | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/data/templates/dns-forwarding/recursor.conf.tmpl b/data/templates/dns-forwarding/recursor.conf.tmpl index 9d1e019fa..d233b8abc 100644 --- a/data/templates/dns-forwarding/recursor.conf.tmpl +++ b/data/templates/dns-forwarding/recursor.conf.tmpl @@ -12,6 +12,7 @@ log-common-errors=yes non-local-bind=yes query-local-address=0.0.0.0 query-local-address6=:: +lua-config-file=recursor.conf.lua # cache-size max-cache-entries={{ cache_size }} @@ -22,23 +23,11 @@ max-negative-ttl={{ negative_ttl }} # ignore-hosts-file export-etc-hosts={{ export_hosts_file }} -# listen-on -local-address={{ listen_on | join(',') }} +# listen-address +local-address={{ listen_address | join(',') }} # dnssec dnssec={{ dnssec }} -# forward-zones / recursion -# -# statement is only inserted if either one forwarding domain or nameserver is configured -# if nothing is given at all, powerdns will act as a real recursor and resolve all requests by its own -# -{% if name_servers or domains %}forward-zones-recurse= -{%- for d in domains %} -{{ d.name }}={{ d.servers | join(";") }} -{{- ", " if not loop.last -}} -{%- endfor -%} -{%- if name_servers -%} -{%- if domains -%}, {% endif -%}.={{ name_servers | join(';') }} -{% endif %} -{% endif %} +forward-zones-file=recursor.forward-zones.conf + |