From cf68c7a9f182c9ca6b4fd7fbe914f70b0910c07e Mon Sep 17 00:00:00 2001
From: Jacek Konieczny <j.konieczny@eggsoft.pl>
Date: Fri, 2 Nov 2012 13:36:02 +0100
Subject: [PATCH] Better default config file provided

The config file from the 'rpm' source directory seems outdated and it
contains 'fork' directive which may be harmfull when the service is
started by something else than LSB init script.

Init script updated to match the configuration file.
---
 mongod-default.conf | 86 +++++++++++++++++++++++++++++++++++++++++++++
 mongodb.init        |  2 +-
 mongodb.spec        |  3 +-
 3 files changed, 89 insertions(+), 2 deletions(-)
 create mode 100644 mongod-default.conf

diff --git a/mongod-default.conf b/mongod-default.conf
new file mode 100644
index 0000000..683c8d8
--- /dev/null
+++ b/mongod-default.conf
@@ -0,0 +1,86 @@
+# mongod/default.conf
+
+# Where to store the data.
+# each instance should use a separate directory
+dbpath=/var/lib/mongodb
+
+#where to log
+# each instance should use different path
+logpath=/var/log/mongodb/mongodb.log
+
+logappend=true
+
+# port to bind to. should be differen for each instance
+#port = 27017
+
+# Disables write-ahead journaling
+# nojournal = true
+
+# Enables periodic logging of CPU utilization and I/O wait
+#cpu = true
+
+# Turn on/off security.  Off is currently the default
+#noauth = true
+#auth = true
+
+# Verbose logging output.
+#verbose = true
+
+# Inspect all client data for validity on receipt (useful for
+# developing drivers)
+#objcheck = true
+
+# Enable db quota management
+#quota = true
+
+# Set oplogging level where n is
+#   0=off (default)
+#   1=W
+#   2=R
+#   3=both
+#   7=W+some reads
+#diaglog = 0
+
+# Ignore query hints
+#nohints = true
+
+# Disable the HTTP interface (Defaults to localhost:28017).
+#nohttpinterface = true
+
+# Turns off server-side scripting.  This will result in greatly limited
+# functionality
+#noscripting = true
+
+# Turns off table scans.  Any query that would do a table scan fails.
+#notablescan = true
+
+# Disable data file preallocation.
+#noprealloc = true
+
+# Specify .ns file size for new databases.
+# nssize = <size>
+
+# Accout token for Mongo monitoring server.
+#mms-token = <token>
+
+# Server name for Mongo monitoring server.
+#mms-name = <server-name>
+
+# Ping interval for Mongo monitoring server.
+#mms-interval = <seconds>
+
+# Replication Options
+
+# in replica set configuration, specify the name of the replica set
+# replSet = setname 
+
+# in master/slave replicated mongo databases (obsolete), specify here whether
+# this is a slave or master
+#slave = true
+#source = master.example.com
+# Slave only: specify a single database to replicate
+#only = master.example.com
+# or
+#master = true
+#source = slave.example.com
+
diff --git a/mongodb.init b/mongodb.init
index f9b8d53..99a4d70 100644
--- a/mongodb.init
+++ b/mongodb.init
@@ -64,7 +64,7 @@ start() {
 			pidfile="${MONGOD_PIDFILE%.pid}-$instance.log"
 		fi
 		daemon --pidfile "$pidfile" --user $MONGOD_USER \
-			$MONGOD_BIN --config "$config" run
+			$MONGOD_BIN --config "$config" --fork
 		[ $? -eq 0 ] && started=$(($started + 1))
 	done
 	# at least one started - the service is running
diff --git a/mongodb.spec b/mongodb.spec
index d5cf278..2acb4cd 100644
--- a/mongodb.spec
+++ b/mongodb.spec
@@ -12,6 +12,7 @@ Source0:	http://downloads.mongodb.org/src/%{name}-src-r%{version}.tar.gz
 # Source0-md5:	832bdb6cc659176fd8d6b16a660ccfc6
 Source1:	%{name}.logrotate
 Source2:	%{name}.init
+Source3:	mongod-default.conf
 Patch0:		%{name}-cflags.patch
 Patch1:		%{name}-system-libs.patch
 Patch2:		boost-1.50.patch
@@ -176,7 +177,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_mandir}/man1} \
 cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/mongod
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/mongod
 cp -p rpm/mongod.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/mongod
-cp -p rpm/mongod.conf $RPM_BUILD_ROOT%{_sysconfdir}/mongod/default.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/mongod/default.conf
 cp -p debian/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 touch $RPM_BUILD_ROOT%{_var}/log/mongo/mongod.log
-- 
2.43.0