arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 06:48:07 +00:00
Code Issues Releases Wiki Activity
5,919 Commits 9 Branches 109 Tags 20 MiB
master
Commit Graph

1892 Commits

Author SHA1 Message Date
Glenn Strauss
539f9d4da0
lighttpd: remove pihole block page error handler 
remove obsolete pihole block page error handler

x-ref:
  Remove the advanced functionality of the 404 page (Blockpage)
  https://github.com/pi-hole/pi-hole/pull/3910
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
 2022-12-19 17:53:14 -05:00
Glenn Strauss
c6342ed84c
lighttpd: do not overwrite /etc/lighttpd/lighttpd.conf 
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
 2022-12-19 16:19:03 -05:00
Glenn Strauss
0d5d3a1b22
lighttpd: remove obsolete exclusion of letsencrypt.conf 
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
 2022-12-19 14:56:27 -05:00
Glenn Strauss
08c7691d1e
lighttpd pihole-admin.conf for admin interface 
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
 2022-12-19 02:34:29 -05:00
Glenn Strauss
62bf9957dc
lighttpd conf: collect ^/admin/ conditions 
move a sub-condition to be a nested condition under ^/admin/

Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
 2022-12-18 12:53:05 -05:00
Glenn Strauss
dafc9983f5
lighttpd include external.conf using file glob 
lighttpd 1.4.40 and later support 'include' using file glob

(The prior code for compatibility was presumably for Debian Jessie
 and earlier, now obsolete.  Debian Stretch -- currently oldstable --
 ships with lighttpd 1.4.45)

Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
 2022-12-18 12:52:58 -05:00
Neill Wolf
d245226053
set X-XSS-Protection headers to 0 in lighttpd.conf 
Signed-off-by: Neill Wolf <neillawolf@gmail.com>
 2022-12-16 16:01:35 -06:00
Adam Warner
fc83883934
Apply suggestions from code review 
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
 2022-12-11 17:48:45 +00:00
