ConfigFile change to allowlist and blocklist (#1375)

* ConfigFile change to allowlist and blocklist

* revised names and warnings

* consistent file naming in kebab case, and generic use of blocklist and allowlist in cmoments for clarity

* update ci files

Co-authored-by: Ian Bashford <ianbashford@gmail.com>

.ci/blocked-names.txt

@@ -1,5 +1,5 @@
 ##################
-# Test blacklist #
+# Test blocklist #
 ##################
 
 ad.*

.ci/ci-test.sh

@@ -20,7 +20,7 @@ section() {
     true
 }
 
-rm -f blocked.log ip-blocked.log query.log nx.log whitelisted.log
+rm -f blocked-names.log blocked-ips.log query.log nx.log allowed-names.log
 
 t || (
     cd ../dnscrypt-proxy
@@ -94,14 +94,14 @@ kill $(cat /tmp/dnscrypt-proxy.pidfile)
 sleep 5
 
 section
-t || grep -Fq 'telemetry.example' blocked.log || fail
-t || grep -Fq 'telemetry.*' blocked.log || fail
-t || grep -Fq 'tracker.xdebian.org' blocked.log || fail
-t || grep -Fq 'tracker.*' blocked.log || fail
+t || grep -Fq 'telemetry.example' blocked-names.log || fail
+t || grep -Fq 'telemetry.*' blocked-names.log || fail
+t || grep -Fq 'tracker.xdebian.org' blocked-names.log || fail
+t || grep -Fq 'tracker.*' blocked-names.log || fail
 
 section
-t || grep -Fq 'dns.google' ip-blocked.log || fail
-t || grep -Fq '8.8.8.8' ip-blocked.log || fail
+t || grep -Fq 'dns.google' blocked-ips.log || fail
+t || grep -Fq '8.8.8.8' blocked-ips.log || fail
 
 section
 t || grep -Fq 'a.www.dnscrypt-test' nx.log || fail
@@ -127,8 +127,8 @@ t || grep -Eq 'tracker.xdebian.org.*REJECT' query.log || fail
 t || grep -Eq 'tracker.debian.org.*PASS' query.log || fail
 
 section
-t || grep -Fq 'tracker.debian.org' whitelisted.log || fail
-t || grep -Fq '*.tracker.debian' whitelisted.log || fail
+t || grep -Fq 'tracker.debian.org' allowed-names.log || fail
+t || grep -Fq '*.tracker.debian' allowed-names.log || fail
 
 if [ -s error.log ]; then
     cat *.log

.ci/test2-dnscrypt-proxy.toml

@@ -23,17 +23,17 @@ file = 'query.log'
 [nx_log]
 file = 'nx.log'
 
-[blacklist]
-blacklist_file = 'blacklist.txt'
-log_file = 'blocked.log'
+[blocked_names]
+blocked_names_file = 'blocked-names.txt'
+log_file = 'blocked-names.log'
 
-[ip_blacklist]
-blacklist_file = 'ip-blacklist.txt'
-log_file = 'ip-blocked.log'
+[blocked_ips]
+blocked_ips_file = 'blocked-ips.txt'
+log_file = 'blocked-ips.log'
 
-[whitelist]
-whitelist_file = 'whitelist.txt'
-log_file = 'whitelisted.log'
+[allowed_names]
+allowed_names_file = 'allowed-names.txt'
+log_file = 'allowed-names.log'
 
 [schedules]