Merge branch 'master' into patch-1

Signed-off-by: Mike <[email protected]>

Author: DiskCrasher

.github/workflows/calibreapp-image-actions.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.1
 
       - name: Compress Images
         uses: calibreapp/[email protected] # TODO: if they start using a tag like v1, switch to that

.github/workflows/ci.yml

@@ -17,19 +17,19 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.1
         with:
           fetch-depth: 0
 
       - name: Set up Python
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: "${{ env.PYTHON_VERSION }}"
           architecture: "x64"
           cache: pip
 
       - name: Set up Node.js
-        uses: actions/[email protected].2
+        uses: actions/[email protected].4
         with:
           node-version: "${{ env.NODE }}"
           cache: npm

.github/workflows/codespell.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
     -
       name: Checkout repository
-      uses: actions/checkout@v4.1.7
+      uses: actions/checkout@v4.2.1
     -
       name: Spell-Checking
       uses: codespell-project/actions-codespell@master

.github/workflows/editorconfig-checker.yml

@@ -9,6 +9,6 @@ jobs:
     name: editorconfig-checker
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.1
       - uses: editorconfig-checker/action-editorconfig-checker@main
       - run: editorconfig-checker

LICENSE

@@ -33,7 +33,7 @@ exhaustive, and do not form part of our licenses.
      material not subject to the license. This includes other CC-
      licensed material, or material used under an exception or
      limitation to copyright. More considerations for licensors:
-	wiki.creativecommons.org/Considerations_for_licensors
+    wiki.creativecommons.org/Considerations_for_licensors
 
      Considerations for the public: By using one of our public
      licenses, a licensor grants the public permission to use the
@@ -50,7 +50,7 @@ exhaustive, and do not form part of our licenses.
      Although not required by our licenses, you are encouraged to
      respect those requests where reasonable. More_considerations
      for the public:
-	wiki.creativecommons.org/Considerations_for_licensees
+    wiki.creativecommons.org/Considerations_for_licensees
 
 =======================================================================
 

docs/guides/dns/cloudflared.md

@@ -84,9 +84,17 @@ Edit configuration file by copying the following in to `/etc/default/cloudflared
 CLOUDFLARED_OPTS=--port 5053 --upstream https://cloudflare-dns.com/dns-query
 ```
 
+
 !!! info
     See the other available [Cloudflare endpoints](https://developers.cloudflare.com/1.1.1.1/infrastructure/network-operators/#available-endpoints).
 
+If you're running cloudflared on different host than pi-hole, you can add listening address to all IPs (for security, change 0.0.0.0 to your machine's IP, e.g. 192.168.1.1):
+
+```bash
+# Commandline args for cloudflared, using Cloudflare DNS
+CLOUDFLARED_OPTS=--port 5053 --upstream https://1.1.1.1/dns-query --upstream https://1.0.0.1/dns-query --address 0.0.0.0
+```
+
 Update the permissions for the configuration file and `cloudflared` binary to allow access for the cloudflared user:
 
 ```bash
@@ -203,7 +211,7 @@ sudo chown root:root /etc/cron.weekly/cloudflared-updater
 <!-- markdownlint-disable code-block-style -->
 !!! warning
     Make sure to add shebang `#!/bin/bash` in the beginning of  `/etc/cron.weekly/cloudflared-updater`.
-    Otherwise, the command would not executed.
+    Otherwise, the command will not be executed.
 <!-- markdownlint-enable code-block-style -->
 
 The system will now attempt to update the cloudflared binary automatically, once per week.

docs/main/prerequisites.md

@@ -25,14 +25,14 @@ Pi-hole is supported on distributions utilizing [systemd](https://systemd.io/) o
 
 The following operating systems are **officially** supported:
 
-| Distribution | Release          | Architecture        |
-| ------------ | ---------------- | ------------------- |
-| Raspberry Pi OS <br>(formerly Raspbian)     | Buster / Bullseye | ARM                 |
-| Armbian OS   | Any | ARM / x86_64 / riscv64           |
-| Ubuntu       | 20.x / 22.x / 23.x / 24.x   | ARM / x86_64        |
-| Debian       | 10 / 11 / 12         | ARM / x86_64 / i386 |
-| Fedora       | 39 / 40     | ARM / x86_64        |
-| CentOS Stream | 9            | x86_64              |
+- Raspberry Pi OS (formerly Raspbian)
+- Armbian OS
+- Ubuntu
+- Debian
+- Fedora
+- CentOS Stream
+
+Pi-hole only supports actively maintained versions of these systems.
 
 <!-- markdownlint-disable code-block-style -->
 !!! info

docs/regex/pi-hole.md

@@ -2,7 +2,7 @@
 
 ## Only match specific query types
 
-You can amend the regular expressions by special keywords added at the end to fine-tine regular expressions to match only specific [query types](../database/ftl.md#supported-query-types). In contrast to the description of `OTHER` as being deprecated for storing queries in the database, it is still supported for regular expressions and will match all queries that are not *explicitly* covered by the other query types (see also example below).
+You can amend the regular expressions by special keywords added at the end to fine-tune regular expressions to match only specific [query types](../database/ftl.md#supported-query-types). In contrast to the description of `OTHER` as being deprecated for storing queries in the database, it is still supported for regular expressions and will match all queries that are not *explicitly* covered by the other query types (see also example below).
 
 Example: