summaryrefslogtreecommitdiff
path: root/src/conf_mode/dns_forwarding.py
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2019-07-04 11:51:11 +0200
committerDaniil Baturin <daniil@baturin.org>2019-07-04 11:51:11 +0200
commitd0728322381b0abd47e3f490ed2c123859e5be34 (patch)
tree18016597b2d1ac427f4c55964a03cb7a9bc4e029 /src/conf_mode/dns_forwarding.py
parentbeab961cedbd49024f1944b35821dc9bd8562987 (diff)
parent37dcfba27f62fe83c8cd25e08164b4a304ca9aee (diff)
downloadvyos-1x-d0728322381b0abd47e3f490ed2c123859e5be34.tar.gz
vyos-1x-d0728322381b0abd47e3f490ed2c123859e5be34.zip
Merge branch 'crux' of https://github.com/vyos/vyos-1x into crux
Diffstat (limited to 'src/conf_mode/dns_forwarding.py')
-rwxr-xr-xsrc/conf_mode/dns_forwarding.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/conf_mode/dns_forwarding.py b/src/conf_mode/dns_forwarding.py
index 491bb0120..aab389074 100755
--- a/src/conf_mode/dns_forwarding.py
+++ b/src/conf_mode/dns_forwarding.py
@@ -62,16 +62,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 }}
@@ -82,6 +72,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 = {