From 6d66f8b34f3e7ad3b160e0c5e7fc896c8b43b17c Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Tue, 24 Sep 2024 10:47:22 +0100 Subject: [PATCH 1/5] remove restartdns command from docs per https://github.com/pi-hole/pi-hole/pull/5779 Signed-off-by: Adam Warner --- docs/main/pihole-command.md | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/docs/main/pihole-command.md b/docs/main/pihole-command.md index 1a0a31aa..3d8dfc05 100644 --- a/docs/main/pihole-command.md +++ b/docs/main/pihole-command.md @@ -25,7 +25,6 @@ Pi-hole makes use of many commands, and here we will break down those required t | [Uninstall](#uninstall) | `pihole uninstall` | | [Status](#status) | `pihole status` | | [Enable & Disable](#enable-disable) | `pihole enable` | -| [Restart DNS](#restart-dns) | `pihole restartdns` | | [Checkout](#checkout) | `pihole checkout` | ### Core Script @@ -205,16 +204,6 @@ Display the running status of Pi-hole's DNS and blocking services. Toggle Pi-hole's ability to block unwanted domains. The disable option has the option to set a specified time before blocking is automatically re-enabled. -### Restart DNS - -| | | -| -------------- | -------------- | -| Help Command | N/A | -| Script Location | [`/usr/local/bin/pihole`](https://github.com/pi-hole/pi-hole/blob/master/pihole) | -| Example Usage | [`pihole restartdns`](https://discourse.pi-hole.net/t/the-pihole-command-with-examples/738#restartdns) | - -Restart Pi-hole's DNS service. - ### Checkout | | | From e3d537bd9449eb4267d7f803a4a2c7d156f783a1 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 2 Oct 2024 19:49:11 +0100 Subject: [PATCH 2/5] Update various `pihole restartdns` references Signed-off-by: Adam Warner --- docs/ftldns/blockingmode.md | 2 +- docs/ftldns/dnsmasq_warn.md | 2 +- docs/group_management/example.md | 2 +- docs/guides/misc/tor/setup.md | 2 +- docs/regex/index.md | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/ftldns/blockingmode.md b/docs/ftldns/blockingmode.md index 7199fe2a..05dd17f5 100644 --- a/docs/ftldns/blockingmode.md +++ b/docs/ftldns/blockingmode.md @@ -9,7 +9,7 @@ Pi-hole *FTL*DNS currently supports the following modes for blocking queries: Each mode has their advantages and drawbacks which will be discussed in detail below. !!! note - In order to configure a blocking mode, you must edit the *FTL*DNS configuration file (`/etc/pihole/pihole-FTL.conf`). Once you've made any changes to the blocking mode, you must restart Pi-hole with `pihole restartdns`. + In order to configure a blocking mode, you must edit the *FTL*DNS configuration file (`/etc/pihole/pihole-FTL.conf`). Once you've made any changes to the blocking mode, you must restart Pi-hole FTL (e.g `sudo service pihole-FTL restart` `sudo systemctl restart pihole-FTL`). ## Pi-hole's unspecified IP or NULL blocking mode diff --git a/docs/ftldns/dnsmasq_warn.md b/docs/ftldns/dnsmasq_warn.md index b92c9abb..4eebc951 100644 --- a/docs/ftldns/dnsmasq_warn.md +++ b/docs/ftldns/dnsmasq_warn.md @@ -133,7 +133,7 @@ Warnings commonly seen in `dnsmasq`'s log file (`/var/log/pihole/pihole.log`) an edns-packet-max=1232 ``` - After running `pihole restartdns` your Pi-hole will not even try larger packet sizes (the default is 4096). Check out our [unbound guide](../guides/dns/unbound.md) for a comment about the particular value of `1232` or reference [this comment](https://discourse.pi-hole.net/t/dnsmasq-warn-reducing-dns-packet-size/51803/31) regarding the various allowed packet sizes for the various upstream DNS servers. + After restarting pihole-FTL it will not even try larger packet sizes (the default is 4096). Check out our [unbound guide](../guides/dns/unbound.md) for a comment about the particular value of `1232` or reference [this comment](https://discourse.pi-hole.net/t/dnsmasq-warn-reducing-dns-packet-size/51803/31) regarding the various allowed packet sizes for the various upstream DNS servers. !!! warning "Ignoring query from non-local network" diff --git a/docs/group_management/example.md b/docs/group_management/example.md index a7f6e6bc..017adb3f 100644 --- a/docs/group_management/example.md +++ b/docs/group_management/example.md @@ -5,7 +5,7 @@ In this example, we describe how to set up a blocking rule for three specific cl Don't forget to run ```bash -pihole restartdns reload-lists +pihole reloadlists ``` after your database modifications to have FTL flush its internal domain-blocking cache (separate from the DNS cache). diff --git a/docs/guides/misc/tor/setup.md b/docs/guides/misc/tor/setup.md index 36e81da6..4dc7f552 100644 --- a/docs/guides/misc/tor/setup.md +++ b/docs/guides/misc/tor/setup.md @@ -28,7 +28,7 @@ If you want a recognizable hostname for the Tor DNS in your Pi-hole GUI statisti Restart Pi-hole DNS Server for the `/etc/hosts` changes to take effect ```bash -sudo pihole restartdns +sudo service pihole-FTL restart ``` ## Testing your configuration diff --git a/docs/regex/index.md b/docs/regex/index.md index 206c99f5..fdf19589 100644 --- a/docs/regex/index.md +++ b/docs/regex/index.md @@ -16,9 +16,9 @@ There are two locations where regex filters are important: *FTL*DNS reads in regular expression filters from the two [`regex` database views](../database/domain-database/index.md). To tell *FTL*DNS to reload the list of regex filters, either: -- Execute `pihole restartdns reload-lists` or +- Execute `pihole reloadlists` or - Send `SIGHUP` to `pihole-FTL` (`sudo killall -SIGHUP pihole-FTL`) or -- Restart the service (`sudo service pihole-FTL restart`) +- Restart the service (`sudo service pihole-FTL restart` or `sudo systemctl restart pihole-FTL`) The first command is to be preferred as it ensures that the DNS cache itself remains intact. Hence, it is also the fastest of the available options. From 807e5227dd9dc129fa53916dd38a683be926f57a Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 2 Oct 2024 20:04:22 +0100 Subject: [PATCH 3/5] Update benchmark.md to reflect removed restartdns command and also update config setting instructions Signed-off-by: Adam Warner --- docs/guides/misc/benchmark.md | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/docs/guides/misc/benchmark.md b/docs/guides/misc/benchmark.md index f0cd1495..1478ca36 100644 --- a/docs/guides/misc/benchmark.md +++ b/docs/guides/misc/benchmark.md @@ -21,21 +21,19 @@ They are extracted into the list file as they are recorded in the database. Ther We suggest disabling both logging and the long-term database during the benchmark run as both the log file and the database would otherwise unnecessarily grow, several hundred megabytes may be possible. Not only would your statistics be distorted by the artificial mass querying, but the benchmark could also be negatively affected by the writing speed of your SD card. -Logging can be disabled using `sudo pihole logging off`. +Logging can be disabled using `pihole-FTL --config dns.queryLogging false`. -The long-term database can be disabled by setting - -``` -DBFILE= -``` - -in `/etc/pihole/pihole-FTL.conf` and running `sudo pihole restartdns` (see also [here](../../ftldns/configfile.md/#dbfile)). +The long-term database can be disabled running `pihole-FTL --config files.database ""` ### 2.2 Increase DNS cache size We also suggest increasing the DNS cache for benchmarking. The rather low value is fine for typical use cases. Domains will expire at some point and make room for new domains. As the benchmark will artificially increase the querying rate, there will be no time for the domains to expire naturally. This would dramatically hit the caching performance while you would never see such performance penalties in real use cases. -Set `cache-size` to a rather high value (maybe 25,000 - by guess roughly one-eighth to one-fourth number of the domains you extracted from the database in step 1) in `/etc/dnsmasq.d/01-pihole.conf` and run `sudo pihole restartdns` afterward. +Set the cache size to a rather high value (maybe 25,000 - by guess roughly one-eighth to one-fourth number of the domains you extracted from the database in step 1) + +```bash +pihole-FTL --config dns.cache.size 25000 +``` ## 3. Query domains from the list From 87804ec824749994c91db3566bf6814d01ffa6a6 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 2 Oct 2024 20:07:40 +0000 Subject: [PATCH 4/5] Remove outdated references to pihole-FTL.conf Signed-off-by: Adam Warner --- docs/api/index.md | 2 +- docs/database/query-database.md | 10 +- docs/ftldns/blockingmode.md | 13 +- docs/ftldns/configfile.md | 403 +------------------------------ docs/ftldns/signals.md | 6 +- docs/guides/vpn/wireguard/faq.md | 8 +- docs/regex/index.md | 8 +- docs/regex/pi-hole.md | 2 +- 8 files changed, 21 insertions(+), 431 deletions(-) diff --git a/docs/api/index.md b/docs/api/index.md index 5e2f9249..4d02cd23 100644 --- a/docs/api/index.md +++ b/docs/api/index.md @@ -4,7 +4,7 @@ Most (but not all) endpoints require authentication. API endpoints requiring aut ## Accessing the API documentation -The entire API is documented at http://pi.hole/api/docs and self-hosted by your Pi-hole to match 100% the API versions your local Pi-hole has. Using this locally served API documentation is preferred. In case you don't have Pi-hole installed yet, you can also check out the documentation for all branches online, e.g., [Pi-hole API documentation](https://ftl.pi-hole.net/development-v6/docs/) (branch `development-v6`). Similarly, you can check out the documentation for a specific other branches by replacing `development-v6` with the corresponding branch name. +The entire API is documented at http://pi.hole/api/docs and self-hosted by your Pi-hole to match 100% the API versions your local Pi-hole has. Using this locally served API documentation is preferred. In case you don't have Pi-hole installed yet, you can also check out the documentation for all branches online, e.g., [Pi-hole API documentation](https://ftl.pi-hole.net/master/docs/) (branch `master`). Similarly, you can check out the documentation for a specific other branches by replacing `master` with the corresponding branch name. ## API endpoints diff --git a/docs/database/query-database.md b/docs/database/query-database.md index aae8bbc8..ce8560f3 100644 --- a/docs/database/query-database.md +++ b/docs/database/query-database.md @@ -1,13 +1,13 @@ Pi-hole *FTL*DNS uses the well-known relational database management system SQLite3 as its long-term storage of query data. In contrast to many other database management solutions, *FTL*DNS does not need a server database engine as the database engine is directly embedded in *FTL*DNS. It seems an obvious choice as it is probably the most widely deployed database engine - it is used today by several widespread web browsers, operating systems, and embedded systems (such as mobile phones), among others. Hence, it is rich in supported platforms and offered features. SQLite implements most of the SQL-92 standard for SQL and can be used for high-level queries. The long-term query database was the first database that was added to the Pi-hole project. -We update this database periodically and on the exit of *FTL*DNS (triggered e.g. by a `service pihole-FTL restart`). The updating frequency can be controlled by the parameter [`DBINTERVAL`](../ftldns/configfile.md#dbinterval) and defaults to once per minute. We think this interval is sufficient to protect against data losses due to power failure events. *FTL*DNS needs the database to populate its internal history of the most recent 24 hours. If the database is disabled, *FTL*DNS will show an empty query history after a restart. +We update this database periodically and on the exit of *FTL*DNS (triggered e.g. by a `service pihole-FTL restart`). The updating frequency can be controlled by the parameter `database.DBinterval` and defaults to once per minute. We think this interval is sufficient to protect against data losses due to power failure events. *FTL*DNS needs the database to populate its internal history of the most recent 24 hours. If the database is disabled, *FTL*DNS will show an empty query history after a restart. -The location of the database can be configured by the config parameter [`DBFILE`](../ftldns/configfile.md#dbfile). It defaults to `/etc/pihole/pihole-FTL.db`. If the given file does not exist, *FTL*DNS will create a new (empty) database file. +The location of the database can be configured by the config parameter `files.database`. It defaults to `/etc/pihole/pihole-FTL.db`. If the given file does not exist, *FTL*DNS will create a new (empty) database file. -Another way of controlling the size of the long-term database is by setting a maximum age for log queries to keep using the config parameter [`MAXDBDAYS`](../ftldns/configfile.md#maxdbdays). It defaults to 365 days, i.e. queries that are older than one year get periodically removed to limit the growth of the long-term database file. +Another way of controlling the size of the long-term database is by setting a maximum age for log queries to keep using the config parameter `database.maxDBdays`. It defaults to 365 days, i.e. queries that are older than one year get periodically removed to limit the growth of the long-term database file. -The config parameter [`DBIMPORT`](../ftldns/configfile.md#dbimport) controls whether `FTL` loads information from the database on startup. It needs to do this to populate the internal data structure with the most recent history. However, as importing from the database on disk can delay FTL on very large deploys, it can be disabled using this option. +The config parameter `database.DBimport` controls whether `FTL` loads information from the database on startup. It needs to do this to populate the internal data structure with the most recent history. However, as importing from the database on disk can delay FTL on very large deploys, it can be disabled using this option. --- @@ -129,7 +129,7 @@ ID | Status | | Details 12 | Allowed | ✅ | Retried query 13 | Allowed | ✅ | Retried but ignored query (this may happen during ongoing DNSSEC validation) 14 | Allowed | ✅ | Already forwarded, not forwarding again -15 | Blocked | ❌ | Blocked (database is busy)
How these queries are handled can be [configured](../ftldns/configfile.md#reply_when_busy) +15 | Blocked | ❌ | Blocked (database is busy)
How these queries are handled can be configured 16 | Blocked | ❌ | Blocked (special domain)
*E.g. Mozilla's canary domain and Apple's Private Relay domains*
Handling can be [configured](../ftldns/configfile.md) 17 | Allowed | ✅⌛ | Replied from *stale* cache 18 | Blocked | ❌ | By upstream server (EDE 15) diff --git a/docs/ftldns/blockingmode.md b/docs/ftldns/blockingmode.md index 05dd17f5..3ec46db0 100644 --- a/docs/ftldns/blockingmode.md +++ b/docs/ftldns/blockingmode.md @@ -8,12 +8,9 @@ Pi-hole *FTL*DNS currently supports the following modes for blocking queries: Each mode has their advantages and drawbacks which will be discussed in detail below. -!!! note - In order to configure a blocking mode, you must edit the *FTL*DNS configuration file (`/etc/pihole/pihole-FTL.conf`). Once you've made any changes to the blocking mode, you must restart Pi-hole FTL (e.g `sudo service pihole-FTL restart` `sudo systemctl restart pihole-FTL`). - ## Pi-hole's unspecified IP or NULL blocking mode -In `NULL` mode, which is both the default and recommended mode for Pi-hole *FTL*DNS, blocked queries will be answered with the "unspecified address" (`0.0.0.0` or `::`). The "unspecified address" is a reserved IP address specified by [RFC 3513 - Internet Protocol Version 6 (IPv6) Addressing Architecture, section 2.5.2](https://tools.ietf.org/html/rfc3513#section-2.5.2). If no mode is explicitly defined in the configuration file, Pi-hole will default to this mode. To set this mode explicitly, set `BLOCKINGMODE=NULL` in `/etc/pihole/pihole-FTL.conf`. +In `NULL` mode, which is both the default and recommended mode for Pi-hole *FTL*DNS, blocked queries will be answered with the "unspecified address" (`0.0.0.0` or `::`). The "unspecified address" is a reserved IP address specified by [RFC 3513 - Internet Protocol Version 6 (IPv6) Addressing Architecture, section 2.5.2](https://tools.ietf.org/html/rfc3513#section-2.5.2). If no mode is explicitly defined in the configuration file, Pi-hole will default to this mode. To set this mode explicitly, run `pihole-FTL --config dns.blocking.mode NULL` A blocked query would look like the following: @@ -39,7 +36,7 @@ doubleclick.net. 2 IN AAAA :: ## Pi-hole's IP (IPv6 NODATA) blocking mode -In `IP-NODATA-AAAA` mode, blocked queries will be answered with the local IPv4 addresses of your Pi-hole (see [BLOCK_IP4](configfile.md#block_ipv4) for additional options). Blocked AAAA queries will be answered with `NODATA-IPV6` and clients will only try to reach your Pi-hole over its static IPv4 address. To set this mode explicitly, set `BLOCKINGMODE=IP-NODATA-AAAA` in `/etc/pihole/pihole-FTL.conf`. +In `IP-NODATA-AAAA` mode, blocked queries will be answered with the local IPv4 addresses of your Pi-hole. Blocked AAAA queries will be answered with `NODATA-IPV6` and clients will only try to reach your Pi-hole over its static IPv4 address. To set this mode explicitly, run `pihole-FTL --config dns.blocking.mode IP_NODATA_AAAA`. Assuming your Pi-hole server is at `192.168.1.42`, then a blocked query would look like the following: @@ -61,7 +58,7 @@ doubleclick.net. 2 IN A 192.168.1.42 ## Pi-hole's full IP blocking mode -In `IP` mode, blocked queries will be answered with the local IP addresses of your Pi-hole (see [BLOCK_IP4](configfile.md#block_ipv4) and [BLOCK_IP6](configfile.md#block_ipv6) for additional options). To set this mode explicitly, set `BLOCKINGMODE=IP` in `/etc/pihole/pihole-FTL.conf`. +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`. A blocked query would look like the following: @@ -85,7 +82,7 @@ doubleclick.net. 2 IN AAAA fda2:2001:4756:0:ab27:beff:ef37: ## Pi-hole's NXDOMAIN blocking mode -In `NXDOMAIN` mode, blocked queries will be answered with an empty response (i.e., there won't be an *answer* section) and status `NXDOMAIN`. A `NXDOMAIN` response should indicate that there is *no such domain* to the client making the query. To set this mode explicitly, set `BLOCKINGMODE=NXDOMAIN` in `/etc/pihole/pihole-FTL.conf`. +In `NXDOMAIN` mode, blocked queries will be answered with an empty response (i.e., there won't be an *answer* section) and status `NXDOMAIN`. A `NXDOMAIN` response should indicate that there is *no such domain* to the client making the query. To set this mode explicitly, run `pihole-FTL --config dns.blocking.mode NXDOMAIN`. A blocked query would look like the following: @@ -98,7 +95,7 @@ A blocked query would look like the following: ## Pi-hole's NODATA blocking mode -In `NODATA` mode, blocked queries will be answered with an empty response (no answer section) and status `NODATA`. A `NODATA` response indicates that the domain exists, but there is no record for the requested query type. To set this mode explicitly, set `BLOCKINGMODE=NODATA` in `/etc/pihole/pihole-FTL.conf`. +In `NODATA` mode, blocked queries will be answered with an empty response (no answer section) and status `NODATA`. A `NODATA` response indicates that the domain exists, but there is no record for the requested query type. To set this mode explicitly, run `pihole-FTL --config dns.blocking.mode NODATA`. A blocked query would look like the following: diff --git a/docs/ftldns/configfile.md b/docs/ftldns/configfile.md index 57c4d133..e13b3281 100644 --- a/docs/ftldns/configfile.md +++ b/docs/ftldns/configfile.md @@ -1,402 +1,7 @@ -You can create a file `/etc/pihole/pihole-FTL.conf` that will be read by *FTL*DNS on startup. +# Configuration -!!! info - Comments need to start with `#;` to avoid issues with PHP and `bash` reading this file. (See [https://github.com/pi-hole/pi-hole/pull/4081](https://github.com/pi-hole/pi-hole/pull/4081) for more details) +The configuration file can be found at `/etc/pihole/pihole.toml`, all of the options are documented within this file. -Possible settings (**the option shown first is the default**): +The file can be edited directly, however you can also use the command line option (`pihole-FTL --config`) or the web interface. ---- - -### DNS settings - -#### `BLOCKINGMODE=NULL|IP-NODATA-AAAA|IP|NXDOMAIN` {#blocking_mode data-toc-label='Blocking Mode'} - -How should `FTL` reply to blocked queries?
-**[More details](blockingmode.md)** - -#### `CNAME_DEEP_INSPECT=true|false` (PR [#663](https://github.com/pi-hole/FTL/pull/663)) {#cname_deep_inspect data-toc-label='Deep CNAME inspection'} - -Use this option to disable deep CNAME inspection. This might be beneficial for very low-end devices. - -#### `BLOCK_ESNI=true|false` (PR [#733](https://github.com/pi-hole/FTL/pull/733)) {#block_esni data-toc-label='ESNI blocking'} - -[Encrypted Server Name Indication (ESNI)](https://tools.ietf.org/html/draft-ietf-tls-esni-06) is certainly a good step into the right direction to enhance privacy on the web. It prevents on-path observers, including ISPs, coffee shop owners and firewalls, from intercepting the TLS Server Name Indication (SNI) extension by encrypting it. This prevents the SNI from being used to determine which websites users are visiting. - -ESNI will obviously cause issues for `pixelserv-tls` which will be unable to generate matching certificates on-the-fly when it cannot read the SNI. Cloudflare and Firefox are already enabling ESNI. -According to the IEFT draft (link above), we can easily restore `piselserv-tls`'s operation by replying `NXDOMAIN` to `_esni.` subdomains of blocked domains as this mimics a "not configured for this domain" behavior. - -#### `EDNS0_ECS=true|false` (PR [#851](https://github.com/pi-hole/FTL/pull/851)) {#block_edns0_ecs data-toc-label='EDNS ECS overwrite'} - -Should we overwrite the query source when client information is provided through EDNS0 client subnet (ECS) information? -This allows Pi-hole to obtain client IPs even if they are hidden behind the NAT of a router. - -This feature has been requested and discussed on [Discourse](https://discourse.pi-hole.net/t/support-for-add-subnet-option-from-dnsmasq-ecs-edns0-client-subnet/35940), where further information on how to use it can be found. - -#### `RATE_LIMIT=1000/60` (PR [#1052](https://github.com/pi-hole/FTL/pull/1052)) {#rate_limit data-toc-label='Query rate limiting'} - -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. - -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`. -The time interval is relative to when FTL has finished starting (start of the daemon + possible delay by `DELAY_STARTUP`) then it will advance in steps of the rate-limiting interval. If a client reaches the maximum number of queries it will be blocked until **the end of the current interval**. This will be logged to `/var/log/pihole/FTL.log`, e.g. `Rate-limiting 10.0.1.39 for at least 44 seconds`. If the client continues to send queries while being blocked already and this number of queries during the blocking exceeds the limit the client will continue to be blocked **until the end of the next interval** (`FTL.log` will contain lines like `Still rate-limiting 10.0.1.39 as it made additional 5007 queries`). As soon as the client requests less than the set limit, it will be unblocked (`Ending rate-limitation of 10.0.1.39`). - -Rate-limiting may be disabled altogether by setting `RATE_LIMIT=0/0` (this results in the same behavior as before FTL v5.7). - -#### `LOCAL_IPV4=` (unset by default, PR [#1293](https://github.com/pi-hole/FTL/pull/1293)) {#local_ipv4 data-toc-label='Force local A reply'} - -By default, `FTL` determines the address of the interface a query arrived on and uses this address for replying to `A` queries with the most suitable address for the requesting client. This setting can be used to use a fixed, rather than the dynamically obtained, address when Pi-hole responds to the following names: - -- `pi.hole` -- `` -- `pi.hole.` -- `.` - -#### `LOCAL_IPV6=` (unset by default, PR [#1293](https://github.com/pi-hole/FTL/pull/1293)) {#local_ipv6 data-toc-label='Force local AAAA reply'} - -Used to overwrite the IP address for local `AAAA` queries. See [`LOCAL_IPV4`](#local_ipv4) for details on when this setting is used. - -#### `BLOCK_IPV4=` (unset by default, PR [#1293](https://github.com/pi-hole/FTL/pull/1293)) {#block_ipv4 data-toc-label='Force blocked A reply'} - -By default, `FTL` determines the address of the interface a query arrived on and uses this address for replying to `A` queries with the most suitable address for the requesting client. This setting can be used to use a fixed, rather than the dynamically obtained, address when Pi-hole responds in the following cases: - -- `IP` blocking mode is used and this query is to be blocked -- A regular expression with the [`;reply=IP` regex extension](../regex/pi-hole.md#specify-reply-type) is used - -#### `BLOCK_IPV6=` (unset by default, PR [#1293](https://github.com/pi-hole/FTL/pull/1293)) {#block_ipv6 data-toc-label='Force blocked AAAA reply'} - -Used to overwrite the IP address for blocked `AAAA` queries. See [`BLOCK_IPV4`](#block_ipv4) for details on when this setting is used. - -#### `REPLY_WHEN_BUSY=DROP|ALLOW|BLOCK|REFUSE` (PR [#1156](https://github.com/pi-hole/FTL/pull/1156) & PR [#1341](https://github.com/pi-hole/FTL/pull/1341)) {#reply_when_busy data-toc-label='Database busy reply'} - -When the gravity database is locked/busy, how should Pi-hole handle queries? - -- `ALLOW` - allow all queries when the database is busy -- `BLOCK` - block all queries when the database is busy. This uses the configured `BLOCKINGMODE` (default `NULL`) -- `REFUSE` - refuse all queries which arrive while the database is busy -- `DROP` - just drop the queries, i.e., never reply to them at all. - -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'} - -Should Pi-hole always replies with `NXDOMAIN` to `A` and `AAAA` queries of `use-application-dns.net` to disable Firefox's 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_TTL=2` (PR [#1173](https://github.com/pi-hole/FTL/pull/1173)) {#block_ttl data-toc-label='Blocked domains lifetime'} - -FTL's internal TTL to be handed out for blocked queries. This setting allows users to select a value different from the `dnsmasq` config option `local-ttl`. This seems useful in context of locally used hostnames that are known to stay constant over long times (printers, etc.). - -Note that large values may render whitelisting ineffective due to client-side caching of blocked queries. - -#### `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 reply 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 - -#### `MAXLOGAGE=24.0` {#maxlogage data-toc-label='Max Log Age'} - -Up to how many hours of queries should be imported from the database and logs? Values greater than the hard-coded maximum of 24h need a locally compiled `FTL` with a changed compile-time value. - -#### `PRIVACYLEVEL=0|1|2|3` {#privacylevel data-toc-label='Privacy Level'} - -Which privacy level is used?
-**[More details](privacylevels.md)** - -#### `IGNORE_LOCALHOST=no|yes` {#ignore_localhost data-toc-label='Ignore localhost'} - -Should `FTL` ignore queries coming from the local machine? - -#### `AAAA_QUERY_ANALYSIS=yes|no` {#aaaa_query_analysis data-toc-label='AAAA Query Analysis'} - -Should FTL analyze `AAAA` queries? The DNS server will handle `AAAA` queries the same way, regardless of this setting. All this does is ignoring `AAAA` queries when computing the statistics of Pi-hole. This setting is considered obsolete and will be removed in a future version. - -#### `ANALYZE_ONLY_A_AND_AAAA=false|true` {#analyze_only_a_and_aaaa data-toc-label='Analyze A and AAAA Only'} - -Should `FTL` only analyze A and AAAA queries? - - -#### `SHOW_DNSSEC=true|false` {#show_dnssec data-toc-label='Show automatic DNSSEC queries'} - -Should FTL analyze and include automatically generated DNSSEC queries in the Query Log? - ---- - -### Other settings - -#### `SOCKET_LISTENING=localonly|all` {#socket_listening data-toc-label='Socket Listening'} - -Listen only for local socket connections or permit all connections - -#### `FTLPORT=4711` {#ftlport data-toc-label='FTLDNS Port'} - -On which port should FTL be listening? - -#### `RESOLVE_IPV6=yes|no` {#resolve_ipv6 data-toc-label='Resolve IPV6'} - -Should `FTL` try to resolve IPv6 addresses to hostnames? - -#### `RESOLVE_IPV4=yes|no` {#resolve_ipv4 data-toc-label='Resolve IPV4'} - -Should `FTL` try to resolve IPv4 addresses to hostnames? - -#### `PIHOLE_PTR=PI.HOLE|HOSTNAME|HOSTNAMEFQDN|NONE` (PR [#1111](https://github.com/pi-hole/FTL/pull/1111), [#1164](https://github.com/pi-hole/FTL/pull/1164)) {#pihole_ptr data-toc-label='Pi-hole PTR'} - -Controls whether and how FTL will reply with for address for which a local interface exists. Valid options are: - -- `PI.HOLE` (the default) respond with `pi.hole` -- `HOSTNAME` serve the machine's global hostname -- `HOSTNAMEFQDN` serve the machine's global hostname as fully qualified domain by adding the local suffix. See note below. -- `NONE` Pi-hole will **not** respond automatically on PTR requests to local interface addresses. Ensure `pi.hole` and/or hostname records exist elsewhere. - -Note about `HOSTNAMEFQDN`: If no local suffix has been defined, FTL appends the local domain `.no_fqdn_available`. In this case you should either add `domain=whatever.com` to a custom config file inside `/etc/dnsmasq.d/` (to set `whatever.com` as local domain) or use `domain=#` which will try to derive the local domain from `/etc/resolv.conf` (or whatever is set with `resolv-file`, when multiple `search` directives exist, the first one is used). - -#### `DELAY_STARTUP=0` (PR [#716](https://github.com/pi-hole/FTL/pull/716), PR [1349](https://github.com/pi-hole/FTL/pull/1349)) {#delay_startup data-toc-label='Delay resolver startup'} - -During startup, in some configurations, network interfaces appear only late during system startup and are not ready when FTL tries to bind to them. Therefore, you may want FTL to wait a given amount of time before trying to start the DNS revolver. This setting takes any integer value between 0 and 300 seconds. To prevent delayed startup while the system is already running and FTL is restarted, the delay only takes place within the first 180 seconds (hard-coded) after booting. - -#### `NICE=-10` (PR [#798](https://github.com/pi-hole/FTL/pull/798)) {#nice data-toc-label='Set niceness'} - -Can be used to change the niceness of Pi-hole FTL. Defaults to `-10` and can be -disabled altogether by setting a value of `-999`. - -The nice value is an attribute that can be used to influence the CPU scheduler -to favor or disfavor a process in scheduling decisions. The range of the nice -value varies across UNIX systems. On modern Linux, the range is `-20` (high -priority = not very nice to other processes) to `+19` (low priority). - -#### `MAXNETAGE=[MAXDBDAYS]` (PR [#871](https://github.com/pi-hole/FTL/pull/871)) {#maxnetage data-toc-label='Network table cleaning'} - -IP addresses (and associated host names) older than the specified number of days -are removed to avoid dead entries in the network overview table. This setting -defaults to the same value as `MAXDBDAYS` above but can be changed independently -if needed. - -#### `NAMES_FROM_NETDB=true|false` (PR [#784](https://github.com/pi-hole/FTL/pull/784)) {#names_from_netdb data-toc-label='Load names from network table'} - -Control whether FTL should use the fallback option to try to obtain client names -from checking the network table. This behavior can be disabled -with this option - -Assume an IPv6 client without a host names. However, the network table knows - -though the client's MAC address - that this is the same device where we have a -host name for another IP address (e.g., a DHCP server managed IPv4 address). In -this case, we use the host name associated to the other address as this is the -same device. - -#### `REFRESH_HOSTNAMES=IPV4|ALL|UNKNOWN|NONE` (PR [#953](https://github.com/pi-hole/FTL/pull/953)) {#refresh_hostnames data-toc-label='Refresh hostnames'} - -With this option, you can change how (and if) hourly PTR requests are made to check for changes in client and upstream server hostnames. The following options are available: - -- `REFRESH_HOSTNAMES=IPV4` - Do the hourly PTR lookups only for IPv4 addresses - This is the new default since Pi-hole FTL v5.3.2. It should resolve issues with more and more very short-lived PE IPv6 addresses coming up in a lot of networks. -- `REFRESH_HOSTNAMES=ALL` - Do the hourly PTR lookups for all addresses - This is the same as what we're doing with FTL v5.3(.1). This can create a lot of PTR queries for those with many IPv6 addresses in their networks. -- `REFRESH_HOSTNAMES=UNKNOWN` - Only resolve unknown hostnames - Already existing hostnames are never refreshed, i.e., there will be no PTR queries made for clients where hostnames are known. This also means that known hostnames will not be updated once known. -- `REFRESH_HOSTNAMES=NONE` - Don't do any hourly PTR lookups - This means we look host names up exactly once (when we first see a client) and never again. You may miss future changes of host names. - -#### `PARSE_ARP_CACHE=true|false` (PR [#445](https://github.com/pi-hole/FTL/pull/445)) {#parse_arp_cache data-toc-label='Parse ARP cache'} - -This setting can be used to disable ARP cache processing. When disabled, client identification and the network table will stop working reliably. - -#### `CHECK_LOAD=true|false` (PR [#1249](https://github.com/pi-hole/FTL/pull/1249)) {#check_load data-toc-label='Check system load'} - -Pi-hole is very lightweight on resources. Nevertheless, this does not mean that you should run Pi-hole on a server that is otherwise extremely busy as queuing on the system can lead to unnecessary delays in DNS operation as the system becomes less and less usable as the system load increases because all resources are permanently in use. To account for this, FTL regularly checks the system load. To bring this to your attention, FTL warns about excessive load when the 15 minute system load average exceeds the number of cores. - -This check can be disabled with this setting. - -#### `CHECK_SHMEM=90` (PR [#1249](https://github.com/pi-hole/FTL/pull/1249)) {#check_shmem data-toc-label='Check shared-memory limits'} - -FTL stores history in shared memory to allow inter-process communication with forked dedicated TCP workers. If FTL runs out of memory, it cannot continue to work as queries cannot be analyzed any further. Hence, FTL checks if enough shared memory is available on your system and warns you if this is not the case. - -By default, FTL warns if the shared-memory usage exceeds 90%. You can set any integer limit between `0` to `100` (interpreted as percentages) where `0` means that checking of shared-memory usage is disabled. - -#### `CHECK_DISK=90` (PR [#1249](https://github.com/pi-hole/FTL/pull/1249)) {#check_disk data-toc-label='Check disk space'} - -FTL stores its long-term history in a database file on disk (see [here](../database/index.md)). Furthermore, FTL stores log files (see, e.g., [here](#file_LOGFILE)). - -By default, FTL warns if usage of the disk holding any crucial file exceeds 90%. You can set any integer limit between `0` to `100` (interpreted as percentages) where `0` means that checking of disk usage is disabled. - ---- - -### Long-term database settings - -**[Further details concerning the database](../database/index.md)** - -#### `DBIMPORT=yes|no` {#dbimport data-toc-label='Use database'} - -Should `FTL` load information from the database on startup to be aware of the most recent history? - -#### `MAXDBDAYS=365` {#maxdbdays data-toc-label='Max age'} - -How long should queries be stored in the database? Setting this to `0` disables the database - -#### `DBINTERVAL=1.0` {#dbinterval data-toc-label='Storing Interval'} - -How often do we store queries in FTL's database [minutes]? - -#### `DBFILE=/etc/pihole/pihole-FTL.db` {#dbfile data-toc-label='Database Filename'} - -Specify the path and filename of FTL's SQLite3 long-term database. Setting this to `DBFILE=` disables the database altogether - ---- - -### File options - -#### `LOGFILE=/var/log/pihole/FTL.log` {#file_LOGFILE data-toc-label='Log file'} - -The location of FTL's log file. If you want to move the log file to a different place, also consider [this FAQ article](https://discourse.pi-hole.net/t/moving-the-pi-hole-log-to-another-location-device/2041). - -#### `PIDFILE=/run/pihole-FTL.pid` {#file_PIDFILE data-toc-label='Process identifier file'} - -The file which contains the PID of FTL's main process. - -#### `SOCKETFILE=/run/pihole/FTL.sock` {#file_SOCKETFILE data-toc-label='Socket file'} - -The file containing the socket FTL's API is listening on. - -#### `SETUPVARSFILE=/etc/pihole/setupVars.conf` {#file_SETUPVARSFILE data-toc-label='setupVars file'} - -The config file of Pi-hole containing, e.g., the current blocking status (do not change). - -#### `MACVENDORDB=/etc/pihole/macvendor.db` {#file_MACVENDORDB data-toc-label='MacVendor database file'} - -The database containing MAC -> Vendor information for the network table. - -#### `GRAVITYDB=/etc/pihole/gravity.db` {#file_GRAVITYDB data-toc-label='Gravity database'} - -Specify path and filename of FTL's SQLite3 gravity database. This database contains all domains relevant for Pi-hole's DNS blocking - ---- - -### Debugging options - -#### `DEBUG_ALL=false|true` {#debug_all data-toc-label='All'} - -Enable all debug flags. If this is set to true, all other debug config options are ignored. - -#### `DEBUG_DATABASE=false|true` {#debug_database data-toc-label='Database'} - -Print debugging information about database actions. This prints performed SQL statements as well as some general information such as the time it took to store the queries and how many have been saved to the database. - -#### `DEBUG_NETWORKING=false|true` {#debug_networking data-toc-label='Networking'} - -Prints a list of the detected interfaces on the startup of `pihole-FTL`. Also, prints whether these interfaces are IPv4 or IPv6 interfaces. - -#### `DEBUG_EDNS0=false|true` {#debug_edns0 data-toc-label='EDNS0'} - -Print debugging information about received EDNS(0) data. - -#### `DEBUG_LOCKS=false|true` {#debug_locks data-toc-label='Locks'} - -Print information about shared memory locks. Messages will be generated when waiting, obtaining, and releasing a lock. - -#### `DEBUG_QUERIES=false|true` {#debug_queries data-toc-label='Queries'} - -Print extensive query information (domains, types, replies, etc.). This has always been part of the legacy `debug` mode of `pihole-FTL`. - -#### `DEBUG_FLAGS=false|true` {#debug_flags data-toc-label='Flags'} - -Print flags of queries received by the DNS hooks. Only effective when `DEBUG_QUERIES` is enabled as well. - -#### `DEBUG_SHMEM=false|true` {#debug_shmem data-toc-label='Shared Memory'} - -Print information about shared memory buffers. Messages are either about creating or enlarging shmem objects or string injections. - -#### `DEBUG_GC=false|true` {#debug_gc data-toc-label='Garbage Collection'} - -Print information about garbage collection (GC): What is to be removed, how many have been removed and how long did GC take. - -#### `DEBUG_ARP=false|true` {#debug_arp data-toc-label='Neighbor parsing'} - -Print information about ARP table processing: How long did parsing take, whether read MAC addresses are valid, and if the `macvendor.db` file exists. - -#### `DEBUG_REGEX=false|true` {#debug_regex data-toc-label='Regular expressions'} - -Controls if *FTL*DNS should print extended details about regex matching into `FTL.log`. - -**[More details](../regex/index.md)** - -#### `DEBUG_API=false|true` {#debug_api data-toc-label='API'} - -Print extra debugging information during API calls. - -#### `DEBUG_OVERTIME=false|true` {#debug_overtime data-toc-label='Over Time Data'} - -Print information about overTime memory operations, such as initializing or moving overTime slots. - -#### `DEBUG_STATUS=false|true` {#debug_status data-toc-label='Query status'} - -Print information about status changes for individual queries. This can be useful to identify unexpected `unknown` queries. - -#### `DEBUG_CAPS=false|true` {#debug_caps data-toc-label='Linux capabilities'} - -Print information about capabilities granted to the pihole-FTL process. The current capabilities are printed on receipt of `SIGHUP`, i.e., the current set of capabilities can be queried without restarting `pihole-FTL` (by setting `DEBUG_CAPS=true` and thereafter sending `killall -HUP pihole-FTL`). - -#### `DEBUG_DNSMASQ_LINES=false|true` {#debug_dnsmasq_lines data-toc-label='Analyze dnsmasq log lines'} - -Print file and line causing a `dnsmasq` event into FTL's log files. This is handy to implement additional hooks missing from FTL. - -#### `DEBUG_VECTORS=false|true` (PR [#725](https://github.com/pi-hole/FTL/pull/725)) {#debug_vectors data-toc-label='Vectors'} - -FTL uses dynamically allocated vectors for various tasks. This config option enables extensive debugging information such as information about allocation, referencing, deletion, and appending. - -#### `DEBUG_RESOLVER=false|true` (PR [#728](https://github.com/pi-hole/FTL/pull/728)) {#debug_resolver data-toc-label='Resolver details'} - -Extensive information about hostname resolution like which DNS servers are used in the first and second hostname resolving tries (only affecting internally generated PTR queries). - -#### `DEBUG_EDNS0=false|true` (PR [#851](https://github.com/pi-hole/FTL/pull/851)) {#debug_edns0 data-toc-label='EDNS(0) data'} - -Verbose logging during EDNS(0) header analysis. - -#### `DEBUG_CLIENTS=false|true` (PR [#762](https://github.com/pi-hole/FTL/pull/762)) {#debug_clients data-toc-label='Clients'} - -Log various important client events such as change of interface (e.g., client switching from WiFi to wired or VPN connection), as well as extensive reporting about how clients were assigned to its groups. - -#### `DEBUG_ALIASCLIENTS=false|true` (PR [#880](https://github.com/pi-hole/FTL/pull/880)) {#debug_aliasclients data-toc-label='Aliasclients'} - -Log information related to alias-client processing. - -#### `DEBUG_EVENTS=false|true` (PR [#881](https://github.com/pi-hole/FTL/pull/881)) {#debug_events data-toc-label='Events'} - -Log information regarding FTL's embedded event handling queue. - -#### `DEBUG_HELPER=false|true` (PR [#914](https://github.com/pi-hole/FTL/pull/914)) {#debug_helper data-toc-label='Script helpers'} - -Log information about script helpers, e.g., due to `dhcp-script`. - -#### `ADDR2LINE=true|false` (PR [#774](https://github.com/pi-hole/FTL/pull/774)) {#addr2line data-toc-label='Addr2Line'} - -Should FTL translate its own stack addresses into code lines during the bug backtrace? This improves the analysis of crashed significantly. It is recommended to leave the option enabled. This option should only be disabled when `addr2line` is known to not be working correctly on the machine because, in this case, the malfunctioning `addr2line` can prevent from generating any backtrace at all. - -#### `DEBUG_EXTRA=false|true` (PR [#994](https://github.com/pi-hole/FTL/pull/994)) {#debug_extra data-toc-label='Misc.'} - -Temporary flag that may print additional information. This debug flag is meant to be used whenever needed for temporary investigations. The logged content may change without further notice at any time. - -### Deprecated options - -#### `REPLY_ADDR4=` (unset by default, PR [#965](https://github.com/pi-hole/FTL/pull/965)) {#reply_addr4 data-toc-label='Force A reply'} - -*This option is deprecated and may be removed in future versions, please use `BLOCK_IPV4` and `LOCAL_IPV4` instead* - -If neither `BLOCK_IPV4` nor `LOCAL_IPV4` are set, this setting is used to set both of them. If either of the two is set, this setting is ignored altogether. - -#### `REPLY_ADDR6=` (unset by default, PR [#965](https://github.com/pi-hole/FTL/pull/965)) {#reply_addr6 data-toc-label='Force AAAA reply'} - -*This option is deprecated and may be removed in future versions, please use `BLOCK_IPV6` and `LOCAL_IPV6` instead* - -If neither `BLOCK_IPV6` nor `LOCAL_IPV6` are set, this setting is used to set both of them. If either of the two is set, this setting is ignored altogether. - -#### `PORTFILE=/run/pihole-FTL.port` {#file_PORTFILE data-toc-label='Port file'} - -*This option is deprecated as FTL does not write any port file anymore. Please parse `pihole-FTL.conf` if you need to check if a custom API port is set.* - -The file containing the port FTL's API is listening on. +There is also an outline of the configuration options in the [api documentation](../api/index.md#accessing-the-api-documentation). diff --git a/docs/ftldns/signals.md b/docs/ftldns/signals.md index 65331ac2..aaee683c 100644 --- a/docs/ftldns/signals.md +++ b/docs/ftldns/signals.md @@ -20,9 +20,9 @@ When FTL receives a `SIGHUP`, it clears the entire DNS cache, and then **Note:** No other `dnsmasq` config files are re-read. - The FTL database connection (`/etc/pihole/pihole-FTL.db`) is re-opened. -- The privacy level is re-read from `pihole-FTL.conf` (`PRIVACY_LEVEL`). +- The privacy level is re-read from `pihole.toml` (`misc.privacylevel`). - The blocking status is re-read from `setupVars.conf` (`BLOCKING_ENABLED`). -- The debug settings are re-read from `pihole-FTL.conf` (`DEBUG_*`). +- The debug settings are re-read from `pihole.toml` (`debug.*`). - The gravity database connection (`/etc/pihole/gravity.db`) is re-opened. - The number of blocked domains is updated. - All regular expression (RegEx) filters in `gravity.db` are re-read and pre-compiled for fast execution later on. @@ -49,7 +49,7 @@ This signal does: - The number of blocked domains is updated. - All regular expression (RegEx) filters in `gravity.db` are re-read and pre-compiled for fast execution later on. - The blocking cache (storing if a domain has already been analyzed and what the result was) is cleared. -- The privacy level is re-read from `pihole-FTL.conf` (`PRIVACY_LEVEL`). +- The privacy level is re-read from `pihole.toml` (`misc.privacylevel`). The most important difference to `SIGHUP` is that the DNS cache itself is **not** flushed. Merely the blocking cache (storing if a domain has already been analyzed and what the result was) is cleared. diff --git a/docs/guides/vpn/wireguard/faq.md b/docs/guides/vpn/wireguard/faq.md index 04d8ef9b..49db9d3a 100644 --- a/docs/guides/vpn/wireguard/faq.md +++ b/docs/guides/vpn/wireguard/faq.md @@ -86,10 +86,4 @@ MTU = 1500 ## Pi-hole not listening on `wg0` after reboot -If, e.g., after reboot, the `wg0` interface isn't up before Pi-hole is ready (more precisely, the `pihole-FTL` service is started), you may experience that Pi-hole doesn't listen on the Wireguard interface. This can be mitigated by artificially delaying the start of Pi-hole using, e.g., the config option - -```plain -DELAY_STARTUP=5 -``` - -in `/etc/pihole/pihole-FTL.conf` to have Pi-hole delay the start of the DNS server by `5` seconds. +If, e.g., after reboot, the `wg0` interface isn't up before Pi-hole is ready (more precisely, the `pihole-FTL` service is started), you may experience that Pi-hole doesn't listen on the Wireguard interface. This can be mitigated by artificially delaying the start of Pi-hole using, e.g., `pihole-FTL --config mic.delay_startup 5` to have Pi-hole delay the start of the DNS server by `5` seconds. diff --git a/docs/regex/index.md b/docs/regex/index.md index fdf19589..59d7f680 100644 --- a/docs/regex/index.md +++ b/docs/regex/index.md @@ -24,13 +24,7 @@ The first command is to be preferred as it ensures that the DNS cache itself rem ## Pi-hole Regex debugging mode -To ease the usage of regular expression filters in *FTL*DNS, we offer a regex debugging mode. Set - -```plain -DEBUG_REGEX=true -``` - -in your `/etc/pihole/pihole-FTL.conf` and restart `pihole-FTL` to enable or disable this mode. +To ease the usage of regular expression filters in *FTL*DNS, we offer a regex debugging mode, run `pihole-FTL --config debug.regex true` to enable this mode. Once the debugging mode is enabled, each match will be logged to `/var/log/pihole/FTL.log` in the following format: diff --git a/docs/regex/pi-hole.md b/docs/regex/pi-hole.md index 904d507f..c713941f 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 [`REPLY_ADDR4`](../ftldns/configfile.md#reply_addr4) and/or [`REPLY_ADDR6`](../ftldns/configfile.md#reply_addr6)) +- `;reply=ip` (the Pi-hole's IP address if not overwritten by configuration) - `;reply=1.2.3.4` (any valid IPv4 address) - `;reply=fe80::1234` (any valid IPv6 address) From 282cf1a95136a9c52e456803f672153a16acb2fb Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 2 Oct 2024 20:31:56 +0000 Subject: [PATCH 5/5] Reflect changes to the `pihole` command, plus move whitelist/blacklist -> allowlist/denylist Signed-off-by: Adam Warner --- docs/guides/misc/allowlist-denylist.md | 47 ++++++++++++++++ docs/guides/misc/whitelist-blacklist.md | 73 ------------------------- docs/main/pihole-command.md | 8 +-- mkdocs.yml | 5 +- 4 files changed, 54 insertions(+), 79 deletions(-) create mode 100644 docs/guides/misc/allowlist-denylist.md delete mode 100644 docs/guides/misc/whitelist-blacklist.md diff --git a/docs/guides/misc/allowlist-denylist.md b/docs/guides/misc/allowlist-denylist.md new file mode 100644 index 00000000..3e5d1d8a --- /dev/null +++ b/docs/guides/misc/allowlist-denylist.md @@ -0,0 +1,47 @@ +### What Domains To Allow or Deny + +[This extension for Google Chrome](https://chrome.google.com/webstore/detail/adamone-assistant/fdmpekabnlekabjlimjkfmdjajnddgpc) can help you in finding out which domains you need to allow. + +### How to Allow or Deny Domains + +There are scripts to aid users in adding or removing domains to the allowlist or denylist from the CLI + +Each script accepts the following parameters: + +| Parameter | Description | +|------------|--------------------------------------------------------------------------------------------------| +| `[domain]` | Fully qualified domain name you wish to add or remove. You can pass any number of domains. | +| `remove` | Removal mode. Domains will be removed from the list, rather than added | +| `-q` | Quiet mode. Console output is minimal. Useful for calling from another script (see `gravity.sh`) | + +Domains passed are parsed by the script to ensure they are valid domains. If a domain is invalid it will be ignored. + +By default, Allowed/Denied domains are associated with the Default Group only. If the domain should be associated with other groups, these will need to be selected in **Group Management > Domains** within the Pi-Hole web frontend. + +#### Example `pihole allow` usages + +* Attempt to add one or more domains to the allowlist and reload pihole-FTL: + + ```bash + pihole allow domain1 [domain2...] + ``` + +To remove domains from the allowlist add `remove` as an additional argument, e.g: + +```bash +pihole allow remove domain1 [domain2...] +``` + +#### Example `pihole deny` usages + +* Attempt to add one or more domains to the denylist and reload pihole-FTL: + + ```bash + pihole deny domain1 [domain2...] + ``` + +To remove domains from the denylist add `remove` as an additional argument, e.g: + +```bash +pihole deny remove domain1 [domain2...] +``` diff --git a/docs/guides/misc/whitelist-blacklist.md b/docs/guides/misc/whitelist-blacklist.md deleted file mode 100644 index ac5a6942..00000000 --- a/docs/guides/misc/whitelist-blacklist.md +++ /dev/null @@ -1,73 +0,0 @@ -### What to Whitelist or Blacklist - -[This extension for Google Chrome](https://chrome.google.com/webstore/detail/adamone-assistant/fdmpekabnlekabjlimjkfmdjajnddgpc) can help you in finding out which domains you need to whitelist. - -### How to Whitelist or Blacklist - -There are scripts to aid users in adding or removing domains to the whitelist or blacklist from the CLI - -Each script accepts the following parameters: - -| Parameter | Description | -|------------|--------------------------------------------------------------------------------------------------| -| `[domain]` | Fully qualified domain name you wish to add or remove. You can pass any number of domains. | -| `-d` | Removal mode. Domains will be removed from the list, rather than added | -| `-nr` | Update blacklist without refreshing pihole-FTL | -| `-f` | Force delete cached blocklist content | -| `-q` | Quiet mode. Console output is minimal. Useful for calling from another script (see `gravity.sh`) | - -Domains passed are parsed by the script to ensure they are valid domains. If a domain is invalid it will be ignored. - -By default, Whitelisted/Blacklisted domains are associated with the Default Group only. If the domain should be associated with other groups, these will need to be selected in **Group Management > Domains** within the Pi-Hole web frontend. - -#### Example `pihole -w` usages - -* Attempt to add one or more domains to the whitelist and reload pihole-FTL: - - ```bash - pihole -w domain1 [domain2...] - ``` - -* Attempt to add one or more domains to the whitelist, but do not reload pihole-FTL: - - ```bash - pihole -w -nr domain1 [domain2...] - ``` - -* Attempt to add one or more domains to the whitelist and force pihole-FTL to reload: - - ```bash - pihole -w -f domain1 [domain2...] - ``` - -To remove domains from the whitelist add `-d` as an additional argument, e.g: - -```bash -pihole -w -d domain1 [domain2...] -``` - -#### Example `pihole -b` usages - -* Attempt to add one or more domains to the blacklist and reload pihole-FTL: - - ```bash - pihole -b domain1 [domain2...] - ``` - -* Attempt to add one or more domains to the blacklist, but do not reload pihole-FTL: - - ```bash - pihole -b -nr domain1 [domain2...] - ``` - -* Attempt to add one or more domains to the blacklist and force pihole-FTL to reload: - - ```bash - pihole -b -f domain1 [domain2...] - ``` - -To remove domains from the blacklist add `-d` as an additional argument, e.g: - -```bash -pihole -b -d domain1 [domain2...] -``` diff --git a/docs/main/pihole-command.md b/docs/main/pihole-command.md index 3d8dfc05..b7539d60 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` | -| [Whitelisting, Blacklisting and Regex](#whitelisting-blacklisting-and-regex) | `pihole -w`, `pihole -b`, `pihole --regex`, `pihole --wild` | +| [Allowlisting, Denylisting and Regex](#allowlisting-denylisting-and-regex) | `pihole allow`, `pihole deny`, `pihole --regex`, `pihole --wild` | | [Debugger](#debugger) | `pihole debug` | | [Log Flush](#log-flush) | `pihole flush` | | [Reconfigure](#reconfigure) | `pihole reconfigure` | @@ -37,11 +37,11 @@ Pi-hole makes use of many commands, and here we will break down those required t The core script of Pi-hole provides the ability to tie many DNS related functions into a simple and user-friendly management system, so that one may easily block unwanted content such as advertisements. For both the Command-line Interface (CLI) and Web Interface, we achieve this through the `pihole` command (this helps minimize code duplication, and allows users to read exactly what's happening using `bash` scripting). This "wrapper" elevates the current user (whether it be your own user account, or `www-data`) using `sudo`, but restricts the elevation to solely what can be called through the wrapper. -### Whitelisting, Blacklisting and Regex +### Allowlisting, Denylisting and Regex | | | | -------------- | -------------- | -| Help Command | `pihole -w --help`, `pihole -b --help`, `pihole --regex --help`, `pihole --wild --help` | +| Help Command | `pihole allow --help`, `pihole deny --help`, `pihole --regex --help`, `pihole --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) | @@ -130,7 +130,7 @@ Gravity is one of the most important scripts of Pi-hole. Its main purpose is to | Script Location | [`/usr/local/bin/pihole`](https://github.com/pi-hole/pi-hole/blob/master/pihole) | | Example Usage | [`pihole logging off`](https://discourse.pi-hole.net/t/the-pihole-command-with-examples/738#logging) | -This command specifies whether the Pi-hole log should be used, by commenting out `log-queries` within `/etc/dnsmasq.d/01-pihole.conf` and flushing the log. +This command specifies whether the Pi-hole log should be used. ### Query diff --git a/mkdocs.yml b/mkdocs.yml index c8eea4e4..da7c2d68 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -207,7 +207,7 @@ nav: - 'Using Tor': guides/misc/tor/using-tor.md - 'Performance and other issues': guides/misc/tor/performance-issues.md - 'Using DNSSEC': guides/misc/tor/dnssec.md - - 'Whitelist and Blacklist editing': guides/misc/whitelist-blacklist.md + - 'Allowlist and Denylist editing': guides/misc/allowlist-denylist.md - 'Web server': - 'NGINX': guides/webserver/nginx.md - 'Caddy': guides/webserver/caddy.md @@ -264,7 +264,7 @@ plugins: 'guides/tor/using-tor.md': guides/misc/tor/using-tor.md 'guides/tor/performance-issues.md': guides/misc/tor/performance-issues.md 'guides/tor/dnssec.md': guides/misc/tor/dnssec.md - 'guides/whitelist-blacklist.md': guides/misc/whitelist-blacklist.md + 'guides/whitelist-blacklist.md': guides/misc/allowlist-denylist.md 'guides/nginx-configuration.md': 'guides/webserver/nginx.md' 'guides/caddy-configuration.md': 'guides/webserver/caddy.md' 'guides/traefik-configuration-nodocker.md': 'guides/webserver/traefik-nodocker.md' @@ -283,3 +283,4 @@ plugins: 'guides/vpn/openvpn/overview.md': guides/vpn/openvpn/index.md 'guides/misc/tor/overview.md': guides/misc/tor/index.md 'guides/github/contributing.md': guides/github/index.md + 'guides/misc/whitelist-blacklist.md': guides/misc/allowlist-denylist.md