svn commit: r473020 - in head/devel/fossil: . files

[Pietro Cerutti]

Author: gahr
Date: Fri Jun 22 08:06:05 2018
New Revision: 473020
URL: https://svnweb.freebsd.org/changeset/ports/473020

Log:
  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 at clogic.com.ua>

Modified:
  head/devel/fossil/Makefile
  head/devel/fossil/files/fossil.in

Modified: head/devel/fossil/Makefile
==============================================================================
--- head/devel/fossil/Makefile	Fri Jun 22 08:04:38 2018	(r473019)
+++ head/devel/fossil/Makefile	Fri Jun 22 08:06:05 2018	(r473020)
@@ -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/

Modified: head/devel/fossil/files/fossil.in
==============================================================================
--- head/devel/fossil/files/fossil.in	Fri Jun 22 08:04:38 2018	(r473019)
+++ head/devel/fossil/files/fossil.in	Fri Jun 22 08:06:05 2018	(r473020)
@@ -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}"