5907 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Dan Schaper	538ba918c1	Merge pull request #2490 from sadsfae/add_blog_guide_hobohouse ... Add hobohouse blog/guide to coverage links.	2018-11-02 13:00:24 -07:00
Will Foster	c330df9700	Add hobohouse blog/guide to coverage links. ... This is a link to an updated guide on setting up Pi-hole on Raspberry Pi. It also covers using the Tomato router firmware and running things in a docker container along with some tips, blocklist recommendations and usage. Signed-off-by: Will Foster <sadsfae@funcamp.net>	2018-11-02 19:50:39 +00:00
Mark Drobnak	1789a2db29	Merge pull request #2384 from pi-hole/feature/install-privacy-level ... Set FTL Privacy Level During Install	2018-11-01 15:16:11 -04:00
Dan Schaper	c270b83341	Use printf instead of echo ... Co-Authored-By: Mcat12 <mark.drobnak@gmail.com>	2018-11-01 15:14:26 -04:00
Dan Schaper	02f0788033	Moved command -v calls to function. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-11-01 12:00:08 -07:00
Dan Schaper	a2ea6e8d47	Merge pull request #2486 from pi-hole/feature/install_printf ... Beginning steps to installer overhaul. Echos to Printf test.	2018-11-01 10:16:57 -07:00
Dan Schaper	a986f53134	Merge pull request #2436 from pi-hole/fix/password-read-error ... Fix error when reading in new password	2018-11-01 07:05:27 -07:00
Dan Schaper	9d2d45b473	Query php directly for major and minor version id strings. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-11-01 05:59:14 -07:00
Dan Schaper	0c892e6b3a	Addressed Stickler ShellCheck lints ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-10-31 14:35:55 -07:00
Dan Schaper	a0fc38d6a2	All terminal echo commands changed to printf. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-10-31 11:14:05 -07:00
Mcat12	28cbf45d1d	Add explanatory comment for include_shell ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-10-30 21:52:42 -04:00
Dan Schaper	72829be281	Remove shellcheck overrides ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-10-26 12:14:10 -07:00
Adam Warner	d57f9906bd	read -r -a, not read -a -r ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-10-26 19:24:43 +01:00
Adam Warner	3d4fea6510	Move -r to before the -p ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-10-26 19:17:49 +01:00
Adam Warner	f670644954	Revert "lighttpd conf enhancements"	2018-10-26 19:12:11 +01:00
Mark Drobnak	dd6821814a	Merge pull request #2479 from pi-hole/fix/referral-readme ... update broken link, add coverage, and fix formatting	2018-10-25 17:09:30 -04:00
Jacob Salmela	f33584511c	update broken link, add coverage, and fix formatting ... Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>	2018-10-25 05:58:17 -05:00
bcambl	3ec84553ef	fix debug service check via sysvinit ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	2018-10-24 10:06:11 -06:00
Mark Drobnak	a301d4381f	Merge pull request #2472 from pi-hole/fix-webpwexpansion ... Prevent BASH from expanding Web Password	2018-10-22 22:18:32 -04:00
Mark Drobnak	49b8ad7e94	Merge pull request #2470 from jeremysherriff/patch-1 ... Silence updateGravity cron job unless errors occur	2018-10-21 14:04:39 -04:00
WaLLy3K	180d29c7b3	Prevent BASH from expanding Web Password ... * Resolves issue #2471 Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	2018-10-21 11:08:22 +11:00
Mark Drobnak	a23ba91681	Merge pull request #2468 from gstrauss/lighttpd-conf-enhancements ... lighttpd conf enhancements	2018-10-20 16:43:03 -04:00
jeremysherriff	d986da63a5	Pass gravity exit code back to caller to allow for cron error handling ... Signed-off-by: jeremysherriff <jeremysherriff@gmail.com>	2018-10-19 19:10:37 +13:00
jeremysherriff	d3ac8bb6f8	Silence updateGravity job unless errors occur ... No need for append/logrotate as we are only interested in the latest output Signed-off-by: jeremysherriff <jeremysherriff@gmail.com>	2018-10-19 19:10:13 +13:00
Mark Drobnak	f87f3b9199	Merge pull request #2467 from pi-hole/fix/dnsmasq-license ... Update dnsmasq config license	2018-10-17 11:56:41 -04:00
Glenn Strauss	67bdcbcf19	lighttpd: slightly more efficient sample config ... Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>	2018-10-17 06:54:54 -04:00
Glenn Strauss	69b2a5a876	lighttpd: use file glob for optional external.conf ... lighttpd 1.4.50 config parse will error if include_shell exits non-zero and pi-hole sample config: include_shell "cat external.conf 2>/dev/null" is an error if external.conf does not exist Replace with: include "external*.conf" file glob supported since lighttpd 1.4.40 and is not an error if there is no file which matches the file glob Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>	2018-10-17 06:54:43 -04:00
Mark Drobnak	a79dff3d98	Merge pull request #2466 from pi-hole/readme-newcoverage ... Update coverage links	2018-10-16 22:42:34 -04:00
Dan Schaper	c859a23136	Merge pull request #2462 from pi-hole/fix/updatecheck-curl-silent ... Use curl -s instead of -q	2018-10-16 18:46:45 -07:00
WaLLy3K	7f92671765	Update dnsmasq config license ... * Also updated "separate config" text Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	2018-10-17 11:01:28 +11:00
WaLLy3K	ec38105b08	Update coverage links ... Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	2018-10-17 10:46:56 +11:00
Mark Drobnak	85dceb12a1	Use curl -s instead of -q ... See #2416 Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>	2018-10-12 23:53:21 -04:00
Mark Drobnak	5126c37c1e	Merge pull request #2460 from bcambl/fix_create_pihole_user ... fix pihole user creation function	2018-10-12 22:47:56 -04:00
bcambl	e7e03e36de	fix pihole user creation function ... - fix stdout newlines - catch failed user creation Signed-off-by: bcambl <blayne@blaynecampbell.com>	2018-10-12 11:05:44 -06:00
Mark Drobnak	13c393fc9d	Merge pull request #2451 from pi-hole/fix/2450 ... fix for #2450	2018-10-07 21:02:39 -04:00
Adam Warner	cc2f375b13	fix for #2450 ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-10-07 11:51:36 +01:00
Mark Drobnak	49d5109c96	Merge pull request #2446 from AndreasElia/development ... Readme grammar fixes	2018-10-02 21:59:35 -04:00
Andreas Elia	e5c8f5e2fa	Readme grammar fixes ... Signed-off-by: Andreas Elia <andreaselia@live.co.uk>	2018-10-02 17:43:13 +01:00
Mark Drobnak	ff925a7578	Merge pull request #2437 from pi-hole/fix/version-files-overwritten ... Append versions (after the first) instead of overwriting in updatecheck	2018-10-01 11:21:29 -04:00
Mark Drobnak	33939a30ea	Merge pull request #2347 from Gusher123/patch-1 ... Don't let one blocklist block an other blocklist	2018-09-30 21:24:45 -04:00
Mark Drobnak	308b296285	Merge pull request #2401 from pi-hole/fix/checkout-readonly ... Fix checkout error due to readonly variable	2018-09-30 21:05:11 -04:00
Mcat12	d55012f724	Append versions (after the first) instead of overwriting in updatecheck ... Fixes an issue brought up in #2435 Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-09-30 20:56:44 -04:00
Mcat12	7c6eecc9c8	Ignore shellcheck warning ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-09-30 18:16:08 -04:00
Mcat12	e4cbf5023a	Fix error when reading in new password ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-09-30 18:09:59 -04:00
Mark Drobnak	46356d3027	Merge pull request #2434 from pi-hole/fix/2200 ... Only check web versions if web interface is installed	2018-09-30 17:57:54 -04:00
Mark Drobnak	958a263437	Merge pull request #2431 from pi-hole/fix/use_PHP_comments_in_pihole-FTL.conf_template ... Improve pihole-FTL.conf template	2018-09-30 17:24:36 -04:00
Mark Drobnak	a89ae82270	Merge pull request #2430 from pi-hole/chrono-lc-all ... Fix invalid numbers in Chronometer	2018-09-30 17:23:06 -04:00
Mark Drobnak	cedc39bf09	Merge pull request #2426 from mrmajik45/master ... Read without -r will mangle backslashes. (Fix)	2018-09-30 17:19:56 -04:00
Adam Warner	0131055ec9	Submission stale, addressing @mcat12's comments ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-09-30 20:00:06 +01:00
Adam Warner	0627e68078	Shellcheck is not a fan of sourcing scripts it does not know about. Add Directive to stop shellcheck from checking this. ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-09-30 19:45:04 +01:00