[gentoo-commits] gentoo-x86 commit in net-im/ejabberd/files: ejabberd-2.0.1.initd ejabberdctl-wrapper-2.0.1.template ejabberd-wrapper-2.0.1.template

[Caleb Tennis (caleb)]

caleb       08/05/22 12:26:07

  Modified:             ejabberd-2.0.1.initd
  Added:                ejabberdctl-wrapper-2.0.1.template
                        ejabberd-wrapper-2.0.1.template
  Log:
  add some more fixes from bug 207586
  (Portage version: 2.1.5_rc10)

Revision  Changes    Path
1.2                  net-im/ejabberd/files/ejabberd-2.0.1.initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.1.initd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.1.initd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.1.initd?r1=1.1&r2=1.2

Index: ejabberd-2.0.1.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.1.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ejabberd-2.0.1.initd	22 May 2008 11:43:11 -0000	1.1
+++ ejabberd-2.0.1.initd	22 May 2008 12:26:06 -0000	1.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.1.initd,v 1.1 2008/05/22 11:43:11 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.1.initd,v 1.2 2008/05/22 12:26:06 caleb Exp $
 
 opts="${opts} reload"
 
@@ -33,6 +33,7 @@
 			SMPOPT="disable"
 		;;
 	esac
+	cd /var/lib/ejabberd
 	start-stop-daemon --start --quiet --chuid jabber:jabber \
 		--name $BEAMNAME \
 		--exec /usr/sbin/ejabberd -- -detached -noinput -smp $SMPOPT



1.1                  net-im/ejabberd/files/ejabberdctl-wrapper-2.0.1.template

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/files/ejabberdctl-wrapper-2.0.1.template?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/files/ejabberdctl-wrapper-2.0.1.template?rev=1.1&content-type=text/plain

Index: ejabberdctl-wrapper-2.0.1.template
===================================================================
#!/bin/sh

[ -f /etc/conf.d/ejabberd ] && . /etc/conf.d/ejabberd

if [ -r /var/run/jabber/.erlang.cookie ] ; then
    HOME=/var/run/jabber
    export HOME
fi

ERL=/usr/bin/erl

if [ $# -ne 0 ] ; then
    case $1 in
	--node) shift ; EJABBERD_NODE=$1 ; shift ;;
    esac
fi

if [ "$EJABBERD_NODE" = "${EJABBERD_NODE%.*}" ] ; then
    SNAME=-sname
else
    SNAME=-name
fi

exec $ERL $SNAME ejabberdctl \
    -pa /usr/@libdir@/erlang/lib/ejabberd-@version@/ebin \
    -s ejabberd_ctl \
    -noinput \
    -extra $EJABBERD_NODE "$@"





1.1                  net-im/ejabberd/files/ejabberd-wrapper-2.0.1.template

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/files/ejabberd-wrapper-2.0.1.template?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/files/ejabberd-wrapper-2.0.1.template?rev=1.1&content-type=text/plain

Index: ejabberd-wrapper-2.0.1.template
===================================================================
#!/bin/sh

[ -f /etc/conf.d/ejabberd ] && . /etc/conf.d/ejabberd

# provide some default configuration
ERL=/usr/bin/erl
CONFIG=/etc/jabber/ejabberd.cfg
INETRC=/etc/jabber/inetrc
LOG_PATH=/var/log/jabber/ejabberd.log
SASL_LOG=/var/log/jabber/sasl.log
SPOOL=/var/spool/jabber

ARGS=
while [ $# -ne 0 ] ; do
    PARAM=$1
    shift
    case $PARAM in
	--) break ;;
	--node) EJABBERD_NODE=$1; shift ;;
	--config) CONFIG=$1 ; shift ;;
	--log) LOG_PATH=$1 ; shift ;;
	--sasl-log) SASL_LOG=$1 ; shift ;;
	--spool) SPOOL=$1 ; shift ;;
	*) ARGS="$ARGS $PARAM" ;;
    esac
done

if [ "$EJABBERD_NODE" = "${EJABBERD_NODE%.*}" ] ; then
    SNAME=-sname
else
    SNAME=-name
fi

# export ejabberd configuration environment variables
export HOME=/var/run/jabber
export EJABBERD_EBIN=/usr/@libdir@/erlang/lib/ejabberd-@version@/ebin
export EJABBERD_MSGS_PATH=/usr/@libdir@/erlang/lib/ejabberd-@version@/priv/msgs
export EJABBERD_SO_PATH=/usr/@libdir@/erlang/lib/ejabberd-@version@/priv/lib
export EJABBERD_LOG_PATH=$LOG_PATH
export EJABBERD_CONFIG_PATH=$CONFIG

exec $ERL $SNAME $EJABBERD_NODE \
    -s ejabberd \
    -kernel inetrc \"$INETRC\" \
    -sasl sasl_error_logger \{file,\"$SASL_LOG\"\} \
    -mnesia dir \"$SPOOL\" \
    $ERL_OPTIONS $ARGS "$@"





-- 
gentoo-commits@l.g.o mailing list