Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-29 08:12:20 +00:00
Code Issues Projects Releases Packages Wiki Activity
6406 commits 10 branches 109 tags 28 MiB
Commit graph

300 commits

Author SHA1 Message Date
Christian König
614d18cd3d
Debug need sudo 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-03-30 21:24:51 +02:00
Christian König
54ce8c2622
Only use sudo power if needed 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-03-30 21:04:36 +02:00
Christian König
42424b515b Add getFTLAPIPort function 
Add ftl_api_port function

Signed-off-by: Christian König <ckoenig@posteo.de>

Use getFTLAPIPort in pihole

Signed-off-by: Christian König <ckoenig@posteo.de>

Use default portfile as fallback

Signed-off-by: Christian König <ckoenig@posteo.de>

Fix stickler

Signed-off-by: Christian König <ckoenig@posteo.de>

Correct variables

Signed-off-by: Christian König <ckoenig@posteo.de>

Apply suggestions from code review

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>

Add test getFTLAPIPort returing default port

Signed-off-by: Christian König <ckoenig@posteo.de>

Remove unused code from test_key_val_replacement_works

Signed-off-by: Christian König <ckoenig@posteo.de>

Add getFTLAPIPort_custom test

Signed-off-by: Christian König <ckoenig@posteo.de>

Fix output format

Signed-off-by: Christian König <ckoenig@posteo.de>

Add debugging

Signed-off-by: Christian König <ckoenig@posteo.de>