RD WebDesign
1550f29f06
Use GREEN if dig was successful 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-12-11 14:42:47 -03:00
RD WebDesign
a206980242
Fix parenthesis color 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-12-11 14:42:47 -03:00
RD WebDesign
8c2f56b0e6
Imporving the output from os_check() function 
- add red color to dig errors
- reorder some output lines
- add "Distro and version supported" on success

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-12-11 14:42:46 -03:00
RD WebDesign
b4349b41ce
Use the correct variable digReturnCode 
also use INFO instead of CROSS, because it's not an error.

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-12-11 14:42:46 -03:00
RD WebDesign
67f04787d6
Only compare OS versions if dig was successful 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-12-11 14:42:35 -03:00
Christian König
f713b14ba0
Cleanup if startup failed 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-12-08 09:49:02 +01:00
Adam Warner
ff5ee29566
Add native systemd service (#4924) 2022-11-27 21:41:35 +00:00
Adam Warner
38775cffdf
Ensure local hash is always of length 8, for consistency. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-11-14 22:51:39 +00:00
Adam Warner
ba74051502
Grab local FTL hash correctly from FTL's own version output, and grab one digit less for remote hashes (also in debug log) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-11-14 22:09:26 +00:00
Adam Warner
cdbe4c9b86
Get only the precise tag number when getting local version, do not show branch name when on master branch(es) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-11-14 20:39:34 +00:00
Christian König
7536c312ee
Correctly identify process status in debug script on docker 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-11-13 21:53:59 +01:00
Adam Warner
a8b6eb9b70
Touch files before addKey or addOrEditKeyValPair (#4999) 2022-11-09 23:37:30 +00:00
Christian König
67385b7ed4
Touch files before addKey or addOrEditKeyValPair 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-11-09 21:25:09 +01:00
Adam Warner
64e61aac4a
Simplify versions.sh (#4959) 2022-11-09 17:15:51 +00:00
Dan Schaper
3491dbfd04
Check versions file on the debug log (#4977) 2022-10-31 13:25:15 -07:00
MichaIng
81927334f2
Add native systemd service 
Inspired by: https://github.com/pi-hole/pi-hole/pull/2112

A pre-start and a post-stop script are added to reduce doubled setup and cleanup code.

Since systemd services do not natively support dynamic users, test once whether capabilities are supported during install/update, and remove User=pihole otherwise.

Signed-off-by: MichaIng <micha@dietpi.com>
Co-authored-by: DL6ER <dl6er@dl6er.de>
 2022-10-30 19:40:33 +01:00
yubiuser
01bf9ca42a
Prevent CNAME loop (#4988) 2022-10-29 15:44:03 +02:00
Christian König
c8c6533440
Add small explanation. 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-29 15:09:14 +02:00
Dan Schaper
f1b15f7e92
Remove check for latest component version in debug log (#4973) 2022-10-28 17:27:05 -07:00
DL6ER
e0c351f0e4
Remove unused possibility to obfuscate pihole.log in debug log (#4974) 2022-10-28 13:16:30 -04:00
Christian König
128a3ab1be
Go POSIX 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-22 22:39:42 +02:00
Christian König
df3e9e5f51
Disable shellcheck as it suggests a bashism 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-22 22:25:40 +02:00
Christian König
c322458dcb
Escape dots in local DNS records/CNAMES before removing them 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-21 13:02:21 +02:00
Christian König
21be1bd58e
Prevent CNAME loop 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-20 07:29:14 +02:00
Christian König
4c9401175c
Remove check for latest version 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-15 09:06:57 +02:00
Christian König
235673dac8
Remove unused possibility to obfuscate pihole.log 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-15 08:58:12 +02:00
RD WebDesign
d737948f64
Add versions file to the REQUIRED_FILES list 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-10-14 14:11:19 -03:00
Christian König
52283478c8
Run pihole updatechecker if versions file is not found 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-14 13:26:06 +02:00
Christian König
c84be5de61
Reorganize by component rather then source 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-14 13:18:12 +02:00
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
997a771dc8
Fix Deepsource.io warning message for index.php file (#4953) 2022-10-01 22:57:32 +01: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
RD WebDesign
d48c557134
Fix Deepsource warning message for index.php file 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-09-30 17:13:08 -03: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
1c1407e083
Use utils.sh in install script (#4872) 2022-09-24 14:00:22 +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
yubiuser
2ff1fa1b85
Merge branch 'development' into use_utils 2022-09-17 16:14:31 +02:00
Christian König
7e6f81f814
Add comment in lighttpd.conf how to change the server port 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-17 12:00:33 +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
Christian König
9b5ea13a33 Use utils.sh in install script 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-08-24 08:49:20 +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
eeccfb27f8
Remove it also from index.php together with more unused variables 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-08-20 23:07:38 +02:00
yubiuser
4cf3280500
Merge pull request #4862 from pi-hole/tweak/lighttpd_headers 
Add security-related headers to Pi-hole web interface
 2022-08-18 13:37:28 +02: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
yubiuser
c67f313ee8
Apply reviewers suggestion for inline CSS 
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2022-08-08 17:21:29 +01:00
Christian König
49a9f6f2db
Reproduce blockpage.css for $splashPage 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-08-08 17:21:29 +01:00
Christian König
e6683803ed
Use absolut asset paths 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-08-08 17:21:29 +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
Christian König
6c9bd7a632
Remove blockingpage.css 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-08-08 17:20:13 +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
Adam Warner
c78cf82fc6
no need to declare $viewPort 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-08 17:12:09 +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
DL6ER
f418481b9f
Add security-related headers to Pi-hole web interface 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-08-06 15:35:01 +02:00
Dan Schaper
989c52ef24
Exit with return code if ftl does not start 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2022-08-04 17:20:39 -07:00
Christian König
3327df8d9c
Ensure user defined FTL_PID_FILE and FTL_PORT_FILE dirs are created on startup 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-08-04 14:47:43 +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