Merge pull request #1123 from Wedmer/master

[luci-app-openvpn] Fixed ivalid checks for parameters in VPN tab.
This commit is contained in:
Hannu Nyman 2017-04-25 20:14:19 +03:00 committed by GitHub
commit da1c1b7291

View file

@ -367,123 +367,122 @@ local knownParams = {
"server", "server",
"10.200.200.0 255.255.255.0", "10.200.200.0 255.255.255.0",
translate("Configure server mode"), translate("Configure server mode"),
{ server_mode="1" } }, { client="0" }, { client="" } },
{ Value, { Value,
"server_bridge", "server_bridge",
"10.200.200.1 255.255.255.0 10.200.200.200 10.200.200.250", "10.200.200.1 255.255.255.0 10.200.200.200 10.200.200.250",
translate("Configure server bridge"), translate("Configure server bridge"),
{ server_mode="1" } }, { client="0" }, { client="" } },
{ DynamicList, { DynamicList,
"push", "push",
{ "redirect-gateway", "comp-lzo" }, { "redirect-gateway", "comp-lzo" },
translate("Push options to peer"), translate("Push options to peer"),
{ server_mode="1" } }, { client="0" }, { client="" } },
{ Flag, { Flag,
"push_reset", "push_reset",
0, 0,
translate("Don't inherit global push options"), translate("Don't inherit global push options"),
{ server_mode="1" } }, { client="0" }, { client="" } },
{ Flag, { Flag,
"disable", "disable",
0, 0,
translate("Client is disabled"), translate("Client is disabled"),
{ server_mode="1" } }, { client="0" }, { client="" } },
{ Value, { Value,
"ifconfig_pool", "ifconfig_pool",
"10.200.200.100 10.200.200.150 255.255.255.0", "10.200.200.100 10.200.200.150 255.255.255.0",
translate("Set aside a pool of subnets"), translate("Set aside a pool of subnets"),
{ server_mode="1" } }, { client="0" }, { client="" } },
{ Value, { Value,
"ifconfig_pool_persist", "ifconfig_pool_persist",
"/etc/openvpn/ipp.txt 600", "/etc/openvpn/ipp.txt 600",
translate("Persist/unpersist ifconfig-pool"), translate("Persist/unpersist ifconfig-pool"),
{ server_mode="1" } }, { client="0" }, { client="" } },
-- deprecated and replaced by --topology p2p -- deprecated and replaced by --topology p2p
-- { Flag, -- { Flag,
-- "ifconfig_pool_linear", -- "ifconfig_pool_linear",
-- 0, -- 0,
-- translate("Use individual addresses rather than /30 subnets"), -- translate("Use individual addresses rather than /30 subnets"),
-- { server_mode="1" } }, -- { client="0" }, { client="" } },
{ Value, { Value,
"ifconfig_push", "ifconfig_push",
"10.200.200.1 255.255.255.255", "10.200.200.1 255.255.255.255",
translate("Push an ifconfig option to remote"), translate("Push an ifconfig option to remote"),
{ server_mode="1" } }, { client="0" }, { client="" } },
{ Value, { Value,
"iroute", "iroute",
"10.200.200.0 255.255.255.0", "10.200.200.0 255.255.255.0",
translate("Route subnet to client"), translate("Route subnet to client"),
{ server_mode="1" } }, { client="0" }, { client="" } },
{ Flag, { Flag,
"client_to_client", "client_to_client",
0, 0,
translate("Allow client-to-client traffic"), translate("Allow client-to-client traffic"),
{ server_mode="1" } }, { client="0" }, { client="" } },
{ Flag, { Flag,
"duplicate_cn", "duplicate_cn",
0, 0,
translate("Allow multiple clients with same certificate"), translate("Allow multiple clients with same certificate"),
{ server_mode="1" } }, { client="0" }, { client="" } },
{ Value, { Value,
"client_config_dir", "client_config_dir",
"/etc/openvpn/ccd", "/etc/openvpn/ccd",
translate("Directory for custom client config files"), translate("Directory for custom client config files"),
{ server_mode="1" } }, { client="0" }, { client="" } },
{ Flag, { Flag,
"ccd_exclusive", "ccd_exclusive",
0, 0,
translate("Refuse connection if no custom client config"), translate("Refuse connection if no custom client config"),
{ server_mode="1" } }, { client="0" }, { client="" } },
{ Value, { Value,
"tmp_dir", "tmp_dir",
"/var/run/openvpn", "/var/run/openvpn",
translate("Temporary directory for client-connect return file"), translate("Temporary directory for client-connect return file"),
{ server_mode="1" } }, { client="0" }, { client="" } },
{ Value, { Value,
"hash_size", "hash_size",
"256 256", "256 256",
translate("Set size of real and virtual address hash tables"), translate("Set size of real and virtual address hash tables"),
{ server_mode="1" } }, { client="0" }, { client="" } },
{ Value, { Value,
"bcast_buffers", "bcast_buffers",
256, 256,
translate("Number of allocated broadcast buffers"), translate("Number of allocated broadcast buffers"),
{ server_mode="1" } }, { client="0" }, { client="" } },
{ Value, { Value,
"tcp_queue_limit", "tcp_queue_limit",
64, 64,
translate("Maximum number of queued TCP output packets"), translate("Maximum number of queued TCP output packets"),
{ server_mode="1" } }, { client="0" }, { client="" } },
{ Value, { Value,
"max_clients", "max_clients",
10, 10,
translate("Allowed maximum of connected clients"), translate("Allowed maximum of connected clients"),
{ server_mode="1" } }, { client="0" }, { client="" } },
{ Value, { Value,
"max_routes_per_client", "max_routes_per_client",
256, 256,
translate("Allowed maximum of internal"), translate("Allowed maximum of internal"),
{ server_mode="1" } }, { client="0" }, { client="" } },
{ Value, { Value,
"connect_freq", "connect_freq",
"3 10", "3 10",
translate("Allowed maximum of new connections"), translate("Allowed maximum of new connections"),
{ server_mode="1" } }, { client="0" }, { client="" } },
{ Flag, { Flag,
"client_cert_not_required", "client_cert_not_required",
0, 0,
translate("Don't require client certificate"), translate("Don't require client certificate"),
{ server_mode="1" } }, { client="0" }, { client="" } },
{ Flag, { Flag,
"username_as_common_name", "username_as_common_name",
0, 0,
translate("Use username as common name"), translate("Use username as common name"),
{ server_mode="1" } }, { client="0" }, { client="" } },
{ Flag, { Flag,
"client", "client",
0, 0,
translate("Configure client mode"), translate("Configure client mode") },
{ server_mode="0" }, { server_mode="" } },
{ Flag, { Flag,
"pull", "pull",
0, 0,