Permalink
Browse files

Merge branch 'dotdeb'

  • Loading branch information...
2 parents ff34ec6 + b49e1a6 commit 25d0bcda67d864dccec548a5af81f3ca8824a4f3 @kreuter kreuter committed Feb 3, 2010
Showing with 2 additions and 28 deletions.
  1. +1 −1 debian/control
  2. +0 −23 debian/init.d
  3. +1 −4 debian/{ubuntu/mongodb.conf → mongodb.upstart}
View
@@ -8,7 +8,7 @@ Homepage: http://www.mongodb.org
Package: mongodb
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xulrunner-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, xulrunner
Description: An object/document-oriented database
MongoDB is a high-performance, open source, schema-free
document-oriented data store that's easy to deploy, manage
View
@@ -82,21 +82,6 @@ DIETIME=10 # Time to wait for the server to die, in seconds
DAEMONUSER=${DAEMONUSER:-mongodb}
DAEMON_OPTS=${DAEMON_OPTS:-"--dbpath $DATA --logpath $LOGFILE run"}
-# Check that the user exists (if we set a user)
-# Does the user exist?
-if [ -z "$DAEMONUSER" ]; then
- log_failure_msg "The variable DAEMONUSER is unset or empty."
- exit 1
-else
- # Ensure the user exists.
- if getent passwd | grep -q "^$DAEMONUSER:"; then
- true # pass
- else
- log_failure_msg "The user $DAEMONUSER, required to run $NAME does not exist."
- exit 1
- fi
-fi
-
set -e
@@ -134,18 +119,10 @@ start_server() {
stop_server() {
# Stop the process using the wrapper
- if [ -z "$DAEMONUSER" ] ; then
- start-stop-daemon --stop --quiet --pidfile $PIDFILE
- rm $PIDFILE
- errcode=$?
- else
-# if we are using a daemonuser then look for process that match
start-stop-daemon --stop --quiet --pidfile $PIDFILE \
--user $DAEMONUSER \
--exec $DAEMON
errcode=$?
- fi
-
return $errcode
}
@@ -1,5 +1,4 @@
# Ubuntu upstart file at /etc/init/mongodb.conf
-# Presumes installation of mongodb is in /usr/local/mongodb/
pre-start script
mkdir -p /var/lib/mongodb/
@@ -8,6 +7,4 @@ end script
start on runlevel [345]
-exec /usr/local/mongodb/bin/mongod --config /usr/local/mongodb/mongodb_settings.conf
-
-respawn
+exec /usr/bin/mongod --logappend --dbpath /var/lib/mongodb --logpath /var/log/mongodb/mongodb.log

0 comments on commit 25d0bcd

Please sign in to comment.