Index: /luci/trunk/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua =================================================================== --- /luci/trunk/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua (revision 7017) +++ /luci/trunk/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua (revision 7017) @@ -0,0 +1,245 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +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 DHCP-Server and DNS-" .. + "Forwarder for NAT " .. + "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 DNS-Requests without " .. + "DNS-Name")) + +s:taboption("general", Flag, "authoritative", + translate("Authoritative"), + translate("This is the only DHCP in the local network")) + + +s:taboption("files", Flag, "readethers", + translate("Use /etc/ethers"), + translate("Read /etc/ethers to configure the DHCP-Server")) + +s:taboption("files", Value, "leasefile", + translate("Leasefile"), + translate("file where given DHCP-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 DNS 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("DNS 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 DNS " .. + "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("DNS 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("DNS 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("Max. DHCP 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("Max. EDNS0 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("Max. 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 Add Button to add a new lease entry. The MAC-Address " .. + "indentifies the host, the IPv4-Address specifies to the fixed address to " .. + "use and the Hostname 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("MAC-Address")) +mac.datatype = "macaddr" + +ip = s:option(Value, "ip", translate("IPv4-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 Index: /ci/trunk/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua =================================================================== --- /luci/trunk/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua (revision 6924) +++ (revision ) @@ -1,52 +1,0 @@ ---[[ -LuCI - Lua Configuration Interface - -Copyright 2008 Steven Barth - -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 Add Button to add a new lease entry. The MAC-Address " .. - "indentifies the host, the IPv4-Address specifies to the fixed address to " .. - "use and the Hostname 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("MAC-Address")) -mac.datatype = "macaddr" - -ip = s:option(Value, "ip", translate("IPv4-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 Index: /ci/trunk/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua =================================================================== --- /luci/trunk/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua (revision 6467) +++ (revision ) @@ -1,207 +1,0 @@ ---[[ -LuCI - Lua Configuration Interface - -Copyright 2008 Steven Barth - -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 DHCP-Server and DNS-" .. - "Forwarder for NAT " .. - "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 DNS-Requests without " .. - "DNS-Name")) - -s:taboption("general", Flag, "authoritative", - translate("Authoritative"), - translate("This is the only DHCP in the local network")) - - -s:taboption("files", Flag, "readethers", - translate("Use /etc/ethers"), - translate("Read /etc/ethers to configure the DHCP-Server")) - -s:taboption("files", Value, "leasefile", - translate("Leasefile"), - translate("file where given DHCP-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 DNS 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("DNS 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 DNS " .. - "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("DNS 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("DNS 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("Max. DHCP 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("Max. EDNS0 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("Max. 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 Index: /luci/trunk/modules/admin-full/luasrc/controller/admin/services.lua =================================================================== --- /luci/trunk/modules/admin-full/luasrc/controller/admin/services.lua (revision 7015) +++ /luci/trunk/modules/admin-full/luasrc/controller/admin/services.lua (revision 7017) @@ -28,10 +28,3 @@ 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 Index: /luci/trunk/modules/admin-full/luasrc/controller/admin/network.lua =================================================================== --- /luci/trunk/modules/admin-full/luasrc/controller/admin/network.lua (revision 6975) +++ /luci/trunk/modules/admin-full/luasrc/controller/admin/network.lua (revision 7017) @@ -107,7 +107,7 @@ 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