summaryrefslogtreecommitdiff
path: root/src/migration-scripts/openvpn/1-to-2
diff options
context:
space:
mode:
Diffstat (limited to 'src/migration-scripts/openvpn/1-to-2')
-rw-r--r--src/migration-scripts/openvpn/1-to-26
1 files changed, 6 insertions, 0 deletions
diff --git a/src/migration-scripts/openvpn/1-to-2 b/src/migration-scripts/openvpn/1-to-2
index 83d6219d6..75360446c 100644
--- a/src/migration-scripts/openvpn/1-to-2
+++ b/src/migration-scripts/openvpn/1-to-2
@@ -25,11 +25,17 @@ def migrate(config: ConfigTree) -> None:
# Remove 'encryption cipher' and add this value to 'encryption ncp-ciphers'
# for server and client mode.
# Site-to-site mode still can use --cipher option
+ mode_path = ['interfaces', 'openvpn', i, 'mode']
cipher_path = ['interfaces', 'openvpn', i, 'encryption', 'cipher']
ncp_cipher_path = ['interfaces', 'openvpn', i, 'encryption', 'ncp-ciphers']
+
if config.exists(cipher_path):
if config.exists(['interfaces', 'openvpn', i, 'shared-secret-key']):
continue
+ # Only migrate if mode is not 'site-to-site'
+ if config.value_exists(mode_path, 'site-to-site'):
+ continue
+
cipher = config.return_value(cipher_path)
config.delete(cipher_path)
if cipher == 'none':