ainur/pi-hole
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
5,791 Commits 10 Branches 126 Tags
ec82aec55fab2b0e751b3ff181d8aab8b653feab
Commit Graph

1425 Commits

Author SHA1 Message Date
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