diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-10 23:42:18 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-04-11 11:25:13 +0200 |
| commit | 02b4c640c8c02124ee8c1c1ee4da82c3367f20d0 (patch) | |
| tree | 14099ad2fd225feb3a30fd36ad25ed6fcdbbc445 | |
| parent | 0dd75963e82d6f20007d523bbd8a0bbe324f1e7f (diff) | |
| download | vyos-1x-02b4c640c8c02124ee8c1c1ee4da82c3367f20d0.tar.gz vyos-1x-02b4c640c8c02124ee8c1c1ee4da82c3367f20d0.zip | |
vpn: sstp: T2008: set accell default values in config dict
This will remove the required if/else parts int he Jinja2 template.
| -rwxr-xr-x | src/conf_mode/vpn_sstp.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/conf_mode/vpn_sstp.py b/src/conf_mode/vpn_sstp.py index 95bf12bb5..6a574dabb 100755 --- a/src/conf_mode/vpn_sstp.py +++ b/src/conf_mode/vpn_sstp.py @@ -60,7 +60,7 @@ def _accel_cmd(command): default_config_data = { 'local_users' : [], 'auth_mode' : 'local', - 'auth_proto' : [], + 'auth_proto' : ['auth_mschap_v2'], 'radius_server' : [], 'radius_acct_tmo' : '3', 'radius_max_try' : '3', @@ -77,7 +77,7 @@ default_config_data = { 'client_ip_pool' : [], 'dnsv4' : [], 'mtu' : '', - 'ppp_mppe' : '', + 'ppp_mppe' : 'prefer', 'ppp_echo_failure' : '', 'ppp_echo_interval' : '', 'ppp_echo_timeout' : '', @@ -223,9 +223,6 @@ def get_config(): for proto in conf.return_values(['protocols']): sstp['auth_proto'].append(auth_mods[proto]) - else: - sstp['auth_proto'] = ['auth_mschap_v2'] - # # read in SSL certs conf.set_level(base_path + ['ssl']) @@ -261,7 +258,7 @@ def get_config(): # read in PPP stuff conf.set_level(base_path + ['ppp-settings']) if conf.exists('mppe'): - sstp['ppp_mppe'] = conf.return_value('ppp-settings mppe') + sstp['ppp_mppe'] = conf.return_value(['ppp-settings', 'mppe']) if conf.exists(['lcp-echo-failure']): sstp['ppp_echo_failure'] = conf.return_value(['lcp-echo-failure']) |