diff options
| author | Dustin Sallings <dustin@spy.net> | 2011-05-08 19:57:56 -0700 |
|---|---|---|
| committer | Dave Cottlehuber <dch@apache.org> | 2012-11-19 12:08:29 +0100 |
| commit | 93227701717de80b369a0cbfc17edf99266e5f3d (patch) | |
| tree | 05cf614efddf6e18ffa0ba33fd34d2d66d0a714a | |
| parent | 5d4ef93048f4aca24bef00fb5b2c13c54c2bbbb3 (diff) | |
| download | couchdb-93227701717de80b369a0cbfc17edf99266e5f3d.tar.gz | |
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 <dustin@spy.net>
Reviewed-by: Steve Yen <steve.yen@gmail.com>
Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
| -rw-r--r-- | bin/couchdb.tpl.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in index eab27b5db..3d660e3f7 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 () { |