Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

apply rootdir patch from Badlop (EJAB-385) 

SVN Revision: 951
This commit is contained in:
Christophe Romain 2007-09-27 12:32:05 +00:00
parent f82b84158e
commit 0bb936f848
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-09-27 Christophe Romain <christophe.romain@process-one.net>
* src/ejabberdctl.template: apply rootdir patch from Badlop (EJAB-385)
* tools/ejabberdctl: define EJABBERD_EBIN as from ejabberdctl.template
2007-09-25 Alexey Shchepin <alexey@process-one.net> 2007-09-25 Alexey Shchepin <alexey@process-one.net>
* src/ejabberd_s2s.erl: Max number of connections and max number * src/ejabberd_s2s.erl: Max number of connections and max number

9
src/ejabberdctl.template
View File

@ -4,9 +4,10 @@ NODE=ejabberd
HOST=localhost HOST=localhost
# Define ejabberd environment # Define ejabberd environment
ROOTDIR=@prefix@ ROOTDIR=@rootdir@
SASL_LOG_PATH=$ROOTDIR/var/log/ejabberd/sasl.log SASL_LOG_PATH=$ROOTDIR/var/log/ejabberd/sasl.log
EJABBERD_DB=$ROOTDIR/var/lib/ejabberd/db/$NODE EJABBERD_DB=$ROOTDIR/var/lib/ejabberd/db/$NODE
EJABBERD_EBIN=$ROOTDIR/var/lib/ejabberd/ebin
export EJABBERD_LOG_PATH=$ROOTDIR/var/log/ejabberd/ejabberd.log export EJABBERD_LOG_PATH=$ROOTDIR/var/log/ejabberd/ejabberd.log
export EJABBERD_CONFIG_PATH=$ROOTDIR/etc/ejabberd/ejabberd.cfg export EJABBERD_CONFIG_PATH=$ROOTDIR/etc/ejabberd/ejabberd.cfg
export EJABBERD_MSGS_PATH=$ROOTDIR/var/lib/ejabberd/priv/msgs export EJABBERD_MSGS_PATH=$ROOTDIR/var/lib/ejabberd/priv/msgs
@ -20,7 +21,7 @@ function start
erl \ erl \
-noinput -detached \ -noinput -detached \
-sname $NODE@$HOST \ -sname $NODE@$HOST \
-pa $ROOTDIR/src \ -pa $EJABBERD_EBIN \
-mnesia dir "\"$EJABBERD_DB\"" \ -mnesia dir "\"$EJABBERD_DB\"" \
-s ejabberd \ -s ejabberd \
-ejabberd config \"$EJABBERD_CONFIG_PATH\" \ -ejabberd config \"$EJABBERD_CONFIG_PATH\" \
@ -32,7 +33,7 @@ function debug
{ {
erl \ erl \
-sname debug$NODE@$HOST \ -sname debug$NODE@$HOST \
-pa $ROOTDIR/src \ -pa $EJABBERD_EBIN \
-mnesia dir "\"$EJABBERD_DB\"" \ -mnesia dir "\"$EJABBERD_DB\"" \
-remsh $NODE@$HOST -remsh $NODE@$HOST
} }
@ -42,7 +43,7 @@ function ctl
erl \ erl \
-noinput \ -noinput \
-sname ejabberdctl@$HOST \ -sname ejabberdctl@$HOST \
-pa $ROOTDIR/src \ -pa $EJABBERD_EBIN \
-s ejabberd_ctl -extra $NODE@$HOST $@ -s ejabberd_ctl -extra $NODE@$HOST $@
} }

7
tools/ejabberdctl
View File

@ -8,6 +8,7 @@ base="`dirname $(which "$0")`/.."
ROOTDIR=`(cd "$base"; echo $PWD)` ROOTDIR=`(cd "$base"; echo $PWD)`
SASL_LOG_PATH=$ROOTDIR/sasl.log SASL_LOG_PATH=$ROOTDIR/sasl.log
EJABBERD_DB=$ROOTDIR/database/$NODE EJABBERD_DB=$ROOTDIR/database/$NODE
EJABBERD_EBIN=$ROOTDIR/src
export EJABBERD_LOG_PATH=$ROOTDIR/ejabberd.log export EJABBERD_LOG_PATH=$ROOTDIR/ejabberd.log
export EJABBERD_CONFIG_PATH=$ROOTDIR/ejabberd.cfg export EJABBERD_CONFIG_PATH=$ROOTDIR/ejabberd.cfg
export EJABBERD_MSGS_PATH=$ROOTDIR/src/msgs export EJABBERD_MSGS_PATH=$ROOTDIR/src/msgs
@ -22,7 +23,7 @@ function start
erl \ erl \
-noinput -detached \ -noinput -detached \
-sname $NODE@$HOST \ -sname $NODE@$HOST \
-pa $ROOTDIR/src \ -pa $EJABBERD_EBIN \
-mnesia dir "\"$EJABBERD_DB\"" \ -mnesia dir "\"$EJABBERD_DB\"" \
-s ejabberd \ -s ejabberd \
-ejabberd config \"$EJABBERD_CONFIG_PATH\" \ -ejabberd config \"$EJABBERD_CONFIG_PATH\" \
@ -34,7 +35,7 @@ function debug
{ {
erl \ erl \
-sname debug$NODE@$HOST \ -sname debug$NODE@$HOST \
-pa $ROOTDIR/src \ -pa $EJABBERD_EBIN \
-mnesia dir "\"$EJABBERD_DB\"" \ -mnesia dir "\"$EJABBERD_DB\"" \
-remsh $NODE@$HOST -remsh $NODE@$HOST
} }
@ -44,7 +45,7 @@ function ctl
erl \ erl \
-noinput \ -noinput \
-sname ejabberdctl@$HOST \ -sname ejabberdctl@$HOST \
-pa $ROOTDIR/src \ -pa $EJABBERD_EBIN \
-s ejabberd_ctl -extra $NODE@$HOST $@ -s ejabberd_ctl -extra $NODE@$HOST $@
} }