Permalink
Browse files

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>
  • Loading branch information...
1 parent 5d4ef93 commit 93227701717de80b369a0cbfc17edf99266e5f3d @dustin dustin committed with dch May 9, 2011
Showing with 4 additions and 0 deletions.
  1. +4 −0 bin/couchdb.tpl.in
View
@@ -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 () {

0 comments on commit 9322770

Please sign in to comment.