summaryrefslogtreecommitdiff
path: root/src/setup/src/setup.erl
diff options
context:
space:
mode:
Diffstat (limited to 'src/setup/src/setup.erl')
-rw-r--r--src/setup/src/setup.erl7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/setup/src/setup.erl b/src/setup/src/setup.erl
index 3d23229b8..5129765da 100644
--- a/src/setup/src/setup.erl
+++ b/src/setup/src/setup.erl
@@ -165,7 +165,7 @@ enable_cluster_int(Options, false) ->
couch_log:debug("Enable Cluster: ~p~n", [Options]).
set_admin(Username, Password) ->
- config:set("admins", binary_to_list(Username), binary_to_list(Password)).
+ config:set("admins", binary_to_list(Username), binary_to_list(Password), #{sensitive => true}).
setup_node(NewCredentials, NewBindAddress, NodeCount, Port) ->
case NewCredentials of
@@ -198,6 +198,9 @@ setup_node(NewCredentials, NewBindAddress, NodeCount, Port) ->
finish_cluster(Options) ->
+ % ensure that uuid is set
+ couch_server:get_uuid(),
+
ok = wait_connected(),
ok = sync_admins(),
ok = sync_uuid(),
@@ -262,7 +265,7 @@ sync_config(Section, Key, Value) ->
ok ->
ok;
error ->
- log:error("~p sync_admin results ~p errors ~p",
+ couch_log:error("~p sync_admin results ~p errors ~p",
[?MODULE, Results, Errors]),
Reason = "Cluster setup unable to sync admin passwords",
throw({setup_error, Reason})