From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Fri, 1 Oct 2021 12:18:23 +0000 (+0200)
Subject: Docs
X-Git-Tag: auth-4.6.0-alpha1~5^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c37970a6a77fccda821117b6b1ea5a014a8917dd;p=thirdparty%2Fpdns.git

Docs
---

diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
index 78213ce73e..899fe50e90 100644
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -1913,6 +1913,7 @@ zonetransfer
 Zonneveld
 zsk
 zskroll
+ztc
 Zumstrull
 Zwane
 zzyzz
diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 0011b55180..280f936744 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -5299,6 +5299,7 @@ static int serviceMain(int argc, char*argv[])
 
   startLuaConfigDelayedThreads(delayedLuaThreads, g_luaconfs.getCopy().generation);
   delayedLuaThreads.rpzPrimaryThreads.clear(); // no longer needed
+  delayedLuaThreads.ztcConfigs.clear(); // no longer needed
 
   makeThreadPipes();
 
diff --git a/pdns/recursordist/docs/lua-config/index.rst b/pdns/recursordist/docs/lua-config/index.rst
index ab29500783..44d04d1617 100644
--- a/pdns/recursordist/docs/lua-config/index.rst
+++ b/pdns/recursordist/docs/lua-config/index.rst
@@ -1,5 +1,5 @@
-Lua Configuration: Trustanchors, Query Logging, RPZs and Sortlist
-=================================================================
+Lua Configuration: Trustanchors, Query Logging, RPZs, Sortlist and Zone to Cache
+================================================================================
 
 Since version 4.0.0, the PowerDNS Recursor supports additional configuration options that have to be loaded through :ref:`setting-lua-config-file`.
 
@@ -9,5 +9,6 @@ Since version 4.0.0, the PowerDNS Recursor supports additional configuration opt
     protobuf
     rpz
     sortlist
+    ztc
 
 In addition, :func:`pdnslog` together with ``pdns.loglevels`` is also supported in the Lua configuration file.
diff --git a/pdns/recursordist/rec-zonetocache.hh b/pdns/recursordist/rec-zonetocache.hh
index 81e86cf2c2..715ca7ecb6 100644
--- a/pdns/recursordist/rec-zonetocache.hh
+++ b/pdns/recursordist/rec-zonetocache.hh
@@ -39,7 +39,7 @@ public:
     size_t d_maxReceivedBytes{0}; // Maximum size
     time_t d_retryOnError{60}; // Retry on error
     time_t d_refreshPeriod{0}; // Take from SOA by default
-    uint32_t d_timeout{30}; // timeout in seconds
+    uint32_t d_timeout{20}; // timeout in seconds
   };
   static void ZoneToCache(Config config, uint64_t gen);
 };