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

577 Commits

Author SHA1 Message Date
DL6ER
c381109dcd Use a different method to identify if a gravity restore succeeded 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2025-01-29 17:52:39 +01:00
DL6ER
69bfb3ff3b Store timestamp of the backup creation instead of the filename on restoring gravity.db 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2025-01-26 19:52:46 +01:00
DL6ER
cc25ee940e Fix unreachable code 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2025-01-12 13:42:51 +01:00
DL6ER
12927f8a3d Put gravity backup files into dedicated directory for cleaness 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2025-01-12 13:41:27 +01:00
DL6ER
579dc07046 Merge branch 'development' into tweak/gravity_backup 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-11-26 21:08:09 +01:00
DL6ER
1c4a48258f Only set ownership/permissions once the file was created 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-11-26 18:16:15 +01:00
DL6ER
d9288b896e Do not touch list files as this creates them. This causes issues down the line in the Heisenberg compensator 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-11-26 18:01:52 +01:00
DL6ER
531490397d When new domains are added to gravity and users run the first time gravity in the terminal (not via web), the list.123.abc.com file is created as root and stays like that. This causes issues down the line when users later try to run gravity from the web interface where we do not have root capabilities. This commit checks for write permissions and suggests what to do on error. It always ensures ownership and permissions are correct 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-11-25 12:40:55 +01:00
DL6ER
633c971a44 Store failed gravity restoration status in message table 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-11-23 09:44:39 +01:00
Dominik
9a9af719f0 Update gravity.sh 
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Dominik <DL6ER@users.noreply.github.com>
 2024-11-17 17:05:26 +01:00
DL6ER
fdf44355d2 Keep up to 10 database backups 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-11-16 12:08:27 +01:00
DL6ER
a5cb07c76e Attempt to restore from all possibly available gravity.db backups 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-11-16 11:52:31 +01:00
DL6ER
59e9bac794 Only try to obtain sources after possible database restore following a corruption 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-11-16 11:49:11 +01:00
DL6ER
b2ad878f4a Try to restore from gravity backup on database preparation error (if backup is available) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-11-16 10:18:00 +01:00
DL6ER
6ff30f7294 Backup a stripped-down version of gravity.db after each pihole -g run 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-11-16 10:09:44 +01:00
DL6ER
2dc5bd15cc Remove remaining traces of audit log 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-11-16 09:45:53 +01:00
Sebastián Dinator
5589fa171c Remove example from error message on invalid protocol 
Signed-off-by: Sebastián Dinator <sdinator@alumnos.uai.cl>
 2024-10-24 14:04:06 -03:00
Sebastian Dinator
0e7706ffa3 Improved error message for invalid protocol in adlist download 
Signed-off-by: Sebastian Dinator <sdinator@alumnos.uai.cl>
Signed-off-by: Sebastián Dinator <sdinator@alumnos.uai.cl>
 2024-10-24 14:04:06 -03:00
Adam Warner
afdf45031f Missed a couple of references in the previous PR 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-10-02 21:51:56 +01:00
Dominik
65806a905a Add database optimization and gravity timing (#5773) 2024-09-25 03:25:02 -04:00
yubiuser
564957c203 Remove lines containing Adguard JavaScript rules from adlists (#5754) 2024-09-23 23:33:14 +02:00
Dominik
0f4ad7734c Update gravity.sh to use color with -t 
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Dominik <DL6ER@users.noreply.github.com>
 2024-09-18 16:13:35 -04:00
DL6ER
111dfc63ff Add new option allowing timing the individual parts of gravity 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-09-17 20:23:09 +02:00
DL6ER
73301da68f Optimize the database by running ANALYZE after gravity finished 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-09-17 20:03:07 +02:00
Jack'lul
129272a695 Fix wrong message being displayed while waiting for DNS 
Signed-off-by: Jack'lul <jacklulcat@gmail.com>
 2024-09-09 19:08:47 +02:00
Christian König
f02162b021 Update comment 
Signed-off-by: Christian König <github@yubiuser.dev>
 2024-09-06 21:22:22 +02:00
yubiuser
0ad2a79624 Apply suggestions from code review 
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2024-09-06 21:20:36 +02:00
yubiuser
e291a9f7e0 It's Adguard not ABP 
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2024-09-05 13:42:10 +02:00
Christian König
cffb3117d4 Remove lines containing ABP JavaScript rules from adlists 
Signed-off-by: Christian König <github@yubiuser.dev>
 2024-09-04 22:32:03 +02:00
Christian König
f80efa51aa Wait until DNS resolution is available 
Signed-off-by: Christian König <github@yubiuser.dev>
 2024-09-03 23:32:41 +02:00
Christian König
ba2d10c65e DNS check in gravity should not check for FTL as it might not be the host's name server 
Signed-off-by: Christian König <github@yubiuser.dev>
 2024-09-03 23:03:59 +02:00
Christian König
a57d539098 Remove leftover DNS check via dig as it now only doubles what we already have with getent hosts 
Signed-off-by: Christian König <github@yubiuser.dev>
 2024-09-03 23:02:15 +02:00
DL6ER
6ffb20f09e Add protocol validation when downloading blocklist from URL 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-07-07 07:35:00 +02:00
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