Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 May 2020 07:23:42 +0000 (UTC)
From:      Dave Cottlehuber <dch@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r535721 - in head/net/fiche: . files
Message-ID:  <202005180723.04I7NgHC087307@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dch
Date: Mon May 18 07:23:42 2020
New Revision: 535721
URL: https://svnweb.freebsd.org/changeset/ports/535721

Log:
  net/fiche: enable passing options such as runtime user to daemon
  
  - daemon(8) mistakenly consumes the usual prepended rc.subr fiche_flags
  - wrap command_args for line length
  
  Approved by:	zi
  Sponsored by:	SkunkWerks, GmbH
  Differential Revision:	https://reviews.freebsd.org/D23438

Modified:
  head/net/fiche/Makefile
  head/net/fiche/files/fiche.in
  head/net/fiche/pkg-descr

Modified: head/net/fiche/Makefile
==============================================================================
--- head/net/fiche/Makefile	Mon May 18 07:19:22 2020	(r535720)
+++ head/net/fiche/Makefile	Mon May 18 07:23:42 2020	(r535721)
@@ -3,7 +3,7 @@
 
 PORTNAME=	fiche
 PORTVERSION=	0.9.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 
 MAINTAINER=	zi@FreeBSD.org

Modified: head/net/fiche/files/fiche.in
==============================================================================
--- head/net/fiche/files/fiche.in	Mon May 18 07:19:22 2020	(r535720)
+++ head/net/fiche/files/fiche.in	Mon May 18 07:23:42 2020	(r535721)
@@ -13,6 +13,7 @@
 # fiche_enable (bool):	Set to "NO" by default.
 #				Set it to "YES" to enable fiche.
 # fiche_domain (str):	Default "localhost"
+# fiche_options (str):	Additional flags Default ""
 # fiche_output (str):	Default "/usr/local/www/fiche"
 # fiche_logfile (str):	Default "/var/log/fiche/fiche.log"
 
@@ -25,6 +26,7 @@ load_rc_config $name
 
 : ${fiche_enable="NO"}
 : ${fiche_pidfile="/var/run/${name}.pid"}
+: ${fiche_options=""}
 : ${fiche_output="%%WWWDIR%%"}
 : ${fiche_domain="localhost"}
 : ${fiche_logfile="/var/log/${name}/${name}.log"}
@@ -34,7 +36,11 @@ pidfile="${fiche_pidfile}"
 procname="%%PREFIX%%/sbin/fiche"
 
 command="/usr/sbin/daemon"
-command_args="-fp ${pidfile} %%PREFIX%%/sbin/fiche -o ${fiche_output} -d ${fiche_domain} -l ${fiche_logfile}"
+command_args="-fp ${pidfile} %%PREFIX%%/sbin/fiche \
+    -o ${fiche_output} \
+    -d ${fiche_domain} \
+    -l ${fiche_logfile} \
+    ${fiche_options}"
 
 fiche_prestart() {
 	install -d -o 477 -g 477 -m 755 /var/log/${name}

Modified: head/net/fiche/pkg-descr
==============================================================================
--- head/net/fiche/pkg-descr	Mon May 18 07:19:22 2020	(r535720)
+++ head/net/fiche/pkg-descr	Mon May 18 07:23:42 2020	(r535721)
@@ -3,4 +3,4 @@ Command line pastebin for sharing terminal output.
 Note: fiche requires a separate web-server to serve the pastebin
 content.
 
-WWW: http://termbin.com/
+WWW: https://github.com/solusipse/fiche



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005180723.04I7NgHC087307>