svn commit: r396629 - in head/www/h2o: . files
Grzegorz Blach
gblach at FreeBSD.org
Thu Sep 10 22:59:57 UTC 2015
Author: gblach
Date: Thu Sep 10 22:59:55 2015
New Revision: 396629
URL: https://svnweb.freebsd.org/changeset/ports/396629
Log:
- Fix rc.d script
- Bump PORTVERSION
PR: 202937
Submitted by: gblach
Approved by: Dave Cottlehuber (dch <at> skunkwerks <dot> at)
Modified:
head/www/h2o/Makefile
head/www/h2o/files/h2o.conf.sample
head/www/h2o/files/h2o.in
head/www/h2o/pkg-plist
Modified: head/www/h2o/Makefile
==============================================================================
--- head/www/h2o/Makefile Thu Sep 10 22:58:33 2015 (r396628)
+++ head/www/h2o/Makefile Thu Sep 10 22:59:55 2015 (r396629)
@@ -4,6 +4,7 @@
PORTNAME= h2o
PORTVERSION= 1.4.4
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= www
MAINTAINER= dch at skunkwerks.at
@@ -21,19 +22,16 @@ PORTDOCS= README.md
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
H2O_GROUP?= www
H2O_LOGDIR= /var/log/${PORTNAME}/
-H2O_PIDDIR= /var/run/${PORTNAME}/
USE_RC_SUBR= ${PORTNAME}
@@ -45,7 +43,6 @@ USE_OPENSSL_PORT= yes
post-install:
${MKDIR} ${STAGEDIR}${DOCSDIR} \
${STAGEDIR}${ETCDIR} \
- ${STAGEDIR}${H2O_PIDDIR} \
${STAGEDIR}${H2O_LOGDIR}
${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} \
Modified: head/www/h2o/files/h2o.conf.sample
==============================================================================
--- head/www/h2o/files/h2o.conf.sample Thu Sep 10 22:58:33 2015 (r396628)
+++ head/www/h2o/files/h2o.conf.sample Thu Sep 10 22:59:55 2015 (r396629)
@@ -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 @@ listen:
# 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:
Modified: head/www/h2o/files/h2o.in
==============================================================================
--- head/www/h2o/files/h2o.in Thu Sep 10 22:58:33 2015 (r396628)
+++ head/www/h2o/files/h2o.in Thu Sep 10 22:59:55 2015 (r396629)
@@ -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 @@ rcvar=h2o_enable
# 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"
-
-h2o_precmd()
-{
- # create empty pidfile with correct permissions
- install -o ${h2o_user} /dev/null ${h2o_pidfile}
-}
+pidfile=`grep pid-file ${h2o_config} | cut -d' ' -f2`
+command="%%PREFIX%%/bin/${name}"
+command_args="-m daemon -c ${h2o_config}"
+procname="perl"
load_rc_config $name
run_rc_command "$1"
Modified: head/www/h2o/pkg-plist
==============================================================================
--- head/www/h2o/pkg-plist Thu Sep 10 22:58:33 2015 (r396628)
+++ head/www/h2o/pkg-plist Thu Sep 10 22:59:55 2015 (r396629)
@@ -5,5 +5,4 @@ share/h2o/kill-on-close
share/h2o/start_server
%%DATADIR%%/setuidgid
@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
- at dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_PIDDIR%%
@sample %%ETCDIR%%/h2o.conf.sample
More information about the svn-ports-all
mailing list