Commit Graph

3319 Commits

Author SHA1 Message Date
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
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
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
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
5ba413569e Merge pull request #1776 from pi-hole/release/3.2
Pi-hole core v3.2
v3.2
2017-12-06 21:37:10 -06:00
b3e969f000 Merge pull request #1797 from pi-hole/Ugh/Codacy
Ugh/codacy
2017-12-07 00:49:59 +00:00
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
79aada0b87 travis didn't like that
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 22:57:05 +00:00
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
69dc22c10f fix some codacy and intelliJ idea complaints
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 22:31:12 +00:00
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
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
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
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
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
472f7725c7 Merge pull request #1779 from pi-hole/new/locallists
Add support for local blocking lists
2017-11-28 20:58:00 -05:00
90f01b5fc4 Merge pull request #1780 from pi-hole/fix/spacepasswd
Allow passwords with spaces
2017-11-23 23:42:54 -06:00
20a2daa114 Merge branch 'release/3.2' into fix/spacepasswd 2017-11-23 23:11:17 -06:00
9b6a2c7068 Merge pull request #1769 from pi-hole/tweak/readme
Use GH Pages images & update wording
2017-11-23 23:07:16 -06:00
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
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
8d721d086c Modify indentation 2017-11-21 18:37:38 -05:00
6f0bb30def Improve indentation
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-11-21 20:58:27 +01:00
c54f04ef4c Repair username:password filtering
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-11-21 20:55:47 +01:00
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
8976930e20 Properly detect if local file was successfully downloaded
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-11-21 18:35:58 +01:00
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
9c8526db49 Add secondary quad9 server 2017-11-20 22:05:41 +04:00
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
1556163fb0 Merge pull request #1774 from mterron/patch-1
Add support for Quad9 secure dns server
2017-11-18 14:06:47 -05:00
616962200a Update the list size to show all the options 2017-11-17 18:18:13 +13:00
eb9c44a347 Add support for Quad9 secure dns server
See www.quad9.net
2017-11-17 15:54:04 +13:00
f36ac48de0 Use GH Pages images & update wording
Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-11-15 13:15:59 +11:00
f63267a7f9 Merge pull request #1757 from Mausy5043/development
Various small fixes
2017-11-11 16:45:16 -06:00
2c8dcd86e5 remove package_check to avoid situations like #1760
Signed-off-by: Adam Warner <adamw@rner.email>
2017-11-09 20:47:15 +00:00
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
557d076d2e Merge pull request #1717 from pi-hole/tweak/readme
Update README.md
2017-11-08 20:07:58 -06:00
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
90efa3b610 Simplify git subroutines
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-11-08 19:11:41 +01:00
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
ec4e4d3b72 fix indentation 2017-11-05 11:02:04 +01:00
63312ac4b8 removed duplicate word 2017-11-05 10:18:39 +01:00
d158a7d51e spelling corrected 2017-11-05 10:16:56 +01:00
209a2ab3ec grammar corrected (double negative) 2017-11-05 10:05:25 +01:00
009fa2f1b7 Hide password textbox if there is no password 2017-11-01 21:30:14 -04:00
5221767a70 Merge pull request #1735 from bcambl/debug_selinux
add SELinux checks to debug script
2017-10-30 13:07:36 +00:00
9492ff26c6 Merge pull request #1747 from pi-hole/tweak/gravity_update_time
Randomize gravity update time
2017-10-29 16:34:18 +01:00
06764d0f36 Randomize gravity update time between 03:01 - 04:58 (excluding 04:00)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-29 15:37:39 +01:00
0db76aada0 Silence errors when directory to be checked does not exist (system may have been installed without a web interface!)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-28 15:44:17 +02:00
7362416afb Force an update of the updatechecker after update/install
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-28 15:40:48 +02:00