Update default.ini with all changes since 2.0

1 files changed, 20 insertions, 2 deletions

diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index eaa0801b7..c6f4b9953 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -8,7 +8,6 @@ database_dir = {{data_dir}}
 view_index_dir = {{view_index_dir}}
 ; util_driver_dir =
 ; plugin_dir =
-max_document_size = 67108864 ; 64 MB
 os_process_timeout = 5000 ; 5 seconds. for view and external servers.
 max_dbs_open = 500
 delayed_commits = false
@@ -39,6 +38,11 @@ default_security = admin_local
 ; influenced directly with this setting - increase for faster processing at the
 ; expense of more memory usage.
 changes_doc_ids_optimization_threshold = 100
+; Maximum document ID length. Can be set to an integer or 'infinity'.
+;max_document_id_length = infinity
+; Single documents that exceed this value in a bulk request will receive a
+; too_large error. The max_http_request_size still takes precedence.
+;single_max_doc_size = 1048576
 
 [cluster]
 q=8
@@ -97,6 +101,8 @@ enable_xframe_options = false
 ; x_forwarded_host = X-Forwarded-Host
 ; x_forwarded_proto = X-Forwarded-Proto
 ; x_forwarded_ssl = X-Forwarded-Ssl
+; Maximum allowed http request size. Applies to both clustered and local port.
+max_http_request_size = 67108864 ; 64 MB
 
 ; [httpd_design_handlers]
 ; _view = 
@@ -134,7 +140,7 @@ port = 6984
 
 ; [global_changes]
 ; max_event_delay = 25
-; max_write_delay = 25
+; max_write_delay = 500
 ; update_db = true
 
 ; [view_updater]
@@ -213,6 +219,9 @@ reduce_limit = true
 os_process_limit = 100
 ; os_process_idle_limit = 300
 ; os_process_soft_limit = 100
+; Timeout for how long a response from a busy view group server can take.
+; "infinity" is also a valid configuration value.
+;group_info_timeout = 5000
 
 [daemons]
 index_server={couch_index_server, start_link, []}
@@ -226,6 +235,13 @@ os_daemons={couch_os_daemons, start_link, []}
 compaction_daemon={couch_compaction_daemon, start_link, []}
 couch_peruser={couch_peruser, start_link, []}
 
+[mango]
+; Set to true to disable the "index all fields" text index, which can lead
+; to out of memory issues when users have documents with nested array fields.
+;index_all_disabled = false
+; Default limit value for mango _find queries.
+;default_limit = 25
+
 [indexers]
 couch_mrview = true
 
@@ -357,6 +373,8 @@ verify_ssl_certificates = false
 ;ssl_trusted_certificates_file = /etc/ssl/certs/ca-certificates.crt
 ; Maximum peer certificate depth (must be set even if certificate validation is off).
 ssl_certificate_max_depth = 3
+; Maximum document ID length for replication.
+;max_document_id_length = 0
 
 [compaction_daemon]
 ; The delay, in seconds, between each check for which database and view indexes