Merge pull request #71 from cloudant/12726-custom-http-options

1 files changed, 11 insertions, 11 deletions

diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 55371083..fdd11e14 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -7,16 +7,21 @@ max_dbs_open = 500
 delayed_commits = false
 
 [cluster]
-q=8
-r=2
-w=2
-n=3
+; Default number of shards for a new database
+q = 8
+; Default number of copies of each shard
+n = 3
 
 [chttpd]
 port = {{cluster_port}}
-backlog = 512
 docroot = {{prefix}}/share/www
 
+; Options for the MochiWeb HTTP server.
+;server_options = [{backlog, 128}, {acceptor_pool_size, 16}]
+
+; For more socket options, consult Erlang's module 'inet' man page.
+;socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}]
+
 [chttps]
 port = {{cluster_ssl}}
 
@@ -41,16 +46,11 @@ ssl_certificate_max_depth = 1
 [httpd]
 port = {{backend_port}}
 bind_address = 127.0.0.1
-max_connections = 2048
 authentication_handlers = {couch_httpd_oauth, oauth_authentication_handler}, {couch_httpd_auth, cookie_authentication_handler}, {couch_httpd_auth, default_authentication_handler}
 default_handler = {couch_httpd_db, handle_request}
 secure_rewrites = true
 vhost_global_handlers = _utils, _uuids, _session, _oauth, _users
 allow_jsonp = false
-; Options for the MochiWeb HTTP server.
-;server_options = [{backlog, 128}, {acceptor_pool_size, 16}]
-; For more socket options, consult Erlang's module 'inet' man page.
-;socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}]
 log_max_chunk_size = 1000000
 
 [ssl]
@@ -73,7 +73,7 @@ javascript = {{prefix}}/bin/couchjs {{prefix}}/share/couchjs/main.js
 
 [query_server_config]
 reduce_limit = true
-os_process_limit = 25
+os_process_soft_limit = 100
 
 [daemons]
 view_manager={couch_view, start_link, []}