From 5e5d029f556332eb118836a0651984bf7af1f044 Mon Sep 17 00:00:00 2001 From: Jan Lehnardt Date: Wed, 19 Feb 2020 16:59:11 +0100 Subject: fix: single node state --- src/setup/src/setup.erl | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/setup/src/setup.erl b/src/setup/src/setup.erl index 3d23229b8..cc64ae438 100644 --- a/src/setup/src/setup.erl +++ b/src/setup/src/setup.erl @@ -65,13 +65,15 @@ is_cluster_enabled() -> end. is_single_node_enabled(Dbs) -> - % admins != empty AND dbs exist + % admins != empty AND dbs exist OR `[couchdb] single_node` is set to true Admins = config:get("admins"), HasDbs = has_cluster_system_dbs(Dbs), - case {Admins, HasDbs} of - {[], _} -> false; - {_, false} -> false; - {_,_} -> true + SingleNodeConfig = config:get_boolean("couchdb", "single_node", false), + case {Admins, HasDbs, SingleNodeConfig} of + {_, _, true} -> true; + {[], _, _} -> false; + {_, false, _} -> false; + {_,_,_} -> true end. cluster_system_dbs() -> -- cgit v1.2.1