summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-firewall/luasrc/controller
diff options
context:
space:
mode:
Diffstat (limited to 'applications/luci-firewall/luasrc/controller')
-rw-r--r--applications/luci-firewall/luasrc/controller/firewall.lua23
-rw-r--r--applications/luci-firewall/luasrc/controller/luci_fw/luci_fw.lua10
2 files changed, 23 insertions, 10 deletions
diff --git a/applications/luci-firewall/luasrc/controller/firewall.lua b/applications/luci-firewall/luasrc/controller/firewall.lua
new file mode 100644
index 0000000000..c0149f8cff
--- /dev/null
+++ b/applications/luci-firewall/luasrc/controller/firewall.lua
@@ -0,0 +1,23 @@
+module("luci.controller.firewall", package.seeall)
+
+function index()
+ entry({"admin", "network", "firewall"},
+ alias("admin", "network", "firewall", "zones"),
+ _("Firewall"), 60).i18n = "firewall"
+
+ entry({"admin", "network", "firewall", "zones"},
+ arcombine(cbi("firewall/zones"), cbi("firewall/zone-details")),
+ _("General Settings"), 10).leaf = true
+
+ entry({"admin", "network", "firewall", "forwards"},
+ arcombine(cbi("firewall/forwards"), cbi("firewall/forward-details")),
+ _("Port Forwards"), 20).leaf = true
+
+ entry({"admin", "network", "firewall", "rules"},
+ arcombine(cbi("firewall/rules"), cbi("firewall/rule-details")),
+ _("Traffic Rules"), 30).leaf = true
+
+ entry({"admin", "network", "firewall", "custom"},
+ cbi("firewall/custom"),
+ _("Custom Rules"), 40).leaf = true
+end
diff --git a/applications/luci-firewall/luasrc/controller/luci_fw/luci_fw.lua b/applications/luci-firewall/luasrc/controller/luci_fw/luci_fw.lua
deleted file mode 100644
index b3d440d1c0..0000000000
--- a/applications/luci-firewall/luasrc/controller/luci_fw/luci_fw.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-module("luci.controller.luci_fw.luci_fw", package.seeall)
-
-function index()
- entry({"admin", "network", "firewall"}, alias("admin", "network", "firewall", "zones"), _("Firewall"), 60).i18n = "firewall"
- entry({"admin", "network", "firewall", "zones"}, arcombine(cbi("luci_fw/zones"), cbi("luci_fw/zone")), nil, 10).leaf = true
- entry({"admin", "network", "firewall", "rule"}, arcombine(cbi("luci_fw/zones"), cbi("luci_fw/trule")), nil, 20).leaf = true
- entry({"admin", "network", "firewall", "redirect"}, arcombine(cbi("luci_fw/zones"), cbi("luci_fw/rrule")), nil, 30).leaf = true
-
- entry({"mini", "network", "portfw"}, cbi("luci_fw/miniportfw", {autoapply=true}), _("Port forwarding"), 70).i18n = "firewall"
-end