Skip to content
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.

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

fix: Set static pidfile directory #206

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions net-mgmt/xymon-client/files/patch-Makefile-include
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- client/Makefile.orig 2014-01-07 21:43:56.000000000 +0000
+++ client/Makefile 2024-11-11 10:57:56.816734000 +0000
@@ -28,6 +28,7 @@

xymonclient.cfg: xymonclient.cfg.DIST
cat xymonclient.cfg.DIST | sed -e 's!@XYMONHOSTIP@!$(XYMONHOSTIP)!g' >xymonclient.cfg
+ echo 'include /usr/local/etc/xymon/xymonclient.cfg' >>xymonclient.cfg
../build/bb-commands.sh >>xymonclient.cfg

clientlaunch.cfg: clientlaunch.cfg.DIST
6 changes: 5 additions & 1 deletion net-mgmt/xymon-client/files/xymon-client.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ load_rc_config "$name"
: ${xymon_client_enable:=NO}
: ${xymon_client_user:=%%XYMONUSER%%}

pidfile="%%WWWDIR%%/client/logs/clientlaunch.`hostname`.pid"
pidfile="/var/run/xymon/${name}.pid"
command=%%WWWDIR%%/client/bin/xymonlaunch
command_args="--config=%%WWWDIR%%/client/etc/clientlaunch.cfg --log=%%WWWDIR%%/client/logs/clientlaunch.log --pidfile=${pidfile}"
start_precmd=xymon_precmd
Expand All @@ -26,6 +26,10 @@ xymon_precmd()
# Ensure permissions of log dir
chown -R ${xymon_client_user} %%WWWDIR%%/client/logs

# Ensure pidfile directory is writable
mkdir /var/run/xymon
chown ${xymon_client_user} /var/run/xymon

# Below is pulled almost directly from Xymon's runclient.sh script which we are bypassing due to redundancy

# Default settings for this client
Expand Down