From: Petr Štetiar <ynezz@true.cz>
Date: Sat, 6 Mar 2021 05:45:38 +0000 (+0100)
Subject: docker: buildslave: make TLS working
X-Git-Tag: v1~39
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=de80fd33928903e6fd3ec456b908a2968b93df63;p=buildbot.git

docker: buildslave: make TLS working

It seems like twisted actually needs SSL in the connection string,
otherwise it will get stuck in the following endless loop:

 [buildbot_worker.pb.BotFactory#info] Starting factory <buildbot_worker.pb.BotFactory object at 0x7ff40f19e080>
 [twisted.application.internet.ClientService#info] Scheduling retry 1 to connect <twisted.internet.endpoints._WrapperEndpoint object at 0x7ff410352978> in 2.1271975799063436 seconds.

Signed-off-by: Petr Štetiar <ynezz@true.cz>
---

diff --git a/docker/buildslave/files/start.sh b/docker/buildslave/files/start.sh
index 20ac53a..01e888e 100644
--- a/docker/buildslave/files/start.sh
+++ b/docker/buildslave/files/start.sh
@@ -20,7 +20,7 @@ use_tls=""
 if [ "$BUILDSLAVE_TLS" = 1 ]; then
 	sed -i \
 		-e 's#(buildmaster_host, port, #(None, None, #' \
-		-e 's#allow_shutdown=allow_shutdown#&, connection_string="TLS:%s:%d:trustRoots=/certs" %(buildmaster_host, port)#' \
+		-e 's#allow_shutdown=allow_shutdown#&, connection_string="SSL:%s:%d" %(buildmaster_host, port)#' \
 		/builder/buildbot.tac
 fi