summaryrefslogtreecommitdiff
path: root/src/migration-scripts/sstp/0-to-1
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-10-04 11:37:21 +0200
committerChristian Poessinger <christian@poessinger.com>2020-10-04 11:37:21 +0200
commit4649284812bb3dbb8c07f0e4dc56226b6da1a703 (patch)
treec1b1a7fd01df61336b95838d05bfd2a643dbece7 /src/migration-scripts/sstp/0-to-1
parent585aaf9c5770e2a0784849aee75213bd4ea1871a (diff)
downloadvyos-1x-4649284812bb3dbb8c07f0e4dc56226b6da1a703.tar.gz
vyos-1x-4649284812bb3dbb8c07f0e4dc56226b6da1a703.zip
sstp: T2953: migrate gateway-address, client-ip-settings to common level
* move "network-settings gateway-address" to "gateway-address" * move "network-settings client-ip-settings" to "client-ip-pool"
Diffstat (limited to 'src/migration-scripts/sstp/0-to-1')
-rwxr-xr-xsrc/migration-scripts/sstp/0-to-15
1 files changed, 2 insertions, 3 deletions
diff --git a/src/migration-scripts/sstp/0-to-1 b/src/migration-scripts/sstp/0-to-1
index 0e8dd1c4b..dc65bdeab 100755
--- a/src/migration-scripts/sstp/0-to-1
+++ b/src/migration-scripts/sstp/0-to-1
@@ -107,9 +107,9 @@ else:
config.delete(radius_server)
# migrate SSL certificates
- old_ssl = new_base + ['sstp-settings', 'ssl-certs']
+ old_ssl = new_base + ['sstp-settings']
new_ssl = new_base + ['ssl']
- config.copy(old_ssl, new_ssl)
+ config.copy(old_ssl + ['ssl-certs'], new_ssl)
config.delete(old_ssl)
if config.exists(new_ssl + ['ca']):
@@ -121,7 +121,6 @@ else:
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())