simple-adblock: rename wan6_trigger option

* rename wan6_trigger to procd_trigger_wan6
* reorder options in default config alphabetically

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 491ade4197f9d6d682f0520d17727045e1c43988)

diff --git a/net/simple-adblock/Makefile b/net/simple-adblock/Makefile
index d4ac46522a6ae3b0e7feebd6730fc042ab659fd8..540a105f40a571f9b85342bd72da441af99804aa 100644 (file)
--- a/net/simple-adblock/Makefile
+++ b/net/simple-adblock/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=simple-adblock
 PKG_VERSION:=1.9.2
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
 PKG_LICENSE:=GPL-3.0-or-later
 

diff --git a/net/simple-adblock/files/simple-adblock.conf b/net/simple-adblock/files/simple-adblock.conf
index 2346801c54b5fc7d3368375b564de189529b5605..e15e7e864808e925014a64efb75a47b5faa3baa1 100644 (file)
--- a/net/simple-adblock/files/simple-adblock.conf
+++ b/net/simple-adblock/files/simple-adblock.conf
@@ -1,10 +1,17 @@
 config simple-adblock 'config'
        option enabled '0'
+       list allowed_domain 'cdn.jsdelivr.net'
+       option allow_non_ascii '0'
+       option canary_domains_icloud '0'
+       option canary_domains_mozilla '0'
+       option compressed_cache '0'
        option config_update_enabled '0'
        option config_update_url 'https://cdn.jsdelivr.net/gh/openwrt/packages/net/simple-adblock/files/simple-adblock.conf.update'
+       option curl_retry '3'
+       option download_timeout '10'
+       option debug '0'
        option dns 'dnsmasq.servers'
        option dns_instance '0'
-       option verbosity '2'
        option force_dns '1'
        list force_dns_port '53'
        list force_dns_port '853'
@@ -16,16 +23,10 @@ config simple-adblock 'config'
 #      list force_dns_port '4434'
 #      list force_dns_port '5443'
 #      list force_dns_port '8443'
-       option canary_domains_icloud '0'
-       option canary_domains_mozilla '0'
        option led 'none'
-       option boot_delay '120'
-       option download_timeout '10'
-       option curl_retry '3'
        option parallel_downloads '1'
-       option debug '0'
-       option compressed_cache '0'
-       list allowed_domain 'cdn.jsdelivr.net'
+       option procd_trigger_wan6 '0'
+       option verbosity '2'
 
 # File size: 16.0K
        list blocked_hosts_url 'https://adaway.org/hosts.txt'

diff --git a/net/simple-adblock/files/simple-adblock.init b/net/simple-adblock/files/simple-adblock.init
index bae0cd6675ec21c1a6f5f88178ae2aa9b8090da0..19fe9ba182a6fc66f061705cd53d97d2ca2eef14 100644 (file)
--- a/net/simple-adblock/files/simple-adblock.init
+++ b/net/simple-adblock/files/simple-adblock.init
@@ -1319,14 +1319,14 @@ stop_service() { load_validate_config 'config' adb_stop "'$*'"; }
 status_service() { load_validate_config 'config' adb_status "''"; }
 service_triggers() {
        local wan wan6 i
-       local wan6_trigger
+       local procd_trigger_wan6
        config_load "$packageName"
-       config_get_bool wan6_trigger 'config' 'wan6_trigger' '0'
+       config_get_bool procd_trigger_wan6 'config' 'procd_trigger_wan6' '0'
        . /lib/functions/network.sh
        network_flush_cache
        network_find_wan wan
        wan="${wan:-wan}"
-       if [ "$wan6_trigger" -ne 0 ]; then
+       if [ "$procd_trigger_wan6" -ne 0 ]; then
                network_find_wan6 wan6
                wan6="${wan6:-wan6}"
        fi
@@ -1404,7 +1404,7 @@ load_validate_config() {
                'download_timeout:range(1,40):20' \
                'curl_retry:range(1,5):3' \
                'verbosity:range(0,2):2' \
-               'wan6_trigger:bool:0' \
+               'procd_trigger_wan6:bool:0' \
                'led:or("", "none", file, device, string)' \
                'dns:or("dnsmasq.addnhosts", "dnsmasq.conf", "dnsmasq.ipset", "dnsmasq.servers", "unbound.adb_list"):dnsmasq.servers' \
                'dns_instance:or(list(integer, string)):0' \