Skip to content

Commit

Permalink
Fix SSL defaults
Browse files Browse the repository at this point in the history
Three properties had their defaults changed to a value that
couch_util:parse_terms throws up on.

"nil" was changed to undefined in COUCHDB-2561 as part of normalising
the config API. The change from list to atom was a mistake.

COUCHDB-3162
  • Loading branch information
rnewson committed Sep 27, 2016
1 parent ff59604 commit f1d0c5d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/chttpd.erl
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ start_link(http) ->

start_link(https) ->
Port = config:get("ssl", "port", "6984"),
{ok, Ciphers} = couch_util:parse_term(config:get("ssl", "ciphers", undefined)),
{ok, Versions} = couch_util:parse_term(config:get("ssl", "tls_versions", undefined)),
{ok, SecureRenegotiate} = couch_util:parse_term(config:get("ssl", "secure_renegotiate", undefined)),
{ok, Ciphers} = couch_util:parse_term(config:get("ssl", "ciphers", "undefined")),
{ok, Versions} = couch_util:parse_term(config:get("ssl", "tls_versions", "undefined")),
{ok, SecureRenegotiate} = couch_util:parse_term(config:get("ssl", "secure_renegotiate", "undefined")),
ServerOpts0 =
[{cacertfile, config:get("ssl", "cacert_file", undefined)},
{keyfile, config:get("ssl", "key_file", undefined)},
Expand Down

0 comments on commit f1d0c5d

Please sign in to comment.