Christian König
a4bdf2454b
Don't use intermediate strings to filter false positives in gravity
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Adam Warner
9939cf1d77
Rename some of the variables to hopefully make the process a little clearer
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Adam Warner
79f4a7cef0
Maintain a list of valid hostnames (taken from the top of StevenBlack's host file), and discount them when calculating the number of "invalid" domains in a given list
...
Soften the output message when reporting on unsuable domains
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Christian König
14ab586603
Start counting with 1
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
372070ab39
Improve detection of incorrecr lines during gravity
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
4004a93d1a
Don't double check for lines containing no domains in gravity
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
RD WebDesign
090727b1d3
Remove unnecessary return
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2 years ago
RD WebDesign
8b98fd06ed
Remove unused old code
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2 years ago
Christian König
230d6a435f
Semi hardcode the connection_timeout value
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
53c0982c8b
Set connection timeout for curl
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Adam Warner
64dc002c3f
Same per @rdwebdesign suggestion.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Adam Warner
6c7a28a7b5
Dont use bash keywords/programs as variable names
2 years ago
Christian König
b486786041
Add database healthy checks to debug script
...
Fix health check output comparison in gravity script as well
Add note about waiting time
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Adam Warner
0be987239e
Adds spellcheck action to the smoke-tests (also moves editorconfig-checker to smoketests away from it's own action)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Peter Russell
052a1f294e
Update gravity.sh
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
2 years ago
Peter Russell
325f20d5c2
Update gravity.sh
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
2 years ago
Peter Russell
1c28da7bbd
Update gravity.sh
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
2 years ago
jpgpi250
aba5e884eb
Update gravity.sh
...
Signed-off-by: jpgpi250 <jpgpi250@gmail.com>
2 years ago
DL6ER
8cbffa179d
Replace remaining sqlite3 calls by calls to our embedded pihole-FTL sqlite3 engine and remove sqlite3 as dependency in the installer.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
534f9a63bf
Copy database tables earlier into the new gravity database to avoid foreign key contraint violations when adding gravity entries refering to an empty adlist table
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
f0f5cc52d9
Use internal SQLite3 engine in more places in gravity.sh
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
ce86157067
Fix gravity in case there are no adlists at all or all are disabled ( #4535 )
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
3d3bb45a46
Merge pull request #4288 from pi-hole/new/gravity_repair
...
Implement fully-automated gravity database recovery method
3 years ago
DL6ER
d2a98ae954
Document -r recover force case
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
2e1ce7fc87
Apply suggestions from code review
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
3 years ago
DL6ER
54c58327f1
Merge pull request #4450 from pi-hole/unblock_NODATA
...
Unblock adlist domain during gravity run in NODATA mode
3 years ago
yubiuser
db5e94b14a
use +short and omit obsolet awk
...
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
3 years ago
DL6ER
7167e6d5e4
Apply suggestions from code review
...
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago
DL6ER
b06efb6ab7
Declare variables local
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
ab4bce4787
Allow users to force recovery even when checks are okay using "pihole -g -r recover force"
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
469c179b32
Return early from recovery routine when integrity checks didn't show any database errors.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
DL6ER
190ab79606
Implement fully-automated gravity database recovery method.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
3 years ago
Dan Schaper
533a77d6d5
Add database function failure guards.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago
Dan Schaper
76ae75689c
Check for DNS before run.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago
Dan Schaper
a780fc59e2
Set DBFile permissions on creation.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago
Christian König
e243c562c2
Unblock adlist domain during gravity run in NODATA mode
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
647ba6ec9d
Rename variables to improve comprehensibility
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
bfda52ed79
Fix number of invalid domains
...
Co-authored-by: abesnier <besnier_antoine@yahoo.fr>
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
jbzdarkid
bc8150adfa
Clean up bash script formatting
...
Done with the help of beautysh (a python-based bash formatter)
Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>
3 years ago
yubiuser
38bb4a4908
Remove unused wildcard_regex_converter.sh ( #4369 )
...
* Remove unused wildcard_regex_converter.sh
Signed-off-by: Christian König <ckoenig@posteo.de>
* Remove regexconverter
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
jpgpi250
3439045228
fix Pi-hole v5.4 update - syntax error #4322
...
Signed-off-by: jpgpi250 <jpgpi250@gmail.com>
3 years ago
Adam Warner
4ac4bc5c18
Merge branch 'development' into fix/gravity_no_locallist
3 years ago
jpgpi250
a2d5b8050a
Update gravity.sh
...
Signed-off-by: jpgpi250 <jpgpi250@gmail.com>
3 years ago
DL6ER
f90dffbf1a
Do not put hostname and pi.hole into local.list - this will be handled by FTL after FTL#1111 has been merged
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
DL6ER
f536718aaa
Use possibly custom gravity.db location in the copying SQL script
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
DL6ER
d25240fe9f
pihole -g should respose GRAVITYDB in pihole-FTL.conf
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
DL6ER
126b9ae381
Add missing three new columns to pihole -g -r
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
4 years ago
DL6ER
57fe3b6621
Merge pull request #3951 from pi-hole/new/gravity_adlist_infos
...
Store gravity details in gravity.db adlist table
4 years ago
Adam Warner
9ec012289f
Merge pull request #4017 from mwoolweaver/patch-2
...
fix suspected typo in comment
4 years ago
Michael Woolweaver
c42b97ddb2
fix typo in comment
...
Signed-off-by: Michael Woolweaver <m.woolweaver@icloud.com>
4 years ago