641318d5c5
* add support for 'DNS File Reset', where the final DNS blockfile
will be purged after DNS backend loading (save storage space).
A small background service will be started to trace/handle
dns backend reloads/restarts
* add support for the 'null' blocking variant in dnsmasq
(via addn-hosts), which may provide better response times
in dnsmasq
* enhance the report & search engine to support
the new blocking variants. Search now includes
backups & black-/whitelist as well
* compressed source list backups are now mandatory (default to '/tmp')
* speed up TLD compression
* E-Mail notification setup is now integrated in UCI/LuCI
* update the LuCI frontend to reflect all changes (separate PR)
* drop preliminary dnscrypt-proxy-support (use dnsmasq instead)
* drop additional 'dnsjail' blocklist support (not used by anyone)
* procd cleanups in init
* various shellcheck cleanups
* update readme
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 504412ccdb)
118 lines
2.4 KiB
Bash
Executable file
118 lines
2.4 KiB
Bash
Executable file
#!/bin/sh /etc/rc.common
|
|
#
|
|
|
|
START=30
|
|
USE_PROCD=1
|
|
|
|
EXTRA_COMMANDS="suspend resume query report status"
|
|
EXTRA_HELP=" suspend Suspend adblock processing
|
|
resume Resume adblock processing
|
|
query <DOMAIN> Query active blocklists for specific domains
|
|
report <SEARCH> Print dns query statistics with an optional search parameter
|
|
status Print runtime information"
|
|
|
|
adb_init="/etc/init.d/adblock"
|
|
adb_script="/usr/bin/adblock.sh"
|
|
adb_pidfile="/var/run/adblock.pid"
|
|
|
|
boot()
|
|
{
|
|
adb_boot=1
|
|
rc_procd start_service
|
|
}
|
|
|
|
start_service()
|
|
{
|
|
if [ $("${adb_init}" enabled; printf "%u" ${?}) -eq 0 ]
|
|
then
|
|
if [ -n "${adb_boot}" ]
|
|
then
|
|
local trigger="$(uci_get adblock global adb_trigger)"
|
|
if [ "${trigger}" != "timed" ]
|
|
then
|
|
return 0
|
|
fi
|
|
fi
|
|
local nice="$(uci_get adblock extra adb_nice)"
|
|
procd_open_instance "adblock"
|
|
procd_set_param command "${adb_script}" "${@}"
|
|
procd_set_param pidfile "${adb_pidfile}"
|
|
procd_set_param nice ${nice:-0}
|
|
procd_set_param stdout 1
|
|
procd_set_param stderr 1
|
|
procd_close_instance
|
|
fi
|
|
}
|
|
|
|
reload_service()
|
|
{
|
|
rc_procd start_service reload
|
|
}
|
|
|
|
stop_service()
|
|
{
|
|
rc_procd "${adb_script}" stop
|
|
}
|
|
|
|
restart()
|
|
{
|
|
rc_procd start_service restart
|
|
}
|
|
|
|
suspend()
|
|
{
|
|
[ -s "${adb_pidfile}" ] && return 1
|
|
rc_procd start_service suspend
|
|
}
|
|
|
|
resume()
|
|
{
|
|
[ -s "${adb_pidfile}" ] && return 1
|
|
rc_procd start_service resume
|
|
}
|
|
|
|
query()
|
|
{
|
|
[ -s "${adb_pidfile}" ] && return 1
|
|
rc_procd "${adb_script}" query "${1}"
|
|
}
|
|
|
|
report()
|
|
{
|
|
[ -s "${adb_pidfile}" ] && return 1
|
|
rc_procd "${adb_script}" report "${1:-"+"}" "${2:-"50"}" "${3:-"false"}" "${4:-"true"}"
|
|
}
|
|
|
|
status()
|
|
{
|
|
local key keylist value rtfile="$(uci_get adblock extra adb_rtfile)"
|
|
|
|
rtfile="${rtfile:-"/tmp/adb_runtime.json"}"
|
|
if [ -s "${rtfile}" ]
|
|
then
|
|
printf "%s\\n" "::: adblock runtime information"
|
|
json_load_file "${rtfile}"
|
|
json_select data
|
|
json_get_keys keylist
|
|
for key in ${keylist}
|
|
do
|
|
json_get_var value "${key}"
|
|
printf " + %-15s : %s\\n" "${key}" "${value}"
|
|
done
|
|
else
|
|
printf "%s\\n" "::: no adblock runtime information available"
|
|
fi
|
|
}
|
|
|
|
service_triggers()
|
|
{
|
|
local trigger="$(uci_get adblock global adb_trigger)"
|
|
local delay="$(uci_get adblock extra adb_triggerdelay)"
|
|
|
|
if [ "${trigger}" != "none" ] && [ "${trigger}" != "timed" ]
|
|
then
|
|
PROCD_RELOAD_DELAY=$((${delay:-2} * 1000))
|
|
procd_add_interface_trigger "interface.*.up" "${trigger}" "${adb_init}" start
|
|
fi
|
|
procd_add_reload_trigger "adblock"
|
|
}
|