Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-23 22:53:43 +00:00
Code Issues Projects Releases Packages Wiki Activity
5704 commits 8 branches 109 tags 27 MiB
Commit graph

1407 commits

Author SHA1 Message Date
Christian König
d85982dc51
Use versions file instead of github api to get latest version 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-14 10:29:14 +02:00
Christian König
5c61f6cb65
Remove checkout hint 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-14 08:43:39 +02:00
Christian König
4c0a94d2b9
Don't rely on pihole -v output but query github to get the lastest versions in debug script 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-13 14:44:13 +02:00
Christian König
9471c69882
Fix spelling 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-07 09:34:05 +02:00
Christian König
79c0b446e1
Set missing data to N/A 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-06 21:55:49 +02:00
Christian König
a478f2460b
POSIX 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-06 21:50:07 +02:00
Christian König
2dc599f266
Simplify version.sh 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-06 17:58:58 +02:00
Christian König
d7f7ef9965
Only create VERSION_FILE if it does not exist 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-06 14:37:56 +02:00
Christian König
888e44e53d
Add hash functions to updatecheck 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-06 14:34:34 +02:00
Christian König
18d28533eb
Update local and remote versions at the same time 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-06 12:36:17 +02:00
Christian König
56527e5dd9
Add get_remote_version() to updatechecker 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-06 12:03:12 +02:00
Adam Warner
b7b5ffa8dd
remove old code per review from @yubiuser and @dschaper 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-10-01 22:31:03 +01:00
Adam Warner
34b66002e9
leasetime (local) should have an h after it to signify 24h lease, else it will be read as two minutes (minimum integer value) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-10-01 22:31:00 +01:00
Christian König
276c480f50
Return default port if non-numeric characters are set in pihole-FTL.conf for FTLPORT. FTL does the same in such case and provide the API on 4711 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-26 23:40:09 +02:00
Christian König
25ba68104b Remove last traces 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-26 22:55:34 +02: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
Dan Schaper
f8a12917e2
Handle more than one default gateway in debug script (#4934) 2022-09-25 11:09:26 -07:00
Dan Schaper
37b45d411d
Read docker tag from file in root, not the previously set environment variable (#4929) 2022-09-25 11:05:08 -07:00
Christian König
22ebf21487
Use POSIX 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-25 18:20:01 +02:00
Adam Warner
9debd22179
If, after reading /pihole.docker.tag into DOCKER_TAG, it does not match an expected pattern, unset it - this should prevent arbitary code from being run 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-09-25 15:51:09 +01:00
Peter Russell
951b4ed002
Remove cronjob that checks local versions every 10 minutes - only check when required (#4939) 
* eliminate updatechecker local from pihole cron job

Signed-off-by: jpgpi250 <jpgpi250@gmail.com>

* resolving stickler-ci items

Signed-off-by: jpgpi250 <jpgpi250@gmail.com>

* undo changes to updatecheck.sh (request from PromoFaux)

Signed-off-by: jpgpi250 <jpgpi250@gmail.com>

* applied recommendation from PromoFaux

Signed-off-by: jpgpi250 <jpgpi250@gmail.com>

* Indent the code inside the function

Signed-off-by: jpgpi250 <jpgpi250@gmail.com>

* removed unnecessary updatecheck for core

Signed-off-by: jpgpi250 <jpgpi250@gmail.com>

* eliminate updatechecker local from pihole cron job

Co-authored-by: jpgpi250 <jpgpi250@gmail.com>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Signed-off-by: jpgpi250 <jpgpi250@gmail.com>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
 2022-09-24 16:14:44 +01:00
Adam Warner
9463c3c69f
Change wording in chronometer (#4910) 2022-09-24 13:53:08 +01:00
Christian König
bb57a9e616
Handle more than one default gateway in debug script 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-22 22:33:11 +02:00
Adam Warner
b6d1bd7335
Read docker tag from file in root, not the previously set environment variable 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-09-19 22:01:05 +01:00
Christian König
60c35cb93c
Remove unused check_database_integrity() 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-18 13:08:44 +02:00
Christian König
2c3fea321b
Remove FAQ_ULA as it is unused in core 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-18 09:10:24 +02:00
Christian König
40f00c6f0b
Fix gravity database integrity check 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-18 09:01:22 +02:00
Christian König
00e51f32b5
Blcked => Block 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-17 16:46:31 +02:00
Christian König
f90fb8b946 Change wording in chronometer 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-17 16:24:31 +02:00
RD WebDesign
5cc317de5b
Change texts after Block Page removal 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-09-16 03:16:54 -03:00
Adam Warner
3d53bda121
Update advanced/Scripts/updatecheck.sh 
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
 2022-09-15 17:54:54 +01:00
Adam Warner
760325eb76
Update piholeDebug to source versions file for DOCKER_VERSION instead of reading PIHOLE_DOCKER_TAG 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-09-14 22:49:37 +01:00
Adam Warner
bf256aa5a7
If docker version env var is set, store it in /etc/pihole/versions file for later use 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-09-14 22:38:41 +01:00
Christian König
49b9dc8888
Remove json_extract function 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-08-25 09:55:47 +02:00
yubiuser
66eeee5548
Remove the email function (#4870) 
- **What does this PR aim to accomplish?:**

We offered to set an administrator email which was shown on the blockpage. With the removal of the blockpage (https://github.com/pi-hole/pi-hole/pull/3910) this function is not needed anymore.

Corresponding web interface PR: https://github.com/pi-hole/AdminLTE/pull/2301
 2022-08-24 07:21:04 +02:00
Adam Warner
a4b899c256
Review suggestions (and shellcheck complaints) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-23 19:10:12 +01:00
Adam Warner
5421aad03e
Store versions as key/value pairs rather than space delimeted values 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-22 19:11:27 +01:00
Christian König
8c4a9aa6e3
Remove the email function 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-08-17 23:14:56 +02:00
Adam Warner
114f562758
Merge branch 'development' into removeblockpagefunctionality 2022-08-17 20:25:03 +01:00
Adam Warner
e35a9da921
Remove the blockpage-focussed customisations to query.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-08 18:57:55 +01:00
Christian König
b98e331375
Only do one curl call in debug when checking the X-Header 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-08-08 17:20:41 +01:00
Adam Warner
5d5a85b7b6
X-Pi-hole removed from blocking page... 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-08 17:12:16 +01:00
Christian König
d77677312c
Extend FTL information in debug log 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-08-08 13:52:20 +02:00
Adam Warner
0b81dd387b
type -> list_type per @yubiuser suggestion 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-01 20:56:37 +01:00
yubiuser
aa0a9e2976
Merge pull request #4839 from pi-hole/move_getFTLPIDFile 
Move FTL port and PID functions to utils.sh
 2022-07-30 21:01:21 +02:00
Christian König
567a915336
Remove unused and outdated files and scripts 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-07-29 23:21:38 +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
RD WebDesign
d89720330f
Address revision requests: 
- replace `local var` with `_var` (POSIX style);
- move inline comments

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-07-24 20:15:20 -03:00
RD WebDesign
8d1f286f30
Only execute spinner function if there is a tty 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-07-24 17:52:17 -03:00
RD WebDesign
cbcd12631d
Adding the spinner for foreign_key_check too 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-07-11 01:53:30 -03:00
RD WebDesign
c4f9a475f3
Debug log - add spinner for long processes 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-07-11 01:34:51 -03: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
yubiuser
8e4adb6e39
Merge pull request #4788 from pi-hole/SKIP_INSTALL 
Rename PH_TEST to SKIP_INSTALL
 2022-07-09 00:01:48 +02:00
Christian König
b49db58ec2
Fix spelling mistakes 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-07-08 22:00:36 +02:00
Christian König
518cbd10e0
Rename also in docker files 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-07-06 22:58:14 +02:00
Christian König
0a8761ee68
Rename PH_TEST to SKIP_INSTALL 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-07-06 22:53:09 +02:00
Christian König
469776afd6
Do not restrict RegEx added from CLI by length 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-07-06 19:27:33 +02:00
DL6ER
98c238064e
Change FTL's default log file path from /var/log/pihole/pihole-FTL.log to /var/log/pihole/FTL.log 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-07-03 18:43:45 +02:00
Adam Warner
0be987239e
Adds spellcheck action to the smoke-tests (also moves editorconfig-checker to smoketests away from it's own action) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-07-02 14:04:08 +01:00
Christian König
73d5902bed
Add editorconfig-checker workflow 
Add yml style to editorconfig
Add markdown styling to editorconfig

Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-07-02 09:36:52 +02:00
Dan Schaper
dcea3cf2c6
Merge branch 'development' into drop_fedora 2022-06-27 11:48:26 -07:00
Christian König
f9d1893f96
Update test to reflect currently supported OS 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-06-20 10:34:32 +02:00
Christian König
954a0c2a14
Remove read permission for others on senible log files 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-06-19 23:09:05 +02:00
Dan Schaper
67f5f16f84
Merge branch 'development' into fix-ipv6 2022-06-02 12:24:01 -07:00
yubiuser
ae9d16baf2
Merge pull request #3732 from pi-hole/tweak/moveloglocation 
Utilise /var/log/pihole/ for log storage
 2022-05-31 22:59:32 +02:00
Christian König
300c7b1518
Do not hardcode webroot dir for teleporter 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-05-31 14:11:39 +02:00
Christian König
dae96e7384
Change lighttpd log file names 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-05-29 21:04:18 +02:00
Christian König
52c3df1a8e
lighttpd log dir is now different than Pi-hole log dir 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-05-28 21:21:48 +02:00
Adam Warner
82695aba7d update LOG_DIRECTORY variable in debug script 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-05-15 07:09:27 +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
Omoeba
f7c800863e
Remove DHCPv6, use leasetime from interface (#4507) 
Signed-off-by: Omoeba <38597972+Omoeba@users.noreply.github.com>
 2022-05-11 11:57:42 -07:00
Adam Warner
d78c689e55
no more alphabetical order 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-21 19:56:21 +01:00
Adam Warner
c9e76c978e
Update advanced/Scripts/webpage.sh 
Co-authored-by: yubiuser <ckoenig@posteo.de>
 2022-04-17 13:39:55 +01:00
Adam Warner
23e6fa1ec5
Replace wrapper function calls with direct utils.sh calls. Leave warpper functions until next release as docker currently uses them, and new changes to utils.sh need to be in the master branch before docker can use them 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-15 09:50:40 +01: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
d3e94cbceb
Merge pull request #4653 from pi-hole/refactor-utils-redux 
Tweaks to functions in utils.sh and refactored usages in webpage.sh
 2022-04-04 23:25:54 +02:00
yubiuser
9b4f6c84cd
Minor review comments 2022-04-04 23:14:10 +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
Christian König
e4a1f3a175
Rename block lists to adlists within the query list functions 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-04-04 13:52:26 +02:00
Adam Warner
0d74b27101
Merge pull request #4646 from pi-hole/tweak/debug_message 
Pool identical messages in debug output
 2022-04-02 13:14:44 +01:00
Adam Warner
7fa8cdd03e
Address: 
- Review Comments
 - Stickler Complaints
 2022-04-02 12:46:07 +01:00
RD WebDesign
5cebceadda Remove @ and following character from interface name 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-03-30 21:32:18 -03:00
Adam Warner
59fc3804be
Make utils.sh posix compatible per request 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-03-16 20:40:25 +00:00
Adam Warner
48138d32b6
Adjust addOrEditKeyValPair to optionally take two or three arguments (adjust test to suit) 
Add a removeKey function with test

update webpage.sh to reference functions in utils.sh (this can likely be abstracted/refactored further)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-03-16 17:42:01 +00:00
Christian König
48136c5bbc
Add last timestamp 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-03-14 19:54:46 +01:00
Christian König
0219e5dfe0
Pool identical messages in debug output 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-03-12 21:00:48 +01:00
Adam Warner
0631cb4984
Merge pull request #4645 from rdwebdesign/color_debug_web 
Generate colorful debug logs to web interface
 2022-03-12 18:02:49 +00:00
RD WebDesign
40b96e673b Allows colorful debug logs via web interface 
Note: needs the AdminLTE code changes to work.

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-03-12 02:58:46 -03: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
DL6ER
91b4233d3a
Add backend option to set rate-limit from the dashboard 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-02-19 14:46:32 +01:00
Christian König
f4286a4d12
Fix log flush with new query database schema 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-02-12 23:33:19 +01:00
Adam Warner
08999bf315
Use case insensitive deletion when removing custom CNAME/DNS records in case of manual entries with mixed case having been added 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-02-04 21:16:02 +00:00
Adam Warner
2bd670a3dd
Merge pull request #4582 from lschloetterer/patch-1 
add parameter to set filename for teleporter
 2022-02-04 20:44:49 +00:00
Lukas Schlötterer
2a0bb5b9ee Create second entry for teleporter and adjust spacing 
Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>
 2022-02-04 21:29:23 +01:00
DL6ER
844c4dcdc8
Merge pull request #4584 from pi-hole/fix/gravity_internal_sqlite3 
Replace calls to sqlite3 by calls to pihole-FTL sqlite3
 2022-02-03 05:45:04 +01:00
Lukas Schlötterer
881d92632c
add hint for custom teleporter filename to help function 
Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>
 2022-02-01 09:41:57 +01:00
DL6ER
76d4e1209f
Merge pull request #4585 from pi-hole/tweak/sed-add-if-not-exists 
Replace value for BLOCKING_ENABLED, add if it does not already exist
 2022-02-01 07:45:34 +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
DL6ER
8cbffa179d
Replace remaining sqlite3 calls by calls to our embedded pihole-FTL sqlite3 engine and remove sqlite3 as dependency in the installer. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-01-30 11:18:17 +01:00