From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Dec 3 09:30:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7F838106567B for ; Wed, 3 Dec 2008 09:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 5C3A18FC21; Wed, 3 Dec 2008 09:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id mB39U2Ic024220; Wed, 3 Dec 2008 09:30:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id mB39U1QJ024160; Wed, 3 Dec 2008 09:30:01 GMT (envelope-from gnats) Resent-Date: Wed, 3 Dec 2008 09:30:01 GMT Resent-Message-Id: <200812030930.mB39U1QJ024160@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Cc: jarrod@netleader.com.au Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Eygene Ryabinkin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6AE52106564A for ; Wed, 3 Dec 2008 09:22:04 +0000 (UTC) (envelope-from rea-fbsd@codelabs.ru) Received: from 0.mx.codelabs.ru (0.mx.codelabs.ru [144.206.177.45]) by mx1.freebsd.org (Postfix) with ESMTP id 1E1C98FC0C for ; Wed, 3 Dec 2008 09:22:03 +0000 (UTC) (envelope-from rea-fbsd@codelabs.ru) Received: from void.codelabs.ru (void.codelabs.ru [144.206.177.25]) by 0.mx.codelabs.ru with esmtps (TLSv1:CAMELLIA256-SHA:256) id 1L7nvm-0004bq-MO for FreeBSD-gnats-submit@freebsd.org; Wed, 03 Dec 2008 12:22:02 +0300 Message-Id: <20081203092202.620311AF41E@void.codelabs.ru> Date: Wed, 3 Dec 2008 12:22:02 +0300 (MSK) From: Eygene Ryabinkin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 X-GNATS-Notify: jarrod@netleader.com.au Cc: Subject: ports/129386: [patch] net-mgmt/nrpe2: add nrpe2_pidfile knob X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Eygene Ryabinkin List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Dec 2008 09:30:02 -0000 >Number: 129386 >Category: ports >Synopsis: [patch] net-mgmt/nrpe2: add nrpe2_pidfile knob >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Dec 03 09:30:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Eygene Ryabinkin >Release: FreeBSD 7.1-PRERELEASE i386 >Organization: Code Labs >Environment: System: FreeBSD 7.1-PRERELEASE i386 >Description: rc.d script for nrpe2 uses hardcoded value of pidfile. It is not always good, because some people might want to place pid file in some non-default location. One can hack rc.d script, but he will need to do it everytime the port upgrades. Not cool... >How-To-Repeat: Set PID file location in the nrpe.cfg to the non-standard value and try to restart the daemon via rc.d script. It will refuse to stop the daemon, because of missing PID file. >Fix: The following patch takes care about the situation. --- add-knob-nrpe2_pidfile.diff begins here --- >From 2b020ab731eedbeac539103196fd5866007aa736 Mon Sep 17 00:00:00 2001 From: Eygene Ryabinkin Date: Wed, 3 Dec 2008 11:23:11 +0300 Modify rc.d script to allow administrator to change PID file location without editing rc.d script. New knob nrpe2_pidfile is provided for this and it defaults to the old value of the PID file. Signed-off-by: Eygene Ryabinkin --- net-mgmt/nrpe2/Makefile | 1 + net-mgmt/nrpe2/files/nrpe2.in | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/net-mgmt/nrpe2/Makefile b/net-mgmt/nrpe2/Makefile index dfbc564..315786d 100644 --- a/net-mgmt/nrpe2/Makefile +++ b/net-mgmt/nrpe2/Makefile @@ -7,6 +7,7 @@ PORTNAME= nrpe DISTVERSION= 2.12 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= SF MASTER_SITE_SUBDIR= nagios diff --git a/net-mgmt/nrpe2/files/nrpe2.in b/net-mgmt/nrpe2/files/nrpe2.in index e80e519..0213beb 100644 --- a/net-mgmt/nrpe2/files/nrpe2.in +++ b/net-mgmt/nrpe2/files/nrpe2.in @@ -13,6 +13,8 @@ # Set it to "YES" to enable nrpe2. # nrpe2_flags (str): Set to "" by default. # nrpe2_configfile (str): Set to "%%PREFIX%%/etc/nrpe.cfg" by default. +# nrpe2_pidfile (str): The location of the PID file. +# Defaults to %%NAGIOSDIR%%/nrpe2.pid. # . %%RC_SUBR%% @@ -23,7 +25,6 @@ rcvar=`set_rcvar` command="%%PREFIX%%/sbin/nrpe2" command_args="-d" extra_commands="reload" -pidfile="%%NAGIOSDIR%%/nrpe2.pid" sig_reload=HUP @@ -33,6 +34,7 @@ sig_reload=HUP load_rc_config "${name}" +pidfile="${nrpe2_pidfile:-%%NAGIOSDIR%%/nrpe2.pid}" required_files="${nrpe2_configfile}" command_args="${command_args} -c ${nrpe2_configfile}" -- 1.6.0.4 --- add-knob-nrpe2_pidfile.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: