Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-27 16:43:16 +00:00
Code Issues Projects Releases Packages Wiki Activity
5998 commits 8 branches 109 tags 27 MiB
Commit graph

5998 commits

This branch
This branch
All branches
Author SHA1 Message Date
DL6ER
40e8657137
Please Mr. Stickler 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-12 11:18:46 +00:00
DL6ER
52dd72dfa5
Ensure output is always correct and also display if domain has been found but is disabled 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-12 11:08:19 +00:00
DL6ER
922ce7359c
pihole -q should also scan gravity table 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-12 10:58:41 +00:00
DL6ER
779fe670f7
Show full URL during gravity download instead of only domain and file 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-12 10:29:44 +00:00
DL6ER
570a7a5c11
Use sort -u instead of uniq as it is guaranteed to be safe when doing inline file operations. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-12 10:17:59 +00:00
DL6ER
bd1b004d94
Remove possible duplicates found in lower-quality adlists 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-12 10:13:51 +00:00
DL6ER
5457b2c6ea
Merge pull request #2935 from pi-hole/new/internal-blocking 
Per-client blocking changes
 2019-12-12 09:49:02 +01:00
Adam Warner
02f3316710
Merge pull request #3031 from pi-hole/fix/do_not_force_local_resolver 
Do not force nameserver 127.0.0.1 through resolvconf
 2019-12-11 22:11:44 +00:00
DL6ER
69a909fc4c
On modification of lists, we should send real-time signal 0 instead of SIGHUP. This also preserves the DNS cache of not-blocked domains. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-11 21:47:46 +00:00
Adam Warner
ec09b5843c
Merge branch 'development' into fix/do_not_force_local_resolver 2019-12-11 19:09:02 +00:00
Adam Warner
078e7e1686
Merge pull request #3030 from pi-hole/fix/database-service-script 
Ensure database permissions are set up correctly by the service script
 2019-12-11 19:07:29 +00:00
Adam Warner
d29947ba32
optimise gravity list inserts 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-12-09 22:30:41 +00:00
Adam Warner
1f03faddef
shell check recomends 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-12-09 21:35:54 +00:00
Adam Warner
d1bce7e685
Merge pull request #2995 from pi-hole/tweak/NoFurtherThanLatestTag 
Don't allow repo to go further than latest tag on master
 2019-12-09 20:41:29 +00:00
Dan Schaper
880352ea65
Merge pull request #3013 from Jason-Cooke/patch-2 
docs: fix typo
 2019-12-09 10:59:04 -08:00
DL6ER
3231e5c3ba
Address stickler requests. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-09 16:52:03 +00:00
DL6ER
f482156cca
Merge branch 'development' into new/internal-blocking 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-09 16:49:16 +00:00
DL6ER
620e1e9c73
Do not force nameserver 127.0.0.1 through resolvconf in pihole-FTL.service 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-09 12:23:42 +00:00
DL6ER
8a119d72e2
Ensure database permissions are set up correctly by the service script. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-09 12:17:55 +00:00
DL6ER
807a5cfb23
Merge pull request #3015 from pi-hole/tweak/domainlist_table 
Unite four domain tables into a single domainlist table.
 2019-12-08 16:50:22 +01:00
XhmikosR
54d0b9a1b8 Serve JS files with utf-8 charset too 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2019-12-07 13:48:25 +02:00
Adam Warner
ca7a5bc0fe
Merge pull request #3024 from pi-hole/fix/3003 
Get binary name in update.sh
 2019-12-04 21:23:13 +00:00
DL6ER
0c5185f8ba
Also display how many unique domains we have caught in the event horizon. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-04 21:02:46 +00:00
Adam Warner
eaf1244932
:dominik: Detect binary name before calling FTLcheckUpdate in update.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-12-04 20:10:46 +00:00
Adam Warner
7c2bbf840a
Merge pull request #2993 from MichaIng/patch-3 
Minor installer output enhancements
 2019-12-04 18:53:58 +00:00
MichaIng
85673b8273
Print name of chosen upstream DNS as well 
Signed-off-by: MichaIng <micha@dietpi.com>
 2019-12-04 18:59:25 +01:00
