a8af2e1837
Store domains without sorting and unifying them first. This allows us to preserve the relationship of the individual domains to the lists they came from.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-09-04 23:14:29 +02:00
ab90ff565a
Merge pull request #2903 from pi-hole/tweak/store-gravity-timestamp
...
Store timestamp when the gravity table was last updated successfully
2019-09-01 19:05:46 +02:00
ca8982494b
Store timestamp when the gravity table was last updated successfully. This fixes https://github.com/pi-hole/AdminLTE/issues/989
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-09-01 14:42:07 +02:00
a7b44426cd
Merge pull request #2838 from pi-hole/new/whitelist-regex-support
...
Whitelist regex support
2019-09-01 14:23:37 +02:00
95b2560a08
Merge pull request #2874 from snapsl/tweak/webpage-shellcheck
...
tweaked webpage.sh
2019-08-26 10:56:38 -04:00
6faddfcd3d
Print timestamps in local time zone of the Pi-hole.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-08-23 10:09:52 +02:00
1820c2c598
Merge branch 'development' into new/whitelist-regex-support
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-08-22 14:19:51 +02:00
23b688287f
Fix indentation in query.sh. No functional change in this commit.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-08-22 14:12:58 +02:00
42ccc1ef24
Add support for regex whitelist in "pihole -q".
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-08-22 14:06:42 +02:00
aef7892de6
Add missing hyphens.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-08-22 13:57:01 +02:00
cc40c18f49
Wrap upgrade script commands in a transaction.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-08-22 13:54:46 +02:00
b1838512b2
Explicitly select columns (and their order) when listing the databaes tables. Print timestamps translated to strings instead of printing the integer timestamps.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-08-22 13:39:58 +02:00
3e78ed95d4
Fix displaying options for table "group" in the debugger.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-08-17 15:04:04 +02:00
20a839fef5
fixed local declaration before assignment
...
Signed-off-by: snapsl <chris.baller@gmx.de >
2019-08-15 11:20:55 +02:00
b2d8c4374b
tweaked code style of webpage.sh
...
Signed-off-by: snapsl <chris.baller@gmx.de >
2019-08-14 23:28:13 +02:00
9f77810ca8
Merge pull request #2774 from pi-hole/meta/funding
...
Create FUNDING.yml
2019-08-12 10:30:33 -04:00
dc93462d42
Group table has only two columns
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-08-06 20:28:00 +02:00
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
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
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
06860ed5b4
Group tables have only two columns.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-08-05 21:07:39 +02:00
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
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
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
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
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
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
6f58d58cae
Add --whitewild to help texts and man pages.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-22 22:26:27 +02:00
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
0692be9bae
Fix small mistake in 2->3 upgrade script.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-22 20:59:52 +02:00
0d28dce326
Print group table contents in debug log.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-22 20:18:15 +02:00
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
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
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
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
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
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
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
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
1d5755a4c2
Add tests for valid_ip
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-07-10 21:18:58 -07:00
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
c156af020c
Use suggested array creation to fix linter error
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-07-10 19:52:17 -07:00
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
420f60b5c7
Add timeout to migration script (1->2).
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-10 12:02:07 +02:00
65fdbc85d5
Add timeout to migration script (2->3).
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-10 12:01:38 +02:00
87f75c737a
Review comments.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-10 12:00:38 +02:00
5ff9052200
Review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-09 11:41:44 +02:00
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
b154dd5f07
Quote calls to read FTL config
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-07-08 19:48:50 -07:00
0683842ec3
Fix typo in 2->3 migration script.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-08 21:43:49 +02:00
