mirror/dnscrypt-server-docker
1
1
Fork 0
mirror of https://github.com/dnscrypt/dnscrypt-server-docker synced 2024-11-26 10:23:48 +01:00
Code Issues

Blacklist migration

Browse Source
This commit is contained in:
Frank Denis 2019-09-25 16:10:09 +02:00
parent e970987013
commit 6ef82579b6
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
encrypted-dns.toml.in
View File

@ -160,4 +160,4 @@ key_cache_capacity = 10000
[filtering] [filtering]
# domain_blacklist = "/etc/domain_blacklist.txt" @DOMAIN_BLACKLIST_CONFIGURATION@

15
entrypoint.sh
View File

@ -5,7 +5,9 @@ set -e
action="$1" action="$1"
LEGACY_KEYS_DIR="/opt/dnscrypt-wrapper/etc/keys" LEGACY_KEYS_DIR="/opt/dnscrypt-wrapper/etc/keys"
LEGACY_LISTS_DIR="/opt/dnscrypt-wrapper/etc/lists"
KEYS_DIR="/opt/encrypted-dns/etc/keys" KEYS_DIR="/opt/encrypted-dns/etc/keys"
LISTS_DIR="/opt/encrypted-dns/etc/lists"
CONF_DIR="/opt/encrypted-dns/etc" CONF_DIR="/opt/encrypted-dns/etc"
CONFIG_FILE="${CONF_DIR}/encrypted-dns.toml" CONFIG_FILE="${CONF_DIR}/encrypted-dns.toml"
CONFIG_FILE_TEMPLATE="${CONF_DIR}/encrypted-dns.toml.in" CONFIG_FILE_TEMPLATE="${CONF_DIR}/encrypted-dns.toml.in"
@ -47,6 +49,12 @@ init() {
tls_proxy_configuration="upstream_addr = \"${tls_proxy_upstream_address}\"" tls_proxy_configuration="upstream_addr = \"${tls_proxy_upstream_address}\""
fi fi
domain_blacklist_file="${LISTS_DIR}/blacklist.txt"
domain_blacklist_configuration=""
if [ -s "$domain_blacklist_file" ]; then
domain_blacklist_configuration="domain_blacklist = \"${domain_blacklist_file}\""
fi
echo "Provider name: [$provider_name]" echo "Provider name: [$provider_name]"
echo "$provider_name" >"${KEYS_DIR}/provider_name" echo "$provider_name" >"${KEYS_DIR}/provider_name"
@ -56,6 +64,7 @@ init() {
-e "s/@PROVIDER_NAME@/${provider_name}/" \ -e "s/@PROVIDER_NAME@/${provider_name}/" \
-e "s/@EXTERNAL_IPV4@/${ext_address}/" \ -e "s/@EXTERNAL_IPV4@/${ext_address}/" \
-e "s/@TLS_PROXY_CONFIGURATION@/${tls_proxy_configuration}/" \ -e "s/@TLS_PROXY_CONFIGURATION@/${tls_proxy_configuration}/" \
-e "s/@DOMAIN_BLACKLIST_CONFIGURATION@/${domain_blacklist_configuration}/" \
"$CONFIG_FILE_TEMPLATE" >"$CONFIG_FILE" "$CONFIG_FILE_TEMPLATE" >"$CONFIG_FILE"
/opt/encrypted-dns/sbin/encrypted-dns \ /opt/encrypted-dns/sbin/encrypted-dns \
@ -127,7 +136,13 @@ dnscrypt_wrapper_compat() {
chmod 600 "${LEGACY_KEYS_DIR}/secret.key" chmod 600 "${LEGACY_KEYS_DIR}/secret.key"
echo "Done!" >&2 echo "Done!" >&2
echo >&2 echo >&2
if [ -s "${LEGACY_LISTS_DIR}/blacklist.txt" ]; then
echo "Your blacklist [${LEGACY_LISTS_DIR}/blacklist.txt] will be loaded as well." >&2
fi
export KEYS_DIR="$LEGACY_KEYS_DIR" export KEYS_DIR="$LEGACY_KEYS_DIR"
export LISTS_DIR="$LEGACY_LISTS_DIR"
} }
is_initialized() { is_initialized() {