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
e27f50b8e5
Try to obtain PID from PIDFILE. If this fails (file does not exist or is empty), fall back to using pidof + awk
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-08-21 04:38:58 -07:00
484f618685
Use last PID in case pidof returns multiple PIDs for pihole-FTL
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-08-21 04:38:55 -07:00
d3d45a8776
Fix 404 error when browsing to pi.hole (without /admin) (for fedora)
...
Signed-off-by: Jeroen Baert <3607063+Forceflow@users.noreply.github.com >
2019-08-20 11:29:20 -07:00
9f86fd0cb4
Fix for 404 error when browsing to pi.hole (without /admin)
...
Signed-off-by: Jeroen Baert <3607063+Forceflow@users.noreply.github.com >
2019-08-20 11:29:17 -07: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
dc93462d42
Group table has only two columns
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-08-06 20:28:00 +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
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
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
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
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
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
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
3d3fc2947e
Review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-08 19:22:35 +02:00
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
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
be3e198f9a
Address linting errors.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-07 10:46:20 +02:00
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
efe8216445
Fix further stickler complaint.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-06 09:45:07 +02:00
0405aaa3da
Review comments and fixing stickler complaints.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-06 09:32:41 +02:00
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
2fb4256f84
Rename table to "auditlist"
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-05 16:28:36 +02:00
82476138c1
Instead of calling sqlite3 multiple times within a loop, we use the ability to add multiple rows within one INSERT clause. This is supported since sqlite3 3.7.11 (2012-03-20) and should be available on all systems.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-05 16:09:13 +02:00
5293beeb77
Update audit script to store domains in new database table.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-05 14:10:33 +02:00
0c8f5f1221
Remove comment field from audit table
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-05 14:06:05 +02:00
4f4a12bb40
Upgrade database if necessary and store audit domains therein.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-05 14:03:57 +02:00
1dbe6c83c3
Add database upgrading mechanism for adding the audit table.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-05 13:54:18 +02:00
2b5033e732
Add missing spaces found by linter
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-07-04 13:49:39 -07:00
8d9ff550d4
Fix blockpage error if whitelisted, blacklisted, or regex filtered
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-07-04 13:44:14 -07:00
f1733f9c5d
Fetch adlists for the block page from gravity.db
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-07-04 13:11:46 -07:00
92c3c86be4
Merge pull request #2769 from pi-hole/new/arp-flush
...
Add new "pihole arpflush" command
2019-07-04 14:00:16 -04:00
7a1b6fd205
Merge branch 'development' into new/gravity.db_domain_groups
2019-07-03 19:21:55 +02:00
04abcb71f6
Fix potential invalid result for pihole -q
...
Signed-off-by: MMotti <matthew.w.motti@gmail.com >
2019-07-03 13:04:57 +01:00
1fe3507bc5
Adlists table was renamed to Adlist. Adapt further places in the code to match the new name.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-03 07:56:10 +02:00
DL6ER