Try to get configured PidFile; rel 2

Signed-off-by: Elan Ruusamäe <glen@pld-linux.org>

diff --git a/zabbix.spec b/zabbix.spec
index bccd76ff617b2ada9b9c47a221cd207677821f60..40ef47e09a176f36c6a823cfb1009f84f8f142b7 100644 (file)
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -24,7 +24,7 @@ Summary:      Zabbix - network monitoring software
 Summary(pl.UTF-8):     Zabbix - oprogramowanie do monitorowania sieci
 Name:          zabbix
 Version:       5.4.3
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         Networking/Utilities
 # https://www.zabbix.com/download_sources

diff --git a/zabbix_agent2.init b/zabbix_agent2.init
index eb83ccfb373833947f11d5543a1d1ca67ed58315..eabb0d3632da709e8f7b361be7acfec0405f9b12 100755 (executable)
--- a/zabbix_agent2.init
+++ b/zabbix_agent2.init
@@ -29,7 +29,17 @@ ZABBIX_USER=zabbix
 # Get service config - may override defaults
 [ -f /etc/sysconfig/zabbix_agent2 ] && . /etc/sysconfig/zabbix_agent2
 
-pidfile="/var/run/zabbix/zabbix_agent2.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_agent2 default pidfile
+       test -n "$pidfile" || pidfile=/tmp/zabbix_agent2.pid
+       echo "$pidfile"
+}
+
+pidfile=$(get_pid /etc/zabbix/zabbix_agent2.conf)
 
 start() {
        # Check if the service is already running?