Pi-Hole/docs
1
0
Fork 0
mirror of https://github.com/pi-hole/docs.git synced 2026-04-18 07:55:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into group_dependabot

Browse Source 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner
2023-09-10 12:57:08 +01:00
committed by GitHub
parent fb206c4586 a6af0e7fe5
commit 68a9ecf839
10 changed files with 131 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
.github/dependabot.yml vendored
View File

@@ -6,6 +6,7 @@ updates:
interval: weekly
day: saturday
time: "10:00"
target-branch: master
open-pull-requests-limit: 10
versioning-strategy: increase
reviewers:
@@ -20,6 +21,7 @@ updates:
interval: weekly
day: saturday
time: "10:00"
target-branch: master
open-pull-requests-limit: 10
allow:
- dependency-type: direct
@@ -42,3 +44,53 @@ updates:
github_action-dependencies:
patterns:
- "*"
target-branch: master
# As above, but for development-v6
version: 2
updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: weekly
day: saturday
time: "10:00"
target-branch: release/v6.0
open-pull-requests-limit: 10
versioning-strategy: increase
reviewers:
- "pi-hole/docs-maintainers"
groups:
npm-dependencies:
patterns:
- "*"
- package-ecosystem: pip
directory: "/"
schedule:
interval: weekly
day: saturday
time: "10:00"
target-branch: release/v6.0
open-pull-requests-limit: 10
allow:
- dependency-type: direct
- dependency-type: indirect
reviewers:
- "pi-hole/docs-maintainers"
groups:
pip-dependencies:
patterns:
- "*"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: weekly
day: saturday
time: "10:00"
reviewers:
- "pi-hole/docs-maintainers"
groups:
github_action-dependencies:
patterns:
- "*"
target-branch: release/v6.0

2
.github/workflows/calibreapp-image-actions.yml vendored
View File

@@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v3.5.3
uses: actions/checkout@v3.6.0
- name: Compress Images
uses: calibreapp/image-actions@1.1.0 # TODO: if they start using a tag like v1, switch to that

4
.github/workflows/ci.yml vendored
View File

@@ -17,7 +17,7 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.5.3
- uses: actions/checkout@v3.6.0
with:
fetch-depth: 0
@@ -29,7 +29,7 @@ jobs:
cache: pip
- name: Set up Node.js
uses: actions/setup-node@v3.7.0
uses: actions/setup-node@v3.8.1
with:
node-version: "${{ env.NODE }}"
cache: npm

2
.github/workflows/codespell.yml vendored
View File

@@ -10,7 +10,7 @@ jobs:
steps:
-
name: Checkout repository
uses: actions/checkout@v3.5.3
uses: actions/checkout@v3.6.0
-
name: Spell-Checking
uses: codespell-project/actions-codespell@master

2
.github/workflows/editorconfig-checker.yml vendored
View File

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

3
docs/guides/dns/unbound.md
View File

