From 31f2887a69eda5b630165c288b0759e3540681cd Mon Sep 17 00:00:00 2001
From: qiuchengxuan <qiuchengxuan@gmail.com>
Date: Sat, 22 Jun 2019 21:38:43 +0800
Subject: [pdns-recursor] T1469 - replace forward-zones with
 forward-zones-recurse

forward-zones-recurse behaves identically to dnsmasq server option
in legacy vyos 1.1.8, while forward-zones option disallow recursive
name resolving, which leads to dns lookup failure
---
 src/conf_mode/dns_forwarding.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/conf_mode/dns_forwarding.py')

diff --git a/src/conf_mode/dns_forwarding.py b/src/conf_mode/dns_forwarding.py
index 7559a0af6..c7e362d07 100755
--- a/src/conf_mode/dns_forwarding.py
+++ b/src/conf_mode/dns_forwarding.py
@@ -60,16 +60,6 @@ export-etc-hosts={{ export_hosts_file }}
 # listen-on
 local-address={{ listen_on | join(',') }}
 
-# domain ... server ...
-{% if domains -%}
-
-forward-zones={% for d in domains %}
-{{ d.name }}={{ d.servers | join(";") }}
-{{- "," if not loop.last -}}
-{% endfor %}
-
-{% endif %}
-
 # dnssec
 dnssec={{ dnssec }}
 
@@ -80,6 +70,16 @@ forward-zones-recurse=.={{ name_servers | join(';') }}
 # no name-servers specified - start full recursor
 {% endif %}
 
+# domain ... server ...
+{% if domains -%}
+
+forward-zones-recurse={% for d in domains %}
+{{ d.name }}={{ d.servers | join(";") }}
+{{- "," if not loop.last -}}
+{% endfor %}
+
+{% endif %}
+
 """
 
 default_config_data = {
-- 
cgit v1.2.3