summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Newson <robert.newson@cloudant.com>2011-09-13 06:14:58 +0200
committerRobert Newson <robert.newson@cloudant.com>2011-09-27 09:04:34 +0100
commitd73a628f540ed1033693c3a50250e71930184a1d (patch)
tree0898202385af827b636387d6b5e2fd9b051f8789
parente9cc7d004d946d261f8fbee8884e7f3cab4a1f44 (diff)
set cluster_ssl correctly, and tidy chttps section.
-rw-r--r--rel/overlay/etc/default.ini16
1 files changed, 12 insertions, 4 deletions
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index c143ac2d..cb032152 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -18,16 +18,22 @@ backlog = 512
docroot = {{prefix}}/share/www
[chttps]
-;cert_file = /full/path/to/server_cert.pem
-;key_file = /full/path/to/server_key.pem
-;password = somepassword
+port = {{cluster_ssl}}
+
+; cert_file = /full/path/to/server_cert.pem
+; key_file = /full/path/to/server_key.pem
+; password = somepassword
+; also remember to enable the chttps daemon in [daemons] section.
+
; set to true to validate peer certificates
verify_ssl_certificates = false
+
; Path to file containing PEM encoded CA certificates (trusted
; certificates used for verifying a peer certificate). May be omitted if
; you do not want to verify the peer.
;cacert_file = /full/path/to/cacertf
-; The verification fun (optionnal) if not specidied, the default
+
+; The verification fun (optional) if not specified, the default
; verification fun will be used.
;verify_fun = {Module, VerifyFun}
ssl_certificate_max_depth = 1
@@ -80,6 +86,8 @@ auth_cache={couch_auth_cache, start_link, []}
replication_manager={couch_replication_manager, start_link, []}
vhosts={couch_httpd_vhost, start_link, []}
os_daemons={couch_os_daemons, start_link, []}
+; Uncomment next line to enable SSL daemon
+; chttpsd = {chttpd, start_link, [https]}
[httpd_global_handlers]
/ = {couch_httpd_misc_handlers, handle_welcome_req, <<"Welcome">>}