From 2bf3bc5c1f7ee776ba582259009d308b4f93e823 Mon Sep 17 00:00:00 2001 From: yubiuser Date: Thu, 30 Sep 2021 09:23:48 +0200 Subject: [PATCH 1/3] Add config option Signed-off-by: yubiuser --- docs/ftldns/configfile.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/ftldns/configfile.md b/docs/ftldns/configfile.md index 3ff1505..c92ece6 100644 --- a/docs/ftldns/configfile.md +++ b/docs/ftldns/configfile.md @@ -59,11 +59,16 @@ When the gravity database is locked/busy, how should Pi-hole handle queries? Despite `REFUSE` sounding similar to `DROP`, it turned out that many clients will just immediately retry, causing up to several thousands of queries per second. This does not happen in `DROP` mode. -#### `MOZILLA_CANARY=true|false` (PR [#1148](https://github.com/pi-hole/FTL/pull/1148)) {#mozilla_canary data-toc-label='Mozilla canary domain handling'} +#### `MOZILLA_CANARY=true|false` (PR [#1171](https://github.com/pi-hole/FTL/pull/1171)) {#mozilla_canary data-toc-label='Mozilla canary domain handling'} Should Pi-hole always replies with `NXDOMAIN` to `A` and `AAAA` queries of `use-application-dns.net` to disable Firefox automatic DNS-over-HTTP? This is following the recommendation on [https://support.mozilla.org/en-US/kb/configuring-networks-disable-dns-over-https](https://support.mozilla.org/en-US/kb/configuring-networks-disable-dns-over-https) +#### `BLOCK_ICLOUD_PR=true|false` (PR [#1148](https://github.com/pi-hole/FTL/pull/1148)) {#icloud_private_relay data-toc-label='iCloud Private Relay domain handling'} + +Should Pi-hole always replies with `NXDOMAIN` to `A` and `AAAA` queries of `mask.icloud.com` and `mask-h2.icloud.com` to disable Apple's iCloud Private Relay to prevent Apple devices from bypassing Pi-hole? +This is following the recommendation on [https://developer.apple.com/support/prepare-your-network-for-icloud-private-relay](https://developer.apple.com/support/prepare-your-network-for-icloud-private-relay) + --- ### Statistics settings From 3a7d8303c0b304bc2c54a3011b42725c73317c52 Mon Sep 17 00:00:00 2001 From: yubiuser Date: Thu, 30 Sep 2021 09:28:04 +0200 Subject: [PATCH 2/3] Fix links Signed-off-by: yubiuser --- docs/ftldns/configfile.md | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/docs/ftldns/configfile.md b/docs/ftldns/configfile.md index c92ece6..cc71ead 100644 --- a/docs/ftldns/configfile.md +++ b/docs/ftldns/configfile.md @@ -34,7 +34,18 @@ This feature has been requested and discussed on [Discourse](https://discourse.p Control FTL's query rate-limiting. Rate-limited queries are answered with a `REFUSED` reply and not further processed by FTL. The default settings for FTL's rate-limiting are to permit no more than `1000` queries in `60` seconds. Both numbers can be customized independently. -It is important to note that rate-limiting is happening on a *per-client* basis. Other clients can continue to use FTL while rate-limited clients are short-circuited at the same time. +It is important to note that rate-limiting is happening on a *per-client* basis. Other clients can continu +**How does this PR accomplish the above?:** +*A detailed description (such as a changelog) and screenshots (if necessary) of the implemented fix* + + +**What documentation changes (if any) are needed to support this PR?:** +*A detailed list of any necessary changes* + + +--- +* You must follow the template instructions. Failure to do so will result in your pull request being closed. +* Please respect that Pi-hole is developed by volunteers, who can only reply in their spare time.e to use FTL while rate-limited clients are short-circuited at the same time. For this setting, both numbers, the maximum number of queries within a given time, **and** the length of the time interval (seconds) have to be specified. For instance, if you want to set a rate limit of 1 query per hour, the option should look like `RATE_LIMIT=1/3600`. @@ -59,12 +70,12 @@ When the gravity database is locked/busy, how should Pi-hole handle queries? Despite `REFUSE` sounding similar to `DROP`, it turned out that many clients will just immediately retry, causing up to several thousands of queries per second. This does not happen in `DROP` mode. -#### `MOZILLA_CANARY=true|false` (PR [#1171](https://github.com/pi-hole/FTL/pull/1171)) {#mozilla_canary data-toc-label='Mozilla canary domain handling'} +#### `MOZILLA_CANARY=true|false` (PR [#1148](https://github.com/pi-hole/FTL/pull/1148)) {#mozilla_canary data-toc-label='Mozilla canary domain handling'} Should Pi-hole always replies with `NXDOMAIN` to `A` and `AAAA` queries of `use-application-dns.net` to disable Firefox automatic DNS-over-HTTP? This is following the recommendation on [https://support.mozilla.org/en-US/kb/configuring-networks-disable-dns-over-https](https://support.mozilla.org/en-US/kb/configuring-networks-disable-dns-over-https) -#### `BLOCK_ICLOUD_PR=true|false` (PR [#1148](https://github.com/pi-hole/FTL/pull/1148)) {#icloud_private_relay data-toc-label='iCloud Private Relay domain handling'} +#### `BLOCK_ICLOUD_PR=true|false` (PR [#1171](https://github.com/pi-hole/FTL/pull/1171)) {#icloud_private_relay data-toc-label='iCloud Private Relay domain handling'} Should Pi-hole always replies with `NXDOMAIN` to `A` and `AAAA` queries of `mask.icloud.com` and `mask-h2.icloud.com` to disable Apple's iCloud Private Relay to prevent Apple devices from bypassing Pi-hole? This is following the recommendation on [https://developer.apple.com/support/prepare-your-network-for-icloud-private-relay](https://developer.apple.com/support/prepare-your-network-for-icloud-private-relay) From eb910586e1f2befa5416e84ca8c478e94aa6cb7b Mon Sep 17 00:00:00 2001 From: yubiuser Date: Thu, 30 Sep 2021 09:29:16 +0200 Subject: [PATCH 3/3] Copy paste error Signed-off-by: yubiuser --- docs/ftldns/configfile.md | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/docs/ftldns/configfile.md b/docs/ftldns/configfile.md index cc71ead..f77314d 100644 --- a/docs/ftldns/configfile.md +++ b/docs/ftldns/configfile.md @@ -34,18 +34,7 @@ This feature has been requested and discussed on [Discourse](https://discourse.p Control FTL's query rate-limiting. Rate-limited queries are answered with a `REFUSED` reply and not further processed by FTL. The default settings for FTL's rate-limiting are to permit no more than `1000` queries in `60` seconds. Both numbers can be customized independently. -It is important to note that rate-limiting is happening on a *per-client* basis. Other clients can continu -**How does this PR accomplish the above?:** -*A detailed description (such as a changelog) and screenshots (if necessary) of the implemented fix* - - -**What documentation changes (if any) are needed to support this PR?:** -*A detailed list of any necessary changes* - - ---- -* You must follow the template instructions. Failure to do so will result in your pull request being closed. -* Please respect that Pi-hole is developed by volunteers, who can only reply in their spare time.e to use FTL while rate-limited clients are short-circuited at the same time. +It is important to note that rate-limiting is happening on a *per-client* basis. Other clients can continue to use FTL while rate-limited clients are short-circuited at the same time. For this setting, both numbers, the maximum number of queries within a given time, **and** the length of the time interval (seconds) have to be specified. For instance, if you want to set a rate limit of 1 query per hour, the option should look like `RATE_LIMIT=1/3600`.