Date: Tue, 27 Mar 2012 11:18:59 -0700 From: Jason Helfman <jgh@FreeBSD.org> To: Muhammad Moinur Rahman <5u623l20@gmail.com> Cc: rc@freebsd.org, bug-followup@freebsd.org Subject: Re: [PATCH] www/resin3: reorganize rc script Message-ID: <20120327181859.GD82277@dormouse.experts-exchange.com> In-Reply-To: <CA%2BnPUkw4TqXna6sWofRwnoo5dBaPHO2TAnjJWcapdeC_h3RbLQ@mail.gmail.com> References: <1332869146.439481.86668.nullmailer@experts-exchange.com> <CA%2BnPUkw4TqXna6sWofRwnoo5dBaPHO2TAnjJWcapdeC_h3RbLQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--2oS5YaxWCcQjTEyO
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Disposition: inline
On Wed, Mar 28, 2012 at 12:10:58AM +0600, Muhammad Moinur Rahman thus spake:
>Hi Jason,
>
>Good to see you again. :D
Good to see you too :)
>
>As far as I remember we got rid off the users problem running the
>application with www user and group. In that case don't you think we can
>get rid off the following variables from the rc file :
>
>+%%APP_NAME%%_user=${%%APP_NAME%%_user:-"%%USERS%%"}
>+%%APP_NAME%%_group=${%%APP_NAME%%_group:-"%%GROUPS%%"}
>
>Let me know your opinion please.
>
>Regards,
>Muhammad
We didn't get rid of the USERS/GROUPS usage, though. We are using both
of these, but using the www user and www group.
Since it isn't configurable now, though, you have a a point, so it should at
least be non-configurable in the rc script.
Included is an updated patch.
-jgh
--
Jason Helfman | FreeBSD Committer
jgh@FreeBSD.org | http://people.freebsd.org/~jgh
--2oS5YaxWCcQjTEyO
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="newpatch.txt"
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/resin3/Makefile,v
retrieving revision 1.46
diff -u -r1.46 Makefile
--- Makefile 14 Mar 2012 18:09:37 -0000 1.46
+++ Makefile 27 Mar 2012 18:17:47 -0000
@@ -7,6 +7,7 @@
PORTNAME= resin
PORTVERSION= 3.1.12
+PORTREVISION= 1
CATEGORIES= www java
MASTER_SITES= http://www.caucho.com/download/
@@ -44,7 +45,7 @@
# Other settings
APXS?= ${LOCALBASE}/sbin/apxs
SUB_FILES= pkg-message resin3ctl
-USE_RC_SUBR= resin3.sh
+USE_RC_SUBR= resin3
.include <bsd.port.pre.mk>
Index: files/resin3.in
===================================================================
RCS file: files/resin3.in
diff -N files/resin3.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/resin3.in 27 Mar 2012 18:17:47 -0000
@@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/www/resin3/files/resin3.sh.in,v 1.1 2012/03/13 16:29:23 jgh Exp $
+#
+
+# PROVIDE: %%APP_NAME%%
+# REQUIRE: LOGIN NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: shutdown
+
+#
+# Add the following line to /etc/rc.conf to enable %%APP_NAME%%:
+#
+# %%APP_NAME%%_enable="YES"
+#
+
+
+%%APP_NAME%%_enable=${%%APP_NAME%%_enable:-"NO"}
+%%APP_NAME%%_user=${%%APP_NAME%%_user:"www"}
+%%APP_NAME%%_group=${%%APP_NAME%%_group:"www"}
+
+. /etc/rc.subr
+
+name=%%APP_NAME%%
+rcvar=%%APP_NAME%%_enable
+
+load_rc_config ${name}
+
+command="%%PREFIX%%/sbin/%%APP_NAME%%ctl"
+command_args="start"
+pidfile=%%PID_FILE%%
+
+if test -n "${%%APP_NAME%%_java_version}" ; then
+ JAVA_HOME=$(JAVA_VERSION="${%%APP_NAME%%_java_version}" JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVA_HOME | cut -d= -f2)
+ procname=$(JAVA_VERSION="${%%APP_NAME%%_java_version}" JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVAVM_PROG | cut -d= -f2)
+else
+ JAVA_HOME=$(JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVA_HOME | cut -d= -f2)
+ procname=$(JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVAVM_PROG | cut -d= -f2)
+fi
+
+export JAVA_HOME
+
+run_rc_command "$1"
Index: files/resin3.sh.in
===================================================================
RCS file: files/resin3.sh.in
diff -N files/resin3.sh.in
--- files/resin3.sh.in 13 Mar 2012 16:29:23 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/www/resin3/files/resin3.sh.in,v 1.1 2012/03/13 16:29:23 jgh Exp $
-#
-
-# PROVIDE: %%APP_NAME%%
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable %%APP_NAME%%:
-#
-# %%APP_NAME%%_enable="YES"
-#
-
-. /etc/rc.subr
-
-name=%%APP_NAME%%
-rcvar=%%APP_NAME%%_enable
-
-command="%%PREFIX%%/sbin/%%APP_NAME%%ctl"
-command_args="start"
-pidfile=%%PID_FILE%%
-
-# set defaults
-
-%%APP_NAME%%_enable=${%%APP_NAME%%_enable:-"NO"}
-%%APP_NAME%%_user=${%%APP_NAME%%_user:-"%%USERS%%"}
-%%APP_NAME%%_group=${%%APP_NAME%%_group:-"%%GROUPS%%"}
-
-load_rc_config ${name}
-
-if test -n "${%%APP_NAME%%_java_version}" ; then
- JAVA_HOME=$(JAVA_VERSION="${%%APP_NAME%%_java_version}" JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVA_HOME | cut -d= -f2)
- procname=$(JAVA_VERSION="${%%APP_NAME%%_java_version}" JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVAVM_PROG | cut -d= -f2)
-else
- JAVA_HOME=$(JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVA_HOME | cut -d= -f2)
- procname=$(JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVAVM_PROG | cut -d= -f2)
-fi
-
-export JAVA_HOME
-
-run_rc_command "$1"
--2oS5YaxWCcQjTEyO--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120327181859.GD82277>