arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-23 07:18:07 +00:00
Code Issues Releases Wiki Activity
4,164 Commits 10 Branches 109 Tags 20 MiB
37217ece73
Commit Graph

204 Commits

Author SHA1 Message Date
DL6ER
69a909fc4c
On modification of lists, we should send real-time signal 0 instead of SIGHUP. This also preserves the DNS cache of not-blocked domains. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-11 21:47:46 +00:00
chrunchyjesus
476975540a
make some shebangs comply to posix standard 2019-11-05 22:33:00 +01:00
John Crisp
4f21f67775
Update pihole 
Fix spelling typos
 2019-10-06 15:09:14 +01:00
Adam Warner
61a40c1b43
merge devel into 4.3.2 And Resolve merge conflicts 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-09-22 01:16:44 +01:00
Adam Warner
79b8dac0fa
Remove readonly attribute of the PI_HOLE_BIN_DIR declaration in pihole 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-08-30 22:06:14 +01:00
Dan Schaper
03c65dd0e9
Convert hardcoded /usr/local/bin to variable 
Update pihole script with full path to 'pihole'

Variable for webpage.sh 'pihole' call.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2019-08-24 04:49:14 -07:00
DL6ER
aef7892de6
Add missing hyphens. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-22 13:57:01 +02:00
DL6ER
251c9fee98
Simplify restarting code for "pihole restartdns". This fixes #2869. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-14 21:14:55 +02:00
DL6ER
6e2e825a5f
Rename options "pihole --whiteregex" to "pihole --white-regex" for the sake of readability. The same applied for "whitewild" -> "white-wild" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-05 21:10:52 +02:00
DL6ER
6f58d58cae
Add --whitewild to help texts and man pages. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-22 22:26:27 +02:00
DL6ER
40d0caa70b
Add undocumented --whitewild option that does the same --wild does for the whitelist. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-22 21:15:28 +02:00
DL6ER
96031214c6
Add support for whitelist regex filter management via CLI. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-22 19:36:11 +02:00
DL6ER
4947350ca5
Add arpflush to help and bash autocompletion 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-15 09:08:33 +02:00
DL6ER
c3023fe681
Add new "pihole arpflush" command to flush both the ARP cache as well as the network table in pihole-FTL.db 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 21:25:10 +02:00
DL6ER
d7ee44960e
Remove moving around of the gravity and blacklist files as we do not use them any longer 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-24 18:57:38 +02:00
DL6ER
6594a0a6e7
Fix detection of blocked query in pihole -t 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-24 18:53:20 +02:00
DL6ER
a4ba8d4b8f
Prevent double disabling/enabling by checking BLOCKING_ENABLED value in setupVars.conf 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-01-24 09:16:24 +01:00
Ludovic Rousseau
d5fbe1b629 Do not ask admin password just for help documentation 
It is not a good idea to ask for an admin password just to get the
command documentation.
"pihole -h" should return the arguments documentation with no need to
enter a password.

Without the patch I get:
$ ./pihole -h
Password:

It is easy to reproduce by invalidating the sudo password using
"sudo -k" before running pihole again.

Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2019-01-02 23:54:30 +01:00
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