mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-20 16:15:59 +01:00
Merge pull request #742 from joudinet/master
Allow root to run join_cluster and leave_cluster
This commit is contained in:
commit
7cf904f4cf
@ -444,11 +444,11 @@ check_start()
|
|||||||
# cluster setup
|
# cluster setup
|
||||||
join_cluster()
|
join_cluster()
|
||||||
{
|
{
|
||||||
$EJABBERD_BIN_PATH/joincluster $*
|
$EXEC_CMD "$EJABBERD_BIN_PATH/joincluster $*"
|
||||||
}
|
}
|
||||||
leave_cluster()
|
leave_cluster()
|
||||||
{
|
{
|
||||||
$EJABBERD_BIN_PATH/leavecluster $*
|
$EXEC_CMD "$EJABBERD_BIN_PATH/leavecluster $*"
|
||||||
}
|
}
|
||||||
|
|
||||||
# allow sync calls
|
# allow sync calls
|
||||||
|
@ -145,7 +145,7 @@ start() ->
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
$ERLC -o $PA $CLUSTERSETUP_ERL
|
$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 -
|
cd -
|
||||||
rm -Rf $PA
|
rm -Rf $PA
|
||||||
|
|
||||||
|
@ -101,7 +101,7 @@ start() ->
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
$ERLC -o $PA $CLUSTERSETUP_ERL
|
$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 -
|
cd -
|
||||||
rm -Rf $PA
|
rm -Rf $PA
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user