diff options
| author | Christian Poessinger <christian@poessinger.com> | 2018-05-15 20:58:58 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2018-05-15 20:58:58 +0200 |
| commit | d34591809104df052d2706edec3ee3f8428cf55e (patch) | |
| tree | 4d4f33ef02605bbfea8d7b09feec0c0b9c8d997a /src/conf-mode/vyos-config-dns-forwarding.py | |
| parent | 86771ef232f45058f8cf8c5848ef2e805afadd1b (diff) | |
| parent | 30030cc0cc808b9a1c942e89e8698ee2b522b87f (diff) | |
| download | vyos-1x-d34591809104df052d2706edec3ee3f8428cf55e.tar.gz vyos-1x-d34591809104df052d2706edec3ee3f8428cf55e.zip | |
Merge remote-tracking branch 'upstream/current' into current
* upstream/current:
Do not try to decode data read from /sys files in the show version script, it's already an str.
Dependencies on file and pystache, for install and show version scripts..
Add dependency on hvinfo, too.
T637, T638: add dependencies on tcpdump and bmon.
T638: new op mode CLI for the bandwidth monitor commands.
T637: new op mode for traffic dumps based on tcpdump.
Correct the logic of generating tag nodes for op mode.
Add missing vyos.base module
Fix cron interval regex to allow single digit values.
Fix misplaces ConfigError exception.
Some more valueless fixes.
Mark nodes in SSH and NTP valueless (related to T602).
Diffstat (limited to 'src/conf-mode/vyos-config-dns-forwarding.py')
| -rwxr-xr-x | src/conf-mode/vyos-config-dns-forwarding.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/conf-mode/vyos-config-dns-forwarding.py b/src/conf-mode/vyos-config-dns-forwarding.py index 9f3bb7aee..5494d07aa 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' |