From cfe15fbfdebe92fc9d438c53d020d64bbef3796d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Sun, 29 Oct 2023 20:43:12 +0100 Subject: [PATCH 1/3] Update Node to 20 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d878da1..d26d838 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ on: env: FORCE_COLOR: 2 - NODE: 16 + NODE: 20 PYTHON_VERSION: "3.11" jobs: From 70541b3561f0608ea3432b5d0770f60986cfca72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Sun, 29 Oct 2023 20:55:01 +0100 Subject: [PATCH 2/3] Fix spellcheck MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- docs/routers/ubiquiti-usg.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/routers/ubiquiti-usg.md b/docs/routers/ubiquiti-usg.md index 3f59eea..a66992e 100644 --- a/docs/routers/ubiquiti-usg.md +++ b/docs/routers/ubiquiti-usg.md @@ -53,7 +53,7 @@ If you'd rather have your USG forward all DNS traffic to Pi-hole, you can comple ``` !!! warning - Keep in mind that if you are using your USG's IP address as an upstream resolver for your Pi-hole together with this configureation, ***this will cause a resolver loop***. Make sure to have another upstream DNS server(s) set in your Pi-hole's configuration, or use Pi-hole as [your own recursive DNS server with Unbound](https://docs.pi-hole.net/guides/dns/unbound/?h=unbound#configure-unbound). + Keep in mind that if you are using your USG's IP address as an upstream resolver for your Pi-hole together with this configuration, ***this will cause a resolver loop***. Make sure to have another upstream DNS server(s) set in your Pi-hole's configuration, or use Pi-hole as [your own recursive DNS server with Unbound](https://docs.pi-hole.net/guides/dns/unbound/?h=unbound#configure-unbound). Log into your Unifi Cloud Key. Go to **Settings** -> **Internet**. Click on the WAN line that appears. From 61ca8c8cfd9157871601a924c2d21c78f604603c Mon Sep 17 00:00:00 2001 From: Chris L Date: Tue, 14 Nov 2023 18:56:56 +0000 Subject: [PATCH 3/3] Update faq.md Signed-off-by: Chris L --- docs/main/faq.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/main/faq.md b/docs/main/faq.md index efa659f..a352c4b 100644 --- a/docs/main/faq.md +++ b/docs/main/faq.md @@ -105,3 +105,16 @@ Restart the web server: ```bash sudo service lighttpd restart ``` + +### In which order are locally defined DNS records used? + +**Answer:** + +The order of locally defined DNS records is: + +1. The device's host name and `pi.hole` +2. Configured in a config file in `/etc/dnsmasq.d/` +3. Read from `/etc/hosts` +4. Read from the "Local (custom) DNS" list (stored in `/etc/pihole/custom.list`) + +Only the first record will trigger an address-to-name association.