From f75b961035c123eed8cf9079738095d48e4cad51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Sat, 1 Jul 2023 09:24:48 +0200 Subject: [PATCH 01/12] Group Dependabot pull requests by pachage ecosystem MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- .github/dependabot.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index cab6cc8..c35dd4b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,6 +10,10 @@ updates: versioning-strategy: increase reviewers: - "pi-hole/docs-maintainers" + groups: + npm-dependencies: + patterns: + - "*" - package-ecosystem: pip directory: "/" schedule: @@ -22,6 +26,10 @@ updates: - dependency-type: indirect reviewers: - "pi-hole/docs-maintainers" + groups: + pip-dependencies: + patterns: + - "*" - package-ecosystem: "github-actions" directory: "/" schedule: @@ -30,3 +38,7 @@ updates: time: "10:00" reviewers: - "pi-hole/docs-maintainers" + groups: + github_action-dependencies: + patterns: + - "*" From 96aa7b13f99f8852d340d6e0b180b52045ab8af0 Mon Sep 17 00:00:00 2001 From: Chris L Date: Sat, 5 Aug 2023 07:42:47 +0100 Subject: [PATCH 02/12] Update unbound.md Minor tweak to logfile section to ensure human-readable timestamps (default is Unix time) Signed-off-by: Chris L --- docs/guides/dns/unbound.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/guides/dns/unbound.md b/docs/guides/dns/unbound.md index 15da9a9..11f1d68 100644 --- a/docs/guides/dns/unbound.md +++ b/docs/guides/dns/unbound.md @@ -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 ``` From 0b15348a97b14b454febd11142f3d993456d507a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 5 Aug 2023 10:50:53 +0000 Subject: [PATCH 03/12] Bump mkdocs from 1.5.1 to 1.5.2 Bumps [mkdocs](https://github.com/mkdocs/mkdocs) from 1.5.1 to 1.5.2. - [Release notes](https://github.com/mkdocs/mkdocs/releases) - [Commits](https://github.com/mkdocs/mkdocs/compare/1.5.1...1.5.2) --- updated-dependencies: - dependency-name: mkdocs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a82aed7..5340409 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -mkdocs==1.5.1 +mkdocs==1.5.2 mkdocs-git-revision-date-localized-plugin==1.2.0 mkdocs-material==9.1.21 mkdocs-redirects==1.2.1 From f17f43ec181d96a7ef0e9c1f5a38a58130d0a963 Mon Sep 17 00:00:00 2001 From: Angelo Peronio Date: Fri, 11 Aug 2023 16:34:54 +0200 Subject: [PATCH 04/12] Add OpenDNS Family Shield IPv6 addresses See https://discourse.pi-hole.net/t/mention-opendns-family-shield-ipv6-addresses-in-the-docs/64342 Signed-off-by: Angelo Peronio --- docs/guides/dns/upstream-dns-providers.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/guides/dns/upstream-dns-providers.md b/docs/guides/dns/upstream-dns-providers.md index f70223d..4d34912 100644 --- a/docs/guides/dns/upstream-dns-providers.md +++ b/docs/guides/dns/upstream-dns-providers.md @@ -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) From e1e4e121063113a848ecb6a07e7bd4a3702e02e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 19 Aug 2023 10:37:31 +0000 Subject: [PATCH 05/12] Bump actions/setup-node from 3.7.0 to 3.8.1 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3.7.0 to 3.8.1. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v3.7.0...v3.8.1) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .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 a65dacc..69533e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 From a25c71fa70ea751954c5a908390d7688e4212706 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Aug 2023 10:11:38 +0000 Subject: [PATCH 06/12] Bump markdownlint-cli2 from 0.8.1 to 0.9.2 Bumps [markdownlint-cli2](https://github.com/DavidAnson/markdownlint-cli2) from 0.8.1 to 0.9.2. - [Changelog](https://github.com/DavidAnson/markdownlint-cli2/blob/main/CHANGELOG.md) - [Commits](https://github.com/DavidAnson/markdownlint-cli2/compare/v0.8.1...v0.9.2) --- updated-dependencies: - dependency-name: markdownlint-cli2 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 98 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/package-lock.json b/package-lock.json index b5007b6..9503fd4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "CC-BY-SA-4.0", "devDependencies": { "linkinator": "^5.0.1", - "markdownlint-cli2": "0.8.1" + "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" }, @@ -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,9 +884,9 @@ } }, "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" @@ -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" } @@ -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,9 +2225,9 @@ "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": { @@ -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": { diff --git a/package.json b/package.json index 7ce72ab..3ee6a22 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,6 @@ }, "devDependencies": { "linkinator": "^5.0.1", - "markdownlint-cli2": "0.8.1" + "markdownlint-cli2": "0.9.2" } } From e17dd1f98a5868794662d9dbc45f746b9005f8bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Aug 2023 11:22:07 +0000 Subject: [PATCH 07/12] Bump mkdocs-material from 9.1.21 to 9.2.3 Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.1.21 to 9.2.3. - [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/9.1.21...9.2.3) --- updated-dependencies: - dependency-name: mkdocs-material dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5340409..f33c31a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ mkdocs==1.5.2 mkdocs-git-revision-date-localized-plugin==1.2.0 -mkdocs-material==9.1.21 +mkdocs-material==9.2.3 mkdocs-redirects==1.2.1 From af91c80b5d05f4a5b2592982ba6b9662bcc468c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Aug 2023 12:41:32 +0000 Subject: [PATCH 08/12] Bump linkinator from 5.0.1 to 5.0.2 Bumps [linkinator](https://github.com/JustinBeckwith/linkinator) from 5.0.1 to 5.0.2. - [Release notes](https://github.com/JustinBeckwith/linkinator/releases) - [Commits](https://github.com/JustinBeckwith/linkinator/compare/v5.0.1...v5.0.2) --- updated-dependencies: - dependency-name: linkinator dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 32 ++++++++++++++++---------------- package.json | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9503fd4..7170c34 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "CC-BY-SA-4.0", "devDependencies": { - "linkinator": "^5.0.1", + "linkinator": "^5.0.2", "markdownlint-cli2": "0.9.2" } }, @@ -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", @@ -893,15 +893,15 @@ } }, "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": { @@ -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", @@ -2231,9 +2231,9 @@ "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": { diff --git a/package.json b/package.json index 3ee6a22..52079f9 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "test": "npm run markdownlint && npm run linkinator" }, "devDependencies": { - "linkinator": "^5.0.1", + "linkinator": "^5.0.2", "markdownlint-cli2": "0.9.2" } } From 66dcba48358dae9be22c2df1143fc22afbf5316a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Aug 2023 12:44:57 +0000 Subject: [PATCH 09/12] Bump actions/checkout from 3.5.3 to 3.6.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.3 to 3.6.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3.5.3...v3.6.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/calibreapp-image-actions.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/codespell.yml | 2 +- .github/workflows/editorconfig-checker.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/calibreapp-image-actions.yml b/.github/workflows/calibreapp-image-actions.yml index 5aee9fa..6597488 100644 --- a/.github/workflows/calibreapp-image-actions.yml +++ b/.github/workflows/calibreapp-image-actions.yml @@ -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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 69533e2..d878da1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 6363afa..5fec3ce 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -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 diff --git a/.github/workflows/editorconfig-checker.yml b/.github/workflows/editorconfig-checker.yml index ca48bf7..0e46a08 100644 --- a/.github/workflows/editorconfig-checker.yml +++ b/.github/workflows/editorconfig-checker.yml @@ -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 From 26395f561c342c395d672b48c6df0ef15b4048a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Sep 2023 10:33:15 +0000 Subject: [PATCH 10/12] Bump mkdocs-material from 9.2.3 to 9.2.6 Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.2.3 to 9.2.6. - [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/9.2.3...9.2.6) --- updated-dependencies: - dependency-name: mkdocs-material dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f33c31a..21f9559 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ mkdocs==1.5.2 mkdocs-git-revision-date-localized-plugin==1.2.0 -mkdocs-material==9.2.3 +mkdocs-material==9.2.6 mkdocs-redirects==1.2.1 From 760870db9882dabe857bef9dce105adc45ebe3f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Fri, 4 Aug 2023 20:31:33 +0200 Subject: [PATCH 11/12] Run dependabot on v6 branch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- .github/dependabot.yml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index cab6cc8..80342c7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,6 +6,7 @@ updates: interval: weekly day: saturday time: "10:00" + target-branch: master open-pull-requests-limit: 10 versioning-strategy: increase reviewers: @@ -16,6 +17,7 @@ updates: interval: weekly day: saturday time: "10:00" + target-branch: master open-pull-requests-limit: 10 allow: - dependency-type: direct @@ -30,3 +32,41 @@ updates: time: "10:00" reviewers: - "pi-hole/docs-maintainers" + 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" + - 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" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: weekly + day: saturday + time: "10:00" + reviewers: + - "pi-hole/docs-maintainers" + target-branch: release/v6.0 From 6a8a9c7734b0b63b54d14a03d8011aabfa50dfb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Sat, 26 Aug 2023 09:26:38 +0200 Subject: [PATCH 12/12] Remove >domain from Telnet API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- docs/ftldns/telnet-api.md | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/docs/ftldns/telnet-api.md b/docs/ftldns/telnet-api.md index 53cf00c..a55d14d 100644 --- a/docs/ftldns/telnet-api.md +++ b/docs/ftldns/telnet-api.md @@ -196,19 +196,6 @@ SQLite version: 3.23.1 --- -#### `>domain pi-hole.net` {data-toc-label='domain'} - -Get detailed information about domain (if available) - -```text -Domain "pi-hole.net", ID: 254 -Total: 179 -Blocked: 0 -Wildcard blocked: false -``` - ---- - #### `>cacheinfo` {data-toc-label='cacheinfo'} Get DNS server cache size and usage information