From owner-svn-ports-head@FreeBSD.ORG Wed Sep 12 21:04:43 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 01E7A1065686 for ; Wed, 12 Sep 2012 21:04:43 +0000 (UTC) (envelope-from dougb@dougbarton.us) Received: from mail2.fluidhosting.com (mx22.fluidhosting.com [204.14.89.5]) by mx1.freebsd.org (Postfix) with ESMTP id 75E618FC0C for ; Wed, 12 Sep 2012 21:04:41 +0000 (UTC) Received: (qmail 26571 invoked by uid 399); 12 Sep 2012 21:04:30 -0000 Received: from pluto.wwt.com (HELO ?172.29.3.77?) (dougb@dougbarton.us@198.200.139.3) by mail2.fluidhosting.com with ESMTPAM; 12 Sep 2012 21:04:30 -0000 X-Originating-IP: 198.200.139.3 X-Sender: dougb@dougbarton.us Message-ID: <5050F8E5.2070507@dougbarton.us> Date: Wed, 12 Sep 2012 11:04:37 -1000 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:15.0) Gecko/20120907 Thunderbird/15.0.1 MIME-Version: 1.0 To: Chris Rees References: <201209122057.q8CKvSP8046722@svn.freebsd.org> In-Reply-To: <201209122057.q8CKvSP8046722@svn.freebsd.org> X-Enigmail-Version: 1.4.4 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r304163 - in head/net-mgmt/nrpe2: . files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2012 21:04:43 -0000 The pidfile stuff is awesome, thanks! I feel so happy and proud ... *sniff* :) Doug On 9/12/2012 10:57 AM, Chris Rees wrote: > Author: crees > Date: Wed Sep 12 20:57:27 2012 > New Revision: 304163 > URL: http://svn.freebsd.org/changeset/ports/304163 > > Log: > Improve rc script handling of pidfile, and do a few optimisations > > PR: ports/168225 http://www.FreeBSD.org/cgi/query-pr.cgi?pr=168225 > Submitted by: yar (based on) > > While here, copy over default config file on install > > Modified: > head/net-mgmt/nrpe2/Makefile > head/net-mgmt/nrpe2/files/nrpe2.in > head/net-mgmt/nrpe2/pkg-plist > > Modified: head/net-mgmt/nrpe2/Makefile > ============================================================================== > --- head/net-mgmt/nrpe2/Makefile Wed Sep 12 20:39:39 2012 (r304162) > +++ head/net-mgmt/nrpe2/Makefile Wed Sep 12 20:57:27 2012 (r304163) > @@ -74,7 +74,7 @@ CONFIGURE_ARGS+= --disable-command-args > .endif > > post-patch: > - @${REINPLACE_CMD} -e 's#/var/run/nrpe.pid#@localstatedir@/nrpe2.pid#g' \ > + @${REINPLACE_CMD} -e 's#/var/run/nrpe.pid#/var/run/nrpe2/nrpe2.pid#g' \ > -e 's#/usr/lib/nagios/plugins/#${LOCALBASE}/libexec/nagios/#g' \ > -e 's#/usr/bin/sudo#${LOCALBASE}/bin/sudo#g' \ > ${WRKSRC}/sample-config/nrpe.cfg.in > @@ -90,6 +90,8 @@ do-install: > > post-install: > @${SH} ${PKGINSTALL} ${DISTNAME} POST-INSTALL > + @[ -f ${PREFIX}/etc/nrpe.cfg ] || \ > + ${CP} -p ${PREFIX}/etc/nrpe.cfg-sample ${PREFIX}/etc/nrpe.cfg > @${CAT} ${PKGMESSAGE} > > .include > > Modified: head/net-mgmt/nrpe2/files/nrpe2.in > ============================================================================== > --- head/net-mgmt/nrpe2/files/nrpe2.in Wed Sep 12 20:39:39 2012 (r304162) > +++ head/net-mgmt/nrpe2/files/nrpe2.in Wed Sep 12 20:57:27 2012 (r304163) > @@ -21,20 +21,18 @@ > name="nrpe2" > rcvar=nrpe2_enable > > +: ${nrpe2_enable=NO} > +: ${nrpe2_configfile=%%PREFIX%%/etc/nrpe.cfg} > +pidfile=${nrpe2_pidfile:-/var/run/nrpe2/nrpe2.pid} > + > command="%%PREFIX%%/sbin/nrpe2" > command_args="-d" > extra_commands="reload" > - > +start_precmd="install -d -o ${nrpe_user:-nagios} ${pidfile%/*}" > sig_reload=HUP > > -[ -z "${nrpe2_enable}" ] && nrpe2_enable="NO" > -[ -z "${nrpe2_configfile}" ] && nrpe2_configfile="%%PREFIX%%/etc/nrpe.cfg" > -[ -z "${nrpe2_pidfile}" ] && nrpe2_pidfile="%%NAGIOSDIR%%/nrpe2.pid" > - > load_rc_config "${name}" > > -pidfile="${nrpe2_pidfile}" > - > required_files="${nrpe2_configfile}" > command_args="${command_args} -c ${nrpe2_configfile}" > > > Modified: head/net-mgmt/nrpe2/pkg-plist > ============================================================================== > --- head/net-mgmt/nrpe2/pkg-plist Wed Sep 12 20:39:39 2012 (r304162) > +++ head/net-mgmt/nrpe2/pkg-plist Wed Sep 12 20:57:27 2012 (r304163) > @@ -1,4 +1,6 @@ > +@unexec cmp -s %D/etc/nrpe.cfg-sample %D/etc/nrpe.cfg && rm %D/etc/nrpe.cfg || true > etc/nrpe.cfg-sample > +@exec test -f %B/nrpe.cfg || cp -p %D/%F %B/nrpe.cfg > libexec/nagios/check_nrpe2 > @dirrmtry libexec/nagios > sbin/nrpe2 >