6 files changed, 14 insertions, 14 deletions
diff --git a/src/conf-mode/vyos-config-bcast-relay.py b/src/conf-mode/vyos-config-bcast-relay.py
index f60664051..785690d9c 100755
--- a/src/conf-mode/vyos-config-bcast-relay.py
+++ b/src/conf-mode/vyos-config-bcast-relay.py
@@ -23,7 +23,7 @@ import time
 import subprocess
 
 from vyos.config import Config
-from vyos.util import ConfigError
+from vyos import ConfigError
 
 config_file = r'/etc/default/udp-broadcast-relay'
 
diff --git a/src/conf-mode/vyos-config-dns-forwarding.py b/src/conf-mode/vyos-config-dns-forwarding.py
index df273b321..be48cde60 100755
--- a/src/conf-mode/vyos-config-dns-forwarding.py
+++ b/src/conf-mode/vyos-config-dns-forwarding.py
@@ -23,7 +23,7 @@ import netifaces
 import jinja2
 
 from vyos.config import Config
-from vyos.util import ConfigError
+from vyos import ConfigError
 
 config_file = r'/etc/powerdns/recursor.conf'
 
@@ -31,7 +31,6 @@ config_file = r'/etc/powerdns/recursor.conf'
 # especially in the semicolon-separated lists of name servers.
 # Please be careful if you edit the template.
 config_tmpl = """
-
 ### Autogenerated by vyos-config-dns-forwarding.py ###
 
 # Non-configurable defaults
@@ -47,19 +46,20 @@ max-cache-entries={{ cache_size }}
 export-etc-hosts={{ export_hosts_file }}
 
 # listen-on
-local-address= {{ listen_on | join(',') }}
+local-address={{ listen_on | join(',') }}
 
 # domain ... server ...
 {% if domains -%}
 
-{% for d in domains -%}
-forward-zones = {{ d.name }} = {{ d.servers | join(";") }}
-{% endfor -%}
+forward-zones={% for d in domains %}
+{{ d.name }}={{ d.servers | join(";") }}
+{%- if loop.first %}, {% endif %}
+{% endfor %}
 
 {% endif %}
 
 # name-server
-forward-zones-recurse=.=  {{ name_servers | join(';') }}
+forward-zones-recurse=.={{ name_servers | join(';') }}
 
 """
 
@@ -113,7 +113,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')
@@ -185,7 +185,7 @@ def generate(dns):
     if dns is None:
         return None
 
-    tmpl = jinja2.Template(config_tmpl)
+    tmpl = jinja2.Template(config_tmpl, trim_blocks=True)
 
     config_text = tmpl.render(dns)
     with open(config_file, 'w') as f:
diff --git a/src/conf-mode/vyos-config-mdns-repeater.py b/src/conf-mode/vyos-config-mdns-repeater.py
index 3b8ca26ad..e648fd64f 100755
--- a/src/conf-mode/vyos-config-mdns-repeater.py
+++ b/src/conf-mode/vyos-config-mdns-repeater.py
@@ -22,7 +22,7 @@ import netifaces
 import time
 
 from vyos.config import Config
-from vyos.util import ConfigError
+from vyos import ConfigError
 
 config_file = r'/etc/default/mdns-repeater'
 
diff --git a/src/conf-mode/vyos-config-ntp.py b/src/conf-mode/vyos-config-ntp.py
index 061e8760e..8be12e44e 100755
--- a/src/conf-mode/vyos-config-ntp.py
+++ b/src/conf-mode/vyos-config-ntp.py
@@ -23,7 +23,7 @@ import jinja2
 import ipaddress
 
 from vyos.config import Config
-from vyos.util import ConfigError
+from vyos import ConfigError
 
 config_file = r'/etc/ntp.conf'
 
diff --git a/src/conf-mode/vyos-config-ssh.py b/src/conf-mode/vyos-config-ssh.py
index d09219caa..a7877eaeb 100755
--- a/src/conf-mode/vyos-config-ssh.py
+++ b/src/conf-mode/vyos-config-ssh.py
@@ -22,7 +22,7 @@ import os
 import jinja2
 
 from vyos.config import Config
-from vyos.util import ConfigError
+from vyos import ConfigError
 
 config_file = r'/etc/ssh/sshd_config'
 
diff --git a/src/conf-mode/vyos-update-crontab.py b/src/conf-mode/vyos-update-crontab.py
index 2d15de8ea..c19b88007 100755
--- a/src/conf-mode/vyos-update-crontab.py
+++ b/src/conf-mode/vyos-update-crontab.py
@@ -21,7 +21,7 @@ import re
 import sys
 
 from vyos.config import Config
-from vyos.util import ConfigError
+from vyos import ConfigError
 
 
 crontab_file = "/etc/cron.d/vyos-crontab"