commit f58e0a640714fee335065670be34e174f4814bd9 parent e3576f3d0f34b7e13167f8d368fa8c311eda35b9 Author: Etienne CHAMPETIER <champetier.etienne@gmail.com> Date: Sun, 21 Jun 2015 16:10:34 +0200 zabbix: switch zabbix_agentd to procd run tested on ar71xx Signed-off-by: Etienne CHAMPETIER <champetier.etienne@gmail.com> Diffstat:
| M | admin/zabbix/files/zabbix_agentd.init | | | 22 | ++++++---------------- |
| M | admin/zabbix/patches/010-change-agentd-config.patch | | | 4 | ++-- |
2 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/admin/zabbix/files/zabbix_agentd.init b/admin/zabbix/files/zabbix_agentd.init @@ -3,29 +3,19 @@ START=60 +USE_PROCD=1 PROG=/usr/sbin/zabbix_agentd CONFIG=/etc/zabbix_agentd.conf -SERVICE_PID_FILE=/var/run/zabbix_agentd.pid -start() { +start_service() { # Sometimes the agentd config was installed in /etc/zabbix/zabbix_agentd.conf [ -f /etc/zabbix/zabbix_agentd.conf ] && mv /etc/zabbix/zabbix_agentd.conf ${CONFIG} [ -f ${CONFIG} ] || return 1 - grep -q "^PidFile=${SERVICE_PID_FILE}" ${CONFIG} || { - logger -s -t ${CONFIG} -p daemon.error "Only \"PidFile=${SERVICE_PID_FILE}\" supported" - return 1 - } - - grep -q "^AllowRoot=1" ${CONFIG} || { - touch ${SERVICE_PID_FILE} - chown zabbix:zabbix ${SERVICE_PID_FILE} - } - - service_start ${PROG} -c ${CONFIG} + procd_open_instance + procd_set_param command ${PROG} -c ${CONFIG} -f + procd_set_param respawn + procd_close_instance } -stop() { - service_stop ${PROG} -} diff --git a/admin/zabbix/patches/010-change-agentd-config.patch b/admin/zabbix/patches/010-change-agentd-config.patch @@ -10,8 +10,8 @@ -# Mandatory: no -# Default: -# PidFile=/tmp/zabbix_agentd.pid -+# Only /var/run/zabbix_agentd.pid supported -+PidFile=/var/run/zabbix_agentd.pid ++# We do not need PidFile with procd ++# PidFile=/var/run/zabbix_agentd.pid ### Option: LogFile # Name of log file.