summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--applications/luci-coovachilli/luasrc/controller/coovachilli.lua2
-rw-r--r--applications/luci-coovachilli/luasrc/i18n/coovachilli.en.xml190
-rw-r--r--applications/luci-coovachilli/luasrc/model/cbi/coovachilli_auth.lua6
-rw-r--r--applications/luci-coovachilli/root/lib/uci/schema/default/coovachilli6
4 files changed, 197 insertions, 7 deletions
diff --git a/applications/luci-coovachilli/luasrc/controller/coovachilli.lua b/applications/luci-coovachilli/luasrc/controller/coovachilli.lua
index d26dc20bc..6f0a89e00 100644
--- a/applications/luci-coovachilli/luasrc/controller/coovachilli.lua
+++ b/applications/luci-coovachilli/luasrc/controller/coovachilli.lua
@@ -18,7 +18,7 @@ function index()
require("luci.i18n")
local i18n = luci.i18n.translate
- entry( { "admin", "services", "coovachilli" }, cbi("coovachilli"), i18n("coovachilli", "CoovaChilli"), 90)
+ entry( { "admin", "services", "coovachilli" }, cbi("coovachilli"), i18n("coovachilli", "CoovaChilli"), 90).i18n = "coovachilli"
entry( { "admin", "services", "coovachilli", "network" }, cbi("coovachilli_network"), i18n("coovachilli_network", "Network Configuration"), 10)
entry( { "admin", "services", "coovachilli", "radius" }, cbi("coovachilli_radius"), i18n("coovachilli_radius", "Radius Configuration"), 20)
entry( { "admin", "services", "coovachilli", "auth" }, cbi("coovachilli_auth"), i18n("coovachilli_auth", "UAM and MAC Authentication"), 30)
diff --git a/applications/luci-coovachilli/luasrc/i18n/coovachilli.en.xml b/applications/luci-coovachilli/luasrc/i18n/coovachilli.en.xml
new file mode 100644
index 000000000..9efff4193
--- /dev/null
+++ b/applications/luci-coovachilli/luasrc/i18n/coovachilli.en.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<i18n:msgs xmlns:i18n="http://luci.freifunk-halle.net/2008/i18n#" xmlns="http://www.w3.org/1999/xhtml">
+
+<i18n:msg xml:id="coovachilli">CoovaChilli</i18n:msg>
+
+<i18n:msg xml:id="coovachilli_general">General configuration</i18n:msg>
+<i18n:msg xml:id="coovachilli_general_desc">General CoovaChilli settings</i18n:msg>
+<i18n:msg xml:id="coovachilli_general_cmdsock">Command socket</i18n:msg>
+<i18n:msg xml:id="coovachilli_general_cmdsock_desc">UNIX socket used for communication with chilli_query</i18n:msg>
+<i18n:msg xml:id="coovachilli_general_interval">Config refresh interval</i18n:msg>
+<i18n:msg xml:id="coovachilli_general_interval_desc">Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. </i18n:msg>
+<i18n:msg xml:id="coovachilli_general_pidfile">Pid file</i18n:msg>
+<i18n:msg xml:id="coovachilli_general_pidfile_desc">Filename to put the process id</i18n:msg>
+<i18n:msg xml:id="coovachilli_general_statedir">State directory</i18n:msg>
+<i18n:msg xml:id="coovachilli_general_statedir_desc">Directory of non-volatile data</i18n:msg>
+
+<i18n:msg xml:id="coovachilli_tun">TUN/TAP configuration</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_desc">Network/Tun configuration</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_condown">Network down script</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_condown_desc">Script executed after a session has moved from authorized state to unauthorized</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_conup">Network up script</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_conup_desc">Script executed after the tun network interface has been brought up</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_dns1">Primary DNS Server</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_dns1_desc">Is used to inform the client about the DNS address to use for host name resolution</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_dns2">Secondary DNS Server</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_dns2_desc">Is used to inform the client about the DNS address to use for host name resolution</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_domain">Domain name</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_domain_desc">Is used to inform the client about the domain name to use for DNS lookups</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_dynip">Dynamic IP address pool</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_dynip_desc">Specifies a pool of dynamic IP addresses</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_ipdown">IP down script</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_ipdown_desc">Script executed after the tun network interface has been taken down</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_ipup">IP up script</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_ipup_desc">Script executed after the TUN/TAP network interface has been brought up</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_net">Uplink subnet</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_net_desc">Network address of the uplink interface (CIDR notation)</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_statip">Static IP address pool</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_statip_desc">Specifies a pool of static IP addresses</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_tundev">TUN/TAP device</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_tundev_desc">The specific device to use for the TUN/TAP interface</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_txqlen">TX queue length</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_txqlen_desc">The TX queue length to set on the TUN/TAP interface</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_usetap">Use TAP device</i18n:msg>
+<i18n:msg xml:id="coovachilli_tun_usetap_desc">Use the TAP interface instead of TUN</i18n:msg>
+
+<i18n:msg xml:id="coovachilli_dhcp">DHCP configuration</i18n:msg>
+<i18n:msg xml:id="coovachilli_dhcp_desc">Set DHCP options for connecting clients</i18n:msg>
+<i18n:msg xml:id="coovachilli_dhcp_dhcpend">DHCP end number</i18n:msg>
+<i18n:msg xml:id="coovachilli_dhcp_dhcpend_desc">Where to stop assigning IP addresses (default 254)</i18n:msg>
+<i18n:msg xml:id="coovachilli_dhcp_dhcpif">DHCP interface</i18n:msg>
+<i18n:msg xml:id="coovachilli_dhcp_dhcpif_desc">Ethernet interface to listen to for the downlink interface</i18n:msg>
+<i18n:msg xml:id="coovachilli_dhcp_dhcpmac">Listen MAC address</i18n:msg>
+<i18n:msg xml:id="coovachilli_dhcp_dhcpmac_desc">MAC address to listen to. If not specified the MAC address of the interface will be used</i18n:msg>
+<i18n:msg xml:id="coovachilli_dhcp_dhcpstart">DHCP start number</i18n:msg>
+<i18n:msg xml:id="coovachilli_dhcp_dhcpstart_desc">Where to start assigning IP addresses (default 10)</i18n:msg>
+<i18n:msg xml:id="coovachilli_dhcp_eapolenable">Enable IEEE 802.1x</i18n:msg>
+<i18n:msg xml:id="coovachilli_dhcp_eapolenable_desc">Enable IEEE 802.1x authentication and listen for EAP requests</i18n:msg>
+<i18n:msg xml:id="coovachilli_dhcp_lease">Leasetime</i18n:msg>
+<i18n:msg xml:id="coovachilli_dhcp_lease_desc">Use a DHCP lease of seconds (default 600)</i18n:msg>
+
+<i18n:msg xml:id="coovachilli_radius">RADIUS configuration</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_desc">RADIUS configuration</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_acctupdate">Allow session update through RADIUS</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_acctupdate_desc">Allow updating of session parameters with RADIUS attributes sent in Accounting-Response</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_adminpasswd">Admin password</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_adminpasswd_desc">Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device "system" session</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_adminuser">Admin user</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_adminuser_desc">User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device "system" session</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_coanoipcheck">Do not check disconnection requests</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_coanoipcheck_desc">Do not check the source IP address of radius disconnect requests</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_coaport">RADIUS disconnect port</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_coaport_desc">UDP port to listen to for accepting radius disconnect requests</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_nasip">NAS IP</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_nasip_desc">Value to use in RADIUS NAS-IP-Address attribute</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_nasmac">NAS MAC</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_nasmac_desc">MAC address value to use in RADIUS Called-Station-ID attribute</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_openidauth">Allow OpenID authentication</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_openidauth_desc">Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiusacctport">RADIUS accounting port</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiusacctport_desc">The UDP port number to use for radius accounting requests (default 1813)</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiusauthport">RADIUS authentication port</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiusauthport_desc">The UDP port number to use for radius authentication requests (default 1812)</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiuscalled">Option radiuscalled</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiuslisten">RADIUS listen address</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiuslisten_desc">Local interface IP address to use for the radius interface</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiuslocationid">RADIUS location ID</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiuslocationid_desc">WISPr Location ID</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiuslocationname">RADIUS location name</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiuslocationname_desc">WISPr Location Name</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiusnasid">NAS ID</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiusnasid_desc">Network access server identifier</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiusnasip">Option radiusnasip</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiusnasporttype">NAS port type</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiusnasporttype_desc">Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiusoriginalurl">Send RADIUS VSA</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiusoriginalurl_desc">Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiussecret">RADIUS secret</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiussecret_desc">Radius shared secret for both servers</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiusserver1">RADIUS server 1</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiusserver1_desc">The IP address of radius server 1</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiusserver2">RADIUS server 2</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_radiusserver2_desc">The IP address of radius server 2</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_swapoctets">Swap octets</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_swapoctets_desc">Swap the meaning of "input octets" and "output octets" as it related to RADIUS attribtues</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_wpaguests">Allow WPA guests</i18n:msg>
+<i18n:msg xml:id="coovachilli_radius_wpaguests_desc">Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests</i18n:msg>
+
+<i18n:msg xml:id="coovachilli_proxy">RADIUS proxy settings</i18n:msg>
+<i18n:msg xml:id="coovachilli_proxy_desc">RADIUS proxy settings</i18n:msg>
+<i18n:msg xml:id="coovachilli_proxy_proxyclient">Proxy client</i18n:msg>
+<i18n:msg xml:id="coovachilli_proxy_proxyclient_desc">IP address from which radius requests are accepted. If omitted the server will not accept radius requests</i18n:msg>
+<i18n:msg xml:id="coovachilli_proxy_proxylisten">Proxy listen address</i18n:msg>
+<i18n:msg xml:id="coovachilli_proxy_proxylisten_desc">Local interface IP address to use for accepting radius requests</i18n:msg>
+<i18n:msg xml:id="coovachilli_proxy_proxyport">Proxy port</i18n:msg>
+<i18n:msg xml:id="coovachilli_proxy_proxyport_desc">UDP Port to listen to for accepting radius requests</i18n:msg>
+<i18n:msg xml:id="coovachilli_proxy_proxysecret">Proxy secret</i18n:msg>
+<i18n:msg xml:id="coovachilli_proxy_proxysecret_desc">Radius shared secret for clients</i18n:msg>
+
+<i18n:msg xml:id="coovachilli_uam">UAM configuration</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_desc">Unified Configuration Method settings</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_chillixml">Use Chilli XML</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_chillixml_desc">Return the so-called Chilli XML along with WISPr XML</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_defidletimeout">Default idle timeout</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_defidletimeout_desc">Default idle timeout unless otherwise set by RADIUS (defaults to 0)</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_definteriminterval">Default interim interval</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_definteriminterval_desc">Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_defsessiontimeout">Default session timeout</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_defsessiontimeout_desc">Default session timeout unless otherwise set by RADIUS (defaults to 0)</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_dnsparanoia">Inspect DNS traffic</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_dnsparanoia_desc">Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_localusers">Local users file</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_localusers_desc">A colon seperated file containing usernames and passwords of locally authenticated users</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_locationname">Location name</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_locationname_desc">Human readable location name used in JSON interface</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_nouamsuccess">Do not redirect to UAM server</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_nouamsuccess_desc">Do not return to UAM server on login success, just redirect to original URL</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_nouamwispr">Do not do WISPr</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_nouamwispr_desc">Do not do any WISPr XML, assume the back-end is doing this instead</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_postauthproxy">Post auth proxy</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_postauthproxy_desc">Used with postauthproxyport to define a post authentication HTTP proxy server</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_postauthproxyport">Post auth proxy port</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_postauthproxyport_desc">Used with postauthproxy to define a post authentication HTTP proxy server</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamallowed">Allowed resources</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamallowed_desc">List of resources the client can access without first authenticating</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamanydns">Allow any DNS server</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamanydns_desc">Allow any DNS server for unauthenticated clients</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamanyip">Allow any IP address</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamanyip_desc">Allow clients to use any IP settings they wish by spoofing ARP (experimental)</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamdomain">Allowed domains</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamdomain_desc">Defines a list of domain names to automatically add to the walled garden</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamhomepage">UAM homepage</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamhomepage_desc">URL of homepage to redirect unauthenticated users to</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamiport">UAM static content port</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamiport_desc">TCP port to bind to for only serving embedded content</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamlisten">UAM listening address</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamlisten_desc">IP address to listen to for authentication of clients</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamlogoutip">UAM logout IP</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamlogoutip_desc">Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamport">UAM listening port</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamport_desc">TCP port to bind to for authenticating clients (default 3990)</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamsecret">UAM secret</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamsecret_desc">Shared secret between uamserver and chilli</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamserver">UAM server</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamserver_desc">URL of web server to use for authenticating clients</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamui">UAM user interface</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_uamui_desc">An init.d style program to handle local content on the uamuiport web server</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_usestatusfile">Use status file</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_usestatusfile_desc">Write the status of clients in a non-volatile state file (experimental)</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_wisprlogin">WISPr login url</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_wisprlogin_desc">Specific URL to be given in WISPr XML LoginURL</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_wwwbin">CGI program</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_wwwbin_desc">Executable to run as a CGI type program (like haserl) for URLs with extention .chi</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_wwwdir">Web content directory</i18n:msg>
+<i18n:msg xml:id="coovachilli_uam_wwwdir_desc">Directory where embedded local web content is placed</i18n:msg>
+
+<i18n:msg xml:id="coovachilli_macauth">MAC configuration</i18n:msg>
+<i18n:msg xml:id="coovachilli_macauth_desc">Configure MAC authentication</i18n:msg>
+<i18n:msg xml:id="coovachilli_macauth_macallowed">Allowed MAC addresses</i18n:msg>
+<i18n:msg xml:id="coovachilli_macauth_macallowed_desc">List of MAC addresses for which MAC authentication will be performed</i18n:msg>
+<i18n:msg xml:id="coovachilli_macauth_macallowlocal">Authenticate locally allowed MACs</i18n:msg>
+<i18n:msg xml:id="coovachilli_macauth_macallowlocal_desc">Authenticate allowed MAC addresses without the use of RADIUS</i18n:msg>
+<i18n:msg xml:id="coovachilli_macauth_macauth">Enable MAC authentification</i18n:msg>
+<i18n:msg xml:id="coovachilli_macauth_macauth_desc">Try to authenticate all users based on their mac address alone</i18n:msg>
+<i18n:msg xml:id="coovachilli_macauth_macpasswd">Password</i18n:msg>
+<i18n:msg xml:id="coovachilli_macauth_macpasswd_desc">Password used when performing MAC authentication</i18n:msg>
+<i18n:msg xml:id="coovachilli_macauth_macsuffix">Suffix</i18n:msg>
+<i18n:msg xml:id="coovachilli_macauth_macsuffix_desc">Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server</i18n:msg>
+
+</i18n:msgs>
diff --git a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_auth.lua b/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_auth.lua
index eb6151996..064df2b4f 100644
--- a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_auth.lua
+++ b/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_auth.lua
@@ -23,13 +23,13 @@ s1.anonymous = true
s1:option( Value, "uamserver" )
s1:option( Value, "uamsecret" ).password = true
-s1:option( Flag, "uamanyip" )
s1:option( Flag, "uamanydns" )
-s1:option( Flag, "dnsparanoia" )
s1:option( Flag, "nouamsuccess" )
s1:option( Flag, "nouamwispr" )
-s1:option( Flag, "usestatusfile" )
s1:option( Flag, "chillixml" )
+s1:option( Flag, "uamanyip" ).optional = true
+s1:option( Flag, "dnsparanoia" ).optional = true
+s1:option( Flag, "usestatusfile" ).optional = true
s1:option( Value, "uamhomepage" ).optional = true
s1:option( Value, "uamlisten" ).optional = true
diff --git a/applications/luci-coovachilli/root/lib/uci/schema/default/coovachilli b/applications/luci-coovachilli/root/lib/uci/schema/default/coovachilli
index 2111dfbb6..898381a6d 100644
--- a/applications/luci-coovachilli/root/lib/uci/schema/default/coovachilli
+++ b/applications/luci-coovachilli/root/lib/uci/schema/default/coovachilli
@@ -2,7 +2,7 @@ package coovachilli
config section
option name 'general'
- option title 'Section general'
+ option title 'General configuration'
option description 'General CoovaChilli settings'
option package 'coovachilli'
option unique true
@@ -39,7 +39,7 @@ config variable
config section
option name 'tun'
- option title 'Section tun'
+ option title 'TUN/TAP configuration'
option description 'Network/Tun configuration'
option package 'coovachilli'
option unique true
@@ -191,7 +191,7 @@ config variable
config section
option name 'macauth'
- option title 'Section macauth'
+ option title 'MAC configuration'
option description 'Configure MAC authentication'
option package 'coovachilli'
option unique true