- use configured pid file path

diff --git a/zabbix_agentd.init b/zabbix_agentd.init
index 97f000bb796d3063ec7a36347a25261c7e7ef216..7ff42297ad0cc3a4c75eb5f04fcb8858f83a1553 100644 (file)
--- 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
 
 # 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?
 
 start() {
        # Check if the service is already running?

diff --git a/zabbix_proxy.init b/zabbix_proxy.init
index 71bef022b6670ec96f482401428056b9cc0cf9c0..8a86cd7f81e1610a532557d961a36149ef3fecc0 100644 (file)
--- 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
 
 # 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?
 
 start() {
        # Check if the service is already running?

diff --git a/zabbix_server.init b/zabbix_server.init
index a5c5f56216a7fa54f808f0e2cafdfaf6c63b8c19..4c4c99dda694300d4ff2173cd66f600d28d4d388 100644 (file)
--- 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}
 
 # 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?
 
 start() {
        # Check if the service is already running?