summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-01-12 10:49:42 +0100
committerChristian Poessinger <christian@poessinger.com>2019-01-12 10:56:34 +0100
commit3c563b3ae8397da33a03c0429c17b97eb9625c5f (patch)
tree9a3cfc322ca0d327129206e13a6bf72ea72216ff /src/conf_mode
parent898889396f3cce989468b973f484a8851dd613b2 (diff)
downloadvyos-1x-3c563b3ae8397da33a03c0429c17b97eb9625c5f.tar.gz
vyos-1x-3c563b3ae8397da33a03c0429c17b97eb9625c5f.zip
T1041: make upstream DNS server optional
The name-server option under "service dns-forwarding" was never mandatory so users never needed to specify an upstream server. With the recent switch to PowerDNS recursor in VyOS 1.2.0 we will act as a full DNS recursor when there is no upstream DNS server configured.
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/dns_forwarding.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/conf_mode/dns_forwarding.py b/src/conf_mode/dns_forwarding.py
index c21a91a30..135f6fec0 100755
--- a/src/conf_mode/dns_forwarding.py
+++ b/src/conf_mode/dns_forwarding.py
@@ -67,8 +67,12 @@ forward-zones={% for d in domains %}
# dnssec
dnssec={{ dnssec }}
+{% if name_servers -%}
# name-server
forward-zones-recurse=.={{ name_servers | join(';') }}
+{% else %}
+# no name-servers specified - start full recursor
+{% endif %}
"""