3179 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Dan Schaper	423280cee1	Merge pull request #1817 from jjssoftware/development ... pihole.log permissions	2017-12-09 14:15:12 -08:00
Dan Schaper	8c0faa0b9a	Create .stickler.yml ... Initial stickler yaml file.	2017-12-09 14:08:54 -08:00
Keith Bentrup	45ab2a3d7a	send HTTP headers before HTML ... Signed-off-by: Keith Bentrup <keith@keithbentrup.com>	2017-12-09 17:03:20 -05:00
Dan Schaper	8804f5c423	Merge pull request #1825 from pi-hole/tweak/updatechecker ... Tweak update checker	2017-12-09 13:58:16 -08:00
Dan Schaper	1078aa499c	Merge pull request #1812 from pi-hole/fix/resolvconf ... Try dig +short if getent hosts fails when running gravity	2017-12-09 13:57:48 -08:00
DL6ER	05d015169c	Check for local version and branches every 10 minutes, check for remote versions only once a day ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-12-09 19:00:46 +01:00
Jacob Salmela	6c9e7586d5	Merge pull request #1818 from pi-hole/fix/debug ... Use systemctl or service commands in debug script	2017-12-08 19:57:37 -06:00
Jacob Salmela	28bed0041e	remove comment ... Signed-off-by: Jacob Salmela <github@decoy.email>	2017-12-08 18:29:28 -06:00
Jacob Salmela	6f03e30151	fixes #1537 by checking if systemctl is found ... Signed-off-by: Jacob Salmela <github@decoy.email>	2017-12-08 18:23:55 -06:00
Joe	6085d6ffd1	Merge pull request #1 from jjssoftware/jjssoftware-patch-1 ... Jjssoftware patch 1	2017-12-08 22:38:22 +00:00
Joe	6ecd93d0c9	pihole.log permissions ... This change makes pihole more friendly to the non-existence of the pihole.log file. This can help with systems that are configured to mount /var/log as a tmpfs volume. It may also help with systems where the pihole.log file is accidentally/unintentionally removed. Further discussion around the details of this change are in https://github.com/pi-hole/pi-hole/issues/1798	2017-12-08 22:25:01 +00:00
Dan Schaper	863ea7294f	Merge pull request #1815 from pi-hole/release/3.2 ... Merge Release 3.2 in to development. GitFlow	2017-12-08 13:06:18 -08:00
Jacob Salmela	af59824819	Merge pull request #1811 from bcambl/nmcli_check ... check NetworkManager status prior to using the cli (#1653)	2017-12-08 06:38:42 -06:00
Jacob Salmela	80e17ab721	potentially fixes #1806 by falling back to dig if getent fails ... Signed-off-by: Jacob Salmela <github@decoy.email>	2017-12-07 22:38:47 -06:00
bcambl	f89d69b081	check NetworkManager status prior to using the cli (#1653) ... Closes #1653 Signed-off-by: bcambl <blayne@blaynecampbell.com>	2017-12-07 21:43:14 -06:00
Jacob Salmela	5ba413569e	Merge pull request #1776 from pi-hole/release/3.2 ... Pi-hole core v3.2	2017-12-06 21:37:10 -06:00
Adam Warner	b3e969f000	Merge pull request #1797 from pi-hole/Ugh/Codacy ... Ugh/codacy	2017-12-07 00:49:59 +00:00
Adam Warner	a9a40ca46c	Useless cat. Consider 'cmd < file | ..' or 'cmd file | ..' instead. ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-12-06 23:27:40 +00:00
Adam Warner	79aada0b87	travis didn't like that ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-12-06 22:57:05 +00:00
Adam Warner	162a7b56fe	force mode is no longer referenced. Regression. Same with domToRemoveList ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-12-06 22:42:08 +00:00
Adam Warner	69dc22c10f	fix some codacy and intelliJ idea complaints ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-12-06 22:31:12 +00:00
Mcat12	9642cda949	Merge pull request #1792 from pi-hole/bugfix/lighttpdEnabled ... Add in an extra check to enable lighttpd.	2017-12-06 16:31:26 -05:00
Adam Warner	dd6a9a0b84	supress output of which command on centos/fedora as per https://github.com/pi-hole/pi-hole/pull/1776#discussion_r155156819 ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-12-06 15:28:58 +00:00
Adam Warner	945dcc6c2b	Indent two spaces as per https://github.com/pi-hole/pi-hole/pull/1776#discussion_r155157116 ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-12-06 15:17:31 +00:00
Adam Warner	f60791ac7c	Add dependencies as per https://github.com/pi-hole/pi-hole/pull/1776#discussion_r155149349 ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-12-06 14:42:01 +00:00
Adam Warner	b64155a165	Add in an extra check to enable lighttpd. ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-12-06 14:32:39 +00:00
Mcat12	472f7725c7	Merge pull request #1779 from pi-hole/new/locallists ... Add support for local blocking lists	2017-11-28 20:58:00 -05:00
Jacob Salmela	90f01b5fc4	Merge pull request #1780 from pi-hole/fix/spacepasswd ... Allow passwords with spaces	2017-11-23 23:42:54 -06:00
Jacob Salmela	20a2daa114	Merge branch 'release/3.2' into fix/spacepasswd	2017-11-23 23:11:17 -06:00
Jacob Salmela	9b6a2c7068	Merge pull request #1769 from pi-hole/tweak/readme ... Use GH Pages images & update wording	2017-11-23 23:07:16 -06:00
WaLLy3K	0a4d3ef6e6	Add "sudo bash" to installation instructions ... * Running as sudo/root prevents script from being re-downloaded, unintentionally side-stepping manual code review by end user Signed off by WaLLy3K <wally3k@pi-hole.net>	2017-11-23 13:35:51 +11:00
WaLLy3K	2dc1851892	Allow passwords with spaces ... e.g: `pihole -a -p "foo bar"` Signed off by WaLLy3K <wally3k@pi-hole.net>	2017-11-23 13:17:34 +11:00
Mcat12	8d721d086c	Modify indentation	2017-11-21 18:37:38 -05:00
DL6ER	6f0bb30def	Improve indentation ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-11-21 20:58:27 +01:00
DL6ER	c54f04ef4c	Repair username:password filtering ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-11-21 20:55:47 +01:00
DL6ER	eb83081a5c	Clarify error message: File could also have been of zero size ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-11-21 18:36:34 +01:00
DL6ER	8976930e20	Properly detect if local file was successfully downloaded ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-11-21 18:35:58 +01:00
DL6ER	164a81776e	Allow to add local lists to gravity using e.g. file:///path/to/my.list in adlists.list ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-11-21 18:30:40 +01:00
Loganaden Velvindron	9c8526db49	Add secondary quad9 server	2017-11-20 22:05:41 +04:00
WaLLy3K	d92f9b4dbd	Add separator between FAQ/Requests & Social Media ... This is to add emphasis that the first three options should be considered before the social media outlets. Signed off by WaLLy3K <wally3k@pi-hole.net>	2017-11-20 15:59:13 +11:00
Mcat12	1556163fb0	Merge pull request #1774 from mterron/patch-1 ... Add support for Quad9 secure dns server	2017-11-18 14:06:47 -05:00
Terror	616962200a	Update the list size to show all the options	2017-11-17 18:18:13 +13:00
Terror	eb9c44a347	Add support for Quad9 secure dns server ... See www.quad9.net	2017-11-17 15:54:04 +13:00
WaLLy3K	f36ac48de0	Use GH Pages images & update wording ... Signed off by WaLLy3K <wally3k@pi-hole.net>	2017-11-15 13:15:59 +11:00
Jacob Salmela	f63267a7f9	Merge pull request #1757 from Mausy5043/development ... Various small fixes	2017-11-11 16:45:16 -06:00
Jacob Salmela	9631519eb1	Merge pull request #1752 from pi-hole/new/bashupdatechecker ... Add bash / cron based update checker for Pi-hole	2017-11-08 20:38:40 -06:00
Jacob Salmela	557d076d2e	Merge pull request #1717 from pi-hole/tweak/readme ... Update README.md	2017-11-08 20:07:58 -06:00
Jacob Salmela	8a40c91d1a	made above the fold focus on the logo and Pi-holes features. fixed typos. wordsmithed ... Signed-off-by: Jacob Salmela <github@decoy.email>	2017-11-08 20:03:18 -06:00
DL6ER	90efa3b610	Simplify git subroutines ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-11-08 19:11:41 +01:00
mettacrawler	35dc4800e0	basic-install.sh - no CIDR in ifcfg-* ... Do not expect CIDR format IP addresses in /etc/sysconfig/network-scripts/ifcfg-* files as it is not a requirement. Expect only: IPADDR=10.10.10.10 Do not expect: IPADDR=10.10.10.10/24	2017-11-05 15:28:44 -05:00