]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
Update links to documentation docs-develop-docs-6odbsx/deployments/3013
authorOto Šťáva <oto.stava@nic.cz>
Fri, 12 Jan 2024 15:21:31 +0000 (16:21 +0100)
committerOto Šťáva <oto.stava@nic.cz>
Fri, 12 Jan 2024 15:21:31 +0000 (16:21 +0100)
Replaces all mentions of `knot-resolver.readthedocs.io` with
`www.knot-resolver.cz/documentation/latest`.

Some of the links used to point to the `latest` documentation, which
meant the latest `master` commit, but the current system does not really
allow us to do this, so instead we link to the latest stable (which is
what `www.knot-resolver.cz/documentation/latest` basically is).

We also cannot reliably get the documentation for a particular version
in the code, so it all just points to `latest` as well. This may change
in the future, although I do not yet have a good approach in mind
(particularly, I don't want to bother our admins with nginx
configuration updates for each newly released version).

21 files changed:
.gitlab-ci.yml
README.md
ci/respdiff/kresd.config
daemon/lua/trust_anchors.lua.in
distro/pkg/nix/default.nix
doc/kresctl.8.in
doc/kresd.8.in
etc/config/config.cluster
etc/config/config.docker
etc/config/config.internal
etc/config/config.isp
etc/config/config.personal
etc/config/config.privacy
etc/config/config.splitview
lib/module.c
manager/etc/knot-resolver/config.example.internal.yaml
manager/etc/knot-resolver/config.example.isp.yaml
manager/etc/knot-resolver/config.example.personal.yaml
manager/knot_resolver_manager/datamodel/design-notes.yml
manager/knot_resolver_manager/datamodel/types/enums.py
systemd/kresd.systemd.7.in

index 02a3f552e26e016a588e1226b0ac4b83a0becc7a..f5abec54b5441019899bfa1a86f8871a5f63f100 100644 (file)
@@ -706,7 +706,7 @@ docs:develop:
       - doc/html
   environment:
     name: docs-develop/$CI_COMMIT_REF_NAME
-    url: https://$CI_PROJECT_NAMESPACE.pages.nic.cz/-/knot-resolver/-/jobs/$CI_JOB_ID/artifacts/doc/html/index.html
+    url: https://www.knot-resolver.cz/documentation/artifacts/$CI_JOB_ID/index.html
 
 # This job deploys the Knot Resolver documentation into a release environment,
 # which may be found at
@@ -727,7 +727,7 @@ docs:release:
       - doc/html
   environment:
     name: docs-release/$CI_COMMIT_TAG
-    url: https://$CI_PROJECT_NAMESPACE.pages.nic.cz/-/knot-resolver/-/jobs/$CI_JOB_ID/artifacts/doc/html/index.html
+    url: https://www.knot-resolver.cz/documentation/artifacts/$CI_JOB_ID/index.html
 
 # This job deploys the current docs as <https://knot.pages.nic.cz/knot-resolver>
 pages:
