From 7835c1a90eb9713aa16b4e8231d76da65483416e Mon Sep 17 00:00:00 2001 From: Mathieu A Date: Mon, 11 Nov 2024 12:14:15 +0100 Subject: [PATCH] fix: Set static pidfile directory --- net-mgmt/xymon-client/files/patch-Makefile-include | 10 ++++++++++ net-mgmt/xymon-client/files/xymon-client.in | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 net-mgmt/xymon-client/files/patch-Makefile-include diff --git a/net-mgmt/xymon-client/files/patch-Makefile-include b/net-mgmt/xymon-client/files/patch-Makefile-include new file mode 100644 index 000000000000..f0d94204ca46 --- /dev/null +++ b/net-mgmt/xymon-client/files/patch-Makefile-include @@ -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 diff --git a/net-mgmt/xymon-client/files/xymon-client.in b/net-mgmt/xymon-client/files/xymon-client.in index 1a045b5781af..63e2add4dc89 100644 --- a/net-mgmt/xymon-client/files/xymon-client.in +++ b/net-mgmt/xymon-client/files/xymon-client.in @@ -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 @@ -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