buildworker: start: fix broken non TLS setups
authorPetr Štetiar <ynezz@true.cz>
Thu, 24 Oct 2024 19:55:04 +0000 (19:55 +0000)
committerPetr Štetiar <ynezz@true.cz>
Mon, 4 Nov 2024 06:12:04 +0000 (06:12 +0000)
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>
docker/buildworker/files/start.sh

index 5e0147a61f97df7eb1d34b2d49e69254b33b62e2..0f50c50305ed4a1e62c95f5c1dd3aa9c38c074f0 100644 (file)
@@ -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" \