diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-07-22 19:56:19 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-07-22 20:01:35 +0200 |
| commit | 4e4dacee281059fdbca6531ace53f22817a62650 (patch) | |
| tree | e68e41052c4620c4bf40c5cf73b3891a7ea7e967 /src | |
| parent | 2495ea2f010474f8eb673d9ccd89429a127c1edc (diff) | |
| download | vyos-1x-4e4dacee281059fdbca6531ace53f22817a62650.tar.gz vyos-1x-4e4dacee281059fdbca6531ace53f22817a62650.zip | |
ipsec: T2816: remove "auto-update" CLI option
Update/refresh of DNS records is now handled internally by Strongswan.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/conf_mode/vpn_ipsec.py | 5 | ||||
| -rwxr-xr-x | src/migration-scripts/ipsec/5-to-6 | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/conf_mode/vpn_ipsec.py b/src/conf_mode/vpn_ipsec.py index c50724592..f1c6b216b 100755 --- a/src/conf_mode/vpn_ipsec.py +++ b/src/conf_mode/vpn_ipsec.py @@ -544,10 +544,7 @@ def apply(ipsec): if not ipsec: call('sudo ipsec stop') else: - args = '' - if 'auto_update' in ipsec: - args = '--auto-update ' + ipsec['auto_update'] - call(f'sudo ipsec restart {args}') + call('sudo ipsec restart') call('sudo ipsec rereadall') call('sudo ipsec reload') diff --git a/src/migration-scripts/ipsec/5-to-6 b/src/migration-scripts/ipsec/5-to-6 index 76ee9ecba..e9adee01b 100755 --- a/src/migration-scripts/ipsec/5-to-6 +++ b/src/migration-scripts/ipsec/5-to-6 @@ -80,6 +80,11 @@ if config.exists(base_interfaces): config.copy(base_interfaces, base + ['interface']) config.delete(base_interfaces) +# Remove deprecated "auto-update" option +tmp = base + ['auto-update'] +if config.exists(tmp): + config.delete(tmp) + try: with open(file_name, 'w') as f: f.write(config.to_string()) |