From 53a1165085b404278509d091b2f517a6f993072e Mon Sep 17 00:00:00 2001 From: Christian Elsen Date: Sat, 10 May 2025 17:16:38 -0700 Subject: [PATCH 1/2] Allow manual setting of slave name Allow manual setting of slave name via "SLAVE_NAME" env variable, as e.g. ECS with Fargate does not support setting the hostname of a container (task). --- root/etc/s6-overlay/s6-rc.d/svc-smokeping/run | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/svc-smokeping/run b/root/etc/s6-overlay/s6-rc.d/svc-smokeping/run index efca6f1..8baa3ab 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-smokeping/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-smokeping/run @@ -3,8 +3,13 @@ if [ -n "${MASTER_URL}" ] && [ -n "${SHARED_SECRET}" ] && [ -n "${CACHE_DIR}" ]; then install -g abc -o abc -m 400 -D <(echo $SHARED_SECRET) /var/smokeping/secret.txt + if [ -n "${SLAVE_NAME}" ]; then + SLAVE_NAME_OPTION="--slave-name=\"${SLAVE_NAME}\"" + else + SLAVE_NAME_OPTION="" + fi exec \ - s6-setuidgid abc /usr/sbin/smokeping --master-url="${MASTER_URL}" --cache-dir="${CACHE_DIR}" --shared-secret="/var/smokeping/secret.txt" --nodaemon + s6-setuidgid abc /usr/sbin/smokeping --master-url="${MASTER_URL}" --cache-dir="${CACHE_DIR}" --shared-secret="/var/smokeping/secret.txt" ${SLAVE_NAME_OPTION} --nodaemon else exec \ s6-setuidgid abc /usr/sbin/smokeping --config="/etc/smokeping/config" --nodaemon From 57b6eea1ac1e414e53544b4902e4fe4113b8f095 Mon Sep 17 00:00:00 2001 From: Christian Elsen Date: Sat, 10 May 2025 18:53:25 -0700 Subject: [PATCH 2/2] Fixed use of " --- root/etc/s6-overlay/s6-rc.d/svc-smokeping/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/svc-smokeping/run b/root/etc/s6-overlay/s6-rc.d/svc-smokeping/run index 8baa3ab..e856eda 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-smokeping/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-smokeping/run @@ -4,7 +4,7 @@ if [ -n "${MASTER_URL}" ] && [ -n "${SHARED_SECRET}" ] && [ -n "${CACHE_DIR}" ]; then install -g abc -o abc -m 400 -D <(echo $SHARED_SECRET) /var/smokeping/secret.txt if [ -n "${SLAVE_NAME}" ]; then - SLAVE_NAME_OPTION="--slave-name=\"${SLAVE_NAME}\"" + SLAVE_NAME_OPTION="--slave-name=${SLAVE_NAME}" else SLAVE_NAME_OPTION="" fi