X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-app-adblock%2Fluasrc%2Fmodel%2Fcbi%2Fadblock.lua;h=0a4a4cdd2f9a216aa148f36af48f90d72701af08;hp=19328376c8f51e74e60146596e7c3e0c036f4d10;hb=5180a5bb8bcab18e06d25dbe94ba3f5e37e66248;hpb=1575d659a14c393a46cef8a2e917945b1c676726

diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua
index 19328376c..0a4a4cdd2 100644
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua
@@ -1,4 +1,4 @@
--- Copyright 2016 Openwrt.org
+-- Copyright 2016 Hannu Nyman
 -- Licensed to the public under the Apache License 2.0.
 
 m = Map("adblock", translate("Adblock"),
@@ -17,14 +17,6 @@ o3 = s:option(Value, "adb_whitelist", translate("Whitelist file"),
 o3.rmempty = false
 o3.datatype = "file"
 
-fdns = s:option(Flag, "adb_forcedns", translate("Redirect all DNS queries to the local resolver"),
-        translate("When adblock is active, all DNS queries are redirected to the local resolver " ..
-        "in this server by default. You can disable that to allow queries to external DNS servers."))
-fdns.rmempty = false
-fdns.default = fdns.enabled
-
-tot = s:option(DummyValue, "adb_overall_count", translate("Total count of blocked domains"))
-
 -- Blocklist options
 
 bl = m:section(TypedSection, "source", translate("Blocklist sources"),
@@ -39,18 +31,16 @@ name = bl:option(Flag, "enabled", translate("Enabled"))
 name.rmempty  = false
 
 des = bl:option(DummyValue, "adb_src_desc", translate("Description"))
-cou = bl:option(DummyValue, "adb_src_count", translate("Count"))
-upd = bl:option(DummyValue, "adb_src_timestamp", translate("List date/state"))
 
 -- Additional options
 
-s2 = m:section(NamedSection, "backup", "service", translate("Backup options"))
+s2 = m:section(NamedSection, "global", "adblock", translate("Backup options"))
 
-o4 = s2:option(Flag, "enabled", translate("Enable blocklist backup"))
+o4 = s2:option(Flag, "adb_backup", translate("Enable blocklist backup"))
 o4.rmempty = false
 o4.default = 0
 
-o5 = s2:option(Value, "adb_dir", translate("Backup directory"))
+o5 = s2:option(Value, "adb_backupdir", translate("Backup directory"))
 o5.rmempty = false
 o5.datatype = "directory"
 
@@ -59,34 +49,15 @@ o5.datatype = "directory"
 e = m:section(NamedSection, "global", "adblock", translate("Extra options"),
 	translate("Options for further tweaking in case the defaults are not suitable for you."))
 
-a0 = e:option(Flag, "adb_restricted", translate("Do not write status info to flash"),
-	translate("Skip writing update status information to the config file. Status fields on this page will not be updated."))
-a0.default = 0
-
-a1 = e:option(Value, "adb_nullport", translate("Port of the adblock uhttpd instance"))
-a1.optional = true
-a1.default = 65535
-a1.datatype = "port"
-
-a2 = e:option(Value, "adb_nullipv4", translate("IPv4 blackhole ip address"))
-a2.optional = 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.default = "::ffff:c000:0201"
-a3.datatype = "ip6addr"
-
-a4 = e:option(Value, "adb_fetchttl", translate("Timeout for blocklist fetch (seconds)"))
-a4.optional = true
-a4.default = 5
-a4.datatype = "range(2,60)"
-
-a7 = e:option(Value, "adb_lanif", translate("Name of the logical lan interface"))
-a7.optional = true
-a7.default = "lan"
-a7.datatype = "network"
+a = e:option(Flag, "adb_debug", translate("Enable verbose debug logging"))
+a.default = a.disabled
+a.rmempty = false
+
+a = e:option(Value, "adb_iface", translate("Restrict reload trigger to certain interface(s)"),
+	translate("Space separated list of wan interfaces that trigger reload action. " ..
+		"To disable reload trigger set it to 'false'. Default: empty"))
+a.datatype = "network"
+a.rmempty = true
 
 return m