Date: Sun, 14 Jun 2020 15:17:02 +0000 (UTC) From: "Danilo G. Baio" <dbaio@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538809 - in head/net-mgmt: zabbix3-java zabbix3-server/files zabbix4-java zabbix4-server/files zabbix42-java zabbix42-server/files zabbix44-java zabbix44-server/files zabbix5-java zabb... Message-ID: <202006141517.05EFH2dk031750@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbaio Date: Sun Jun 14 15:17:01 2020 New Revision: 538809 URL: https://svnweb.freebsd.org/changeset/ports/538809 Log: net-mgmt/zabbix*: Add status command to the zabbix_java rc script PR: 240139 Submitted by: TAO ZHOU <zhoutao@laocius.org> Approved by: maintainer timeout (pg@pakhom.spb.ru, > 9 months) Modified: head/net-mgmt/zabbix3-java/Makefile head/net-mgmt/zabbix3-server/files/zabbix_java.in head/net-mgmt/zabbix4-java/Makefile head/net-mgmt/zabbix4-server/files/zabbix_java.in head/net-mgmt/zabbix42-java/Makefile head/net-mgmt/zabbix42-server/files/zabbix_java.in head/net-mgmt/zabbix44-java/Makefile head/net-mgmt/zabbix44-server/files/zabbix_java.in head/net-mgmt/zabbix5-java/Makefile head/net-mgmt/zabbix5-server/Makefile head/net-mgmt/zabbix5-server/files/zabbix_java.in Modified: head/net-mgmt/zabbix3-java/Makefile ============================================================================== --- head/net-mgmt/zabbix3-java/Makefile Sun Jun 14 14:51:20 2020 (r538808) +++ head/net-mgmt/zabbix3-java/Makefile Sun Jun 14 15:17:01 2020 (r538809) @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= zabbix3 +PORTREVISION= 1 CATEGORIES= net-mgmt PKGNAMESUFFIX= -java Modified: head/net-mgmt/zabbix3-server/files/zabbix_java.in ============================================================================== --- head/net-mgmt/zabbix3-server/files/zabbix_java.in Sun Jun 14 14:51:20 2020 (r538808) +++ head/net-mgmt/zabbix3-server/files/zabbix_java.in Sun Jun 14 15:17:01 2020 (r538809) @@ -23,5 +23,25 @@ load_rc_config $name start_cmd="/usr/bin/su -m zabbix -c %%PREFIX%%/sbin/zabbix_java/startup.sh" stop_cmd="/usr/bin/su -m zabbix -c %%PREFIX%%/sbin/zabbix_java/shutdown.sh" +status_cmd="zabbix_java_status" + +extra_commands="status" + +zabbix_java_status() { + if get_pidfile_from_conf PID_FILE %%PREFIX%%/sbin/zabbix_java/settings.sh; then + PID_FILE="$_pidfile_from_conf" + fi + + if [ -n "$PID_FILE" -a -f "$PID_FILE" ]; then + PID=`cat "$PID_FILE"` + if ps -p "$PID" > /dev/null 2>&1; then + echo "${name} is running as pid ${PID}" + else + echo "${name} is not running" + fi + else + echo "${name} is not running" + fi +} run_rc_command "$1" Modified: head/net-mgmt/zabbix4-java/Makefile ============================================================================== --- head/net-mgmt/zabbix4-java/Makefile Sun Jun 14 14:51:20 2020 (r538808) +++ head/net-mgmt/zabbix4-java/Makefile Sun Jun 14 15:17:01 2020 (r538809) @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= zabbix4 +PORTREVISION= 1 CATEGORIES= net-mgmt PKGNAMESUFFIX= -java Modified: head/net-mgmt/zabbix4-server/files/zabbix_java.in ============================================================================== --- head/net-mgmt/zabbix4-server/files/zabbix_java.in Sun Jun 14 14:51:20 2020 (r538808) +++ head/net-mgmt/zabbix4-server/files/zabbix_java.in Sun Jun 14 15:17:01 2020 (r538809) @@ -23,5 +23,25 @@ load_rc_config $name start_cmd="/usr/bin/su -m zabbix -c %%PREFIX%%/sbin/zabbix_java/startup.sh" stop_cmd="/usr/bin/su -m zabbix -c %%PREFIX%%/sbin/zabbix_java/shutdown.sh" +status_cmd="zabbix_java_status" + +extra_commands="status" + +zabbix_java_status() { + if get_pidfile_from_conf PID_FILE %%PREFIX%%/sbin/zabbix_java/settings.sh; then + PID_FILE="$_pidfile_from_conf" + fi + + if [ -n "$PID_FILE" -a -f "$PID_FILE" ]; then + PID=`cat "$PID_FILE"` + if ps -p "$PID" > /dev/null 2>&1; then + echo "${name} is running as pid ${PID}" + else + echo "${name} is not running" + fi + else + echo "${name} is not running" + fi +} run_rc_command "$1" Modified: head/net-mgmt/zabbix42-java/Makefile ============================================================================== --- head/net-mgmt/zabbix42-java/Makefile Sun Jun 14 14:51:20 2020 (r538808) +++ head/net-mgmt/zabbix42-java/Makefile Sun Jun 14 15:17:01 2020 (r538809) @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= zabbix42 +PORTREVISION= 1 CATEGORIES= net-mgmt PKGNAMESUFFIX= -java Modified: head/net-mgmt/zabbix42-server/files/zabbix_java.in ============================================================================== --- head/net-mgmt/zabbix42-server/files/zabbix_java.in Sun Jun 14 14:51:20 2020 (r538808) +++ head/net-mgmt/zabbix42-server/files/zabbix_java.in Sun Jun 14 15:17:01 2020 (r538809) @@ -23,5 +23,25 @@ load_rc_config $name start_cmd="/usr/bin/su -m zabbix -c %%PREFIX%%/sbin/zabbix_java/startup.sh" stop_cmd="/usr/bin/su -m zabbix -c %%PREFIX%%/sbin/zabbix_java/shutdown.sh" +status_cmd="zabbix_java_status" + +extra_commands="status" + +zabbix_java_status() { + if get_pidfile_from_conf PID_FILE %%PREFIX%%/sbin/zabbix_java/settings.sh; then + PID_FILE="$_pidfile_from_conf" + fi + + if [ -n "$PID_FILE" -a -f "$PID_FILE" ]; then + PID=`cat "$PID_FILE"` + if ps -p "$PID" > /dev/null 2>&1; then + echo "${name} is running as pid ${PID}" + else + echo "${name} is not running" + fi + else + echo "${name} is not running" + fi +} run_rc_command "$1" Modified: head/net-mgmt/zabbix44-java/Makefile ============================================================================== --- head/net-mgmt/zabbix44-java/Makefile Sun Jun 14 14:51:20 2020 (r538808) +++ head/net-mgmt/zabbix44-java/Makefile Sun Jun 14 15:17:01 2020 (r538809) @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= zabbix44 +PORTREVISION= 2 CATEGORIES= net-mgmt PKGNAMESUFFIX= -java Modified: head/net-mgmt/zabbix44-server/files/zabbix_java.in ============================================================================== --- head/net-mgmt/zabbix44-server/files/zabbix_java.in Sun Jun 14 14:51:20 2020 (r538808) +++ head/net-mgmt/zabbix44-server/files/zabbix_java.in Sun Jun 14 15:17:01 2020 (r538809) @@ -23,5 +23,25 @@ load_rc_config $name start_cmd="/usr/bin/su -m zabbix -c %%PREFIX%%/sbin/zabbix_java/startup.sh" stop_cmd="/usr/bin/su -m zabbix -c %%PREFIX%%/sbin/zabbix_java/shutdown.sh" +status_cmd="zabbix_java_status" + +extra_commands="status" + +zabbix_java_status() { + if get_pidfile_from_conf PID_FILE %%PREFIX%%/sbin/zabbix_java/settings.sh; then + PID_FILE="$_pidfile_from_conf" + fi + + if [ -n "$PID_FILE" -a -f "$PID_FILE" ]; then + PID=`cat "$PID_FILE"` + if ps -p "$PID" > /dev/null 2>&1; then + echo "${name} is running as pid ${PID}" + else + echo "${name} is not running" + fi + else + echo "${name} is not running" + fi +} run_rc_command "$1" Modified: head/net-mgmt/zabbix5-java/Makefile ============================================================================== --- head/net-mgmt/zabbix5-java/Makefile Sun Jun 14 14:51:20 2020 (r538808) +++ head/net-mgmt/zabbix5-java/Makefile Sun Jun 14 15:17:01 2020 (r538809) @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= zabbix5 +PORTREVISION= 1 CATEGORIES= net-mgmt PKGNAMESUFFIX= -java Modified: head/net-mgmt/zabbix5-server/Makefile ============================================================================== --- head/net-mgmt/zabbix5-server/Makefile Sun Jun 14 14:51:20 2020 (r538808) +++ head/net-mgmt/zabbix5-server/Makefile Sun Jun 14 15:17:01 2020 (r538809) @@ -3,6 +3,7 @@ PORTNAME= zabbix5 PORTVERSION= 5.0.1 +PORTREVISION?= 0 CATEGORIES= net-mgmt MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${PORTVERSION:R}/ PKGNAMESUFFIX?= -server Modified: head/net-mgmt/zabbix5-server/files/zabbix_java.in ============================================================================== --- head/net-mgmt/zabbix5-server/files/zabbix_java.in Sun Jun 14 14:51:20 2020 (r538808) +++ head/net-mgmt/zabbix5-server/files/zabbix_java.in Sun Jun 14 15:17:01 2020 (r538809) @@ -23,5 +23,25 @@ load_rc_config $name start_cmd="/usr/bin/su -m zabbix -c %%PREFIX%%/sbin/zabbix_java/startup.sh" stop_cmd="/usr/bin/su -m zabbix -c %%PREFIX%%/sbin/zabbix_java/shutdown.sh" +status_cmd="zabbix_java_status" + +extra_commands="status" + +zabbix_java_status() { + if get_pidfile_from_conf PID_FILE %%PREFIX%%/sbin/zabbix_java/settings.sh; then + PID_FILE="$_pidfile_from_conf" + fi + + if [ -n "$PID_FILE" -a -f "$PID_FILE" ]; then + PID=`cat "$PID_FILE"` + if ps -p "$PID" > /dev/null 2>&1; then + echo "${name} is running as pid ${PID}" + else + echo "${name} is not running" + fi + else + echo "${name} is not running" + fi +} run_rc_command "$1"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006141517.05EFH2dk031750>