modules: Split luci-mod-full
authorDaniel F. Dickinson <redacted>
Fri, 3 Aug 2018 16:36:51 +0000 (12:36 -0400)
committerJo-Philipp Wich <redacted>
Wed, 19 Sep 2018 18:08:19 +0000 (20:08 +0200)
Move some common elements to luci-base, and otherwise make three
packages out of status, system, and network.  They were mostly
separated already, but there were some shared elements between
status and network that are now in luci-base.

Signed-off-by: Daniel F. Dickinson <redacted>
65 files changed:
modules/luci-base/luasrc/controller/admin/index.lua
modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm [moved from modules/luci-mod-admin-full/luasrc/view/cbi/wireless_modefreq.htm with 100% similarity]
modules/luci-base/luasrc/view/lease_status.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm with 97% similarity]
modules/luci-base/luasrc/view/wifi_assoclist.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_assoclist.htm with 97% similarity]
modules/luci-mod-admin-full/Makefile
modules/luci-mod-network/Makefile [new file with mode: 0644]
modules/luci-mod-network/luasrc/controller/admin/network.lua [moved from modules/luci-mod-admin-full/luasrc/controller/admin/network.lua with 94% similarity]
modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua [moved from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua with 99% similarity]
modules/luci-mod-network/luasrc/model/cbi/admin_network/hosts.lua [moved from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/hosts.lua with 100% similarity]
modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua [moved from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/iface_add.lua with 100% similarity]
modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua [moved from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua with 100% similarity]
modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua [moved from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua with 100% similarity]
modules/luci-mod-network/luasrc/model/cbi/admin_network/proto_ahcp.lua [moved from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/proto_ahcp.lua with 100% similarity]
modules/luci-mod-network/luasrc/model/cbi/admin_network/routes.lua [moved from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/routes.lua with 100% similarity]
modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua [moved from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua with 100% similarity]
modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua [moved from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua with 100% similarity]
modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua [moved from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua with 100% similarity]
modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua [moved from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua with 99% similarity]
modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm with 100% similarity]
modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview_status.htm with 100% similarity]
modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_network/iface_status.htm with 100% similarity]
modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_network/switch_status.htm with 100% similarity]
modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm with 100% similarity]
modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm with 100% similarity]
modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm with 100% similarity]
modules/luci-mod-network/root/etc/uci-defaults/50_luci-mod-admin-full [moved from modules/luci-mod-admin-full/root/etc/uci-defaults/50_luci-mod-admin-full with 100% similarity]
modules/luci-mod-status/Makefile [new file with mode: 0644]
modules/luci-mod-status/htdocs/luci-static/resources/bandwidth.svg [moved from modules/luci-mod-admin-full/htdocs/luci-static/resources/bandwidth.svg with 100% similarity]
modules/luci-mod-status/htdocs/luci-static/resources/connections.svg [moved from modules/luci-mod-admin-full/htdocs/luci-static/resources/connections.svg with 100% similarity]
modules/luci-mod-status/htdocs/luci-static/resources/load.svg [moved from modules/luci-mod-admin-full/htdocs/luci-static/resources/load.svg with 100% similarity]
modules/luci-mod-status/htdocs/luci-static/resources/wifirate.svg [moved from modules/luci-mod-admin-full/htdocs/luci-static/resources/wifirate.svg with 100% similarity]
modules/luci-mod-status/htdocs/luci-static/resources/wireless.svg [moved from modules/luci-mod-admin-full/htdocs/luci-static/resources/wireless.svg with 100% similarity]
modules/luci-mod-status/luasrc/controller/admin/status.lua [moved from modules/luci-mod-admin-full/luasrc/controller/admin/status.lua with 100% similarity]
modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua [moved from modules/luci-mod-admin-full/luasrc/model/cbi/admin_status/processes.lua with 100% similarity]
modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm with 100% similarity]
modules/luci-mod-status/luasrc/view/admin_status/connections.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm with 100% similarity]
modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm with 100% similarity]
modules/luci-mod-status/luasrc/view/admin_status/index.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm with 99% similarity]
modules/luci-mod-status/luasrc/view/admin_status/iptables.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm with 100% similarity]
modules/luci-mod-status/luasrc/view/admin_status/load.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm with 100% similarity]
modules/luci-mod-status/luasrc/view/admin_status/routes.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm with 100% similarity]
modules/luci-mod-status/luasrc/view/admin_status/syslog.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm with 100% similarity]
modules/luci-mod-status/luasrc/view/admin_status/wireless.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm with 100% similarity]
modules/luci-mod-status/src/Makefile [moved from modules/luci-mod-admin-full/src/Makefile with 100% similarity]
modules/luci-mod-status/src/luci-bwc.c [moved from modules/luci-mod-admin-full/src/luci-bwc.c with 100% similarity]
modules/luci-mod-system/Makefile [new file with mode: 0644]
modules/luci-mod-system/luasrc/controller/admin/system.lua [moved from modules/luci-mod-admin-full/luasrc/controller/admin/system.lua with 100% similarity]
modules/luci-mod-system/luasrc/model/cbi/admin_system/admin.lua [moved from modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/admin.lua with 100% similarity]
modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua [moved from modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/backupfiles.lua with 100% similarity]
modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua [moved from modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/crontab.lua with 100% similarity]
modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua [moved from modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab.lua with 100% similarity]
modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua [moved from modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua with 100% similarity]
modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua [moved from modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/swap.lua with 100% similarity]
modules/luci-mod-system/luasrc/model/cbi/admin_system/ipkg.lua [moved from modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/ipkg.lua with 100% similarity]
modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua [moved from modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/leds.lua with 100% similarity]
modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua [moved from modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/startup.lua with 100% similarity]
modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua [moved from modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/system.lua with 100% similarity]
modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm with 100% similarity]
modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_system/backupfiles.htm with 100% similarity]
modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_system/clock_status.htm with 100% similarity]
modules/luci-mod-system/luasrc/view/admin_system/flashops.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm with 100% similarity]
modules/luci-mod-system/luasrc/view/admin_system/ipkg.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_system/ipkg.htm with 100% similarity]
modules/luci-mod-system/luasrc/view/admin_system/packages.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm with 100% similarity]
modules/luci-mod-system/luasrc/view/admin_system/reboot.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm with 100% similarity]
modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm [moved from modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm with 100% similarity]

