adblock: release 3.0

* add kresd & turris omnia support
* add dnscrypt-proxy support
* change start priority to 30, to fix possible trigger issues on slow
booting hardware
* simplify suspend/resume handling (no longer use a hideout directory)
* enhanced LuCI frontend
* many small changes & improvements
* default config change (please update your config!), adblock is now
disabled by default
* documentation update

Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken
2017-09-09 17:35:42 +02:00
parent 7cdb6c7031
commit 206c847bb5
5 changed files with 238 additions and 188 deletions
+14 -12
View File
@@ -1,7 +1,7 @@
#!/bin/sh /etc/rc.common
#
START=50
START=30
USE_PROCD=1
EXTRA_COMMANDS="suspend resume query status"
@@ -16,7 +16,6 @@ adb_script="/usr/bin/adblock.sh"
boot()
{
adb_boot=1
ubus -t 30 wait_for network.interface 2>/dev/null
rc_procd start_service
}
@@ -26,7 +25,11 @@ start_service()
then
if [ -n "${adb_boot}" ]
then
return 0
local trigger="$(uci_get adblock.global.adb_trigger)"
if [ "${trigger}" != "timed" ]
then
return 0
fi
fi
procd_open_instance "adblock"
procd_set_param command "${adb_script}" "${@}"
@@ -74,14 +77,13 @@ status()
service_triggers()
{
local iface="$(uci -q get adblock.global.adb_iface)"
local delay="$(uci -q get adblock.global.adb_triggerdelay)"
local trigger="$(uci_get adblock.global.adb_trigger)"
local delay="$(uci_get adblock.global.adb_triggerdelay)"
PROCD_RELOAD_DELAY=$((${delay:=2} * 1000))
for name in ${iface}
do
procd_add_interface_trigger "interface.*.up" "${name}" "${adb_init}" start
done
PROCD_RELOAD_DELAY=1000
procd_add_config_trigger "config.change" "adblock" "${adb_init}" start
if [ "${trigger}" != "none" ] && [ "${trigger}" != "timed" ]
then
PROCD_RELOAD_DELAY=$((${delay:=1} * 1000))
procd_add_interface_trigger "interface.*.up" "${trigger}" "${adb_init}" start
fi
procd_add_reload_trigger "adblock"
}