From 2c90c0d7c8d3bef95c1397c199bb53f7847743d7 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 3 Oct 2020 19:57:06 +0200 Subject: 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'. --- src/conf_mode/vpn_sstp.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/conf_mode/vpn_sstp.py') 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']) -- cgit v1.2.3