You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2019/12/09 17:57:00 UTC
[couchdb] branch 2-small-fixes created (now 5eb6ea5)
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a change to branch 2-small-fixes
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
at 5eb6ea5 Remove invalid query server def in local.ini
This branch includes the following new commits:
new 4c0bc6e Add COUCHDB_FAUXTON_DOCROOT comment to couchdb.cmd
new 5eb6ea5 Remove invalid query server def in local.ini
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[couchdb] 02/02: Remove invalid query server def in local.ini
Posted by wo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch 2-small-fixes
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 5eb6ea5cd8cfa42fdf934bed9302fbdab8d0deb3
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Mon Dec 9 12:54:37 2019 -0500
Remove invalid query server def in local.ini
---
rel/overlay/etc/local.ini | 3 ---
1 file changed, 3 deletions(-)
diff --git a/rel/overlay/etc/local.ini b/rel/overlay/etc/local.ini
index ac51b7b..5ccc826 100644
--- a/rel/overlay/etc/local.ini
+++ b/rel/overlay/etc/local.ini
@@ -44,9 +44,6 @@ enable = true ; for the test suites
; the whitelist.
;config_whitelist = [{httpd,config_whitelist}, {log,level}, {etc,etc}]
-[query_servers]
-;nodejs = /usr/local/bin/couchjs-node /path/to/couchdb/share/server/main.js
-
[couch_httpd_auth]
; If you set this to true, you should also uncomment the WWW-Authenticate line
; above. If you don't configure a WWW-Authenticate header, CouchDB will send
[couchdb] 01/02: Add COUCHDB_FAUXTON_DOCROOT comment to couchdb.cmd
Posted by wo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch 2-small-fixes
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 4c0bc6e1385636414e8bcbbfb41ecddebd08bb80
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Mon Dec 9 12:18:13 2019 -0500
Add COUCHDB_FAUXTON_DOCROOT comment to couchdb.cmd
---
rel/files/couchdb.cmd.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/rel/files/couchdb.cmd.in b/rel/files/couchdb.cmd.in
index 9438872..0e9c340 100644
--- a/rel/files/couchdb.cmd.in
+++ b/rel/files/couchdb.cmd.in
@@ -27,6 +27,7 @@ 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"
+REM set COUCHDB_FAUXTON_DOCROOT="{{fauxton_root}}"
"%BINDIR%\erl" -boot "%ROOTDIR%\releases\%APP_VSN%\couchdb" ^
-args_file "%ROOTDIR%\etc\vm.args" ^