index 39e6e573b15d03947e9f44a1c81fa4ee48ad323b..360298b1cd26d8093337bd24233b53c4f2b7e7a2 100644 (file)
@@ -16,6 +16,8 @@ function index()
                end
        end
 
+       local uci = require("luci.model.uci").cursor()
+
        local root = node()
        if not root.target then
                root.target = alias("admin")
@@ -23,6 +25,7 @@ function index()
        end
 
        local page   = node("admin")
+       
        page.title   = _("Administration")
        page.order   = 10
        page.sysauth = "root"
@@ -61,6 +64,24 @@ function index()
        page.index = true
        toplevel_page(page, false, false)
 
+       if nixio.fs.access("/etc/config/dhcp") then
+               page = entry({"admin", "dhcplease_status"}, call("lease_status"), nil)
+               page.leaf = true
+       end
+
+       local has_wifi = false
+
+       uci:foreach("wireless", "wifi-device",
+               function(s)
+                       has_wifi = true
+                       return false
+               end)
+
+       if has_wifi then
+               page = entry({"admin", "wireless_assoclist"}, call("wifi_assoclist"), nil)
+               page.leaf = true
+       end
+
        -- Logout is last
        entry({"admin", "logout"}, call("action_logout"), _("Logout"), 999)
 end
@@ -80,3 +101,22 @@ function action_logout()
 
        luci.http.redirect(dsp.build_url())
 end
+
+
+function lease_status()
+       local s = require "luci.tools.status"
+
+       luci.http.prepare_content("application/json")
+       luci.http.write('[')
+       luci.http.write_json(s.dhcp_leases())
+       luci.http.write(',')
+       luci.http.write_json(s.dhcp6_leases())
+       luci.http.write(']')
+end
+
+function wifi_assoclist()
+       local s = require "luci.tools.status"
+
+       luci.http.prepare_content("application/json")
+       luci.http.write_json(s.wifi_assoclist())
+end
similarity index 97%
rename from modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm
rename to modules/luci-base/luasrc/view/lease_status.htm
index 8fbbdc94777cac6b4006534fea1c00938278339a..15b6b6908e497c6a35eb81ab48b27c9c629fd547 100644 (file)
@@ -1,5 +1,5 @@
 <script type="text/javascript">//<![CDATA[
