From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 18 20:40:04 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E0EE216A4CE for ; Wed, 18 May 2005 20:40:04 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5186343D5C for ; Wed, 18 May 2005 20:40:04 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j4IKe3qi057403 for ; Wed, 18 May 2005 20:40:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j4IKe3xp057402; Wed, 18 May 2005 20:40:03 GMT (envelope-from gnats) Resent-Date: Wed, 18 May 2005 20:40:03 GMT Resent-Message-Id: <200505182040.j4IKe3xp057402@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Blaz Zupan Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8CB3216A4F0 for ; Wed, 18 May 2005 20:32:12 +0000 (GMT) Received: from titanic.medinet.si (titanic.medinet.si [212.18.42.5]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3704B43D99 for ; Wed, 18 May 2005 20:32:12 +0000 (GMT) (envelope-from blaz@titanic.medinet.si) Received: by titanic.medinet.si (Postfix, from userid 1000) id B732155475; Wed, 18 May 2005 22:32:08 +0200 (CEST) Message-Id: <20050518203208.B732155475@titanic.medinet.si> Date: Wed, 18 May 2005 22:32:08 +0200 (CEST) From: Blaz Zupan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/81220: MAINTAINER UPDATE: net-mgmt/nagios X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Blaz Zupan List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 May 2005 20:40:05 -0000 >Number: 81220 >Category: ports >Synopsis: MAINTAINER UPDATE: net-mgmt/nagios >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed May 18 20:40:03 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Blaz Zupan >Release: FreeBSD 4.10-RELEASE i386 >Organization: >Environment: System: FreeBSD titanic.medinet.si 4.10-RELEASE FreeBSD 4.10-RELEASE #1: Sun Jun 27 16:39:26 CEST 2004 root@bigbrother.amis.net:/usr/obj/usr/src/sys/TITANIC i386 >Description: Check validity of configurations files in the startup script. Submitted by: Artem Naluzhny >How-To-Repeat: >Fix: diff -urN nagios.old/Makefile nagios/Makefile --- nagios.old/Makefile Tue Apr 5 19:17:52 2005 +++ nagios/Makefile Wed May 18 22:27:53 2005 @@ -7,6 +7,7 @@ PORTNAME= nagios PORTVERSION= 2.0.b3 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=nagios diff -urN nagios.old/files/nagios.sh.tmpl nagios/files/nagios.sh.tmpl --- nagios.old/files/nagios.sh.tmpl Mon Feb 14 22:52:42 2005 +++ nagios/files/nagios.sh.tmpl Wed May 18 22:27:33 2005 @@ -34,14 +34,30 @@ start_precmd=start_precmd stop_postcmd=stop_postcmd +restart_precmd=nagios_checkconfig # set defaults nagios_enable=${nagios_enable:-"NO"} nagios_flags=${nagios_flags:-""} +nagios_checkconfig() +{ + echo -n 'Performing sanity check on Nagios configuration: ' + $NagiosBin -v $NagiosCfg > /dev/null 2>&1 + if [ $? != 0 ]; then + echo 'FAILED.' + echo "Use '$NagiosBin -v $NagiosCfg' command for details." + return 1 + else + echo 'OK.' + fi +} + start_precmd() { + nagios_checkconfig; [ $? != 0 ] && return 1 + su -m ${nagios_user} -c "touch ${NagiosVar}/nagios.log ${NagiosSav}" rm -f ${NagiosCmd} } >Release-Note: >Audit-Trail: >Unformatted: