svn commit: r505424 - in branches/2019Q2/www: h2o h2o-devel h2o-devel/files h2o/files
Adam Weinberger
adamw at FreeBSD.org
Sun Jun 30 14:44:17 UTC 2019
Author: adamw
Date: Sun Jun 30 14:44:14 2019
New Revision: 505424
URL: https://svnweb.freebsd.org/changeset/ports/505424
Log:
MFH r502589:
www/h2o*: Remove nop CMAKE_VERBOSE
MFH r505423:
h2o{,-devel}: Improve rc.d/h2o, freshen h2o.conf
rc.d/h2o:
- Add a configtest target
- Fix a bug that could prevent the script from locating the PIDfile path
h2o.conf:
- Remove entries that are defaults
PR: 238888
Approved by: maintainer (dch)
Approved by: portmgr (with hat)
Modified:
branches/2019Q2/www/h2o-devel/Makefile
branches/2019Q2/www/h2o-devel/files/h2o.conf.sample.in
branches/2019Q2/www/h2o-devel/files/h2o.in
branches/2019Q2/www/h2o/Makefile
branches/2019Q2/www/h2o/files/h2o.conf.sample.in
branches/2019Q2/www/h2o/files/h2o.in
Directory Properties:
branches/2019Q2/ (props changed)
Modified: branches/2019Q2/www/h2o-devel/Makefile
==============================================================================
--- branches/2019Q2/www/h2o-devel/Makefile Sun Jun 30 14:41:17 2019 (r505423)
+++ branches/2019Q2/www/h2o-devel/Makefile Sun Jun 30 14:44:14 2019 (r505424)
@@ -4,7 +4,7 @@
PORTNAME= h2o
DISTVERSIONPREFIX= v
DISTVERSION= 2.3.0-beta1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
PKGNAMESUFFIX= -devel
@@ -54,7 +54,6 @@ OPTIONS_SUB= yes
MRUBY_DESC= Build with embedded mruby handler support
CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON -DWITH_BUNDLED_SSL=OFF
-CMAKE_VERBOSE= yes
MRUBY_CMAKE_BOOL= WITH_MRUBY
MRUBY_USES= bison
Modified: branches/2019Q2/www/h2o-devel/files/h2o.conf.sample.in
==============================================================================
--- branches/2019Q2/www/h2o-devel/files/h2o.conf.sample.in Sun Jun 30 14:41:17 2019 (r505423)
+++ branches/2019Q2/www/h2o-devel/files/h2o.conf.sample.in Sun Jun 30 14:44:14 2019 (r505424)
@@ -39,20 +39,13 @@ header.add: "Content-Security-Policy: default-src http
# 6 months HSTS pinning
header.add: "Strict-Transport-Security: max-age=16000000"
-# no patience for slow users
-http1-request-timeout: 10
-http2-idle-timeout: 10
# limit POST bodies
limit-request-body: 10485760 # 10MiB
-max-connections: 1024
file.mime.addtypes:
- image/svg+xml: .svg
text/plain: .log
text/css: .css
application/atom+xml: .xml
- application/zip: .zip
- application/json: .json
"text/html; charset=utf-8": .html
# per-host configurations
Modified: branches/2019Q2/www/h2o-devel/files/h2o.in
==============================================================================
--- branches/2019Q2/www/h2o-devel/files/h2o.in Sun Jun 30 14:41:17 2019 (r505423)
+++ branches/2019Q2/www/h2o-devel/files/h2o.in Sun Jun 30 14:44:14 2019 (r505424)
@@ -24,19 +24,23 @@ desc="An HTTP/2 high-performance webserver"
load_rc_config $name
+extra_commands="configtest reload"
+configtest_cmd="h2o_configtest"
+
# defaults
: ${h2o_enable:=NO}
: ${h2o_config:=%%PREFIX%%/etc/${name}/${name}.conf}
: ${h2o_perl:=%%LOCALBASE%%/bin/perl}
# daemon
-pidfile=`grep pid-file ${h2o_config} | cut -d' ' -f2`
+pidfile=`grep pid-file ${h2o_config} | awk '{print $2}'`
h2o_env="H2O_PERL=${h2o_perl}"
command="%%PREFIX%%/bin/${name}"
command_args="-m daemon -c ${h2o_config}"
procname="%%LOCALBASE%%/bin/perl"
-# support SIGHUP to reload configuration file
-extra_commands=reload
+h2o_configtest() {
+ "${command}" -c "${h2o_config}" -t
+}
run_rc_command "$1"
Modified: branches/2019Q2/www/h2o/Makefile
==============================================================================
--- branches/2019Q2/www/h2o/Makefile Sun Jun 30 14:41:17 2019 (r505423)
+++ branches/2019Q2/www/h2o/Makefile Sun Jun 30 14:44:14 2019 (r505424)
@@ -4,7 +4,7 @@
PORTNAME= h2o
DISTVERSIONPREFIX= v
DISTVERSION= 2.2.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MAINTAINER= dch at FreeBSD.org
@@ -54,7 +54,6 @@ OPTIONS_SUB= yes
MRUBY_DESC= Build with embedded mruby handler support
CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON -DWITH_BUNDLED_SSL=OFF
-CMAKE_VERBOSE= yes
MRUBY_CMAKE_BOOL= WITH_MRUBY
MRUBY_USES= bison
Modified: branches/2019Q2/www/h2o/files/h2o.conf.sample.in
==============================================================================
--- branches/2019Q2/www/h2o/files/h2o.conf.sample.in Sun Jun 30 14:41:17 2019 (r505423)
+++ branches/2019Q2/www/h2o/files/h2o.conf.sample.in Sun Jun 30 14:44:14 2019 (r505424)
@@ -39,20 +39,13 @@ header.add: "Content-Security-Policy: default-src http
# 6 months HSTS pinning
header.add: "Strict-Transport-Security: max-age=16000000"
-# no patience for slow users
-http1-request-timeout: 10
-http2-idle-timeout: 10
# limit POST bodies
limit-request-body: 10485760 # 10MiB
-max-connections: 1024
file.mime.addtypes:
- image/svg+xml: .svg
text/plain: .log
text/css: .css
application/atom+xml: .xml
- application/zip: .zip
- application/json: .json
"text/html; charset=utf-8": .html
# per-host configurations
Modified: branches/2019Q2/www/h2o/files/h2o.in
==============================================================================
--- branches/2019Q2/www/h2o/files/h2o.in Sun Jun 30 14:41:17 2019 (r505423)
+++ branches/2019Q2/www/h2o/files/h2o.in Sun Jun 30 14:44:14 2019 (r505424)
@@ -24,19 +24,23 @@ desc="An HTTP/2 high-performance webserver"
load_rc_config $name
+extra_commands="configtest reload"
+configtest_cmd="h2o_configtest"
+
# defaults
: ${h2o_enable:=NO}
: ${h2o_config:=%%PREFIX%%/etc/${name}/${name}.conf}
: ${h2o_perl:=%%LOCALBASE%%/bin/perl}
# daemon
-pidfile=`grep pid-file ${h2o_config} | cut -d' ' -f2`
+pidfile=`grep pid-file ${h2o_config} | awk '{print $2}'`
h2o_env="H2O_PERL=${h2o_perl}"
command="%%PREFIX%%/bin/${name}"
command_args="-m daemon -c ${h2o_config}"
procname="%%LOCALBASE%%/bin/perl"
-# support SIGHUP to reload configuration file
-extra_commands=reload
+h2o_configtest() {
+ "${command}" -c "${h2o_config}" -t
+}
run_rc_command "$1"
More information about the svn-ports-all
mailing list