From owner-svn-ports-all@freebsd.org Tue Jan 8 02:11:54 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 C4DF5148AE52; Tue, 8 Jan 2019 02:11:54 +0000 (UTC) (envelope-from jhixson@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 672FF8FAED; Tue, 8 Jan 2019 02:11:54 +0000 (UTC) (envelope-from jhixson@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 5A4FA20FC5; Tue, 8 Jan 2019 02:11:54 +0000 (UTC) (envelope-from jhixson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x082Bsi3024786; Tue, 8 Jan 2019 02:11:54 GMT (envelope-from jhixson@FreeBSD.org) Received: (from jhixson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x082Br9L024784; Tue, 8 Jan 2019 02:11:53 GMT (envelope-from jhixson@FreeBSD.org) Message-Id: <201901080211.x082Br9L024784@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhixson set sender to jhixson@FreeBSD.org using -f From: John Hixson Date: Tue, 8 Jan 2019 02:11:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489638 - in head/sysutils/ipfs-go: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jhixson X-SVN-Commit-Paths: in head/sysutils/ipfs-go: . files X-SVN-Commit-Revision: 489638 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 672FF8FAED X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.998,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: Tue, 08 Jan 2019 02:11:55 -0000 Author: jhixson Date: Tue Jan 8 02:11:53 2019 New Revision: 489638 URL: https://svnweb.freebsd.org/changeset/ports/489638 Log: sysutils/ipfs-go: allow IPFS_PATH to be set PR: 234673 Submitted by: david@bolcsfoldi.com Reviewed by: araujo (mentor) Approved by: araujo (mentor) Modified: head/sysutils/ipfs-go/Makefile head/sysutils/ipfs-go/files/ipfs-go.in Modified: head/sysutils/ipfs-go/Makefile ============================================================================== --- head/sysutils/ipfs-go/Makefile Tue Jan 8 01:41:08 2019 (r489637) +++ head/sysutils/ipfs-go/Makefile Tue Jan 8 02:11:53 2019 (r489638) @@ -3,6 +3,7 @@ PORTNAME= ipfs DISTVERSIONPREFIX= v DISTVERSION= 0.4.18 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://github.com/ipfs/go-ipfs/releases/download/v${DISTVERSION}/ PKGNAMESUFFIX= -go Modified: head/sysutils/ipfs-go/files/ipfs-go.in ============================================================================== --- head/sysutils/ipfs-go/files/ipfs-go.in Tue Jan 8 01:41:08 2019 (r489637) +++ head/sysutils/ipfs-go/files/ipfs-go.in Tue Jan 8 02:11:53 2019 (r489638) @@ -17,7 +17,10 @@ # Default: %%IPFS_USER%% # ipfs_go_group (str): ipfs_go daemon group # Default: %%IPFS_GROUP%% +# ipfs_go_path (str): ipfs_go ipfs repo path +# Default: %%IPFS_HOME%% + . /etc/rc.subr name=ipfs_go @@ -27,6 +30,7 @@ load_rc_config $name : ${ipfs_go_enable:="NO"} : ${ipfs_go_user:="%%IPFS_USER%%"} : ${ipfs_go_group:="%%IPFS_GROUP%%"} +: ${ipfs_go_path:="%%IPFS_HOME%%"} logfile="%%IPFS_LOGDIR%%/${name}.log" pidfile="/var/run/${name}.pid" @@ -36,13 +40,14 @@ start_cmd="ipfs_go_start" ipfs_go_prestart() { install -d -o ${ipfs_go_user} -g ${ipfs_go_group} -m750 %%IPFS_LOGDIR%% - [ -d ~%%IPFS_USER%%/.ipfs ] || /usr/bin/su - ${ipfs_go_user} -c "${command} init" + [ -d ${ipfs_go_path} ] || /usr/bin/su - ${ipfs_go_user} -c "env IPFS_PATH=${ipfs_go_path} ${command} init" } ipfs_go_start() { echo running ${command} daemon export USER=${ipfs_go_user} export HOME=$(echo ~%%IPFS_USER%%) + export IPFS_PATH=${ipfs_go_path} /usr/sbin/daemon -p ${pidfile} -u ${ipfs_go_user} ${command} daemon >> ${logfile} 2>&1 }