Merge branch 'master' into master

This commit is contained in:
XhmikosR
2020-04-15 14:25:18 +03:00
committed by GitHub
5 changed files with 13 additions and 16 deletions
+4 -5
View File
@@ -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/
+4 -6
View File
@@ -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
```
+1 -1
View File
@@ -152,7 +152,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):
![Upstream DNS Servers Configuration](../images/RecursiveResolver.png)
+3 -3
View File
@@ -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": {
+1 -1
View File
@@ -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.5.0
mkdocs-material==4.6.3