From owner-svn-ports-all@freebsd.org Sun Jun 14 15:17:04 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 65D0E33CED5; Sun, 14 Jun 2020 15:17:04 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49lJ3N27hVz4Yht; Sun, 14 Jun 2020 15:17:04 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 44615E80F; Sun, 14 Jun 2020 15:17:04 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05EFH4Ve031760; Sun, 14 Jun 2020 15:17:04 GMT (envelope-from dbaio@FreeBSD.org) Received: (from dbaio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05EFH2dk031750; Sun, 14 Jun 2020 15:17:02 GMT (envelope-from dbaio@FreeBSD.org) Message-Id: <202006141517.05EFH2dk031750@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbaio set sender to dbaio@FreeBSD.org using -f From: "Danilo G. Baio" Date: Sun, 14 Jun 2020 15:17:02 +0000 (UTC) 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... X-SVN-Group: ports-head X-SVN-Commit-Author: dbaio X-SVN-Commit-Paths: 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 zabbix5-server zabbix5-server... X-SVN-Commit-Revision: 538809 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jun 2020 15:17:04 -0000 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 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"