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 | d9435c59aca93b5f34bc9f1567122ceb47ad5d0c (patch) | |
| tree | dfc90f6cd82e5a1f29fc6adb577f0137c359c8ec /net-im | |
| parent | Add support for new homedir and trap signals went prompting (diff) | |
| download | historical-d9435c59aca93b5f34bc9f1567122ceb47ad5d0c.tar.gz historical-d9435c59aca93b5f34bc9f1567122ceb47ad5d0c.tar.bz2 historical-d9435c59aca93b5f34bc9f1567122ceb47ad5d0c.zip | |
update to init script
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/jabberd/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/jabberd/Manifest | 6 | ||||
| -rw-r--r-- | net-im/jabberd/files/jabber-conf.d | 6 | ||||
| -rw-r--r-- | net-im/jabberd/files/jabber.rc6-r7 | 14 |
4 files changed, 22 insertions, 10 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/Manifest b/net-im/jabberd/Manifest index 460f9c21826d..55a46bace754 100644 --- a/net-im/jabberd/Manifest +++ b/net-im/jabberd/Manifest @@ -1,4 +1,4 @@ -MD5 2eda4b586eb81174c07cc310a1d64a62 ChangeLog 4650 +MD5 4aa2a4046add95c5dec59a353119f967 ChangeLog 4782 MD5 21c87de75953eb5978ad3a3bb4a1ada6 jabberd-1.4.3-r2.ebuild 5142 MD5 218c00bbc36a44dbea00881e2be195fc jabberd-1.4.3-r3.ebuild 5247 MD5 373c2e6de5f626f1b9705b740686e166 jabberd-2.0.ebuild 4911 @@ -7,10 +7,10 @@ MD5 1a325b6068e591bc222376a7d70f6e17 files/README.Gentoo 984 MD5 c0945b1bc206e13be453cd2c1bb7e3f1 files/digest-jabberd-1.4.3-r2 129 MD5 c0945b1bc206e13be453cd2c1bb7e3f1 files/digest-jabberd-1.4.3-r3 129 MD5 d07e9280a9fed9f133b6900d542a81df files/digest-jabberd-2.0 65 -MD5 7f71f3c24fae75266ebf2bc75bdecc8a files/jabber-conf.d 370 +MD5 21c3cb29cea153dcc8832387a175f6c6 files/jabber-conf.d 533 MD5 6e3663408f58427247b1aa80adf4acb6 files/jabber.rc6-r5 880 MD5 add7951ae63442a72e870b0b0d843d79 files/jabber.rc6-r6 959 -MD5 59b36eaa89384ef715433c56bd41868c files/jabber.rc6-r7 1791 +MD5 e1f6ed68426e8999b240b1226eb4a9f7 files/jabber.rc6-r7 1814 MD5 5aeafd17644a405b363de0ea1eb22d8b files/multiple-xml-patch-00 5934 MD5 0067018951674e703063f0f4337c5a2c files/multiple-xml-patch-01 303 MD5 73c38af347fdcf7d7cb6dd3490344bfa files/multiple.xml 15387 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" |