summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorLucas Christian <lucas@lucasec.com>2024-02-08 22:04:16 -0800
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-03-28 16:09:39 +0000
commit781807e732da80b967019649cd79d4721e19f26d (patch)
tree4ddb6dde11ec5e76e30a2026bd14c95fc4f044f1 /data
parent5a722cf8491436b0091c8fd5522e8c1074569ef1 (diff)
downloadvyos-1x-781807e732da80b967019649cd79d4721e19f26d.tar.gz
vyos-1x-781807e732da80b967019649cd79d4721e19f26d.zip
T5872: fix ipsec dhclient exit hook
(cherry picked from commit cd8ef21f280f726955f537132e3fab2bcb3c286f)
Diffstat (limited to 'data')
-rw-r--r--data/templates/ipsec/swanctl/peer.j22
-rw-r--r--data/templates/ipsec/swanctl/remote_access.j22
2 files changed, 2 insertions, 2 deletions
diff --git a/data/templates/ipsec/swanctl/peer.j2 b/data/templates/ipsec/swanctl/peer.j2
index 58f0199fa..f38691884 100644
--- a/data/templates/ipsec/swanctl/peer.j2
+++ b/data/templates/ipsec/swanctl/peer.j2
@@ -8,7 +8,7 @@
{% if peer_conf.virtual_address is vyos_defined %}
vips = {{ peer_conf.virtual_address | join(', ') }}
{% endif %}
- local_addrs = {{ peer_conf.local_address if peer_conf.local_address != 'any' else '%any' }} # dhcp:{{ peer_conf.dhcp_interface if 'dhcp_interface' in peer_conf else 'no' }}
+ local_addrs = {{ peer_conf.local_address if peer_conf.local_address != 'any' else '%any' }} # dhcp:{{ peer_conf.dhcp_interface if 'dhcp_interface' in peer_conf else 'no' }} reset:{{ name }}
remote_addrs = {{ peer_conf.remote_address | join(",") if peer_conf.remote_address is vyos_defined and 'any' not in peer_conf.remote_address else '%any' }}
{% if peer_conf.authentication.mode is vyos_defined('x509') %}
send_cert = always
diff --git a/data/templates/ipsec/swanctl/remote_access.j2 b/data/templates/ipsec/swanctl/remote_access.j2
index af7f2994e..d1d6d2478 100644
--- a/data/templates/ipsec/swanctl/remote_access.j2
+++ b/data/templates/ipsec/swanctl/remote_access.j2
@@ -4,7 +4,7 @@
{% set esp = esp_group[rw_conf.esp_group] %}
ra-{{ name }} {
remote_addrs = %any
- local_addrs = {{ rw_conf.local_address if rw_conf.local_address is not vyos_defined('any') else '%any' }} # dhcp:{{ rw_conf.dhcp_interface if rw_conf.dhcp_interface is vyos_defined else 'no' }}
+ local_addrs = {{ rw_conf.local_address if rw_conf.local_address is not vyos_defined('any') else '%any' }} # dhcp:{{ rw_conf.dhcp_interface if rw_conf.dhcp_interface is vyos_defined else 'no' }} reset:ra-{{ name }}
proposals = {{ ike_group[rw_conf.ike_group] | get_esp_ike_cipher | join(',') }}
version = {{ ike.key_exchange[4:] if ike.key_exchange is vyos_defined else "0" }}
send_certreq = no