Date: Tue, 24 Feb 2015 14:56:22 +0000 (UTC) From: Jimmy Olgeni <olgeni@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379802 - in head/databases/couchdb: . files Message-ID: <201502241456.t1OEuM3D054750@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olgeni Date: Tue Feb 24 14:56:22 2015 New Revision: 379802 URL: https://svnweb.freebsd.org/changeset/ports/379802 QAT: https://qat.redports.org/buildarchive/r379802/ Log: Allow passing ERL_ZFLAGS to CouchDB via couchdb_erl_flags in rc.conf. ERL_ZFLAGS is used to configure the Erlang VM itself (see also erl(1), "EMULATOR FLAGS") PR: 197847 Submitted by: Dave Cottlehuber Modified: head/databases/couchdb/Makefile head/databases/couchdb/files/couchdb.in Modified: head/databases/couchdb/Makefile ============================================================================== --- head/databases/couchdb/Makefile Tue Feb 24 14:40:58 2015 (r379801) +++ head/databases/couchdb/Makefile Tue Feb 24 14:56:22 2015 (r379802) @@ -3,7 +3,7 @@ PORTNAME= couchdb PORTVERSION= 1.6.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_APACHE} Modified: head/databases/couchdb/files/couchdb.in ============================================================================== --- head/databases/couchdb/files/couchdb.in Tue Feb 24 14:40:58 2015 (r379801) +++ head/databases/couchdb/files/couchdb.in Tue Feb 24 14:56:22 2015 (r379802) @@ -19,6 +19,9 @@ # # couchdb_respawn (int): Set to none by default. If CouchDB crashes, # respawn after this many seconds. +# +# couchdb_erl_flags (string): Set to none by default. Additional Erlang flags +# that are appended via ERL_ZFLAGS to the Erlang VM parameters. . /etc/rc.subr @@ -27,11 +30,12 @@ rcvar=couchdb_enable load_rc_config $name -: ${couchdb_enable="NO"} +: ${couchdb_enable:="NO"} couchdb_user="${couchdb_user:-"couchdb"}" couchdb_enablelogs="${couchdb_enablelogs:-"YES"}" couchdb_etcdir="${couchdb_etcdir:-"%%PREFIX%%/etc/couchdb"}" couchdb_respawn="${couchdb_respawn:-"0"}" +couchdb_erl_flags="${couchdb_erl_flags:-""}" command="%%PREFIX%%/bin/${name}" pidfile="/var/run/${name}/${name}.pid" @@ -63,6 +67,11 @@ couchdb_prestart() errfile=/dev/null fi + # couchdb supports passing options through to the erlang vm directly in + # ERL_ZFLAGS which is appended to CouchDB own flags. + ERL_ZFLAGS=${couchdb_erl_flags} + export ERL_ZFLAGS + command_args="-a ${couchdb_etcdir}/default.ini -a ${couchdb_etcdir}/local.ini ${respawn} -o ${logfile} -e ${errfile} ${command_args}" }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502241456.t1OEuM3D054750>