From 09ffdcc9274e20b879710cdb5d1271a65e6c6470 Mon Sep 17 00:00:00 2001
From: Ernie Hershey <ernie.hershey@10gen.com>
Date: Thu, 26 Sep 2013 18:06:20 -0400
Subject: SERVER-10871 Change 'mongodb' to 'mongo' to mean the mongod process
 and service

---
 debian/init.d          |  6 +++---
 debian/mongod.upstart  | 19 +++++++++++++++++++
 debian/mongodb.upstart | 19 -------------------
 debian/rules           |  2 +-
 4 files changed, 23 insertions(+), 23 deletions(-)
 create mode 100644 debian/mongod.upstart
 delete mode 100644 debian/mongodb.upstart

(limited to 'debian')

diff --git a/debian/init.d b/debian/init.d
index 85aa24e84a7..013fca55545 100644
--- a/debian/init.d
+++ b/debian/init.d
@@ -20,7 +20,7 @@
 # Suite 330, Boston, MA 02111-1307 USA
 #
 ### BEGIN INIT INFO
-# Provides:          mongodb
+# Provides:          mongod
 # Required-Start:    $network $local_fs $remote_fs
 # Required-Stop:     $network $local_fs $remote_fs
 # Should-Start:      $named
@@ -50,7 +50,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/bin/mongod
 DESC=database
 
-NAME=mongodb
+NAME=mongod
 # Defaults.  Can be overridden by the /etc/default/$NAME
 # Other configuration options are located in $CONF file. See here for more:
 # http://dochub.mongodb.org/core/configurationoptions
@@ -80,7 +80,7 @@ if test ! -x $DAEMON; then
     exit 0
 fi
 
-if test "x$ENABLE_MONGODB" != "xyes"; then
+if test "x$ENABLE_MONGOD" != "xyes"; then
     exit 0
 fi
 
diff --git a/debian/mongod.upstart b/debian/mongod.upstart
new file mode 100644
index 00000000000..48180ba8a4e
--- /dev/null
+++ b/debian/mongod.upstart
@@ -0,0 +1,19 @@
+# Ubuntu upstart file at /etc/init/mongod.conf
+
+limit nofile 20000 20000
+
+kill timeout 300 # wait 300s between SIGTERM and SIGKILL.
+
+pre-start script
+    mkdir -p /var/lib/mongodb/
+    mkdir -p /var/log/mongodb/
+end script
+
+start on runlevel [2345]
+stop on runlevel [06]
+
+script
+  ENABLE_MONGOD="yes"
+  if [ -f /etc/default/mongod ]; then . /etc/default/mongod; fi
+  if [ "x$ENABLE_MONGOD" = "xyes" ]; then exec start-stop-daemon --start --quiet --chuid mongodb --exec  /usr/bin/mongod -- --config /etc/mongod.conf; fi
+end script
diff --git a/debian/mongodb.upstart b/debian/mongodb.upstart
deleted file mode 100644
index 9a3b50835af..00000000000
--- a/debian/mongodb.upstart
+++ /dev/null
@@ -1,19 +0,0 @@
-# Ubuntu upstart file at /etc/init/mongod.conf
-
-limit nofile 20000 20000
-
-kill timeout 300 # wait 300s between SIGTERM and SIGKILL.
-
-pre-start script
-    mkdir -p /var/lib/mongodb/
-    mkdir -p /var/log/mongodb/
-end script
-
-start on runlevel [2345]
-stop on runlevel [06]
-
-script
-  ENABLE_MONGODB="yes"
-  if [ -f /etc/default/mongodb ]; then . /etc/default/mongodb; fi
-  if [ "x$ENABLE_MONGODB" = "xyes" ]; then exec start-stop-daemon --start --quiet --chuid mongodb --exec  /usr/bin/mongod -- --config /etc/mongod.conf; fi
-end script
diff --git a/debian/rules b/debian/rules
index ee0ec73414c..7ba9651507a 100644
--- a/debian/rules
+++ b/debian/rules
@@ -137,7 +137,7 @@ binary-arch: build install
 #	dh_installemacsen
 #	dh_installpam
 #	dh_installmime
-	dh_installinit -pmongodb-org-unstable-server --name=mongodb
+	dh_installinit -pmongodb-org-unstable-server --name=mongod
 #	dh_installinfo
 	dh_installman
 	dh_link
-- 
cgit v1.2.1