[15/27] git commit: Allow a final config override to be specified via environment.

[ja...@apache.org]

Allow a final config override to be specified via environment.

This lets the OS X startup define this user's config which will be
used for editing and what-not.

Forward port from 1.2.0

Change-Id: I03ebce57030457e25c9c8cb60a679547a0cd84bf
Reviewed-on: http://review.membase.org/6380
Tested-by: Dustin Sallings <du...@spy.net>
Reviewed-by: Steve Yen <st...@gmail.com>
Reviewed-by: Filipe David Borba Manana <fd...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/93227701
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/93227701
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/93227701

Branch: refs/heads/1597-update-erlang-oauth-1-3-0
Commit: 93227701717de80b369a0cbfc17edf99266e5f3d
Parents: 5d4ef93
Author: Dustin Sallings <du...@spy.net>
Authored: Sun May 8 19:57:56 2011 -0700
Committer: Dave Cottlehuber <dc...@apache.org>
Committed: Mon Nov 19 12:08:29 2012 +0100

----------------------------------------------------------------------
 bin/couchdb.tpl.in |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/93227701/bin/couchdb.tpl.in
----------------------------------------------------------------------
diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in
index eab27b5..3d660e3 100644
--- a/bin/couchdb.tpl.in
+++ b/bin/couchdb.tpl.in
@@ -146,6 +146,10 @@ _load_config () {
     _add_config_dir "$DEFAULT_CONFIG_DIR"
     _add_config_file "$LOCAL_CONFIG_FILE"
     _add_config_dir "$LOCAL_CONFIG_DIR"
+    if [ "$COUCHDB_ADDITIONAL_CONFIG_FILE" != '' ]
+    then
+        _add_config_file "$COUCHDB_ADDITIONAL_CONFIG_FILE"
+    fi
 }
 
 _reset_config () {