From 64a841d5efd61577e8d0a0efdb392bb4f42bc15c Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sat, 21 Mar 2020 18:14:31 +0100
Subject: [PATCH] Downgrade Unbound, disable serve-stale, disable parking_lot
 for tokio

Essentially revert anything new and potentially causing #80
---
 Dockerfile | 4 ++--
 unbound.sh | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bfd1e8d..e2cf7a5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ RUN apt-get update; apt-get -qy dist-upgrade; apt-get -qy clean && \
 RUN update-ca-certificates 2> /dev/null || true
 
 ENV UNBOUND_GIT_URL https://github.com/NLnetLabs/unbound.git
-ENV UNBOUND_GIT_REVISION 10e5ab2c5f7deccd287b58e7d76b66aad846fc81
+ENV UNBOUND_GIT_REVISION 6d7e0d68cfce26cd50bd209c43019d24d47ed5d0
 
 WORKDIR /tmp
 
@@ -37,7 +37,7 @@ ENV RUSTFLAGS "-C link-arg=-s"
 RUN apt-get update && apt-get install -qy --no-install-recommends $BUILD_DEPS && \
     curl -sSf https://sh.rustup.rs | bash -s -- -y --default-toolchain stable && \
     export PATH="$HOME/.cargo/bin:$PATH" && \
-    echo "Compiling encrypted-dns version 0.3.13" && \
+    echo "Compiling encrypted-dns version 0.3.14" && \
     cargo install encrypted-dns && \
     mkdir -p /opt/encrypted-dns/sbin && \
     mv ~/.cargo/bin/encrypted-dns /opt/encrypted-dns/sbin/ && \
diff --git a/unbound.sh b/unbound.sh
index d4fc9d7..3588e78 100755
--- a/unbound.sh
+++ b/unbound.sh
@@ -65,7 +65,6 @@ server:
   serve-expired: yes
   serve-expired-ttl: 86400
   serve-expired-ttl-reset: yes
-  serve-expired-client-timeout: 1800
   access-control: 0.0.0.0/0 allow
   access-control: ::0/0 allow
   tls-cert-bundle: "/etc/ssl/certs/ca-certificates.crt"