git commit: updated refs/heads/1867-feature-plugins-jhs to ae61fbb

[jh...@apache.org]

Updated Branches:
  refs/heads/1867-feature-plugins-jhs [created] ae61fbb07


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/ae61fbb0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/ae61fbb0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/ae61fbb0

Branch: refs/heads/1867-feature-plugins-jhs
Commit: ae61fbb07cbc733514ba621c2041e0c3ab3ad413
Parents: 0ba9c5a
Author: Jason Smith (work) <ja...@gmail.com>
Authored: Sun Aug 18 11:48:14 2013 +0000
Committer: Jason Smith (work) <ja...@gmail.com>
Committed: Sun Aug 18 11:48:14 2013 +0000

----------------------------------------------------------------------
 bin/couchdb.tpl.in | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/ae61fbb0/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