Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 86063109D4 for ; Thu, 3 Oct 2013 14:13:33 +0000 (UTC) Received: (qmail 30201 invoked by uid 500); 3 Oct 2013 14:13:27 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 29635 invoked by uid 500); 3 Oct 2013 14:13:26 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 28523 invoked by uid 99); 3 Oct 2013 14:13:19 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Oct 2013 14:13:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 36D3C90E75F; Thu, 3 Oct 2013 14:13:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jan@apache.org To: commits@couchdb.apache.org Date: Thu, 03 Oct 2013 14:13:49 -0000 Message-Id: <29079942fd74441d927634829603b617@git.apache.org> In-Reply-To: <9351b938e1204588abbb8b05c490028f@git.apache.org> References: <9351b938e1204588abbb8b05c490028f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [36/42] git commit: updated refs/heads/master to a4d6cd4 Allow plugins to provide config files (for their dependencies) Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b5394262 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b5394262 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b5394262 Branch: refs/heads/master Commit: b53942628391c7b6341a244aa6ac2ec6aa076690 Parents: 520abcd Author: Jason Smith (work) Authored: Sun Aug 18 11:48:14 2013 +0000 Committer: Jan Lehnardt Committed: Thu Oct 3 16:08:37 2013 +0200 ---------------------------------------------------------------------- bin/couchdb.tpl.in | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/b5394262/bin/couchdb.tpl.in ---------------------------------------------------------------------- diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in index 36d4dfb..6ebacf4 100644 --- a/bin/couchdb.tpl.in +++ b/bin/couchdb.tpl.in @@ -142,6 +142,12 @@ _add_config_dir () { done } +_add_erlang_config () { + if [ -r "$1" ]; then + ERL_START_OPTIONS="$ERL_START_OPTIONS -config '$1'" + fi +} + _load_config () { _add_config_file "$DEFAULT_CONFIG_FILE" _add_config_dir "$DEFAULT_CONFIG_DIR" @@ -233,6 +239,7 @@ _find_plugins () { ERL_ZFLAGS="$ERL_ZFLAGS -pz '$plugin/ebin'" fi _add_config_dir "$plugin/priv/default.d" + _add_erlang_config "$plugin/priv/couch_plugin.config" fi done export ERL_ZFLAGS