diff options
| author | gahr <gahr@FreeBSD.org> | 2018-06-22 16:06:05 +0800 |
|---|---|---|
| committer | gahr <gahr@FreeBSD.org> | 2018-06-22 16:06:05 +0800 |
| commit | 3c1c7cc1cca055c14fa4eb70ec6421feb45ede9d (patch) | |
| tree | 4069272d0d2c8bfd6b355d65e53a7c5adcce0897 /devel | |
| parent | fc465b9d787fd3a4c468d1a152f851f13c602bbc (diff) | |
| download | freebsd-ports-gnome-3c1c7cc1cca055c14fa4eb70ec6421feb45ede9d.tar.gz freebsd-ports-gnome-3c1c7cc1cca055c14fa4eb70ec6421feb45ede9d.tar.zst freebsd-ports-gnome-3c1c7cc1cca055c14fa4eb70ec6421feb45ede9d.zip | |
devel/fossil: add fossil_https rc.conf setting
When the rc.conf fossil_https is set to a non-empty string, the --https
parameter is added to the fossil serve command line to force HTTPS
communication.
PR: 229200
Submitted by: Oleh Hushchenkov <gor@clogic.com.ua>
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/fossil/Makefile | 2 | ||||
| -rw-r--r-- | devel/fossil/files/fossil.in | 21 |
2 files changed, 14 insertions, 9 deletions
diff --git a/devel/fossil/Makefile b/devel/fossil/Makefile index 09de32f99e1a..c1339fd1f9f4 100644 --- a/devel/fossil/Makefile +++ b/devel/fossil/Makefile @@ -2,8 +2,8 @@ PORTNAME= fossil PORTVERSION= 2.6 -PORTREVISION= 0 DISTVERSIONPREFIX= src- +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= devel www MASTER_SITES= http://fossil-scm.org/index.html/uv/ diff --git a/devel/fossil/files/fossil.in b/devel/fossil/files/fossil.in index 8615f65ba2f6..d6396d21960d 100644 --- a/devel/fossil/files/fossil.in +++ b/devel/fossil/files/fossil.in @@ -18,6 +18,7 @@ # fossil_baseurl="" # fossil_proto="http" # fossil_listenall="" +# fossil_https="" # force the HTTPS CGI parameter to "on" # fossil_files="" # comma separated globing patterns of files to serve # fossil_notfound="" # URI to redirect to in case of 404 # Use fossil_user to run fossil as user @@ -42,20 +43,24 @@ fossil_proto=${fossil_proto:-"http"} fossil_directory=${fossil_directory:-"/nonexistent"} case "${fossil_proto}" in -http);; -scgi) fossil_args="--scgi" ;; -*) +http) + # http is the default + ;; +scgi) + fossil_args="--scgi" + ;; +*) echo "unsupported protocol: ${fossil_proto}, only scgi and http are supported" >&2 - exit 1 ;; esac -[ -n "${fossil_baseurl}" ] && fossil_args="${fossil_args} --baseurl ${fossil_baseurl}" +[ -n "${fossil_baseurl}" ] && fossil_args="${fossil_args} --baseurl ${fossil_baseurl}" [ -z "${fossil_listenall}" ] && fossil_args="${fossil_args} --localhost" -[ -n "${fossil_files}" ] && fossil_args="${fossil_args} --files '${fossil_files}'" -[ -n "${fossil_notfound}" ] && fossil_args="${fossil_args} --notfound \"${fossil_notfound}\"" -[ -n "${fossil_repolist}" ] && fossil_args="${fossil_args} --repolist" +[ -n "${fossil_https}" ] && fossil_args="${fossil_args} --https" +[ -n "${fossil_files}" ] && fossil_args="${fossil_args} --files '${fossil_files}'" +[ -n "${fossil_notfound}" ] && fossil_args="${fossil_args} --notfound \"${fossil_notfound}\"" +[ -n "${fossil_repolist}" ] && fossil_args="${fossil_args} --repolist" command_args="-f -p ${pidfile} ${procname} server -P ${fossil_port} ${fossil_args} ${fossil_directory}" |