From 073d155a46fdf303ab8462f6e49665666e7f169f Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 31 Jan 2022 14:28:01 -0500
Subject: [PATCH] kresd no longer accepts socket activation
---
testsuite | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/testsuite b/testsuite
index d82f54c..a7d370e 100755
--- a/testsuite
+++ b/testsuite
@@ -105,14 +105,15 @@ modules = { 'hints > iterate' }
net.tls("$d/ee-cert.pem", "$d/ee-key.pem")
hints["monkeys.example"] = "127.15.23.5"
EOF
-systemd-socket-activate -l "$ip:8853" --fdname=tls /usr/sbin/kresd -c "$d/kresd.conf" "$d" 2> "$d/kresd.err" &
+/usr/sbin/kresd --config "$d/kresd.conf" --tls "$ip@8853" --noninteractive "$d" 2> "$d/kresd.err" &
section "make hddemux configuration on $ip:2000"
-systemd-socket-activate -l "$ip:2000" -E=HTTP_TARGET="$ip:8853" -E DNS_TARGET="$ip:8853" "$hddemux" 2> "$d/hddemux.err" &
+systemd-socket-activate -l "$ip:2000" -E HTTP_TARGET="$ip:8853" -E DNS_TARGET="$ip:8853" "$hddemux" 2> "$d/hddemux.err" &
section "set up nginx on $ip:4433"
mkdir -p "$d/nginx"
cat >"$d/nginx.conf" <<EOF
+# note: an alert might still show up: https://trac.nginx.org/nginx/ticket/147
error_log stderr;
worker_processes 1;
pid nginx.pid;
--
GitLab