sync: master to development #1
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
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: DL6ER <[email protected]>
…or it. Can be used in future to organise re/commonly-used code Signed-off-by: Adam Warner <[email protected]>
Fix stale label to stale
sync: master to development
Signed-off-by: DL6ER <[email protected]>
Fix updating based on tags on older git versions by doing a full fetch
Replace value for BLOCKING_ENABLED, add if it does not already exist
Signed-off-by: Lukas Schlötterer <[email protected]>
…ite3 Replace calls to sqlite3 by calls to pihole-FTL sqlite3
Switch from centos8 to centos8:stream base image for centos 8 tests
Signed-off-by: Christian König <[email protected]> Remove double https:// Signed-off-by: Christian König <[email protected]>
Signed-off-by: Christian König <[email protected]>
Co-authored-by: DL6ER <[email protected]>
Signed-off-by: Lukas Schlötterer <[email protected]>
Remove pihole-FTL.conf manpage
add parameter to set filename for teleporter
…in case of manual entries with mixed case having been added Signed-off-by: Adam Warner <[email protected]>
Use case insensitive deletion when removing custom CNAME/DNS records
Pi-hole Core v5.9
Signed-off-by: Dan Schaper <[email protected]>
Signed-off-by: Dan Schaper <[email protected]>
Signed-off-by: Dan Schaper <[email protected]>
Signed-off-by: Dan Schaper <[email protected]> co-authored-by: RD WebDesign <[email protected]>
Signed-off-by: Dan Schaper <[email protected]>
Signed-off-by: Dan Schaper <[email protected]>
Wrap touch calls with if/then guards for Buster docker.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
sync-branches: New code has just landed in master, so let's bring development up to speed!