From owner-svn-ports-head@freebsd.org Mon May 16 06:44:14 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 69841B3D94A; Mon, 16 May 2016 06:44:14 +0000 (UTC) (envelope-from pi@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 mx1.freebsd.org (Postfix) with ESMTPS id 208CC175B; Mon, 16 May 2016 06:44:14 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4G6iDDX066781; Mon, 16 May 2016 06:44:13 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4G6iDXk066779; Mon, 16 May 2016 06:44:13 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201605160644.u4G6iDXk066779@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Mon, 16 May 2016 06:44:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415311 - in head/databases: mongodb/files mongodb32/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 May 2016 06:44:14 -0000 Author: pi Date: Mon May 16 06:44:13 2016 New Revision: 415311 URL: https://svnweb.freebsd.org/changeset/ports/415311 Log: databases/mongodb{32}: allows to change the config location from rc.conf PR: 198212 Submitted by: Daniel Ylitalo Approved by: ale (maintainer timeout) Modified: head/databases/mongodb/files/mongod.in head/databases/mongodb32/files/mongod.in Modified: head/databases/mongodb/files/mongod.in ============================================================================== --- head/databases/mongodb/files/mongod.in Mon May 16 06:34:32 2016 (r415310) +++ head/databases/mongodb/files/mongod.in Mon May 16 06:44:13 2016 (r415311) @@ -16,6 +16,8 @@ # Base database directory. # mongod_flags (str): Custom additional arguments to be passed to mongod. # Default to "--logpath ${mongod_dbpath}/mongod.log --logappend". +# mongod_config (str): Default to "%%PREFIX%%/etc/mongodb.conf" +# Path to config file # . /etc/rc.subr @@ -31,10 +33,11 @@ load_rc_config $name : ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend"} : ${mongod_user="mongodb"} : ${mongod_group="mongodb"} +: ${mongod_config="%%PREFIX%%/etc/mongodb.conf"} pidfile="${mongod_dbpath}/mongod.lock" command=%%PREFIX%%/bin/${name} -command_args="--config %%PREFIX%%/etc/mongodb.conf --dbpath $mongod_dbpath --fork >/dev/null 2>/dev/null" +command_args="--config $mongod_config --dbpath $mongod_dbpath --fork >/dev/null 2>/dev/null" start_precmd="${name}_prestart" mongod_create_dbpath() Modified: head/databases/mongodb32/files/mongod.in ============================================================================== --- head/databases/mongodb32/files/mongod.in Mon May 16 06:34:32 2016 (r415310) +++ head/databases/mongodb32/files/mongod.in Mon May 16 06:44:13 2016 (r415311) @@ -16,6 +16,8 @@ # Base database directory. # mongod_flags (str): Custom additional arguments to be passed to mongod. # Default to "--logpath ${mongod_dbpath}/mongod.log --logappend". +# mongod_config (str): Default to "%%PREFIX%%/etc/mongodb.conf" +# Path to config file # . /etc/rc.subr @@ -31,10 +33,11 @@ load_rc_config $name : ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend"} : ${mongod_user="mongodb"} : ${mongod_group="mongodb"} +: ${mongod_config="%%PREFIX%%/etc/mongodb.conf"} pidfile="${mongod_dbpath}/mongod.lock" command=%%PREFIX%%/bin/${name} -command_args="--config %%PREFIX%%/etc/mongodb.conf --dbpath $mongod_dbpath --fork >/dev/null 2>/dev/null" +command_args="--config $mongod_config --dbpath $mongod_dbpath --fork >/dev/null 2>/dev/null" start_precmd="${name}_prestart" mongod_create_dbpath()