From b7cfd97722f9d5949c8e47105201e10349413f15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= <petr.spacek@nic.cz>
Date: Tue, 27 Oct 2020 12:30:19 +0100
Subject: [PATCH] doh2: replace references to obsolete DoH in docs, tests and
example configs
---
etc/config/config.docker | 2 +-
systemd/multiinst.rst | 2 +-
utils/upgrade/upgrade-4-to-5.lua.in | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/etc/config/config.docker b/etc/config/config.docker
index 8e82a6098..f036fd55f 100644
--- 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 4a5623f5f..bcf4cb2d2 100644
--- 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 1d59bbb2a..7955e9648 100644
--- 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' },
}
--
GitLab