summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Smith (work) <jason.h.smith@gmail.com>2013-08-18 11:48:14 +0000
committerJan Lehnardt <jan@apache.org>2013-10-03 16:08:37 +0200
commitb53942628391c7b6341a244aa6ac2ec6aa076690 (patch)
tree405e58c23abfd815e50af8429b5bf5d6a80c1448
parent520abcd855f9f2c8f45a868dff33c7d2d3069ffd (diff)
downloadcouchdb-b53942628391c7b6341a244aa6ac2ec6aa076690.tar.gz
Allow plugins to provide config files (for their dependencies)
-rw-r--r--bin/couchdb.tpl.in7
1 files changed, 7 insertions, 0 deletions
diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in
index 36d4dfbb7..6ebacf458 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