Pi-hole core v5.5

Signed-off-by: Christian König <[email protected]>

Signed-off-by: Christian König <[email protected]>

Signed-off-by: Christian König <[email protected]>

Signed-off-by: Christian König <[email protected]>

Tweak local DNS record and CNAME

Signed-off-by: bcambl <[email protected]>

Pi-hole v5.6

Signed-off-by: Christian König <[email protected]>

Signed-off-by: David Irvine <[email protected]>

Fix documentation; add some missing zones

Signed-off-by: Christian König <[email protected]>

…pi-hole#4421)

* Only change the recommendation to use apt

Signed-off-by: Christian König <[email protected]>

* Allow users to skip setting static IP adresss

Signed-off-by: Christian König <[email protected]>

…e#3191)

* add test for file permissions of $webroot

Signed-off-by: pvogt09 <[email protected]>

* changes sudo to su for running command as user www-data

Signed-off-by: pvogt09 <[email protected]>

* installs PIHOLE_WEB_DEPS to create LIGHTTPD_USER

Signed-off-by: pvogt09 <[email protected]>

* changes stdout to rc

Signed-off-by: pvogt09 <[email protected]>

* use installPihole instead of installPiholeWeb in test

Signed-off-by: pvogt09 <[email protected]>

* try installation process with main

Signed-off-by: pvogt09 <[email protected]>

* mock systemctl

Signed-off-by: pvogt09 <[email protected]>

* removes stickler errors

Signed-off-by: pvogt09 <[email protected]>

* start lighttpd and make webpage test optional

Signed-off-by: pvogt09 <[email protected]>

* test all files and directories in $webroot

Signed-off-by: pvogt09 <[email protected]>

* fix stickler and codefactor warnings

Signed-off-by: pvogt09 <[email protected]>

* set permission for /var/cache if it did not exist before

Signed-off-by: pvogt09 <[email protected]>

* add test case for pihole files

Signed-off-by: pvogt09 <[email protected]>

* fix stickler errors

Signed-off-by: pvogt09 <[email protected]>

* revert "set permission for /var/cache if it did not exist before" and make lighttpd start work

Signed-off-by: pvogt09 <[email protected]>

* add --add-cap=NET_ADMIN to enable FTL start

Signed-off-by: pvogt09 <[email protected]>

* specify DNS server for cURL

Signed-off-by: pvogt09 <[email protected]>

* check files created by FTL

Signed-off-by: pvogt09 <[email protected]>

* reorder code and change nameserver in /etc/resolv.conf

Signed-off-by: pvogt09 <[email protected]>

* resolve with dig instead of relying on /etc/resolv.conf

Signed-off-by: pvogt09 <[email protected]>

* set IP to 127.0.0.1 in setupVars.conf for blockpage tests

Signed-off-by: pvogt09 <[email protected]>

* resolve domain with dig and remove debug output

Signed-off-by: pvogt09 <[email protected]>

* fix stickler errors

Signed-off-by: pvogt09 <[email protected]>

* no git pull in Github Action runs for pull requests

Signed-off-by: pvogt09 <[email protected]>

* --cap-add=ALL test

Signed-off-by: pvogt09 <[email protected]>

* fix stickler errors

Signed-off-by: pvogt09 <[email protected]>

* remove debug code

Signed-off-by: pvogt09 <[email protected]>

* update_repo patch for CentOS 7 in Github Actions

Signed-off-by: pvogt09 <[email protected]>

* removes TODOs and stickler warnings

Signed-off-by: pvogt09 <[email protected]>

* adds trailing slash to domain

Signed-off-by: pvogt09 <[email protected]>

* use only first result from dig

Signed-off-by: pvogt09 <[email protected]>

* domain name resolution does not work reliably in docker container

Signed-off-by: pvogt09 <[email protected]>

* repair executable permission

Signed-off-by: pvogt09 <[email protected]>

* Create mock_command_passthrough that allows intercepting of specific arguments - everything else is passed through to the proper command. Use this new command instead of making changes in basic-install.sh to make the tests pass.

Signed-off-by: Adam Warner <[email protected]>

Co-authored-by: Adam Warner <[email protected]>

* unpin the requirements and update all to latest available - needs more work still. see notes in `def host()`

Signed-off-by: Adam Warner <[email protected]>

* fix py3 monkey patch of testinfra docker using bash

Signed-off-by: Adam Hill <[email protected]>

* update the other test files to use `host` instead of `Pihole`
Address some sticklr and codefactor
update python version from 3.7 to 3.8
preload `git` onto the centos/fedora test images, and switch which with command -v in the passthrough mock
testinfra is deprecated, use pytest-testinfra

Signed-off-by: Adam Warner <[email protected]>

Co-authored-by: Adam Hill <[email protected]>

Remove unused code from webpage.sh

This solves the issue reported here: pi-hole#4196
It replaces the other suggested solution here: pi-hole#4197

The benefit of using a fixed/limited list height, compared to allowing larger whiptail/dialogue dimension, is that it works on small screens as well, where the screen or console size itself is too small to hold the interface list + text above + whiptail frame.

It the amount of list elements exceeds the defined list height, automatically a visual scroll bar is added and the list can be scrolled with up/down pageup/pagedown buttons, hence it is generally not required to adjust a list height based on the amount of elements. The fixed height of "6" is chosen since all other "--radiolist" calls use this fixed height as well, it fits and looks good within a 20 rows high whiptail dialogue, and in the common Pi-hole use cases there are no more than 6 network interfaces.

Signed-off-by: MichaIng <[email protected]>

Use a fixed list height for network interface selection

Done with the help of beautysh (a python-based bash formatter)

Signed-off-by: jbzdarkid <[email protected]>

Clean up bash script formatting

