From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q9Hs4-0005OQ-Te for garchives@archives.gentoo.org; Mon, 11 Apr 2011 14:13:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A864E1C01C; Mon, 11 Apr 2011 14:13:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 687A31C01C for ; Mon, 11 Apr 2011 14:13:32 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D4B141B404C for ; Mon, 11 Apr 2011 14:13:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E8CBE80065 for ; Mon, 11 Apr 2011 14:13:30 +0000 (UTC) From: "Alexys Jacob" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexys Jacob" Message-ID: <02f6d7328378f27453411696aed3cdc324f7e033.ultrabug@gentoo> Subject: [gentoo-commits] dev/ultrabug:master commit in: dev-db/mongodb/files/, dev-db/mongodb/ X-VCS-Repository: dev/ultrabug X-VCS-Files: dev-db/mongodb/Manifest dev-db/mongodb/files/mongodb.confd dev-db/mongodb/files/mongodb.initd dev-db/mongodb/files/mongos.confd dev-db/mongodb/files/mongos.initd dev-db/mongodb/mongodb-1.8.1.ebuild X-VCS-Directories: dev-db/mongodb/files/ dev-db/mongodb/ X-VCS-Committer: ultrabug X-VCS-Committer-Name: Alexys Jacob X-VCS-Revision: 02f6d7328378f27453411696aed3cdc324f7e033 Date: Mon, 11 Apr 2011 14:13:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 25c852ce2f766b2ef0827401e3a1cfd7 commit: 02f6d7328378f27453411696aed3cdc324f7e033 Author: Ultrabug gentoo org> AuthorDate: Mon Apr 11 14:13:25 2011 +0000 Commit: Alexys Jacob gentoo org> CommitDate: Mon Apr 11 14:13:25 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/ultrabug.git;a= =3Dcommit;h=3D02f6d732 add mongos init.d and fix root privileges --- dev-db/mongodb/Manifest | 8 +++++--- dev-db/mongodb/files/mongodb.confd | 1 + dev-db/mongodb/files/mongodb.initd | 9 ++++++--- dev-db/mongodb/files/mongos.confd | 10 ++++++++++ .../mongodb/files/{mongodb.initd =3D> mongos.initd} | 13 ++++++------= - dev-db/mongodb/mongodb-1.8.1.ebuild | 12 +++++++----- 6 files changed, 35 insertions(+), 18 deletions(-) diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest index 3734021..9277b32 100644 --- a/dev-db/mongodb/Manifest +++ b/dev-db/mongodb/Manifest @@ -1,5 +1,7 @@ AUX mongodb-1.8-fix-scons.patch 1649 RMD160 1e5be2fe75f25c511b1d70dd1dd7= 977c8f1a6db3 SHA1 1300bbc5ff4f9c4a59e89fb3e119506b3507906d SHA256 5b8db8f= 66adabbdd52c364a713ce38a937c4ac6282a4ac530d14930d386d582d -AUX mongodb.confd 246 RMD160 fee0f87d5f6715b237d7195ea6dfd24a50868102 SH= A1 dd786ce383ea3a112352f5b48e4948dd3377b009 SHA256 5dd09535664bd7bc9d0e92= 7896f8e768f225c43c1d84bde9812cb36866f1f587 -AUX mongodb.initd 738 RMD160 ba740896d73b19544a73d0ffbab3c3849d822692 SH= A1 cc5fbd32849cab99e2bb5395ad1229e6087a7a88 SHA256 9247f210bd43f4efd7a8c9= b046d6e5f4eeed3acbc736c351f57557277cf71d06 +AUX mongodb.confd 277 RMD160 a6c7f01ecc843c9138046a5b4deaaff839b7bcc4 SH= A1 cb04bf6b4d3799846b9ab59dc587c88093d8e265 SHA256 b5b44beb64aae30f285c47= 64acbb8b2c7c60bd0cdcd47c6c11f285790c42b510 +AUX mongodb.initd 897 RMD160 e33b2d27c4b21d36531726857722c20044743388 SH= A1 f36023f9a78676da5e117b9d4968ec99fc5df85d SHA256 3b0b7df3172799261653c2= a2679d7fbaf0e045b8c447064b82d825ca71865ab5 +AUX mongos.confd 189 RMD160 56c0fb6d545da7ff5689c517b6b71f898e27c5a2 SHA= 1 1b3f6b072ac94a7ab29410096a7cab15a208171a SHA256 78e4ef078adf6a8add95546= f501d070019717c0bc4833672fbb2ad834d16b16c +AUX mongos.initd 710 RMD160 1f59b815bc7b67d4a1bb3134f6b891e361bedd3f SHA= 1 c1d6598e988be9b61b00f59baaea2c9dc675d756 SHA256 96f6d27404d52e0fc0ab637= 457aa025c25f7fe1fe13dfa9fa873593b412406d7 DIST mongodb-src-r1.8.1.tar.gz 1718969 RMD160 e8739fd15c40eac9934045af43= 65c13f204d16fe SHA1 615cfe4ace4899e73a7083059c7178d8f5c19f03 SHA256 8b268= b4f8c4d055c74add1fc995f103d893657c4291964d370899ebefd0bc97d -EBUILD mongodb-1.8.1.ebuild 2040 RMD160 2b98f57a23aedfab3f73bb4428d5c238= ac5fb77e SHA1 a8560252110fc80122044fe9b009e4425d37b561 SHA256 8908e7fbd1c= 1855e9f536775baf09ca6ddacbe74ff9c43162958f16444e00b99 +EBUILD mongodb-1.8.1.ebuild 2220 RMD160 c56d9e79bfb4401d6a39ecce9a0a46db= 6cb8a175 SHA1 64dee98f2bfd5513668aab39910a91d66c774047 SHA256 7f2048c74e0= 96901156221ceec06788d236711e1ba69f715d49708d7b841e191 diff --git a/dev-db/mongodb/files/mongodb.confd b/dev-db/mongodb/files/mo= ngodb.confd index 3643f9e..9b3a438 100644 --- a/dev-db/mongodb/files/mongodb.confd +++ b/dev-db/mongodb/files/mongodb.confd @@ -1,5 +1,6 @@ # Mongodb essentials MONGODB_EXEC=3D"/usr/bin/mongod" +MONGODB_RUN=3D"/var/run/mongodb" MONGODB_DATA=3D"/var/lib/mongodb" MONGODB_USER=3D"mongodb" =20 diff --git a/dev-db/mongodb/files/mongodb.initd b/dev-db/mongodb/files/mo= ngodb.initd index 189cfae..e1dfa71 100644 --- a/dev-db/mongodb/files/mongodb.initd +++ b/dev-db/mongodb/files/mongodb.initd @@ -8,16 +8,19 @@ depend() { } =20 start() { + mkdir -p ${MONGODB_RUN:-/var/run/mongodb} + chown ${MONGODB_USER:-mongodb}: ${MONGODB_RUN:-/var/run/mongodb} + ebegin "Starting ${SVCNAME}" start-stop-daemon --background --start --make-pidfile \ - --pidfile /var/run/${SVCNAME}.pid \ - --user ${MONGODB_USER:-mongodb} \ + --pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid \ + --chuid ${MONGODB_USER:-mongodb} \ --exec ${MONGODB_EXEC:-/usr/bin/mongod} \ -- \ --bind_ip ${MONGODB_IP:-127.0.0.1} \ --port ${MONGODB_PORT:-27017} \ --dbpath ${MONGODB_DATA:-/var/lib/mongodb} \ - --unixSocketPrefix /var/run \ + --unixSocketPrefix ${MONGODB_RUN:-/var/run/mongodb} \ --logappend --logpath /var/log/mongodb/${SVCNAME}.log \ ${MONGODB_OPTIONS} eend $? diff --git a/dev-db/mongodb/files/mongos.confd b/dev-db/mongodb/files/mon= gos.confd new file mode 100644 index 0000000..8a2bf88 --- /dev/null +++ b/dev-db/mongodb/files/mongos.confd @@ -0,0 +1,10 @@ +# Mongos essentials +MONGOS_EXEC=3D"/usr/bin/mongos" +MONGOS_RUN=3D"/var/run/mongodb" +MONGOS_USER=3D"mongodb" + +MONGOS_IP=3D"127.0.0.1" +MONGOS_PORT=3D"27018" + +# Set extra options here +MONGOS_OPTIONS=3D"" diff --git a/dev-db/mongodb/files/mongodb.initd b/dev-db/mongodb/files/mo= ngos.initd similarity index 65% copy from dev-db/mongodb/files/mongodb.initd copy to dev-db/mongodb/files/mongos.initd index 189cfae..501c0f5 100644 --- a/dev-db/mongodb/files/mongodb.initd +++ b/dev-db/mongodb/files/mongos.initd @@ -11,15 +11,14 @@ start() { ebegin "Starting ${SVCNAME}" start-stop-daemon --background --start --make-pidfile \ --pidfile /var/run/${SVCNAME}.pid \ - --user ${MONGODB_USER:-mongodb} \ - --exec ${MONGODB_EXEC:-/usr/bin/mongod} \ + --chuid ${MONGOS_USER:-mongodb} \ + --exec ${MONGOS_EXEC:-/usr/bin/mongos} \ -- \ - --bind_ip ${MONGODB_IP:-127.0.0.1} \ - --port ${MONGODB_PORT:-27017} \ - --dbpath ${MONGODB_DATA:-/var/lib/mongodb} \ - --unixSocketPrefix /var/run \ + --bind_ip ${MONGOS_IP:-127.0.0.1} \ + --port ${MONGOS_PORT:-27018} \ + --unixSocketPrefix ${MONGOS_RUN:-/var/run/mongodb} \ --logappend --logpath /var/log/mongodb/${SVCNAME}.log \ - ${MONGODB_OPTIONS} + ${MONGOS_OPTIONS} eend $? } =20 diff --git a/dev-db/mongodb/mongodb-1.8.1.ebuild b/dev-db/mongodb/mongodb= -1.8.1.ebuild index 228c419..8280234 100644 --- a/dev-db/mongodb/mongodb-1.8.1.ebuild +++ b/dev-db/mongodb/mongodb-1.8.1.ebuild @@ -3,8 +3,9 @@ # $Header: $ =20 EAPI=3D3 +SCONS_MIN_VERSION=3D"1.2.0" =20 -inherit eutils multilib versionator +inherit eutils multilib scons-utils versionator =20 MY_P=3D"${PN}-src-r${PV/_rc/-rc}" =20 @@ -23,7 +24,6 @@ RDEPEND=3D"!v8? ( >=3Ddev-lang/spidermonkey-1.9 ) dev-libs/libpcre[cxx] net-libs/libpcap" DEPEND=3D"${RDEPEND} - dev-util/scons sys-libs/readline sys-libs/ncurses" =20 @@ -47,7 +47,7 @@ src_prepare() { } =20 src_compile() { - scons ${scons_opts} all || die "Compile failed" + escons ${scons_opts} all || die "Compile failed" } =20 pkg_preinst() { @@ -56,11 +56,11 @@ pkg_preinst() { } =20 src_install() { - scons ${scons_opts} --full --nostrip install --prefix=3D"${D}"/usr || d= ie "Install failed" + escons ${scons_opts} --full --nostrip install --prefix=3D"${D}"/usr || = die "Install failed" =20 use static-libs || rm "${D}/usr/$(get_libdir)/libmongoclient.a" =20 - for x in /var/{lib,log}/${PN}; do + for x in /var/{lib,log,run}/${PN}; do keepdir "${x}" || die "Install failed" fowners mongodb:mongodb "${x}" done @@ -70,6 +70,8 @@ src_install() { =20 newinitd "${FILESDIR}/${PN}.initd" ${PN} || die "Install failed" newconfd "${FILESDIR}/${PN}.confd" ${PN} || die "Install failed" + newinitd "${FILESDIR}/${PN/db/s}.initd" ${PN/db/s} || die "Install fail= ed" + newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s} || die "Install fail= ed" } =20 src_test() {