diff options
| -rwxr-xr-x | buildscripts/packager-enterprise.py | 6 | ||||
| -rw-r--r-- | buildscripts/packager.py | 6 | ||||
| -rw-r--r-- | debian/init.d | 6 | ||||
| -rw-r--r-- | debian/mongod.upstart (renamed from debian/mongodb.upstart) | 6 | ||||
| -rw-r--r-- | debian/rules | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/buildscripts/packager-enterprise.py b/buildscripts/packager-enterprise.py index 80ec618dfb2..643c9527c66 100755 --- a/buildscripts/packager-enterprise.py +++ b/buildscripts/packager-enterprise.py @@ -346,10 +346,10 @@ def make_deb(distro, arch, spec, srcdir): suffix=spec.suffix() sdir=setupdir(distro, arch, spec) if re.search("sysvinit", distro.name()): - os.link(sdir+"debian/init.d", sdir+"debian/%s%s.mongodb.init" % (distro.pkgbase(), suffix)) - os.unlink(sdir+"debian/mongodb.upstart") + os.link(sdir+"debian/init.d", sdir+"debian/%s%s-server.mongod.init" % (distro.pkgbase(), suffix)) + os.unlink(sdir+"debian/mongod.upstart") elif re.search("upstart", distro.name()): - os.link(sdir+"debian/mongodb.upstart", sdir+"debian/%s%s.upstart" % (distro.pkgbase(), suffix)) + os.link(sdir+"debian/mongod.upstart", sdir+"debian/%s%s-server.mongod.upstart" % (distro.pkgbase(), suffix)) os.unlink(sdir+"debian/init.d") else: raise Exception("unknown debianoid flavor: not sysvinit or upstart?") diff --git a/buildscripts/packager.py b/buildscripts/packager.py index 48f7968d9b8..d9cd477c860 100644 --- a/buildscripts/packager.py +++ b/buildscripts/packager.py @@ -358,10 +358,10 @@ def make_deb(distro, arch, spec, srcdir): suffix=spec.suffix() sdir=setupdir(distro, arch, spec) if re.search("sysvinit", distro.name()): - os.link(sdir+"debian/init.d", sdir+"debian/%s%s.mongodb.init" % (distro.pkgbase(), suffix)) - os.unlink(sdir+"debian/mongodb.upstart") + os.link(sdir+"debian/init.d", sdir+"debian/%s%s-server.mongod.init" % (distro.pkgbase(), suffix)) + os.unlink(sdir+"debian/mongod.upstart") elif re.search("upstart", distro.name()): - os.link(sdir+"debian/mongodb.upstart", sdir+"debian/%s%s.upstart" % (distro.pkgbase(), suffix)) + os.link(sdir+"debian/mongod.upstart", sdir+"debian/%s%s-server.mongod.upstart" % (distro.pkgbase(), suffix)) os.unlink(sdir+"debian/init.d") else: raise Exception("unknown debianoid flavor: not sysvinit or upstart?") 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/mongodb.upstart b/debian/mongod.upstart index 9a3b50835af..48180ba8a4e 100644 --- a/debian/mongodb.upstart +++ b/debian/mongod.upstart @@ -13,7 +13,7 @@ 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 + 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/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 |