From owner-cvs-ports@FreeBSD.ORG Sat Aug 13 22:03:19 2011 Return-Path: Delivered-To: cvs-ports@FreeBSD.org Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35]) by hub.freebsd.org (Postfix) with ESMTP id 69F891065672; Sat, 13 Aug 2011 22:03:19 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from 172-17-198-245.globalsuite.net (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id D0FC315061F; Sat, 13 Aug 2011 22:03:18 +0000 (UTC) Message-ID: <4E46F4A7.8030300@FreeBSD.org> Date: Sat, 13 Aug 2011 15:03:19 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:5.0) Gecko/20110811 Thunderbird/5.0 MIME-Version: 1.0 To: Steve Wills References: <201108131428.p7DESYAh016813@repoman.freebsd.org> In-Reply-To: <201108131428.p7DESYAh016813@repoman.freebsd.org> X-Enigmail-Version: 1.2.1 OpenPGP: id=1A1ABC84 Content-Type: multipart/mixed; boundary="------------040406090609070702090704" Cc: Russell Jackson , cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/sysutils Makefile ports/sysutils/mcollective Makefile distinfo pkg-descr pkg-plist ports/sysutils/mcollective/files mcollectived.in X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Aug 2011 22:03:19 -0000 This is a multi-part message in MIME format. --------------040406090609070702090704 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Before I forget, please don't obfuscate e-mail addresses in commit messages. It does absolutely nothing to slow down the spammers, however it does slow people down when they need to copy the e-mail address and paste it into an actual e-mail. This rc.d script has a lot of problems, and should not have been committed as is, if for no other reason than it needs %%PREFIX%% instead of /usr/local in command=. I've attached a patch that addresses the following issues. It would also be helpful to visit http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/rc-scripts.html to familiarize yourself with the basic requirements. 1. Add a $FreeBSD$ 2. Unless there is a good reason, ports rc.d scripts should REQUIRE: LOGIN. 3. Add the comments suggested in the web page above. 4. Move load_rc_config up to what will soon become the standard location. 5. s#/usr/local#%%PREFIX%%# 6. Since the -p option is almost certainly mandatory here, use command_args instead of _flags. hth, Doug On 08/13/2011 07:28, Steve Wills wrote: > swills 2011-08-13 14:28:34 UTC > > FreeBSD ports repository > > Modified files: > sysutils Makefile > Added files: > sysutils/mcollective Makefile distinfo pkg-descr pkg-plist > sysutils/mcollective/files mcollectived.in > Log: > The Marionette Collective > A modern scalable datacenter orchestration framework > > WWW: http://marionette-collective.org/ > > PR: ports/159673 http://www.FreeBSD.org/cgi/query-pr.cgi?pr=159673 > Submitted by: Russell Jackson > > Revision Changes Path > 1.1314 +1 -0 ports/sysutils/Makefile > 1.1 +64 -0 ports/sysutils/mcollective/Makefile (new) > 1.1 +2 -0 ports/sysutils/mcollective/distinfo (new) > 1.1 +21 -0 ports/sysutils/mcollective/files/mcollectived.in (new) > 1.1 +4 -0 ports/sysutils/mcollective/pkg-descr (new) > 1.1 +473 -0 ports/sysutils/mcollective/pkg-plist (new) > > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/sysutils/Makefile.diff?&r1=1.1313&r2=1.1314&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/sysutils/mcollective/Makefile > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/sysutils/mcollective/distinfo > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/sysutils/mcollective/files/mcollectived.in > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/sysutils/mcollective/pkg-descr > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/sysutils/mcollective/pkg-plist > -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ --------------040406090609070702090704 Content-Type: text/plain; name="mcoll.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="mcoll.diff" Index: mcollectived.in =================================================================== RCS file: /home/pcvs/ports/sysutils/mcollective/files/mcollectived.in,v retrieving revision 1.1 diff -u -r1.1 mcollectived.in --- mcollectived.in 13 Aug 2011 14:28:34 -0000 1.1 +++ mcollectived.in 13 Aug 2011 21:57:52 -0000 @@ -1,21 +1,30 @@ #!/bin/sh +# $FreeBSD$ +# # PROVIDE: mcollectived -# REQUIRE: DAEMON +# REQUIRE: LOGIN # KEYWORD: shutdown +# +# Add the following lines to /etc/rc.conf.local or /etc/rc.conf +# to enable this service: +# +# mcollectived_enable (bool): Set to NO by default. +# Set it to YES to enable mcollectived. +# mcollectived_flags (str): Set as needed. Empty by default. . /etc/rc.subr name="mcollectived" rcvar="${name}_enable" -command="/usr/local/sbin/${name}" -pidfile="/var/run/${name}.pid" -procname="ruby" - load_rc_config "${name}" : ${mcollectived_enable="NO"} -: ${mcollectived_flags="-p ${pidfile}"} + +pidfile="/var/run/${name}.pid" +command="%%PREFIX%%/sbin/${name}" +command_args="-p $pidfile" +procname="ruby" run_rc_command "$1" --------------040406090609070702090704--