summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2020-02-19 21:55:55 +0100
committerJoan Touzet <wohali@users.noreply.github.com>2020-02-20 04:00:26 +0000
commitf892de13ace39c49770b2f0206777388721b4783 (patch)
tree89f8bfcd2b8cc36d1cc610d937da922fa94bc533
parentc86f0a6e3ff22a881cc5cfb10005b80c226f0970 (diff)
downloadcouchdb-f892de13ace39c49770b2f0206777388721b4783.tar.gz
Revert "fix: single node state (#2574)"
This reverts commit afef1b2f5823f6269ecb4a845e286e9d0c0f4f35.
-rw-r--r--src/setup/src/setup.erl12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/setup/src/setup.erl b/src/setup/src/setup.erl
index cc64ae438..3d23229b8 100644
--- a/src/setup/src/setup.erl
+++ b/src/setup/src/setup.erl
@@ -65,15 +65,13 @@ is_cluster_enabled() ->
end.
is_single_node_enabled(Dbs) ->
- % admins != empty AND dbs exist OR `[couchdb] single_node` is set to true
+ % admins != empty AND dbs exist
Admins = config:get("admins"),
HasDbs = has_cluster_system_dbs(Dbs),
- SingleNodeConfig = config:get_boolean("couchdb", "single_node", false),
- case {Admins, HasDbs, SingleNodeConfig} of
- {_, _, true} -> true;
- {[], _, _} -> false;
- {_, false, _} -> false;
- {_,_,_} -> true
+ case {Admins, HasDbs} of
+ {[], _} -> false;
+ {_, false} -> false;
+ {_,_} -> true
end.
cluster_system_dbs() ->