From 86771ef232f45058f8cf8c5848ef2e805afadd1b Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 15 May 2018 20:58:29 +0200
Subject: bugfix: vyos-config-dns-forwarding.py: adding name-server into
 dictionary

---
 src/conf-mode/vyos-config-dns-forwarding.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

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')
-- 
cgit v1.2.3