summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBracken <abdawson@gmail.com>2022-04-06 20:17:58 +0100
committerGitHub <noreply@github.com>2022-04-06 21:17:58 +0200
commit25069b949eb97c1308ec927b53ac0c2d9d118467 (patch)
treeccbab7579e112375ba0f7523a3788732f4da8ac0
parenta101f6d66a055e3cc45371cac3943d1ab9cb0232 (diff)
downloadvyos-1x-25069b949eb97c1308ec927b53ac0c2d9d118467.tar.gz
vyos-1x-25069b949eb97c1308ec927b53ac0c2d9d118467.zip
dns: forwarding: T4343: add CLI option for PowerDNS network-timeout
Makes the powerdns `network-timeout` setting configurable via: `service dns forwarding timeout`. The powerdns default is 1500ms, VyOS now explicitly sets the same default value or the configured value so that the setting can have a readily apparent default in the help, rather than the user having to know it's powerdns.
-rw-r--r--data/templates/dns-forwarding/recursor.conf.tmpl3
-rw-r--r--interface-definitions/dns-forwarding.xml.in13
2 files changed, 16 insertions, 0 deletions
diff --git a/data/templates/dns-forwarding/recursor.conf.tmpl b/data/templates/dns-forwarding/recursor.conf.tmpl
index 02efe903b..d4ec80a3a 100644
--- a/data/templates/dns-forwarding/recursor.conf.tmpl
+++ b/data/templates/dns-forwarding/recursor.conf.tmpl
@@ -19,6 +19,9 @@ max-cache-entries={{ cache_size }}
# negative TTL for NXDOMAIN
max-negative-ttl={{ negative_ttl }}
+# timeout
+network-timeout={{ timeout }}
+
# ignore-hosts-file
export-etc-hosts={{ 'no' if ignore_hosts_file is defined else 'yes' }}
diff --git a/interface-definitions/dns-forwarding.xml.in b/interface-definitions/dns-forwarding.xml.in
index a2e809da8..08501a4b5 100644
--- a/interface-definitions/dns-forwarding.xml.in
+++ b/interface-definitions/dns-forwarding.xml.in
@@ -598,6 +598,19 @@
</properties>
<defaultValue>3600</defaultValue>
</leafNode>
+ <leafNode name="timeout">
+ <properties>
+ <help>Number of milliseconds to wait for a remote authoritative server to respond</help>
+ <valueHelp>
+ <format>u32:10-60000</format>
+ <description>Network timeout in milliseconds</description>
+ </valueHelp>
+ <constraint>
+ <validator name="numeric" argument="--range 10-60000"/>
+ </constraint>
+ </properties>
+ <defaultValue>1500</defaultValue>
+ </leafNode>
#include <include/name-server-ipv4-ipv6.xml.i>
<leafNode name="source-address">
<properties>