DL6ER
b6cd7b8e3d
Use more descriptive names instead of directly using the IDs in list.sh 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-02 17:27:32 +00:00
Adam Warner
869473172c
remove _ from regex descibers 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-12-01 12:50:24 +00:00
Adam Warner
63e407cfdc
Update advanced/Scripts/list.sh 
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
 2019-12-01 12:45:22 +00:00
Adam Warner
0251117c77
Update advanced/Scripts/list.sh 
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
 2019-12-01 12:45:06 +00:00
Adam Warner
44e1455b12
Update advanced/Scripts/list.sh 
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
 2019-12-01 12:44:48 +00:00
Adam Warner
76460f01e9
Change the regex used for domain validation 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-11-30 17:45:07 +00:00
Adam Warner
4b8a72fda7
functionise parameter discovery 
Rename HandleOther to ValidateDomain
Capital letters on the new functions

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-11-30 16:26:26 +00:00
Adam Warner
edaee4e962
remove redundant function and comments 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-11-30 16:02:50 +00:00
Adam Warner
77bfb3fb67
tidy up variable usage in list.sh Remove some that are redundant 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-11-30 14:18:12 +00:00
Adam Warner
6a881545b0
tweak wording Signed-off-by: Adam Warner <me@adamwarner.co.uk> 2019-11-30 13:25:32 +00:00
Adam Warner
d0de5fda30
Simplify removal of domain from one list when it is requested for another 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-11-30 13:13:26 +00:00
DL6ER
a1f120b2ff
Address stickler's complaint 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-11-30 12:43:07 +00:00
DL6ER
185319d560
Unite four domain tables into a single domainlist table. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-11-30 12:33:51 +00:00
DL6ER
5c6dd3f6f4
Merge pull request #2978 from Mograine/patch-1 
Add commands to add/remove custom DNS records
 2019-11-29 13:25:09 +01:00
Jason Cooke
8e5abc1f15
docs: fix typo 2019-11-29 13:46:05 +13:00
Adam Warner
9248c92b5c
Merge pull request #2984 from diginc/development 
Adding docker+arm detection & FTL download
 2019-11-27 21:25:41 +00:00
Adam Warner
583ea4d17a
Merge branch 'development' into development 2019-11-27 21:17:05 +00:00
Adam Warner
edcdf9f619
Merge pull request #3003 from pi-hole/fix/tbd 
FTL always determined.
 2019-11-27 09:46:17 +00:00
Mograine
c809c34024 Add user feedback 
Signed-off-by: Mograine <ghiot.pierre@gmail.com>
 2019-11-27 00:28:44 +01:00
DL6ER
037d52104a
New command "pihole -g -r" recreates gravity.db based on files backed up in /etc/pihole/migration_update. This is useful to restore a working version of the database when the user destroyed the original database. Also, update gravity.db to version 5 because of a fix we needed to implement. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-11-26 10:58:39 +01:00
Adam Warner
1fb70c977c
Merge pull request #3002 from pi-hole/tweak/output-format 
add a double space to the beginning of some outputs
 2019-11-25 19:41:58 +00:00
Adam Warner
eeb26e3975
Merge pull request #2990 from chrunchyjesus/unix-compliance 
make some shebangs comply to posix standard
 2019-11-16 12:26:49 +00:00
Adam Warner
12817c09bb
(Squashed commits) 
Always ensure we have the correct machine arch by storing to/reading from a file rather than depending on global variable that for some reason is not always populated...

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

no need for global variable

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Use a file in the temporary FTL download directory

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

Local binary variable named to l_binary. Disambiguate from global binary.

Allow 'binary' to be shadowed for testing.

Use ./ftlbinary in all operations.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

Revert shadow ability on binary variable.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

Remove unused tests, binary variable can not be overridden.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

This should work here, too

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

binary name is passed through from pihole checkout

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Add comments

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

OK, let's try it this way again

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

we might be getting somewhere.. squash after this I think!

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

This is a test to see if it fixes the aarch64 test (we are definitely squashing these commits

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

fix the rest of the tests

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Remove trailing whitespace in the files we've touched here

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-11-15 19:49:09 +00:00
Adam Warner
4840bdb031
add a double space to the beginning of some outputs 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-11-14 19:06:23 +00:00