summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-04-15 22:22:00 +0200
committerGitHub <noreply@github.com>2020-04-15 22:22:00 +0200
commitf50877bff8afed409f02d2978da6a70c383ccea1 (patch)
tree1cf1d2af7819e1415be39f33a3933011d9fb8629 /data
parent2bdd37a165c0e85dee371cff64e995d83d8cb118 (diff)
parent44dab795acaa39d8481d86022b691626989e52e8 (diff)
downloadvyos-1x-f50877bff8afed409f02d2978da6a70c383ccea1.tar.gz
vyos-1x-f50877bff8afed409f02d2978da6a70c383ccea1.zip
Merge pull request #349 from jjakob/openvpn-pool
openvpn: T2335: allow disabling client-ip-pool
Diffstat (limited to 'data')
-rw-r--r--data/templates/openvpn/server.conf.tmpl4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/templates/openvpn/server.conf.tmpl b/data/templates/openvpn/server.conf.tmpl
index a9dacd36e..e2f9062a1 100644
--- a/data/templates/openvpn/server.conf.tmpl
+++ b/data/templates/openvpn/server.conf.tmpl
@@ -78,10 +78,10 @@ topology {% if server_topology == 'point-to-point' %}p2p{% else %}{{ server_topo
mode server
tls-server
{%- else %}
-server {{ server_subnet }}{% if server_pool_start %} nopool{% endif %}
+server {{ server_subnet }} nopool
{%- endif %}
-{%- if server_pool_start %}
+{%- if server_pool %}
ifconfig-pool {{ server_pool_start }} {{ server_pool_stop }}{% if server_pool_netmask %} {{ server_pool_netmask }}{% endif %}
{%- endif %}