Christian König
d7f7ef9965
Only create VERSION_FILE if it does not exist
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
888e44e53d
Add hash functions to updatecheck
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
18d28533eb
Update local and remote versions at the same time
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
56527e5dd9
Add get_remote_version() to updatechecker
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Adam Warner
997a771dc8
Fix Deepsource.io warning message for index.php file ( #4953 )
2 years ago
Adam Warner
b7b5ffa8dd
remove old code per review from @yubiuser and @dschaper
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
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>
2 years ago
RD WebDesign
d48c557134
Fix Deepsource warning message for index.php file
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2 years ago
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>
2 years ago
Christian König
25ba68104b
Remove last traces
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
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>
2 years ago
Dan Schaper
f8a12917e2
Handle more than one default gateway in debug script ( #4934 )
2 years ago
Dan Schaper
37b45d411d
Read docker tag from file in root, not the previously set environment variable ( #4929 )
2 years ago
Christian König
22ebf21487
Use POSIX
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
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>
2 years ago
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>
2 years ago
Adam Warner
1c1407e083
Use utils.sh in install script ( #4872 )
2 years ago
Adam Warner
9463c3c69f
Change wording in chronometer ( #4910 )
2 years ago
Christian König
bb57a9e616
Handle more than one default gateway in debug script
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
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>
2 years ago
Christian König
60c35cb93c
Remove unused check_database_integrity()
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
2c3fea321b
Remove FAQ_ULA as it is unused in `core`
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
40f00c6f0b
Fix gravity database integrity check
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
00e51f32b5
Blcked => Block
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
f90fb8b946
Change wording in chronometer
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
yubiuser
2ff1fa1b85
Merge branch 'development' into use_utils
2 years ago
Christian König
7e6f81f814
Add comment in lighttpd.conf how to change the server port
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
RD WebDesign
5cc317de5b
Change texts after Block Page removal
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2 years ago
Adam Warner
3d53bda121
Update advanced/Scripts/updatecheck.sh
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2 years ago
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>
2 years ago
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>
2 years ago
Christian König
49b9dc8888
Remove json_extract function
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
9b5ea13a33
Use utils.sh in install script
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
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
2 years ago
Adam Warner
a4b899c256
Review suggestions (and shellcheck complaints)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Adam Warner
5421aad03e
Store versions as key/value pairs rather than space delimeted values
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Christian König
eeccfb27f8
Remove it also from index.php together with more unused variables
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
yubiuser
4cf3280500
Merge pull request #4862 from pi-hole/tweak/lighttpd_headers
...
Add security-related headers to Pi-hole web interface
2 years ago
Christian König
8c4a9aa6e3
Remove the email function
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Adam Warner
114f562758
Merge branch 'development' into removeblockpagefunctionality
2 years ago
Adam Warner
e35a9da921
Remove the blockpage-focussed customisations to query.sh
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
yubiuser
c67f313ee8
Apply reviewers suggestion for inline CSS
...
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: yubiuser <ckoenig@posteo.de>
2 years ago
Christian König
49a9f6f2db
Reproduce blockpage.css for $splashPage
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
e6683803ed
Use absolut asset paths
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
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>
2 years ago
Christian König
6c9bd7a632
Remove blockingpage.css
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Adam Warner
5d5a85b7b6
X-Pi-hole removed from blocking page...
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Adam Warner
c78cf82fc6
no need to declare $viewPort
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Christian König
d77677312c
Extend FTL information in debug log
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
DL6ER
f418481b9f
Add security-related headers to Pi-hole web interface
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2 years ago
Dan Schaper
989c52ef24
Exit with return code if ftl does not start
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2 years ago
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>
2 years ago
Adam Warner
0b81dd387b
type -> list_type per @yubiuser suggestion
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
yubiuser
aa0a9e2976
Merge pull request #4839 from pi-hole/move_getFTLPIDFile
...
Move FTL port and PID functions to utils.sh
2 years ago
Christian König
567a915336
Remove unused and outdated files and scripts
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
7b77d991df
Move FTL port and PID functions to utils.sh
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
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>
2 years ago
RD WebDesign
8d1f286f30
Only execute spinner function if there is a tty
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2 years ago
RD WebDesign
cbcd12631d
Adding the spinner for foreign_key_check too
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2 years ago
RD WebDesign
c4f9a475f3
Debug log - add spinner for long processes
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2 years ago
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>
2 years ago
yubiuser
8e4adb6e39
Merge pull request #4788 from pi-hole/SKIP_INSTALL
...
Rename PH_TEST to SKIP_INSTALL
2 years ago
Christian König
b49db58ec2
Fix spelling mistakes
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
518cbd10e0
Rename also in docker files
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
0a8761ee68
Rename PH_TEST to SKIP_INSTALL
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
469776afd6
Do not restrict RegEx added from CLI by length
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
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>
2 years ago
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>
2 years ago
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>
2 years ago
Dan Schaper
dcea3cf2c6
Merge branch 'development' into drop_fedora
2 years ago
Christian König
f9d1893f96
Update test to reflect currently supported OS
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
954a0c2a14
Remove read permission for others on senible log files
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Dan Schaper
67f5f16f84
Merge branch 'development' into fix-ipv6
2 years ago
yubiuser
ae9d16baf2
Merge pull request #3732 from pi-hole/tweak/moveloglocation
...
Utilise /var/log/pihole/ for log storage
2 years ago
Christian König
300c7b1518
Do not hardcode webroot dir for teleporter
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
dae96e7384
Change lighttpd log file names
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
yubiuser
3fa8f76d99
Combine mkdir in service file
...
Co-authored-by: MichaIng <micha@dietpi.com>
2 years ago
Christian König
52c3df1a8e
lighttpd log dir is now different than Pi-hole log dir
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
ce8731b746
no-dereference
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
08faf21b2e
Set file owner and permission to symlinks
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
2dd08f070e
Fix copy&paste error
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
0961103933
Add backward compatibility to FTL service by creating symlinks
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Adam Warner
82695aba7d
update LOG_DIRECTORY variable in debug script
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Adam Warner
36dd533ef3
use directory /var/log/pihole/ for log storage
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
yubiuser
0decc1252b
Respect user configurable path for pid and port file in pihole-FTL.service ( #4680 )
...
* Use pid file in pihole-FTL.service
Signed-off-by: Christian König <ckoenig@posteo.de>
Co-authored-by: MichaIng <micha@dietpi.com>
2 years ago
Omoeba
f7c800863e
Remove DHCPv6, use leasetime from interface ( #4507 )
...
Signed-off-by: Omoeba <38597972+Omoeba@users.noreply.github.com>
2 years ago
Adam Warner
d78c689e55
no more alphabetical order
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Adam Warner
c9e76c978e
Update advanced/Scripts/webpage.sh
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
2 years ago
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>
2 years ago
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>
2 years ago
Adam Warner
86dd612882
remove `readonly` directive from declaration of `utilsfile`, it is unnecassery
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
yubiuser
d3e94cbceb
Merge pull request #4653 from pi-hole/refactor-utils-redux
...
Tweaks to functions in utils.sh and refactored usages in webpage.sh
3 years ago
yubiuser
9b4f6c84cd
Minor review comments
3 years ago
Adam Warner
4d31d5ee11
Address review comments
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
3 years ago
Christian König
e4a1f3a175
Rename block lists to adlists within the query list functions
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Adam Warner
0d74b27101
Merge pull request #4646 from pi-hole/tweak/debug_message
...
Pool identical messages in debug output
3 years ago
Adam Warner
7fa8cdd03e
Address:
...
- Review Comments
- Stickler Complaints
3 years ago
Adam Warner
fe9031b26f
Merge pull request #4669 from pi-hole/master
...
sync: master to development
3 years ago
Dan Schaper
b714c4598a
Found it.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago
Dan Schaper
0f192998eb
Create empty files.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago