s = m:section(NamedSection, "global", "adblock", translate("Global options"))
-o1 = s:option(Flag, "adb_enabled", translate("Enable"))
+o1 = s:option(Flag, "adb_enabled", translate("Enable adblock"))
o1.rmempty = false
o1.default = 0
o3.rmempty = false
o3.datatype = "file"
+-- Blocklist options
+
+bl = m:section(TypedSection, "source", translate("Blocklist sources"),
+ translate("Available blocklist sources (")
+ .. [[<a href="https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md" target="_blank">]]
+ .. translate("see list details")
+ .. [[</a>]]
+ .. translate("). Note that list URLs and Shallalist category selections are not configurable via Luci."))
+bl.template = "cbi/tblsection"
+
+name = bl:option(Flag, "enabled", translate("Enabled"))
+name.rmempty = false
+
+des = bl:option(DummyValue, "adb_srcdesc", translate("Description"))
+des.rmempty = false
+
+-- Additional options
+
s2 = m:section(NamedSection, "backup", "service", translate("Backup options"))
o4 = s2:option(Flag, "enabled", translate("Enable blocklist backup"))
o5.rmempty = false
o5.datatype = "directory"
-s3 = m:section(NamedSection, "debuglog", "service", translate("Debug log options"),
- translate("Verbose log for debuging purposes."))
+s3 = m:section(NamedSection, "log", "service", translate("Log options"))
-o6 = s3:option(Flag, "enabled", translate("Enable debug log"))
+o6 = s3:option(Flag, "enabled", translate("Enable log"))
o6.rmempty = false
o6.default = 0
-o7 = s3:option(Value, "adb_logfile", translate("Debug log file"))
+o7 = s3:option(Value, "adb_logfile", translate("Log file"))
o7.rmempty = false
o7.datatype = "string"
--- Blocklist options
-
-s3 = m:section(TypedSection, "source", translate("Blocklist sources"),
- translate("Available blocklist sources (")
- .. [[<a href="https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md#main-features" target="_blank">]]
- .. translate("see list details")
- .. [[</a>]]
- .. translate("). Note that list URLs and Shallalist category selections are not configurable via Luci."))
-
-name = s3:option(Flag, "enabled", translate("Enabled"))
-name.rmempty = false
-
+-- Extra options
+
+e = m:section(NamedSection, "global", "adblock", translate("Extra options"),
+ translate("Options for further tweaking in case the defaults are not suitable for you."))
+
+a1 = e:option(Value, "adb_port", translate("Port of the adblock uhttpd instance"))
+a1.optional = true
+a1.rmempty = true
+a1.default = 65535
+a1.datatype = "port"
+
+a2 = e:option(Value, "adb_nullipv4", translate("IPv4 blackhole ip address"))
+a2.optional = true
+a2.rmempty = true
+a2.default = "192.0.2.1"
+a2.datatype = "ip4addr"
+
+a3 = e:option(Value, "adb_nullipv6", translate("IPv6 blackhole ip address"))
+a3.optional = true
+a3.rmempty = true
+a3.default = "::ffff:c000:0201"
+a3.datatype = "ip6addr"
+
+a6 = e:option(Value, "adb_wanif", translate("Name of the logical wan interface"))
+a6.optional = true
+a6.rmempty = true
+a6.default = "wan"
+a6.datatype = "network"
+
+a7 = e:option(Value, "adb_lanif", translate("Name of the logical lan interface"))
+a7.optional = true
+a7.rmempty = true
+a7.default = "lan"
+a7.datatype = "network"
return m