diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-12-09 15:52:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-09 15:52:12 +0100 |
| commit | e4854350aa00f35a005f3b11ee0139d0c69c4f96 (patch) | |
| tree | ae6475c3178b1ec3fc7e14ad573a2f97c66526bf /data | |
| parent | e51b9444a6a6a4640445c22a7f71ba1e035876da (diff) | |
| parent | 98704f45a4d261ae472e9b299080a1f06275ae81 (diff) | |
| download | vyos-1x-e4854350aa00f35a005f3b11ee0139d0c69c4f96.tar.gz vyos-1x-e4854350aa00f35a005f3b11ee0139d0c69c4f96.zip | |
Merge pull request #1024 from lucasec/dns-authoritative
T562: Config syntax for defining DNS forward authoritative zones
Diffstat (limited to 'data')
3 files changed, 16 insertions, 0 deletions
diff --git a/data/templates/dns-forwarding/recursor.conf.tmpl b/data/templates/dns-forwarding/recursor.conf.tmpl index d44f756e8..02efe903b 100644 --- a/data/templates/dns-forwarding/recursor.conf.tmpl +++ b/data/templates/dns-forwarding/recursor.conf.tmpl @@ -31,5 +31,8 @@ dnssec={{ dnssec }} # serve rfc1918 records serve-rfc1918={{ 'no' if no_serve_rfc1918 is defined else 'yes' }} +# zones +auth-zones={% for z in authoritative_zones %}{{ z.name }}={{ z.file }}{{- "," if not loop.last -}}{% endfor %} + forward-zones-file=recursor.forward-zones.conf diff --git a/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl b/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl index 784d5c360..7f29c387e 100644 --- a/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl +++ b/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl @@ -22,3 +22,9 @@ addNTA("{{ zone }}", "static") {% endfor %} {% endif %} +{% if authoritative_zones is defined %} +-- from 'service dns forwarding authoritative-domain' +{% for zone in authoritative_zones %} +addNTA("{{ zone }}", "static") +{% endfor %} +{% endif %} diff --git a/data/templates/dns-forwarding/recursor.zone.conf.tmpl b/data/templates/dns-forwarding/recursor.zone.conf.tmpl new file mode 100644 index 000000000..758871bef --- /dev/null +++ b/data/templates/dns-forwarding/recursor.zone.conf.tmpl @@ -0,0 +1,7 @@ +; +; Autogenerated by dns_forwarding.py +; +; +{% for r in records %} +{{ r.name }} {{ r.ttl }} {{ r.type }} {{ r.value }} +{% endfor %} |