doh2: replace references to obsolete DoH in docs, tests and example configs

diff --git a/etc/config/config.docker b/etc/config/config.docker
index 8e82a6098f0d0093efb426aa5234303739af5e67..f036fd55fe13e8c626a7f809c841093a431086a4 100644 (file)
--- a/etc/config/config.docker
+++ b/etc/config/config.docker
@@ -10,7 +10,7 @@ function interactive_mode()
        -- Listen on all interfaces (localhost would not work in Docker)
        net.listen('0.0.0.0', 53, { kind = 'dns' })
        net.listen('0.0.0.0', 853, { kind = 'tls' })
-       net.listen('0.0.0.0', 443, { kind = 'doh' })
+       net.listen('0.0.0.0', 443, { kind = 'doh2' })
        net.listen('0.0.0.0', 8453, { kind = 'webmgmt' })
 
        -- Load Useful modules

diff --git a/systemd/multiinst.rst b/systemd/multiinst.rst
index 4a5623f5f07dcf296e1b3d11b6059b790566d79d..bcf4cb2d2fdbb4d6b8190ab64359398fdf8746d1 100644 (file)
--- a/systemd/multiinst.rst
+++ b/systemd/multiinst.rst
@@ -93,7 +93,7 @@ individual services for classic DNS, DoT and DoH from each other.
    elseif string.match(systemd_instance, '^tls') then
        net.listen('127.0.0.1', 853, { kind = 'tls' })
    elseif string.match(systemd_instance, '^doh') then
-       net.listen('127.0.0.1', 443, { kind = 'doh' })
+       net.listen('127.0.0.1', 443, { kind = 'doh2' })
    else
        panic("Use kresd@dns*, kresd@tls* or kresd@doh* instance names")
    end

diff --git a/utils/upgrade/upgrade-4-to-5.lua.in b/utils/upgrade/upgrade-4-to-5.lua.in
index 1d59bbb2a281145321d85215e56f1d956ff57fd8..7955e9648f6403959f2dbe93006edec93773c995 100644 (file)
--- a/utils/upgrade/upgrade-4-to-5.lua.in
+++ b/utils/upgrade/upgrade-4-to-5.lua.in
@@ -5,7 +5,7 @@ local out = upg_dir..'/kresd.conf.net'
 local sockets = {
        { file='kresd.socket', kind='dns' },
        { file='kresd-tls.socket', kind='tls' },
-       { file='kresd-doh.socket', kind='doh' },
+       { file='kresd-doh.socket', kind='doh2' },
        { file='kresd-webmgmt.socket', kind='webmgmt' },
 }