summaryrefslogtreecommitdiff
path: root/uncensor.patch
blob: 61ed1d7bf84dc97ebed97f25d76df2389a873ad1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
--- a/dnscrypt-proxy/example-dnscrypt-proxy.toml
+++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml
@@ -75,7 +75,7 @@
 # Server must not log user queries (declarative)
 require_nolog = true
 
-# Server must not enforce its own blocklist (for parental control, ads blocking...)
+# Server must not enforce its own blacklist (for parental control, ads blocking...)
 require_nofilter = true
 
 # Server names to avoid even if they match all criteria
@@ -290,7 +290,7 @@
 
 ## Note: if you are using dnsmasq, disable the `dnssec` option in dnsmasq if you
 ## configure dnscrypt-proxy to do any kind of filtering (including the filters
-## below and blocklists).
+## below and blacklists).
 ## You can still choose resolvers that do DNSSEC validation.
 
 
@@ -313,7 +313,7 @@
 
 
 ## TTL for synthetic responses sent when a request has been blocked (due to
-## IPv6 or blocklists).
+## IPv6 or blacklists).
 
 reject_ttl = 600
 
@@ -474,7 +474,7 @@
 
 
 ######################################################
-#        Pattern-based blocking (blocklists)         #
+#            Pattern-based blacklists                #
 ######################################################
 
 ## Blocklists are made of one pattern per line. Example of valid patterns:
@@ -486,20 +486,20 @@
 ##   ads*.example.*
 ##   ads*.example[0-9]*.com
 ##
-## Example blocklist files can be found at https://download.dnscrypt.info/blocklists/
-## A script to build blocklists from public feeds can be found in the
-## `utils/generate-domains-blocklists` directory of the dnscrypt-proxy source code.
+## Example blacklist files can be found at https://download.dnscrypt.info/blocklists/
+## A script to build blacklists from public feeds can be found in the
+## `utils/generate-domains-blacklists` directory of the dnscrypt-proxy source code.
 
 [blocked_names]
 
-## Path to the file of blocking rules (absolute, or relative to the same directory as the config file)
+## Path to the file of blacklisting rules (absolute, or relative to the same directory as the config file)
 
-# blocked_names_file = '/etc/dnscrypt-proxy/blocked-names.txt'
+# blocked_names_file = '/etc/dnscrypt-proxy/blacklist.txt'
 
 
-## Optional path to a file logging blocked queries
+## Optional path to a file logging blacklisted queries
 
-# log_file = '/var/log/dnscrypt-proxy/blocked-names.log'
+# log_file = '/var/log/dnscrypt-proxy/blacklisted.log'
 
 
   ## Optional log format: tsv or ltsv (default: tsv)
@@ -509,10 +509,10 @@
 
 
 ###########################################################
-#        Pattern-based IP blocking (IP blocklists)        #
+#            Pattern-based IP blacklists                  #
 ###########################################################
 
-## IP blocklists are made of one pattern per line. Example of valid patterns:
+## IP blacklists are made of one pattern per line. Example of valid patterns:
 ##
 ##   127.*
 ##   fe80:abcd:*
@@ -520,14 +520,14 @@
 
 [blocked_ips]
 
-## Path to the file of blocking rules (absolute, or relative to the same directory as the config file)
+## Path to the file of blacklisting rules (absolute, or relative to the same directory as the config file)
 
-# blocked_ips_file = '/etc/dnscrypt-proxy/blocked-ips.txt'
+# blocked_ips_file = '/etc/dnscrypt-proxy/ip-blacklist.txt'
 
 
-## Optional path to a file logging blocked queries
+## Optional path to a file logging blacklisted queries
 
-# log_file = '/var/log/dnscrypt-proxy/blocked-ips.log'
+# log_file = '/var/log/dnscrypt-proxy/ip-blacklisted.log'
 
 
   ## Optional log format: tsv or ltsv (default: tsv)
@@ -537,25 +537,25 @@
 
 
 ######################################################
-#   Pattern-based allow lists (blocklists bypass)    #
+#            Pattern-based whitelists                #
 ######################################################
 
-## Allowlists support the same patterns as blocklists
-## If a name matches an allowlist entry, the corresponding session
+## Whitelists support the same patterns as blacklists
+## If a name matches a whitelist entry, the corresponding session
 ## will bypass names and IP filters.
 ##
 ## Time-based rules are also supported to make some websites only accessible at specific times of the day.
 
 [allowed_names]
 
-## Path to the file of allow list rules (absolute, or relative to the same directory as the config file)
+## Path to the file of whitelist rules (absolute, or relative to the same directory as the config file)
 
-# allowed_names_file = '/etc/dnscrypt-proxy/allowed-names.txt'
+# allowed_names_file = '/etc/dnscrypt-proxy/whitelist.txt'
 
 
-## Optional path to a file logging allowed queries
+## Optional path to a file logging whitelisted queries
 
-# log_file = '/var/log/dnscrypt-proxy/allowed-names.log'
+# log_file = '/var/log/dnscrypt-proxy/whitelisted.log'
 
 
 ## Optional log format: tsv or ltsv (default: tsv)
@@ -565,25 +565,25 @@
 
 
 #########################################################
-#   Pattern-based allowed IPs lists (blocklists bypass) #
+#             Pattern-based IPs whitelists              #
 #########################################################
 
-## Allowed IP lists support the same patterns as IP blocklists
-## If an IP response matches an allowed entry, the corresponding session
+## Whitelisted IP lists support the same patterns as IP blacklists
+## If an IP response matches a whitelisted ip entry, the corresponding session
 ## will bypass IP filters.
 ##
 ## Time-based rules are also supported to make some websites only accessible at specific times of the day.
 
 [allowed_ips]
 
-## Path to the file of allowed ip rules (absolute, or relative to the same directory as the config file)
+## Path to the file of whitelisted ip rules (absolute, or relative to the same directory as the config file)
 
-# allowed_ips_file = '/etc/dnscrypt-proxy/allowed-ips.txt'
+# allowed_ips_file = '/etc/dnscrypt-proxy/ip-whitelist.txt'
 
 
-## Optional path to a file logging allowed queries
+## Optional path to a file logging whitelisted queries
 
-# log_file = '/var/log/dnscrypt-proxy/allowed-ips.log'
+# log_file = '/var/log/dnscrypt-proxy/ip-whitelisted.log'
 
 ## Optional log format: tsv or ltsv (default: tsv)
 
@@ -599,7 +599,7 @@
 ## Patterns in the name-based blocked_names file can optionally be followed with @schedule_name
 ## to apply the pattern 'schedule_name' only when it matches a time range of that schedule.
 ##
-## For example, the following rule in a blocklist file:
+## For example, the following rule in a blacklist file:
 ## *.youtube.* @time-to-sleep
 ## would block access to YouTube during the times defined by the 'time-to-sleep' schedule.
 ##