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 2021/03/14 17:00:38 UTC
[couchdb] branch 3.x updated: Added override for
COUCHDB_FAUXTON_DOCROOT (#3335)
This is an automated email from the ASF dual-hosted git repository.
jan pushed a commit to branch 3.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git
The following commit(s) were added to refs/heads/3.x by this push:
new ae74720 Added override for COUCHDB_FAUXTON_DOCROOT (#3335)
ae74720 is described below
commit ae74720b30de1f514b4370f03af040d70196e483
Author: Simon Klassen <69...@users.noreply.github.com>
AuthorDate: Mon Mar 15 01:00:32 2021 +0800
Added override for COUCHDB_FAUXTON_DOCROOT (#3335)
* Added override for COUCHDB_FAUXTON_DOCROOT
---
rel/files/couchdb.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rel/files/couchdb.in b/rel/files/couchdb.in
index c6ee7c9..4e142b3 100755
--- a/rel/files/couchdb.in
+++ b/rel/files/couchdb.in
@@ -38,7 +38,7 @@ export PROGNAME=`echo $0 | sed 's/.*\///'`
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}}
+export COUCHDB_FAUXTON_DOCROOT="${COUCHDB_FAUXTON_DOCROOT:-{{fauxton_root}} }"
ARGS_FILE="${COUCHDB_ARGS_FILE:-$ROOTDIR/etc/vm.args}"
[ -n "${COUCHDB_INI_FILES:-}" ] && INI_ARGS="-couch_ini $COUCHDB_INI_FILES"