version bump wrt #347419

(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)

2 files changed, 22 insertions, 23 deletions

diff --git a/net-misc/rabbitmq-server/files/rabbitmq-server.init b/net-misc/rabbitmq-server/files/rabbitmq-server.init
deleted file mode 100644
index 154f7df6586d..000000000000
--- a/net-misc/rabbitmq-server/files/rabbitmq-server.init
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/files/rabbitmq-server.init,v 1.2 2010/08/02 23:56:58 hollow Exp $
-
-depend() {
-	need net
-	use dns
-}
-
-start() {
-	export HOME=/var/empty
-	ebegin "Starting RabbitMQ..."
-	rabbitmq-server -detached
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping RabbitMQ..."
-	rabbitmqctl stop
-	eend $?
-}
-
diff --git a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r2 b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r2
new file mode 100644
index 000000000000..0d3553b78dc0
--- /dev/null
+++ b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r2
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/files/rabbitmq-server.init-r2,v 1.1 2011/04/07 15:23:19 hollow Exp $
+
+depend() {
+	need net
+	use dns epmd
+}
+
+start() {
+	ebegin "Starting RabbitMQ..."
+	setsid sh -c "/usr/sbin/rabbitmq-server >> /var/log/rabbitmq/startup.log 2>> /var/log/rabbitmq/startup.err" &
+	/usr/sbin/rabbitmqctl wait &>/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping RabbitMQ..."
+	/usr/sbin/rabbitmqctl stop >> /var/log/rabbitmq/shutdown.log 2>> /var/log/rabbitmq/shutdown.err
+	eend $?
+}