diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2016-06-12 21:14:54 +0300 |
|---|---|---|
| committer | Hannu Nyman <hannu.nyman@iki.fi> | 2016-06-12 21:14:54 +0300 |
| commit | cd50f27956f5c30c13b52e8a70178ce07972d552 (patch) | |
| tree | 5352046d442bfffc829330d3c969a6fd7d5cde45 /applications | |
| parent | e52406936efca8e53d50336ace0c7567079c4c8b (diff) | |
luci-app-adblock: adjust to adblock 1.2.0
* more status info
* change in default nullipv addresses
* two uhttpd instances (for ports 80/443)
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'applications')
| -rw-r--r-- | applications/luci-app-adblock/luasrc/model/cbi/adblock.lua | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua index 19328376c8..2cee302086 100644 --- a/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua +++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua @@ -23,7 +23,13 @@ fdns = s:option(Flag, "adb_forcedns", translate("Redirect all DNS queries to the fdns.rmempty = false fdns.default = fdns.enabled -tot = s:option(DummyValue, "adb_overall_count", translate("Total count of blocked domains")) +-- Statistics + +t = m:section(NamedSection, "global", "adblock", translate("Statistics")) + +dat = t:option(DummyValue, "adb_lastrun", translate("Last update of the blocklists")) +tot = t:option(DummyValue, "adb_overall_count", translate("Total count of blocked domains")) +prc = t:option(DummyValue, "adb_percentage", translate("Percentage of blocked packets (before last update, IPv4/IPv6)")) -- Blocklist options @@ -65,17 +71,22 @@ a0.default = 0 a1 = e:option(Value, "adb_nullport", translate("Port of the adblock uhttpd instance")) a1.optional = true -a1.default = 65535 +a1.default = 65534 a1.datatype = "port" +a5 = e:option(Value, "adb_nullportssl", translate("Port of the adblock uhttpd instance for https links")) +a5.optional = true +a5.default = 65535 +a5.datatype = "port" + a2 = e:option(Value, "adb_nullipv4", translate("IPv4 blackhole ip address")) a2.optional = true -a2.default = "192.0.2.1" +a2.default = "198.18.0.1" a2.datatype = "ip4addr" a3 = e:option(Value, "adb_nullipv6", translate("IPv6 blackhole ip address")) a3.optional = true -a3.default = "::ffff:c000:0201" +a3.default = "::ffff:c612:0001" a3.datatype = "ip6addr" a4 = e:option(Value, "adb_fetchttl", translate("Timeout for blocklist fetch (seconds)")) |