From 962f880554e70afc94f8902bb3742a8c0ef44fca Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 12 Jan 2019 10:49:42 +0100
Subject: 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.

(cherry picked from commit 3c563b3ae8397da33a03c0429c17b97eb9625c5f)
---
 src/conf_mode/dns_forwarding.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

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 %}
 
 """
 
-- 
cgit v1.2.3