Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SERVER-9275 Fix the location of the pidfile in the rpm and bump rpm to 2.4.1 #403

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rpm/init.d-mongod
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +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"`
PIDFILE=`awk -F= '/^pidfilepath=/{print $2}' "$CONFIGFILE"`
mongod=${MONGOD-/usr/bin/mongod}

MONGO_USER=mongod
Expand Down
8 changes: 7 additions & 1 deletion rpm/mongo.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Name: mongo-10gen
Conflicts: mongo, mongo-10gen-unstable
Obsoletes: mongo-stable
Version: 2.4.0
Version: 2.4.1
Release: mongodb_1%{?dist}
Summary: mongo client shell and tools
License: AGPL 3.0
Expand Down Expand Up @@ -65,6 +65,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
cp -v rpm/mongod.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/mongod
mkdir -p $RPM_BUILD_ROOT/var/lib/mongo
mkdir -p $RPM_BUILD_ROOT/var/log/mongo
mkdir -p $RPM_BUILD_ROOT/var/run/mongo
touch $RPM_BUILD_ROOT/var/log/mongo/mongod.log

%clean
Expand Down Expand Up @@ -140,9 +141,14 @@ 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
* Tue Mar 26 2013 Spencer Rinehart <spencer.rinehart@dominionenterprises.com>
- Fix pidfile location.
- Bump to 2.4.1.

* Thu Jan 28 2010 Richard M Kreuter <richard@10gen.com>
- Minor fixes.

Expand Down
2 changes: 1 addition & 1 deletion rpm/mongod.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ fork = true
dbpath=/var/lib/mongo

# location of pidfile
pidfilepath = /var/run/mongodb/mongod.pid
pidfilepath=/var/run/mongo/mongod.pid

# Disables write-ahead journaling
# nojournal = true
Expand Down