From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Mar 15 20:30:08 2010 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 82E431065679 for ; Mon, 15 Mar 2010 20:30:08 +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 483378FC18 for ; Mon, 15 Mar 2010 20:30:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o2FKU709009768 for ; Mon, 15 Mar 2010 20:30:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o2FKU7h3009767; Mon, 15 Mar 2010 20:30:07 GMT (envelope-from gnats) Resent-Date: Mon, 15 Mar 2010 20:30:07 GMT Resent-Message-Id: <201003152030.o2FKU7h3009767@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, Martin Pala Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5E9461065672 for ; Mon, 15 Mar 2010 20:26:46 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 4EA518FC0C for ; Mon, 15 Mar 2010 20:26:46 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o2FKQjlJ067801 for ; Mon, 15 Mar 2010 20:26:45 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o2FKQjV5067800; Mon, 15 Mar 2010 20:26:45 GMT (envelope-from nobody) Message-Id: <201003152026.o2FKQjV5067800@www.freebsd.org> Date: Mon, 15 Mar 2010 20:26:45 GMT From: Martin Pala To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/144772: [maintainer update] sysutils/monit (monit_flags support) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2010 20:30:08 -0000 >Number: 144772 >Category: ports >Synopsis: [maintainer update] sysutils/monit (monit_flags support) >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: Mon Mar 15 20:30:07 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Martin Pala >Release: >Organization: >Environment: >Description: >How-To-Repeat: >Fix: diff -ruN monit/files/monit.sh.in monit-new/files/monit.sh.in --- monit/files/monit.sh.in 2005-10-11 04:50:45.000000000 +0200 +++ monit-new/files/monit.sh.in 2010-03-15 21:17:59.000000000 +0100 @@ -12,6 +12,8 @@ # Add the following lines to /etc/rc.conf to enable monit: # monit_enable (bool): Set to "NO" by default. # Set it to "YES" to enable monit +# monit_flags (str): Flags passed to monit on startup. +# Default is "". # . %%RC_SUBR%% @@ -21,16 +23,17 @@ restart_precmd="monit_checkconfig" reload_precmd="monit_checkconfig" +[ -z "$monit_enable" ] && monit_enable="NO" +[ -z "$monit_flags" ] && monit_flags="" + +load_rc_config $name + default_config=%%PREFIX%%/etc/monitrc required_files=${default_config} command="%%PREFIX%%/bin/monit" command_args="-c ${default_config}" pidfile="/var/run/monit.pid" -[ -z "$monit_enable" ] && monit_enable="NO" - -load_rc_config $name - monit_checkconfig() { echo "Performing sanity check on monit configuration:" >Release-Note: >Audit-Trail: >Unformatted: