diff options
| author |   Gustavo Felisberto <humpback@gentoo.org> | 2004-06-24 00:33:16 +0000 |
|---|---|---|
| committer | Gustavo Felisberto <humpback@gentoo.org> | 2004-06-24 00:33:16 +0000 |
| commit | d73ba6f54b085de158dd58c83c3491478e2e186e (patch) | |
| tree | f7cd5536e04257561e3a7ea50ee862a115401464 /net-im/jabberd | |
| parent | Add support for new homedir and trap signals went prompting (Manifest recommit) (diff) | |
| download | gentoo-2-d73ba6f54b085de158dd58c83c3491478e2e186e.tar.gz gentoo-2-d73ba6f54b085de158dd58c83c3491478e2e186e.tar.bz2 gentoo-2-d73ba6f54b085de158dd58c83c3491478e2e186e.zip | |
update to init script
Diffstat (limited to 'net-im/jabberd')
| -rw-r--r-- | net-im/jabberd/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/jabberd/files/jabber-conf.d | 6 | ||||
| -rw-r--r-- | net-im/jabberd/files/jabber.rc6-r7 | 14 |
3 files changed, 19 insertions, 7 deletions
diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog index 644bbb7554fb..b4132696478b 100644 --- a/net-im/jabberd/ChangeLog +++ b/net-im/jabberd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/jabberd # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.28 2004/06/23 01:13:42 humpback Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.29 2004/06/24 00:33:16 humpback Exp $ + + 24 Jun 2004; Gustavo Felisberto <humpback@gentoo.org>; files/jabber-conf.d, + files/jabber.rc6-r7: + Small update to init script 23 Jun 2004; Gustavo Felisberto <humpback@gentoo.org>; -jabberd-1.4.3-r1.ebuild, jabberd-1.4.3-r2.ebuild: diff --git a/net-im/jabberd/files/jabber-conf.d b/net-im/jabberd/files/jabber-conf.d index 843558a71fe9..7ca120fd850b 100644 --- a/net-im/jabberd/files/jabber-conf.d +++ b/net-im/jabberd/files/jabber-conf.d @@ -1,8 +1,12 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber-conf.d,v 1.2 2004/04/08 22:53:18 humpback Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber-conf.d,v 1.3 2004/06/24 00:33:16 humpback Exp $ # Configure which is the default jabberd server. Any value that is not # jabberd14 and jabberd2 will be started JABBERD="jabberd14" + +#Right now this is only used by the init script, but i would like to find a way +#for jabberd to include this in the conf +JPIDFILE="/var/log/jabber/jabberd14.pid" diff --git a/net-im/jabberd/files/jabber.rc6-r7 b/net-im/jabberd/files/jabber.rc6-r7 index d8a667ab38e4..a4c74fc24ca4 100644 --- a/net-im/jabberd/files/jabber.rc6-r7 +++ b/net-im/jabberd/files/jabber.rc6-r7 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.rc6-r7,v 1.3 2004/06/01 10:23:01 humpback Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.rc6-r7,v 1.4 2004/06/24 00:33:16 humpback Exp $ depend() { need net @@ -12,6 +12,10 @@ start() { ebegin "Starting main Jabber Component" if [ "${JABBERD}" = "jabberd14" ] then + if [ -z $(ps ax | grep `cat ${JPIDFILE}` | grep -v grep ) ] + then + rm -f ${JPIDFILE} + fi jabberd -B -c /etc/jabber/multiple.xml >/dev/null 2>&1 else ebegin " Router" @@ -36,13 +40,13 @@ start() { stop() { ebegin "Stopping main Jabber Component" - kill `cat /var/log/jabber/jabberd14.pid` + kill `cat ${JPIDFILE}` if [ "${JABBERD}" = "jabberd14" ] then sleep 2 - if [ -f /var/log/jabber/jabberd14.pid ]; then - kill -9 `cat /var/log/jabber/jabberd14.pid` - rm -f /var/log/jabber/jabberd14.pid + if [ -f ${JPIDFILE} ]; then + kill -9 `cat ${JPIDFILE}` + rm -f ${JPIDFILE} fi else ebegin " Router" |