Skip to content

Commit e9fb359

Browse files
yubiuseryubiuser
authored
Merge pull request #1308 from pi-hole/dependabot/npm_and_yarn/master/npm-dependencies-2587637d0c
Bump markdownlint-cli2 from 0.18.1 to 0.19.0 in the npm-dependencies group
2 parents 378e580 + cc07874 commit e9fb359

File tree

13 files changed

+196
-186
lines changed

13 files changed

+196
-186
lines changed

‎.devcontainer/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ RUN apk add --no-cache \
44
git \
55
nano \
66
openssh \
7-
py3-pip
7+
py3-pip \
8+
tzdata
89

910
ENV USER node
1011
USER ${USER}

‎.markdownlint.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,8 @@
3737
"MD046": {
3838
"style": "fenced"
3939
},
40-
"MD059": false
40+
"MD059": false,
41+
"MD060": {
42+
"style": "any"
43+
}
4144
}

‎docs/api/tls.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ It is worth noting that the certificate is only valid for the domain that you ha
2323

2424
### Firefox (tested with Firefox 121.0)
2525

26-
Before | After
27-
:-----:|:-----:
28-
![Firefox Untrusted](../images/api/firefox-pihole-untrusted.png) | ![Firefox Trusted](../images/api/firefox-pihole-trusted.png)
26+
| Before | After |
27+
| :-----: | :-----: |
28+
| ![Firefox Untrusted](../images/api/firefox-pihole-untrusted.png) | ![Firefox Trusted](../images/api/firefox-pihole-trusted.png) |
2929

