summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-04-13 14:45:39 +0200
committerGitHub <noreply@github.com>2020-04-13 14:45:39 +0200
commit1e6dc1a45dd113dc49d24738d0b324bb67a8d11f (patch)
tree35f5bd836d8fb582abda88fff565ded99d90084f /data
parent518626c9cdd4430828d8909a9e2cdb88f3283f97 (diff)
parentbb36bdec1506c7fbf57b786c907b0c7cd5efc117 (diff)
downloadvyos-1x-1e6dc1a45dd113dc49d24738d0b324bb67a8d11f.tar.gz
vyos-1x-1e6dc1a45dd113dc49d24738d0b324bb67a8d11f.zip
Merge pull request #325 from jjakob/openvpn-pool
openvpn: T2235: add custom server pool handling
Diffstat (limited to 'data')
-rw-r--r--data/templates/openvpn/server.conf.tmpl11
1 files changed, 8 insertions, 3 deletions
diff --git a/data/templates/openvpn/server.conf.tmpl b/data/templates/openvpn/server.conf.tmpl
index c909f4337..a9dacd36e 100644
--- a/data/templates/openvpn/server.conf.tmpl
+++ b/data/templates/openvpn/server.conf.tmpl
@@ -71,13 +71,18 @@ nobind
#
{%- if server_topology %}
-topology {% if 'point-to-point' in server_topology %}p2p{% else %}subnet{% endif %}
+topology {% if server_topology == 'point-to-point' %}p2p{% else %}{{ server_topology }}{% endif %}
{%- endif %}
{%- if bridge_member %}
-server-bridge nogw
+mode server
+tls-server
{%- else %}
-server {{ server_subnet }}
+server {{ server_subnet }}{% if server_pool_start %} nopool{% endif %}
+{%- endif %}
+
+{%- if server_pool_start %}
+ifconfig-pool {{ server_pool_start }} {{ server_pool_stop }}{% if server_pool_netmask %} {{ server_pool_netmask }}{% endif %}
{%- endif %}
{%- if server_max_conn %}