dad6247cb0
Merge pull request #4347 from pi-hole/development
...
Pi-hole core v5.5
2021-09-29 21:45:58 +01:00
841222fa21
Add to INSTALLER_DEPS ( #4343 )
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-09-26 10:50:03 -07:00
0576810438
Merge pull request #4339 from pi-hole/tweak/local_ttl
...
Remove local-ttl from set of default dnsmasq options
2021-09-25 21:57:49 +02:00
b755330f4c
Remove local-ttl from set of default dnsmasq options.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-09-24 11:34:05 +02:00
cf59f35a4e
Merge pull request #4324 from jpgpi250/fix_#4322
...
Fix for gravity syntax error (see #4322 )
2021-09-14 09:23:14 +02:00
2131a1fe7f
Merge pull request #4327 from yubiuser/export_nfqdn_bogus
...
Export DNS_FQDN_REQUIRED and DNS_BOGUS_PRIV to setupVars.conf during installation
2021-09-13 08:55:54 +02:00
a88a94c4f1
Export DNS_FQDN_REQUIRED and DNS_BOGUS_PRIV to setupVars.conf during installation
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-09-13 08:06:19 +02:00
1c286c7bc4
Select proper PHP version on RPM based OS after INSTALLER_DEPS have been installed ( #4325 )
...
* Select proper PHP version on RPM based OS after INSTALLER_DEPS have been installed
* Remove check for unsupported RPM distros as it is checked in os_check already
* Add select_rpm_php function to tox tests
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-09-12 13:40:37 -07:00
6d670991c3
Perform a check of required packages befor updating pihole ( #4326 )
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-09-12 13:38:55 -07:00
3439045228
fix Pi-hole v5.4 update - syntax error #4322
...
Signed-off-by: jpgpi250 <jpgpi250@gmail.com >
2021-09-12 18:24:15 +02:00
b710e107d6
Merge pull request #4320 from pi-hole/master
...
Sync master back to dev
2021-09-11 22:39:50 +01:00
2673c2c072
Merge pull request #4318 from pi-hole/release/v5.4
...
Pi-hole core v5.4
2021-09-11 22:17:43 +01:00
e393048488
Merge pull request #4229 from MichaIng/patch-3
...
Hardcode whiptail dimensions to 20 rows and 70 chars width
2021-09-11 21:37:14 +01:00
2feea70311
Merge pull request #4319 from pi-hole/development
...
Sync Dev -> release/v5.4
2021-09-11 21:36:08 +01:00
62f29ba3fa
Merge branch 'release/v5.4' into development
2021-09-11 21:35:11 +01:00
89b1cfcd85
Merge pull request #4243 from yubiuser/debug_dnsmasq
...
Include all files in the dnsmasq config dir in the debug output
2021-09-11 22:20:00 +02:00
89e187947e
Merge pull request #4282 from pi-hole/new/RFC6761
...
Install RFC6761 config file
2021-09-11 20:44:46 +01:00
d2faa93241
Merge pull request #4314 from pi-hole/fix/capabilities
...
Add possibly missing capabilities
2021-09-11 20:44:24 +01:00
0df099a6a5
Merge pull request #4312 from yubiuser/debug_dnsmasq.conf
...
Add content of /etc/dnsmasq.conf to debug output
2021-09-11 21:42:36 +02:00
482ac12c9b
Merge pull request #4275 from MichaIng/patch-4
...
Remove ineffective Access-Control-Allow-Origin header
2021-09-11 21:41:49 +02:00
b2592f5d31
Merge pull request #4317 from pi-hole/tweak/UQDN_forwarding
...
Forward unqualified names to the CF target only when the "Never forward non-FQDN" option is NOT ticked
2021-09-11 21:40:14 +02:00
d0e8b0c962
Forward unqualified names to the CF target only when the "Never forward non-FQDN" option is NOT ticked
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-09-09 20:28:33 +02:00
d48d3aba69
Merge pull request #4305 from pi-hole/tweak/debug_curl
...
Use --no-progress-meter instead of --silent so error reasons are printed
2021-09-07 09:33:25 -07:00
cbc99d45c6
Small style change to finished debug upload display
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-09-07 11:21:34 +02:00
be68a5339c
Apply same improvement to pihole tricorder feature
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-09-07 11:16:40 +02:00
606b05eec1
Ensure curl is either storing a valid token or a meaningful error message
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-09-07 11:13:09 +02:00
a1ee7d92a9
Add possibly missing capabilities
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-09-06 22:38:16 +02:00
6941155572
Add content of /etc/dnsmasq.conf to debug output
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-09-06 17:16:36 +02:00
b6d73ac081
Merge pull request #4311 from yubiuser/debug_resolv
...
Add content of /etc/resolv.conf to debug output
2021-09-06 10:56:21 +02:00
6fec4acd82
Add content of /etc/resolv.conf to debug output
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-09-05 20:44:39 +02:00
b241a19e87
Use --no-progress-meter instead of --silent so error reasons are printed
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-08-30 21:19:47 +02:00
a7ba55ffb0
Merge pull request #4304 from pi-hole/fix/tricorder
...
Fix pipe to pihole tricorder
2021-08-30 11:49:36 -07:00
115e3eeda9
Use --no-progress-meter instead of --silent so error reasons are printed
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-08-30 20:20:45 +02:00
21897d7fbd
Add warning if curl failed
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-08-30 15:55:42 +02:00
31c7c019cb
Fix piping to pihole tricorder
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-08-30 14:04:48 +02:00
b97f76e678
Merge pull request #4292 from yubiuser/sudo_apt
...
Add sudo to apt-get recommendation
2021-08-29 12:55:22 +02:00
839a70cc37
Add sudo to apt-get recommendation
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-08-27 19:16:15 +02:00
a068567926
Merge pull request #4287 from pi-hole/tweak/conditional_forwarding_unqualified_domains
...
Conditional forwarding: Also forward unqualified host names
2021-08-23 22:02:43 +02:00
06fd8123c3
Also remove "rev-server" lines when rewriting 01-pihole.conf
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-08-20 16:26:17 +02:00
c2f3477a82
Ensure conditional forwarding will forward unqualified host names if we have no local answer for them.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-08-20 15:54:25 +02:00
ff64d8cf4d
Use variable in user output, too
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-08-16 09:57:12 +02:00
e8e8104b36
Remove server=/local/ because of https://github.com/pi-hole/pi-hole/pull/4282#discussion_r689112972
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-08-15 18:37:12 +02:00
e1dca46423
Hardcode whiptail dimensions to 20 rows and 70 chars width
...
With the suggested way to call the installer via "curl -sSL https://install.pi-hole.net | bash", STDIN is no terminal, but overridden by the curl output, hence in most cases, the minimum dimensions were applied, even on larger screens. All whiptail calls are hence assured to work fine with those dimensions, aside of one case, making the calculations obsolete.
This commit hardcodes the whiptail dimensions to the prior minimum and removes the calculations. This also helps with testing, as it does not matter anymore how the script is called, and developers have a clearly defined space to make dialogs look nice, including line breaks, menu and list heights.
The only case which does not fit the 70 character width, the second menu entry of the "pihole -r" dialog, has been shortened accordingly. This was not an issue before, as "pihole -r" does not override the scripts STDIN and hence did allow larger dimensions based on the now removed calculations.
See the following discussions for reference:
- https://github.com/pi-hole/pi-hole/issues/3323
- https://github.com/pi-hole/pi-hole/pull/4197#issuecomment-876702380
Signed-off-by: MichaIng <micha@dietpi.com >
2021-08-15 18:04:11 +02:00
ea5a3bf0b2
Install RFC6761 config file
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-08-15 11:21:24 +02:00
98867d8d71
Merge pull request #4276 from pi-hole/dev-release5.4
...
Sync release/v5.4 back into development
2021-08-13 23:37:53 +02:00
c88c943cda
Merge branch 'release/v5.4' into dev-release5.4
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2021-08-13 20:24:35 +01:00
3ef90a9e47
Remove ineffective Access-Control-Allow-Origin header
...
The Access-Control-Allow-Origin header has only relevance, when a resource is loaded from an external host, so one that does not match the host of the primary loaded website. As the fonts are reasonably loaded via local URLs without hostname or scheme from the blocking page style sheet, they are never seen as external resources, regardless whether the blocking page is shown to the browser from a blocked domain or from the Pi-hole domain/IP.
For reference: https://github.com/pi-hole/pi-hole/issues/3462
Signed-off-by: MichaIng <micha@dietpi.com >
2021-08-13 20:42:51 +02:00
58a21bee07
Merge pull request #4271 from yubiuser/fix_splash
...
Fix Splashpage not appearing properly on non-root directories
2021-08-12 17:32:18 +02:00
676b7e60f3
Fix Splashpage not appearing properly on non-root directories
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-08-12 13:55:40 +02:00
43b88cd628
Merge pull request #4236 from MichaIng/patch-4
...
Update pihole-FTL.service
2021-08-10 16:09:41 +02:00
