From 19f39c1741bad9374ab7e5a3764dffe8640189ff Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sun, 20 Oct 2024 15:45:59 +0100 Subject: [PATCH] Address @Yubiusers review comments Signed-off-by: Adam Warner --- docs/ftldns/blockingmode.md | 2 ++ docs/main/pihole-command.md | 4 ++-- docs/regex/pi-hole.md | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/ftldns/blockingmode.md b/docs/ftldns/blockingmode.md index 3ec46db..1ecd295 100644 --- a/docs/ftldns/blockingmode.md +++ b/docs/ftldns/blockingmode.md @@ -60,6 +60,8 @@ doubleclick.net. 2 IN A 192.168.1.42 In `IP` mode, blocked queries will be answered with the local IP addresses of your Pi-hole. To set this mode explicitly, run `pihole-FTL --config dns.blocking.mode IP`. +The IP that is returned is automatically determined by FTL, however it can also be set with `reply.blocking.IPv4` and `reply.blocking.IPv6` FTL options. + A blocked query would look like the following: ``` diff --git a/docs/main/pihole-command.md b/docs/main/pihole-command.md index 9b993e7..a8a8c1c 100644 --- a/docs/main/pihole-command.md +++ b/docs/main/pihole-command.md @@ -11,7 +11,7 @@ Pi-hole makes use of many commands, and here we will break down those required t | Feature | Invocation | | -------------- | -------------- | | [Core](#core-script) | `pihole` | -| [Allowlisting, Denylisting and Regex](#allowlisting-denylisting-and-regex) | `pihole allow`, `pihole deny`, `pihole --regex`, `pihole --wild` | +| [Allowlisting, Denylisting and Regex](#allowlisting-denylisting-and-regex) | `pihole allow`, `pihole deny`, `pihole --regex`, `pihole --wild`, `pihole --allow-regex`, `pihole --allow-wild` | | [Debugger](#debugger) | `pihole debug` | | [Log Flush](#log-flush) | `pihole flush` | | [Reconfigure](#reconfigure) | `pihole reconfigure` | @@ -41,7 +41,7 @@ The core script of Pi-hole provides the ability to tie many DNS related function | | | | -------------- | -------------- | -| Help Command | `pihole allow --help`, `pihole deny --help`, `pihole --regex --help`, `pihole --wild --help` | +| Help Command | `pihole allow --help`, `pihole deny --help`, `pihole --regex --help`, `pihole --wild --help`, `pihole --allow-regex --help`, `pihole --allow-wild --help` | | Script Location | [`/opt/pihole/list.sh`](https://github.com/pi-hole/pi-hole/blob/master/advanced/Scripts/list.sh) | | Example Usage | [`pihole --regex '^example.com$' '.*\.example2.net'`](https://discourse.pi-hole.net/t/the-pihole-command-with-examples/738#white-black-list) | diff --git a/docs/regex/pi-hole.md b/docs/regex/pi-hole.md index 48e1a5c..762a0bb 100644 --- a/docs/regex/pi-hole.md +++ b/docs/regex/pi-hole.md @@ -72,7 +72,7 @@ Valid options are: - `;reply=nxdomain` ("no such domain" will be provided, can cause unintended side-effects) - `;reply=refused` (the query will be refused) - `;reply=none` (the query will be silently dropped) -- `;reply=ip` (the Pi-hole's IP address if not overwritten by configuration) +- `;reply=ip` (the Pi-hole's IP address if not overwritten by configuration options: `reply.blocking.IPv4`/`reply.blocking.IPv6`) - `;reply=1.2.3.4` (any valid IPv4 address) - `;reply=fe80::1234` (any valid IPv6 address)