summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2024-09-18 12:38:09 +0100
committerGitHub <noreply@github.com>2024-09-18 12:38:09 +0100
commit19ac59d02da196c8bc34c706ca72fc960e8ebb1c (patch)
treea7e9242c2f4e2260270b4e78f3645d2f2b5e6e9c
parent87611cccbcb89bcf0fb3316afd7064a7d2f66b5b (diff)
parent9040d1caafc915d53f8d141138a6333c9f936fcd (diff)
downloadvyos-1x-19ac59d02da196c8bc34c706ca72fc960e8ebb1c.tar.gz
vyos-1x-19ac59d02da196c8bc34c706ca72fc960e8ebb1c.zip
Merge pull request #4081 from vyos/mergify/bp/circinus/pr-3930
T6486: use data-ciphers instead of ncp-ciphers in "run generate openvpn client-config" (backport #3930)
-rwxr-xr-xsrc/op_mode/generate_ovpn_client_file.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/op_mode/generate_ovpn_client_file.py b/src/op_mode/generate_ovpn_client_file.py
index 974f7d9b6..1d2f1067a 100755
--- a/src/op_mode/generate_ovpn_client_file.py
+++ b/src/op_mode/generate_ovpn_client_file.py
@@ -51,12 +51,12 @@ verb 3
} %}
{% if encryption is defined and encryption is not none %}
-{% if encryption.ncp_ciphers is defined and encryption.ncp_ciphers is not none %}
-cipher {% for algo in encryption.ncp_ciphers %}
+{% if encryption.data_ciphers is defined and encryption.data_ciphers is not none %}
+cipher {% for algo in encryption.data_ciphers %}
{{ encryption_map[algo] if algo in encryption_map.keys() else algo }}{% if not loop.last %}:{% endif %}
{% endfor %}
-data-ciphers {% for algo in encryption.ncp_ciphers %}
+data-ciphers {% for algo in encryption.data_ciphers %}
{{ encryption_map[algo] if algo in encryption_map.keys() else algo }}{% if not loop.last %}:{% endif %}
{% endfor %}
{% endif %}