summaryrefslogtreecommitdiff
path: root/src/conf-mode
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-05-14 13:31:47 +0200
committerDaniil Baturin <daniil@baturin.org>2018-05-14 13:31:47 +0200
commit37aa8753fa67a1a8ad51cdc50539cab83f94ed2b (patch)
tree330e9ae6e92db9f6c42bcf061c4d5a873d80f8ff /src/conf-mode
parent345ec6803b0bc0a859a90bf659fa3d3eeea3a2f8 (diff)
downloadvyos-1x-37aa8753fa67a1a8ad51cdc50539cab83f94ed2b.tar.gz
vyos-1x-37aa8753fa67a1a8ad51cdc50539cab83f94ed2b.zip
Fix misplaces ConfigError exception.
Diffstat (limited to 'src/conf-mode')
-rwxr-xr-xsrc/conf-mode/vyos-config-bcast-relay.py2
-rwxr-xr-xsrc/conf-mode/vyos-config-dns-forwarding.py2
-rwxr-xr-xsrc/conf-mode/vyos-config-mdns-repeater.py2
-rwxr-xr-xsrc/conf-mode/vyos-config-ntp.py2
-rwxr-xr-xsrc/conf-mode/vyos-config-ssh.py2
-rwxr-xr-xsrc/conf-mode/vyos-update-crontab.py2
6 files changed, 6 insertions, 6 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..0d265f819 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'
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 1605dcd74..4949d6463 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"