Skip to content

Allow manual setting of slave name #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
chriselsen wants to merge 2 commits into from
Closed

Allow manual setting of slave name #195

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53a1165
Allow manual setting of slave name
chriselsen May 11, 2025
57b6eea
Fixed use of "
chriselsen May 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion root/etc/s6-overlay/s6-rc.d/svc-smokeping/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down