ainur/pi-hole
1
0
Fork 0
Code Issues Pull Requests Actions 90 Packages Projects Releases Wiki Activity
6,234 Commits 10 Branches 126 Tags
5270336679030dce6f4c3d01201014e178113136
Commit Graph

544 Commits

Author SHA1 Message Date
Adam Warner
200a82acfb Merge development into development-v6 2024-05-08 21:25:26 +01:00
Dominik
91e0d668e0 Code style: Use explicit form of CLI arguments 
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Signed-off-by: Dominik <DL6ER@users.noreply.github.com>
 2024-03-30 20:03:15 +01:00
DL6ER
b595b3b5f4 Port most recent changes of PRs #5615, #5618 amd #5620 to v6 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-03-28 15:41:45 +01:00
Orazio
d80fcf2e62 More checks when downloading from file:// scheme 
Signed-off-by: Orazio <22700499+orazioedoardo@users.noreply.github.com>
 2024-03-27 22:10:12 +01:00
Adam Warner
eb7daf4d2c Fix file permission check in gravity.sh. Remove quotes that were added after complaints from shellcheck, this stopped the comparisson from working 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-03-27 19:12:59 +00:00
DL6ER
8fb3a594eb Merge branch 'development-v6' into fix/gravity_domain 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-03-09 07:47:32 +01:00
DL6ER
9dd138b033 Only use local files (file://) when they have explicit permissions a+r 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-03-04 19:38:13 +01:00
DL6ER
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
DL6ER
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
yubiuser
aca7b31b83 Remove local.list and openVPN traces (#5480) 2024-02-10 06:16:00 +01:00
Adam Warner
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
DL6ER
8e8c7ecad2 Run gravity upgrade on checkout/update 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-12-25 05:59:41 +01:00
DL6ER
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
DL6ER
3f7413d538 Add "-ni" to all sqlite3 invocations 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-12-09 23:07:35 +01:00
DL6ER
c90a27c509 Add "-ni" to all sqlite3 invocations 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-12-09 23:06:50 +01:00
DL6ER
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
DL6ER
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
DL6ER
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
DL6ER
df7633bd1b Add missing value for ${gravityDBfile_default} 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-11-22 21:08:06 +01:00
DL6ER
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
DL6ER
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
DL6ER
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
Christian König
de6e61705e Remove local.list and openVPN traces 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-11-06 21:40:32 +01:00
Christian König
fd8fdd3513 Use suffixed temp file 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-10-23 21:36:18 +02:00
DL6ER
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
RD WebDesign
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
Adam Warner
aba41b45b0 Some verbiage change to outputs 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-10-04 16:20:38 +01:00
DL6ER
f19a56cf87 Merge branch 'development-v6' into new/antigravity 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-09-11 11:43:56 +02:00
Christian König
cdc1c1ace1 Remove user agent when downloading adlists 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-09-03 23:40:58 +02:00
Christian König
eca84e0986 Remove user agent when downloading adlists 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-08-27 14:59:47 +02:00
DL6ER
2a03671fb9 Reinstall gravity cleanup on error 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-07-18 08:13:36 +01:00
DL6ER
35512c4dc9 Fix adlist.list migration step failing during tests 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-07-18 08:13:36 +01:00
DL6ER
00cbb8bc8a Add antigravity support to gravity 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-07-18 08:13:36 +01:00
Adam Warner
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
Christian König
7351a4d3b1 Merge branch 'development' into development-v6 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-06-01 15:45:05 +02:00
DL6ER
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
Adam Warner
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
Adam Warner
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
Adam Warner
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
Adam Warner
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
DL6ER
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
DL6ER
73733308ba Use parseList function offered by pihole-FTL 2023-05-15 19:25:56 +02:00
Christian König
eaded9fdb1 Remove forgotten variables 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-05-11 22:16:21 +02:00
Christian König
a3e610dbf2 Don't use '--suffix' in mktemp 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-05-10 06:52:51 +02:00
yubiuser
cd638b102f Filter ABP CSS selectors (#5247) 2023-05-04 12:01:20 +02:00
Christian König
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
Christian König
d10d59303e There is no ! but an $ rule 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-04-07 21:44:49 +02:00
Christian König
aaf828117d Remove unecessary $cmd_ext 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-04-07 12:36:50 +02:00
Christian König
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
Christian König
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