3030
1. Open the settings page of Firefox at [about:preferences#privacy](about:preferences#privacy)
3131
2. Search for "Certificates"
@@ -44,9 +44,9 @@ If the last step did not work, make sure that you have generated the certificate
4444

4545
### Chrome (tested with Chrome 120.0)
4646

47-
Before | After
48-
:-----:|:-----:
49-
![Chrome Untrusted](../images/api/chrome-pihole-untrusted.png) | ![Chrome Trusted](../images/api/chrome-pihole-trusted.png)
47+
| Before | After |
48+
| :-----: | :-----: |
49+
| ![Chrome Untrusted](../images/api/chrome-pihole-untrusted.png) | ![Chrome Trusted](../images/api/chrome-pihole-trusted.png) |
5050

5151
1. Open the settings page of Chrome at [chrome://settings/privacy](chrome://settings/privacy)
5252
2. Navigate to "Manage certificates" in the "Security" submenu of "Privacy and security" or use the search bar
@@ -64,10 +64,10 @@ If the last step did not work, see the remark below the Firefox instructions abo
6464

6565
### Android (tested with Android 11 and Firefox Mobile 121.1.0)
6666

67-
Before | After
68-
:-----:|:-----:
69-
![Android Firefox Untrusted](../images/api/android-pihole-untrusted.png) | ![Android Firefox Trusted](../images/api/android-pihole-trusted.png)
70-
![Android Chrome Untrusted](../images/api/android-chrome-untrusted.png) | ![Android Chrome Trusted](../images/api/android-chrome-trusted.png)
67+
| Before | After |
68+
| :-----: | :-----: |
69+
| ![Android Firefox Untrusted](../images/api/android-pihole-untrusted.png) | ![Android Firefox Trusted](../images/api/android-pihole-trusted.png) |
70+
| ![Android Chrome Untrusted](../images/api/android-chrome-untrusted.png) | ![Android Chrome Trusted](../images/api/android-chrome-trusted.png) |
7171

7272
1. Go to your device's settings
7373
2. Navigate to "System Security" or "Security & location" (depending on your device)

‎docs/docker/upgrading/v5-v6.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Nearly all environment variables from previous versions have been removed, but f
99

1010
### Misc
1111

12-
| Old Variable | New Variable |
12+
|Old Variable|New Variable|
1313
|:-------------|:-------------|
1414
|`CUSTOM_CACHE_SIZE`|`FTLCONF_dns_cache_size`|
1515
|`DNS_BOGUS_PRIV`|`FTLCONF_dns_bogusPriv`|
@@ -28,14 +28,14 @@ Nearly all environment variables from previous versions have been removed, but f
2828

2929
|Old|New|
3030
|:--|:--|
31-
|`DHCP_ACTIVE`| `FTLCONF_dhcp_active`|
32-
|`DHCP_START`| `FTLCONF_dhcp_start`|
33-
|`DHCP_END`| `FTLCONF_dhcp_end`|
34-
|`DHCP_ROUTER`| `FTLCONF_dhcp_router`|
35-
|`DHCP_LEASETIME`| `FTLCONF_dhcp_leaseTime`|
36-
|`PIHOLE_DOMAIN`| `FTLCONF_dns_domain`|
37-
|`DHCP_IPv6`| `FTLCONF_dhcp_ipv6`|
38-
|`DHCP_rapid_commit`| `FTLCONF_dhcp_rapidCommit`|
31+
|`DHCP_ACTIVE`|`FTLCONF_dhcp_active`|
32+
|`DHCP_START`|`FTLCONF_dhcp_start`|
33+
|`DHCP_END`|`FTLCONF_dhcp_end`|
34+
|`DHCP_ROUTER`|`FTLCONF_dhcp_router`|
35+
|`DHCP_LEASETIME`|`FTLCONF_dhcp_leaseTime`|
36+
|`PIHOLE_DOMAIN`|`FTLCONF_dns_domain`|
37+
|`DHCP_IPv6`|`FTLCONF_dhcp_ipv6`|
38+
|`DHCP_rapid_commit`|`FTLCONF_dhcp_rapidCommit`|
3939

4040
### Conditional Forwarding Variables
4141

‎docs/ftldns/cache_dump.md‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -115,28 +115,28 @@ Self-explanatory: Queries sent, retried, and failed to the individual upstream s
115115

116116
The first character of the flags describes the query type:
117117

118-
Character | Record type
119-
----------|------------
120-
`4` | `A` (IPv4 address)
121-
`6` | `AAAA` (IPv6 address)
122-
`C` | `CNAME`
123-
`V` | `SRV`
124-
`S` | `DS`
125-
`K` | `DNSKEY`
126-
`(empty)` | something else
118+
| Character | Record type |
119+
| ---------- | ------------ |
120+
| `4` | `A` (IPv4 address) |
121+
| `6` | `AAAA` (IPv6 address) |
122+
| `C` | `CNAME` |
123+
| `V` | `SRV` |
124+
| `S` | `DS` |
125+
| `K` | `DNSKEY` |
126+
| `(empty)` | something else |
127127

128128
The rest of the flags can be almost any combination of the following bits:
129129

130-
Bit | Interpretation
131-
-------|---------------
132-
`F` | Forward entry (domain-to-address record)
133-
`R` | Reverse entry (address-to-domain, typically combined with `D` or `H`)
134-
`I` | Immortal cache entry (no expiry, typically from local configuration)
135-
`D` | DHCP-provided record
136-
`N` | Negative record (This record does not exist)
137-
`X` | NXDOMAIN (No record exists at all for this domain)
138-
`H` | From HOSTS file (always combined with `I`)
139-
`V` | DNSSEC verified
130+
| Bit | Interpretation |
131+
| ------- | --------------- |
132+
| `F` | Forward entry (domain-to-address record) |
133+
| `R` | Reverse entry (address-to-domain, typically combined with `D` or `H`) |
134+
| `I` | Immortal cache entry (no expiry, typically from local configuration) |
135+
| `D` | DHCP-provided record |
136+
| `N` | Negative record (This record does not exist) |
137+
| `X` | NXDOMAIN (No record exists at all for this domain) |
138+
| `H` | From HOSTS file (always combined with `I`) |
139+
| `V` | DNSSEC verified |
140140

141141
The `V` flag in negative DS records has a different meaning. Only validated `DS` records are every cached, and the `V` bit is used to store information about the presence of an `NS` record for the domain, i.e., if there's a zone cut at that point.
142142

‎docs/group_management/example.md‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ after your database modifications to have FTL flush its internal domain-blocking
6262

6363
**Result**
6464

65-
Client | Group membership | Domain | Blocked
66-
------------- | ----- | ------ | -------
67-
*all other* | Default | doubleclick.net | Yes
68-
192.168.0.101 | Group 1 | doubleclick.net | **No**
69-
192.168.0.102 | Group 2 + Default | doubleclick.net | Yes
70-
192.168.0.103 | Group 3 + Default | doubleclick.net | Yes
65+
| Client | Group membership | Domain | Blocked |
66+
| ------------- | ----- | ------ | ------- |
67+
| *all other* | Default | doubleclick.net | Yes |
68+
| 192.168.0.101 | Group 1 | doubleclick.net | **No** |
69+
| 192.168.0.102 | Group 2 + Default | doubleclick.net | Yes |
70+
| 192.168.0.103 | Group 3 + Default | doubleclick.net | Yes |
7171

7272
All three clients got automatically assigned to the default (`Default`) group when they were added. The default group includes all subscribed lists and list domains (if not already changed by the user). When we remove the default group for client `192.168.0.101`, we effectively remove all associations to any subscribed lists and domains. This leaves this client completely unblocked.
7373

@@ -84,12 +84,12 @@ All three clients got automatically assigned to the default (`Default`) group wh
8484

8585
**Result**
8686

87-
Client | Group membership | Domain | Blocked
88-
------------- | ----- | ------ | -------
89-
*all other* | Default | doubleclick.net | Yes
90-
192.168.0.101 | Group 1 | doubleclick.net | **Yes**
91-
192.168.0.102 | Group 2 + Default | doubleclick.net | Yes
92-
192.168.0.103 | Group 3 + Default | doubleclick.net | Yes
87+
| Client | Group membership | Domain | Blocked |
88+
| ------------- | ----- | ------ | ------- |
89+
| *all other* | Default | doubleclick.net | Yes |
90+
| 192.168.0.101 | Group 1 | doubleclick.net | **Yes** |
91+
| 192.168.0.102 | Group 2 + Default | doubleclick.net | Yes |
92+
| 192.168.0.103 | Group 3 + Default | doubleclick.net | Yes |
9393

9494
`192.168.0.101` gets `doubleclick.net` blocked as it uses a subscribed list including this domain. All other clients stay unchanged.
9595

@@ -112,12 +112,12 @@ Add the domain to be blocked
112112

113113
**Result**
114114

115-
Client | Group membership | Domain | Blocked
116-
------------- | ----- | ------ | -------
117-
*all other* | Default | denylisted.com | **Yes**
118-
192.168.0.101 | Group 1 | denylisted.com | No
119-
192.168.0.102 | Group 2 + Default | denylisted.com | **Yes**
120-
192.168.0.103 | Group 3 + Default | denylisted.com | **Yes**
115+
| Client | Group membership | Domain | Blocked |
116+
| ------------- | ----- | ------ | ------- |
117+
| *all other* | Default | denylisted.com | **Yes** |
118+
| 192.168.0.101 | Group 1 | denylisted.com | No |
119+
| 192.168.0.102 | Group 2 + Default | denylisted.com | **Yes** |
120+
| 192.168.0.103 | Group 3 + Default | denylisted.com | **Yes** |
121121

122122
Note that Pi-hole is *not* blocking this domain for client `192.168.0.101` as we removed the default assignment through group 0 above. All remaining clients are linked through the Default group to this domain and see it as being blocked.
123123

@@ -135,12 +135,12 @@ Assign this domain to group 1
135135

136136
**Result**
137137

138-
Client | Group membership | Domain | Blocked
139-
------------- | ----- | ------ | -------
140-
*all other* | Default | denylisted.com | Yes
141-
192.168.0.101 | Group 1 | denylisted.com | **Yes**
142-
192.168.0.102 | Group 2 + Default | denylisted.com | Yes
143-
192.168.0.103 | Group 3 + Default | denylisted.com | Yes
138+
| Client | Group membership | Domain | Blocked |
139+
| ------------- | ----- | ------ | ------- |
140+
| *all other* | Default | denylisted.com | Yes |
141+
| 192.168.0.101 | Group 1 | denylisted.com | **Yes** |
142+
| 192.168.0.102 | Group 2 + Default | denylisted.com | Yes |
143+
| 192.168.0.103 | Group 3 + Default | denylisted.com | Yes |
144144

145145
All clients see this domain as being blocked: Client 1 due to a direct assignment through group 1, all remaining clients through the default group 0 (unchanged).
146146

@@ -158,12 +158,12 @@ Remove default assignment to all clients not belonging to a group
158158

159159
**Result**
160160

161-
Client | Group membership | Domain | Blocked
162-
------------- | ----- | ------ | -------
163-
*all other* | Default | denylisted.com | **No**
164-
192.168.0.101 | Group 1 | denylisted.com | Yes
165-
192.168.0.102 | Group 2 + Default | denylisted.com | **No**
166-
192.168.0.103 | Group 3 + Default | denylisted.com | **No**
161+
| Client | Group membership | Domain | Blocked |
162+
| ------------- | ----- | ------ | ------- |
163+
| *all other* | Default | denylisted.com | **No** |
164+
| 192.168.0.101 | Group 1 | denylisted.com | Yes |
165+
| 192.168.0.102 | Group 2 + Default | denylisted.com | **No** |
166+
| 192.168.0.103 | Group 3 + Default | denylisted.com | **No** |
167167

168168
While client 1 keeps its explicit assignment through group 1, the remaining clients lost their unassignments when we removed group 0 from the assignment.
169169

@@ -186,12 +186,12 @@ Add the domain to be allowlisted
186186

187187
**Result**
188188

189-
Client | Group membership | Domain | Blocked
190-
------------- | ----- | ------ | -------
191-
*all other* | Default | doubleclick.net | **No**
192-
192.168.0.101 | Group 1 | doubleclick.net | Yes
193-
192.168.0.102 | Group 2 + Default | doubleclick.net | **No**
194-
192.168.0.103 | Group 3 + Default | doubleclick.net | **No**
189+
| Client | Group membership | Domain | Blocked |
190+
| ------------- | ----- | ------ | ------- |
191+
| *all other* | Default | doubleclick.net | **No** |
192+
| 192.168.0.101 | Group 1 | doubleclick.net | Yes |
193+
| 192.168.0.102 | Group 2 + Default | doubleclick.net | **No** |
194+
| 192.168.0.103 | Group 3 + Default | doubleclick.net | **No** |
195195

196196
Client `192.168.0.101` is not allowlisting this domain as we removed the default assignment through group 0 above. All remaining clients are linked through the default group to this domain and see it as being allowlisted. Note that this is completely analog to step 1 of [example 3](#example-3-denylisting).
197197

@@ -208,12 +208,12 @@ Remove default group assignment
208208

209209
**Result**
210210

211-
Client | Group membership | Domain | Blocked
212-
------------- | ----- | ------ | -------
213-
*all other* | Default | doubleclick.net | **Yes**
214-
192.168.0.101 | Group 1 | doubleclick.net | Yes
215-
192.168.0.102 | Group 2 + Default | doubleclick.net | **Yes**
216-
192.168.0.103 | Group 3 + Default | doubleclick.net | **Yes**
211+
| Client | Group membership | Domain | Blocked |
212+
| ------------- | ----- | ------ | ------- |
213+
| *all other* | Default | doubleclick.net | **Yes** |
214+
| 192.168.0.101 | Group 1 | doubleclick.net | Yes |
215+
| 192.168.0.102 | Group 2 + Default | doubleclick.net | **Yes** |
216+
| 192.168.0.103 | Group 3 + Default | doubleclick.net | **Yes** |
217217

218218
Requests from all clients are blocked as the new allowlist entry is not associated with any group and, hence, is not used by any client.
219219

@@ -231,11 +231,11 @@ Assign this domain to group 2
231231

232232
**Result**
233233

234-
Client | Group membership | Domain | Blocked
235-
------------- | ----- | ------ | -------
236-
*all other* | Default | doubleclick.net | Yes
237-
192.168.0.101 | Group 1 | doubleclick.net | Yes
238-
192.168.0.102 | Group 2 + Default | doubleclick.net | **No**
239-
192.168.0.103 | Group 3 + Default | doubleclick.net | Yes
234+
| Client | Group membership | Domain | Blocked |
235+
| ------------- | ----- | ------ | ------- |
236+
| *all other* | Default | doubleclick.net | Yes |
237+
| 192.168.0.101 | Group 1 | doubleclick.net | Yes |
238+
| 192.168.0.102 | Group 2 + Default | doubleclick.net | **No** |
239+
| 192.168.0.103 | Group 3 + Default | doubleclick.net | Yes |
240240

241241
Client 2 got the allowlist entry explicitly assigned to. Accordingly, client 2 does not get the domain blocked whereas all remaining clients still see this domain as blocked.

‎docs/guides/misc/allowlist-denylist.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Each script accepts the following parameters:
1111
| Parameter | Description |
1212
|------------|--------------------------------------------------------------------------------------------------|
1313
| `[domain]` | Fully qualified domain name you wish to add or remove. You can pass any number of domains. |
14-
| `remove` | Removal mode. Domains will be removed from the list, rather than added |
14+
| `remove` | Removal mode. Domains will be removed from the list, rather than added |
1515
| `-q` | Quiet mode. Console output is minimal. Useful for calling from another script (see `gravity.sh`) |
1616

1717
Domains passed are parsed by the script to ensure they are valid domains. If a domain is invalid it will be ignored.

‎docs/main/coverage.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Sites and articles about Pi-hole
44
last_updated: Sun Jan 13 19:20:35 2019 UTC
55
---
66

7-
### YouTube/Twit/Video
7+
## YouTube/Twit/Video
88

99
- [Security Now Netcast: Pi-hole](https://www.youtube.com/watch?v=p7-osq_y8i8&t=100m26s) _Oct 13, 2015_
1010
- [TekThing: Raspberry Pi-Hole Makes Ads Disappear!](https://www.youtube.com/watch?v=8Co59HU2gY0&t=2m) _Dec 18, 2015_
@@ -15,11 +15,11 @@ last_updated: Sun Jan 13 19:20:35 2019 UTC
1515
- [Know How 355: Killing ads with a Raspberry Pi-Hole!](https://www.twit.tv/shows/know-how/episodes/355) _Nov 9, 2017_
1616
- [Linus Tech Tips: Block EVERY Online Ad with THIS](https://www.youtube.com/watch?v=KBXTnrD_Zs4) _Aug 28, 2019_
1717

18-
### Podcasts
18+
## Podcasts
1919

2020
- [MacObserver Podcast 585](https://www.macobserver.com/tmo/podcast/macgeekgab-585) _Dec 27, 2015_
2121

22-
### Blogs
22+
## Blogs
2323

2424
- [Lifehacker: Turn A Raspberry Pi Into An Ad Blocker With A Single Command](https://www.lifehacker.com.au/2015/02/turn-a-raspberry-pi-into-an-ad-blocker-with-a-single-command/) _Feb 17, 2015_
2525
- [MakeUseOf: Adblock Everywhere: The Raspberry Pi-Hole Way](https://www.makeuseof.com/tag/adblock-everywhere-raspberry-pi-hole-way/) _Mar 25, 2015_

0 commit comments

Comments
 (0)