diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-06-09 18:34:29 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2022-06-09 18:34:29 +0200 |
| commit | 23f610f1a1fec326d1f68cddeaabd9c35009e47b (patch) | |
| tree | 591580fc6c8f91757d98ba24e547cf877cc5f357 /src/conf_mode | |
| parent | 5294710b9280053f09ed01ddde6eca3e65fda060 (diff) | |
| parent | 1aeaedb06928ce72c9439802055770826b32b454 (diff) | |
| download | vyos-1x-23f610f1a1fec326d1f68cddeaabd9c35009e47b.tar.gz vyos-1x-23f610f1a1fec326d1f68cddeaabd9c35009e47b.zip | |
Merge branch 'sstp_port' of https://github.com/goodNETnick/vyos-1x into current
* 'sstp_port' of https://github.com/goodNETnick/vyos-1x:
sstp: T4444. Port number changing support
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/vpn_sstp.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/conf_mode/vpn_sstp.py b/src/conf_mode/vpn_sstp.py index db53463cf..c2dc97caf 100755 --- a/src/conf_mode/vpn_sstp.py +++ b/src/conf_mode/vpn_sstp.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2018-2020 VyOS maintainers and contributors +# Copyright (C) 2018-2022 VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 or later as @@ -20,6 +20,7 @@ from sys import exit from vyos.config import Config from vyos.configdict import get_accel_dict +from vyos.configdict import dict_merge from vyos.configverify import verify_accel_ppp_base_service from vyos.pki import wrap_certificate from vyos.pki import wrap_private_key @@ -27,6 +28,7 @@ from vyos.template import render from vyos.util import call from vyos.util import dict_search from vyos.util import write_file +from vyos.xml import defaults from vyos import ConfigError from vyos import airbag airbag.enable() @@ -51,6 +53,11 @@ def get_config(config=None): # retrieve common dictionary keys sstp = get_accel_dict(conf, base, sstp_chap_secrets) + default_values = defaults(base) + sstp = dict_merge(default_values, sstp) + # workaround a "know limitation" - https://phabricator.vyos.net/T2665 + del sstp['authentication']['local_users']['username']['static_ip'] + if sstp: sstp['pki'] = conf.get_config_dict(['pki'], key_mangling=('-', '_'), get_first_key=True, no_tag_node_value_mangle=True) @@ -121,7 +128,6 @@ def generate(sstp): ca_cert_name = sstp['ssl']['ca_certificate'] pki_ca = sstp['pki']['ca'][ca_cert_name] - write_file(cert_file_path, wrap_certificate(pki_cert['certificate'])) write_file(cert_key_path, wrap_private_key(pki_cert['private']['key'])) write_file(ca_cert_file_path, wrap_certificate(pki_ca['certificate'])) |