Attachment 160784 Details for Bug 202937 – Fix for rc.d script

[patch] Fix for rc.d script

h2o.diff (text/plain), 2.98 KB, created by Grzegorz Blach on 2015-09-06 20:42:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Grzegorz Blach

Created: 2015-09-06 20:42:07 UTC

Size: 2.98 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 396229)
>+++ Makefile	(working copy)
>@@ -4,6 +4,7 @@
> PORTNAME=	h2o
> PORTVERSION=	1.4.4
> DISTVERSIONPREFIX=	v
>+PORTREVISION=	1
> CATEGORIES=	www
> 
> MAINTAINER=	dch@skunkwerks.at
>@@ -21,12 +22,10 @@
> SUB_FILES=	${PORTNAME}
> SUB_LIST+=	H2O_USER=${H2O_USER} \
> 		H2O_GROUP=${H2O_GROUP} \
>-		H2O_PIDDIR=${H2O_PIDDIR} \
> 		H2O_LOGDIR=${H2O_LOGDIR}
> 
> PLIST_SUB=	H2O_USER=${H2O_USER} \
> 		H2O_GROUP=${H2O_GROUP} \
>-		H2O_PIDDIR=${H2O_PIDDIR} \
> 		H2O_LOGDIR=${H2O_LOGDIR}
> 
> H2O_USER?=	www
>@@ -33,7 +32,6 @@
> H2O_GROUP?=	www
> 
> H2O_LOGDIR=	/var/log/${PORTNAME}/
>-H2O_PIDDIR=	/var/run/${PORTNAME}/
> 
> USE_RC_SUBR=	${PORTNAME}
> 
>@@ -45,7 +43,6 @@
> post-install:
> 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
> 		${STAGEDIR}${ETCDIR} \
>-		${STAGEDIR}${H2O_PIDDIR} \
> 		${STAGEDIR}${H2O_LOGDIR}
> 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} \
>Index: files/h2o.conf.sample
>===================================================================
>--- files/h2o.conf.sample	(revision 396227)
>+++ files/h2o.conf.sample	(working copy)
>@@ -1,5 +1,9 @@
> # vi: ft=yaml
> # to find out the configuration commands, run: h2o --help
>+user: www
>+pid-file: /var/run/h2o.pid
>+access-log: /var/log/h2o/h2o-access.log
>+error-log: /var/log/h2o/h2o-error.log
> listen: 80
> listen:
>     port: 443
>@@ -8,7 +12,6 @@
>         # generate your own certificates
>         certificate-file: /usr/local/etc/h2o/server.crt
>         key-file: /usr/local/etc/h2o/server.key
>-access-log: /var/log/h2o/h2o.log
> file.dirlisting: on
> # per-host configuration
> hosts:
>Index: files/h2o.in
>===================================================================
>--- files/h2o.in	(revision 396227)
>+++ files/h2o.in	(working copy)
>@@ -14,7 +14,6 @@
> # Set it to YES to enable h2o.
> #
> # h2o_config    (string): Optional full path for h2o config file
>-# h2o_user      (user):   Set to h2o by default.
> 
> . /etc/rc.subr
> 
>@@ -23,22 +22,13 @@
> 
> # defaults
> : ${h2o_enable:="NO"}
>-: ${h2o_user:="%%H2O_USER%%"}
> : ${h2o_config:="%%PREFIX%%/etc/${name}/${name}.conf"}
>-: ${h2o_options:=" --conf ${h2o_config}"}
> 
> # daemon
>-h2o_pidfile="%%H2O_PIDDIR%%${name}.pid"
>-procname="%%PREFIX%%/bin/${name}"
>-command=/usr/sbin/daemon
>-command_args=" -f -c -p ${h2o_pidfile} ${procname} ${h2o_options}"
>-start_precmd="h2o_precmd"
>+pidfile=`grep pid-file ${h2o_config} | cut -d' ' -f2`
>+command="%%PREFIX%%/bin/${name}"
>+command_args="-m daemon -c ${h2o_config}"
>+procname="perl"
> 
>-h2o_precmd()
>-{
>-	# create empty pidfile with correct permissions
>-	install -o ${h2o_user} /dev/null ${h2o_pidfile}
>-}
>-
> load_rc_config $name
> run_rc_command "$1"
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 396227)
>+++ pkg-plist	(working copy)
>@@ -5,5 +5,4 @@
> share/h2o/start_server
> %%DATADIR%%/setuidgid
> @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
>-@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_PIDDIR%%
> @sample %%ETCDIR%%/h2o.conf.sample

Flags:

gblach: maintainer-approval? (dch)

Actions: View | Diff

Attachments on bug 202937: 160784