d85fee27a9
Merge pull request #4420 from pi-hole/clean/webpage.sh
...
Remove unused code from webpage.sh
2021-11-20 21:13:50 +01:00
cdd4d9ea9e
Update the tests ( #4427 )
...
* unpin the requirements and update all to latest available - needs more work still. see notes in `def host()`
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
* fix py3 monkey patch of testinfra docker using bash
Signed-off-by: Adam Hill <adam@diginc.us >
* 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 <me@adamwarner.co.uk >
Co-authored-by: Adam Hill <adam@diginc.us >
2021-11-18 01:03:37 +00:00
cedd1a2591
unit test for umask problems in #3177 and #2730 ( #3191 )
...
* add test for file permissions of $webroot
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* changes sudo to su for running command as user www-data
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* installs PIHOLE_WEB_DEPS to create LIGHTTPD_USER
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* changes stdout to rc
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* use installPihole instead of installPiholeWeb in test
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* try installation process with main
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* mock systemctl
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* removes stickler errors
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* start lighttpd and make webpage test optional
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* test all files and directories in $webroot
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* fix stickler and codefactor warnings
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* set permission for /var/cache if it did not exist before
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* add test case for pihole files
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* fix stickler errors
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* revert "set permission for /var/cache if it did not exist before" and make lighttpd start work
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* add --add-cap=NET_ADMIN to enable FTL start
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* specify DNS server for cURL
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* check files created by FTL
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* reorder code and change nameserver in /etc/resolv.conf
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* resolve with dig instead of relying on /etc/resolv.conf
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* set IP to 127.0.0.1 in setupVars.conf for blockpage tests
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* resolve domain with dig and remove debug output
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* fix stickler errors
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* no git pull in Github Action runs for pull requests
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* --cap-add=ALL test
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* fix stickler errors
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* remove debug code
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* update_repo patch for CentOS 7 in Github Actions
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* removes TODOs and stickler warnings
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* adds trailing slash to domain
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* use only first result from dig
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* domain name resolution does not work reliably in docker container
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* repair executable permission
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
* 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 <me@adamwarner.co.uk >
Co-authored-by: Adam Warner <me@adamwarner.co.uk >
2021-11-11 16:44:57 +00:00
ac4a975be5
Allow users to skip setting static IP adress ( #4419 )
...
* Allow users to skip setting static IP adresss
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-11-06 20:32:03 +00:00
996f8fff28
Recommend apt instead of apt-get if updating the package cache failed ( #4421 )
...
* Only change the recommendation to use apt
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-11-04 15:55:16 -07:00
e733553295
Remove unused code from webpage.sh
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-11-02 21:22:14 +01:00
0c4e1b51ab
Merge pull request #4417 from aviddiviner/fix-rfc-config-docs
...
Fix documentation; add some missing zones
2021-10-28 20:13:42 +02:00
c6da1a3918
Fix documentation; add some missing zones
...
Signed-off-by: David Irvine <aviddiviner@gmail.com >
2021-10-28 12:09:34 +02:00
c1eb35a35e
Add custom.list (Local DNS Records) to debug log
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-26 22:46:52 +02:00
b5e0f142cc
Merge pull request #4405 from pi-hole/development
...
Pi-hole v5.6
2021-10-23 20:01:27 +01:00
8713135b01
update tests: remove fedora 32, add fedora 34 ( #4403 )
...
Signed-off-by: bcambl <blayne@blaynecampbell.com >
2021-10-23 19:43:20 +01:00
7cdd8871e5
Merge pull request #4384 from pi-hole/tweak/local_dns_cname
...
Tweak local DNS record and CNAME
2021-10-23 16:38:52 +02:00
596689b4c9
Validate host/domain of Local DNS records as well
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-19 21:34:16 +02:00
a872fabe7d
Validate on removal as well
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-17 20:56:08 +02:00
bc21a7155d
Add option to not reload
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-12 19:53:59 +02:00
b7bba6a689
Validate when adding not when removing
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-12 19:32:55 +02:00
04f9e92bff
Fix PHP8.0 detection ( #4383 )
...
The phpInsNewer variable is not set anymore, so that the JSON module is now always tried to be installed. Instead of checking for phpInsNewer to derive whether PHP was installed already, phpInsMajor is now checked. If it is set, PHP is installed already, and only if the major version is lower than 8, the JSON module can be installed.
Signed-off-by: MichaIng <micha@dietpi.com >
2021-10-11 20:43:12 +01:00
16fb6665ec
Merge pull request #4380 from pi-hole/df
...
Include df -h in debug log
2021-10-11 19:09:22 +02:00
d84da71310
Only show lines not containing sensitive keywords
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-11 18:02:47 +02:00
77a30ac0c2
Use mapfile
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-11 17:31:03 +02:00
56fb954d64
Merge pull request #4321 from pi-hole/tweak/finalwhiptail
...
Tweak final whiptail dialog
2021-10-11 10:04:25 +02:00
99981b5e66
now that whiptail size is fixed, lose a couple of lines from the final whiptail output
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2021-10-11 09:55:56 +02:00
19ae9d3ee6
Merge pull request #4375 from pi-hole/companion/adminlte-1231
...
Companion to pi-hole/adminlte #1231
2021-10-10 19:03:59 +02:00
d03aa0c0c7
Merge pull request #4379 from pi-hole/tweak/vw_adlist
...
Simplify vw_adlist
2021-10-10 07:11:05 +02:00
3c41ec08a3
Set file permission for querie database in pihole-FTL.service ( #4328 )
...
* Set file permission for querie database in pihole-FTL.service
Signed-off-by: Christian König <ckoenig@posteo.de >
* Use -f flag for chmod of the macvendor.db
Signed-off-by: Christian König <ckoenig@posteo.de >
* Fix missing space
Signed-off-by: Christian König <ckoenig@posteo.de >
* Fix spelling
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-08 22:54:23 +01:00
fdc4cf9869
Fix stickler
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-08 21:54:50 +02:00
a0ecfcc1dc
Include df -h in debug log
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-08 21:50:46 +02:00
b30d729aa4
Simplify vw_adlist
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-08 21:08:10 +02:00
f8af1a1baa
Allow iFrame for teleporter.php, see https://github.com/pi-hole/AdminLTE/pull/1231
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2021-10-07 00:16:07 +01:00
ab27a3bd45
Dependabot config tweak
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2021-10-06 23:30:29 +01:00
f3acc7c839
Make debug log file size human readable ( #4350 )
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-06 15:19:25 -07:00
6f6b54ea05
Merge pull request #4373 from friederbluemle/rm-idea
...
Remove .idea/
2021-10-06 20:07:27 +02:00
3cad8e4c5b
Remove .idea/
...
Signed-off-by: Frieder Bluemle <frieder.bluemle@gmail.com >
2021-10-06 13:38:21 +02:00
9535e2fd6d
Merge pull request #4363 from xanoni/update-upstream-dns-capabilities
...
Update upstream DNS server capability descriptions
2021-10-06 07:18:14 +02:00
0ea7344c30
add --no-rebase to the git pull command(s) to squelch hint message in newer versions of git ( #4226 )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2021-10-06 01:19:28 +01:00
55dce14655
Add execution bit accidentally dropped in #4106 ( #4368 )
...
Add some smoke tests for the repository.
- Add x bit to piholeCheckout.sh. Possibly not needed, but consistency is no bad thing
- Ensure all files in script directorys have executable bit set
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2021-10-05 19:34:51 +01:00
5bf35dc687
Add Dependabot and CodeQL support ( #4286 )
...
Signed-off-by: Jauder Ho <jauderho@users.noreply.github.com >
Co-authored-by: Adam Warner <me@adamwarner.co.uk >
2021-10-05 18:22:46 +01:00
c5828df198
Consequently use defined file path variables ( #4105 )
...
The script defines variables for the most important file paths which are not always used to call the file paths. "lighttpdConfig" was never used in the script itself, so that a shellcheck exception needed to be used. With this change, the defined variables are consequently used, which makes the shellcheck exception obsolete as well.
Additionally the assigned strings are quoted, which is not necessary here but aligns with the coding standard and highlights the strings in most editors and development platforms for developer convenience.
Signed-off-by: MichaIng <micha@dietpi.com >
2021-10-05 16:40:12 +01:00
77e322afa6
(docs) update README.md ( #4371 )
...
- correct grammar
- correct punctuation
- correct pronoun usage
Co-authored-by: Vladislav Doster <mvdoster@gmail.com >
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
Co-authored-by: Vladislav Doster <mvdoster@gmail.com >
2021-10-05 16:25:29 +01:00
541257849d
List fix: no reload ( #3981 )
...
* scripts/list: Fixed --noreload options
We should differentiate the ability and the needings.
Signed-off-by: Andras Tim <andras.tim@gmail.com >
* scripts/list: Removed unnecessary tailing whitespaces
Signed-off-by: Andras Tim <andras.tim@gmail.com >
* Update advanced/Scripts/list.sh
Signed-off-by: Andras Tim <andras.tim@gmail.com >
* Merge bash conditions according to MichaIng suggestion
Co-authored-by: micha@dietpi.com
Signed-off-by: Andras Tim <andras.tim@gmail.com >
2021-10-05 15:52:51 +01:00
80560d4a4a
Do not export DNS_FQDN_REQUIRED and DNS_BOGUS_PRIV unconditionally ( #4354 )
...
* Do not export unconditionally
Signed-off-by: Christian König <ckoenig@posteo.de >
* Check if variable is unset instead of grep for it
Signed-off-by: Christian König <ckoenig@posteo.de >
* Use bash's buld in word syntax
Signed-off-by: Christian König <ckoenig@posteo.de >
* Move export back to their brothers
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-05 14:36:00 +01:00
38bb4a4908
Remove unused wildcard_regex_converter.sh ( #4369 )
...
* Remove unused wildcard_regex_converter.sh
Signed-off-by: Christian König <ckoenig@posteo.de >
* Remove regexconverter
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-05 13:09:16 +01:00
2b74b47b4a
Remove netcat from dependencies ( #4346 )
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-05 01:47:18 +01:00
109340033e
Do not account for refactor anymore ( #4355 )
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-05 01:22:27 +01:00
0f246b8df5
Update upstream DNS server capability descriptions
...
Mention that the below 3 upstream DNS support DNSSEC:
- Cloudflare (see https://developers.cloudflare.com/1.1.1.1/faq#how-does-1111-work-with-dnssec )
- DNS.WATCH (see https://dns.watch/index )
- Google (see https://developers.google.com/speed/public-dns/faq#dnssec )
- Quad9 (see https://www.quad9.net/support/faq/#dnssec )
Other providers and capabilities (e.g., ECS) were not checked.
Signed-off-by: xanoni <77220130+xanoni@users.noreply.github.com >
2021-10-04 13:55:20 -04:00
5b03160295
Install script comment tweaks ( #4361 )
2021-10-04 11:40:53 +01:00
7b0513d1e6
Merge pull request #4357 from yubiuser/remove_whiptail
...
Do not let the user select if they want to blocking via IPv4 and/or IPv6
2021-10-03 07:42:19 +02:00
466520366d
Fogot to save...
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-02 23:47:13 +02:00
9dbcbdbe66
Adjust tests
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-02 23:43:08 +02:00
a9b9718ffa
Do not let the user select if they want to blocking via IPv4 and/or IPv6
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-10-02 23:29:23 +02:00
