95 commits

Author	SHA1	Message	Date
Jacob Salmela	51acdfa633	remove pihole -s flag	2017-01-27 10:12:51 -06:00
DL6ER	2935275227	Merge branch 'development' into wildcardblacklisting	2017-01-09 14:53:01 +01:00
Adam Warner	12bec1df68	Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh ... Major simplification of webpage.sh + extend DHCP to IPv6	2017-01-02 14:28:26 +00:00
DL6ER	2b778695b1	Implement querying ad lists support for wildcards (what hell of a bash experience)	2017-01-02 14:27:13 +01:00
DL6ER	40798da6b1	Add blacklisting wildcard support	2016-12-31 12:49:04 +00:00
DL6ER	d0cd39a25f	Added space behind :53 to only match port 53	2016-12-28 20:32:56 +01:00
DL6ER	1e627c7e8f	Make webpage.sh fully library style	2016-12-28 16:25:14 +00:00
DL6ER	9170488b0a	Test if DNS service is listening on local port 53	2016-12-28 15:58:48 +00:00
DL6ER	c674a175ee	Make grep case insensitive	2016-12-23 17:02:56 +01:00
Promofaux	906a1753be	specifically comment out gravity.list addn-host	2016-12-14 19:42:20 +00:00
Adam Warner	bebb569c43	Merge pull request #964 from pi-hole/queryadsonlyexactmatches ... pihole -q: Add option to show all partial or only exact matches	2016-12-09 23:25:15 +00:00
Mcat12	74e33bb1a0	Merge pull request #973 from pi-hole/taillog ... Add tail argument to automatically "tail -f" pihole.log	2016-12-08 16:40:17 -05:00
Mcat12	b591df55b0	Tell user how to exit tail command	2016-12-08 16:35:50 -05:00
Mcat12	b9e0e88fe9	Update pihole	2016-12-08 15:47:30 -05:00
DL6ER	5120d9ec33	Add tail option	2016-12-08 21:15:03 +01:00
DL6ER	c0886cb5c6	pihole -q <domain> is partial matching (as before), pihole -q <domain> -exact is exact matching (new behavior)	2016-12-06 13:18:01 +01:00
DL6ER	294df8690c	Do only one grep on each of the lists and count the number of non-empty lines in the result. Improves speed by factor of 2x	2016-12-06 09:55:17 +01:00
DL6ER	fb72ac9904	Show only exact matches for pihole -q	2016-12-06 08:18:49 +01:00
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