From f4ab8a09919562052d2fd6395e2215823b47a617 Mon Sep 17 00:00:00 2001 From: Alter Step Date: Wed, 10 Jun 2015 00:17:48 +0200 Subject: [PATCH] Update the list of resolvers after a successful switch to dnscrypt --- .../DNSCrypt/extra/usr/scripts/afterboot.sh | 3 +-- .../DNSCrypt/extra/usr/scripts/common.inc | 1 + .../DNSCrypt/extra/usr/scripts/start-dnscrypt-proxy.sh | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/afterboot.sh b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/afterboot.sh index f1228b5..2db1b9a 100755 --- a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/afterboot.sh +++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/afterboot.sh @@ -4,9 +4,8 @@ rm -f "$QUERY_LOG_FILE" rm -f "$DEBUG_LOG_FILE" +rm -f "$RESOLVERS_LIST_STATE" ./clear-fw.sh -(sleep 600; exec ./update-resolvers-list.sh) & - exec ./handle-control-change.sh --boot diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/common.inc b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/common.inc index ebcb408..f4027dd 100644 --- a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/common.inc +++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/common.inc @@ -38,6 +38,7 @@ EXCEPTIONS_TMP_FILE="${EXCEPTIONS_FILE}.tmp" RESOLVERS_UPDATES_BASE_URL="http://download.dnscrypt.org/dnscrypt-proxy" RESOLVERS_LIST_BASE_DIR="/usr/local/share/dnscrypt-proxy" RESOLVERS_LIST_PUBLIC_KEY="RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3" +RESOLVERS_LIST_STATE="${STATES_DIR}/resolvers-updated" INTERFACE_UNBOUND="127.0.0.53" INTERFACE_UNBOUND_MASK="24" diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/start-dnscrypt-proxy.sh b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/start-dnscrypt-proxy.sh index 5754def..410563f 100755 --- a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/start-dnscrypt-proxy.sh +++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/start-dnscrypt-proxy.sh @@ -156,3 +156,7 @@ logger_debug "Current configuration doesn't seem to hijack all DNS queries" mv "${DESCRIPTIONS_DIR}/${best_file}" \ "${STATES_DIR}/dnscrypt-proxy-description" 2>/dev/null || exit 0 + +[ -e "RESOLVERS_LIST_STATE" ] && exit 0 +touch "$RESOLVERS_LIST_STATE" +exec ./update-resolvers-list.sh