[1/3] couchdb-setup git commit: configure the right http interface
Repository: couchdb-setup
Updated Branches:
refs/heads/wizard-admin.party 20ac682c0 -> f60e1d400 (forced update)
configure the right http interface
Project: http://git-wip-us.apache.org/repos/asf/couchdb-setup/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-setup/commit/bdb8a0c1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-setup/tree/bdb8a0c1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-setup/diff/bdb8a0c1
Branch: refs/heads/wizard-admin.party
Commit: bdb8a0c19e95316912488b986de8d113690b0cd6
Parents: ff19be1
Author: Robert Newson
Authored: Mon Sep 14 12:39:49 2015 +0100
Committer: Robert Newson
Committed: Mon Sep 14 12:39:49 2015 +0100
--
src/setup.erl | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/couchdb-setup/blob/bdb8a0c1/src/setup.erl
--
diff --git a/src/setup.erl b/src/setup.erl
index 2118349..4067956 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).
couchdb-setup git commit: configure the right http interface
Repository: couchdb-setup
Updated Branches:
refs/heads/master ff19be1c1 -> bdb8a0c19
configure the right http interface
Project: http://git-wip-us.apache.org/repos/asf/couchdb-setup/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-setup/commit/bdb8a0c1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-setup/tree/bdb8a0c1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-setup/diff/bdb8a0c1
Branch: refs/heads/master
Commit: bdb8a0c19e95316912488b986de8d113690b0cd6
Parents: ff19be1
Author: Robert Newson
Authored: Mon Sep 14 12:39:49 2015 +0100
Committer: Robert Newson
Committed: Mon Sep 14 12:39:49 2015 +0100
--
src/setup.erl | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/couchdb-setup/blob/bdb8a0c1/src/setup.erl
--
diff --git a/src/setup.erl b/src/setup.erl
index 2118349..4067956 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).
