diff options
Diffstat (limited to 'rpm')
| -rw-r--r-- | rpm/init.d-mongod | 5 | ||||
| -rw-r--r-- | rpm/mongo.spec | 20 | ||||
| -rw-r--r-- | rpm/mongod.conf | 5 |
3 files changed, 19 insertions, 11 deletions
diff --git a/rpm/init.d-mongod b/rpm/init.d-mongod index 423eed56ba6..e9a6202ad9c 100644 --- a/rpm/init.d-mongod +++ b/rpm/init.d-mongod @@ -6,7 +6,7 @@ # description: Mongo is a scalable, document-oriented database. # processname: mongod # config: /etc/mongod.conf -# pidfile: /var/run/mongo/mongo.pid +# pidfile: /var/run/mongo/mongod.pid . /etc/rc.d/init.d/functions @@ -23,6 +23,7 @@ SYSCONFIG="/etc/sysconfig/mongod" # shuts down the correct running pid, but that's unavailable in 1.8 # for now. This can go away when this script stops supporting 1.8. DBPATH=`awk -F= '/^dbpath=/{print $2}' "$CONFIGFILE"` +PIDFILE=`awk -F= '/^dbpath\s=\s/{print $2}' "$CONFIGFILE"` mongod=${MONGOD-/usr/bin/mongod} MONGO_USER=mongod @@ -42,7 +43,7 @@ start() stop() { echo -n $"Stopping mongod: " - killproc -p "$DBPATH"/mongod.lock -t30 -TERM /usr/bin/mongod + killproc -p "$PIDFILE" -d 300 /usr/bin/mongod RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/mongod diff --git a/rpm/mongo.spec b/rpm/mongo.spec index 56d991b7ac0..957284b4276 100644 --- a/rpm/mongo.spec +++ b/rpm/mongo.spec @@ -1,7 +1,7 @@ Name: mongo -Version: 2.0.0-rc2 +Version: 2.1.1 Release: mongodb_1%{?dist} -Summary: mongo client shell and tools +Summary: mongodb client shell and tools License: AGPL 3.0 URL: http://www.mongodb.org Group: Applications/Databases @@ -12,7 +12,7 @@ BuildRequires: js-devel, readline-devel, boost-devel, pcre-devel BuildRequires: gcc-c++, scons %description -Mongo (from "huMONGOus") is a schema-free document-oriented database. +MongoDB (from "huMONGOus") is a schema-free document-oriented database. It features dynamic profileable queries, full indexing, replication and fail-over support, efficient storage of large binary data objects, and auto-sharding. @@ -21,22 +21,22 @@ This package provides the mongo shell, import/export tools, and other client utilities. %package server -Summary: mongo server, sharding server, and support scripts +Summary: mongodb server, sharding server, and support scripts Group: Applications/Databases Requires: mongo %description server -Mongo (from "huMONGOus") is a schema-free document-oriented database. +MongoDB (from "huMONGOus") is a schema-free document-oriented database. This package provides the mongo server software, mongo sharding server -softwware, default configuration files, and init.d scripts. +software, default configuration files, and init.d scripts. %package devel -Summary: Headers and libraries for mongo development. +Summary: Headers and libraries for mongodb development. Group: Applications/Databases %description devel -Mongo (from "huMONGOus") is a schema-free document-oriented database. +MongoDB (from "huMONGOus") is a schema-free document-oriented database. This package provides the mongo static library and header files needed to develop mongo client software. @@ -131,9 +131,13 @@ fi #/etc/rc.d/init.d/mongos %attr(0755,mongod,mongod) %dir /var/lib/mongo %attr(0755,mongod,mongod) %dir /var/log/mongo +%attr(0755,mongod,mongod) %dir /var/run/mongo %attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) /var/log/mongo/mongod.log %changelog +* Fri Feb 17 2012 Michael A. Fiedler <michael@10gen.com> +- Added proper pid file usage + * Thu Jan 28 2010 Richard M Kreuter <richard@10gen.com> - Minor fixes. diff --git a/rpm/mongod.conf b/rpm/mongod.conf index 73ff749534f..060b08dff85 100644 --- a/rpm/mongod.conf +++ b/rpm/mongod.conf @@ -12,6 +12,9 @@ fork = true dbpath=/var/lib/mongo +# location of pidfile +pidfilepath = /var/run/mongodb/mongod.pid + # Disables write-ahead journaling # nojournal = true @@ -38,7 +41,7 @@ dbpath=/var/lib/mongo # 2=R # 3=both # 7=W+some reads -#oplog = 0 +#diaglog = 0 # Ignore query hints #nohints = true |