From 8e7114710d21f38bfcad11afc9265691ef428c11 Mon Sep 17 00:00:00 2001 From: Mahakam20000 Date: Wed, 26 Feb 2020 16:36:18 +0100 Subject: [PATCH 01/14] Revisioning DHCP port I'm fixing my mistake on the previous pull request DHCP port is 67 **udp protocol**, so I delete the tcp rule. It was useless. DHCP must assign the IP address, so we can't check the IP address of the source. If we do so, it simply will not work. --- docs/main/prerequesites.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/main/prerequesites.md b/docs/main/prerequesites.md index 269e2a8..2c7dd6c 100644 --- a/docs/main/prerequesites.md +++ b/docs/main/prerequesites.md @@ -68,8 +68,7 @@ iptables -I INPUT 1 -s 127.0.0.0/8 -p tcp -m tcp --dport 53 -j ACCEPT iptables -I INPUT 1 -s 127.0.0.0/8 -p udp -m udp --dport 53 -j ACCEPT iptables -I INPUT 1 -s 192.168.0.0/16 -p tcp -m tcp --dport 53 -j ACCEPT iptables -I INPUT 1 -s 192.168.0.0/16 -p udp -m udp --dport 53 -j ACCEPT -iptables -I INPUT 1 -s 192.168.0.0/16 -p tcp -m tcp --dport 67 -j ACCEPT -iptables -I INPUT 1 -s 192.168.0.0/16 -p udp -m udp --dport 67 -j ACCEPT +iptables -I INPUT 1 -p udp -m udp --dport 67 -j ACCEPT iptables -I INPUT 1 -p tcp -m tcp --dport 4711:4720 -i lo -j ACCEPT iptables -I INPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT ``` @@ -77,7 +76,7 @@ iptables -I INPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT IP6Tables (IPv6) ```bash -ip6tables -I INPUT -s fe80::/10 -p udp -m udp --sport 546:547 --dport 546:547 -j ACCEPT +ip6tables -I INPUT -p udp -m udp --sport 546:547 --dport 546:547 -j ACCEPT ip6tables -I INPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT ``` From e98ab758251017aff31c5571bb0d0a3fe64b5c22 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Sun, 1 Mar 2020 00:21:07 -0800 Subject: [PATCH 02/14] Update docs/main/prerequesites.md --- docs/main/prerequesites.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/main/prerequesites.md b/docs/main/prerequesites.md index 2c7dd6c..dc04e30 100644 --- a/docs/main/prerequesites.md +++ b/docs/main/prerequesites.md @@ -68,7 +68,7 @@ iptables -I INPUT 1 -s 127.0.0.0/8 -p tcp -m tcp --dport 53 -j ACCEPT iptables -I INPUT 1 -s 127.0.0.0/8 -p udp -m udp --dport 53 -j ACCEPT iptables -I INPUT 1 -s 192.168.0.0/16 -p tcp -m tcp --dport 53 -j ACCEPT iptables -I INPUT 1 -s 192.168.0.0/16 -p udp -m udp --dport 53 -j ACCEPT -iptables -I INPUT 1 -p udp -m udp --dport 67 -j ACCEPT +iptables -I INPUT 1 -p udp --dport 67:68 --sport 67:68 -j ACCEPT iptables -I INPUT 1 -p tcp -m tcp --dport 4711:4720 -i lo -j ACCEPT iptables -I INPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT ``` From 8ae2eca1ea1c0653c8bfd2f8409864e37181802b Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 4 Mar 2020 18:45:44 +0200 Subject: [PATCH 03/14] Minor additions (#273) --- docs/guides/dns-over-https.md | 2 +- docs/guides/unbound.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guides/dns-over-https.md b/docs/guides/dns-over-https.md index 9b2979e..9ef2c90 100644 --- a/docs/guides/dns-over-https.md +++ b/docs/guides/dns-over-https.md @@ -169,7 +169,7 @@ google.com. 191 IN A 172.217.22.14 ### Configuring Pi-hole -Finally, configure Pi-hole to use the local `cloudflared` service as the upstream DNS server by specifying `127.0.0.1#5053` as the Custom DNS: +Finally, configure Pi-hole to use the local `cloudflared` service as the upstream DNS server by specifying `127.0.0.1#5053` as the Custom DNS (IPv4): ![Screenshot of Pi-hole configuration](../images/DoHConfig.png) diff --git a/docs/guides/unbound.md b/docs/guides/unbound.md index 6a84aca..ef53189 100644 --- a/docs/guides/unbound.md +++ b/docs/guides/unbound.md @@ -147,7 +147,7 @@ The first command should give a status report of `SERVFAIL` and no IP address. T ### Configure Pi-hole -Finally, configure Pi-hole to use your recursive DNS server: +Finally, configure Pi-hole to use your recursive DNS server by specifying `127.0.0.1#5353` as the Custom DNS (IPv4): ![screenshot at 2018-04-18](../images/RecursiveResolver.png) From 63e822a6eb10161e3673c66da9ddee8d5a2b7513 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 14 Mar 2020 16:06:29 +0200 Subject: [PATCH 04/14] [Security] Bump minimist from 1.2.0 to 1.2.5 (#276) Bumps [minimist](https://github.com/substack/minimist) from 1.2.0 to 1.2.5. **This update includes a security fix.** - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.0...1.2.5) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index bde14b1..92fcac2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -224,9 +224,9 @@ } }, "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true }, "once": { From 571a10bb1f805fd08dd60e98823404ad6881c7d8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2020 09:11:20 +0200 Subject: [PATCH 05/14] Bump mkdocs-git-revision-date-localized-plugin from 0.4.6 to 0.4.8 (#277) Bumps [mkdocs-git-revision-date-localized-plugin](https://github.com/timvink/mkdocs-git-revision-date-localized-plugin) from 0.4.6 to 0.4.8. - [Release notes](https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/releases) - [Commits](https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/compare/v0.4.6...v0.4.8) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 20aa7f4..37e1868 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ markdown-include==0.5.1 mkdocs==1.1 -mkdocs-git-revision-date-localized-plugin==0.4.6 +mkdocs-git-revision-date-localized-plugin==0.4.8 mkdocs-material==4.6.3 From bf1ade5ac11f915693037d354c13d2fd711b8067 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 19 Mar 2020 08:27:03 +0200 Subject: [PATCH 06/14] Update peaceiris/actions-gh-pages to the v3 tag Also, switch from the env vars to the `with` options --- .github/workflows/build.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f363fe0..dfaf505 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,11 +54,10 @@ jobs: path: ./site/ - name: Deploy - uses: peaceiris/actions-gh-pages@v2 + uses: peaceiris/actions-gh-pages@v3 if: success() - env: - PERSONAL_TOKEN: ${{ secrets.PERSONAL_TOKEN }} - PUBLISH_BRANCH: gh-pages - PUBLISH_DIR: ./site/ with: emptyCommits: false + personal_token: ${{ secrets.PERSONAL_TOKEN }} + publish_branch: gh-pages + publish_dir: ./site/ From 925592f9aaaea0f63e40bf5dccf6c6e7a64b468f Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 27 Mar 2020 10:51:50 +0200 Subject: [PATCH 07/14] Update dns-over-https.md Fix manual update instructions --- docs/guides/dns-over-https.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/guides/dns-over-https.md b/docs/guides/dns-over-https.md index 9ef2c90..a396e58 100644 --- a/docs/guides/dns-over-https.md +++ b/docs/guides/dns-over-https.md @@ -180,15 +180,18 @@ Finally, configure Pi-hole to use the local `cloudflared` service as the upstrea #### Manual way ```bash -# stop the service -sudo systemctl stop cloudflared # fetch and copy the latest version wget https://bin.equinox.io/c/VdrWdbjqyF/cloudflared-stable-linux-arm.tgz tar -xvzf cloudflared-stable-linux-arm.tgz +# stop the service +sudo systemctl stop cloudflared +# copy the binary sudo cp ./cloudflared /usr/local/bin sudo chmod +x /usr/local/bin/cloudflared +# start the service sudo systemctl start cloudflared -# verify the service is working fine +# verify the service and binary are working fine +cloudflared -v sudo systemctl status cloudflared ``` From 6323cd92b379e3649555cd9010490c3293c330c0 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 28 Mar 2020 10:02:47 +0200 Subject: [PATCH 08/14] Update dns-over-https.md Remove the comments inside the snippet to make it easier to copy/paste and link to the cloudflared repo. --- docs/guides/dns-over-https.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/docs/guides/dns-over-https.md b/docs/guides/dns-over-https.md index a396e58..793d9ba 100644 --- a/docs/guides/dns-over-https.md +++ b/docs/guides/dns-over-https.md @@ -9,7 +9,7 @@ It is worth noting, however, that the upstream DNS-Over-HTTPS provider will stil ## Configuring DNS-Over-HTTPS -Along with releasing their DNS service [1.1.1.1](https://blog.cloudflare.com/announcing-1111/), Cloudflare implemented DNS-Over-HTTPS proxy functionality into one of their tools: `cloudflared`. +Along with releasing their DNS service [1.1.1.1](https://blog.cloudflare.com/announcing-1111/), Cloudflare implemented DNS-Over-HTTPS proxy functionality into one of their tools: [`cloudflared`](https://github.com/cloudflare/cloudflared). In the following sections, we will be covering how to install and configure this tool on `Pi-hole`. @@ -180,17 +180,12 @@ Finally, configure Pi-hole to use the local `cloudflared` service as the upstrea #### Manual way ```bash -# fetch and copy the latest version wget https://bin.equinox.io/c/VdrWdbjqyF/cloudflared-stable-linux-arm.tgz tar -xvzf cloudflared-stable-linux-arm.tgz -# stop the service sudo systemctl stop cloudflared -# copy the binary sudo cp ./cloudflared /usr/local/bin sudo chmod +x /usr/local/bin/cloudflared -# start the service sudo systemctl start cloudflared -# verify the service and binary are working fine cloudflared -v sudo systemctl status cloudflared ``` From 4bef9478dba0fa9391313c6383ab6187ef6f4556 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2020 10:14:54 +0000 Subject: [PATCH 09/14] Bump mkdocs-git-revision-date-localized-plugin from 0.4.8 to 0.5.0 Bumps [mkdocs-git-revision-date-localized-plugin](https://github.com/timvink/mkdocs-git-revision-date-localized-plugin) from 0.4.8 to 0.5.0. - [Release notes](https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/releases) - [Commits](https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/compare/v0.4.8...v0.5.0) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 37e1868..121c598 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ markdown-include==0.5.1 mkdocs==1.1 -mkdocs-git-revision-date-localized-plugin==0.4.8 +mkdocs-git-revision-date-localized-plugin==0.5.0 mkdocs-material==4.6.3 From 6ed763042be06e6f8b17218f7171b1e45f398b41 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 17 Apr 2020 09:17:03 +0300 Subject: [PATCH 10/14] Update mkdocs-material to v5.1.0 (#275) --- mkdocs.yml | 6 ++++-- requirements.txt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index 770d2f8..d64f199 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -6,6 +6,8 @@ copyright: 'Copyright © 2019 Pi-hole LLC' remote_branch: gh-pages theme: name: 'material' +# icon: +# repo: fontawesome/brands/github-alt favicon: 'images/favicon.ico' logo: 'images/logo.svg' language: 'en' @@ -111,9 +113,9 @@ nav: extra: social: - - type: globe + - icon: fontawesome/solid/globe-americas link: https://pi-hole.net/ - - type: github-alt + - icon: fontawesome/brands/github link: https://github.com/pi-hole extra_css: diff --git a/requirements.txt b/requirements.txt index 121c598..e09d48a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ markdown-include==0.5.1 mkdocs==1.1 mkdocs-git-revision-date-localized-plugin==0.5.0 -mkdocs-material==4.6.3 +mkdocs-material==5.1.0 From 7e54c0d85a0f356ea61f990dae3e9804ae1d9eb7 Mon Sep 17 00:00:00 2001 From: stevedrz <51426708+stevedrz@users.noreply.github.com> Date: Fri, 17 Apr 2020 06:54:36 -0400 Subject: [PATCH 11/14] Add information on 1.1.1.1 for Families Added info on 1.1.1.1 for Families, including a blog link to explain the service. --- docs/guides/upstream-dns-providers.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/guides/upstream-dns-providers.md b/docs/guides/upstream-dns-providers.md index 2dba326..30620ed 100644 --- a/docs/guides/upstream-dns-providers.md +++ b/docs/guides/upstream-dns-providers.md @@ -91,6 +91,22 @@ CloudFlare will never log your IP address (the way other companies identify you) [More information on Cloudflare DNS](https://cloudflare-dns.com/dns/#explanation) +Cloudflare also provides 1.1.1.1 for Families, a set of resolvers that can block malware only, or malware and adult content. + +Malware Blocking Only +- 1.1.1.2 +- 1.0.0.2 +- 2606:4700:4700::1112 (IPv6) +- 2606:4700:4700::1002 (IPv6) + +Malware and Adult Content +- 1.1.1.3 +- 1.0.0.3 +- 2606:4700:4700::1113 (IPv6) +- 2606:4700:4700::1003 (IPv6) + +[More info on 1.1.1.1 for Families(https://blog.cloudflare.com/introducing-1-1-1-1-for-families/)] + ### Custom With custom, you'll choose your favorite DNS provider. If you care about Internet independence and privacy, we suggest having a look at the [OpenNIC DNS Project](https://servers.opennic.org/). From 2a90ebb8df84067ea15cbab6dd8d5ca1a379a4d6 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Fri, 17 Apr 2020 16:51:33 -0700 Subject: [PATCH 12/14] Update docs/guides/upstream-dns-providers.md --- docs/guides/upstream-dns-providers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guides/upstream-dns-providers.md b/docs/guides/upstream-dns-providers.md index 30620ed..9a911ac 100644 --- a/docs/guides/upstream-dns-providers.md +++ b/docs/guides/upstream-dns-providers.md @@ -105,7 +105,7 @@ Malware and Adult Content - 2606:4700:4700::1113 (IPv6) - 2606:4700:4700::1003 (IPv6) -[More info on 1.1.1.1 for Families(https://blog.cloudflare.com/introducing-1-1-1-1-for-families/)] +[More info on 1.1.1.1 for Families](https://blog.cloudflare.com/introducing-1-1-1-1-for-families/) ### Custom From 007e9cba35ecc4a30833c56d9b8a89977ccb894e Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Fri, 17 Apr 2020 16:53:52 -0700 Subject: [PATCH 13/14] Update docs/guides/upstream-dns-providers.md --- docs/guides/upstream-dns-providers.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/guides/upstream-dns-providers.md b/docs/guides/upstream-dns-providers.md index 9a911ac..9275ad1 100644 --- a/docs/guides/upstream-dns-providers.md +++ b/docs/guides/upstream-dns-providers.md @@ -94,12 +94,14 @@ CloudFlare will never log your IP address (the way other companies identify you) Cloudflare also provides 1.1.1.1 for Families, a set of resolvers that can block malware only, or malware and adult content. Malware Blocking Only + - 1.1.1.2 - 1.0.0.2 - 2606:4700:4700::1112 (IPv6) - 2606:4700:4700::1002 (IPv6) Malware and Adult Content + - 1.1.1.3 - 1.0.0.3 - 2606:4700:4700::1113 (IPv6) From fe06c15ec8086e4ba8da80d877ac5278a3dbb325 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 18 Apr 2020 06:56:17 +0000 Subject: [PATCH 14/14] Bump mkdocs-material from 5.1.0 to 5.1.1 Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 5.1.0 to 5.1.1. - [Release notes](https://github.com/squidfunk/mkdocs-material/releases) - [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG) - [Commits](https://github.com/squidfunk/mkdocs-material/compare/5.1.0...5.1.1) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e09d48a..f304723 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ markdown-include==0.5.1 mkdocs==1.1 mkdocs-git-revision-date-localized-plugin==0.5.0 -mkdocs-material==5.1.0 +mkdocs-material==5.1.1