[47/50] git commit: updated refs/heads/1894-feature-experimental-nodejs-couchjs to 532100c

[ja...@apache.org]

move config to local.ini


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/ea6fe188
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/ea6fe188
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/ea6fe188

Branch: refs/heads/1894-feature-experimental-nodejs-couchjs
Commit: ea6fe1886172562ad1d42d625c410bdaf9d14947
Parents: ccf9309
Author: Jan Lehnardt <ja...@apache.org>
Authored: Tue Sep 24 17:01:12 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Thu Oct 3 17:21:30 2013 +0200

----------------------------------------------------------------------
 etc/couchdb/default.ini.tpl.in | 1 -
 etc/couchdb/local.ini          | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/ea6fe188/etc/couchdb/default.ini.tpl.in
----------------------------------------------------------------------
diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in
index 981bbb1..3267001 100644
--- a/etc/couchdb/default.ini.tpl.in
+++ b/etc/couchdb/default.ini.tpl.in
@@ -123,7 +123,6 @@ use_users_db = false
 [query_servers]
 javascript = %bindir%/%couchjs_command_name% %localbuilddatadir%/server/main.js
 coffeescript = %bindir%/%couchjs_command_name% %localbuilddatadir%/server/main-coffee.js
-nodejs = /usr/local/bin/couchjs-node %localbuilddatadir%/server/main.js
 
 
 ; Changing reduce_limit to false will disable reduce_limit.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/ea6fe188/etc/couchdb/local.ini
----------------------------------------------------------------------
diff --git a/etc/couchdb/local.ini b/etc/couchdb/local.ini
index a5db26f..8aae331 100644
--- a/etc/couchdb/local.ini
+++ b/etc/couchdb/local.ini
@@ -25,6 +25,10 @@
 ; 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
+
+
 [httpd_global_handlers]
 ;_google = {couch_httpd_proxy, handle_proxy_req, <<"http://www.google.com">>}