conf: rename server.dnssec-keydir to server.kasp-db

4 files changed, 20 insertions, 20 deletions

diff --git a/doc/configuration.rst b/doc/configuration.rst
index 062f6fe70..3b6f8cc8f 100644
--- a/doc/configuration.rst
+++ b/doc/configuration.rst
@@ -271,7 +271,7 @@ can operate in two modes:
    No zone operator intervention is necessary.
 
 The DNSSEC signing is controlled by the :ref:`template_dnssec-enable` and
-:ref:`template_dnssec-keydir` configuration options. The first option states
+:ref:`template_kasp_db` configuration options. The first option states
 if the signing is enabled for a particular zone, the second option points to
 a KASP database holding the signing configuration.
 
@@ -287,7 +287,7 @@ default template, but the signing is explicitly disabled for zone
     template:
       - id: default
         dnssec-enable: on
-        dnssec-keydir: /var/lib/knot/kasp
+        kasp-db: /var/lib/knot/kasp
 
     zone:
       - domain: example.com
@@ -356,7 +356,7 @@ The configuration fragment might look similar to::
   template:
     - id: default
       storage: /var/lib/knot
-      dnssec-keydir: kasp
+      kasp-db: kasp
 
   zone:
     - domain: myzone.test
diff --git a/doc/man/knot.conf.5in b/doc/man/knot.conf.5in
index 91f24f65a..224138079 100644
--- a/doc/man/knot.conf.5in
+++ b/doc/man/knot.conf.5in
@@ -433,7 +433,7 @@ template:
     ixfr\-from\-differences: BOOL
     ixfr\-fslimit: SIZE
     dnssec\-enable: BOOL
-    dnssec\-keydir: STR
+    kasp\-db: STR
     signature\-lifetime: TIME
     serial\-policy: increment | unixtime
     module: STR/STR ...
@@ -571,10 +571,10 @@ Default: unlimited
 If enabled, automatic DNSSEC signing for the zone is turned on.
 .sp
 Default: off
-.SS dnssec\-keydir
+.SS kasp_db
 .sp
-A data directory for storing DNSSEC signing keys. Non absolute path is
-relative to \fI\%storage\fP\&.
+A KASP database path. Non absolute path is relative to
+\fI\%storage\fP\&.
 .sp
 Default: \fI\%storage\fP/keys
 .SS signature\-lifetime
diff --git a/doc/migration.rst b/doc/migration.rst
index da0880575..47b6a04cf 100644
--- a/doc/migration.rst
+++ b/doc/migration.rst
@@ -23,21 +23,21 @@ generated by Bind.
    example.com``.
 
    Note: If dynamic updates (DDNS) are enabled for the given zone, you
-   might need to freeze the zone before flushing it.  That can be done
+   might need to freeze the zone before flushing it. That can be done
    similarly: ``rndc freeze example.com``
 
 2. Copy the fresh zone file into the zones storage directory of Knot
-   DNS.  It's default location is ``/var/lib/knot``.
+   DNS. It's default location is ``/var/lib/knot``.
 
 3. We recommend to store DNSSEC keys for each zone in a separate
-   directory.  For this purpose, create a directory
-   ``example.com.keys`` in zones storage directory.  Then copy all
+   directory. For this purpose, create a directory
+   ``example.com.keys`` in zones storage directory. Then copy all
    DNSSEC keys (``*.key`` and ``*.private``) from Bind key directory
    (configured as ``key-directory``) into the newly created one.
 
-4. Add the zone into the Knot DNS configuration file.  Zone
+4. Add the zone into the Knot DNS configuration file. Zone
    configuration should contain at least specification of the zone
-   file (option ``file``), key directory (option ``dnssec-keydir``),
+   file (option ``file``), key directory (option ``kasp-db``),
    and enable automatic DNSSEC signing (option ``dnssec-enable``).
 
    You can follow this example::
@@ -47,6 +47,6 @@ generated by Bind.
         file: "example.com.db"
         storage: "/var/lib/knot"
         dnssec-enable: on
-        dnssec-keydir: "example.com.keys"
+        kasp-db: "example.com.keys"
 
 5. Start Knot DNS and check the log files to make sure that everything went right.
diff --git a/doc/reference.rst b/doc/reference.rst
index 87301bd73..bcc6b3eec 100644
--- a/doc/reference.rst
+++ b/doc/reference.rst
@@ -512,7 +512,7 @@ configuration if a zone doesn't have a teplate specified.
      ixfr-from-differences: BOOL
      ixfr-fslimit: SIZE
      dnssec-enable: BOOL
-     dnssec-keydir: STR
+     kasp-db: STR
      signature-lifetime: TIME
      serial-policy: increment | unixtime
      module: STR/STR ...
@@ -677,13 +677,13 @@ If enabled, automatic DNSSEC signing for the zone is turned on.
 
 Default: off
 
-.. _template_dnssec-keydir:
+.. _template_kasp_db:
 
-dnssec-keydir
--------------
+kasp_db
+-------
 
-A data directory for storing DNSSEC signing keys. Non absolute path is
-relative to :ref:`storage<template_storage>`.
+A KASP database path. Non absolute path is relative to
+:ref:`storage<template_storage>`.
 
 Default: :ref:`storage<template_storage>`/keys