summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2010-05-25 19:41:11 +0000
committerPeter Volkov <pva@gentoo.org>2010-05-25 19:41:11 +0000
commitb1ffcec0b3ab84c3218df384e92e688afd40b65f (patch)
treefd3bc9b04b4a9e87afc82b90c05dd93bc4ef516f
parentnet-im/ejabberd: updated upgrading path to mv ssl cert and cookie. Other clea... (diff)
downloadpva-b1ffcec0b3ab84c3218df384e92e688afd40b65f.tar.gz
pva-b1ffcec0b3ab84c3218df384e92e688afd40b65f.tar.bz2
pva-b1ffcec0b3ab84c3218df384e92e688afd40b65f.zip
net-im/ejabberd: cleaned init script to avoid upgrading code. We fix configs, so no need to keep it here...
svn path=/; revision=425
-rw-r--r--net-im/ejabberd/Manifest4
-rw-r--r--net-im/ejabberd/files/ejabberd-3.initd8
2 files changed, 3 insertions, 9 deletions
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index ec388bc..4077da8 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,7 +1,7 @@
AUX 2.1.1-mod_statsdx.patch 66647 RMD160 b4563c29a827d1452ca70b68bb8cb1989e6104d6 SHA1 1b253ca6371e47773c82e5eab58d530fc171031a SHA256 85e8f7525d720c5fd202889e6511725a1d0edb185b333c586b524e9862023130
AUX ejabberd-3.confd 161 RMD160 3b2c2b2a871c42c75e854a3c592c0d399a5dd387 SHA1 01e72bda178e7bf26a66321c4330bbcc1607e540 SHA256 0296d3d281a321cd7380772c1d89a94e4a86f85b7f43bf9dc1af74935c2e6386
-AUX ejabberd-3.initd 624 RMD160 a315e82cea8fa741d885b6e4134990747b328f67 SHA1 ac105a4ca8616cd7e3edb6ebaaa1806b7f2bfc3e SHA256 1253510256c3627115ce909ed88cf46cf2148996fc44c65777067c83d483422d
+AUX ejabberd-3.initd 369 RMD160 092cbf1d96a92f9a984cce9531c13ee3d022a033 SHA1 e74d6707719959786fd6fd46c4a9ba0714320661 SHA256 31daeafe003a0c13d51e8aaa9aa3c067ba3006e5edb1a47401a36c6d712be651
DIST ejabberd-2.1.3.tar.gz 2243874 RMD160 c57672928e30f71ec66636dd5e76adb802f17b03 SHA1 77fdf18c0bb3b25cf9045e0c833ba4d82f180469 SHA256 602c6e4e742c4cab8594e9f049f08d0bf2125fa84af491e0ceb6d6f2f3854ef6
-EBUILD ejabberd-2.1.3.ebuild 7647 RMD160 4653f6f753518bb73ed94e10354722de6b9aa77c SHA1 3816b1211df8a57b63030c43b4e3bf7db221f972 SHA256 2dfa281c6cfcaeae3e5e1f7c6220a16ccd420df2f6a96437f712e5504a487130
+EBUILD ejabberd-2.1.3.ebuild 7642 RMD160 674d006a9ed5aef5191f3df95ee23a924fd4978a SHA1 0d32f605e534a576039e1e1cc9357622b394258d SHA256 bb8848945c5c1672954e710bd891c6f51434bfc4fc8c5001e7fe0fcc97a56c2f
MISC ChangeLog 8965 RMD160 325a316bff3eb3d4c61170084e81dcebef9ad71c SHA1 f9b2b52117fc679eaf49884eae4cd059e40bf8f8 SHA256 016e4ed223c68bd48b80c59d0780c7b7e68753046da8dd83c59fb6eeec83683a
MISC metadata.xml 876 RMD160 48f50045291f78f0dbd699136b8546b5dfa55d85 SHA1 48dbaf3f6c2eaf5db190c04c881502b4da18a779 SHA256 25fd9d709d98bcfaba02200e29e07b1cc34d6241be0ffa2a7ea1abb52c05d282
diff --git a/net-im/ejabberd/files/ejabberd-3.initd b/net-im/ejabberd/files/ejabberd-3.initd
index 6a1d328..1fe763b 100644
--- a/net-im/ejabberd/files/ejabberd-3.initd
+++ b/net-im/ejabberd/files/ejabberd-3.initd
@@ -10,14 +10,8 @@ depend() {
}
start() {
- local edcopts
- if [ ! -n $EJABBERD_NODE ]; then
- edcopts="--node $EJABBERD_NODE"
- ewarn "Please, do not define EJABBERD_NODE any more. Configure NODE at"
- ewarn "/etc/jabber/ejabberdctl.cfg and drop EJABBERD_NODE from /etc/conf.d/ejabberd"
- fi
ebegin "Starting ejabberd"
- /usr/sbin/ejabberdctl $edcopts $EJABBERDCTL_OPT start
+ /usr/sbin/ejabberdctl ${EJABBERDCTL_OPT} start
eend $?
}