diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2014-12-03 15:17:05 +0100 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-08 16:26:20 +0100 |
commit | 1bb4822dca6113f73e3bc89e2acf15935e6f8e92 (patch) | |
tree | 35e16f100466e4e00657199b38bb3d87d52bf73f /applications/luci-wshaper | |
parent | 9edd0e46c3f880727738ce8ca6ff1c8b85f99ef4 (diff) |
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 <jow@openwrt.org>
Diffstat (limited to 'applications/luci-wshaper')
-rw-r--r-- | applications/luci-wshaper/Makefile | 4 | ||||
-rw-r--r-- | applications/luci-wshaper/ipkg/postinst | 6 | ||||
-rw-r--r-- | applications/luci-wshaper/luasrc/controller/wshaper.lua | 19 | ||||
-rw-r--r-- | applications/luci-wshaper/luasrc/model/cbi/wshaper.lua | 55 | ||||
-rw-r--r-- | applications/luci-wshaper/root/etc/uci-defaults/wshaper | 11 |
5 files changed, 0 insertions, 95 deletions
diff --git a/applications/luci-wshaper/Makefile b/applications/luci-wshaper/Makefile deleted file mode 100644 index fcdd099fa..000000000 --- a/applications/luci-wshaper/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -PO = wshaper - -include ../../build/config.mk -include ../../build/module.mk diff --git a/applications/luci-wshaper/ipkg/postinst b/applications/luci-wshaper/ipkg/postinst deleted file mode 100644 index dad884259..000000000 --- a/applications/luci-wshaper/ipkg/postinst +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -[ -n "${IPKG_INSTROOT}" ] || { - ( . /etc/uci-defaults/wshaper ) && rm -f /etc/uci-defaults/wshaper - exit 0 -} - diff --git a/applications/luci-wshaper/luasrc/controller/wshaper.lua b/applications/luci-wshaper/luasrc/controller/wshaper.lua deleted file mode 100644 index 9d7f01e9d..000000000 --- a/applications/luci-wshaper/luasrc/controller/wshaper.lua +++ /dev/null @@ -1,19 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface - -Copyright 2011 Manuel Munz <freifunk somakoma de> - -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 - -]]-- - -module "luci.controller.wshaper" - -function index() - entry({"admin", "network", "wshaper"}, cbi("wshaper"), _("Wondershaper"), 80) -end - diff --git a/applications/luci-wshaper/luasrc/model/cbi/wshaper.lua b/applications/luci-wshaper/luasrc/model/cbi/wshaper.lua deleted file mode 100644 index faa64f66d..000000000 --- a/applications/luci-wshaper/luasrc/model/cbi/wshaper.lua +++ /dev/null @@ -1,55 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface - -Copyright 2011 Manuel Munz <freifunk at somakoma dot de> - -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 -]]-- - -require("luci.tools.webadmin") - -m = Map("wshaper", translate("Wondershaper"), - translate("Wondershaper shapes traffic to ensure low latencies for interactive traffic even when your " .. - "internet connection is highly saturated.")) - -s = m:section(NamedSection, "settings", "wshaper", translate("Wondershaper settings")) -s.anonymous = true - -network = s:option(ListValue, "network", translate("Interface")) -luci.tools.webadmin.cbi_add_networks(network) - -uplink = s:option(Value, "uplink", translate("Uplink"), translate("Upstream bandwidth in kbit/s")) -uplink.optional = false -uplink.datatype = "uinteger" -uplink.default = "240" - -uplink = s:option(Value, "downlink", translate("Downlink"), translate("Downstream bandwidth in kbit/s")) -uplink.optional = false -uplink.datatype = "uinteger" -uplink.default = "200" - -nopriohostsrc = s:option(DynamicList, "nopriohostsrc", translate("Low priority hosts (Source)"), translate("Host or Network in CIDR notation.")) -nopriohostsrc.optional = true -nopriohostsrc.datatype = ipaddr -nopriohostsrc.placeholder = "10.0.0.1/32" - -nopriohostdst = s:option(DynamicList, "nopriohostdst", translate("Low priority hosts (Destination)"), translate("Host or Network in CIDR notation.")) -nopriohostdst.optional = true -nopriohostdst.datatype = ipaddr -nopriohostdst.placeholder = "10.0.0.1/32" - -noprioportsrc = s:option(DynamicList, "noprioportsrc", translate("Low priority source ports")) -noprioportsrc.optional = true -noprioportsrc.datatype = "range(0,65535)" -noprioportsrc.placeholder = "21" - -noprioportdst = s:option(DynamicList, "noprioportdst", translate("Low priority destination ports")) -noprioportdst.optional = true -noprioportdst.datatype = "range(0,65535)" -noprioportdst.placeholder = "21" - -return m diff --git a/applications/luci-wshaper/root/etc/uci-defaults/wshaper b/applications/luci-wshaper/root/etc/uci-defaults/wshaper deleted file mode 100644 index 918dff280..000000000 --- a/applications/luci-wshaper/root/etc/uci-defaults/wshaper +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -uci -q batch <<-EOF >/dev/null - delete ucitrack.@wshaper[-1] - set ucitrack.wshaper="wshaper" - set ucitrack.wshaper.exec='/etc/init.d/wshaper start' - commit ucitrack -EOF - -rm -f /tmp/luci-indexcache -exit 0 |