Make changes so Slave instances can be launched

ghost commented 3 years ago

Description:

This is a modified version of the following issue: https://github.com/linuxserver/docker-smokeping/issues/115 - credit should go to them for this pull.

/etc/services.d/smokeping/run

#!/usr/bin/with-contenv bash

if [ -a /config/MasterUrl ] && [ -a /config/SlaveSecret ]; then
    chmod 600 /config/SlaveSecret
    chmod 600 /config/MasterUrl
    masterurl=$(cat /config/MasterUrl)
    exec s6-setuidgid abc  /usr/bin/smokeping --master-url=$masterurl --cache-dir=/tmp --shared-secret=/config/SlaveSecret --nodaemon
else
    exec s6-setuidgid abc  /usr/bin/smokeping --config="/etc/smokeping/config" --nodaemon
fi

perl-lwp-protocol-https was added to the installed packages to allow communication over https from master to slave.

Benefits of this PR and context:

This adds master/slave configuration: https://oss.oetiker.ch/smokeping/doc/smokeping_master_slave.en.html

How Has This Been Tested?

Debian 11 build: docker buildx build --platform linux/amd64,linux/arm64 -t registry.******.**/smokeping --push .
Tested on both amd64 and arm64: docker run --hostname remote -d --name=smokeping_remote_1 -e PUID=1000 -e PGID=1000 -e TZ=Etc/UTC -v /opt/smokeping/config:/config -v /opt/smokeping/data:/data -p 127.0.0.1:1056:80 --restart unless-stopped registry.******.**/smokeping
I can confirm that the master/slave feature is working between a Raspberry Pi 4 (Debian 11) to remote VPS (Debian 11) over HTTPS through nginx reverse proxies: https://i.imgur.com/zHUciFJ.jpg

Source / References:

https://github.com/linuxserver/docker-smokeping/issues/115

LinuxServer-CI commented 3 years ago

I am a bot, here are the test results for this PR: https://ci-tests.linuxserver.io/lspipepr/smokeping/2.7.3-r5-pkg-553e4cff-pr-118/index.html https://ci-tests.linuxserver.io/lspipepr/smokeping/2.7.3-r5-pkg-553e4cff-pr-118/shellcheck-result.xml

github-actions[bot] commented 3 years ago

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

gee456 commented 2 years ago

Can we do a pull into the main branch?

github-actions[bot] commented 2 years ago

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

dpremy commented 1 year ago

Bummer to see this was not merged, been fighting getting a slave setup and this would have been an easy fix.

gee456 commented 1 year ago

Why was this not merged in? It fixed a real problem and added fuctionalit as well it was a simple change?

Roxedus commented 1 year ago

The OPs github account is deleted. There is noone on the Team that has the knowledge needed with smokeping test this PR

linuxserver / docker-smokeping