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
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
5a6763f90d
Merge pull request #2833 from bcambl/fedora30_tests
...
Fedora 30 tests
2019-07-06 19:27:02 -04:00
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
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
c48b03584f
update Fedora Dockerfile to 30
...
Signed-off-by: bcambl <blayne@blaynecampbell.com >
2019-07-06 10:57:57 -06: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
ada8b53423
Merge pull request #2803 from pi-hole/new/gravity.db_domain_groups
...
Implement groups for lists
2019-07-04 13:52:52 -04:00
7a1b6fd205
Merge branch 'development' into new/gravity.db_domain_groups
2019-07-03 19:21:55 +02:00
b78cbb98d8
Merge pull request #2830 from mmotti/fix/regexp_query
...
Fix potential invalid result for pihole -q
2019-07-03 19:16:04 +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
9fedafed15
Fix 404 error when browsing to pi.hole (without /admin) (for fedora)
...
Signed-off-by: Jeroen Baert <3607063+Forceflow@users.noreply.github.com >
2019-07-03 04:28:44 +02:00
23b3a9a650
Add DISTINCT to the view\'s SELECT queries to avoid domain duplication in case they are enabled in multiple groups at the same time.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-01 09:44:20 +02:00
7b2ac25a52
Fix for 404 error when browsing to pi.hole (without /admin)
...
Signed-off-by: Jeroen Baert <3607063+Forceflow@users.noreply.github.com >
2019-07-01 03:42:02 +02:00
f91421418a
Rename adlists -> adlist table.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-06-30 23:21:10 +02:00
3a14e8b013
Check whitelist_by_group.group_id instead of group.enabled against NULL.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-06-30 23:20:13 +02:00
ad97e95f2f
Add required name column in group table.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-06-30 23:06:15 +02:00
5b01facd73
Fix logix on the views: AND ( OR )
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-06-30 20:03:22 +02:00
6fe637b9ee
Rename groups -> group
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-06-30 19:43:18 +02:00
94d83dbb2d
Unify the two group tables into a single "groups" table. This allows managing adlists and domains together.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-06-30 19:33:02 +02:00
c9a843b417
Merge pull request #2823 from pi-hole/fix/lighttpd-mime
...
Update with v4.3.1 changes
2019-06-30 13:27:55 -04:00
b986c5585d
Merge pull request #2822 from akurth/development
...
Fix pihole manpage to match code.
2019-06-30 13:11:20 -04:00
87c115fc86
Change implementation to use linking tables (domain_groups, adlists_groups). This allows adding domains to multiple lists conveniently.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-06-30 19:04:38 +02:00
acee97916e
Fix pihole manpage to match code.
...
The dry-run argument to pihole -up is "--check-only", not "--checkonly".
Signed-off-by: Andreas Kurth <github@akurth.de >
2019-06-30 08:02:51 +02:00
1a741f696e
Merge pull request #2816 from RamSet/hotfix/lighttpdMime
...
Fix lighttpd mime
2019-06-29 15:45:33 -04:00
37e7cd5211
Fix ShellCheck issue by refactoring a bit
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-06-28 21:19:07 -07:00
91a2d052a7
Fix pihole -up showing FTL update when network is down
...
Fixes #1877
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-06-28 20:49:56 -07:00
06134d3ffc
Merge pull request #2817 from pi-hole/tweak/gravity_db_timeout
...
Add timeout to sqlite3 command
2019-06-27 17:34:34 -04:00
092957c14a
Merge pull request #2808 from pi-hole/fix/uninstall
...
Fix uninstall causing 403 errors and not removing packages
2019-06-27 12:51:07 -04:00
d5e8f1a781
Add 10 seconds timeout to the sqlite3 command that writes tables to the gravity database. This prevents gravity from failing when the database file is locked for a short time.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-06-26 18:20:36 +02:00
b5af125be6
Removed line
...
Signed-off-by: RamSet <RamSet@gmail.com >
2019-06-25 15:45:01 -06:00
ecc49318f0
Fixed MIME related issue present in lighttpd/1.4.53
...
Signed-off-by: RamSet <RamSet@gmail.com >
2019-06-25 15:45:01 -06:00
