summaryrefslogtreecommitdiffstats
path: root/doc/man
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-12 04:43:26 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-12 04:43:26 +0000
commite0b319795dcf6342ca636879f76a8ffa0af6f978 (patch)
tree4be83145000ff55f9da4bf32979f65a3655e0a50 /doc/man
parentReleasing progress-linux version 3.3.7-1~progress7.99u1. (diff)
downloadknot-e0b319795dcf6342ca636879f76a8ffa0af6f978.tar.xz
knot-e0b319795dcf6342ca636879f76a8ffa0af6f978.zip
Merging upstream version 3.3.8.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'doc/man')
-rw-r--r--doc/man/keymgr.8in11
-rw-r--r--doc/man/knot.conf.5in18
2 files changed, 29 insertions, 0 deletions
diff --git a/doc/man/keymgr.8in b/doc/man/keymgr.8in
index 39c46a9..01e244f 100644
--- a/doc/man/keymgr.8in
+++ b/doc/man/keymgr.8in
@@ -170,6 +170,17 @@ Remove the specified key from zone. If the key was not shared, it is also delete
Import a key (specified by full key ID) from another zone as shared. After this, the key is
owned by both zones equally.
.UNINDENT
+.SS Keystore commands
+.INDENT 0.0
+.TP
+\fBkeystore_test\fP
+Conduct some tests on the specified keystore. Use a configured keystore id
+or \fB\-\fP for the default.
+.TP
+\fBkeystore_bench\fP [\fInum_threads\fP]
+Conduct a signing benchmark for each supported algorithm. Use a configured
+keystore id or \fB\-\fP for the default.
+.UNINDENT
.SS Commands related to Offline KSK feature
.INDENT 0.0
.TP
diff --git a/doc/man/knot.conf.5in b/doc/man/knot.conf.5in
index a9b175e..d091d15 100644
--- a/doc/man/knot.conf.5in
+++ b/doc/man/knot.conf.5in
@@ -2253,6 +2253,7 @@ zone:
master\-pin\-tolerance: TIME
provide\-ixfr: BOOL
semantic\-checks: BOOL | soft
+ default\-ttl: TIME
zonefile\-sync: TIME
zonefile\-load: none | difference | difference\-no\-serial | whole
journal\-content: none | changes | all
@@ -2442,6 +2443,23 @@ query (malformed message) and triggers a zone bootstrap instead.
.UNINDENT
.sp
\fIDefault:\fP \fBoff\fP
+.SS default\-ttl
+.sp
+The default TTL value if none is specified in a zone file or zone insertion
+using the dynamic configuration.
+.sp
+\fBWARNING:\fP
+.INDENT 0.0
+.INDENT 3.5
+As changing this value can result in differently parsed zone file(s),
+the corresponding zone SOA serial(s) should be incremented before
+reloading or commiting the configuration. Alternatively, setting
+\fI\%zonefile\-load\fP to \fBdifference\-no\-serial\fP ensures
+the resulting zone(s) update is correct.
+.UNINDENT
+.UNINDENT
+.sp
+\fIDefault:\fP \fB3600\fP
.SS zonefile\-sync
.sp
The time in seconds after which the current zone in memory will be synced with