1 files changed, 23 insertions, 27 deletions
diff --git a/data/templates/openvpn/client.conf.tmpl b/data/templates/openvpn/client.conf.tmpl
index 508d8da94..62387ef7c 100644
--- a/data/templates/openvpn/client.conf.tmpl
+++ b/data/templates/openvpn/client.conf.tmpl
@@ -1,35 +1,31 @@
 ### Autogenerated by interfaces-openvpn.py ###
 
-{% if ip -%}
-ifconfig-push {{ ip[0] }} {{ remote_netmask }}
-{% endif -%}
-
-{% for route in push_route -%}
-push "route {{ route }}"
-{% endfor -%}
-
-{% for net in subnet -%}
-iroute {{ net }}
-{% endfor -%}
-
+{% if ip %}
+ifconfig-push {{ ip[0] }} {{ server_subnet[0] | netmask_from_cidr }}
+{% endif %}
+{% if push_route is defined and push_route is not none %}
+{%   for route in push_route %}
+push "route {{ route | address_from_cidr }} {{ route | netmask_from_cidr }}"
+{%   endfor %}
+{% endif %}
+{% if subnet is defined and subnet is not none %}
+{%   for network in subnet %}
+iroute {{ network | address_from_cidr }} {{ network | netmask_from_cidr }}
+{%   endfor %}
+{% endif %}
 {# ipv6_remote is only set when IPv6 server is enabled #}
-{% if ipv6_remote -%}
+{% if ipv6_remote %}
 # IPv6
-
-{%- if ipv6_ip %}
+{%   if ipv6_ip %}
 ifconfig-ipv6-push {{ ipv6_ip[0] }} {{ ipv6_remote }}
-{%- endif %}
-
-{%- for route6 in ipv6_push_route %}
+{%   endif %}
+{%   for route6 in ipv6_push_route %}
 push "route-ipv6 {{ route6 }}"
-{%- endfor %}
-
-{%- for net6 in ipv6_subnet %}
+{%   endfor %}
+{%   for net6 in ipv6_subnet %}
 iroute {{ net6 }}
-{%- endfor %}
-
-{% endif -%}
-
-{% if disable -%}
+{%   endfor %}
+{% endif %}
+{% if disable is defined %}
 disable
-{% endif -%}
+{% endif %}