modules/admin-full: merge services/dnsmasq and network/dhcpleases into network/dhcp
authorJo-Philipp Wich <jow@openwrt.org>
Tue, 3 May 2011 22:06:29 +0000 (22:06 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Tue, 3 May 2011 22:06:29 +0000 (22:06 +0000)
modules/admin-full/luasrc/controller/admin/network.lua
modules/admin-full/luasrc/controller/admin/services.lua
modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua [new file with mode: 0644]
modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua [deleted file]
modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua [deleted file]

index bed96d8..76d4320 100644 (file)
@@ -106,9 +106,9 @@ function index()
        )
 
        if nixio.fs.access("/etc/config/dhcp") then
        )
 
        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)
                page.order  = 30
 
                page = entry({"admin", "network", "dhcplease_status"}, call("lease_status"), nil)
index 81c4426..14ced9f 100644 (file)
@@ -27,11 +27,4 @@ function index()
        page.title  = i18n("Services")
        page.order  = 40
        page.index  = true
        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
 end
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
new file mode 100644 (file)
index 0000000..27a4156
--- /dev/null
@@ -0,0 +1,245 @@
+--[[
+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"
+
+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> " ..
+               "firewalls"))
+
+s = m:section(TypedSection, "dnsmasq", translate("Settings"))
+s.anonymous = true
+s.addremove = false
+
+s:tab("general", translate("General Settings"))
+s:tab("files", translate("Resolv and Hosts Files"))
+s:tab("tftp", translate("TFTP Settings"))
+s:tab("advanced", translate("Advanced Settings"))
+
+s:taboption("general", Flag, "domainneeded",
+       translate("Domain required"),
+       translate("Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without " ..
+               "<abbr title=\"Domain Name System\">DNS</abbr>-Name"))
+
+s:taboption("general", Flag, "authoritative",
+       translate("Authoritative"),
+       translate("This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</" ..
+               "abbr> in the local network"))
+
+
+s:taboption("files", Flag, "readethers",
+       translate("Use <code>/etc/ethers</code>"),
+       translate("Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host " ..
+               "Configuration Protocol\">DHCP</abbr>-Server"))
+
+s:taboption("files", Value, "leasefile",
+       translate("Leasefile"),
+       translate("file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</" ..
+               "abbr>-leases will be stored"))
+
+s:taboption("files", Flag, "noresolv",
+       translate("Ignore resolve file")).optional = true
+
+rf = s:taboption("files", Value, "resolvfile",
+       translate("Resolve file"),
+       translate("local <abbr title=\"Domain Name System\">DNS</abbr> file"))
+
+rf:depends("noresolv", "")
+rf.optional = true
+
+
+s:taboption("files", Flag, "nohosts",
+       translate("Ignore Hosts files")).optional = true
+
+hf = s:taboption("files", DynamicList, "addnhosts",
+       translate("Additional Hosts files"))
+
+hf:depends("nohosts", "")
+hf.optional = true
+
+
+s:taboption("advanced", Flag, "boguspriv",
+       translate("Filter private"),
+       translate("Do not forward reverse lookups for local networks"))
+
+s:taboption("advanced", Flag, "filterwin2k",
+       translate("Filter useless"),
+       translate("Do not forward requests that cannot be answered by public name servers"))
+
+s:taboption("advanced", Flag, "localise_queries",
+       translate("Localise queries"),
+       translate("Localise hostname depending on the requesting subnet if multiple IPs are available"))
+
+s:taboption("general", Value, "local",
+       translate("Local server"),
+       translate("Local domain specification. Names matching this domain are never forwared and resolved from DHCP or hosts files only"))
+
+s:taboption("general", Value, "domain",
+       translate("Local domain"),
+       translate("Local domain suffix appended to DHCP names and hosts file entries"))
+
+s:taboption("advanced", Flag, "expandhosts",
+       translate("Expand hosts"),
+       translate("Add local domain suffix to names served from hosts files"))
+
+s:taboption("advanced", Flag, "nonegcache",
+       translate("No negative cache"),
+       translate("Do not cache negative replies, e.g. for not existing domains"))
+
+s:taboption("advanced", Flag, "strictorder",
+       translate("Strict order"),
+       translate("<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the " ..
+               "order of the resolvfile")).optional = true
+
+s:taboption("general", Flag, "logqueries",
+       translate("Log queries"),
+       translate("Write received DNS requests to syslog")).optional = true
+
+df = s:taboption("general", DynamicList, "server", translate("DNS forwardings"),
+       translate("List of <abbr title=\"Domain Name System\">DNS</abbr> " ..
+                       "servers to forward requests to"))
+
+df.optional = true
+df.placeholder = "/example.org/10.1.2.3"
+
+
+rp = s:taboption("general", Flag, "rebind_protection",
+       translate("Rebind protection"),
+       translate("Discard upstream RFC1918 responses"))
+
+rp.rmempty = false
+
+
+rl = s:taboption("general", Flag, "rebind_localhost",
+       translate("Allow localhost"),
+       translate("Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"))
+
+rl:depends("rebind_protection", "1")
+
+
+rd = s:taboption("general", DynamicList, "rebind_domain",
+       translate("Domain whitelist"),
+       translate("List of domains to allow RFC1918 responses for"))
+
+rd:depends("rebind_protection", "1")
+rd.datatype = "host"
+rd.placeholder = "ihost.netflix.com"
+
+
+pt = s:taboption("advanced", Value, "port",
+       translate("<abbr title=\"Domain Name System\">DNS</abbr> server port"),
+       translate("Listening port for inbound DNS queries"))
+
+pt.optional = true
+pt.datatype = "port"
+pt.placeholder = 53
+
+
+qp = s:taboption("advanced", Value, "queryport",
+       translate("<abbr title=\"Domain Name System\">DNS</abbr> query port"),
+       translate("Fixed source port for outbound DNS queries"))
+
+qp.optional = true
+qp.datatype = "port"
+qp.placeholder = translate("any")
+
+
+lm = s:taboption("advanced", Value, "dhcpleasemax",
+       translate("<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration " ..
+               "Protocol\">DHCP</abbr> leases"),
+       translate("Maximum allowed number of active DHCP leases"))
+
+lm.optional = true
+lm.datatype = "uinteger"
+lm.placeholder = translate("unlimited")
+
+
+em = s:taboption("advanced", Value, "ednspacket_max",
+       translate("<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for " ..
+               "Domain Name System\">EDNS0</abbr> paket size"),
+       translate("Maximum allowed size of EDNS.0 UDP packets"))
+
+em.optional = true
+em.datatype = "uinteger"
+em.placeholder = 1280
+
+
+cq = s:taboption("advanced", Value, "dnsforwardmax",
+       translate("<abbr title=\"maximal\">Max.</abbr> concurrent queries"),
+       translate("Maximum allowed number of concurrent DNS queries"))
+
+cq.optional = true
+cq.datatype = "uinteger"
+cq.placeholder = 150
+
+
+s:taboption("tftp", Flag, "enable_tftp",
+       translate("Enable TFTP server")).optional = true
+
+tr = s:taboption("tftp", Value, "tftp_root",
+       translate("TFTP server root"),
+       translate("Root directory for files served via TFTP"))
+
+tr.optional = true
+tr:depends("enable_tftp", "1")
+tr.placeholder = "/"
+
+
+db = s:taboption("tftp", Value, "dhcp_boot",
+       translate("Network boot image"),
+       translate("Filename of the boot image advertised to clients"))
+
+db.optional = true
+db:depends("enable_tftp", "1")
+db.placeholder = "pxelinux.0"
+
+
+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 (file)
index e0e65e5..0000000
+++ /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
diff --git a/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua b/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua
deleted file mode 100644 (file)
index b9c6f07..0000000
+++ /dev/null
@@ -1,207 +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$
-]]--
-m = Map("dhcp", "Dnsmasq",
-       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> " ..
-               "firewalls"))
-
-s = m:section(TypedSection, "dnsmasq", translate("Settings"))
-s.anonymous = true
-s.addremove = false
-
-s:tab("general", translate("General Settings"))
-s:tab("files", translate("Resolv and Hosts Files"))
-s:tab("tftp", translate("TFTP Settings"))
-s:tab("advanced", translate("Advanced Settings"))
-
-s:taboption("general", Flag, "domainneeded",
-       translate("Domain required"),
-       translate("Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without " ..
-               "<abbr title=\"Domain Name System\">DNS</abbr>-Name"))
-
-s:taboption("general", Flag, "authoritative",
-       translate("Authoritative"),
-       translate("This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</" ..
-               "abbr> in the local network"))
-
-
-s:taboption("files", Flag, "readethers",
-       translate("Use <code>/etc/ethers</code>"),
-       translate("Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host " ..
-               "Configuration Protocol\">DHCP</abbr>-Server"))
-
-s:taboption("files", Value, "leasefile",
-       translate("Leasefile"),
-       translate("file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</" ..
-               "abbr>-leases will be stored"))
-
-s:taboption("files", Flag, "noresolv",
-       translate("Ignore resolve file")).optional = true
-
-rf = s:taboption("files", Value, "resolvfile",
-       translate("Resolve file"),
-       translate("local <abbr title=\"Domain Name System\">DNS</abbr> file"))
-
-rf:depends("noresolv", "")
-rf.optional = true
-
-
-s:taboption("files", Flag, "nohosts",
-       translate("Ignore Hosts files")).optional = true
-
-hf = s:taboption("files", DynamicList, "addnhosts",
-       translate("Additional Hosts files"))
-
-hf:depends("nohosts", "")
-hf.optional = true
-
-
-s:taboption("advanced", Flag, "boguspriv",
-       translate("Filter private"),
-       translate("Do not forward reverse lookups for local networks"))
-
-s:taboption("advanced", Flag, "filterwin2k",
-       translate("Filter useless"),
-       translate("Do not forward requests that cannot be answered by public name servers"))
-
-s:taboption("advanced", Flag, "localise_queries",
-       translate("Localise queries"),
-       translate("Localise hostname depending on the requesting subnet if multiple IPs are available"))
-
-s:taboption("general", Value, "local",
-       translate("Local server"),
-       translate("Local domain specification. Names matching this domain are never forwared and resolved from DHCP or hosts files only"))
-
-s:taboption("general", Value, "domain",
-       translate("Local domain"),
-       translate("Local domain suffix appended to DHCP names and hosts file entries"))
-
-s:taboption("advanced", Flag, "expandhosts",
-       translate("Expand hosts"),
-       translate("Add local domain suffix to names served from hosts files"))
-
-s:taboption("advanced", Flag, "nonegcache",
-       translate("No negative cache"),
-       translate("Do not cache negative replies, e.g. for not existing domains"))
-
-s:taboption("advanced", Flag, "strictorder",
-       translate("Strict order"),
-       translate("<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the " ..
-               "order of the resolvfile")).optional = true
-
-s:taboption("general", Flag, "logqueries",
-       translate("Log queries"),
-       translate("Write received DNS requests to syslog")).optional = true
-
-df = s:taboption("general", DynamicList, "server", translate("DNS forwardings"),
-       translate("List of <abbr title=\"Domain Name System\">DNS</abbr> " ..
-                       "servers to forward requests to"))
-
-df.optional = true
-df.placeholder = "/example.org/10.1.2.3"
-
-
-rp = s:taboption("general", Flag, "rebind_protection",
-       translate("Rebind protection"),
-       translate("Discard upstream RFC1918 responses"))
-
-rp.rmempty = false
-
-
-rl = s:taboption("general", Flag, "rebind_localhost",
-       translate("Allow localhost"),
-       translate("Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"))
-
-rl:depends("rebind_protection", "1")
-
-
-rd = s:taboption("general", DynamicList, "rebind_domain",
-       translate("Domain whitelist"),
-       translate("List of domains to allow RFC1918 responses for"))
-
-rd:depends("rebind_protection", "1")
-rd.datatype = "host"
-rd.placeholder = "ihost.netflix.com"
-
-
-pt = s:taboption("advanced", Value, "port",
-       translate("<abbr title=\"Domain Name System\">DNS</abbr> server port"),
-       translate("Listening port for inbound DNS queries"))
-
-pt.optional = true
-pt.datatype = "port"
-pt.placeholder = 53
-
-
-qp = s:taboption("advanced", Value, "queryport",
-       translate("<abbr title=\"Domain Name System\">DNS</abbr> query port"),
-       translate("Fixed source port for outbound DNS queries"))
-
-qp.optional = true
-qp.datatype = "port"
-qp.placeholder = translate("any")
-
-
-lm = s:taboption("advanced", Value, "dhcpleasemax",
-       translate("<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration " ..
-               "Protocol\">DHCP</abbr> leases"),
-       translate("Maximum allowed number of active DHCP leases"))
-
-lm.optional = true
-lm.datatype = "uinteger"
-lm.placeholder = translate("unlimited")
-
-
-em = s:taboption("advanced", Value, "ednspacket_max",
-       translate("<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for " ..
-               "Domain Name System\">EDNS0</abbr> paket size"),
-       translate("Maximum allowed size of EDNS.0 UDP packets"))
-
-em.optional = true
-em.datatype = "uinteger"
-em.placeholder = 1280
-
-
-cq = s:taboption("advanced", Value, "dnsforwardmax",
-       translate("<abbr title=\"maximal\">Max.</abbr> concurrent queries"),
-       translate("Maximum allowed number of concurrent DNS queries"))
-
-cq.optional = true
-cq.datatype = "uinteger"
-cq.placeholder = 150
-
-
-s:taboption("tftp", Flag, "enable_tftp",
-       translate("Enable TFTP server")).optional = true
-
-tr = s:taboption("tftp", Value, "tftp_root",
-       translate("TFTP server root"),
-       translate("Root directory for files served via TFTP"))
-
-tr.optional = true
-tr:depends("enable_tftp", "1")
-tr.placeholder = "/"
-
-
-db = s:taboption("tftp", Value, "dhcp_boot",
-       translate("Network boot image"),
-       translate("Filename of the boot image advertised to clients"))
-
-db.optional = true
-db:depends("enable_tftp", "1")
-db.placeholder = "pxelinux.0"
-
-
-return m