Blob Blame History Raw
diff -up dnscrypt-proxy-2.1.1/dnscrypt-proxy/example-dnscrypt-proxy.toml.orig dnscrypt-proxy-2.1.1/dnscrypt-proxy/example-dnscrypt-proxy.toml
--- dnscrypt-proxy-2.1.1/dnscrypt-proxy/example-dnscrypt-proxy.toml.orig	2021-09-27 17:59:16.000000000 +0200
+++ dnscrypt-proxy-2.1.1/dnscrypt-proxy/example-dnscrypt-proxy.toml	2021-10-23 21:52:26.020382483 +0200
@@ -163,7 +163,7 @@ keepalive = 30
 ## This file is different from other log files, and will not be
 ## automatically rotated by the application.
 
-# log_file = 'dnscrypt-proxy.log'
+# log_file = '/var/log/dnscrypt-proxy/dnscrypt-proxy.log'
 
 
 ## When using a log file, only keep logs from the most recent launch.
@@ -173,7 +173,7 @@ keepalive = 30
 
 ## Use the system logger (syslog on Unix, Event Log on Windows)
 
-# use_syslog = true
+use_syslog = true
 
 
 ## Delay, in minutes, after which certificates are reloaded
@@ -341,7 +341,7 @@ reject_ttl = 10
 
 ## See the `example-forwarding-rules.txt` file for an example
 
-# forwarding_rules = 'forwarding-rules.txt'
+# forwarding_rules = '/etc/dnscrypt-proxy/forwarding-rules.txt'
 
 
 
@@ -355,7 +355,7 @@ reject_ttl = 10
 ##
 ## See the `example-cloaking-rules.txt` file for an example
 
-# cloaking_rules = 'cloaking-rules.txt'
+# cloaking_rules = '/etc/dnscrypt-proxy/cloaking-rules.txt'
 
 ## TTL used when serving entries in cloaking-rules.txt
 
@@ -408,7 +408,7 @@ cache_neg_max_ttl = 600
 ## check for connectivity and captive portals, along with hard-coded
 ## IP addresses to return.
 
-# map_file = 'example-captive-portals.txt'
+# map_file = '/etc/dnscrypt-proxy/example-captive-portals.txt'
 
 
 
@@ -454,7 +454,7 @@ cache_neg_max_ttl = 600
   ## Path to the query log file (absolute, or relative to the same directory as the config file)
   ## Can be set to /dev/stdout in order to log to the standard output.
 
-  # file = 'query.log'
+  # file = '/var/log/dnscrypt-proxy/query.log'
 
 
   ## Query log format (currently supported: tsv and ltsv)
@@ -480,7 +480,7 @@ cache_neg_max_ttl = 600
 
   ## Path to the query log file (absolute, or relative to the same directory as the config file)
 
-  # file = 'nx.log'
+  # file = '/var/log/dnscrypt-proxy/nx.log'
 
 
   ## Query log format (currently supported: tsv and ltsv)
@@ -510,12 +510,12 @@ cache_neg_max_ttl = 600
 
   ## Path to the file of blocking rules (absolute, or relative to the same directory as the config file)
 
-  # blocked_names_file = 'blocked-names.txt'
+  # blocked_names_file = '/etc/dnscrypt-proxy/blocked-names.txt'
 
 
   ## Optional path to a file logging blocked queries
 
-  # log_file = 'blocked-names.log'
+  # log_file = '/var/log/dnscrypt-proxy/blocked-names.log'
 
 
   ## Optional log format: tsv or ltsv (default: tsv)
@@ -538,12 +538,12 @@ cache_neg_max_ttl = 600
 
   ## Path to the file of blocking rules (absolute, or relative to the same directory as the config file)
 
-  # blocked_ips_file = 'blocked-ips.txt'
+  # blocked_ips_file = '/etc/dnscrypt-proxy/blocked-ips.txt'
 
 
   ## Optional path to a file logging blocked queries
 
-  # log_file = 'blocked-ips.log'
+  # log_file = '/var/log/dnscrypt-proxy/blocked-ips.log'
 
 
   ## Optional log format: tsv or ltsv (default: tsv)
@@ -566,12 +566,12 @@ cache_neg_max_ttl = 600
 
   ## Path to the file of allow list rules (absolute, or relative to the same directory as the config file)
 
-  # allowed_names_file = 'allowed-names.txt'
+  # allowed_names_file = '/etc/dnscrypt-proxy/allowed-names.txt'
 
 
   ## Optional path to a file logging allowed queries
 
-  # log_file = 'allowed-names.log'
+  # log_file = '/var/log/dnscrypt-proxy/allowed-names.log'
 
 
   ## Optional log format: tsv or ltsv (default: tsv)
@@ -594,12 +594,12 @@ cache_neg_max_ttl = 600
 
   ## Path to the file of allowed ip rules (absolute, or relative to the same directory as the config file)
 
-  # allowed_ips_file = 'allowed-ips.txt'
+  # allowed_ips_file = '/etc/dnscrypt-proxy/allowed-ips.txt'
 
 
   ## Optional path to a file logging allowed queries
 
-  # log_file = 'allowed-ips.log'
+  # log_file = '/var/log/dnscrypt-proxy/allowed-ips.log'
 
   ## Optional log format: tsv or ltsv (default: tsv)
 
@@ -670,7 +670,7 @@ cache_neg_max_ttl = 600
 
   [sources.'public-resolvers']
     urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/public-resolvers.md', 'https://download.dnscrypt.net/resolvers-list/v3/public-resolvers.md']
-    cache_file = 'public-resolvers.md'
+    cache_file = '/var/cache/dnscrypt-proxy/public-resolvers.md'
     minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
     refresh_delay = 72
     prefix = ''
@@ -679,7 +679,7 @@ cache_neg_max_ttl = 600
 
   [sources.'relays']
     urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/relays.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/relays.md', 'https://download.dnscrypt.net/resolvers-list/v3/relays.md']
-    cache_file = 'relays.md'
+    cache_file = '/var/cache/dnscrypt-proxy/relays.md'
     minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
     refresh_delay = 72
     prefix = ''
@@ -688,13 +688,13 @@ cache_neg_max_ttl = 600
 
   # [sources.'odoh-servers']
   #   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-servers.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh-servers.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/odoh-servers.md', 'https://download.dnscrypt.net/resolvers-list/v3/odoh-servers.md']
-  #   cache_file = 'odoh-servers.md'
+  #   cache_file = '/var/cache/dnscrypt-proxy/odoh-servers.md'
   #   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
   #   refresh_delay = 24
   #   prefix = ''
   # [sources.'odoh-relays']
   #   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh-relays.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/odoh-relays.md', 'https://download.dnscrypt.net/resolvers-list/v3/odoh-relays.md']
-  #   cache_file = 'odoh-relays.md'
+  #   cache_file = '/var/cache/dnscrypt-proxy/odoh-relays.md'
   #   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
   #   refresh_delay = 24
   #   prefix = ''
@@ -704,7 +704,7 @@ cache_neg_max_ttl = 600
   # [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
@@ -712,7 +712,7 @@ cache_neg_max_ttl = 600
 
   #  [sources.'parental-control']
   #    urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/parental-control.md', 'https://download.dnscrypt.info/resolvers-list/v3/parental-control.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/parental-control.md', 'https://download.dnscrypt.net/resolvers-list/v3/parental-control.md']
-  #    cache_file = 'parental-control.md'
+  #    cache_file = '/var/cache/dnscrypt-proxy/parental-control.md'
   #    minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'