cvs commit: ports/sysutils Makefile ports/sysutils/mcollective
Makefile distinfo pkg-descr pkg-plist
ports/sysutils/mcollective/files mcollectived.in
Doug Barton
dougb at FreeBSD.org
Sat Aug 13 22:03:19 UTC 2011
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 <raj at csub.edu>
>
> 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/
-------------- next part --------------
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"
More information about the cvs-all
mailing list