186 commits

Author	SHA1	Message	Date
Mcat12	3f59b51be1	Fix restartDNS returning code 1 even when it worked ... If stdout was not a terminal (the `-t 1` check), `restartDNS` would return code 1 in the success case. This caused the API to fail whenever it tried to restart the DNS server. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-11-08 22:00:13 -05: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
Mark Drobnak	c976bbcfd2	Fix checkout error due to readonly variable ... Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>	2018-09-01 22:11:45 -04:00
DL6ER	f20e4ddf3b	Change message for unknown state to something more useful ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-30 22:28:15 +02:00
DL6ER	40656641b6	Merge branch 'development' into tweak/reload_on_enable_disable	2018-08-30 22:26:57 +02:00
DL6ER	0ebd68f17f	Review comments ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-14 09:55:16 +02:00
DL6ER	337cc5ca18	BLOCKING -> BLOCKING_ENABLED ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-13 17:22:10 +02:00
DL6ER	4e4d6b5d1f	Adjust "pihole status" command ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-13 15:02:00 +02:00
DL6ER	b011adc453	Use new setupVars BLOCKING variable to determine which file to update via gravity ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-13 14:19:59 +02:00
DL6ER	d8abc1d266	Storing BLOCKING=true/false in setupVars.conf ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-13 13:49:47 +02:00
WaLLy3K	d163e38380	Ensure regex-blocked lines are red ... * Add `regex.list` to seds list Signed-off-by: WaLLy3K <wally3k@pihole.net>	2018-08-13 14:56:38 +10:00
DL6ER	20b946eae5	Instead of changing the dnsmasq configuration, we replace gravity.list and black.list by empty files for disabling. When pihole-FTL receives SIGHUP, it will clear its cache and reload all configured lists. If the files are empty, blocking will be disabled as no content to be blocked will be imported. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-12 19:31:00 +02:00
DL6ER	c00357663b	Reload pihole-FTL instead of restart the entire service on "pihole enable/disable" ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-12 19:17:20 +02:00
WaLLy3K	a1bf9fad98	Fix colour tail for use with new blocking methods ... Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	2018-08-11 12:55:18 +10:00
Dan Schaper	dbc82cfb6a	Merge pull request #2236 from pi-hole/new/regex-lists ... Use regex lists instead of wildcards for blocking	2018-07-14 06:10:44 -07:00
Mcat12	941a766aa3	Replace -wild and -regex with --wild and --regex ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-12 21:38:43 -04:00
Mcat12	c5bb404d6a	Emulate wildcard blacklisting via -wild and move regex to -regex ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-08 14:37:33 -04:00
Mcat12	4763969c8f	Move processWildcards to query.sh ... Closes #2255 Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-06-30 22:03:53 -04:00
Mcat12	0f4968d75c	Merge remote-tracking branch 'origin/development' into new/regex-lists	2018-06-29 23:12:34 -04:00
Mcat12	3077c22e4f	Change help strings from wildcard to regex blacklist ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-06-29 23:10:49 -04:00
DL6ER	a7c73036f0	pihole -t: Warn user if Pi-hole's logging is disabled ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-06-17 13:37:41 +02:00
Rob Gill	2255d05664	Remove scanlist(), now in query.sh ... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	2018-06-13 16:09:49 +10:00
Rob Gill	b1207949ac	Call query.sh to replace queryFunc() ... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	2018-06-13 15:49:52 +10:00
Rob Gill	40bc390c3b	Admin Console -> "Web Interface" ... User facing --help text changes Admin Console --> Web Interface and additional branch option Signed-Off-By: Rob Gill <rrobgill@protonmail.com>	2018-06-04 13:34:42 +10:00
RamSet	2f24e5ceb7	Minor correction for double instance of the word "found". ... Signed-off-by: RamSet <RamSet@gmail.com>	2018-05-14 12:21:20 -06:00
Adam Warner	e49a9096a5	accidentally a 'shift' ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-04-15 18:46:35 +01:00
Adam Warner	33148ba832	Add help text to pihole command to document new flag ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-04-15 18:30:13 +01:00
Adam Warner	bca23dd896	Allow passing of --check-only to update script. ... Don't run installer for updating web files, it's handled by getGitFiles. I think this works... Signed-off-by: Adam Warner <adamw@rner.email>	2018-04-15 18:25:35 +01:00
Adam Warner	310d33b8ee	Merge dev > FTLDNS fix merge conflicts ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-04-13 17:01:54 +01:00
Razvan Radu	7361d5d3ea	Update pihole lolcahost probe for DNS status ... Signed-off-by: Razvan Radu <ramset@gmail.com>	2018-04-05 11:14:39 -06:00
Adam Warner	0b87f489d5	Look for pihole-FTL, not dnsmasq! ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-03-03 15:59:56 +00:00
DL6ER	7ed45d26c2	Remove " " at some places where they shouldn't be ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-02-26 17:26:51 +01:00
DL6ER	e8ec0dc701	Use pihole-FTL resolver in pihole and gravity ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-02-25 09:34:04 +01:00
DL6ER	d7dde06552	Add "pihole logging off noflush" command ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-01-18 17:08:46 +01: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	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
DL6ER	6ca47dc3b3	Add bash / cron based update checker for Pi-hole	2017-10-28 13:20:02 +02:00
Mcat12	8dba2a88e2	Move FTL re-parsing call after dnsmasq restart	2017-10-25 23:07:45 -04:00
DL6ER	b9ae01d819	Send SIGHUP to pihole-FTL when restarting/reloading dnsmasq ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-10-25 17:46:24 +02:00
WaLLy3K	645d8e0ebd	Fix issue where wildcarding didn't restart dnsmasq ... Signed off by WaLLy3K <wally3k@pi-hole.net>	2017-10-19 17:51:20 +11:00
WaLLy3K	80c40e6050	Prevent full stop being interpreted as regex ... Signed off by WaLLy3K <wally3k@pi-hole.net>	2017-10-16 10:12:27 +11:00
WaLLy3K	3b300a4d6a	Fix query option handling ... Signed off by WaLLy3K <wally3k@pi-hole.net>	2017-10-13 11:42:49 +11:00
WaLLy3K	664d0ea023	Correctly retrieve IPv4/6 addresses for tailFunc() ... * Add comments for readability * Use `sed -E` for readability * Move `date` into `sed` * Use updated colour codes	2017-09-23 11:27:40 +10:00
Adam Warner	a0bd517380	Merge pull request #1694 from pi-hole/fix/qf-opt ... Slow query fix & queryFunc optimisation	2017-09-21 20:05:42 +01:00
WaLLy3K	56990618e9	Prevent Block Page issue ... * Block Page expects to see a full stop, otherwise it will throw an unhandled error	2017-09-18 01:12:19 +10:00
WaLLy3K	54a85d3a63	Fix invalid option case ... * Ensure `pihole -q doubleclick.com asd` exits with error	2017-09-18 00:58:56 +10:00
WaLLy3K	c2d3e99ddd	Slow query fix & queryFunc optimisation ... * Validate modified code using Shellcheck & Strict Bash * Added and/or elaborated more comments * scanlist() should exit if /etc/pihole is not available * Add `export LC_CTYPE=C` to prevent extreme grep slowdown * Consider "domain.com#comment" an exact match * Add specialised wildcard searching grep * Optimise and simplify queryFunc() for readability * Replace IDN `python` parsing with `idn2`, as `python` is not guaranteed to be available * Use ${COL_BOLD} when printing filenames	2017-09-18 00:41:26 +10:00
WaLLy3K	4d39ab9753	Allow force-reload to be used when restarting DNS ... * Remove duplicate coltable variable definition and source * Minor comment modifications * Add "$2" to restartdns	2017-09-14 16:39:25 +10:00
WaLLy3K	56b8c4bfdb	Merge branch 'development' into tweak/gravity	2017-09-01 10:01:41 +10:00
WaLLy3K	15a5f425bf	Replace nc with psuedo-device ... * Also fix minor conditional style issue	2017-08-31 20:32:02 +10:00