diff options
Diffstat (limited to 'uncensor.patch')
-rw-r--r-- | uncensor.patch | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/uncensor.patch b/uncensor.patch index bb4824e..61ed1d7 100644 --- a/uncensor.patch +++ b/uncensor.patch @@ -31,7 +31,7 @@ ###################################################### --# Pattern-based blocking (blocklists) # +-# Pattern-based blocking (blocklists) # +# Pattern-based blacklists # ###################################################### @@ -49,18 +49,18 @@ [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) +-## 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' +-# 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 +-## 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' +-# 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) @@ -81,18 +81,18 @@ [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) +-## 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' +-# 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 +-## 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' +-# 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) @@ -100,7 +100,7 @@ ###################################################### --# Pattern-based allow lists (blocklists bypass) # +-# Pattern-based allow lists (blocklists bypass) # +# Pattern-based whitelists # ###################################################### @@ -114,21 +114,21 @@ [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) +-## 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' +-# 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 +-## 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' +-# 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) + ## Optional log format: tsv or ltsv (default: tsv) @@ -565,25 +565,25 @@ @@ -138,7 +138,7 @@ ######################################################### -## Allowed IP lists support the same patterns as IP blocklists --## If an IP response matches an allow ip entry, the corresponding session +-## 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. @@ -147,20 +147,20 @@ [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) +-## 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' +-# 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 +-## 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' +-# 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) + ## 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 |