c2080324b7
Install netcat-openbsd as dependency explicitly
...
Since Debian Stretch and Ubuntu Bionic, the "netcat" package is a transitional dummy package which pulls in "netcat-traditional" on Debian Stretch+Buster and Ubuntu Bionic, and "netcat-openbsd" on Debian Bullseye, Ubuntu Focal and up.
On Debian Bookworm (testing), however, the "netcat" package has been removed during the last 3 days at time or writing, so that it fails do be installed. While "netcat-traditional" and "netcat-openbsd" both "Provides: netcat", since it's two alternatives, APT does not automatically pick one but aborts, and the only solution is to install one explicitly.
While this is likely a temporary state of the Debian testing suite, having a closer look at the two alternatives shows that "netcat-openbsd" is a much more actively maintained newer version with additional support for IPv6, proxies, and UNIX sockets, which is likely the reason for the gradual transition via meta package from "netcat-traditional" to "netcat-openbsd". This commit hence consequently follows this aim by skipping the transitional dummy package and installing "netcat-openbsd" explicitly as dependency, to avoid any possible errors like the one which occurs currently on Bookworm.
Both packages can be installed concurrently and do no conflict, but are managed via dpkg's "update-alternatives".
For reference:
- https://packages.debian.org/netcat
- https://packages.ubuntu.com/netcat
Signed-off-by: MichaIng <micha@dietpi.com >
2022-01-07 18:55:15 +01:00
0124e491d0
Merge pull request #4521 from pi-hole/fix/chronometer
...
Fix/chronometer
2022-01-05 22:51:43 +00:00
81698ef1ed
Fix Pi-hole status in chronometer
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-01-05 21:09:57 +01:00
2ff10fcd0a
Merge pull request #4514 from pi-hole/development
...
Pi-hole core v5.8
2022-01-05 18:24:21 +00:00
5823f5e254
Use ss instead of lsof ( #4518 )
...
* Use ss instead of lsof for pihole status checks
Signed-off-by: DL6ER <dl6er@dl6er.de >
* Use ss FILTER instead of piping into bash
Signed-off-by: DL6ER <dl6er@dl6er.de >
* Use ss in debug log generation
Signed-off-by: DL6ER <dl6er@dl6er.de >
* Remove lsof from dependencies
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-01-05 16:41:46 +00:00
7807a93e10
If PIHOLE_DOCKER_TAG is set, then include that info in the debug run ( #4515 )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2022-01-04 21:46:06 +00:00
c6a2a6f739
Install pihole-FTL.conf template on fresh installation ( #4496 )
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-01-04 19:09:30 +00:00
241e53ed45
Skip debug upload question if called from web interface ( #4494 )
...
* Skip debug upload question if called from web interface
Signed-off-by: Christian König <ckoenig@posteo.de >
* Suppress upload error if users opt-out from uploading from web interface
Signed-off-by: Christian König <ckoenig@posteo.de >
* Fix and reverse logic
Signed-off-by: Christian König <ckoenig@posteo.de >
* Remove addtional space
Signed-off-by: Christian König <ckoenig@posteo.de >
* Include reviewer's comment :D
Co-authored-by: Adam Warner <me@adamwarner.co.uk >
Co-authored-by: Adam Warner <me@adamwarner.co.uk >
2022-01-04 19:06:41 +00:00
d605b4b8f9
Merge pull request #4513 from pi-hole/master
...
master->development
2022-01-04 16:57:33 +00:00
0e359a6321
Set dnsmasq interface listening by default to local ( #4509 )
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-01-04 09:40:07 +01:00
5bd7cc9c9d
Replace which with command -v ( #4499 )
...
Signed-off-by: WaLLy3K WaLLy3K@users.noreply.github.com
2022-01-01 18:02:20 +00:00
886f0c7df3
Merge pull request #4485 from pi-hole/tweak/web_status
...
Return the port FTL is listening on in pihole status function
2021-12-29 11:13:12 +01:00
3989cc19e9
Remove double text output
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-12-28 19:55:42 +01:00
bcb59159ed
Analyse port also on ports other than 53
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-12-28 19:52:11 +01:00
2b52f92647
Inlcude port also in cli output
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-12-28 19:36:32 +01:00
71ed842dfd
Fixed path to 404 file when using custom.php ( #4488 )
...
Signed-off-by: Computroniks <mnickson@sidingsmedia.com >
2021-12-28 19:32:06 +01:00
f45248df80
Use FTL's new dns-port API endpoint
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-12-28 13:42:19 +01:00
5729f64ddc
Fix missing fi
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-12-28 12:21:31 +01:00
2a869419b4
Add netcat to dependencies
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-12-28 12:18:39 +01:00
4a2f4c1bce
Fix indention_2
...
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com >
2021-12-28 12:11:46 +01:00
5ef731fc57
Fix indention
...
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com >
2021-12-28 12:11:26 +01:00
71ebd64f4e
mend
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-12-26 18:13:14 +01:00
9f0e0dbd37
Fix analyse ports
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-12-26 18:10:36 +01:00
ef30a85afb
Include port in status function
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-12-26 17:10:48 +01:00
1b809e4e8e
Merge pull request #4480 from pi-hole/development
...
Pi-hole Core v5.7
2021-12-22 20:24:59 +00:00
3d3bb45a46
Merge pull request #4288 from pi-hole/new/gravity_repair
...
Implement fully-automated gravity database recovery method
2021-12-22 21:08:01 +01:00
d2a98ae954
Document -r recover force case
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-12-22 19:53:52 +01:00
2e1ce7fc87
Apply suggestions from code review
...
Co-authored-by: yubiuser <ckoenig@posteo.de >
2021-12-22 19:52:08 +01:00
920cf6de14
Check for updates on master based on tags not commits ( #4475 )
...
* Check for updates on master based on tags not commits
Signed-off-by: Christian König <ckoenig@posteo.de >
* Fix stickler
Signed-off-by: Christian König <ckoenig@posteo.de >
* Address reviewer's comments
Signed-off-by: Christian König <ckoenig@posteo.de >
* Fix stickler again
Signed-off-by: Christian König <ckoenig@posteo.de >
* Use local git instead of relying on github
Signed-off-by: Christian König <ckoenig@posteo.de >
* Add --tags
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com >
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com >
2021-12-22 18:21:44 +00:00
1eb31174a5
Merge pull request #4455 from pi-hole/comment
...
Add comment help text to list function
2021-12-21 22:26:05 +01:00
ff4487ff74
Escape quotes
...
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com >
2021-12-21 22:10:56 +01:00
54c58327f1
Merge pull request #4450 from pi-hole/unblock_NODATA
...
Unblock adlist domain during gravity run in NODATA mode
2021-12-21 22:08:14 +01:00
db5e94b14a
use +short and omit obsolet awk
...
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com >
2021-12-21 22:01:34 +01:00
7167e6d5e4
Apply suggestions from code review
...
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net >
2021-12-21 16:20:02 +01:00
39a66b608b
Replace Contributing Guide by link to docs.pi-hole.net ( #4433 )
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-12-21 14:00:47 +01:00
b06efb6ab7
Declare variables local
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-12-21 14:00:46 +01:00
ab4bce4787
Allow users to force recovery even when checks are okay using "pihole -g -r recover force"
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-12-21 13:57:03 +01:00
469c179b32
Return early from recovery routine when integrity checks didn't show any database errors.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-12-21 13:57:03 +01:00
190ab79606
Implement fully-automated gravity database recovery method.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-12-21 13:57:03 +01:00
669f1b0f4a
Address reviewer's comment
...
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com >
2021-12-21 12:58:39 +01:00
31de661bbb
Merge pull request #4414 from pi-hole/debug/custom.list
...
Add custom.list (Local DNS Records) to debug log
2021-12-21 12:37:11 +01:00
3a67d1cf8d
Merge pull request #4461 from pi-hole/qr_iframe
...
Companion to pi-hole/adminlte #1996
2021-12-20 21:51:05 +01:00
c0f454ddfa
Add new interface listening option "bind" ( #4476 )
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-12-20 21:36:19 +01:00
ef0a22f9ec
Merge pull request #4478 from pi-hole/fix/db_permission
...
Gravity database handling improvements
2021-12-20 21:28:09 +01:00
533a77d6d5
Add database function failure guards.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2021-12-20 11:36:55 -08:00
76ae75689c
Check for DNS before run.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2021-12-20 11:09:11 -08:00
a780fc59e2
Set DBFile permissions on creation.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2021-12-20 10:56:42 -08:00
28085cf7d8
Merge iFrame exceptions
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-12-17 10:08:16 +01:00
a3cc5df317
Configure stale action ( #4269 )
...
* Configure stale action
* [skip ci] Update .github/workflows/stale.yml
* Update .github/workflows/stale.yml
2021-12-16 20:19:11 +01:00
2eff53b2bb
Allow qr code iframe
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-12-10 07:17:53 +01:00