@@ -233,13 +233,14 @@ Level 4 gives algorithm level information
Level 5 logs client identification for cache misses
```
First, specify the log file and the verbosity level in the `server` part of
First, specify the log file, human-readable timestamps and the verbosity level in the `server` part of
`/etc/unbound/unbound.conf.d/pi-hole.conf`:
```yaml
server:
# If no logfile is specified, syslog is used
logfile: "/var/log/unbound/unbound.log"
log-time-ascii: yes
verbosity: 1
```

2
docs/guides/dns/upstream-dns-providers.md
View File

@@ -39,6 +39,8 @@ OpenDNS also provides the OpenDNS FamilyShield (free)- option. The service block
- 208.67.222.123
- 208.67.220.123
- 2620:119:35::123 (IPv6)
- 2620:119:53::123 (IPv6)
[More information on OpenDNS FamilyShield](https://www.opendns.com/setupguide/#familyshield) + [OpenDNS FamilyShield introduction Blog](https://umbrella.cisco.com/blog/introducing-familyshield-parental-controls)

130
package-lock.json generated
View File

@@ -9,8 +9,8 @@
"version": "1.0.0",
"license": "CC-BY-SA-4.0",
"devDependencies": {
"linkinator": "^5.0.1",
"markdownlint-cli2": "0.8.1"
"linkinator": "^5.0.2",
"markdownlint-cli2": "0.9.2"
}
},
"node_modules/@babel/code-frame": {
@@ -422,9 +422,9 @@
"dev": true
},
"node_modules/fast-glob": {
"version": "3.2.12",
"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
"integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
"integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
"dev": true,
"dependencies": {
"@nodelib/fs.stat": "^2.0.2",
@@ -533,14 +533,14 @@
}
},
"node_modules/globby": {
"version": "13.1.4",
"resolved": "https://registry.npmjs.org/globby/-/globby-13.1.4.tgz",
"integrity": "sha512-iui/IiiW+QrJ1X1hKH5qwlMQyv34wJAYwH1vrf8b9kBA4sNiif3gKsMHa+BrdnOpEudWjpotfa7LrTzB1ERS/g==",
"version": "13.2.2",
"resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
"integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
"dev": true,
"dependencies": {
"dir-glob": "^3.0.1",
"fast-glob": "^3.2.11",
"ignore": "^5.2.0",
"fast-glob": "^3.3.0",
"ignore": "^5.2.4",
"merge2": "^1.4.1",
"slash": "^4.0.0"
},
@@ -752,9 +752,9 @@
}
},
"node_modules/linkinator": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/linkinator/-/linkinator-5.0.1.tgz",
"integrity": "sha512-i5M70AaFx55BD9lGLvFrzLN3kuVpNTqQpczyip/p8tE3d2Sf1tyWtDRg9JZfm2BJG79A5TGCDcvZpCT6J+cVkg==",
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/linkinator/-/linkinator-5.0.2.tgz",
"integrity": "sha512-bkcgC070cpNfwWySimU2mRWxtMcrVsWR+rD89O+DSqaPxI0k1nd8Cf8GNyLkqS28YOwSYTMg/CpV+k0MxmiRkQ==",
"dev": true,
"dependencies": {
"chalk": "^5.0.0",
@@ -762,7 +762,7 @@
"gaxios": "^5.0.0",
"glob": "^9.3.2",
"htmlparser2": "^9.0.0",
"marked": "^4.0.3",
"marked": "^7.0.4",
"meow": "^12.0.1",
"mime": "^3.0.0",
"server-destroy": "^1.0.1",
@@ -840,29 +840,29 @@
}
},
"node_modules/markdownlint": {
"version": "0.29.0",
"resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.29.0.tgz",
"integrity": "sha512-ASAzqpODstu/Qsk0xW5BPgWnK/qjpBQ4e7IpsSvvFXcfYIjanLTdwFRJK1SIEEh0fGSMKXcJf/qhaZYHyME0wA==",
"version": "0.30.0",
"resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.30.0.tgz",
"integrity": "sha512-nInuFvI/rEzanAOArW5490Ez4EYpB5ODqVM0mcDYCPx9DKJWCQqCgejjiCvbSeE7sjbDscVtZmwr665qpF5xGA==",
"dev": true,
"dependencies": {
"markdown-it": "13.0.1",
"markdownlint-micromark": "0.1.5"
"markdownlint-micromark": "0.1.7"
},
"engines": {
"node": ">=16"
}
},
"node_modules/markdownlint-cli2": {
"version": "0.8.1",
"resolved": "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.8.1.tgz",
"integrity": "sha512-y0Siwt+RApKxSSb0CT9p7z1DcAO+ncjrB9IpC/jflJRIet4namCFmxLTbfBBQdPF6EntPk5yyXKe7vcoPGlnXw==",
"version": "0.9.2",
"resolved": "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.9.2.tgz",
"integrity": "sha512-ndijEHIOikcs29W8068exHXlfkFviGFT/mPhREia7zSfQzHvTDkL2s+tWizvELjLHiKRO4KGTkkJyR3oeR8A5g==",
"dev": true,
"dependencies": {
"globby": "13.1.4",
"markdownlint": "0.29.0",
"globby": "13.2.2",
"markdownlint": "0.30.0",
"markdownlint-cli2-formatter-default": "0.0.4",
"micromatch": "4.0.5",
"strip-json-comments": "5.0.0",
"strip-json-comments": "5.0.1",
"yaml": "2.3.1"
},
"bin": {
@@ -884,24 +884,24 @@
}
},
"node_modules/markdownlint-micromark": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/markdownlint-micromark/-/markdownlint-micromark-0.1.5.tgz",
"integrity": "sha512-HvofNU4QCvfUCWnocQP1IAWaqop5wpWrB0mKB6SSh0fcpV0PdmQNS6tdUuFew1utpYlUvYYzz84oDkrD76GB9A==",
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/markdownlint-micromark/-/markdownlint-micromark-0.1.7.tgz",
"integrity": "sha512-BbRPTC72fl5vlSKv37v/xIENSRDYL/7X/XoFzZ740FGEbs9vZerLrIkFRY0rv7slQKxDczToYuMmqQFN61fi4Q==",
"dev": true,
"engines": {
"node": ">=16"
}
},
"node_modules/marked": {
"version": "4.0.12",
"resolved": "https://registry.npmjs.org/marked/-/marked-4.0.12.tgz",
"integrity": "sha512-hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ==",
"version": "7.0.4",
"resolved": "https://registry.npmjs.org/marked/-/marked-7.0.4.tgz",
"integrity": "sha512-t8eP0dXRJMtMvBojtkcsA7n48BkauktUKzfkPSCq85ZMTJ0v76Rke4DYz01omYpPTUh4p/f7HePgRo3ebG8+QQ==",
"dev": true,
"bin": {
"marked": "bin/marked.js"
},
"engines": {
"node": ">= 12"
"node": ">= 16"
}
},
"node_modules/mdurl": {
@@ -1454,9 +1454,9 @@
}
},
"node_modules/strip-json-comments": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.0.tgz",
"integrity": "sha512-V1LGY4UUo0jgwC+ELQ2BNWfPa17TIuwBLg+j1AA/9RPzKINl1lhxVEu2r+ZTTO8aetIsUzE5Qj6LMSBkoGYKKw==",
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.1.tgz",
"integrity": "sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==",
"dev": true,
"engines": {
"node": ">=14.16"
@@ -1889,9 +1889,9 @@
"dev": true
},
"fast-glob": {
"version": "3.2.12",
"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
"integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
"integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
"dev": true,
"requires": {
"@nodelib/fs.stat": "^2.0.2",
@@ -1976,14 +1976,14 @@
}
},
"globby": {
"version": "13.1.4",
"resolved": "https://registry.npmjs.org/globby/-/globby-13.1.4.tgz",
"integrity": "sha512-iui/IiiW+QrJ1X1hKH5qwlMQyv34wJAYwH1vrf8b9kBA4sNiif3gKsMHa+BrdnOpEudWjpotfa7LrTzB1ERS/g==",
"version": "13.2.2",
"resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
"integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
"dev": true,
"requires": {
"dir-glob": "^3.0.1",
"fast-glob": "^3.2.11",
"ignore": "^5.2.0",
"fast-glob": "^3.3.0",
"ignore": "^5.2.4",
"merge2": "^1.4.1",
"slash": "^4.0.0"
}
@@ -2134,9 +2134,9 @@
}
},
"linkinator": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/linkinator/-/linkinator-5.0.1.tgz",
"integrity": "sha512-i5M70AaFx55BD9lGLvFrzLN3kuVpNTqQpczyip/p8tE3d2Sf1tyWtDRg9JZfm2BJG79A5TGCDcvZpCT6J+cVkg==",
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/linkinator/-/linkinator-5.0.2.tgz",
"integrity": "sha512-bkcgC070cpNfwWySimU2mRWxtMcrVsWR+rD89O+DSqaPxI0k1nd8Cf8GNyLkqS28YOwSYTMg/CpV+k0MxmiRkQ==",
"dev": true,
"requires": {
"chalk": "^5.0.0",
@@ -2144,7 +2144,7 @@
"gaxios": "^5.0.0",
"glob": "^9.3.2",
"htmlparser2": "^9.0.0",
"marked": "^4.0.3",
"marked": "^7.0.4",
"meow": "^12.0.1",
"mime": "^3.0.0",
"server-destroy": "^1.0.1",
@@ -2194,26 +2194,26 @@
}
},
"markdownlint": {
"version": "0.29.0",
"resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.29.0.tgz",
"integrity": "sha512-ASAzqpODstu/Qsk0xW5BPgWnK/qjpBQ4e7IpsSvvFXcfYIjanLTdwFRJK1SIEEh0fGSMKXcJf/qhaZYHyME0wA==",
"version": "0.30.0",
"resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.30.0.tgz",
"integrity": "sha512-nInuFvI/rEzanAOArW5490Ez4EYpB5ODqVM0mcDYCPx9DKJWCQqCgejjiCvbSeE7sjbDscVtZmwr665qpF5xGA==",
"dev": true,
"requires": {
"markdown-it": "13.0.1",
"markdownlint-micromark": "0.1.5"
"markdownlint-micromark": "0.1.7"
}
},
"markdownlint-cli2": {
"version": "0.8.1",
"resolved": "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.8.1.tgz",
"integrity": "sha512-y0Siwt+RApKxSSb0CT9p7z1DcAO+ncjrB9IpC/jflJRIet4namCFmxLTbfBBQdPF6EntPk5yyXKe7vcoPGlnXw==",
"version": "0.9.2",
"resolved": "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.9.2.tgz",
"integrity": "sha512-ndijEHIOikcs29W8068exHXlfkFviGFT/mPhREia7zSfQzHvTDkL2s+tWizvELjLHiKRO4KGTkkJyR3oeR8A5g==",
"dev": true,
"requires": {
"globby": "13.1.4",
"markdownlint": "0.29.0",
"globby": "13.2.2",
"markdownlint": "0.30.0",
"markdownlint-cli2-formatter-default": "0.0.4",
"micromatch": "4.0.5",
"strip-json-comments": "5.0.0",
"strip-json-comments": "5.0.1",
"yaml": "2.3.1"
}
},
@@ -2225,15 +2225,15 @@
"requires": {}
},
"markdownlint-micromark": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/markdownlint-micromark/-/markdownlint-micromark-0.1.5.tgz",
"integrity": "sha512-HvofNU4QCvfUCWnocQP1IAWaqop5wpWrB0mKB6SSh0fcpV0PdmQNS6tdUuFew1utpYlUvYYzz84oDkrD76GB9A==",
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/markdownlint-micromark/-/markdownlint-micromark-0.1.7.tgz",
"integrity": "sha512-BbRPTC72fl5vlSKv37v/xIENSRDYL/7X/XoFzZ740FGEbs9vZerLrIkFRY0rv7slQKxDczToYuMmqQFN61fi4Q==",
"dev": true
},
"marked": {
"version": "4.0.12",
"resolved": "https://registry.npmjs.org/marked/-/marked-4.0.12.tgz",
"integrity": "sha512-hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ==",
"version": "7.0.4",
"resolved": "https://registry.npmjs.org/marked/-/marked-7.0.4.tgz",
"integrity": "sha512-t8eP0dXRJMtMvBojtkcsA7n48BkauktUKzfkPSCq85ZMTJ0v76Rke4DYz01omYpPTUh4p/f7HePgRo3ebG8+QQ==",
"dev": true
},
"mdurl": {
@@ -2601,9 +2601,9 @@
}
},
"strip-json-comments": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.0.tgz",
"integrity": "sha512-V1LGY4UUo0jgwC+ELQ2BNWfPa17TIuwBLg+j1AA/9RPzKINl1lhxVEu2r+ZTTO8aetIsUzE5Qj6LMSBkoGYKKw==",
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.1.tgz",
"integrity": "sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==",
"dev": true
},
"supports-color": {

4
package.json
View File

@@ -22,7 +22,7 @@
"test": "npm run markdownlint && npm run linkinator"
},
"devDependencies": {
"linkinator": "^5.0.1",
"markdownlint-cli2": "0.8.1"
"linkinator": "^5.0.2",
"markdownlint-cli2": "0.9.2"
}
}

6
requirements.txt
View File

@@ -1,4 +1,4 @@
mkdocs==1.4.3
mkdocs==1.5.2
mkdocs-git-revision-date-localized-plugin==1.2.0
mkdocs-material==9.1.18
mkdocs-redirects==1.2.0
mkdocs-material==9.2.6
mkdocs-redirects==1.2.1