DL6ER
5ff9052200
Review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
9641e268ea
Merge pull request #2837 from pi-hole/fix/debug-use-FTL-file-locations
...
Get file locations of FTL files from the config
5 years ago
Mcat12
b154dd5f07
Quote calls to read FTL config
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
DL6ER
0683842ec3
Fix typo in 2->3 migration script.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
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>
5 years ago
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>
5 years ago
DL6ER
3d3fc2947e
Review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
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>
5 years ago
DL6ER
8382f4d727
Rename table to domain_audit and simplify subroutine addAudit().
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
be3e198f9a
Address linting errors.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
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>
5 years ago
Mark Drobnak
5a6763f90d
Merge pull request #2833 from bcambl/fedora30_tests
...
Fedora 30 tests
5 years ago
bcambl
218476fab0
ensure installation dependencies for FTL tests which rely on /etc/init.d
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
5 years ago
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>
5 years ago
bcambl
c48b03584f
update Fedora Dockerfile to 30
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
5 years ago
DL6ER
efe8216445
Fix further stickler complaint.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
0405aaa3da
Review comments and fixing stickler complaints.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
Mark Drobnak
6bb213e56f
Merge pull request #2826 from Forceflow/development
...
Fix for 404 error when browsing to pi.hole (without /admin)
5 years ago
DL6ER
2fb4256f84
Rename table to "auditlist"
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
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>
5 years ago
DL6ER
5293beeb77
Update audit script to store domains in new database table.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
0c8f5f1221
Remove comment field from audit table
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
4f4a12bb40
Upgrade database if necessary and store audit domains therein.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
1dbe6c83c3
Add database upgrading mechanism for adding the audit table.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
Mcat12
2b5033e732
Add missing spaces found by linter
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
Mcat12
8d9ff550d4
Fix blockpage error if whitelisted, blacklisted, or regex filtered
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
Mcat12
f1733f9c5d
Fetch adlists for the block page from gravity.db
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
Mark Drobnak
92c3c86be4
Merge pull request #2769 from pi-hole/new/arp-flush
...
Add new "pihole arpflush" command
5 years ago
Mark Drobnak
ada8b53423
Merge pull request #2803 from pi-hole/new/gravity.db_domain_groups
...
Implement groups for lists
5 years ago
DL6ER
7a1b6fd205
Merge branch 'development' into new/gravity.db_domain_groups
5 years ago
DL6ER
b78cbb98d8
Merge pull request #2830 from mmotti/fix/regexp_query
...
Fix potential invalid result for pihole -q
5 years ago
MMotti
04abcb71f6
Fix potential invalid result for pihole -q
...
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
5 years ago
DL6ER
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>
5 years ago
Jeroen Baert
9fedafed15
Fix 404 error when browsing to pi.hole (without /admin) (for fedora)
...
Signed-off-by: Jeroen Baert <3607063+Forceflow@users.noreply.github.com>
5 years ago
DL6ER
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>
5 years ago
Jeroen Baert
7b2ac25a52
Fix for 404 error when browsing to pi.hole (without /admin)
...
Signed-off-by: Jeroen Baert <3607063+Forceflow@users.noreply.github.com>
5 years ago
DL6ER
f91421418a
Rename adlists -> adlist table.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
3a14e8b013
Check whitelist_by_group.group_id instead of group.enabled against NULL.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
ad97e95f2f
Add required name column in group table.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
5b01facd73
Fix logix on the views: AND ( OR )
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
6fe637b9ee
Rename groups -> group
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
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>
5 years ago
Mark Drobnak
c9a843b417
Merge pull request #2823 from pi-hole/fix/lighttpd-mime
...
Update with v4.3.1 changes
5 years ago
Mark Drobnak
b986c5585d
Merge pull request #2822 from akurth/development
...
Fix pihole manpage to match code.
5 years ago
DL6ER
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>
5 years ago
Andreas Kurth
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>
5 years ago
Mark Drobnak
1a741f696e
Merge pull request #2816 from RamSet/hotfix/lighttpdMime
...
Fix lighttpd mime
5 years ago
Mcat12
37e7cd5211
Fix ShellCheck issue by refactoring a bit
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
Mcat12
91a2d052a7
Fix pihole -up showing FTL update when network is down
...
Fixes #1877
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
Mark Drobnak
06134d3ffc
Merge pull request #2817 from pi-hole/tweak/gravity_db_timeout
...
Add timeout to sqlite3 command
5 years ago