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)
MFH:		2019Q2
This commit is contained in:
Adam Weinberger 2019-06-30 14:41:17 +00:00
parent f0c25dfb4d
commit b66098f32b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=505423
6 changed files with 16 additions and 22 deletions

View file

@ -4,7 +4,7 @@
PORTNAME= h2o
DISTVERSIONPREFIX= v
DISTVERSION= 2.3.0-beta1
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= www
PKGNAMESUFFIX= -devel

View file

@ -39,20 +39,13 @@ header.add: "Content-Security-Policy: default-src https:"
# 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

View file

@ -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"

View file

@ -4,7 +4,7 @@
PORTNAME= h2o
DISTVERSIONPREFIX= v
DISTVERSION= 2.2.5
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= www
MAINTAINER= dch@FreeBSD.org

View file

@ -39,20 +39,13 @@ header.add: "Content-Security-Policy: default-src https:"
# 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

View file

@ -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"