diff options
| author | Antonin Kral <a.kral@bobek.cz> | 2011-08-07 20:13:37 +0200 |
|---|---|---|
| committer | Antonin Kral <a.kral@bobek.cz> | 2011-08-07 20:13:37 +0200 |
| commit | bbf5935b52ba5c34ec5fc02fb9b587b756996c4f (patch) | |
| tree | 4eba0e381d24151615a1fe60a7b8b7c290587750 | |
| parent | 481ce14cfacef6372319f2a5bf2387f26a76ccf1 (diff) | |
| download | mongodb-bbf5935b52ba5c34ec5fc02fb9b587b756996c4f.tar.gz | |
(Closes: #634484) use dbpath and logpath from config file not forcing in init.d
| -rw-r--r-- | debian/mongodb-server.mongodb.init | 19 | ||||
| -rw-r--r-- | debian/mongodb.conf | 8 |
2 files changed, 7 insertions, 20 deletions
diff --git a/debian/mongodb-server.mongodb.init b/debian/mongodb-server.mongodb.init index 34e8c0f..878bba6 100644 --- a/debian/mongodb-server.mongodb.init +++ b/debian/mongodb-server.mongodb.init @@ -28,20 +28,20 @@ # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: An object/document-oriented database -# Description: MongoDB is a high-performance, open source, schema-free +# Description: MongoDB is a high-performance, open source, schema-free # document-oriented data store that's easy to deploy, manage # and use. It's network accessible, written in C++ and offers # the following features: -# +# # * Collection oriented storage - easy storage of object- # style data # * Full index support, including on inner objects # * Query profiling # * Replication and fail-over support -# * Efficient storage of binary data including large +# * Efficient storage of binary data including large # objects (e.g. videos) # * Auto-sharding for cloud-level scalability (Q209) -# +# # High performance, scalability, and reasonable depth of # functionality are the goals for the project. ### END INIT INFO @@ -53,10 +53,7 @@ DESC=database # Default defaults. Can be overridden by the /etc/default/$NAME NAME=mongodb CONF=/etc/mongodb.conf -DATA=/var/lib/mongodb -LOGDIR=/var/log/mongodb PIDFILE=/var/run/$NAME.pid -LOGFILE=$LOGDIR/$NAME.log # Server logfile ENABLE_MONGODB=yes # Include mongodb defaults if available @@ -73,10 +70,6 @@ if test "x$ENABLE_MONGODB" != "xyes"; then exit 0 fi -if test ! -x $DATA; then - mkdir $DATA || exit 0 -fi - . /lib/lsb/init-functions STARTTIME=1 @@ -86,7 +79,7 @@ DIETIME=10 # Time to wait for the server to die, in seconds # 'restart' will not work DAEMONUSER=${DAEMONUSER:-mongodb} -DAEMON_OPTS=${DAEMON_OPTS:-"--dbpath $DATA --logpath $LOGFILE --config $CONF run"} +DAEMON_OPTS=${DAEMON_OPTS:-"--config $CONF run"} set -e @@ -165,7 +158,7 @@ case "$1" in # NOTE: Some servers might die some time after they start, # this code will detect this issue if STARTTIME is set # to a reasonable value - [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time + [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time if running ; then # It's ok, the server started and is running log_end_msg 0 diff --git a/debian/mongodb.conf b/debian/mongodb.conf index 195a8a2..d14966e 100644 --- a/debian/mongodb.conf +++ b/debian/mongodb.conf @@ -1,10 +1,6 @@ # mongodb.conf # Where to store the data. - -# Note: if you run mongodb as a non-root user (recommended) you may -# need to create and set permissions for this directory manually, -# e.g., if the parent directory isn't mutable by the mongodb user. dbpath=/var/lib/mongodb #where to log @@ -12,11 +8,9 @@ logpath=/var/log/mongodb/mongodb.log logappend=true -bind_ip = 127.0.0.1 +bind_ip = 127.0.0.1 #port = 27017 - - # Enables periodic logging of CPU utilization and I/O wait #cpu = true |