Signed-off-by: MichaIng <[email protected]>

Fix generated /etc/os-release file in OS check test

Co-authored-by: abesnier <[email protected]>
Signed-off-by: Christian König <[email protected]>

* Some shellchecks in basic-install.sh

Signed-off-by: ChillerDragon <[email protected]>

* Use more explicit grep (thanks to @MichaIng)

Signed-off-by: ChillerDragon <[email protected]>

* Fix pi-hole#4279

Signed-off-by: Subhaditya Nath <[email protected]>

* Don't ignore exit code of version.sh

If it exits with a non-zero return code, that means some error occurred,
and so it shouldn't be ignored.

Signed-off-by: Subhaditya Nath <[email protected]>

* Implement changes suggested by @Michalng

Signed-off-by: Subhaditya Nath <[email protected]>

* Implement changes suggested by @PromoFaux

Signed-off-by: Subhaditya Nath <[email protected]>

* Always source /etc/pihole/setupVars.conf

pi-hole#4370 (comment)

Co-authored-by: Adam Warner <[email protected]>

Signed-off-by: Christian König <[email protected]>

Fix number of invalid domains

Signed-off-by: Christian König <[email protected]>

Signed-off-by: Christian König <[email protected]>

Signed-off-by: Christian König <[email protected]>

Signed-off-by: Christian König <[email protected]>

Signed-off-by: Christian König <[email protected]>

* Configure stale action

* [skip ci] Update .github/workflows/stale.yml

* Update .github/workflows/stale.yml

Signed-off-by: Christian König <[email protected]>

Signed-off-by: Dan Schaper <[email protected]>

Signed-off-by: Dan Schaper <[email protected]>

Signed-off-by: Dan Schaper <[email protected]>

Gravity database handling improvements

Signed-off-by: DL6ER <[email protected]>

Companion to pi-hole/adminlte pi-hole#1996

Add custom.list (Local DNS Records) to debug log

Co-authored-by: DL6ER <[email protected]>

Signed-off-by: DL6ER <[email protected]>

…any database errors.

Signed-off-by: DL6ER <[email protected]>

… -g -r recover force"

Signed-off-by: DL6ER <[email protected]>

Signed-off-by: DL6ER <[email protected]>

Signed-off-by: Christian König <[email protected]>

Co-authored-by: Dan Schaper <[email protected]>

Co-authored-by: DL6ER <[email protected]>

Unblock adlist domain during gravity run in NODATA mode

Co-authored-by: DL6ER <[email protected]>

Add comment help text to list function

* Check for updates on master based on tags not commits

Signed-off-by: Christian König <[email protected]>

* Fix stickler

Signed-off-by: Christian König <[email protected]>

* Address reviewer's comments

Signed-off-by: Christian König <[email protected]>

* Fix stickler again

Signed-off-by: Christian König <[email protected]>

* Use local git instead of relying on github

Signed-off-by: Christian König <[email protected]>

* Add --tags

Co-authored-by: DL6ER <[email protected]>

Co-authored-by: DL6ER <[email protected]>

Co-authored-by: yubiuser <[email protected]>

Signed-off-by: DL6ER <[email protected]>

Implement fully-automated gravity database recovery method

Pi-hole Core v5.7

Signed-off-by: Christian König <[email protected]>

Signed-off-by: Christian König <[email protected]>

Signed-off-by: Christian König <[email protected]>

Co-authored-by: DL6ER <[email protected]>

Co-authored-by: DL6ER <[email protected]>

Signed-off-by: Christian König <[email protected]>

Signed-off-by: Christian König <[email protected]>

Signed-off-by: Christian König <[email protected]>

Signed-off-by: Computroniks <[email protected]>

Signed-off-by: Christian König <[email protected]>

Signed-off-by: Christian König <[email protected]>

Signed-off-by: Christian König <[email protected]>

Return the port FTL is listening on in pihole status function

Signed-off-by: WaLLy3K [email protected]

Signed-off-by: Christian König <[email protected]>

master->development

* Skip debug upload question if called from web interface

Signed-off-by: Christian König <[email protected]>

* Suppress upload error if users opt-out from uploading from web interface

Signed-off-by: Christian König <[email protected]>

* Fix and reverse logic

Signed-off-by: Christian König <[email protected]>

* Remove addtional space

Signed-off-by: Christian König <[email protected]>

* Include reviewer's comment :D

Co-authored-by: Adam Warner <[email protected]>

Co-authored-by: Adam Warner <[email protected]>

Signed-off-by: Christian König <[email protected]>

…i-hole#4515)

Signed-off-by: Adam Warner <[email protected]>

* Use ss instead of lsof for pihole status checks

Signed-off-by: DL6ER <[email protected]>

* Use ss FILTER instead of piping into bash

Signed-off-by: DL6ER <[email protected]>

* Use ss in debug log generation

Signed-off-by: DL6ER <[email protected]>

* Remove lsof from dependencies

Signed-off-by: DL6ER <[email protected]>

Pi-hole core v5.8

Signed-off-by: Christian König <[email protected]>

Fix/chronometer

v5.8.1

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 <[email protected]>

Put Stale in to action.

Enable Stale Action for live use

…v'ed containers do not have access to the information required to resolve the service name listening - and the container should not start if there was a port conflict anyway (pi-hole#4536)

Signed-off-by: Adam Warner <[email protected]>

…i-hole#4535)

Signed-off-by: DL6ER <[email protected]>

Install netcat-openbsd as dependency explicitly

Sync Master -> Dev

Signed-off-by: Christian König <[email protected]>

Remove oneline from ss call

…ice issues (where hops-away is measured)

Signed-off-by: DL6ER <[email protected]>

Include ip addr show and ip route show in debug log