summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-10-03 19:57:06 +0200
committerChristian Poessinger <christian@poessinger.com>2020-10-03 19:59:21 +0200
commit2c90c0d7c8d3bef95c1397c199bb53f7847743d7 (patch)
tree88b40c283a7c55161070c2527d44585d1387a930 /src/conf_mode
parent0cc3e6f1bdcb907cecf2bf958c49e5d66adcbf13 (diff)
downloadvyos-1x-2c90c0d7c8d3bef95c1397c199bb53f7847743d7.tar.gz
vyos-1x-2c90c0d7c8d3bef95c1397c199bb53f7847743d7.zip
sstp: T2953: migrate name-server settions to common level
In order to reuse as much as possible before migrationg to get_config_dict() and re-use Jinja2 snippets the name-server node must be moved one level up to 'set vpn sstp name-server'.
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/vpn_sstp.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/conf_mode/vpn_sstp.py b/src/conf_mode/vpn_sstp.py
index 5d928a945..30972f60d 100755
--- a/src/conf_mode/vpn_sstp.py
+++ b/src/conf_mode/vpn_sstp.py
@@ -260,7 +260,7 @@ def get_config(config=None):
#
# read in network settings
- conf.set_level(base_path + ['network-settings'])
+ conf.set_level(base_path)
if conf.exists(['name-server']):
for name_server in conf.return_values(['name-server']):
if is_ipv4(name_server):
@@ -268,6 +268,9 @@ def get_config(config=None):
else:
sstp['dnsv6'].append(name_server)
+ #
+ # read in network settings
+ conf.set_level(base_path + ['network-settings'])
if conf.exists(['mtu']):
sstp['mtu'] = conf.return_value(['mtu'])