mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 07:28:39 +01:00
adblock: update 4.1.0
* major source changes:
* split oisd.nl in basic and full variant
* add swedish regional list
* made archive categories for shallalist and utcapitole selectable
via LuCI
* made all list variants of energized and stevenblack selectable
via LuCI
* removed dns filereset mode
Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken
+35
-40
@@ -18,17 +18,13 @@ A lot of people already use adblocker plugins within their desktop browsers, but
|
||||
| anudeep | | M | compilation | [Link](https://github.com/anudeepND/blacklist) |
|
||||
| bitcoin | | S | mining | [Link](https://github.com/hoshsadiq/adblock-nocoin-list) |
|
||||
| disconnect | x | S | general | [Link](https://disconnect.me) |
|
||||
| energized_blugo | | XL | compilation | [Link](https://energized.pro) |
|
||||
| energized_blu | | XL | compilation | [Link](https://energized.pro) |
|
||||
| energized_porn | | XXL | compilation+porn | [Link](https://energized.pro) |
|
||||
| energized_ultimate | | XXL | compilation | [Link](https://energized.pro) |
|
||||
| energized_unified | | XXL | compilation | [Link](https://energized.pro) |
|
||||
| energized | | VAR | compilation | [Link](https://energized.pro) |
|
||||
| firetv_tracking | | S | tracking | [Link](https://github.com/Perflyst/PiHoleBlocklist) |
|
||||
| games_tracking | | S | tracking | [Link](https://www.gameindustry.eu) |
|
||||
| gaming | | S | gaming | [Link](https://github.com/abyssin/pihole-blocklist) |
|
||||
| malwaredomains | | M | malware | [Link](https://malwaredomains.com) |
|
||||
| notracking | | XL | tracking | [Link](https://github.com/notracking/hosts-blocklists) |
|
||||
| oisd_nl | | XXL | general | [Link](https://oisd.nl) |
|
||||
| oisd_basic | | L | general | [Link](https://oisd.nl) |
|
||||
| oisd_full | | XXL | general | [Link](https://oisd.nl) |
|
||||
| openphish | | S | phishing | [Link](https://openphish.com) |
|
||||
| phishing_army | | S | phishing | [Link](https://phishing.army) |
|
||||
| reg_cn | | M | reg_china | [Link](https://easylist.to) |
|
||||
@@ -45,16 +41,14 @@ A lot of people already use adblocker plugins within their desktop browsers, but
|
||||
| reg_pl2 | | S | reg_poland | [Link](https://www.certyficate.it) |
|
||||
| reg_ro | | M | reg_romania | [Link](https://easylist.to) |
|
||||
| reg_ru | | M | reg_russia | [Link](https://easylist.to) |
|
||||
| reg_se | | M | reg_sweden | [Link](https://github.com/lassekongo83/Frellwits-filter-lists) |
|
||||
| reg_vn | | S | reg_vietnam | [Link](https://bigdargon.github.io/hostsVN) |
|
||||
| shallalist | | L | general | [Link](https://www.shallalist.de) |
|
||||
| shallalist_porn | | XXL | general+porn | [Link](https://www.shallalist.de) |
|
||||
| shallalist | | VAR | general | [Link](https://www.shallalist.de) |
|
||||
| smarttv_tracking | | S | tracking | [Link](https://github.com/Perflyst/PiHoleBlocklist) |
|
||||
| spam404 | | S | general | [Link](https://github.com/Dawsey21) |
|
||||
| stevenblack | | L | compilation | [Link](https://github.com/StevenBlack/hosts) |
|
||||
| stevenblack_porn | | L | compilation+porn | [Link](https://github.com/StevenBlack/hosts) |
|
||||
| stevenblack | | VAR | compilation | [Link](https://github.com/StevenBlack/hosts) |
|
||||
| stopforumspam | | S | spam | [Link](https://www.stopforumspam.com) |
|
||||
| utcapitole | | L | general | [Link](https://dsi.ut-capitole.fr/blacklists/index_en.php) |
|
||||
| utcapitole_porn | | XXL | general+porn | [Link](https://dsi.ut-capitole.fr/blacklists/index_en.php) |
|
||||
| utcapitole | | VAR | general | [Link](https://dsi.ut-capitole.fr/blacklists/index_en.php) |
|
||||
| wally3k | | S | compilation | [Link](https://firebog.net/about) |
|
||||
| whocares | | M | general | [Link](https://someonewhocares.org) |
|
||||
| winhelp | | S | general | [Link](https://winhelp2002.mvps.org) |
|
||||
@@ -117,26 +111,28 @@ A lot of people already use adblocker plugins within their desktop browsers, but
|
||||
|
||||
## Adblock CLI Options
|
||||
* All important adblock functions are accessible via CLI as well.
|
||||
<b>Please note:</b> The 'status' command in 19.07.x and TurrisOS is only available via 'status_service'
|
||||
<pre><code>
|
||||
/etc/init.d/adblock
|
||||
~# /etc/init.d/adblock
|
||||
Syntax: /etc/init.d/adblock [command]
|
||||
|
||||
Available commands:
|
||||
start Start the service
|
||||
stop Stop the service
|
||||
restart Restart the service
|
||||
reload Reload configuration files (or restart if service does not implement reload)
|
||||
enable Enable service autostart
|
||||
disable Disable service autostart
|
||||
running Check if service is running
|
||||
status Service status
|
||||
suspend Suspend adblock processing
|
||||
resume Resume adblock processing
|
||||
query <domain> Query active blocklists and backups for a specific domain
|
||||
report [<search>] Print DNS statistics with an optional search parameter
|
||||
list [[<add>|<remove>] [source(s)]] List available adblock sources or add/remove them from config
|
||||
timer <action> <hour> [<minute>] [<weekday>] Set a cron based update interval
|
||||
start Start the service
|
||||
stop Stop the service
|
||||
restart Restart the service
|
||||
reload Reload configuration files (or restart if service does not implement reload)
|
||||
enable Enable service autostart
|
||||
disable Disable service autostart
|
||||
enabled Check if service is started on boot
|
||||
suspend Suspend adblock processing
|
||||
resume Resume adblock processing
|
||||
query <domain> Query active blocklists and backups for a specific domain
|
||||
report [<search>] Print DNS statistics with an optional search parameter
|
||||
list [<add>|<add_sha>|<add_utc>|<add_eng>|<add_stb>|<remove>|<remove_sha>|<remove_utc>|<remove_eng>|<remove_stb>] <source(s)> List/Edit available sources
|
||||
timer [<add> <tasks> <hour> [<minute>] [<weekday>]]|[<remove> <line no.>] List/Edit cron update intervals
|
||||
version Print version information
|
||||
running Check if service is running
|
||||
status Service status
|
||||
trace Start with syscall trace
|
||||
</code></pre>
|
||||
|
||||
## Adblock Config Options
|
||||
@@ -159,7 +155,6 @@ Available commands:
|
||||
| adb_dnsdir | -, auto-detected | path for the generated blocklist file 'adb_list.overall' |
|
||||
| adb_dnstimeout | 10 | timeout in seconds to wait for a successful DNS backend restart |
|
||||
| adb_dnsinstance | 0, first instance | set to the relevant dns backend instance used by adblock (dnsmasq only) |
|
||||
| adb_dnsfilereset | 0, disabled | set to 1 to purge the final DNS blocklist file after DNS backend loading |
|
||||
| adb_dnsflush | 0, disabled | set to 1 to flush the DNS Cache before & after adblock processing |
|
||||
| adb_dnsinotify | -, not set | set to 1 to prevent adblock triggered restarts for DNS backends with autoload functions |
|
||||
| adb_dnsallow | -, not set | set to 1 to disable selective DNS whitelisting (RPZ pass through) |
|
||||
@@ -236,19 +231,19 @@ Finally enable E-Mail support and add a valid E-Mail receiver address in LuCI.
|
||||
In LuCI you'll see the realtime status in the 'Runtime' section on the overview page.
|
||||
To get the status in the CLI, just call _/etc/init.d/adblock status_ or _/etc/init.d/adblock status\_service_ (in 19.07 and TurrisOS):
|
||||
<pre><code>
|
||||
/etc/init.d/adblock status_service
|
||||
~# /etc/init.d/adblock status
|
||||
::: adblock runtime information
|
||||
+ adblock_status : enabled
|
||||
+ adblock_version : 4.0.2
|
||||
+ blocked_domains : 52420
|
||||
+ active_sources : adaway adguard andryou bitcoin disconnect winspy yoyo
|
||||
+ dns_backend : kresd, /etc/kresd
|
||||
+ run_utils : /usr/bin/curl, /bin/awk
|
||||
+ adblock_version : 4.1.0
|
||||
+ blocked_domains : 32658
|
||||
+ active_sources : android_tracking, disconnect, shallalist
|
||||
+ dns_backend : dnsmasq, /tmp/dnsmasq.d
|
||||
+ run_utils : /usr/bin/curl, /usr/bin/gawk
|
||||
+ run_ifaces : trigger: trm_wwan, report: br-lan
|
||||
+ run_directories : base: /tmp, backup: /tmp, report: /tmp, jail: /tmp
|
||||
+ run_flags : backup: 1, reset: 0, flush: 0, force: 1, search: 0, report: 1, mail: 0, jail: 0
|
||||
+ last_run : start, 0m 17s, 496/198/218, 03.04.2020 08:55:14
|
||||
+ system : CZ.NIC Turris Mox Board, TurrisOS 5.1.0 81264ebb51991aa2d17489852854e3b5ec3f514d
|
||||
+ run_directories : base: /tmp, backup: /tmp/adblock-Backup, report: /tmp/adblock-Report, jail: /tmp
|
||||
+ run_flags : backup: 1, flush: 0, force: 1, search: 1, report: 1, mail: 0, jail: 0
|
||||
+ last_run : reload, 0m 25s, 252/177/167, 26.02.2021 18:31:41
|
||||
+ system : GL.iNet GL-MT1300, OpenWrt SNAPSHOT r15875-1bf6d70e60
|
||||
</code></pre>
|
||||
The 'last\_run' line includes the used start type, the run duration, the memory footprint after DNS backend loading (total/free/available) and the date/time of the last run.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user