diff options
author | Christian Breunig <christian@breunig.cc> | 2024-08-05 07:28:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-08-05 07:28:27 +0200 |
commit | d30646fad07bd9263b385aa6a26c6d6dbc163e27 (patch) | |
tree | 429dc8602a8c475ba2424928f1a714c740f7c9ff /data/templates/openvpn/server.conf.j2 | |
parent | 60b0614296874c144665417130d4881461114db0 (diff) | |
parent | aa842a640cbe96719caf4cd1843d718a68f81319 (diff) | |
download | vyos-1x-d30646fad07bd9263b385aa6a26c6d6dbc163e27.tar.gz vyos-1x-d30646fad07bd9263b385aa6a26c6d6dbc163e27.zip |
Merge branch 'current' into feature/T4694/gre-match-fields
Diffstat (limited to 'data/templates/openvpn/server.conf.j2')
-rw-r--r-- | data/templates/openvpn/server.conf.j2 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/data/templates/openvpn/server.conf.j2 b/data/templates/openvpn/server.conf.j2 index f69519697..408103558 100644 --- a/data/templates/openvpn/server.conf.j2 +++ b/data/templates/openvpn/server.conf.j2 @@ -90,7 +90,9 @@ server-ipv6 {{ subnet }} {% endif %} {% endfor %} {% endif %} - +{% if server.bridge is vyos_defined and server.bridge.disable is not vyos_defined %} +server-bridge {{ server.bridge.gateway }} {{ server.bridge.subnet_mask }} {{ server.bridge.start }} {{ server.bridge.stop if server.bridge.stop is vyos_defined }} +{% endif %} {% if server.client_ip_pool is vyos_defined and server.client_ip_pool.disable is not vyos_defined %} ifconfig-pool {{ server.client_ip_pool.start }} {{ server.client_ip_pool.stop }} {{ server.client_ip_pool.subnet_mask if server.client_ip_pool.subnet_mask is vyos_defined }} {% endif %} |