summaryrefslogtreecommitdiff
path: root/etc/couchdb
diff options
context:
space:
mode:
authorFilipe David Borba Manana <fdmanana@apache.org>2010-12-07 20:37:56 +0000
committerFilipe David Borba Manana <fdmanana@apache.org>2010-12-07 20:37:56 +0000
commit83c42e18687f227f95a7b262d4a307cfb973baac (patch)
tree58a5e1e4cd8de09bffb702bd0c5e36a61c0c9cf0 /etc/couchdb
parentd3e93e9f7dfdbfcf6eb52688bf9ddeeba53194ea (diff)
Merged revision 1023274 from trunk:
Replicator: fix issues when a peer is accessible via SSL. Closes COUCHDB-491. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@1043193 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'etc/couchdb')
-rw-r--r--etc/couchdb/default.ini.tpl.in8
1 files changed, 7 insertions, 1 deletions
diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in
index 6b70777e..bb7ccec6 100644
--- a/etc/couchdb/default.ini.tpl.in
+++ b/etc/couchdb/default.ini.tpl.in
@@ -121,4 +121,10 @@ compressible_types = text/*, application/javascript, application/json, applicat
[replicator]
max_http_sessions = 10
-max_http_pipeline_size = 10 \ No newline at end of file
+max_http_pipeline_size = 10
+; set to true to validate peer certificates
+verify_ssl_certificates = false
+; file containing a list of peer trusted certificates (PEM format)
+; 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