diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/conf_mode/vpn_sstp.py | 14 | ||||
| -rwxr-xr-x | src/migration-scripts/sstp/0-to-1 | 17 |
2 files changed, 24 insertions, 7 deletions
diff --git a/src/conf_mode/vpn_sstp.py b/src/conf_mode/vpn_sstp.py index 09de7d112..a2e7c9327 100755 --- a/src/conf_mode/vpn_sstp.py +++ b/src/conf_mode/vpn_sstp.py @@ -373,15 +373,15 @@ def get_config(): # # read in SSL certs - conf.set_level(base_path + ['sstp-settings', 'ssl-certs']) - if conf.exists(['ca']): - sstp['ssl_ca'] = conf.return_value(['ca']) + conf.set_level(base_path + ['ssl']) + if conf.exists(['ca-cert-file']): + sstp['ssl_ca'] = conf.return_value(['ca-cert-file']) - if conf.exists(['server-cert']): - sstp['ssl_cert'] = conf.return_value(['server-cert']) + if conf.exists(['cert-file']): + sstp['ssl_cert'] = conf.return_value(['cert-file']) - if conf.exists(['server-key']): - sstp['ssl_key'] = conf.return_value(['server-key']) + if conf.exists(['key-file']): + sstp['ssl_key'] = conf.return_value(['key-file']) # diff --git a/src/migration-scripts/sstp/0-to-1 b/src/migration-scripts/sstp/0-to-1 index 2edf76a56..1d1bea51f 100755 --- a/src/migration-scripts/sstp/0-to-1 +++ b/src/migration-scripts/sstp/0-to-1 @@ -21,6 +21,7 @@ # - authentication radius-server x.x.x.x to authentication radius server x.x.x.x # - authentication radius-settings to authentication radius # - do not migrate radius server req-limit, use default of unlimited +# - migrate SSL certificate path import os import sys @@ -105,6 +106,22 @@ else: config.set_tag(new_base + ['authentication', 'radius', 'server']) config.delete(radius_server) + # migrate SSL certificates + old_ssl = new_base + ['sstp-settings', 'ssl-certs'] + new_ssl = new_base + ['ssl'] + config.copy(old_ssl, new_ssl) + config.delete(old_ssl) + + if config.exists(new_ssl + ['ca']): + config.rename(new_ssl + ['ca'], 'ca-cert-file') + + if config.exists(new_ssl + ['server-cert']): + config.rename(new_ssl + ['server-cert'], 'cert-file') + + if config.exists(new_ssl + ['server-key']): + config.rename(new_ssl + ['server-key'], 'key-file') + + try: with open(file_name, 'w') as f: f.write(config.to_string()) |