Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-27 07:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity
4394 commits 10 branches 109 tags 28 MiB
Commit graph

4394 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mark Drobnak
9f77810ca8
Merge pull request #2774 from pi-hole/meta/funding 
Create FUNDING.yml
 2019-08-12 10:30:33 -04:00
DL6ER
dc93462d42
Group table has only two columns 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-06 20:28:00 +02:00
DL6ER
4371c9ba03
Ensure proper permissions are set for gravity.db after creation. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-05 21:20:07 +02:00
DL6ER
6e2e825a5f
Rename options "pihole --whiteregex" to "pihole --white-regex" for the sake of readability. The same applied for "whitewild" -> "white-wild" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-05 21:10:52 +02:00
DL6ER
af754e3fc4
Rearrange group tables directly next to the tables they refer to. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-05 21:08:36 +02:00
DL6ER
06860ed5b4
Group tables have only two columns. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-05 21:07:39 +02:00
DL6ER
09190c1735
Only check once for if this is a regex list or not. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-05 21:03:47 +02:00
DL6ER
a95b473417
Rearranage if statements to ensure the proper output is shown for wildcard-style filters. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-05 20:56:01 +02:00
Mark Drobnak
56e3565a9e
Merge pull request #2865 from ryrun/patch-1 
quick fix for when dig also returns a CNAME
 2019-08-05 10:58:27 -04:00
Andreas
63230cb72d
quick fix for when dig also returns a CNAME 
Signed-off-by: ryrun <ryrun@online.de>
 2019-08-04 21:21:08 +02:00
Mark Drobnak
f81e57d5b8
Merge pull request #2862 from bolausson/mybranch 
Check if TTY exist before we get screen size - Second PR try
 2019-07-30 14:58:56 -04:00
B. Olausson
ecd6817aaf
This change fixes issue #145 "stty: standard input: Inappropriate ioctl for device ".It checks if a real terminal exist, if not it sets the screen size to a fixed value. This helps to avoid nasty and unnecessary logs when running "pihole -up" via e.g. cron. 
Signed-off-by: B. Olausson <contactme@olausson.de>
 2019-07-29 19:48:56 +01:00
DL6ER
6f58d58cae
Add --whitewild to help texts and man pages. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-22 22:26:27 +02:00
DL6ER
40d0caa70b
Add undocumented --whitewild option that does the same --wild does for the whitelist. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-22 21:15:28 +02:00
DL6ER
0692be9bae
Fix small mistake in 2->3 upgrade script. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-22 20:59:52 +02:00
DL6ER
0d28dce326
Print group table contents in debug log. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-22 20:18:15 +02:00
DL6ER
96031214c6
Add support for whitelist regex filter management via CLI. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-22 19:36:11 +02:00
Mark Drobnak
3420439f31
Merge pull request #2820 from pi-hole/fix/ftl-update-no-network 
Fix pihole -up showing FTL update when network is down
 2019-07-20 14:55:48 -04:00
Mark Drobnak
ab3f6dfcc6
Merge pull request #2831 from pi-hole/fix/block-page-adlists 
Fix block page errors due to gravity DB and changes to queryAds
 2019-07-20 14:55:37 -04:00
Mcat12
3ebd43ebf0
Remove outdated adlists.list check and fix empty adlists error message 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-19 17:39:00 -07:00
Mcat12
38ff343134
Print an error message if the FTL release metadata download fails 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-19 17:35:21 -07:00
Mark Drobnak
6a8d3100d2
Merge pull request #2846 from pi-hole/fix/zeus-dead-adlist 
Remove the ZeusTracker blocklist from the defaults
 2019-07-18 13:43:57 -04:00
Mcat12
c3ec2e68ad
Remove the ZeusTracker blocklist from the defaults 
It is no longer served. Fixes #2843.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-12 20:03:36 -07:00
Mark Drobnak
bfe714e985
Merge pull request #2840 from pi-hole/fix/valid_ip-quote-error 
Fix error when checking if IP address is valid
 2019-07-11 23:06:39 -04:00
