diff --git a/src/usr/local/www/vpn_openvpn_server.php b/src/usr/local/www/vpn_openvpn_server.php index 3f7ff4a8df..910b632bd8 100644 --- a/src/usr/local/www/vpn_openvpn_server.php +++ b/src/usr/local/www/vpn_openvpn_server.php @@ -105,7 +105,6 @@ if ($act == "new") { $pconfig['dev_mode'] = "tun"; $pconfig['interface'] = "wan"; $pconfig['local_port'] = openvpn_port_next('UDP'); - $pconfig['pool_enable'] = "yes"; $pconfig['cert_depth'] = 1; $pconfig['verbosity_level'] = 1; // Default verbosity is 1 // OpenVPN Defaults to SHA1 @@ -183,7 +182,6 @@ if ($act == "edit") { $pconfig['client2client'] = $a_server[$id]['client2client']; $pconfig['dynamic_ip'] = $a_server[$id]['dynamic_ip']; - $pconfig['pool_enable'] = $a_server[$id]['pool_enable']; $pconfig['topology'] = $a_server[$id]['topology']; $pconfig['serverbridge_dhcp'] = $a_server[$id]['serverbridge_dhcp']; @@ -547,7 +545,6 @@ if ($_POST['save']) { $server['client2client'] = $pconfig['client2client']; $server['dynamic_ip'] = $pconfig['dynamic_ip']; - $server['pool_enable'] = $pconfig['pool_enable']; $server['topology'] = $pconfig['topology']; $server['serverbridge_dhcp'] = $pconfig['serverbridge_dhcp']; @@ -982,8 +979,8 @@ if ($act=="new" || $act=="edit"): $pconfig['tunnel_network'] ))->setHelp('This is the IPv4 virtual network used for private communications between this server and client ' . 'hosts expressed using CIDR (e.g. 10.0.8.0/24). The first network address will be assigned to ' . - 'the server virtual interface. The remaining network addresses can optionally be assigned ' . - 'to connecting clients (see Address Pool).'); + 'the server virtual interface. The remaining network addresses will be assigned ' . + 'to connecting clients.'); $section->addInput(new Form_Input( 'tunnel_networkv6', @@ -993,7 +990,7 @@ if ($act=="new" || $act=="edit"): ))->setHelp('This is the IPv6 virtual network used for private ' . 'communications between this server and client hosts expressed using CIDR (e.g. fe80::/64). ' . 'The first network address will be assigned to the server virtual interface. The remaining ' . - 'network addresses can optionally be assigned to connecting clients (see Address Pool).'); + 'network addresses will be assigned to connecting clients.'); $section->addInput(new Form_Checkbox( 'serverbridge_dhcp', @@ -1127,13 +1124,6 @@ if ($act=="new" || $act=="edit"): $pconfig['dynamic_ip'] )); - $section->addInput(new Form_Checkbox( - 'pool_enable', - 'Address Pool', - 'Provide a virtual adapter IP address to clients (see Tunnel Network).', - $pconfig['pool_enable'] - )); - $section->addInput(new Form_Select( 'topology', 'Topology', diff --git a/src/usr/local/www/wizards/openvpn_wizard.inc b/src/usr/local/www/wizards/openvpn_wizard.inc index a46f27dcdc..c6fdca00d3 100644 --- a/src/usr/local/www/wizards/openvpn_wizard.inc +++ b/src/usr/local/www/wizards/openvpn_wizard.inc @@ -597,8 +597,6 @@ function step12_submitphpaction() { $server['duplicate_cn'] = $pconfig['step10']['duplicate_cn']; if (isset($pconfig['step10']['dynip'])) $server['dynamic_ip'] = $pconfig['step10']['dynip']; - if (isset($pconfig['step10']['addrpool'])) - $server['pool_enable'] = $pconfig['step10']['addrpool']; if (isset($pconfig['step10']['defaultdomain'])) $server['dns_domain'] = $pconfig['step10']['defaultdomain']; if (isset($pconfig['step10']['dns1'])) diff --git a/src/usr/local/www/wizards/openvpn_wizard.xml b/src/usr/local/www/wizards/openvpn_wizard.xml index 3d898d7782..45b6956dbd 100644 --- a/src/usr/local/www/wizards/openvpn_wizard.xml +++ b/src/usr/local/www/wizards/openvpn_wizard.xml @@ -782,7 +782,7 @@ input 20 ovpnserver->step10->tunnelnet - This is the virtual network used for private communications between this server and client hosts expressed using CIDR notation (eg. 10.0.8.0/24). The first network address will be assigned to the server virtual interface. The remaining network addresses can optionally be assigned to connecting clients. (see Address Pool) + This is the virtual network used for private communications between this server and client hosts expressed using CIDR notation (eg. 10.0.8.0/24). The first network address will be assigned to the server virtual interface. The remaining network addresses will be assigned to connecting clients. Redirect Gateway @@ -853,14 +853,6 @@ Allow connected clients to retain their connections if their IP address changes. ovpnserver->step10->dynip - - Address Pool - addrpool - checkbox - on - Provide a virtual adapter IP address to clients (see Tunnel Network). - ovpnserver->step10->addrpool - Topology topology