diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-01-17 18:48:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-17 18:48:34 +0100 |
| commit | 0f61334ff4a38aca6e0c33a16f2400b5e7a3b5b3 (patch) | |
| tree | 879826a9e22c8228827a8ab1dcee55cd9c5cf240 /data | |
| parent | 31d3d7263ee3082bb7f7dd722086e2ce5c892a03 (diff) | |
| parent | e6713a7e861dbe3ec8af1761f1c0a3d1ad725cac (diff) | |
| download | vyos-1x-0f61334ff4a38aca6e0c33a16f2400b5e7a3b5b3.tar.gz vyos-1x-0f61334ff4a38aca6e0c33a16f2400b5e7a3b5b3.zip | |
Merge pull request #2845 from vyos/mergify/bp/sagitta/pr-2842
T5953: Changed values of 'close-action' to Strongswan values (backport #2842)
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/ipsec/swanctl/peer.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/templates/ipsec/swanctl/peer.j2 b/data/templates/ipsec/swanctl/peer.j2 index 86a44a0ff..c5841fb91 100644 --- a/data/templates/ipsec/swanctl/peer.j2 +++ b/data/templates/ipsec/swanctl/peer.j2 @@ -85,7 +85,7 @@ {% if ike.dead_peer_detection is vyos_defined %} dpd_action = {{ ike.dead_peer_detection.action }} {% endif %} - close_action = {{ {'none': 'none', 'hold': 'trap', 'restart': 'start'}[ike.close_action] }} + close_action = {{ ike.close_action }} } {% elif peer_conf.tunnel is vyos_defined %} {% for tunnel_id, tunnel_conf in peer_conf.tunnel.items() if tunnel_conf.disable is not defined %} @@ -135,7 +135,7 @@ {% if ike.dead_peer_detection is vyos_defined %} dpd_action = {{ ike.dead_peer_detection.action }} {% endif %} - close_action = {{ {'none': 'none', 'hold': 'trap', 'restart': 'start'}[ike.close_action] }} + close_action = {{ ike.close_action }} {% if peer_conf.vti.bind is vyos_defined %} {# The key defaults to 0 and will match any policies which similarly do not have a lookup key configuration. #} {# Thus we simply shift the key by one to also support a vti0 interface #} |