summaryrefslogtreecommitdiff
path: root/src/conf-mode
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2018-05-15 20:58:29 +0200
committerChristian Poessinger <christian@poessinger.com>2018-05-15 20:58:29 +0200
commit86771ef232f45058f8cf8c5848ef2e805afadd1b (patch)
tree2cb9646cd09ebc97e2d6d77f6b2af7a1d67e435b /src/conf-mode
parent17bce754270301b951d0af9c80bfbf08872ec5af (diff)
downloadvyos-1x-86771ef232f45058f8cf8c5848ef2e805afadd1b.tar.gz
vyos-1x-86771ef232f45058f8cf8c5848ef2e805afadd1b.zip
bugfix: vyos-config-dns-forwarding.py: adding name-server into dictionary
Diffstat (limited to 'src/conf-mode')
-rwxr-xr-xsrc/conf-mode/vyos-config-dns-forwarding.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/conf-mode/vyos-config-dns-forwarding.py b/src/conf-mode/vyos-config-dns-forwarding.py
index 5556c1693..9f3bb7aee 100755
--- a/src/conf-mode/vyos-config-dns-forwarding.py
+++ b/src/conf-mode/vyos-config-dns-forwarding.py
@@ -52,7 +52,7 @@ local-address={{ listen_on | join(',') }}
{% if domains -%}
{% for d in domains -%}
-forward-zones={{ d.name }} = {{ d.servers | join(";") }}
+forward-zones={{ d.name }}={{ d.servers | join(";") }}
{% endfor -%}
{% endif %}
@@ -112,7 +112,7 @@ def get_config():
if conf.exists('name-server'):
name_servers = conf.return_values('name-server')
- dns.setdefault('name_servers', name_servers)
+ dns['name_servers'] = dns['name_servers'] + name_servers
if conf.exists('system'):
conf.set_level('system')