diff options
| -rw-r--r-- | modules/admin-full/luasrc/controller/admin/network.lua | 6 | ||||
| -rw-r--r-- | modules/admin-full/luasrc/controller/admin/services.lua | 7 | ||||
| -rw-r--r-- | modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua (renamed from modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua) | 42 | ||||
| -rw-r--r-- | modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua | 52 |
4 files changed, 43 insertions, 64 deletions
diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua index bed96d89f..76d432094 100644 --- a/modules/admin-full/luasrc/controller/admin/network.lua +++ b/modules/admin-full/luasrc/controller/admin/network.lua @@ -106,9 +106,9 @@ function index() ) if nixio.fs.access("/etc/config/dhcp") then - page = node("admin", "network", "dhcpleases") - page.target = cbi("admin_network/dhcpleases") - page.title = i18n("DHCP Leases") + page = node("admin", "network", "dhcp") + page.target = cbi("admin_network/dhcp") + page.title = i18n("DHCP and DNS") page.order = 30 page = entry({"admin", "network", "dhcplease_status"}, call("lease_status"), nil) diff --git a/modules/admin-full/luasrc/controller/admin/services.lua b/modules/admin-full/luasrc/controller/admin/services.lua index 81c4426ba..14ced9f69 100644 --- a/modules/admin-full/luasrc/controller/admin/services.lua +++ b/modules/admin-full/luasrc/controller/admin/services.lua @@ -27,11 +27,4 @@ function index() page.title = i18n("Services") page.order = 40 page.index = true - - if nixio.fs.access("/etc/config/dhcp") then - local page = node("admin", "services", "dnsmasq") - page.target = cbi("admin_services/dnsmasq") - page.title = "Dnsmasq" - page.order = 30 - end end diff --git a/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua index b9c6f07b3..27a4156ee 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua @@ -11,7 +11,10 @@ You may obtain a copy of the License at $Id$ ]]-- -m = Map("dhcp", "Dnsmasq", + +local sys = require "luci.sys" + +m = Map("dhcp", translate("DHCP Server"), translate("Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol" .. "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-" .. "Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> " .. @@ -204,4 +207,39 @@ db:depends("enable_tftp", "1") db.placeholder = "pxelinux.0" -return m +m2 = Map("dhcp", translate("DHCP Leases"), + translate("Static leases are used to assign fixed IP addresses and symbolic hostnames to " .. + "DHCP clients. They are also required for non-dynamic interface configurations where " .. + "only hosts with a corresponding lease are served.")) + +m2:section(SimpleSection).template = "admin_network/lease_status" + +s = m2:section(TypedSection, "host", translate("Static Leases"), + translate("Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</em> " .. + "indentifies the host, the <em>IPv4-Address</em> specifies to the fixed address to " .. + "use and the <em>Hostname</em> is assigned as symbolic name to the requesting host.")) + +s.addremove = true +s.anonymous = true +s.template = "cbi/tblsection" + +name = s:option(Value, "name", translate("Hostname")) +name.datatype = "hostname" +name.rmempty = true + +mac = s:option(Value, "mac", translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address")) +mac.datatype = "macaddr" + +ip = s:option(Value, "ip", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address")) +ip.datatype = "ip4addr" + +sys.net.arptable(function(entry) + ip:value(entry["IP address"]) + mac:value( + entry["HW address"], + entry["HW address"] .. " (" .. entry["IP address"] .. ")" + ) +end) + + +return m, m2 diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua b/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua deleted file mode 100644 index e0e65e5e4..000000000 --- a/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua +++ /dev/null @@ -1,52 +0,0 @@ ---[[ -LuCI - Lua Configuration Interface - -Copyright 2008 Steven Barth <steven@midlink.org> - -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$ -]]-- - -local sys = require "luci.sys" - -m2 = Map("dhcp", translate("DHCP Leases"), - translate("Static leases are used to assign fixed IP addresses and symbolic hostnames to " .. - "DHCP clients. They are also required for non-dynamic interface configurations where " .. - "only hosts with a corresponding lease are served.")) - -m2:section(SimpleSection).template = "admin_network/lease_status" - -s = m2:section(TypedSection, "host", translate("Static Leases"), - translate("Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</em> " .. - "indentifies the host, the <em>IPv4-Address</em> specifies to the fixed address to " .. - "use and the <em>Hostname</em> is assigned as symbolic name to the requesting host.")) - -s.addremove = true -s.anonymous = true -s.template = "cbi/tblsection" - -name = s:option(Value, "name", translate("Hostname")) -name.datatype = "hostname" -name.rmempty = true - -mac = s:option(Value, "mac", translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address")) -mac.datatype = "macaddr" - -ip = s:option(Value, "ip", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address")) -ip.datatype = "ip4addr" - -sys.net.arptable(function(entry) - ip:value(entry["IP address"]) - mac:value( - entry["HW address"], - entry["HW address"] .. " (" .. entry["IP address"] .. ")" - ) -end) - - -return m2 |