diff --git a/big_tests/Makefile b/big_tests/Makefile index a1a4a4dfe95..07c8054f646 100644 --- a/big_tests/Makefile +++ b/big_tests/Makefile @@ -23,7 +23,7 @@ else TLS_DIST_OPTS := endif -COMMON_OPTS := -sname test -setcookie ejabberd -hidden \ +COMMON_OPTS := -sname test -setcookie this_is_cookie_for_dev_nodes_only_do_not_use_it_on_production -hidden \ $(TLS_DIST_OPTS) \ -env REPO_DIR "$(ABS_REPO_DIR)" \ -env TEST_DIR "$(ABS_TEST_DIR)" \ diff --git a/big_tests/test.config b/big_tests/test.config index c827056ea3d..ca78619baf9 100644 --- a/big_tests/test.config +++ b/big_tests/test.config @@ -7,7 +7,7 @@ %% See s2s_SUITE for example on using `hosts` to RPC into nodes (uses CT "require"). %% the Erlang node name of tested ejabberd/MongooseIM {ejabberd_node, 'mongooseim@localhost'}. -{ejabberd_cookie, ejabberd}. +{ejabberd_cookie, 'this_is_cookie_for_dev_nodes_only_do_not_use_it_on_production'}. {ejabberd_string_format, bin}. %% TODO: in every new use case this should be used instead diff --git a/rebar.config b/rebar.config index 318cd56231e..e268ce98225 100644 --- a/rebar.config +++ b/rebar.config @@ -119,15 +119,15 @@ {overlay_vars, "rel/vars.config"}, {overlay, [{template, "rel/files/mongooseim.cfg", "etc/mongooseim.cfg"}]} ]}]}, %% development nodes - {mim1, [{relx, [ {overlay_vars, ["rel/vars.config", "rel/mim1.vars.config"]}, + {mim1, [{relx, [ {overlay_vars, ["rel/vars.config", "rel/mim1.vars.config", "rel/dev.vars.config"]}, {overlay, [{template, "rel/files/mongooseim.cfg", "etc/mongooseim.cfg"}]} ]}]}, - {mim2, [{relx, [ {overlay_vars, ["rel/vars.config", "rel/mim2.vars.config"]}, + {mim2, [{relx, [ {overlay_vars, ["rel/vars.config", "rel/mim2.vars.config", "rel/dev.vars.config"]}, {overlay, [{template, "rel/files/mongooseim.cfg", "etc/mongooseim.cfg"}]} ]}]}, - {mim3, [{relx, [ {overlay_vars, ["rel/vars.config", "rel/mim3.vars.config"]}, + {mim3, [{relx, [ {overlay_vars, ["rel/vars.config", "rel/mim3.vars.config", "rel/dev.vars.config"]}, {overlay, [{template, "rel/files/mongooseim.cfg", "etc/mongooseim.cfg"}]} ]}]}, - {fed1, [{relx, [ {overlay_vars, ["rel/vars.config", "rel/fed1.vars.config"]}, + {fed1, [{relx, [ {overlay_vars, ["rel/vars.config", "rel/fed1.vars.config", "rel/dev.vars.config"]}, {overlay, [{template, "rel/files/mongooseim.cfg", "etc/mongooseim.cfg"}]} ]}]}, - {reg1, [{relx, [ {overlay_vars, ["rel/vars.config", "rel/reg1.vars.config"]}, + {reg1, [{relx, [ {overlay_vars, ["rel/vars.config", "rel/reg1.vars.config", "rel/dev.vars.config"]}, {overlay, [{template, "rel/files/mongooseim.cfg", "etc/mongooseim.cfg"}]} ]}]} ]}. diff --git a/rel/dev.vars.config b/rel/dev.vars.config new file mode 100644 index 00000000000..7424b9fdfab --- /dev/null +++ b/rel/dev.vars.config @@ -0,0 +1 @@ +{cluster_cookie, "this_is_cookie_for_dev_nodes_only_do_not_use_it_on_production"}. diff --git a/rel/files/vm.args b/rel/files/vm.args index 8f57be58995..f1d4fb71e49 100644 --- a/rel/files/vm.args +++ b/rel/files/vm.args @@ -10,7 +10,9 @@ -sname {{node_name}} ## Cookie for distributed erlang --setcookie ejabberd +## Please make sure this is randomly generated +## and different for all your MongooseIM or Erlang clusters. +-setcookie {{cluster_cookie}} ## Heartbeat management; auto-restarts VM if it dies or becomes unresponsive ## (Disabled by default..use with caution!)