docs: Move 'tlscerts' page to 'kbase/'

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/docs/daemons.rst b/docs/daemons.rst
index 383f0f64ffcfadd41bb590093451929d48b926b0..2918b3d4ceb483b87b7bb6e209bec402b80abbc6 100644 (file)
--- a/docs/daemons.rst
+++ b/docs/daemons.rst
@@ -100,7 +100,7 @@ optionally, one or two TCP sockets:
   with full read-write privileges. A connection to this socket gives the
   client privileges that are equivalent to having a root shell. Access control
   can be enforced either through validation of `x509 certificates
-  <tlscerts.html>`__, and/or by enabling an `authentication mechanism
+  <kbase/tlscerts.html>`__, and/or by enabling an `authentication mechanism
   <auth.html>`__.
 
 NB, some distros will use ``/run`` instead of ``/var/run``.

diff --git a/docs/docs.html.in b/docs/docs.html.in
index 225827b6933e89c677e6444d536238af335f3e0a..ff7a95fae7e67bd1333bb8c2181e0c27203e5e8f 100644 (file)
--- a/docs/docs.html.in
+++ b/docs/docs.html.in
@@ -28,9 +28,6 @@
         <dt><a href="remote.html">Remote access</a></dt>
         <dd>Enable remote access over TCP</dd>
 
-        <dt><a href="tlscerts.html">TLS certs</a></dt>
-        <dd>Generate and deploy x509 certificates for TLS</dd>
-
         <dt><a href="auth.html">Authentication</a></dt>
         <dd>Configure authentication for the libvirt daemon</dd>
 

diff --git a/docs/kbase/index.rst b/docs/kbase/index.rst
index 860bfde71f56656e10ef3a7a8e254dae0874df36..9c4e921f1f0db432c00d5e522d1b0ccebc95fc5b 100644 (file)
--- a/docs/kbase/index.rst
+++ b/docs/kbase/index.rst
@@ -19,6 +19,9 @@ Usage
    Examination of the security protections used for QEMU and how they need
    configuring to allow use of QEMU passthrough with host files/devices.
 
+`TLS certificates <tlscerts.html>`__
+   Generate and deploy x509 certificates for TLS.
+
 `RPM deployment <rpm-deployment.html>`__
    Explanation of the different RPM packages and illustration of which to
    pick for installation

diff --git a/docs/kbase/meson.build b/docs/kbase/meson.build
index d632f9bda1929e090afe0a6fbce47699892bcc5b..4114fc81d14e05ce0e29b5dfb0a18f15409422d0 100644 (file)
--- a/docs/kbase/meson.build
+++ b/docs/kbase/meson.build
@@ -20,6 +20,7 @@ docs_kbase_files = [
   'secureusage',
   'snapshots',
   'systemtap',
+  'tlscerts',
   'virtiofs',
 ]
 

diff --git a/docs/tlscerts.rst b/docs/kbase/tlscerts.rst
similarity index 100%
rename from docs/tlscerts.rst
rename to docs/kbase/tlscerts.rst

diff --git a/docs/meson.build b/docs/meson.build
index 8b174fe41e33e9c4fcd3f34fbbf13dd9dc5bad8a..d738da85f25d0c40cfa9afa99510fbd771257335 100644 (file)
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -109,7 +109,6 @@ docs_rst_files = [
   'testapi',
   'testsuites',
   'testtck',
-  'tlscerts',
 ]
 
 # list of web targets to build for docs/web rule

diff --git a/docs/remote.html.in b/docs/remote.html.in
index 47fb2d4df3e971c98e0d3b92e56defd5fb03cde6..3a5258a0d5aeea89ec6ffbe3e1b3798b7910149f 100644 (file)
--- a/docs/remote.html.in
+++ b/docs/remote.html.in
@@ -61,7 +61,7 @@ Remote libvirt supports a range of transports:
       <dd><a href="https://en.wikipedia.org/wiki/Transport_Layer_Security" title="Transport Layer Security">TLS</a>
  1.0 (SSL 3.1) authenticated and encrypted TCP/IP socket, usually
  listening on a public port number.  To use this you will need to
- <a href="tlscerts.html" title="Generating TLS certificates">generate client and
+ <a href="kbase/tlscerts.html" title="Generating TLS certificates">generate client and
  server certificates</a>.
  The standard port is 16514.
  </dd>