From ac7c868dcba4dd6738eb0087c4f414b92bf10c9d Mon Sep 17 00:00:00 2001 From: hagbard Date: Mon, 7 Jan 2019 13:05:19 -0800 Subject: Fix: T1168 - Upgrade: 1,1,7 -> 1.2.0-epa2 (command conversion) --- src/migration-scripts/ipsec/4-to-5 | 33 +++++++++++++++++++++++++++++++ src/migration-scripts/pppoe-server/0-to-1 | 4 +++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100755 src/migration-scripts/ipsec/4-to-5 (limited to 'src/migration-scripts') diff --git a/src/migration-scripts/ipsec/4-to-5 b/src/migration-scripts/ipsec/4-to-5 new file mode 100755 index 000000000..b64aa8462 --- /dev/null +++ b/src/migration-scripts/ipsec/4-to-5 @@ -0,0 +1,33 @@ +#!/usr/bin/env python3 + +# log-modes have changed, keyword all to any + +import sys + +from vyos.configtree import ConfigTree + +if (len(sys.argv) < 1): + print("Must specify file name!") + sys.exit(1) + +file_name = sys.argv[1] + +with open(file_name, 'r') as f: + config_file = f.read() + +ctree = ConfigTree(config_file) + +if not ctree.exists(['vpn', 'ipsec', 'logging','log-modes']): + # Nothing to do + sys.exit(0) +else: + lmodes = ctree.return_values(['vpn', 'ipsec', 'logging','log-modes']) + for mode in lmodes: + if mode == 'all': + ctree.set(['vpn', 'ipsec', 'logging','log-modes'], value='any', replace=True) + + try: + open(file_name,'w').write(ctree.to_string()) + except OSError as e: + print("Failed to save the modified config: {}".format(e)) + sys.exit(1) diff --git a/src/migration-scripts/pppoe-server/0-to-1 b/src/migration-scripts/pppoe-server/0-to-1 index df816a321..bb24211b6 100755 --- a/src/migration-scripts/pppoe-server/0-to-1 +++ b/src/migration-scripts/pppoe-server/0-to-1 @@ -1,6 +1,8 @@ #!/usr/bin/env python3 -# Delete "service ssh allow-root" option +# Convert "service pppoe-server authentication radius-server node key" +# to: +# "service pppoe-server authentication radius-server node secret" import sys -- cgit v1.2.3 From 4960c354afc207814cec419daf0a04d53703d63a Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Sat, 26 Jan 2019 00:36:57 +0100 Subject: [webproxy] T1203: do not attempt to migrate proxy-bypass if it doesn't exist. --- src/migration-scripts/webproxy/1-to-2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/migration-scripts') diff --git a/src/migration-scripts/webproxy/1-to-2 b/src/migration-scripts/webproxy/1-to-2 index 4acabba3e..070ff356d 100755 --- a/src/migration-scripts/webproxy/1-to-2 +++ b/src/migration-scripts/webproxy/1-to-2 @@ -19,7 +19,7 @@ with open(file_name, 'r') as f: config = ConfigTree(config_file) cfg_webproxy_base = ['service', 'webproxy'] -if not config.exists(cfg_webproxy_base): +if not config.exists(cfg_webproxy_base + ['proxy-bypass']): # Nothing to do sys.exit(0) else: -- cgit v1.2.3