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-28 15:52:21 +00:00
Code Issues Projects Releases Packages Wiki Activity
6340 commits 10 branches 109 tags 28 MiB
Commit graph

293 commits

Author SHA1 Message Date
DL6ER
9e9c985245
FTL checkout: Check for availability of branches before trying to download from the webserver. Also, fix check_download_exists() possibly killing the script on non-availability of requested branches 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-08-26 06:11:42 +02:00
DL6ER
a302d7b5d7
Make the help text of "pihole checkout [what] [branch]" more colorful 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-08-26 05:22:15 +02:00
Christian König
2c32d485bd
Remove obsolet getFTLPIDFile() 
We can get the path of the PID file via getFTLConfigValue files.pid

Signed-off-by: Christian König <github@yubiuser.dev>
 2024-07-27 22:00:52 +02:00
DL6ER
897e23089c
Implement pihole enable/disable using the API 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-07-16 10:56:37 +02:00
DL6ER
ccdbfd4130
Use natural langauge for list manipulations, like pihole allow example.com or pihole deny other.net. Also remove using pihole deny not bad.org 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-06-25 13:56:49 +02:00
DL6ER
fe8e63853c
Use concatenate of arguments instead of using the array directly 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-06-22 20:49:44 +02:00
DL6ER
b835fa06a6
Further black -> deny renaming 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-06-22 20:48:07 +02:00
DL6ER
424e825bd9
Do not auto-sudo in the pihole command 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-06-22 20:42:22 +02:00
DL6ER
7e91b9ab47
Update help text 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-06-22 20:35:06 +02:00
DL6ER
bfc18f8329
Rewrite list functions to use the API 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-06-19 23:04:39 +02:00
DL6ER
8f24e8aa5f
Modify pihole -t to use TOML config items 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-06-19 22:41:42 +02:00
Christian König
c3c31a1a60 Print version details automatically if not on master 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-12-09 23:14:58 +01:00
Christian König
fe4d934a40 Simplify pihole -v 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-12-09 23:13:04 +01:00
Christian König
bc96d3b0a9
Tweak help text of pihole setpassword 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-11-05 21:18:46 +01:00
Adam Warner
ab3b6dfa67
No need to >/dev/null because setFTLConfigValue already does this 
adjust output of setFTLConfigValue to test for the exit code of `pihole-FTL --config`
 2023-10-28 19:46:45 +01:00
Adam Warner
6292e65b37
When setting a blank password, use webserver.api.password instead of webserver.api.pwhash (fixed in https://github.com/pi-hole/FTL/pull/1702) 
This prevents the password from being blanked out on the command line when it has been set by an environment variable
 2023-10-28 17:56:37 +01:00
RD WebDesign
2c7fa4a7b3
Avoid printing getFTLConfigValue return in statusFunc() 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2023-10-18 02:07:06 -03:00
Christian König
ec83d6b793
No help for gone functions 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-10-14 14:06:47 +02:00
Christian König
46ff257344
Remove Chronometer 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-10-12 13:44:51 +02:00
Adam Warner
044e856e6b
Disable checkout function for (official) docker containers 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-10-08 13:23:44 +01:00
Christian König
8ef8a27583
Remove webpage.sh 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-08-04 20:04:45 +02:00
Adam Warner
6edd6a4d55
if ${USER} variable is blank, then populate it with whoami 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-18 08:11:48 +01:00
Christian König
ba3e290915
Fix shellcheck errors 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-06-04 21:21:48 +02:00
Christian König
b5800ef718
Remove getFTLAPIPort() function and fix pihole status 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-05-27 11:53:00 +01:00
Adam Warner
2784b267ec
pihole command: read values from pihole-FTL instead of setupvars.conf 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-05-27 11:51:16 +01:00
DL6ER
3695610300
Allow running pihole -g without root (run as user pihole) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-05-27 11:51:16 +01:00
Christian König
ca00ffa101
Only source versions file if the file exits 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-02-02 11:58:58 +01:00
Adam Warner
b8eae60fcc
Disable a few commands for Docker. Currently this is done by monkeypatching the the pihole file on Docker install, however if someone was to run pihole checkout, these patches are removed. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-12-11 11:39:11 +00:00
RD WebDesign
233453267e
Using shift to allow passing multiple arguments 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-11-23 15:33:49 -03:00
RD WebDesign
f3c27f706f
Pass only the correct argument 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-11-23 14:07:30 -03:00
Christian König
3d01e4d0cf No detour - use pihole-FTL.conf to get the API port number 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-26 22:55:30 +02:00
Christian König
89b88416b3
Fix 4898 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-06 17:09:52 +02:00
Christian König
7b77d991df
Move FTL port and PID functions to utils.sh 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-07-26 14:38:03 +02:00
Christian König
b486786041
Add database healthy checks to debug script 
Fix health check output comparison in gravity script as well
Add note about waiting time

Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-07-10 23:32:47 +02:00
Christian König
2c5907a8b1
Requiere sudo for pihole -t 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-06-19 23:25:53 +02:00
Adam Warner
36dd533ef3 use directory /var/log/pihole/ for log storage 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-05-15 06:46:23 +02:00
Adam Warner
db116971ce
I tried to do too many things in one function, vastly overcomplicating what should have been _this_ all along 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-14 22:53:38 +01:00
Adam Warner
86dd612882
remove readonly directive from declaration of utilsfile, it is unnecassery 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-12 17:13:50 +01:00
yubiuser
42d3368955
Merge pull request #4663 from pi-hole/no_root 
Only use sudo power if needed
 2022-04-10 12:34:05 +02:00
Adam Warner
4d31d5ee11
Address review comments 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-04 22:02:26 +01:00
yubiuser
6121c162ff
Fix typo 
Co-authored-by: Marius Hanl <66004280+Maran23@users.noreply.github.com>
 2022-04-03 13:49:43 +02:00
Adam Warner
7fa8cdd03e
Address: 
- Review Comments
 - Stickler Complaints
 2022-04-02 12:46:07 +01:00
Christian König
722a716de3
Add exit code to status function 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-03-30 22:40:14 +02:00
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