You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2020/01/04 13:04:36 UTC
[couchdb] 01/01: fix(#2143): allow env var overrides for js query
server config
This is an automated email from the ASF dual-hosted git repository.
jan pushed a commit to branch fix/2143/override-query-server-config
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit bf7c10a7d2cbe5113c66779549a9d5de4c9f0d46
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Sat Jan 4 14:04:13 2020 +0100
fix(#2143): allow env var overrides for js query server config
---
rel/files/couchdb.cmd.in | 5 +++--
rel/files/couchdb.in | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/rel/files/couchdb.cmd.in b/rel/files/couchdb.cmd.in
index 0e9c340..4abb6cd 100644
--- a/rel/files/couchdb.cmd.in
+++ b/rel/files/couchdb.cmd.in
@@ -25,8 +25,9 @@ set EMU=beam
set PROGNAME=%~n0
set PATH=%PATH%;%COUCHDB_BIN_DIR%
-set COUCHDB_QUERY_SERVER_JAVASCRIPT="{{prefix}}/bin/couchjs {{prefix}}/share/server/main.js"
-set COUCHDB_QUERY_SERVER_COFFEESCRIPT="{{prefix}}/bin/couchjs {{prefix}}/share/server/main-coffee.js"
+IF NOT DEFINED COUCHDB_QUERY_SERVER_JAVASCRIPT SET COUCHDB_QUERY_SERVER_JAVASCRIPT="{{prefix}}/bin/couchjs {{prefix}}/share/server/main.js"
+IF NOT DEFINED COUCHDB_QUERY_SERVER_COFFEESCRIPT SET COUCHDB_QUERY_SERVER_COFFEESCRIPT="{{prefix}}/bin/couchjs {{prefix}}/share/server/main-coffee.js"
+
REM set COUCHDB_FAUXTON_DOCROOT="{{fauxton_root}}"
"%BINDIR%\erl" -boot "%ROOTDIR%\releases\%APP_VSN%\couchdb" ^
diff --git a/rel/files/couchdb.in b/rel/files/couchdb.in
index b3c7e98..f67c4d9 100755
--- a/rel/files/couchdb.in
+++ b/rel/files/couchdb.in
@@ -26,8 +26,8 @@ export BINDIR="$ROOTDIR/erts-$ERTS_VSN/bin"
export EMU=beam
export PROGNAME=`echo $0 | sed 's/.*\///'`
-export COUCHDB_QUERY_SERVER_JAVASCRIPT="{{prefix}}/bin/couchjs {{prefix}}/share/server/main.js"
-export COUCHDB_QUERY_SERVER_COFFEESCRIPT="{{prefix}}/bin/couchjs {{prefix}}/share/server/main-coffee.js"
+export COUCHDB_QUERY_SERVER_JAVASCRIPT=${COUCHDB_QUERY_SERVER_JAVASCRIPT:-{{prefix}}/bin/couchjs {{prefix}}/share/server/main.js"
+export COUCHDB_QUERY_SERVER_COFFEESCRIPT=${COUCHDB_QUERY_SERVER_COFFEESCRIPT:-{{prefix}}/bin/couchjs {{prefix}}/share/server/main-coffee.js"
export COUCHDB_FAUXTON_DOCROOT={{fauxton_root}}
ARGS_FILE="${COUCHDB_ARGS_FILE:-$ROOTDIR/etc/vm.args}"