77 commits

Author	SHA1	Message	Date
DL6ER	74cb79252c	Only looking for blocking entries (do not scan whitelist.txt)	2016-12-05 17:12:28 +01:00
DL6ER	6cd3c93472	Also query white- and blacklist	2016-12-05 17:09:49 +01:00
DL6ER	eb63e75379	No need for pipe here	2016-12-05 17:06:20 +01:00
Dan Schaper	2ec4acfe52	Begin fixing exit values. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2016-12-01 12:21:08 -08:00
Mcat12	3ba7d7640f	Merge pull request #933 from DL6ER/delayedreactivation ... Add possiblity for delayed reactivation of blocking	2016-11-21 08:26:26 -05:00
DL6ER	7bf0985a57	Extended help text of main pihole command	2016-11-21 11:30:34 +01:00
DL6ER	f50cbe74cb	Changed -web (webpage) to -a (admin)	2016-11-20 15:15:27 +01:00
DL6ER	291ca0874a	Fixed two more typos	2016-11-18 12:16:26 +01:00
DL6ER	96f2aa1803	fixed typo	2016-11-17 23:36:53 +01:00
DL6ER	c6857501aa	Removed check for availability of nohup	2016-11-17 23:31:11 +01:00
DL6ER	3aba1607b2	Removed debug echos	2016-11-17 23:04:46 +01:00
DL6ER	f667298b64	Added possiblity for delayed reactivation of blocking	2016-11-17 22:58:00 +01:00
DL6ER	db278d81e4	Added webpage.sh	2016-11-16 21:34:43 +01:00
Dan Schaper	1d64ad1ccd	Stash all changed files, clean directory and pull updates.	2016-11-02 10:39:27 -07:00
Dan Schaper	dfb4ac0365	Keep .yml's from going to user local repos.	2016-11-02 09:52:15 -07:00
Dan Schaper	0ef8832b04	whitespace	2016-11-02 09:36:30 -07:00
Dan Schaper	e42a037b7d	Grep -i instead of cat.	2016-11-02 09:28:00 -07:00
Dan Schaper	fe18d69b65	Grep should start at the beginning of line to make sure it doesn't fire on # beginning lines.	2016-11-02 09:25:32 -07:00
Adam Warner	f36e4ba336	Cherry picking 3f049fa79, conflict fix	2016-11-02 04:34:02 -07:00
Adam Warner	c47c5e466f	consistency	2016-11-02 04:18:52 -07:00
Promofaux	1d21b0da9a	enable or disable logging from pihole command	2016-11-02 04:10:43 -07:00
Adam Warner	469ff45f01	create list.sh. Combines whitelist and blacklist scripts in an effort to reduce code duplication. ... update pihole script to reflect new white/blacklist command.	2016-10-26 09:36:02 +01:00
Promofaux	8ee98f0a4a	remove a space	2016-10-23 19:47:31 +01:00
Promofaux	82e78fb651	Add output to pihole disable and pihole enable	2016-10-23 19:44:40 +01:00
Promofaux	d0826b2c33	Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev	2016-10-23 19:33:28 +01:00
Marcus Hildum	640398ced4	Consistency ... We went with tabs earlier, may as well make that the "standard". Easy enough to switch to spaces too if that's desired with expand(1)	2016-10-21 23:17:14 -07:00
Marcus Hildum	5ebfa5ecf7	heredoc for helpfunc in pihole	2016-10-21 22:53:04 -07:00
tuplink	e199f6db87	spelling updates	2016-10-20 21:15:11 -04:00
tuplink	c83dd3ccd7	change spacing	2016-10-20 18:45:27 -04:00
tuplink	78fbafa1cd	test out new status logic	2016-10-20 18:40:03 -04:00
Tommy Huff	685b775b68	rework status if statments	2016-10-20 11:24:34 -04:00
Tommy Huff	9056a5a7b6	fix spelling / replace tabs with spaces in help	2016-10-20 11:05:49 -04:00
Tommy Huff	3ca3eaa62c	change restartdnsmasq to restartdns	2016-10-20 09:40:45 -04:00
Tommy Huff	aaee895b2b	add pihole status web option to return 1 or 0 for easy use with php	2016-10-20 08:58:36 -04:00
Tommy Huff	7d7e17b351	add toggle to enable or disable pi-hole	2016-10-20 08:45:20 -04:00
Adam Warner	b66f23cfd0	account for new update script	2016-10-18 14:19:44 +01:00
Adam Warner	ce46c4dec4	remove prematurely added code	2016-10-18 12:11:02 +01:00
Adam Warner	77e8be09a1	handle passing arguments to version script	2016-10-18 12:07:42 +01:00
Adam Warner	29ad2496b6	don't output "elevating with sudo" in pihole script, just do it.	2016-10-18 12:05:48 +01:00
Promofaux	a43577fa26	add reconfigure flag to -r command	2016-10-15 20:43:03 +01:00
Promofaux	090fbd04af	Remove ${SUDO} usages and root checks from scripts called by pihole command as they should not be called directly.	2016-10-15 17:54:04 +01:00
Promofaux	461de48625	function declarations as per basic-install.sh	2016-10-15 17:25:17 +01:00
Promofaux	9352ba6e4a	about time we exit 0'd	2016-10-15 17:16:44 +01:00
Promofaux	5e883239f9	remove calls for ${SUDO} as per basic-install.sh.	2016-10-15 17:15:59 +01:00
Promofaux	5ea08a2120	add -r to reconfigure pihole (basically runs basic-install.sh from /etc/.pihole)	2016-10-15 17:07:08 +01:00
Promofaux	1a83988e26	Add check at the beginning of update script to check for existence of local repos. If not, redirect user to run install command again.	2016-10-01 16:56:03 +01:00
Promofaux	ec0c68621c	add blank line after Current version display	2016-09-12 19:40:34 +01:00
Promofaux	d58f7c6ec9	Remove references to dashboard update Script	2016-09-12 19:08:33 +01:00
Promofaux	d124c2c12e	Expand to check web admin versions	2016-09-12 18:57:19 +01:00
Promofaux	0229f70761	Make updatePiholeFunc a bit smarter. Only run update if version is not the latest.	2016-09-12 18:29:04 +01:00