-       XHR.poll(5, '<%=url('admin/network/dhcplease_status')%>', null,
+       XHR.poll(5, '<%=url('admin/dhcplease_status')%>', null,
                function(x, st)
                {
                        var tb = document.getElementById('lease_status_table');
similarity index 97%
rename from modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_assoclist.htm
rename to modules/luci-base/luasrc/view/wifi_assoclist.htm
index b6f84c0607f3ec61859732cd22027b62f019db5a..700d998ad8fb309b19071876c6ef6227248d0879 100644 (file)
@@ -17,7 +17,7 @@
                return s;
        }
 
-       XHR.poll(5, '<%=url('admin/network/wireless_assoclist')%>', null,
+       XHR.poll(5, '<%=url('admin/wireless_assoclist')%>', null,
                function(x, st)
                {
                        var tb = document.getElementById('wifi_assoclist_table');
index 36ddf13f16825f06b311fc36cf732b2addce80c7..b376b35e55622803f2088a7491c3e1679578c4e5 100644 (file)
@@ -7,9 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Administration - full-featured for full control
-LUCI_DEPENDS:=+luci-base
+LUCI_DEPENDS:=+luci-base +luci-mod-status +luci-mod-system +luci-mod-network
 
-PKG_BUILD_DEPENDS:=iwinfo
 PKG_LICENSE:=Apache-2.0
 
 include ../../luci.mk
diff --git a/modules/luci-mod-network/Makefile b/modules/luci-mod-network/Makefile
new file mode 100644 (file)
index 0000000..5958765
--- /dev/null
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Network Administration
+LUCI_DEPENDS:=+luci-base +libiwinfo-lua
+
+PKG_LICENSE:=Apache-2.0
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
+
similarity index 94%
rename from modules/luci-mod-admin-full/luasrc/controller/admin/network.lua
rename to modules/luci-mod-network/luasrc/controller/admin/network.lua
index c4e1c3aa1655850516b847e3224d6b53696f6030..a587b7e513ab98720bbcc1125a095b058fabd27f 100644 (file)
@@ -37,9 +37,6 @@ function index()
                        end)
 
                if has_wifi then
-                       page = entry({"admin", "network", "wireless_assoclist"}, call("wifi_assoclist"), nil)
-                       page.leaf = true
-
                        page = entry({"admin", "network", "wireless_join"}, post("wifi_join"), nil)
                        page.leaf = true
 
@@ -110,9 +107,6 @@ function index()
                        page.title  = _("DHCP and DNS")
                        page.order  = 30
 
-                       page = entry({"admin", "network", "dhcplease_status"}, call("lease_status"), nil)
-                       page.leaf = true
-
                        page = node("admin", "network", "hosts")
                        page.target = cbi("admin_network/hosts")
                        page.title  = _("Hostnames")
@@ -302,14 +296,6 @@ function wifi_reconnect(radio)
        end
 end
 
-function wifi_assoclist()
-       local s = require "luci.tools.status"
-
-       luci.http.prepare_content("application/json")
-       luci.http.write_json(s.wifi_assoclist())
-end
-
-
 local function _wifi_get_scan_results(cache_key)
        local results = luci.util.ubus("session", "get", {
                ubus_rpc_session = luci.model.uci:get_session_id(),
@@ -381,17 +367,6 @@ function wifi_scan_results(radio)
        end
 end
 
-function lease_status()
-       local s = require "luci.tools.status"
-
-       luci.http.prepare_content("application/json")
-       luci.http.write('[')
-       luci.http.write_json(s.dhcp_leases())
-       luci.http.write(',')
-       luci.http.write_json(s.dhcp6_leases())
-       luci.http.write(']')
-end
-
 function switch_status(switches)
        local s = require "luci.tools.status"
 
similarity index 99%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
rename to modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua
index ae8a95f9ce05f12583bb3dab0b84ca9e4f4cce76..3ac49d635d1b1a0c8050d2634a9afb8eea2c0e39 100644 (file)
@@ -266,7 +266,7 @@ o = s:taboption("general", DynamicList, "notinterface",
 o.optional = true
 o:depends("nonwildcard", true)
 
-m:section(SimpleSection).template = "admin_network/lease_status"
+m:section(SimpleSection).template = "lease_status"
 
 s = m:section(TypedSection, "host", translate("Static Leases"),
        translate("Static leases are used to assign fixed IP addresses and symbolic hostnames to " ..
similarity index 99%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua
rename to modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua
index ad20f09187c4bb480038c3248e48144346aa9c92..3bffb3502c392cdccfd2efb2144deb9e19fd78be 100644 (file)
@@ -216,7 +216,7 @@ s = m:section(NamedSection, "__assoclist__")
 function s.render(self, sid)
        tpl.render_string([[
                <h2><%:Associated Stations%></h2>
-               <%+admin_network/wifi_assoclist%>
+               <%+wifi_assoclist%>
        ]])
 end
 
diff --git a/modules/luci-mod-status/Makefile b/modules/luci-mod-status/Makefile
new file mode 100644 (file)
index 0000000..cf8c8dd
--- /dev/null
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Status Pages
+LUCI_DEPENDS:=+luci-base +libiwinfo +libiwinfo-lua
+
+PKG_BUILD_DEPENDS:=iwinfo
+PKG_LICENSE:=Apache-2.0
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
+
similarity index 99%
rename from modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
rename to modules/luci-mod-status/luasrc/view/admin_status/index.htm
index 8820ae1cf350b8db0798f3caf09914915b612d4e..3edfd920475971543c35b4f33b4fc557295199fe 100644 (file)
 
 <%
        if has_dhcp then
-               include("admin_network/lease_status")
+               include("lease_status")
        end
 %>
 
 <div class="cbi-section">
        <h3><%:Associated Stations%></h3>
 
-       <%+admin_network/wifi_assoclist%>
+       <%+wifi_assoclist%>
 </div>
 <% end %>
 
diff --git a/modules/luci-mod-system/Makefile b/modules/luci-mod-system/Makefile
new file mode 100644 (file)
index 0000000..a6d5a7a
--- /dev/null
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Administration - Global System Settings
+LUCI_DEPENDS:=+luci-base
+
+PKG_LICENSE:=Apache-2.0
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
+
git clone https://git.99rst.org/PROJECT