From 7d628393a95bec519bfc3c5643fb7f00bac77e38 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 24 Sep 2008 23:01:06 +0000 Subject: * luci/app/chillispot: replace macauth with generalized auth cbi model --- .../luasrc/model/cbi/chillispot_auth.lua | 76 ++++++++++++++++++++++ .../luasrc/model/cbi/chillispot_macauth.lua | 76 ---------------------- 2 files changed, 76 insertions(+), 76 deletions(-) create mode 100644 applications/luci-chillispot/luasrc/model/cbi/chillispot_auth.lua delete mode 100644 applications/luci-chillispot/luasrc/model/cbi/chillispot_macauth.lua (limited to 'applications') diff --git a/applications/luci-chillispot/luasrc/model/cbi/chillispot_auth.lua b/applications/luci-chillispot/luasrc/model/cbi/chillispot_auth.lua new file mode 100644 index 000000000..8f033f070 --- /dev/null +++ b/applications/luci-chillispot/luasrc/model/cbi/chillispot_auth.lua @@ -0,0 +1,76 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth +Copyright 2008 Jo-Philipp Wich + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- + + +m = Map("chillispot") + +-- uam config +s1 = m:section(TypedSection, "uam") +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( Value, "uamhomepage" ).optional = true +s1:option( Value, "uamlisten" ).optional = true +s1:option( Value, "uamport" ).optional = true +s1:option( Value, "uamiport" ).optional = true +s1:option( Value, "uamdomain" ).optional = true +s1:option( Value, "uamlogoutip" ).optional = true +s1:option( DynamicList, "uamallowed" ).optional = true +s1:option( Value, "uamui" ).optional = true + +s1:option( Value, "wisprlogin" ).optional = true + +s1:option( Value, "defsessiontimeout" ).optional = true +s1:option( Value, "defidletimeout" ).optional = true +s1:option( Value, "definteriminterval" ).optional = true + +s1:option( Value, "ssid" ).optional = true +s1:option( Value, "vlan" ).optional = true +s1:option( Value, "nasip" ).optional = true +s1:option( Value, "nasmac" ).optional = true +s1:option( Value, "wwwdir" ).optional = true +s1:option( Value, "wwwbin" ).optional = true + +s1:option( Value, "localusers" ).optional = true +s1:option( Value, "postauthproxy" ).optional = true +s1:option( Value, "postauthproxyport" ).optional = true +s1:option( Value, "locationname" ).optional = true + + +-- mac authentication +s2 = m:section(TypedSection, "macauth") +s2.anonymous = true + +s2:option( Flag, "macauth" ) +s2:option( Flag, "macallowlocal" ) +s2:option( DynamicList, "macallowed" ) + +pw = s2:option( Value, "macpasswd" ) +pw.optional = true +pw.password = true + +s2:option( Value, "macsuffix" ).optional = true + +return m diff --git a/applications/luci-chillispot/luasrc/model/cbi/chillispot_macauth.lua b/applications/luci-chillispot/luasrc/model/cbi/chillispot_macauth.lua deleted file mode 100644 index b042911b6..000000000 --- a/applications/luci-chillispot/luasrc/model/cbi/chillispot_macauth.lua +++ /dev/null @@ -1,76 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface - -Copyright 2008 Steven Barth -Copyright 2008 Jo-Philipp Wich - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -$Id$ -]]-- - - -m = Map("chillispot") - --- uam config -s1 = m:section(TypedSection, "uam") -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( Value, "uamhomepage" ).optional = true -s1:option( Value, "uamlisten" ).optional = true -s1:option( Value, "uamport" ).optional = true -s1:option( Value, "uamiport" ).optional = true -s1:option( Value, "uamdomain" ).optional = true -s1:option( Value, "uamlogoutip" ).optional = true -s1:option( DynamicList, "uamallowed" ).optional = true -s1:option( Value, "uamui" ).optional = true - -s1:option( Value, "wisprlogin" ).optional = true - -s1:option( Value, "defsessiontimeout" ).optional = true -s1:option( Value, "defidletimeout" ).optional = true -s1:option( Value, "definteriminterval" ).optional = true - -s1:option( Value, "ssid" ).optional = true -s1:option( Value, "vlan" ).optional = true -s1:option( Value, "nasip" ).optional = true -s1:option( Value, "nasmac" ).optional = true -s1:option( Value, "wwwdir" ).optional = true -s1:option( Value, "wwwbin" ).optional = true - -s:option( Value, "localusers" ).optional = true -s:option( Value, "postauthproxy" ).optional = true -s:option( Value, "postauthproxyport" ).optional = true -s:option( Value, "locationname" ).optional = true - - --- mac authentication -s = m:section(TypedSection, "macauth") -s.anonymous = true - -s:option( Flag, "macauth" ) -s:option( Flag, "macallowlocal" ) -s:option( DynamicList, "macallowed" ) - -pw = s:option( Value, "macpasswd" ) -pw.optional = true -pw.password = true - -s:option( Value, "macsuffix" ).optional = true - -return m -- cgit v1.2.3