summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexys Jacob <ultrabug@gentoo.org>2015-02-23 11:41:17 +0000
committerAlexys Jacob <ultrabug@gentoo.org>2015-02-23 11:41:17 +0000
commitfc992476192707a7e709b8ec21eb4c0ddc801039 (patch)
tree195382904ed43a54bc9f5fab91e5777c09b5ef58 /dev-db/mongodb
parentStable for ia64, wrt bug #536564 (diff)
downloadgentoo-2-fc992476192707a7e709b8ec21eb4c0ddc801039.tar.gz
gentoo-2-fc992476192707a7e709b8ec21eb4c0ddc801039.tar.bz2
gentoo-2-fc992476192707a7e709b8ec21eb4c0ddc801039.zip
fix #540364
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
Diffstat (limited to 'dev-db/mongodb')
-rw-r--r--dev-db/mongodb/ChangeLog6
-rw-r--r--dev-db/mongodb/files/mongodb.conf-r24
2 files changed, 7 insertions, 3 deletions
diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index 805a06982e52..bbb20cce11e9 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-db/mongodb
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.105 2015/02/15 14:24:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.106 2015/02/23 11:41:17 ultrabug Exp $
+
+ 23 Feb 2015; Ultrabug <ultrabug@gentoo.org> files/mongodb.conf-r2:
+ fix default config for non ssl enabled installations thx to Tomas Mozes, fix
+ #540364
15 Feb 2015; Pacho Ramos <pacho@gentoo.org> mongodb-2.6.7.ebuild:
x86 stable, bug #539324
diff --git a/dev-db/mongodb/files/mongodb.conf-r2 b/dev-db/mongodb/files/mongodb.conf-r2
index 337e6b62fa57..8e8a64408cdf 100644
--- a/dev-db/mongodb/files/mongodb.conf-r2
+++ b/dev-db/mongodb/files/mongodb.conf-r2
@@ -15,8 +15,8 @@ systemLog:
net:
port: 27017
bindIp: 127.0.0.1
- ssl:
- mode: disabled
+# ssl:
+# mode: disabled
#security:
#keyFile: