8fb3a594eb
Merge branch 'development-v6' into fix/gravity_domain
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-03-09 07:47:32 +01:00
bcb712b6e3
Fix accidential double -ni from one of the last PRs
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-02-11 21:07:15 +01:00
8b3469cabc
Merge branch 'development-v6' into development-v6-merge-development
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-02-11 16:41:41 +01:00
aca7b31b83
Remove local.list and openVPN traces ( #5480 )
2024-02-10 06:16:00 +01:00
f193edd428
Merge branch 'development' into development-v6-merge-development (resolved conflicts)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-02-09 19:22:53 +00:00
8e8c7ecad2
Run gravity upgrade on checkout/update
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-12-25 05:59:41 +01:00
0066c6fbff
Make IDs of anti-/gravity lists available in vw_(anti)gravity
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-12-25 05:29:29 +01:00
3f7413d538
Add "-ni" to all sqlite3 invocations
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-12-09 23:07:35 +01:00
c90a27c509
Add "-ni" to all sqlite3 invocations
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-12-09 23:06:50 +01:00
29d010dc2c
Use files.gravity_tmp as temporary directory for the intermediate lists
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-12-01 10:21:13 +01:00
c785667efe
Trim leading and trailing spaces and tabs in upstream servers (if any)
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-23 09:56:43 +01:00
cc333f79cc
Check if this domain is blocked by Pi-hole but only if the domain is not a local file or empty
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-22 21:10:22 +01:00
df7633bd1b
Add missing value for ${gravityDBfile_default}
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-22 21:08:06 +01:00
4efcdf1189
Add missing double quotes to prevent globbing and word splitting
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-22 21:06:09 +01:00
f16cf71781
${PIHOLE_DNS_1} is gone, use the first server from pihole-FTL --config dns.upstreams instead
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-22 21:04:46 +01:00
19d3489bcb
gravity_DownloadBlocklistFromUrl needs ${domain} but it was declared local before and was not passed as argument, making gravity currently depend on undefined behavior. It seems to be working well in the vast majority of cases, however, it seems we have at least one report where it is not working.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-22 20:56:23 +01:00
de6e61705e
Remove local.list and openVPN traces
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-06 21:40:32 +01:00
fd8fdd3513
Use suffixed temp file
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-10-23 21:36:18 +02:00
7523c49f62
Swapping the databases must be the last step before the cleanup. Otherwise, FTL may be reloading from an only partially completed database causing spurious errors and/or warnings.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-22 08:14:11 +02:00
27522fbc18
Add a final message to gravity
...
The terminal version doesn't really need a final message, but this will be
read by the web interface to show a success message
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2023-10-16 17:19:44 -03:00
aba41b45b0
Some verbiage change to outputs
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-04 16:20:38 +01:00
f19a56cf87
Merge branch 'development-v6' into new/antigravity
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-09-11 11:43:56 +02:00
cdc1c1ace1
Remove user agent when downloading adlists
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-09-03 23:40:58 +02:00
eca84e0986
Remove user agent when downloading adlists
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-27 14:59:47 +02:00
2a03671fb9
Reinstall gravity cleanup on error
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-07-18 08:13:36 +01:00
35512c4dc9
Fix adlist.list migration step failing during tests
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-07-18 08:13:36 +01:00
00cbb8bc8a
Add antigravity support to gravity
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-07-18 08:13:36 +01:00
a3bb3872bf
adlist table now contains 11 columns, not 10.
...
Co-authored-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-06-18 21:10:12 +01:00
7351a4d3b1
Merge branch 'development' into development-v6
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-01 15:45:05 +02:00
6c302c9bc8
Adlist properties need to be stored in the new ("temp") database rather than the old.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-05-30 17:01:58 +02:00
ea748822ef
REVISIT: I don't _think_ this line is nessacery. Why should gravity restart FTL if it is offline? It might be offline on purpose.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:53:00 +01:00
a91eb48d48
Remove some code from gravity that gets values from setupVars.conf / pihole-FTL.conf - use getFTLConfigValue from utils.sh instead
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
cd17040f95
setupVars.conf not existing is no longer a critical error
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
dbc6b814b2
Should not need to reloadDNS manually any more as FTL will detect that it needs to reload by itself
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
3695610300
Allow running pihole -g without root (run as user pihole)
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-05-27 11:51:16 +01:00
73733308ba
Use parseList function offered by pihole-FTL
2023-05-15 19:25:56 +02:00
eaded9fdb1
Remove forgotten variables
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-05-11 22:16:21 +02:00
a3e610dbf2
Don't use '--suffix' in mktemp
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-05-10 06:52:51 +02:00
cd638b102f
Filter ABP CSS selectors ( #5247 )
2023-05-04 12:01:20 +02:00
dd3a7a4edb
Only delete lines containing separator when preceded by a letter to reduce false positiv (deleting valid comments)
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-04-08 14:59:26 +02:00
d10d59303e
There is no ! but an $ rule
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-04-07 21:44:49 +02:00
aaf828117d
Remove unecessary $cmd_ext
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-04-07 12:36:50 +02:00
9c4e74ffa7
Remove special handling of pgl.yoyo.org
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-04-07 12:23:11 +02:00
2a0f720153
Don't delete lines containing `/` as they should count as invalid
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-04-07 10:25:25 +02:00
cc17fe18a9
Remove lines with ABP extended CSS selector
...
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-04-07 10:14:59 +02:00
61ff5b2c76
Unifiy sed commands
...
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-04-07 09:44:31 +02:00
66bfa606a7
Using a better text for the comment
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2023-03-29 14:17:41 -03:00
32fb2e69ff
Spliting the regex into TLD_pattern and subdomain_pattern
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2023-03-29 00:05:01 -03:00
c71460e4b6
Allow TLD blocking using ABP style
...
This validates patterns without dots (only for abp style), allowing TLDs to be blocked
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2023-03-28 17:21:50 -03:00
0656ceb149
Speed things up a bit with some humble greps. Consolodate regexes and remove the need for so many mapfile/arrays
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Use temp files for parsing and remove when done.
Always rm the non-domains temp file.
exit 1 if gravity database creation fails.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Co-authored-by: DL6ER <dl6er@dl6er.de>
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
2023-03-25 11:19:23 -07:00
DL6ER
yubiuser
Adam Warner
RD WebDesign