From 9efad19c5f19d44550fc2839878c633ebd160a46 Mon Sep 17 00:00:00 2001 From: Alexys Jacob Date: Thu, 27 Oct 2011 12:55:50 +0000 Subject: Fix mms-agent settings overwrite by adding a confd file. Package-Manager: portage-2.1.10.29/cvs/Linux x86_64 --- dev-db/mongodb/ChangeLog | 8 ++- dev-db/mongodb/Manifest | 13 ++--- dev-db/mongodb/files/mms-agent.confd | 9 ++++ dev-db/mongodb/files/mms-agent.initd | 13 ++++- dev-db/mongodb/mongodb-1.8.4-r1.ebuild | 95 ++++++++++++++++++++++++++++++++++ dev-db/mongodb/mongodb-1.8.4.ebuild | 94 --------------------------------- 6 files changed, 130 insertions(+), 102 deletions(-) create mode 100644 dev-db/mongodb/files/mms-agent.confd create mode 100644 dev-db/mongodb/mongodb-1.8.4-r1.ebuild delete mode 100644 dev-db/mongodb/mongodb-1.8.4.ebuild (limited to 'dev-db/mongodb') diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog index 4da2a2959f4d..1ab0088ac0d6 100644 --- a/dev-db/mongodb/ChangeLog +++ b/dev-db/mongodb/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-db/mongodb # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.23 2011/10/27 07:56:16 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.24 2011/10/27 12:55:50 ultrabug Exp $ + +*mongodb-1.8.4-r1 (27 Oct 2011) + + 27 Oct 2011; Ultrabug -mongodb-1.8.4.ebuild, + +mongodb-1.8.4-r1.ebuild, +files/mms-agent.confd, files/mms-agent.initd: + Fix mms-agent settings overwrite by adding a confd file. *mongodb-1.8.4 (26 Oct 2011) diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest index 05a206e25994..f9f41bc1bf1e 100644 --- a/dev-db/mongodb/Manifest +++ b/dev-db/mongodb/Manifest @@ -1,7 +1,8 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX mms-agent.initd 748 RMD160 3f3eade21ef1615956624b7f51a28f84cd3b64a3 SHA1 7049a0a32bdcb6105e4bf2b6b2f4fd916211c979 SHA256 124d47a90ec5a0141cd36c4fabf6eb5b01602ae1dcdcd1b1b363ac49da59b14a +AUX mms-agent.confd 205 RMD160 ee93fed685f22bf27801becfc0f7da1c2cf50d78 SHA1 d20dfbb32374a6eebf1dad430148faa352dfb0dc SHA256 29e678e722268311fb59f5af57ac3fbadb9e930cd3cb1ce9e4dc33d30e021e40 +AUX mms-agent.initd 1231 RMD160 dda8b391c205069241ac8b26054f0b1c13b8592a SHA1 79c4a9df6d2c96cd2ec48a187b816c88953b25e6 SHA256 0691afaed977e2a3b6764002300ebfbb66ccc78f08629d06579a09aa0c48ec05 AUX mongodb-1.8-fix-scons.patch 1859 RMD160 71700297d66808d2503f8a5eb56e10398e282ee7 SHA1 cba8225b2cd79477c0882a312707fbb58a59b70a SHA256 2b1a2180e73ad18c6fc884678dcdfb081c9ed6e967e137ba761683075cd59a1a AUX mongodb-linux3.patch 1588 RMD160 879245215595e6f16ef6c04157a9b50b96638d48 SHA1 1ab387e8b6ddc46dbb3dde654e0e01a565c25222 SHA256 bc96fad782e5396cc4464e7d7bff6abb1f054c4ff034fbeebea44a1e7a41945b AUX mongodb.confd 361 RMD160 26e8d39513b44d989ee64c30669967237cabbaa8 SHA1 837b3603de36bf8ebab9a6f2c1652a853cdf02ef SHA256 a4ca29c577428c02cd0b0a8b46756df5f53a05519c9d13c270533cf99b9b819d @@ -14,13 +15,13 @@ DIST mongodb-src-r1.8.3.tar.gz 1726144 RMD160 9662b6963e7e6a4b5adcbea3faa36dd50a DIST mongodb-src-r1.8.4.tar.gz 1727826 RMD160 6b561592b4f58f08ca2789e5ab92a3d31597912e SHA1 d296a6e04057e17989de5c7ded3a8c4d28285156 SHA256 c4e27bf22f2353e28ce169dbdbc24205baf863d1f61bd9a31b2230386cada4ae EBUILD mongodb-1.8.2-r1.ebuild 2016 RMD160 8b8f5a5d3a6d63a075778ec801f70deb8b45836a SHA1 8f94e36e099fedc6b8ee80e1dcd71e6691a8184c SHA256 7f6b7ebd5f443bac0cf4b0bd5415496f63e4ef611d04aa6dfccd22b82a67ed97 EBUILD mongodb-1.8.3.ebuild 2013 RMD160 d4b6aa684d5ff860fe570ed597128344ff15cb7e SHA1 ff8deee519548ef021632e671707728d5b321824 SHA256 42b7bb8edb6b19f3cb98681fc07f143722d0e61d73b8458c4479a53659154923 -EBUILD mongodb-1.8.4.ebuild 2354 RMD160 10f4331ee229bbd699c09ca50dd7229a0fa04819 SHA1 1a68ec132688da486066eb98fc5dac960133ebcd SHA256 112822086e8dec08158cb6fe621e0722f441dd943c15910cd9a782314db249c5 -MISC ChangeLog 6326 RMD160 ff2d81ffe8289f7a6b542e98dfe88754082f6d76 SHA1 2d00ceb48e38b155e15b5ac6a52c151442ea1888 SHA256 e9ed220d06b9df76a554250d06bfaa69a8ad8f15179309195683a25708c2f9b3 +EBUILD mongodb-1.8.4-r1.ebuild 2406 RMD160 4dde658e44b919e28a62e6eab567bd7b49861440 SHA1 991d4845b431dc0ad0dc7941404ea1bc55537da8 SHA256 9a622527f7322e195025740f16879df237d0a278d05cc58695f018ff48010e3c +MISC ChangeLog 6563 RMD160 9e8a62050bdab4d1e9830c5bc365664f4922da51 SHA1 07b5dd01ac54322fc49b6384b473d4583d25228d SHA256 0239339755da8d49e93b47a0ddcafe59dd1833bea9088616be31c0deed23450b MISC metadata.xml 1094 RMD160 382287bd018ebf994f0997376095d1735858ca0f SHA1 4063b9bc6bb3d95e4b1a5aab9bf63ea567f92329 SHA256 8b325542cc2200f22d21915688992073cc1b0a8c5c4f08f34771df2ac6a9cfaf -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF0EAREIAAYFAk6pDqwACgkQKiQSS7ZY+hODxAD3cgF7vng07lyfZzJMrQRoMLfF -4hnrBhAwGi/OZ1IHdgEAvZb1ssQMs9jgYwA3wJuXMzjmplcO0IF9w6jMCwDldNA= -=ptAJ +iF4EAREIAAYFAk6pVOAACgkQKiQSS7ZY+hM+ZAD+InHVGOmuDvoF6YQMef9HjqDw +NmIjDjvEYwrW6ReCtq0BAKTvRxT298X01cPSWonEw/NIXimXqFx8vsRBbbKYhWoh +=ii76 -----END PGP SIGNATURE----- diff --git a/dev-db/mongodb/files/mms-agent.confd b/dev-db/mongodb/files/mms-agent.confd new file mode 100644 index 000000000000..d19b21e2d32b --- /dev/null +++ b/dev-db/mongodb/files/mms-agent.confd @@ -0,0 +1,9 @@ +# Your API key - See: http://mms.10gen.com/settings +API_KEY="" +SECRET_KEY="" + +# Seconds between Mongo status checks +#COLLECTION_INTERVAL=56 + +# Seconds between cloud configuration checks +#CONF_INTERVAL=120 \ No newline at end of file diff --git a/dev-db/mongodb/files/mms-agent.initd b/dev-db/mongodb/files/mms-agent.initd index 684037aa08b0..45e42eaa1e1a 100644 --- a/dev-db/mongodb/files/mms-agent.initd +++ b/dev-db/mongodb/files/mms-agent.initd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2011 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,v 1.1 2011/10/27 07:56:16 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mms-agent.initd,v 1.2 2011/10/27 12:55:50 ultrabug Exp $ ROOTDIR=/opt/mms-agent PIDFILE=/var/run/mm-agent.pid @@ -15,6 +15,17 @@ depend() { start() { ebegin "Starting ${SVCNAME}" + + # Setup API/SECRETY KEYS + sed -i -e "s/^mms_key.*/mms_key = '${API_KEY}'/g" \ + -e "s/^secret_key.*/secret_key = '${SECRET_KEY}'/g" ${ROOTDIR}/settings.py &>/dev/null + + # Tune the agent + [ -z "${COLLECTION_INTERVAL}" ] || sed -i \ + -e "s/^collection_interval.*/collection_interval = ${COLLECTION_INTERVAL}/g" ${ROOTDIR}/settings.py &>/dev/null + [ -z "${CONF_INTERVAL}" ] || sed -i \ + -e "s/^conf_interval.*/conf_interval = ${CONF_INTERVAL}/g" ${ROOTDIR}/settings.py &>/dev/null + start-stop-daemon --start --chdir ${ROOTDIR} --exec ${EXEC} \ --pidfile "${PIDFILE}" --make-pidfile --background \ --user mongodb:mongodb --stdout ${LOGFILE} --stderr ${LOGFILE} diff --git a/dev-db/mongodb/mongodb-1.8.4-r1.ebuild b/dev-db/mongodb/mongodb-1.8.4-r1.ebuild new file mode 100644 index 000000000000..fd7daa645b7f --- /dev/null +++ b/dev-db/mongodb/mongodb-1.8.4-r1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.8.4-r1.ebuild,v 1.1 2011/10/27 12:55:50 ultrabug Exp $ + +EAPI=4 +SCONS_MIN_VERSION="1.2.0" + +inherit eutils multilib scons-utils versionator + +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? ( https://mms.10gen.com/settings/10gen-mms-agent.zip )" + +LICENSE="AGPL-3 Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="mms-agent static-libs v8" + +PDEPEND="mms-agent? ( dev-python/pymongo )" +RDEPEND="!v8? ( =dev-lang/spidermonkey-1.8.2* ) + v8? ( dev-lang/v8 ) + dev-libs/boost + dev-libs/libpcre[cxx] + net-libs/libpcap" +DEPEND="${RDEPEND} + sys-libs/readline + sys-libs/ncurses" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + enewgroup mongodb + enewuser mongodb -1 -1 /var/lib/${PN} mongodb + + scons_opts=" --cxx=$(tc-getCXX) --sharedclient" + if use v8; then + scons_opts+=" --usev8" + else + scons_opts+=" --usesm" + fi +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-1.8-fix-scons.patch" + epatch "${FILESDIR}/${PN}-linux3.patch" +} + +src_compile() { + escons ${scons_opts} all +} + +src_install() { + escons ${scons_opts} --full --nostrip install --prefix="${D}"/usr + + use static-libs || rm "${D}/usr/$(get_libdir)/libmongoclient.a" + + for x in /var/{lib,log,run}/${PN}; do + keepdir "${x}" + fowners mongodb:mongodb "${x}" + done + + doman debian/mongo*.1 + dodoc README docs/building.md + + newinitd "${FILESDIR}/${PN}.initd" ${PN} + newconfd "${FILESDIR}/${PN}.confd" ${PN} + newinitd "${FILESDIR}/${PN/db/s}.initd" ${PN/db/s} + newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s} + + if use mms-agent; then + local MY_PN="mms-agent" + local MY_D="/opt/${MY_PN}" + 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} + fi +} + +src_test() { + escons ${scons_opts} test + "${S}"/test --dbpath=unittest || die +} + +pkg_postinst() { + if [[ ${REPLACING_VERSIONS} < 1.8 ]]; then + ewarn "You just upgraded from a previous version of mongodb !" + ewarn "Make sure you run 'mongod --upgrade' before using this version." + fi + elog "Journaling is now enabled by default, see /etc/conf.d/${PN}" +} diff --git a/dev-db/mongodb/mongodb-1.8.4.ebuild b/dev-db/mongodb/mongodb-1.8.4.ebuild deleted file mode 100644 index 7bb5ecee003f..000000000000 --- a/dev-db/mongodb/mongodb-1.8.4.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.8.4.ebuild,v 1.1 2011/10/27 07:56:16 ultrabug Exp $ - -EAPI=4 -SCONS_MIN_VERSION="1.2.0" - -inherit eutils multilib scons-utils versionator - -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? ( https://mms.10gen.com/settings/10gen-mms-agent.zip )" - -LICENSE="AGPL-3 Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="mms-agent static-libs v8" - -PDEPEND="mms-agent? ( dev-python/pymongo )" -RDEPEND="!v8? ( =dev-lang/spidermonkey-1.8.2* ) - v8? ( dev-lang/v8 ) - dev-libs/boost - dev-libs/libpcre[cxx] - net-libs/libpcap" -DEPEND="${RDEPEND} - sys-libs/readline - sys-libs/ncurses" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - enewgroup mongodb - enewuser mongodb -1 -1 /var/lib/${PN} mongodb - - scons_opts=" --cxx=$(tc-getCXX) --sharedclient" - if use v8; then - scons_opts+=" --usev8" - else - scons_opts+=" --usesm" - fi -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-1.8-fix-scons.patch" - epatch "${FILESDIR}/${PN}-linux3.patch" -} - -src_compile() { - escons ${scons_opts} all -} - -src_install() { - escons ${scons_opts} --full --nostrip install --prefix="${D}"/usr - - use static-libs || rm "${D}/usr/$(get_libdir)/libmongoclient.a" - - for x in /var/{lib,log,run}/${PN}; do - keepdir "${x}" - fowners mongodb:mongodb "${x}" - done - - doman debian/mongo*.1 - dodoc README docs/building.md - - newinitd "${FILESDIR}/${PN}.initd" ${PN} - newconfd "${FILESDIR}/${PN}.confd" ${PN} - newinitd "${FILESDIR}/${PN/db/s}.initd" ${PN/db/s} - newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s} - - if use mms-agent; then - local MY_PN="mms-agent" - local MY_D="/opt/${MY_PN}" - insinto ${MY_D} - doins "${WORKDIR}/${MY_PN}/"* - fowners -R mongodb:mongodb ${MY_D} - newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN} - fi -} - -src_test() { - escons ${scons_opts} test - "${S}"/test --dbpath=unittest || die -} - -pkg_postinst() { - if [[ ${REPLACING_VERSIONS} < 1.8 ]]; then - ewarn "You just upgraded from a previous version of mongodb !" - ewarn "Make sure you run 'mongod --upgrade' before using this version." - fi - elog "Journaling is now enabled by default, see /etc/conf.d/${PN}" -} -- cgit v1.2.3-65-gdbad