Merge branch 'master' into master

.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/

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`.
 
@@ -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)
 
@@ -180,15 +180,13 @@ 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
+sudo systemctl stop cloudflared
 sudo cp ./cloudflared /usr/local/bin
 sudo chmod +x /usr/local/bin/cloudflared
 sudo systemctl start cloudflared
-# verify the service is working fine
+cloudflared -v
 sudo systemctl status cloudflared
 ```
 

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)
 

docs/guides/upstream-dns-providers.md

@@ -91,6 +91,24 @@ 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/).

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:

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": {

requirements.txt

@@ -1,4 +1,4 @@
 markdown-include==0.5.1
 mkdocs==1.1
-mkdocs-git-revision-date-localized-plugin==0.4.6
-mkdocs-material==4.6.3
+mkdocs-git-revision-date-localized-plugin==0.5.0
+mkdocs-material==5.1.1