diff options
| author | Antonio Quartulli <antonio@mandelbit.com> | 2022-11-01 22:52:49 +0100 |
|---|---|---|
| committer | Antonio Quartulli <antonio@mandelbit.com> | 2022-11-02 19:32:23 +0100 |
| commit | 0ccbbca01b22232b5cba63d64ab00eb54af7b068 (patch) | |
| tree | c780c6cc424064999de60d690e4145e8a66aced8 | |
| parent | 7a0e40ce8df386c0ea2de84bce8fb6c81a0353ce (diff) | |
| download | vyos-1x-0ccbbca01b22232b5cba63d64ab00eb54af7b068.tar.gz vyos-1x-0ccbbca01b22232b5cba63d64ab00eb54af7b068.zip | |
openvpn: T3214: specify nopool on --server line only if needed
The --server directive will already create a pool automatically.
For this reason noppol should be used only when an explicit
client-ip-pool was configured by the user.
If that's not the case, then the nopool flag should not be
specified and no manual pool should be configured.
Signed-off-by: Antonio Quartulli <antonio@mandelbit.com>
| -rw-r--r-- | data/templates/openvpn/server.conf.j2 | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/data/templates/openvpn/server.conf.j2 b/data/templates/openvpn/server.conf.j2 index 6dd4ef88d..844a1390b 100644 --- a/data/templates/openvpn/server.conf.j2 +++ b/data/templates/openvpn/server.conf.j2 @@ -71,7 +71,7 @@ topology {{ server.topology }} {% endif %} {% for subnet in server.subnet %} {% if subnet | is_ipv4 %} -server {{ subnet | address_from_cidr }} {{ subnet | netmask_from_cidr }} nopool +server {{ subnet | address_from_cidr }} {{ subnet | netmask_from_cidr }} {{ 'nopool' if server.client_ip_pool is vyos_defined and server.client_ip_pool.disable is not vyos_defined else '' }} {# First ip address is used as gateway. It's allows to use metrics #} {% if server.push_route is vyos_defined %} {% for route, route_config in server.push_route.items() %} @@ -82,15 +82,6 @@ push "route-ipv6 {{ route }}" {% endif %} {% endfor %} {% endif %} -{# OpenVPN assigns the first IP address to its local interface so the pool used #} -{# in net30 topology - where each client receives a /30 must start from the second subnet #} -{% if server.topology is vyos_defined('net30') %} -ifconfig-pool {{ subnet | inc_ip('4') }} {{ subnet | last_host_address | dec_ip('1') }} {{ subnet | netmask_from_cidr if device_type == 'tap' else '' }} -{% else %} -{# OpenVPN assigns the first IP address to its local interface so the pool must #} -{# start from the second address and end on the last address #} -ifconfig-pool {{ subnet | first_host_address | inc_ip('1') }} {{ subnet | last_host_address | dec_ip('1') }} {{ subnet | netmask_from_cidr if device_type == 'tun' else '' }} -{% endif %} {% elif subnet | is_ipv6 %} server-ipv6 {{ subnet }} {% endif %} |