24
1
mirror of https://github.com/processone/ejabberd.git synced 2024-06-16 22:05:29 +02:00

Merge pull request #742 from joudinet/master

Allow root to run join_cluster and leave_cluster
This commit is contained in:
Christophe Romain 2015-09-25 14:20:37 +02:00
commit 7cf904f4cf
3 changed files with 4 additions and 4 deletions

View File

@ -444,11 +444,11 @@ check_start()
# cluster setup
join_cluster()
{
$EJABBERD_BIN_PATH/joincluster $*
$EXEC_CMD "$EJABBERD_BIN_PATH/joincluster $*"
}
leave_cluster()
{
$EJABBERD_BIN_PATH/leavecluster $*
$EXEC_CMD "$EJABBERD_BIN_PATH/leavecluster $*"
}
# allow sync calls

View File

@ -145,7 +145,7 @@ start() ->
EOF
$ERLC -o $PA $CLUSTERSETUP_ERL
sh -c "$ERL $NAME $ERLANG_NODE -pa $PA $KERNEL_OPTS -mnesia extra_db_nodes \"['$REMOTE']\" dir \"\\\"$SPOOL_DIR\\\"\" -s mnesia -s $CLUSTERSETUP start"
$ERL $NAME $ERLANG_NODE -pa $PA $KERNEL_OPTS -mnesia extra_db_nodes "['$REMOTE']" dir "\"$SPOOL_DIR\"" -s mnesia -s $CLUSTERSETUP start
cd -
rm -Rf $PA

View File

@ -101,7 +101,7 @@ start() ->
EOF
$ERLC -o $PA $CLUSTERSETUP_ERL
sh -c "$ERL $NAME $ERLANG_NODE -pa $PA $KERNEL_OPTS -mnesia dir \"\\\"$SPOOL_DIR\\\"\" -s mnesia -s $CLUSTERSETUP start"
$ERL $NAME $ERLANG_NODE -pa $PA $KERNEL_OPTS -mnesia dir "\"$SPOOL_DIR\"" -s mnesia -s $CLUSTERSETUP start
cd -
rm -Rf $PA