summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Štetiar2024-10-24 19:55:04 +0000
committerPetr Štetiar2024-11-04 06:12:04 +0000
commitdbf5d03807e66f15b1b661a4fac51c6739cad156 (patch)
tree014ad508b1ff8d27c5a2eb8c5fbd6ce28fa9a0c7
parent3915bd80cec149897f37530eeaba366aa87e2784 (diff)
downloadbuildbot-dbf5d03807e66f15b1b661a4fac51c6739cad156.tar.gz
buildworker: start: fix broken non TLS setups
Changes in commit 3812ff7bb296 ("buildworker: start: fix worker startup failure after update") broke non TLS setups. So lets fix it by setting SSL: only if BUILDWORKER_TLS is set. Fixes: 3812ff7bb296 ("buildworker: start: fix worker startup failure after update") Reported-by: Paul Spooren <mail@aparcar.org> Signed-off-by: Petr Štetiar <ynezz@true.cz>
-rw-r--r--docker/buildworker/files/start.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/buildworker/files/start.sh b/docker/buildworker/files/start.sh
index 5e0147a..0f50c50 100644
--- a/docker/buildworker/files/start.sh
+++ b/docker/buildworker/files/start.sh
@@ -21,7 +21,7 @@ rm -f /builder/buildbot.tac
/opt/venv/bin/buildbot-worker create-worker \
--force \
--umask="0o22" \
- --connection-string="SSL:$BUILDWORKER_MASTER" \
+ ${BUILDWORKER_TLS:+--connection-string="SSL:$BUILDWORKER_MASTER"} \
/builder \
"$BUILDWORKER_MASTER" \
"$BUILDWORKER_NAME" \