index 42fce0b4fd8626ad2eefd2997a3ad5735b140276..ade943ef7fe696f3c7c923cff0a8ea3632851b50 100644 (file)
--- a/README.md
+++ b/README.md
@@ -2,27 +2,24 @@
 
 [![Build Status](https://gitlab.nic.cz/knot/knot-resolver/badges/nightly/pipeline.svg?x)](https://gitlab.nic.cz/knot/knot-resolver/commits/nightly)
 [![Coverage Status](https://gitlab.nic.cz/knot/knot-resolver/badges/nightly/coverage.svg?x)](https://knot.pages.nic.cz/knot-resolver/)
-[![Documentation Status](https://readthedocs.org/projects/knot-resolver/badge/?version=latest)](https://readthedocs.org/projects/knot-resolver/?badge=latest)
 [![Packaging status](https://repology.org/badge/tiny-repos/knot-resolver.svg)](https://repology.org/project/knot-resolver/versions)
 
 Knot Resolver is a caching full resolver implementation written in C and [LuaJIT][luajit], both a resolver library and a daemon. The core architecture is tiny and efficient, and provides a foundation and
-a state-machine like API for extensions. There are three modules built-in - *iterator*, *validator*, *cache*, and a few more are loaded by default. Most of the [rich features](https://knot-resolver.readthedocs.io/en/latest/config-overview.html) are written in Lua(JIT) and C. Batteries are included, but optional.
+a state-machine like API for extensions. There are three modules built-in - *iterator*, *validator*, *cache*, and a few more are loaded by default. Most of the [rich features](https://www.knot-resolver.cz/documentation/latest/config-overview.html) are written in Lua(JIT) and C. Batteries are included, but optional.
 
 The LuaJIT modules, support DNS privacy and DNSSEC, and persistent cache with low memory footprint make it a great personal DNS resolver or a research tool to tap into DNS data. TL;DR it's the [OpenResty][openresty] of DNS.
 
 Strong filtering rules, and auto-configuration with etcd make it a great large-scale resolver solution.
 
-The server adopts a [different scaling strategy][scaling] than the rest of the DNS recursors - no threading, shared-nothing architecture (except MVCC cache that may be shared) that allows you to pin instances on available CPU cores and grow by self-replication. You can start and stop additional nodes depending on the contention without downtime.
+The server adopts a [different scaling strategy][scaling] than the rest of the DNS recursors - no threading, shared-nothing architecture (except MVCC cache that may be shared) that allows you to pin instances on available CPU cores and grow by self-replication. You can start and stop additional nodes depending on the contention without downtime, which is by default automated by the included [manager][manager].
 
 It also has strong support for DNS over TCP, notably TCP Fast-Open, query pipelining and deduplication, and response reordering.
 
 ### Packages
 
 The latest stable packages for various distributions are available in our
-[upstream repository](https://build.opensuse.org/package/show/home:CZ-NIC:knot-resolver-latest/knot-resolver).
-Follow the
-[installation instructions](https://software.opensuse.org//download.html?project=home%3ACZ-NIC%3Aknot-resolver-latest&package=knot-resolver)
-to add this repository to your system.
+[upstream repository](https://pkg.labs.nic.cz/doc/?project=knot-resolver).
+Follow the installation instructions to add this repository to your system.
 
 Knot Resolver is also available from the following distributions' repositories.
 
@@ -36,7 +33,7 @@ Knot Resolver is also available from the following distributions' repositories.
 
 ### Building from sources
 
-Knot Resolver mainly [depends][depends] on Knot DNS libraries, [LuaJIT][luajit] and [libuv][libuv].
+Knot Resolver mainly [depends][depends] on Knot DNS libraries, [LuaJIT][luajit], and [libuv][libuv].
 See the [Building project][depends] documentation page for more information.
 
 ### Docker image
@@ -57,11 +54,12 @@ The project builds a resolver library in the `lib` directory, and a daemon in th
 $ kresd
 ```
 
-See the documentation at [knot-resolver.readthedocs.io][doc] for more options.
+See the documentation at [knot-resolver.cz/documentation/latest][doc] for more options.
 
-[depends]: https://knot-resolver.readthedocs.io/en/stable/build.html
-[doc]: https://knot-resolver.readthedocs.io/en/stable/index.html
-[scaling]: https://knot-resolver.readthedocs.io/en/stable/systemd-multiinst.html
+[depends]: https://www.knot-resolver.cz/documentation/latest/build.html
+[doc]: https://www.knot-resolver.cz/documentation/latest/
+[scaling]: https://www.knot-resolver.cz/documentation/latest/config-multiple-workers.html
+[manager]: https://www.knot-resolver.cz/documentation/latest/architecture-manager.html
 [deckard]: https://gitlab.nic.cz/knot/deckard
 [luajit]: https://luajit.org/
 [libuv]: http://libuv.org
index 2b7b218cb18cc56fb85b6a8471af3ff0a6be5029..3d163d7e81fde09cc388675ae1879c7bec374f68 100644 (file)
@@ -1,5 +1,5 @@
 -- SPDX-License-Identifier: GPL-3.0-or-later
--- Refer to manual: https://knot-resolver.readthedocs.io/en/stable/
+-- Refer to manual: https://www.knot-resolver.cz/documentation/latest/
 -- Listen on localhost and external interface
 net.listen('127.0.0.1', 5353)
 net.listen('127.0.0.1', 8853, { tls = true })
index 56a7f955986f0d72f4038f9aff13ce6b7ee2b402..13e8156900628f6c028a6aafbf62397f4829cb0b 100644 (file)
@@ -20,7 +20,7 @@ local function upgrade_required(msg)
                msg = ''
        end
        panic('Configuration upgrade required: ' .. msg .. 'Please refer to ' ..
-               'https://knot-resolver.readthedocs.io/en/stable/upgrading.html')
+               'https://www.knot-resolver.cz/documentation/latest/upgrading.html')
 end
 
 -- TODO: Move bootstrap to a separate module or even its own binary
index 6d975bf8511e19d10c14ad6a085968461dae4aae..535106f39b26bb3484fd85b69eb19ef2f729788d 100644 (file)
@@ -53,7 +53,7 @@ unwrapped = stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config meson ninja ];
 
-  # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements
+  # http://www.knot-resolver.cz/documentation/latest/build.html#dependencies
   buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ]
     ++ optionals stdenv.isLinux [ systemd libcap_ng ]
     ++ [ jemalloc nghttp2 ]
index 5d586500721875f525545ab3209e3440c22d1a6b..538356afce243a9f973f37e264ac678e52640d5a 100644 (file)
@@ -24,8 +24,8 @@
 Knot Resolver via its HTTP API.
 
 Full documentation is available at
-\fIhttps://knot-resolver.readthedocs.io\fR or in package documentation
-(available as knot-resolver-doc package in most distributions.
+\fIhttps://www.knot-resolver.cz/documentation/latest/\fR or in package
+documentation (available as knot-resolver-doc package in most distributions.
 .SH OPTIONS
 The available options are:
 .TP
@@ -61,7 +61,7 @@ Equivalent to PUT method in the underlying HTTP API.
 .B stop
 Gracefully stops the running resolver.
 .SH "SEE ALSO"
-\fBkresd(8)\fR, @man_seealso_systemd@\fIhttps://knot-resolver.readthedocs.io/en/v@version@/\fR
+\fBkresd(8)\fR, @man_seealso_systemd@\fIhttps://www.knot-resolver.cz/documentation/latest/\fR
 .SH "AUTHORS"
 .B kresd
 developers are mentioned in the AUTHORS file in the distribution.
index b052a5afce796f370642cadadc265046580456ab..29d4ed9b4f821623ac3043965d335e79de5ad065 100644 (file)
@@ -64,8 +64,8 @@ and start
 The daemon may be configured also as a plain forwarder using query policies.
 This requires using a config file. Please refer to documentation for
 configuration file options. It is available at
-\fIhttps://knot-resolver.readthedocs.io\fR or in package documentation
-(available as knot-resolver-doc package in most distributions).
+\fIhttps://www.knot-resolver.cz/documentation/latest/\fR or in package
+documentation (available as knot-resolver-doc package in most distributions).
 
 The available CLI options are:
 .TP
@@ -116,7 +116,7 @@ Show short command-line option help.
 .B \-V
 Show the version.
 .SH "SEE ALSO"
-@man_seealso_systemd@\fIhttps://knot-resolver.readthedocs.io/en/v@version@/\fR
+@man_seealso_systemd@\fIhttps://www.knot-resolver.cz/documentation/latest/\fR
 .SH "AUTHORS"
 .B kresd
 developers are mentioned in the AUTHORS file in the distribution.
index 3bd12dd2843a7e8ad27089a1ca5d09d458de2097..87873be4838e353193a797611fac144512324bd0 100644 (file)
@@ -4,7 +4,7 @@
 -- In this case cache should be made as large as possible, and prefetching turned off
 -- as the resolver is busy most of the time.
 -- Alternative is using `etcd` as a configuration backend.
--- Refer to manual: https://knot-resolver.readthedocs.io/en/stable/
+-- Refer to manual: https://www.knot-resolver.cz/documentation/latest/
 
 -- Network interface configuration
 net.listen('127.0.0.1', 53, { kind = 'dns' })
index f631a545e21da6e4571e24e5ac0c3c20c2d80f50..66683dbe5d5fade015f34d30f2edd3ae9cd172bb 100644 (file)
@@ -1,6 +1,6 @@
 -- SPDX-License-Identifier: CC0-1.0
 -- vim:syntax=lua:set ts=4 sw=4:
--- Refer to manual: https://knot-resolver.readthedocs.io/en/stable/
+-- Refer to manual: https://www.knot-resolver.cz/documentation/latest/
 print('Knot Resolver ' .. package_version())
 
 -- Smaller cache size
index 46bbf173e13201772c00f4bbef2e5c0d0c858bc0..a83b2746fd489ddd15b89b29f664376649574fc2 100644 (file)
@@ -1,7 +1,7 @@
 -- SPDX-License-Identifier: CC0-1.0
 -- vim:syntax=lua:set ts=4 sw=4:
 -- Config file example usable for multi-user ISP resolver
--- Refer to manual: https://knot-resolver.readthedocs.io/en/stable/
+-- Refer to manual: https://www.knot-resolver.cz/documentation/latest/
 
 -- Network interface configuration
 net.listen('127.0.0.1', 53, { kind = 'dns' })
index d4e2f9af98ad0710ffbca9401db70cfd8d3ef643..b8600529a74de151000a7d57c24e7b53db2c3fe3 100644 (file)
@@ -1,7 +1,7 @@
 -- SPDX-License-Identifier: CC0-1.0
 -- vim:syntax=lua:set ts=4 sw=4:
 -- Config file example usable for ISP resolver
--- Refer to manual: https://knot-resolver.readthedocs.io/en/stable/
+-- Refer to manual: https://www.knot-resolver.cz/documentation/latest/
 
 -- Network interface configuration
 net.listen('127.0.0.1', 53, { kind = 'dns' })
index 961a2f6609034529a28b1160427de228b18feedb..a477a0e284cb321352dc70191ab2745fe3792ec6 100644 (file)
@@ -1,6 +1,6 @@
 -- SPDX-License-Identifier: CC0-1.0
 -- vim:syntax=lua:set ts=4 sw=4:
--- Refer to manual: https://knot-resolver.readthedocs.org/en/stable/
+-- Refer to manual: https://www.knot-resolver.cz/documentation/latest/
 
 -- Network interface configuration
 net.listen('127.0.0.1', 53, { kind = 'dns' })
index 6c14d7400d72a38ab067ead557989f54938b7159..1711053ff15ee26c259ad53d03eee270e8e46633 100644 (file)
@@ -1,7 +1,7 @@
 -- SPDX-License-Identifier: CC0-1.0
 -- vim:syntax=lua:set ts=4 sw=4:
 -- Config file example usable for privacy-preserving resolver
--- Refer to manual: https://knot-resolver.readthedocs.io/en/stable/
+-- Refer to manual: https://www.knot-resolver.cz/documentation/latest/
 
 -- Network interface configuration
 net.listen('127.0.0.1', 53, { kind = 'dns' })
index a8a93448192db0d528762a6984c2245f59a2f56f..0b8216a19d75a0aa65e86fd9e784523ce408f4fd 100644 (file)
@@ -1,7 +1,7 @@
 -- SPDX-License-Identifier: CC0-1.0
 -- vim:syntax=lua:set ts=4 sw=4:
 -- Config file with split-view for internal zone
--- Refer to manual: https://knot-resolver.readthedocs.io/en/stable/
+-- Refer to manual: https://www.knot-resolver.cz/documentation/latest/
 
 -- Network interface configuration
 net.listen('127.0.0.1', 53, { kind = 'dns' })
index 83ae77370977733a8e75084fc3850f3a7e6afb17..79219d3a108949a1d296a69aca5928b085de5aba 100644 (file)
@@ -88,7 +88,7 @@ static int load_sym_c(struct kr_module *module, uint32_t api_required)
                /* In case someone re-compiled against new kresd
                 * but haven't actually changed the symbols. */
                kr_log_error(SYSTEM, "module %s requires upgrade.  Please refer to "
-                       "https://knot-resolver.readthedocs.io/en/stable/upgrading.html",
+                       "https://www.knot-resolver.cz/documentation/latest/upgrading.html",
                        module->name);
                return kr_error(ENOTSUP);
        }
index 9c934af239e6236053ae265d6e902d98a6628828..6c11b2c6972b611573ed6b74dc78ed20f460de7f 100644 (file)
@@ -1,4 +1,4 @@
-# Refer to manual: https://knot-resolver.readthedocs.io/en/stable/
+# Refer to manual: https://www.knot-resolver.cz/documentation/latest/
 
 network:
   listen:
index 72b75e000d48687bd5eb07f287f361bf56607362..6f7fbe504830a453ceb3dcabb98a41a0dd0fd02e 100644 (file)
@@ -1,4 +1,4 @@
-# Refer to manual: https://knot-resolver.readthedocs.io/en/stable/
+# Refer to manual: https://www.knot-resolver.cz/documentation/latest/
 
 network:
   listen:
index a3df2c2a220573729868f92d29f73a7f985a8936..b7d11c1aae96465093f6fba9d8e327ab3abaa98a 100644 (file)
@@ -1,4 +1,4 @@
-# Refer to manual: https://knot-resolver.readthedocs.io/en/stable/
+# Refer to manual: https://www.knot-resolver.cz/documentation/latest/
 
 network:
   listen:
index fb909acc9bfbccbf50b94434abcd2750d4f5842c..e4424bc8969f046050b5d134d1ea9b9b73eda3e8 100644 (file)
@@ -148,7 +148,7 @@ forward: # TODO: "name" is from Unbound, but @vcunat would prefer "subtree" or s
   - name: '.' # Root is the default so could be omitted?
     servers: [2001:148f:fffe::1, 2001:148f:ffff::1, 185.43.135.1, 193.14.47.1]
   # TLS forward, server authenticated using hostname and system-wide CA certificates
-  # https://knot-resolver.readthedocs.io/en/stable/modules-policy.html?highlight=forward#tls-examples
+  # https://www.knot-resolver.cz/documentation/latest/modules-policy.html?highlight=forward#tls-examples
   - name: '.'
     servers:
       - address: [ 192.0.2.1, 192.0.2.2@5353 ]
@@ -234,4 +234,4 @@ forward:
   - subtree: 1.168.192.in-addr.arpa
     servers: [ 192.0.2.1@5353 ]
     options:
-      dnssec: false # policy.STUB?
\ No newline at end of file
+      dnssec: false # policy.STUB?
index cd45e1d603be9861e1f25349f34138217b14b5db..bc93ae2fe0b42697addf202753f88231f816a917 100644 (file)
@@ -20,7 +20,7 @@ PolicyActionEnum = Literal[
     "reqtrace",
 ]
 
-# FLAGS from https://knot-resolver.readthedocs.io/en/stable/lib.html?highlight=options#c.kr_qflags
+# FLAGS from https://www.knot-resolver.cz/documentation/latest/lib.html?highlight=options#c.kr_qflags
 PolicyFlagEnum = Literal[
     "no-minimize",
     "no-ipv4",
index a602b8e68888a3af1c2975b2b5f79cbf04c00c8a..cb0a65febf67c644e27c62ba4badba10ae5cb610 100644 (file)
@@ -93,7 +93,7 @@ To start all enabled kresd daemons, you can also use the provided \fIkresd.targe
 .SH "SEE ALSO"
 \fIkresd(8)\fR,
 \fIsystemd.unit(5)\fR,
-\fIhttps://knot-resolver.readthedocs.io/en/v@version@/\fR
+\fIhttps://www.knot-resolver.cz/documentation/latest/\fR
 
 .SH "AUTHORS"
 .B kresd