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
MichaIng
2b124b1c69
Do not pass whole environment for PIHOLE_SKIP_OS_CHECK=true
...
With `sudo -E`, the whole environment is passed to the root shell, which is a potential security and/or privacy issue when command overrides/functions, PATH or private user info are passed. To pass `PIHOLE_SKIP_OS_CHECK=true`, it can be passed alone to the bash/script call within the sudo session, so the `-E` flag can be omitted.
Signed-off-by: MichaIng <micha@dietpi.com>
2 years ago
yubiuser
9356d7bbb1
Remove unnecessary case in uninstall script ( #4692 )
...
* Remove unnecessary case in uninstall script
* Better answer
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Adam Warner
29a867d5ae
Merge pull request #4690 from pi-hole/utils-sourcing
...
Prevent issues cause by declaring `utilsfile` as `readonly`
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
42d3368955
Merge pull request #4663 from pi-hole/no_root
...
Only use sudo power if needed
3 years ago
yubiuser
21ae81ffdb
Merge pull request #4682 from pi-hole/loop
...
Exit installer if dpkg lock is held for more then 30 seconds
3 years ago
yubiuser
b33434d02a
Let uses know how long they need to wait (max)
...
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
3 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
Adam Warner
9878477896
Merge pull request #4681 from pi-hole/adlist
...
Rename block lists to adlists within the query list functions
3 years ago
Christian König
c0a2ab7b77
Fix indention
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
30ba79f6a0
Let users know what's going on
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
cd3c97f113
Exit installer if dpkg lock is held for more then 30 seconds
...
Signed-off-by: Christian König <ckoenig@posteo.de>
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
yubiuser
6121c162ff
Fix typo
...
Co-authored-by: Marius Hanl <66004280+Maran23@users.noreply.github.com>
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
326cd6a1f8
Merge pull request #4665 from pi-hole/fix/touch_guard
...
Wrap touch calls with if/then guards for Buster docker.
3 years ago
Adam Warner
063f92f8f4
Merge pull request #4667 from pi-hole/test/hirsute_eol
...
Hirsute buildpack EOL upstream. Adding impish.
3 years ago
Adam Warner
be6a73f102
Merge pull request #4668 from pi-hole/test/python_3.8
...
Bump to python action v3. v2 has many changes.
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
Dan Schaper
8a5c7dec71
Ensure existing files are proper owner and mode.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
3 years ago
Dan Schaper
69e4e9a2ae
Bump to python action v3. v2 has many changes.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago
Dan Schaper
4230be0c80
Hirsute buildpack EOL upstream. Adding impish.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago
Dan Schaper
d45c9fc522
Final touch to install fix.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago
yubiuser
efa99a177e
Merge pull request #4664 from rdwebdesign/fix/docker_1015
...
Remove `@` and following character from interface name
3 years ago
Dan Schaper
c2384ecc6f
Change touch that would always fire to install.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago
Dan Schaper
2f38452565
Wrap touch calls with if/then guards for Buster docker.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
3 years ago
RD WebDesign
5cebceadda
Remove `@` and following character from interface name
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
3 years ago
Christian König
722a716de3
Add exit code to status function
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
614d18cd3d
Debug need sudo
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
54ce8c2622
Only use sudo power if needed
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
yubiuser
329c161054
Merge pull request #4659 from rdwebdesign/fix4656_part2
...
Select the protocol on the blocking page
3 years ago
RD WebDesign
f8e84b3c3f
Fix stickler
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
3 years ago
RD WebDesign
c9809371ab
Selecting the protocol
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
3 years ago
yubiuser
a48750e257
Merge pull request #4657 from rdwebdesign/fix4656
...
Add check to avoid error in PHP 8 on the blocking page
3 years ago
RD WebDesign
0d4c69cc6f
Add check to avoid error in PHP 8
...
and return some information about the unexpected value
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
3 years ago
yubiuser
479b2bc075
Merge pull request #4655 from y0ngb1n/fix-wrong-words
...
Fixed wrong words in `README.md`
3 years ago
Yang Bin
2ade05d60f
Fixed wrong words in `README.md`
...
Signed-off-by: Yang Bin <y0ngb1n@163.com>
3 years ago
Adam Warner
59fc3804be
Make utils.sh posix compatible per request
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
3 years ago
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>
3 years ago
yubiuser
ff5e788889
Merge pull request #4652 from rdwebdesign/debuglog_improvements
...
Improving debug log
3 years ago
RD WebDesign
ab7d83384f
Allow lighttpd to stream responses to browser
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
3 years ago
Christian König
48136c5bbc
Add last timestamp
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Christian König
0219e5dfe0
Pool identical messages in debug output
...
Signed-off-by: Christian König <ckoenig@posteo.de>
3 years ago
Adam Warner
0631cb4984
Merge pull request #4645 from rdwebdesign/color_debug_web
...
Generate colorful debug logs to web interface
3 years ago