summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-05-05 21:17:54 +0200
committerGitHub <noreply@github.com>2021-05-05 21:17:54 +0200
commitb9dcd6a9754de32c27dcd1e64d72209e39ad922a (patch)
tree0d1d63245d6ce0431e6a093d7b9a8dd7272e26f1
parent7050f4f5f8fedae794e77d6f34dba0a385698590 (diff)
parent8fcff3112b235307b78eb23833c1d646f0e7f9f4 (diff)
downloadvyos-1x-b9dcd6a9754de32c27dcd1e64d72209e39ad922a.tar.gz
vyos-1x-b9dcd6a9754de32c27dcd1e64d72209e39ad922a.zip
Merge pull request #829 from Hard7Rock/T3277
dns: T3277: DNS Forwarding - reverse zones for RFC1918 addresses
-rw-r--r--data/templates/dns-forwarding/recursor.conf.tmpl9
-rw-r--r--interface-definitions/dns-forwarding.xml.in6
2 files changed, 15 insertions, 0 deletions
diff --git a/data/templates/dns-forwarding/recursor.conf.tmpl b/data/templates/dns-forwarding/recursor.conf.tmpl
index 8799718b0..672080d63 100644
--- a/data/templates/dns-forwarding/recursor.conf.tmpl
+++ b/data/templates/dns-forwarding/recursor.conf.tmpl
@@ -29,5 +29,14 @@ local-address={{ listen_address | join(',') }}
# dnssec
dnssec={{ dnssec }}
+{# dns: T3277: #}
+{% 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 66b4db403..c420e9b8b 100644
--- a/interface-definitions/dns-forwarding.xml.in
+++ b/interface-definitions/dns-forwarding.xml.in
@@ -111,6 +111,12 @@
<valueless/>
</properties>
</leafNode>
+ <leafNode name="no-serve-rfc1918">
+ <properties>
+ <help>Makes the server authoritatively not aware of RFC1918 addresses</help>
+ <valueless/>
+ </properties>
+ </leafNode>
<leafNode name="allow-from">
<properties>
<help>Networks allowed to query this server</help>