From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Mon, 20 Jan 2020 13:28:24 +0000 (+0100)
Subject: doc/upgrading: add network interface upgrade info
X-Git-Tag: v5.0.0~3^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f6ee00a31e53855b3c7b3a4436e369b35aeba7d;p=thirdparty%2Fknot-resolver.git

doc/upgrading: add network interface upgrade info
---

diff --git a/doc/_static/css/custom.css b/doc/_static/css/custom.css
new file mode 100644
index 000000000..3467c6908
--- /dev/null
+++ b/doc/_static/css/custom.css
@@ -0,0 +1,5 @@
+@import "theme.css";
+
+table.docutils blockquote {
+    margin-left: 0;
+}
diff --git a/doc/conf.py b/doc/conf.py
index bf74c1aa3..f47ff8ab8 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -63,6 +63,7 @@ html_theme_options = {
     'sticky_navigation': True,
 }
 html_logo = '_static/logo-negativ.svg'
+html_style = 'css/custom.css'
 
 # -- Options for LaTeX output --------------------------------------------------
 
diff --git a/doc/upgrading.rst b/doc/upgrading.rst
index e2e979ee5..7c8529864 100644
--- a/doc/upgrading.rst
+++ b/doc/upgrading.rst
@@ -30,6 +30,39 @@ Users
 Configuration file
 ------------------
 
+* Network interface are now configured in ``kresd.conf`` with
+  :func:`net.listen` instead of systemd sockets (`#485
+  <https://gitlab.labs.nic.cz/knot/knot-resolver/issues/485>`_). See
+  the following examples.
+
+  .. tip:: For Debian, Ubuntu, CentOS and Fedora users, the configuration file
+     is upgraded automatically and only needs to be verified for corectness.
+
+  .. csv-table::
+     :header: "4.x - systemd socket file", "5.x - kresd.conf"
+
+      "kresd.socket
+      | [Socket]
+      | ListenDatagram=127.0.0.1:53
+      | ListenStream=127.0.0.1:53","| net.listen('127.0.0.1', 53, { kind = 'dns' })"
+      "kresd.socket
+      | [Socket]
+      | FreeBind=true
+      | BindIPv6Only=both
+      | ListenDatagram=[::1]:53
+      | ListenStream=[::1]:53
+      "," | net.listen('127.0.0.1', 53, { kind = 'dns', freebind = true })
+      | net.listen('::1', 53, { kind = 'dns', freebind = true })"
+      "kresd-tls.socket
+      | [Socket]
+      | ListenStream=127.0.0.1:853","| net.listen('127.0.0.1', 853, { kind = 'tls' })"
+      "kresd-doh.socket
+      | [Socket]
+      | ListenStream=127.0.0.1:443","| net.listen('127.0.0.1', 443, { kind = 'doh' })"
+      "kresd-webmgmt.socket
+      | [Socket]
+      | ListenStream=127.0.0.1:8453","| net.listen('127.0.0.1', 8453, { kind = 'webmgmt' })"
+
 * :func:`net.listen` throws an error if it fails to bind. Use ``freebind=true`` option
   to bind to nonlocal addresses.