From: Vladimír Čunát Date: Tue, 21 Jan 2020 14:51:47 +0000 (+0100) Subject: doc: remove parts exclusive for systemd socket activation X-Git-Tag: v5.0.0~3^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e448aa457430e6caeb70e8fc92dda98395b787b;p=thirdparty%2Fknot-resolver.git doc: remove parts exclusive for systemd socket activation Well, the `view` note applies to any sockets passed from a supervisor, but together that seems a very exotic combination. --- diff --git a/doc/build.rst b/doc/build.rst index 7302bf7e6..d8eb7bb22 100644 --- a/doc/build.rst +++ b/doc/build.rst @@ -50,7 +50,7 @@ Resolver: "Sphinx_ and sphinx_rtd_theme_", "``documentation``", "Building this HTML/PDF documentation." "breathe_", "``documentation``", "Exposing Doxygen API doc to Sphinx." - "libsystemd_ >= 227", "``daemon``", "Systemd socket activation support." + "libsystemd_", "``daemon``", "Systemd watchdog support." "libprotobuf_ 3.0+", "``modules/dnstap``", "Protocol Buffers support for dnstap_." "`libprotobuf-c`_ 1.0+", "``modules/dnstap``", "C bindings for Protobuf." diff --git a/doc/kresd.8.in b/doc/kresd.8.in index 3b194c845..632caee2a 100644 --- a/doc/kresd.8.in +++ b/doc/kresd.8.in @@ -98,10 +98,8 @@ UNIX socket in \fIrundir\fR that the operator can connect to for interactive ses A number greater than 1 forks the daemon N times, all forks will bind to same addresses and the kernel will load-balance between them on Linux with \fISO_REUSEPORT\fR support. -When socket-activated and supervised by systemd or the equivalent, kresd defaults to ---noninteractive. If you want multiple concurrent -processes supervised in this way, they should be supervised independently (see -\fBkresd.systemd(7)\fR). +If you want multiple concurrent processes supervised in this way, +they should be supervised independently (see \fBkresd.systemd(7)\fR). .TP .B \-n\fR, \fB\-\-noninteractive Daemon will refrain from entering into read-eval-print loop for stdin+stdout. diff --git a/modules/view/README.rst b/modules/view/README.rst index c352a2e36..30c5d462d 100644 --- a/modules/view/README.rst +++ b/modules/view/README.rst @@ -53,12 +53,6 @@ Example configuration -- Drop everything that hasn't matched view:addr('0.0.0.0/0', policy.all(policy.DROP)) -.. note:: When using systemd socket activation, it's possible to bind to IPv6 - socket that also handles IPv4 connections via v4-mapped-on-v6 addresses. - With this setup, using IPv4 syntax in ``view:addr()`` is currently not - supported. Instead, you can use the v4-mapped-on-v6 syntax, e.g. - ``::ffff:127.0.0.0/104`` instead of ``127.0.0.0/8``. - Rule order ----------