diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-09-26 15:35:52 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-09-26 15:37:42 +0200 |
| commit | 1290706dc0dd81565c0566925ed3951f9fd6ddba (patch) | |
| tree | 003020cfa53327adf936cc2f4c43d2590b9cb22a /src | |
| parent | 9717d6630144a4c1acaa473d1bdacf2536f8e041 (diff) | |
| download | vyos-1x-1290706dc0dd81565c0566925ed3951f9fd6ddba.tar.gz vyos-1x-1290706dc0dd81565c0566925ed3951f9fd6ddba.zip | |
login: migration: T2929: add missing if condition when probing for radius-server
Diffstat (limited to 'src')
| -rwxr-xr-x | src/migration-scripts/system/11-to-12 | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/src/migration-scripts/system/11-to-12 b/src/migration-scripts/system/11-to-12 index 1a0233c7d..9cddaa1a7 100755 --- a/src/migration-scripts/system/11-to-12 +++ b/src/migration-scripts/system/11-to-12 @@ -37,31 +37,32 @@ else: # Migrate "system login radius-server" tag node to new # "system login radius server" tag node and also rename the "secret" node to "key" # - for server in config.list_nodes(cfg_base + ['radius-server']): - base_server = cfg_base + ['radius-server', server] - # "key" node is mandatory - key = config.return_value(base_server + ['secret']) - config.set(cfg_base + ['radius', 'server', server, 'key'], value=key) + if config.exists(cfg_base + ['radius-server']): + for server in config.list_nodes(cfg_base + ['radius-server']): + base_server = cfg_base + ['radius-server', server] + # "key" node is mandatory + key = config.return_value(base_server + ['secret']) + config.set(cfg_base + ['radius', 'server', server, 'key'], value=key) - # "port" is optional - if config.exists(base_server + ['port']): - port = config.return_value(base_server + ['port']) - config.set(cfg_base + ['radius', 'server', server, 'port'], value=port) + # "port" is optional + if config.exists(base_server + ['port']): + port = config.return_value(base_server + ['port']) + config.set(cfg_base + ['radius', 'server', server, 'port'], value=port) - # "timeout is optional" - if config.exists(base_server + ['timeout']): - timeout = config.return_value(base_server + ['timeout']) - config.set(cfg_base + ['radius', 'server', server, 'timeout'], value=timeout) + # "timeout is optional" + if config.exists(base_server + ['timeout']): + timeout = config.return_value(base_server + ['timeout']) + config.set(cfg_base + ['radius', 'server', server, 'timeout'], value=timeout) - # format as tag node - config.set_tag(cfg_base + ['radius', 'server']) + # format as tag node + config.set_tag(cfg_base + ['radius', 'server']) - # delete old configuration node - config.delete(base_server) + # delete old configuration node + config.delete(base_server) - # delete top level tag node - if config.exists(cfg_base + ['radius-server']): - config.delete(cfg_base + ['radius-server']) + # delete top level tag node + if config.exists(cfg_base + ['radius-server']): + config.delete(cfg_base + ['radius-server']) try: with open(file_name, 'w') as f: |