Permalink
Browse files

Merge branch 'v1.2' of github.com:mongodb/mongo into v1.2

  • Loading branch information...
2 parents 4a7c73f + ee38815 commit 5cf582d3d96b882c400c33e7670b811ccd47f477 @erh erh committed Mar 2, 2010
Showing with 10 additions and 5 deletions.
  1. +4 −2 debian/mongodb.upstart
  2. +2 −2 debian/postinst
  3. +4 −1 debian/rules
@@ -5,6 +5,8 @@ pre-start script
mkdir -p /var/log/mongodb/
end script
-start on runlevel [345]
+start on runlevel [2345]
+stop on runlevel [06]
+
+exec start-stop-daemon --start --quiet --chuid mongodb --exec /usr/bin/mongod -- --config /etc/mongodb.conf
-exec su -c "/usr/bin/mongod --config /etc/mongodb.conf" -s "/bin/sh" mongodb
View
@@ -29,11 +29,11 @@ case "$1" in
# create db -- note: this should agree with dbpath in mongodb.conf
mkdir -p /var/lib/mongodb
- chown mongodb:mongodb /var/lib/mongodb
+ chown -R mongodb:mongodb /var/lib/mongodb
# create logdir -- note: this should agree with logpath in mongodb.conf
mkdir -p /var/log/mongodb
- chown mongodb:mongodb /var/log/mongodb
+ chown -R mongodb:mongodb /var/log/mongodb
;;
abort-upgrade|abort-remove|abort-deconfigure)
View
@@ -35,7 +35,10 @@ clean:
dh_testroot
rm -f build-stamp configure-stamp
- scons -c
+ # FIXME: scons freaks out at the presence of target files
+ # under debian/mongodb.
+ #scons -c
+ rm -rf $(CURDIR)/debian/mongodb
rm -f config.log
rm -f mongo
rm -f mongod

0 comments on commit 5cf582d

Please sign in to comment.