diff options
Diffstat (limited to 'configuration.diff')
| -rw-r--r-- | configuration.diff | 48 |
1 files changed, 33 insertions, 15 deletions
diff --git a/configuration.diff b/configuration.diff index a1b991f..c43de74 100644 --- a/configuration.diff +++ b/configuration.diff @@ -1,7 +1,7 @@ -diff -ruN dnscrypt-proxy-2.0.9-a/dnscrypt-proxy/example-dnscrypt-proxy.toml dnscrypt-proxy-2.0.9-b/dnscrypt-proxy/example-dnscrypt-proxy.toml ---- dnscrypt-proxy-2.0.9-a/dnscrypt-proxy/example-dnscrypt-proxy.toml 2018-04-11 14:05:16.000000000 +0200 -+++ dnscrypt-proxy-2.0.9-b/dnscrypt-proxy/example-dnscrypt-proxy.toml 2018-04-11 23:09:53.874362036 +0200 -@@ -96,12 +96,12 @@ +diff -ruN a/dnscrypt-proxy/example-dnscrypt-proxy.toml b/dnscrypt-proxy/example-dnscrypt-proxy.toml +--- a/dnscrypt-proxy/example-dnscrypt-proxy.toml 2019-11-18 13:00:34.000000000 +0100 ++++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml 2019-11-19 22:11:15.890730311 +0100 +@@ -138,12 +138,12 @@ ## log file for the application @@ -16,7 +16,7 @@ diff -ruN dnscrypt-proxy-2.0.9-a/dnscrypt-proxy/example-dnscrypt-proxy.toml dnsc ## Delay, in minutes, after which certificates are reloaded -@@ -194,7 +194,7 @@ +@@ -280,7 +280,7 @@ ## example.com 9.9.9.9 ## example.net 9.9.9.9,8.8.8.8,1.1.1.1 @@ -25,25 +25,25 @@ diff -ruN dnscrypt-proxy-2.0.9-a/dnscrypt-proxy/example-dnscrypt-proxy.toml dnsc -@@ -210,7 +210,7 @@ +@@ -296,7 +296,7 @@ ## example.com 10.1.1.1 ## www.google.com forcesafesearch.google.com -# cloaking_rules = 'cloaking-rules.txt' +# cloaking_rules = '/etc/dnscrypt-proxy/cloaking-rules.txt' + ## TTL used when serving entries in cloaking-rules.txt - -@@ -254,7 +254,7 @@ - +@@ -349,7 +349,7 @@ ## Path to the query log file (absolute, or relative to the same directory as the executable file) + ## Can be /dev/stdout to log to the standard output (and set log_files_max_size to 0) - # file = 'query.log' + # file = '/var/log/dnscrypt-proxy/query.log' ## Query log format (currently supported: tsv and ltsv) -@@ -280,7 +280,7 @@ +@@ -375,7 +375,7 @@ ## Path to the query log file (absolute, or relative to the same directory as the executable file) @@ -52,7 +52,7 @@ diff -ruN dnscrypt-proxy-2.0.9-a/dnscrypt-proxy/example-dnscrypt-proxy.toml dnsc ## Query log format (currently supported: tsv and ltsv) -@@ -310,12 +310,12 @@ +@@ -405,12 +405,12 @@ ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file) @@ -67,7 +67,7 @@ diff -ruN dnscrypt-proxy-2.0.9-a/dnscrypt-proxy/example-dnscrypt-proxy.toml dnsc ## Optional log format: tsv or ltsv (default: tsv) -@@ -338,12 +338,12 @@ +@@ -433,12 +433,12 @@ ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file) @@ -82,7 +82,7 @@ diff -ruN dnscrypt-proxy-2.0.9-a/dnscrypt-proxy/example-dnscrypt-proxy.toml dnsc ## Optional log format: tsv or ltsv (default: tsv) -@@ -366,12 +366,12 @@ +@@ -461,12 +461,12 @@ ## Path to the file of whitelisting rules (absolute, or relative to the same directory as the executable file) @@ -97,16 +97,34 @@ diff -ruN dnscrypt-proxy-2.0.9-a/dnscrypt-proxy/example-dnscrypt-proxy.toml dnsc ## Optional log format: tsv or ltsv (default: tsv) -@@ -441,7 +441,7 @@ +@@ -536,7 +536,7 @@ [sources.'public-resolvers'] urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md'] - cache_file = 'public-resolvers.md' + cache_file = '/var/cache/dnscrypt-proxy/public-resolvers.md' minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' + prefix = '' + +@@ -544,7 +544,7 @@ + + [sources.'relays'] + urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/relays.md', 'https://download.dnscrypt.info/resolvers-list/v2/relays.md'] +- cache_file = 'relays.md' ++ cache_file = '/var/cache/dnscrypt-proxy/relays.md' + minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' refresh_delay = 72 prefix = '' -@@ -451,7 +451,7 @@ +@@ -554,7 +554,7 @@ + # [sources.quad9-resolvers] + # urls = ['https://www.quad9.net/quad9-resolvers.md'] + # minisign_key = 'RWQBphd2+f6eiAqBsvDZEBXBGHQBJfeG6G+wJPPKxCZMoEQYpmoysKUN' +- # cache_file = 'quad9-resolvers.md' ++ # cache_file = '/var/cache/dnscrypt-proxy/quad9-resolvers.md' + # prefix = 'quad9-' + + ## Another example source, with resolvers censoring some websites not appropriate for children +@@ -562,7 +562,7 @@ # [sources.'parental-control'] # urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/parental-control.md', 'https://download.dnscrypt.info/resolvers-list/v2/parental-control.md'] |