3875 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
MMotti	97df6d7415	Stickler fix ... Signed-off-by: MMotti <matthew.w.motti@gmail.com>	2019-06-03 19:56:10 +01:00
MMotti	54bfaa28c1	Fix for regexp queries through pihole -q ... Taking inspiration from: https://github.com/pi-hole/pi-hole/pull/2346 We will use awk to iterate through each regexp and print any that match the domain query. Signed-off-by: MMotti <matthew.w.motti@gmail.com>	2019-06-03 19:32:59 +01:00
Mark Drobnak	afd28fab03	Merge pull request #2767 from pi-hole/fix/multiple_pihole-FTL_PIDs ... Improve PID detection in pihole-FTL.service	2019-06-01 01:03:55 -04:00
Mark Drobnak	d92ced6fb6	Merge pull request #2734 from pi-hole/fix/query_black_and_whitelists_database ... Query black and whitelists database	2019-06-01 00:55:05 -04:00
DL6ER	ae98fde321	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-05-31 09:18:12 +02:00
DL6ER	44f8fcb600	We can print the table name without any extra check as we already returned early in case there are no results. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-31 08:39:18 +02:00
Mark Drobnak	814fdcf9b6	Merge pull request #2768 from pi-hole/fix/dhcp-ignore-names ... Add dhcp-ignore-names option when enabling DHCP service	2019-05-30 22:35:52 -04:00
DL6ER	5060605626	Print table name before entering the loop for the sake of simplicity ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-30 21:44:59 +02:00
DL6ER	453ba14cbd	Merge pull request #2758 from pi-hole/fix/debug-log-gravity-database ... Update debug script with gravity DB changes	2019-05-30 21:37:49 +02:00
DL6ER	c5df104a66	Add dhcp-ignore-names option when enabling DHCP service. We currently remove anything that starts with "dhcp-" to have a clean configuration and removed these lines without noticing when enabling the DHCP server. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-30 16:41:37 +02:00
DL6ER	f6213d4f4d	Use last PID in case pidof returns multiple PIDs for pihole-FTL ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-30 15:26:27 +02:00
Mark Drobnak	ca2ea388b7	Merge pull request #2763 from chrisys/development ... Handle an empty local.list	2019-05-27 16:06:25 -04:00
Chris Crocker-White	69dba022c4	Handle an empty local.list ... Handle the case of an empty local.list file which would otherwise prevent the system from starting Change-type: patch Signed-off-by: Chris Crocker-White <chriscw@balena.io>	2019-05-27 10:27:28 -07:00
Mcat12	bfb99c361c	Note that the gravity size does not include the blacklist entries ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-05-21 17:12:47 -07:00
Mcat12	5796054305	Increase ID column width to 4 ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-05-20 21:59:18 -07:00
Mcat12	a3e1473ac1	Set explicit column widths to prevent text from getting cut off ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-05-20 21:33:09 -07:00
Mcat12	7b5fc60e00	Improve table formatting ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-05-20 21:20:38 -07:00
Mcat12	807ce0af4e	Show whitelist, blacklist, and regexlist details ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-05-20 21:15:22 -07:00
Mcat12	3f05efd60f	Add extra newline ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-05-20 21:02:31 -07:00
Mcat12	03d93aa19a	Update debug script with gravity DB changes ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-05-20 20:58:57 -07:00
DL6ER	cad9386ff6	Merge pull request #2750 from pi-hole/release/v4.3 ... Update Dev with v4.3 fixes	2019-05-19 19:42:29 +02:00
Dan Schaper	7de6bbca61	Merge branch 'development' into release/v4.3	2019-05-18 13:18:14 -07:00
Mark Drobnak	c8d32e0dd3	Merge pull request #2743 from haguenau/fix/shellcheck-install-script ... Clean up basic install script	2019-05-16 23:22:01 -04:00
David Haguenauer	be3a21ae07	Put quotes at ends of strings ... Signed-off-by: David Haguenauer <ml@kurokatta.org>	2019-05-14 15:20:28 -04:00
David Haguenauer	69081a9175	Drop indirection from install_dependent_packages ... Previously, install_dependent_packages would receive an array variable name as its single parameter, and would use variable indirection to access it; this change simplifies that function so that it instead receives the expanded array. Signed-off-by: David Haguenauer <ml@kurokatta.org>	2019-05-14 15:20:28 -04:00
David Haguenauer	ab2f8a0c09	Quote variables in basic-install.sh ... This greatly reduces the number of warnings emitted by ShellCheck, and in turn should make it more likely that errors are caught in the future. Signed-off-by: David Haguenauer <ml@kurokatta.org>	2019-05-14 15:20:28 -04:00
Mark Drobnak	b961a501bb	Merge pull request #2611 from pi-hole/new/gravitydb ... Store blocking domains in a database	2019-05-12 18:46:47 -04:00
Mcat12	8e1bf6e3d4	Merge branch 'development' into new/gravitydb ... # Conflicts: # advanced/Scripts/list.sh # gravity.sh # pihole	2019-05-12 15:20:52 -07:00
Mark Drobnak	d6756eb46b	Merge pull request #2730 from pvogt09/development ... Adds world readable attribute to files created by Pi-hole to circumve…	2019-05-12 15:44:20 -04:00
pvogt09	efbd42f7b5	Moves creation of pihole user before FTL installation ... Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>	2019-05-12 11:27:25 +02:00
pvogt09	3f90261520	Moves chmod after every creation of ${destination} instead of end of function ... Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>	2019-05-12 11:25:48 +02:00
Mark Drobnak	ff5894d772	Merge pull request #2744 from pi-hole/fix/cron-job-errors-untagged ... Fix for preventing git error message in cron logs	2019-05-11 22:59:32 -04:00
pvogt09	225285cb97	Removes chmod for ${source} and superfluous chmod for ${destination} ... Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>	2019-05-11 11:14:07 +02:00
mpiederiet	3220e2b978	Fix for preventing git error message in cron logs ... Fix to prevent "fatal: No names found, cannot describe anything" git message during scheduled update checks Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-11 10:57:44 +02:00
DL6ER	54ae458b61	Merge pull request #2733 from pi-hole/fix/debug-curl ... Pi-hole Debug - tricorder upload function calls	2019-05-11 10:54:30 +02:00
pvogt09	e076db5a4e	Changes ownership of macvendor.db to pihole ... Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>	2019-05-10 11:19:28 +02:00
pvogt09	a3d2a1062f	Makes blocklists world readable ... Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>	2019-05-10 11:13:19 +02:00
pvogt09	2e6198077d	chmod 644 adlists.list ... Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>	2019-05-09 12:23:44 +02:00
Mark Drobnak	55ab3b2dc7	Merge pull request #2739 from pi-hole/new/stickermule_reflink ... README StickerMule URL	2019-05-07 23:26:20 -04:00
Mark Drobnak	bdc8cf2bc8	Merge pull request #2738 from pi-hole/fix/untagged_version_fresh_install ... Fix Untagged display on new installs	2019-05-07 23:25:33 -04:00
Dan Schaper	74836bebe4	README StickerMule URL ... Change StickerMule reflink to Team Pi-hole link.	2019-05-07 11:10:51 -07:00
DL6ER	95150a5d85	Clone twenty instead of only one commit when installing Pi-hole. This ensures that we clone at least one tagged commit in case we need to push changes to master. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-07 19:42:11 +02:00
pvogt09	4d23b3267f	Adds X to chmod for git operations ... Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>	2019-05-07 10:46:16 +02:00
pvogt09	e19adccd9c	Moves chmod for /var/www/html into INSTALL_WEB_SERVER block ... Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>	2019-05-05 22:34:13 +02:00
pvogt09	a25f331e83	Adds chmod 644 for /var/www and /var/www/html ... Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>	2019-05-05 09:20:49 +02:00
pvogt09	69c06ba6fe	Sets permissions for dnsmaq.conf ... Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>	2019-05-05 00:32:10 +02:00
DL6ER	8abeb2204b	Merge pull request #2735 from pi-hole/fix/gravity-blocked-domain ... Fix incorrect adlist query when an adlist is blocked during gravity	2019-05-04 23:14:49 +02:00
Mcat12	ec06fd0ad4	Fix incorrect adlist query when an adlist is blocked during gravity ... hosts-file.net was hard-coded as the domain to check instead of the actual domain. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-05-04 11:35:21 -07:00
DL6ER	a904c183df	Use printf to escape domain content. This prevents possible SQL injection issues ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-04 18:25:11 +02:00
DL6ER	5246b3e496	Explicitly escape backslash in ESCAPE clause. This has been suggested by Stickler bot. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-05-04 13:24:36 +02:00