Mcat12
1d5755a4c2
Add tests for valid_ip 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-10 21:18:58 -07:00
Mark Drobnak
445127accc
Merge pull request #2832 from pi-hole/new/audit_database 
Migrate audit list to gravity.db database table
 2019-07-10 22:55:48 -04:00
Mcat12
c156af020c
Use suggested array creation to fix linter error 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-10 19:52:17 -07:00
Mark Drobnak
fa8751f9ad
Fix error when checking if IP address is valid 
During install in `valid_ip`, we split up the IP address into octets to verify it is valid (each is <= 255).

This validation was broken in #2743 when a variable usage was quoted where it should have stayed unquoted:
```
./automated install/basic-install.sh: line 942: [[: 192.241.211.120: syntax error: invalid arithmetic operator (error token is ".241.211.120")
```

Due to this error, `127.0.0.1` would be used instead of the requested IP address. Also, this prevented the user from entering a custom DNS server as it would be marked as an invalid IP address.

Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
 2019-07-10 19:42:51 -07:00
DL6ER
420f60b5c7
Add timeout to migration script (1->2). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-10 12:02:07 +02:00
DL6ER
65fdbc85d5
Add timeout to migration script (2->3). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-10 12:01:38 +02:00
DL6ER
87f75c737a
Review comments. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-10 12:00:38 +02:00
DL6ER
5ff9052200
Review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-09 11:41:44 +02:00
DL6ER
9641e268ea
Merge pull request #2837 from pi-hole/fix/debug-use-FTL-file-locations 
Get file locations of FTL files from the config
 2019-07-09 07:54:57 +02:00
Mcat12
b154dd5f07
Quote calls to read FTL config 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-08 19:48:50 -07:00
DL6ER
0683842ec3
Fix typo in 2->3 migration script. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-08 21:43:49 +02:00
DL6ER
f5121c64be
We should still add the regex lines (initially) to the regex table as the renaming will happen only after the importing. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-08 21:39:30 +02:00
DL6ER
054c7a2c05
Create new table + view regex_whitelist + rename old regex table to regex_blacklist. This updates the gravity.db version to 3. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-08 21:35:31 +02:00
DL6ER
3d3fc2947e
Review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-08 19:22:35 +02:00
Mcat12
e8e5d4afda
Get file locations of FTL files from the config 
Instead of hardcoding the location of certain FTL files (`gravity.db`,
`pihole-FTL.log`), read the configured location from FTL's config. The
default location is used if no custom location has been configured.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-07 18:10:39 -07:00
DL6ER
8382f4d727
Rename table to domain_audit and simplify subroutine addAudit(). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-07 21:21:56 +02:00
DL6ER
be3e198f9a
Address linting errors. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-07 10:46:20 +02:00
DL6ER
acc50b709e
Only migrate files once (domain and adlist lists druing initial creation of gravity.db auditlog.list on database upgrade from version 1 to 2. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-07 10:33:08 +02:00
Mark Drobnak
5a6763f90d
Merge pull request #2833 from bcambl/fedora30_tests 
Fedora 30 tests
 2019-07-06 19:27:02 -04:00
bcambl
218476fab0 ensure installation dependencies for FTL tests which rely on /etc/init.d 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2019-07-06 11:06:08 -06:00
bcambl
ec850dc820 add chkconfig to INSTALLER_DEPS (CentOS/Fedora) 
chkconfig is a dependency of spawn-fcgi which is a dependency of lighttpd which is installed via PIHOLE_WEB_DEPS in phase 2
adding chkconfig to INSTALLER_DEPS to ensure /etc/init.d is present during the installation prompts (phase 1)

Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2019-07-06 10:58:19 -06:00
bcambl
c48b03584f update Fedora Dockerfile to 30 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2019-07-06 10:57:57 -06:00
DL6ER
efe8216445
Fix further stickler complaint. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-06 09:45:07 +02:00
DL6ER
0405aaa3da
Review comments and fixing stickler complaints. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-06 09:32:41 +02:00
Mark Drobnak
6bb213e56f
Merge pull request #2826 from Forceflow/development 
Fix for 404 error when browsing to pi.hole (without /admin)
 2019-07-05 17:18:50 -04:00
DL6ER
2fb4256f84
Rename table to "auditlist" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-05 16:28:36 +02:00