From: Marcin Krol <hawk@tld-linux.org>
Date: Sun, 18 May 2025 19:29:05 +0000 (+0200)
Subject: - use configured pid file path
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=HEAD;p=packages%2Fzabbix.git

- use configured pid file path
---

diff --git a/zabbix_agentd.init b/zabbix_agentd.init
index 97f000b..7ff4229 100644
--- a/zabbix_agentd.init
+++ b/zabbix_agentd.init
@@ -27,7 +27,17 @@ fi
 # Get service config - may override defaults
 [ -f /etc/sysconfig/zabbix_agentd ] && . /etc/sysconfig/zabbix_agentd
 
-pidfile="/var/run/zabbix/zabbix_agentd.pid"
+# Try to get configured PidFile or set default
+get_pid() {
+	local config="$1"
+	local pidfile
+	test -f "$config" && pidfile=$(awk -F= '/^ *PidFile/ {print $2}' "$config")
+	# Fallback to zabbix_agentd default pidfile
+	test -n "$pidfile" || pidfile=/var/run/zabbix/zabbix_agentd.pid
+	echo "$pidfile"
+}
+
+pidfile=$(get_pid /etc/zabbix/zabbix_agentd.conf)
 
 start() {
 	# Check if the service is already running?
diff --git a/zabbix_proxy.init b/zabbix_proxy.init
index 71bef02..8a86cd7 100644
--- a/zabbix_proxy.init
+++ b/zabbix_proxy.init
@@ -27,7 +27,17 @@ fi
 # Get service config - may override defaults
 [ -f /etc/sysconfig/zabbix_proxy ] && . /etc/sysconfig/zabbix_proxy
 
-pidfile="/var/run/zabbix/zabbix_proxy.pid"
+# Try to get configured PidFile or set default
+get_pid() {
+	local config="$1"
+	local pidfile
+	test -f "$config" && pidfile=$(awk -F= '/^ *PidFile/ {print $2}' "$config")
+	# Fallback to zabbix_proxy default pidfile
+	test -n "$pidfile" || pidfile=/var/run/zabbix/zabbix_proxy.pid
+	echo "$pidfile"
+}
+
+pidfile=$(get_pid /etc/zabbix/zabbix_proxy.conf)
 
 start() {
 	# Check if the service is already running?
diff --git a/zabbix_server.init b/zabbix_server.init
index a5c5f56..4c4c99d 100644
--- a/zabbix_server.init
+++ b/zabbix_server.init
@@ -30,7 +30,17 @@ fi
 # Set default shutdown timeout if it is not set in service config
 ZABBIX_SHUTDOWN_TIMEOUT=${ZABBIX_SHUTDOWN_TIMEOUT:-60}
 
-pidfile="/var/run/zabbix/zabbix_server.pid"
+# Try to get configured PidFile or set default
+get_pid() {
+	local config="$1"
+	local pidfile
+	test -f "$config" && pidfile=$(awk -F= '/^ *PidFile/ {print $2}' "$config")
+	# Fallback to zabbix_server default pidfile
+	test -n "$pidfile" || pidfile=/var/run/zabbix/zabbix_server.pid
+	echo "$pidfile"
+}
+
+pidfile=$(get_pid /etc/zabbix/zabbix_server.conf)
 
 start() {
 	# Check if the service is already running?