diff options
| author | Robert Newson <rnewson@apache.org> | 2015-09-14 12:39:49 +0100 |
|---|---|---|
| committer | Robert Newson <rnewson@apache.org> | 2015-09-14 12:39:49 +0100 |
| commit | bdb8a0c19e95316912488b986de8d113690b0cd6 (patch) | |
| tree | bdc8dc3aec8fb5c2fd17db43bd7e48c076dde14d | |
| parent | ff19be1c1855fcdc5b9d6351c5c40c85a7977195 (diff) | |
| download | couchdb-bdb8a0c19e95316912488b986de8d113690b0cd6.tar.gz | |
configure the right http interface
| -rw-r--r-- | src/setup.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/setup.erl b/src/setup.erl index 211834928..40679561e 100644 --- a/src/setup.erl +++ b/src/setup.erl @@ -36,7 +36,7 @@ require_bind_address(_, _) -> is_cluster_enabled() -> % bind_address != 127.0.0.1 AND admins != empty - BindAddress = config:get("httpd", "bind_address"), + BindAddress = config:get("chttpd", "bind_address"), Admins = config:get("admins"), case {BindAddress, Admins} of {"127.0.0.1", _} -> no; @@ -115,7 +115,7 @@ enable_cluster_int(Options, no) -> }, % if bind_address == 127.0.0.1 and no bind_address in req -> error - CurrentBindAddress = config:get("httpd","bind_address"), + CurrentBindAddress = config:get("chttpd","bind_address"), NewBindAddress = proplists:get_value(bind_address, Options), ok = require_admins(CurrentAdmins, NewCredentials), ok = require_bind_address(CurrentBindAddress, NewBindAddress), @@ -129,9 +129,9 @@ enable_cluster_int(Options, no) -> case NewBindAddress of undefined -> - config:set("httpd", "bind_address", "0.0.0.0"); + config:set("chttpd", "bind_address", "0.0.0.0"); NewBindAddress -> - config:set("httpd", "bind_address", binary_to_list(NewBindAddress)) + config:set("chttpd", "bind_address", binary_to_list(NewBindAddress)) end, Port = proplists:get_value(port, Options), @@ -139,7 +139,7 @@ enable_cluster_int(Options, no) -> undefined -> ok; Port -> - config:set("httpd", "port", integer_to_list(Port)) + config:set("chttpd", "port", integer_to_list(Port)) end, couch_log:notice("Enable Cluster: ~p~n", [Options]). %cluster_state:set(enabled). |