diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2022-02-09 16:07:55 +0000 |
|---|---|---|
| committer | Viacheslav Hletenko <v.gletenko@vyos.io> | 2022-02-15 12:08:04 +0000 |
| commit | 4552dbcf38b01596270c649c07b980f37b627fc2 (patch) | |
| tree | 04addd0abff9f33b80640cbe9fe1ea1363184a7d /data | |
| parent | 3ecdcc69401bddaa4b07fe024da149d6edb5da2d (diff) | |
| download | vyos-1x-4552dbcf38b01596270c649c07b980f37b627fc2.tar.gz vyos-1x-4552dbcf38b01596270c649c07b980f37b627fc2.zip | |
openvpn: T3686: Fix for check local-address in script and tmpl
Local-address should be checked/executed only if it exists in the
openvpn configuration, dictionary, jinja2 template
(cherry picked from commit 230ac0a202acd7ae9ad9bccb9e777ee5a0e0b7b7)
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/openvpn/server.conf.tmpl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/data/templates/openvpn/server.conf.tmpl b/data/templates/openvpn/server.conf.tmpl index c2b0c2ef9..75aae2981 100644 --- a/data/templates/openvpn/server.conf.tmpl +++ b/data/templates/openvpn/server.conf.tmpl @@ -135,11 +135,13 @@ ping {{ keep_alive.interval }} ping-restart {{ keep_alive.failure_count }} {% if device_type == 'tap' %} -{% for laddr, laddr_conf in local_address.items() if laddr | is_ipv4 %} -{% if laddr_conf is defined and laddr_conf.subnet_mask is defined and laddr_conf.subnet_mask is not none %} +{% if local_address is defined and local_address is not none %} +{% for laddr, laddr_conf in local_address.items() if laddr | is_ipv4 %} +{% if laddr_conf is defined and laddr_conf.subnet_mask is defined and laddr_conf.subnet_mask is not none %} ifconfig {{ laddr }} {{ laddr_conf.subnet_mask }} -{% endif %} -{% endfor %} +{% endif %} +{% endfor %} +{% endif %} {% else %} {% for laddr in local_address if laddr | is_ipv4 %} {% for raddr in remote_address if raddr | is_ipv4 %} |