diff options
| author | Igor Melnyk <igor_melnyk@ukr.net> | 2021-05-04 10:44:29 +0300 |
|---|---|---|
| committer | Igor Melnyk <igor_melnyk@ukr.net> | 2021-05-04 10:44:29 +0300 |
| commit | 8fcff3112b235307b78eb23833c1d646f0e7f9f4 (patch) | |
| tree | 7d7c9528a7c2178f27e884ea7a58caf6375f148b | |
| parent | 0191c089f94455f53f3f234c094891353583f64c (diff) | |
| download | vyos-1x-8fcff3112b235307b78eb23833c1d646f0e7f9f4.tar.gz vyos-1x-8fcff3112b235307b78eb23833c1d646f0e7f9f4.zip | |
dns: T3277: DNS Forwarding - reverse zones for RFC1918 addresses (v2)
| -rw-r--r-- | data/templates/dns-forwarding/recursor.conf.tmpl | 5 | ||||
| -rw-r--r-- | interface-definitions/dns-forwarding.xml.in | 16 |
2 files changed, 7 insertions, 14 deletions
diff --git a/data/templates/dns-forwarding/recursor.conf.tmpl b/data/templates/dns-forwarding/recursor.conf.tmpl index cc9612ca8..672080d63 100644 --- a/data/templates/dns-forwarding/recursor.conf.tmpl +++ b/data/templates/dns-forwarding/recursor.conf.tmpl @@ -30,9 +30,12 @@ local-address={{ listen_address | join(',') }} dnssec={{ dnssec }} {# dns: T3277: #} -{% if serve_rfc1918 is defined and serve_rfc1918 == 'no' %} +{% if no_serve_rfc1918 is defined %} # serve-rfc1918 serve-rfc1918=no +{% else %} +# serve-rfc1918 +serve-rfc1918=yes {% endif %} forward-zones-file=recursor.forward-zones.conf diff --git a/interface-definitions/dns-forwarding.xml.in b/interface-definitions/dns-forwarding.xml.in index 789a6562b..c420e9b8b 100644 --- a/interface-definitions/dns-forwarding.xml.in +++ b/interface-definitions/dns-forwarding.xml.in @@ -111,20 +111,10 @@ <valueless/> </properties> </leafNode> - <leafNode name="serve-rfc1918"> + <leafNode name="no-serve-rfc1918"> <properties> - <help>Makes the server authoritatively aware of RFC1918 addresses</help> - <completionHelp> - <list>yes no</list> - </completionHelp> - <valueHelp> - <format>yes</format> - <description>Authoritatively aware about RFC1918 addresses (Default)</description> - </valueHelp> - <valueHelp> - <format>no</format> - <description>Authoritatively not aware about RFC1918 addresses</description> - </valueHelp> + <help>Makes the server authoritatively not aware of RFC1918 addresses</help> + <valueless/> </properties> </leafNode> <leafNode name="allow-from"> |