diff options
| author | Mickaël Rémond <mickael.remond@process-one.net> | 2008-11-23 16:41:50 +0000 |
|---|---|---|
| committer | Mickaël Rémond <mickael.remond@process-one.net> | 2008-11-23 16:41:50 +0000 |
| commit | cc858469ecbc43e0dee9109987cca090e26c98d8 (patch) | |
| tree | b14aa882df28db5e16f37485be23ad331160f475 /src/ejabberdctl.template | |
| parent | * src/ejabberd_receiver.erl: Hibernate after timeout (diff) | |
* src/ejabberdctl.template: Added the ability to define the --config-dir option.
SVN Revision: 1681
Diffstat (limited to 'src/ejabberdctl.template')
| -rw-r--r-- | src/ejabberdctl.template | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/ejabberdctl.template b/src/ejabberdctl.template index 15e252cd..376f03ad 100644 --- a/src/ejabberdctl.template +++ b/src/ejabberdctl.template @@ -13,10 +13,6 @@ HOST=localhost ERLANG_NODE=$NODE@$HOST ERL=@erl@ INSTALLUSER=@installuser@ -ETCDIR=@SYSCONFDIR@/ejabberd -EJABBERD_CONFIG_PATH=$ETCDIR/ejabberd.cfg -LOGS_DIR=@LOCALSTATEDIR@/log/ejabberd -SPOOLDIR=@LOCALSTATEDIR@/lib/ejabberd # read custom configuration EJABBERDCTL_CONFIG_PATH=$ETCDIR/ejabberdctl.cfg @@ -30,6 +26,7 @@ while [ $# -ne 0 ] ; do case $PARAM in --) break ;; --node) ERLANG_NODE=$1; shift ;; + --config-dir) ETCDIR=$1 ; shift ;; --config) EJABBERD_CONFIG_PATH=$1 ; shift ;; --ctl-config) EJABBERDCTL_CONFIG_PATH=$1 ; shift ;; --logs) LOGS_DIR=$1 ; shift ;; @@ -38,6 +35,20 @@ while [ $# -ne 0 ] ; do esac done +# Define ejabberd variable if they have not been defined from the command line +if [ "$ETCDIR" = "" ] ; then + ETCDIR=@SYSCONFDIR@/ejabberd +fi +if [ "$EJABBERD_CONFIG_PATH" = "" ] ; then + EJABBERD_CONFIG_PATH=$ETCDIR/ejabberd.cfg +fi +if [ "$LOGS_DIR" = "" ] ; then + LOGS_DIR=@LOCALSTATEDIR@/log/ejabberd +fi +if [ "$SPOOLDIR" = "" ] ; then + SPOOLDIR=@LOCALSTATEDIR@/lib/ejabberd +fi + # check the proper system user is used ID=`id -g` EJID=`id -g $INSTALLUSER` @@ -172,6 +183,7 @@ help () echo " live Start an ejabberd node in live (interactive) mode" echo "" echo "Optional parameters when starting an ejabberd node:" + echo " --config-dir dir Config ejabberd: $ETCDIR" echo " --config file Config ejabberd: $EJABBERD_CONFIG_PATH" echo " --ctl-config file Config ejabberdctl: $EJABBERDCTL_CONFIG_PATH" echo " --logs dir Directory for logs: $LOGS_DIR" |