update mms-agent, revbump

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B658FA13)

3 files changed, 45 insertions, 5 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index a20b1ab83085..7fe67b0079d9 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mongodb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.88 2014/04/08 15:25:12 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.89 2014/04/09 15:40:20 ultrabug Exp $
+
+*mongodb-2.4.10-r1 (09 Apr 2014)
+
+  09 Apr 2014; Ultrabug <ultrabug@gentoo.org> -mongodb-2.4.10.ebuild,
+  +mongodb-2.4.10-r1.ebuild, +files/mms-agent.initd-r1:
+  update mms-agent, drop useless version
 
 *mongodb-2.4.10 (08 Apr 2014)
 
diff --git a/dev-db/mongodb/files/mms-agent.initd-r1 b/dev-db/mongodb/files/mms-agent.initd-r1
new file mode 100644
index 000000000000..8184fe0c83c1
--- /dev/null
+++ b/dev-db/mongodb/files/mms-agent.initd-r1
@@ -0,0 +1,31 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mms-agent.initd-r1,v 1.1 2014/04/09 15:40:20 ultrabug Exp $
+
+ROOTDIR=/opt/mms-agent
+PIDFILE=/var/run/mm-agent.pid
+EXEC="/usr/bin/env python agent.py"
+LOGFILE=/var/log/mongodb/mms-agent.log
+
+depend() {
+	need net
+	use syslog
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+
+	checkpath -d -m 0755 -o root:root /var/run/
+
+	start-stop-daemon --start --chdir ${ROOTDIR} --exec ${EXEC} \
+		--pidfile "${PIDFILE}" --make-pidfile --background \
+		--user mongodb:mongodb --stdout ${LOGFILE} --stderr ${LOGFILE}
+	eend $?
+}
+
+stop() {
+	ebegin "Requesting ${SVCNAME} to stop"
+	start-stop-daemon --stop --pidfile "${PIDFILE}"
+	eend $?
+}
diff --git a/dev-db/mongodb/mongodb-2.4.10.ebuild b/dev-db/mongodb/mongodb-2.4.10-r1.ebuild
index e68a3994d5dd..1243e6315126 100644
--- a/dev-db/mongodb/mongodb-2.4.10.ebuild
+++ b/dev-db/mongodb/mongodb-2.4.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.4.10.ebuild,v 1.1 2014/04/08 15:25:12 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.4.10-r1.ebuild,v 1.1 2014/04/09 15:40:20 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -14,7 +14,7 @@ MY_P=${PN}-src-r${PV/_rc/-rc}
 DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
 HOMEPAGE="http://www.mongodb.org"
 SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz
-	mms-agent? ( http://dev.gentoo.org/~ultrabug/20130821-10gen-mms-agent.zip )"
+	mms-agent? ( http://dev.gentoo.org/~ultrabug/20140409-mms-monitoring-agent.zip )"
 
 LICENSE="AGPL-3 Apache-2.0"
 SLOT="0"
@@ -119,8 +119,7 @@ src_install() {
 		insinto ${MY_D}
 		doins "${WORKDIR}/${MY_PN}/"*
 		fowners -R mongodb:mongodb ${MY_D}
-		newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
-		newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
+		newinitd "${FILESDIR}/${MY_PN}.initd-r1" ${MY_PN}
 	fi
 }
 
@@ -142,4 +141,8 @@ pkg_postinst() {
 		ewarn "Make sure you run 'mongod --upgrade' before using this version."
 	fi
 	elog "Journaling is now enabled by default, see /etc/conf.d/${PN}"
+	if use mms-agent; then
+		elog "You have to configure MMM Agent yourself :"
+		elog "Edit the settings.py file in the /opt/mms-agent/ folder."
+	fi
 }