diff options
| author | Jernej Jakob <jernej.jakob@gmail.com> | 2020-06-11 09:17:51 +0200 |
|---|---|---|
| committer | Jernej Jakob <jernej.jakob@gmail.com> | 2020-06-11 22:10:47 +0200 |
| commit | 6f2d87526d9ad4e8e1cb09a607223ee6119f02e7 (patch) | |
| tree | 5f5e2211192f070824b6aa8c5b6321d974860bab | |
| parent | 64b4f483832b436849ecbbd30c3cbea0bd663648 (diff) | |
| download | vyos-1x-6f2d87526d9ad4e8e1cb09a607223ee6119f02e7.tar.gz vyos-1x-6f2d87526d9ad4e8e1cb09a607223ee6119f02e7.zip | |
dns forwarding: T2486: add templates
| -rw-r--r-- | data/templates/dns-forwarding/recursor.conf.lua.tmpl | 9 | ||||
| -rw-r--r-- | data/templates/dns-forwarding/recursor.conf.tmpl | 16 |
2 files changed, 11 insertions, 14 deletions
diff --git a/data/templates/dns-forwarding/recursor.conf.lua.tmpl b/data/templates/dns-forwarding/recursor.conf.lua.tmpl new file mode 100644 index 000000000..e2506238d --- /dev/null +++ b/data/templates/dns-forwarding/recursor.conf.lua.tmpl @@ -0,0 +1,9 @@ +-- Autogenerated by VyOS (dns_forwarding.py) -- +-- Do not edit, your changes will get overwritten -- + +-- Load DNSSEC root keys from dns-root-data package. +dofile("/usr/share/pdns-recursor/lua-config/rootkeys.lua") + +-- Load lua from vyos-hostsd -- +dofile("recursor.vyos-hostsd.conf.lua") + diff --git a/data/templates/dns-forwarding/recursor.conf.tmpl b/data/templates/dns-forwarding/recursor.conf.tmpl index c3ffea159..d233b8abc 100644 --- a/data/templates/dns-forwarding/recursor.conf.tmpl +++ b/data/templates/dns-forwarding/recursor.conf.tmpl @@ -29,17 +29,5 @@ 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 + |