Remove debugging and fix function

Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-02-27 18:16:53 +01:00
Adam Warner
77e5121d43
Split new function out into a separte utility script and add a test for it. Can be used in future to organise re/commonly-used code 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-30 23:05:28 +00:00
Adam Warner
1dd9d55d82
Replace value for BLOCKING_ENABLED (and QUERY_LOGGING, for consistency) and if value that we are trying to replace does not exist, add it to the end of the file. 
Co-authored-by: MichaIng <micha@dietpi.com>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-30 15:53:03 +00:00
Lukas Schlötterer
ed6b85241b
use sed substitute instead of delete and append (#4555) 
* use sed substitute instead of delete and append

doesn't move the line to the end of the file, instead keeps the order of the lines in setupVars.conf intact

Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>

* Match start of line

as suggested in the review

Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>

Co-authored-by: yubiuser <ckoenig@posteo.de>

Co-authored-by: yubiuser <ckoenig@posteo.de>
 2022-01-12 09:23:13 +01:00
DL6ER
5823f5e254
Use ss instead of lsof (#4518) 
* Use ss instead of lsof for pihole status checks

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Use ss FILTER instead of piping into bash

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Use ss in debug log generation

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Remove lsof from dependencies

Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-01-05 16:41:46 +00:00
Christian König
3989cc19e9
Remove double text output 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-12-28 19:55:42 +01:00
Christian König
bcb59159ed
Analyse port also on ports other than 53 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-12-28 19:52:11 +01:00
Christian König
2b52f92647
Inlcude port also in cli output 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-12-28 19:36:32 +01:00
Christian König
f45248df80
Use FTL's new dns-port API endpoint 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-12-28 13:42:19 +01:00
Christian König
5729f64ddc
Fix missing fi 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-12-28 12:21:31 +01:00
yubiuser
4a2f4c1bce
Fix indention_2 
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2021-12-28 12:11:46 +01:00
yubiuser
5ef731fc57
Fix indention 
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2021-12-28 12:11:26 +01:00
Christian König
71ebd64f4e
mend 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-12-26 18:13:14 +01:00
Christian König
9f0e0dbd37
Fix analyse ports 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-12-26 18:10:36 +01:00
Christian König
ef30a85afb
Include port in status function 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-12-26 17:10:48 +01:00
yubiuser
ae39e338fe
Use exec to run gravity script (#4449) 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-12-04 10:50:21 +01:00
Subhaditya Nath
ba6d700e7e
Fix pihole -v output if WebAdmin not installed (#4370) 
* Fix https://github.com/pi-hole/pi-hole/issues/4279

Signed-off-by: Subhaditya Nath <sn03.general@gmail.com>

* Don't ignore exit code of version.sh

If it exits with a non-zero return code, that means some error occurred,
and so it shouldn't be ignored.

Signed-off-by: Subhaditya Nath <sn03.general@gmail.com>

* Implement changes suggested by @Michalng

Signed-off-by: Subhaditya Nath <sn03.general@gmail.com>

* Implement changes suggested by @PromoFaux

Signed-off-by: Subhaditya Nath <sn03.general@gmail.com>

* Always source /etc/pihole/setupVars.conf

https://github.com/pi-hole/pi-hole/pull/4370#issuecomment-978149567

Co-authored-by: Adam Warner <me@adamwarner.co.uk>
 2021-12-02 20:46:11 +00:00
DL6ER
cbc99d45c6
Small style change to finished debug upload display 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-09-07 11:21:34 +02:00
DL6ER
be68a5339c
Apply same improvement to pihole tricorder feature 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-09-07 11:16:40 +02:00
DL6ER
115e3eeda9
Use --no-progress-meter instead of --silent so error reasons are printed 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-08-30 20:20:45 +02:00
DL6ER
21897d7fbd
Add warning if curl failed 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-08-30 15:55:42 +02:00
DL6ER
31c7c019cb
Fix piping to pihole tricorder 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-08-30 14:04:48 +02:00
Christian König
ffe45e8b76 On enabling/disabeling only reload-lists instead of reload 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-08-06 20:51:48 +02:00
Christian König
6be647a85f Fix coloring of pihole -t 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-07-16 21:52:12 +02:00
Adam Warner
4ac4bc5c18
Merge branch 'development' into fix/gravity_no_locallist 2021-07-04 00:48:09 +01:00
Christian König
4fb5157719 Squashed commits 
Add simple grep function to pihole -t

Signed-off-by: Christian König <ckoenig@posteo.de>

Add help info

Signed-off-by: Christian König <ckoenig@posteo.de>

Improve help info

Signed-off-by: Christian König <ckoenig@posteo.de>

Fix details

Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-07-03 17:13:19 +02:00
DL6ER
aa88be335e
Acknowledge that IPV{4,6}_ADDRESS may not exist 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-04-16 11:44:54 +02:00
DL6ER
5df7ed2f32
Obtain FTL's PID from the PID file (#4103) 
* Try to obtain FTL's PID from the PID file. If this fails, try to identify the main process using pgrep --oldest (instead of relying on pkill finding the right one by itself). This allows the script to work in even when FTL is running inside the memory checker valgrind.

* Rename FTL_PID -> FTL_PID_FILE

* Remove the pgrep fallback after discussions about that it should be more obvious to users if something strange happened to their PID file. Also, simplify the routine using a bashism in the end.

* Shorten if [[ regex ]]

* Use unset instead of emptying the PID variable

Signed-off-by: DL6ER <dl6er@dl6er.de>

Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-04-14 09:33:10 -07:00
Christian König
e7d937c412 Be more specific what pihole -d -a does 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-11-15 20:31:47 +01:00
Adam Warner
bb1a6243d6
Merge pull request #3669 from pi-hole/release/v5.1.2 
Release/v5.1.2 to development
 2020-08-14 16:28:53 +01:00
Dan Schaper
548ad6375d
Merge pull request #3524 from pi-hole/fix/status_checking 
Fix pihole status to not rely on a TCP port test
 2020-07-28 07:24:34 -07:00
DL6ER
6ee6eea1fb
Use pkill instead of the somewhat fragile combination of kill + pidof. This solves some issues especially when there are many TCP workers floating around. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-07-21 21:13:40 +02:00
DL6ER
94cd7f59d4
Make verbose output the default. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-07-01 18:49:31 +02:00
DL6ER
6009e86947
Fix pihole status to not rely on a TCP port test. The current test can fail even when there is no error i case the max. number of TCP workers is reached. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-07-01 18:39:28 +02:00
Thomas L. Kjeldsen
852f6b95f5 Prevent "pihole disable $timeout" from messing up future state changes 
Signed-off-by: Thomas L. Kjeldsen <tlk@closureconsulting.com>
 2020-05-30 02:58:27 +02:00
Dan Schaper
c76435883b
Merge pull request #3360 from dnicolson/fix-github-capitalisation 
Fix GitHub capitalisation
 2020-05-13 16:56:36 -07:00
Dave Nicolson
ab753e88a2 Fix GitHub capitalisation 
Signed-off-by: Dave Nicolson <david.nicolson@gmail.com>
 2020-05-13 12:55:00 +02:00
Adam Warner
9e96ff37de
Fix merge conflicts 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-12 22:16:43 +01:00
yubiuser
d27a565d39 Apply suggestions from code review 
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-04-05 11:46:41 +02:00
Christian König
de42669bb7 fix typo in pihole help 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-04-05 08:56:10 +02:00
Christian König
3095fd4dd6 add restart [options] to cli help 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-04-05 08:49:35 +02:00
XhmikosR
7b8611ced0
Assorted typo fixes. (#3126) 
* Assorted typo fixes.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>

Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-03-08 16:53:14 -07:00
DL6ER
f10a151469
Fix pihole -t sed instructions. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-12 21:05:02 +01:00
DL6ER
a809624356
Update blocked strings for pihole -t. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-01-23 19:19:44 +01:00
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
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