From owner-svn-ports-all@freebsd.org Sun Jun 30 14:44:17 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 05FD715D7A98; Sun, 30 Jun 2019 14:44:17 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6D10888BE7; Sun, 30 Jun 2019 14:44:16 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 46FCE26F21; Sun, 30 Jun 2019 14:44:16 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5UEiGxr031510; Sun, 30 Jun 2019 14:44:16 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5UEiED8031502; Sun, 30 Jun 2019 14:44:14 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201906301444.x5UEiED8031502@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Sun, 30 Jun 2019 14:44:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r505424 - in branches/2019Q2/www: h2o h2o-devel h2o-devel/files h2o/files X-SVN-Group: ports-branches X-SVN-Commit-Author: adamw X-SVN-Commit-Paths: in branches/2019Q2/www: h2o h2o-devel h2o-devel/files h2o/files X-SVN-Commit-Revision: 505424 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6D10888BE7 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.969,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jun 2019 14:44:17 -0000 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@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"