From 1bb4822dca6113f73e3bc89e2acf15935e6f8e92 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 3 Dec 2014 15:17:05 +0100 Subject: Rework LuCI build system * Rename subdirectories to their repective OpenWrt package names * Make each LuCI module its own standalone package * Deploy a shared luci.mk which is used by each module Makefile Signed-off-by: Jo-Philipp Wich --- .../luasrc/model/cbi/coovachilli.lua | 31 --------- .../luasrc/model/cbi/coovachilli_auth.lua | 76 ---------------------- .../luasrc/model/cbi/coovachilli_network.lua | 67 ------------------- .../luasrc/model/cbi/coovachilli_radius.lua | 67 ------------------- 4 files changed, 241 deletions(-) delete mode 100644 applications/luci-coovachilli/luasrc/model/cbi/coovachilli.lua delete mode 100644 applications/luci-coovachilli/luasrc/model/cbi/coovachilli_auth.lua delete mode 100644 applications/luci-coovachilli/luasrc/model/cbi/coovachilli_network.lua delete mode 100644 applications/luci-coovachilli/luasrc/model/cbi/coovachilli_radius.lua (limited to 'applications/luci-coovachilli/luasrc/model') diff --git a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli.lua b/applications/luci-coovachilli/luasrc/model/cbi/coovachilli.lua deleted file mode 100644 index e97987dd7e..0000000000 --- a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli.lua +++ /dev/null @@ -1,31 +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("coovachilli") - --- general -s = m:section(TypedSection, "general") -s.anonymous = true - -s:option( Flag, "debug" ) -s:option( Value, "interval" ) -s:option( Value, "pidfile" ).optional = true -s:option( Value, "statedir" ).optional = true -s:option( Value, "cmdsock" ).optional = true -s:option( Value, "logfacility" ).optional = true - - -return m diff --git a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_auth.lua b/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_auth.lua deleted file mode 100644 index 064df2b4fa..0000000000 --- a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_auth.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("coovachilli") - --- uam config -s1 = m:section(TypedSection, "uam") -s1.anonymous = true - -s1:option( Value, "uamserver" ) -s1:option( Value, "uamsecret" ).password = true - -s1:option( Flag, "uamanydns" ) -s1:option( Flag, "nouamsuccess" ) -s1:option( Flag, "nouamwispr" ) -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 -s1:option( Value, "uamport" ).optional = true -s1:option( Value, "uamiport" ).optional = true -s1:option( DynamicList, "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-coovachilli/luasrc/model/cbi/coovachilli_network.lua b/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_network.lua deleted file mode 100644 index 2e9768ff3d..0000000000 --- a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_network.lua +++ /dev/null @@ -1,67 +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$ -]]-- - -require("luci.sys") -require("luci.ip") - -m = Map("coovachilli") - --- tun -s1 = m:section(TypedSection, "tun") -s1.anonymous = true - -s1:option( Flag, "usetap" ) -s1:option( Value, "tundev" ).optional = true -s1:option( Value, "txqlen" ).optional = true - -net = s1:option( Value, "net" ) -for _, route in ipairs(luci.sys.net.routes()) do - if route.device ~= "lo" and route.dest:prefix() < 32 then - net:value( route.dest:string() ) - end -end - -s1:option( Value, "dynip" ).optional = true -s1:option( Value, "statip" ).optional = true - -s1:option( Value, "dns1" ).optional = true -s1:option( Value, "dns2" ).optional = true -s1:option( Value, "domain" ).optional = true - -s1:option( Value, "ipup" ).optional = true -s1:option( Value, "ipdown" ).optional = true - -s1:option( Value, "conup" ).optional = true -s1:option( Value, "condown" ).optional = true - - --- dhcp config -s2 = m:section(TypedSection, "dhcp") -s2.anonymous = true - -dif = s2:option( Value, "dhcpif" ) -for _, nif in ipairs(luci.sys.net.devices()) do - if nif ~= "lo" then dif:value(nif) end -end - -s2:option( Value, "dhcpmac" ).optional = true -s2:option( Value, "lease" ).optional = true -s2:option( Value, "dhcpstart" ).optional = true -s2:option( Value, "dhcpend" ).optional = true - -s2:option( Flag, "eapolenable" ) - - -return m diff --git a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_radius.lua b/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_radius.lua deleted file mode 100644 index ee838b0864..0000000000 --- a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_radius.lua +++ /dev/null @@ -1,67 +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("coovachilli") - --- radius server -s1 = m:section(TypedSection, "radius") -s1.anonymous = true - -s1:option( Value, "radiusserver1" ) -s1:option( Value, "radiusserver2" ) -s1:option( Value, "radiussecret" ).password = true - -s1:option( Value, "radiuslisten" ).optional = true -s1:option( Value, "radiusauthport" ).optional = true -s1:option( Value, "radiusacctport" ).optional = true - -s1:option( Value, "radiusnasid" ).optional = true -s1:option( Value, "radiusnasip" ).optional = true - -s1:option( Value, "radiuscalled" ).optional = true -s1:option( Value, "radiuslocationid" ).optional = true -s1:option( Value, "radiuslocationname" ).optional = true - -s1:option( Value, "radiusnasporttype" ).optional = true - -s1:option( Flag, "radiusoriginalurl" ) - -s1:option( Value, "adminuser" ).optional = true -rs = s1:option( Value, "adminpassword" ) -rs.optional = true -rs.password = true - -s1:option( Flag, "swapoctets" ) -s1:option( Flag, "openidauth" ) -s1:option( Flag, "wpaguests" ) -s1:option( Flag, "acctupdate" ) - -s1:option( Value, "coaport" ).optional = true -s1:option( Flag, "coanoipcheck" ) - - --- radius proxy -s2 = m:section(TypedSection, "proxy") -s2.anonymous = true - -s2:option( Value, "proxylisten" ).optional = true -s2:option( Value, "proxyport" ).optional = true -s2:option( Value, "proxyclient" ).optional = true -ps = s2:option( Value, "proxysecret" ) -ps.optional = true -ps.password = true - -return m -- cgit v1.2.3