Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dea0ba736bfe72de2e35f05d105a4b5fd244029f
commit dea0ba736bfe72de2e35f05d105a4b5fd244029f Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Thu Mar 27 01:02:59 2008 +0100 ejabberd-2.0.0-2-i686 - cleaned up the init script to use ejabberdctl - also fixed ejabberdctl as now we use it diff --git a/source/network-extra/ejabberd/FrugalBuild b/source/network-extra/ejabberd/FrugalBuild index 99a9e10..54bb3c0 100644 --- a/source/network-extra/ejabberd/FrugalBuild +++ b/source/network-extra/ejabberd/FrugalBuild @@ -1,9 +1,9 @@ -# Compiling Time: 0.03 SBU +# Compiling Time: 0.20 SBU # Maintainer: VMiklos <[EMAIL PROTECTED]> pkgname=ejabberd pkgver=2.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="A free and open source instant messaging server written in Erlang." url="http://ejabberd.jabber.ru/"; depends=('erlang') @@ -14,7 +14,7 @@ up2date="lynx -dump http://www.process-one.net/en/ejabberd/archive/|grep -v beta source=(http://www.process-one.net/downloads/ejabberd/$pkgver/ejabberd-$pkgver.tar.gz \ rc.ejabberd README.Frugalware) sha1sums=('d70257c1e75f59b7284d52c038431664cfd53e08' \ - 'eb6e5a51a10fda5b1af1c4378e18700b9a575ef3' \ + 'd0c37dad3bfeefe22bf5c411f1b216c7a77b65e1' \ '1b31169bb44dabd8d862c603f8a79a5d4c6fa69d') build() @@ -23,6 +23,10 @@ build() Fbuild --prefix=/ Fmkdir /var/spool/ejabberd /usr/ Fmv /var/lib /usr/ + Fmv /sbin /usr + Fsed 'EJABBERD_EBIN=.*' 'EJABBERD_EBIN=$ROOTDIR/usr/lib/ejabberd/ebin' $Fdestdir/usr/sbin/ejabberdctl + Fsed 'EJABBERD_MSGS_PATH=.*' 'EJABBERD_MSGS_PATH=$ROOTDIR/usr/lib/ejabberd/priv/msgs' $Fdestdir/usr/sbin/ejabberdctl + Fsed 'EJABBERD_SO_PATH=.*' 'EJABBERD_SO_PATH=$ROOTDIR/usr/lib/ejabberd/priv/lib' $Fdestdir/usr/sbin/ejabberdctl Fdocrel ../doc/* chown -R 41:41 $Fdestdir/{var/log/ejabberd,var/spool/ejabberd,usr/lib/ejabberd} Fdoc README.Frugalware diff --git a/source/network-extra/ejabberd/rc.ejabberd b/source/network-extra/ejabberd/rc.ejabberd index bccd416..02f80dc 100644 --- a/source/network-extra/ejabberd/rc.ejabberd +++ b/source/network-extra/ejabberd/rc.ejabberd @@ -1,6 +1,6 @@ #!/bin/bash -# (c) 2007 Miklos Vajna <[EMAIL PROTECTED]> +# (c) 2007, 2008 Miklos Vajna <[EMAIL PROTECTED]> # rc.ejabberd for Frugalware # distributed under GPL License @@ -14,24 +14,32 @@ TEXTDOMAINDIR=/lib/initscripts/messages actions=(restart status start stop) daemon=$"Ejabber daemon" -pid="skill -n ejabberd" - rc_start() { start_msg - if [[ "$(eval $pid)" == "" ]] ; then - su ejabberd -c 'erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/spool/ejabberd\" -detached' + if ! ejabberdctl status >/dev/null; then + su ejabberd -c 'ejabberdctl start' ok $? else ok 999 fi } +rc_status() +{ + status_msg + if !ejabberdctl status >/dev/null; then + ok 998 + else + ok 997 + fi +} + rc_stop() { stop_msg - if [[ "$(eval $pid)" != "" ]] ; then - skill ejabberd + if ejabberdctl status >/dev/null; then + su ejabberd -c 'ejabberdctl stop' ok $? else ok 999 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
