summaryrefslogtreecommitdiff
path: root/src/migration-scripts/sstp/4-to-5
diff options
context:
space:
mode:
authoraapostoliuk <a.apostoliuk@vyos.io>2024-01-05 16:18:15 +0200
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-01-10 19:00:37 +0000
commitb588e0784626ca42bf0da84a766213bda725305e (patch)
tree089396678f19f2c792f47ebe56ab0e379b3ba4e3 /src/migration-scripts/sstp/4-to-5
parent9bfc538e7af508bcb3979f4489076049e3a0031d (diff)
downloadvyos-1x-b588e0784626ca42bf0da84a766213bda725305e.tar.gz
vyos-1x-b588e0784626ca42bf0da84a766213bda725305e.zip
T5688: Changed 'range' to multi in 'client-ip-pool' for accell-ppp
Changed node 'range' to multi in 'client-ip-pool' for accell-ppp services. Added completionHelp to default-pool and next-pool. Fixed verification in vpn l2tp config script. (cherry picked from commit 4ffec67d04670192d9b722353cbaef04cb0ba129)
Diffstat (limited to 'src/migration-scripts/sstp/4-to-5')
-rwxr-xr-xsrc/migration-scripts/sstp/4-to-517
1 files changed, 4 insertions, 13 deletions
diff --git a/src/migration-scripts/sstp/4-to-5 b/src/migration-scripts/sstp/4-to-5
index 3a86c79ec..95e482713 100755
--- a/src/migration-scripts/sstp/4-to-5
+++ b/src/migration-scripts/sstp/4-to-5
@@ -43,21 +43,12 @@ if not config.exists(base):
if not config.exists(pool_base):
exit(0)
-subnet_base_name = 'default-subnet-pool'
-number = 1
-subnet_pool_name = f'{subnet_base_name}-{number}'
-prev_subnet_pool = subnet_pool_name
+range_pool_name = 'default-range-pool'
+
if config.exists(pool_base + ['subnet']):
- default_pool = subnet_pool_name
+ default_pool = range_pool_name
for subnet in config.return_values(pool_base + ['subnet']):
- config.set(pool_base + [subnet_pool_name, 'range'], value=subnet)
- if prev_subnet_pool != subnet_pool_name:
- config.set(pool_base + [prev_subnet_pool, 'next-pool'],
- value=subnet_pool_name)
- prev_subnet_pool = subnet_pool_name
- number += 1
- subnet_pool_name = f'{subnet_base_name}-{number}'
-
+ config.set(pool_base + [range_pool_name, 'range'], value=subnet, replace=False)
config.delete(pool_base + ['subnet'])
config.set(base + ['default-pool'], value=default_pool)
# format as tag node