3932 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mcat12	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
Mcat12	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
Mark Drobnak	92c3c86be4	Merge pull request #2769 from pi-hole/new/arp-flush ... Add new "pihole arpflush" command	2019-07-04 14:00:16 -04:00
Mark Drobnak	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
DL6ER	7a1b6fd205	Merge branch 'development' into new/gravity.db_domain_groups	2019-07-03 19:21:55 +02:00
DL6ER	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
MMotti	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
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>	2019-07-03 07:56:10 +02:00
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>	2019-07-01 09:44:20 +02:00
DL6ER	f91421418a	Rename adlists -> adlist table. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-30 23:21:10 +02:00
DL6ER	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
DL6ER	ad97e95f2f	Add required name column in group table. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-30 23:06:15 +02:00
DL6ER	5b01facd73	Fix logix on the views: AND ( OR ) ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-30 20:03:22 +02:00
DL6ER	6fe637b9ee	Rename groups -> group ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-30 19:43:18 +02:00
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>	2019-06-30 19:33:02 +02:00
Mark Drobnak	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
Mark Drobnak	b986c5585d	Merge pull request #2822 from akurth/development ... Fix pihole manpage to match code.	2019-06-30 13:11:20 -04:00
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>	2019-06-30 19:04:38 +02:00
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>	2019-06-30 08:02:51 +02:00
Mark Drobnak	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
Mark Drobnak	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
DL6ER	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
RamSet	b5af125be6	Removed line ... Signed-off-by: RamSet <RamSet@gmail.com>	2019-06-25 15:45:01 -06:00
RamSet	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
Mcat12	974bba4a45	Fix PKG_REMOVE array usage ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-06-17 16:30:26 -07:00
Mcat12	951732fc1b	Use an array for PKG_REMOVE ... Fixes shellcheck warning. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-06-17 16:28:55 -07:00
Mcat12	b6700924b2	Fix uninstall causing 403 errors and not removing packages ... The 403 lighttpd errors were caused by removing the lighttpd config directory and not removing lighttpd itself. This caused a subsequent Pi-hole reinstall to not have all of the required lighttpd config files. The error while removing packages was caused by combining arguments into a string instead of listing each argument. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-06-17 16:13:31 -07:00
DL6ER	5d43639e93	Merge branch 'development' into new/arp-flush	2019-06-16 20:21:03 +02:00
DL6ER	27e4208631	Merge branch 'development' into new/gravity.db_domain_groups	2019-06-16 20:20:27 +02:00
DL6ER	b505ad22e6	Merge pull request #2806 from pi-hole/fix/fedora-ci-tests ... Pin the Fedora test docker container to 29	2019-06-16 20:19:44 +02:00
Mcat12	d67122dffc	Pin the Fedora test docker container to 29 ... The tests are currently failing due to a change in Fedora 30, which we are not currently supporting. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-06-16 11:13:23 -07:00
DL6ER	0774c4e5ca	vw_gravity should actually filter using vw_whitelist. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-16 18:52:23 +02:00
DL6ER	01850c2128	Automatically recreate standard group after deletion to avoid violating foreign key constraints even if foreign key enforcing is disabled (SQLite's default behavior) ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-16 17:15:36 +02:00
DL6ER	cbc210b014	Add adlist_groups and mark group_id columns as NOT NULL. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-16 17:05:33 +02:00
DL6ER	c53ee4202b	Add filtering by domain groups to gravity database. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-16 16:50:51 +02:00
DL6ER	f2be12f97b	Merge pull request #2796 from pi-hole/tweak/opendns-ipv6 ... Use the filtered IPv6 OpenDNS servers	2019-06-16 14:56:00 +02:00
DL6ER	6996ffa451	Also flush network_addresses table ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-15 09:15:12 +02:00
DL6ER	435a5fb3ad	Add pihole arpflush to man page. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-15 09:12:44 +02:00
DL6ER	4947350ca5	Add arpflush to help and bash autocompletion ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-06-15 09:08:33 +02:00
DL6ER	c1495b0fa8	Merge branch 'development' into new/arp-flush	2019-06-15 09:04:30 +02:00
Mark Drobnak	67dda9c8bb	Merge pull request #2790 from mmotti/tidy/query ... Small changes to regexp querying	2019-06-13 20:32:42 -04:00
Mcat12	c8987e20c2	Use the filtered IPv6 OpenDNS servers ... The ones we were using previously were not filtered. See https://support.opendns.com/hc/en-us/articles/227986667-Does-OpenDNS-Support-IPv6- Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-06-12 19:13:29 -07:00
MMotti	bcf03647ef	Add comment and remove blankspace ... Signed-off-by: MMotti <matthew.w.motti@gmail.com>	2019-06-12 16:02:59 +01:00
MMotti	a9d0690f4d	Change the case of some variables ... Just for consistency Signed-off-by: MMotti <matthew.w.motti@gmail.com>	2019-06-10 18:50:52 +01:00
MMotti	10fbed50f3	Shellcheck ... Suggesting to use parameter expansion but we need to be able to identify the start of each line Signed-off-by: MMotti <matthew.w.motti@gmail.com>	2019-06-10 18:10:25 +01:00
MMotti	785f1fedd9	Tidy regexp queries ... Signed-off-by: MMotti <matthew.w.motti@gmail.com>	2019-06-10 17:52:58 +01:00
Mark Drobnak	b0c5dcf42f	Merge pull request #2780 from mmotti/fix/regexp_query ... Fix for regexp queries through pihole -q	2019-06-05 13:19:39 -04:00
MMotti	cf21efa103	Minor grammar changes ... Signed-off-by: MMotti <matthew.w.motti@gmail.com>	2019-06-05 14:36:43 +01:00
MMotti	7613e94ef6	Minor tweaks ... Mainly for consistency Signed-off-by: MMotti <matthew.w.motti@gmail.com>	2019-06-04 06:06:17 +01:00
MMotti	b49c702f33	Consistency tweak ... Signed-off-by: MMotti <matthew.w.motti@gmail.com>	2019-06-04 00:03:37 +01:00