From e22d2d1af8a054639733985b8620788228a9199e Mon Sep 17 00:00:00 2001 From: Andrew Aldridge Date: Thu, 10 Dec 2015 16:42:43 -0500 Subject: [PATCH] DOCS-6763: Link to past install instructions, and tidy up a bit --- .../extracts-install-past-mongodb.yaml | 116 ++++++++++++++++++ ...installation-bind-ip-default-in-config.rst | 6 +- .../fact-mongodb-org-package-init-scripts.rst | 14 +++ .../list-mongodb-enterprise-packages.rst | 57 +++------ source/includes/list-mongodb-org-packages.rst | 59 +++------ source/includes/note-package-change.rst | 5 - ...-install-mongodb-enterprise-on-ubuntu.yaml | 1 - .../steps-install-mongodb-on-debian.yaml | 12 +- .../steps-install-mongodb-on-red-hat.yaml | 4 - .../steps-install-mongodb-on-ubuntu.yaml | 6 +- .../install-mongodb-enterprise-on-amazon.txt | 2 + .../install-mongodb-enterprise-on-debian.txt | 11 +- .../install-mongodb-enterprise-on-linux.txt | 2 + .../install-mongodb-enterprise-on-red-hat.txt | 11 +- .../install-mongodb-enterprise-on-suse.txt | 2 + .../install-mongodb-enterprise-on-ubuntu.txt | 11 +- .../install-mongodb-enterprise-on-windows.txt | 2 + source/tutorial/install-mongodb-on-amazon.txt | 21 ++-- source/tutorial/install-mongodb-on-debian.txt | 25 ++-- source/tutorial/install-mongodb-on-linux.txt | 12 +- source/tutorial/install-mongodb-on-os-x.txt | 2 + .../tutorial/install-mongodb-on-red-hat.txt | 21 ++-- source/tutorial/install-mongodb-on-suse.txt | 22 ++-- source/tutorial/install-mongodb-on-ubuntu.txt | 25 ++-- .../tutorial/install-mongodb-on-windows.txt | 2 + 25 files changed, 262 insertions(+), 189 deletions(-) create mode 100644 source/includes/extracts-install-past-mongodb.yaml create mode 100644 source/includes/fact-mongodb-org-package-init-scripts.rst delete mode 100644 source/includes/note-package-change.rst diff --git a/source/includes/extracts-install-past-mongodb.yaml b/source/includes/extracts-install-past-mongodb.yaml new file mode 100644 index 00000000000..15c11436f40 --- /dev/null +++ b/source/includes/extracts-install-past-mongodb.yaml @@ -0,0 +1,116 @@ +ref: _install-past-mongodb +content: | + .. note:: + + To install a version of MongoDB prior to 3.2, please refer to that version's + documentation. For example, see version {{installLink}}. +--- + +# Community +ref: install-past-mongodb-org-red-hat +inherit: + file: extracts-install-past-mongodb.yaml + ref: _install-past-mongodb +replacement: + installLink: "`3.0 `_" +--- +ref: install-past-mongodb-org-ubuntu +inherit: + file: extracts-install-past-mongodb.yaml + ref: _install-past-mongodb +replacement: + installLink: "`3.0 `_" +--- +ref: install-past-mongodb-org-debian +inherit: + file: extracts-install-past-mongodb.yaml + ref: _install-past-mongodb +replacement: + installLink: "`3.0 `_" +--- +ref: install-past-mongodb-org-suse +inherit: + file: extracts-install-past-mongodb.yaml + ref: _install-past-mongodb +replacement: + installLink: "`3.0 `_" +--- +ref: install-past-mongodb-org-amazon +inherit: + file: extracts-install-past-mongodb.yaml + ref: _install-past-mongodb +replacement: + installLink: "`3.0 `_" +--- +ref: install-past-mongodb-org-tarball +inherit: + file: extracts-install-past-mongodb.yaml + ref: _install-past-mongodb +replacement: + installLink: "`3.0 `_" +--- +ref: install-past-mongodb-org-windows +inherit: + file: extracts-install-past-mongodb.yaml + ref: _install-past-mongodb +replacement: + installLink: "`3.0 `_" +--- +ref: install-past-mongodb-org-osx +inherit: + file: extracts-install-past-mongodb.yaml + ref: _install-past-mongodb +replacement: + installLink: "`3.0 `_" +--- + +# Enterprise +ref: install-past-mongodb-enterprise-red-hat +inherit: + file: extracts-install-past-mongodb.yaml + ref: _install-past-mongodb +replacement: + installLink: "`3.0 `_" +--- +ref: install-past-mongodb-enterprise-ubuntu +inherit: + file: extracts-install-past-mongodb.yaml + ref: _install-past-mongodb +replacement: + installLink: "`3.0 `_" +--- +ref: install-past-mongodb-enterprise-debian +inherit: + file: extracts-install-past-mongodb.yaml + ref: _install-past-mongodb +replacement: + installLink: "`3.0 `_" +--- +ref: install-past-mongodb-enterprise-suse +inherit: + file: extracts-install-past-mongodb.yaml + ref: _install-past-mongodb +replacement: + installLink: "`3.0 `_" +--- +ref: install-past-mongodb-enterprise-amazon +inherit: + file: extracts-install-past-mongodb.yaml + ref: _install-past-mongodb +replacement: + installLink: "`3.0 `_" +--- +ref: install-past-mongodb-enterprise-tarball +inherit: + file: extracts-install-past-mongodb.yaml + ref: _install-past-mongodb +replacement: + installLink: "`3.0 `_" +--- +ref: install-past-mongodb-enterprise-windows +inherit: + file: extracts-install-past-mongodb.yaml + ref: _install-past-mongodb +replacement: + installLink: "`3.0 `_" +... diff --git a/source/includes/fact-installation-bind-ip-default-in-config.rst b/source/includes/fact-installation-bind-ip-default-in-config.rst index ad74dc9c5c8..b079ffc129d 100644 --- a/source/includes/fact-installation-bind-ip-default-in-config.rst +++ b/source/includes/fact-installation-bind-ip-default-in-config.rst @@ -1,4 +1,4 @@ The default ``/etc/mongod.conf`` configuration file supplied by the -3.0 series packages has :setting:`~net.bind_ip` set to -``127.0.0.1`` by default. Modify this setting as needed for your -environment before initializing a :term:`replica set`. +packages have :setting:`~net.bind_ip` set to ``127.0.0.1`` by default. Modify +this setting as needed for your environment before initializing a +:term:`replica set`. diff --git a/source/includes/fact-mongodb-org-package-init-scripts.rst b/source/includes/fact-mongodb-org-package-init-scripts.rst new file mode 100644 index 00000000000..5e9ca953904 --- /dev/null +++ b/source/includes/fact-mongodb-org-package-init-scripts.rst @@ -0,0 +1,14 @@ +The ``mongodb-org`` package includes various :term:`init scripts +`, including the init script |init-script-path|. You can use these +scripts to stop, start, and restart daemon processes. + +The package configures MongoDB using the ``/etc/mongod.conf`` file in +conjunction with the init scripts. See +the :doc:`Configuration File ` +reference for documentation of settings available in the configuration file. + +As of version |release|, there are no init scripts for +:program:`mongos`. The :program:`mongos` process is used only in +:doc:`sharding `. You can use the ``mongod`` init script +to derive your own :program:`mongos` init script for use in such +environments. See the :program:`mongos` reference for configuration details. diff --git a/source/includes/list-mongodb-enterprise-packages.rst b/source/includes/list-mongodb-enterprise-packages.rst index e0ba7a3efd0..cab7141a3fb 100644 --- a/source/includes/list-mongodb-enterprise-packages.rst +++ b/source/includes/list-mongodb-enterprise-packages.rst @@ -1,47 +1,26 @@ -Packages --------- - MongoDB provides officially supported Enterprise packages in their own repository. This repository contains the following packages: -- ``mongodb-enterprise`` - - This package is a ``metapackage`` that will automatically install - the four component packages listed below. - -- ``mongodb-enterprise-server`` - - This package contains the :program:`mongod` daemon and associated - configuration and init scripts. - -- ``mongodb-enterprise-mongos`` - - This package contains the :program:`mongos` daemon. - -- ``mongodb-enterprise-shell`` - - This package contains the :program:`mongo` shell. - -- ``mongodb-enterprise-tools`` +.. list-table:: + :widths: 25 75 - This package contains the following MongoDB tools: :program:`mongoimport` - :program:`bsondump`, :program:`mongodump`, :program:`mongoexport`, - :program:`mongofiles`, :program:`mongoimport`, :program:`mongooplog`, - :program:`mongoperf`, :program:`mongorestore`, :program:`mongostat`, - and :program:`mongotop`. + * - ``mongodb-enterprise`` + - A ``metapackage`` that will automatically install + the four component packages listed below. -Init Scripts ------------- + * - ``mongodb-enterprise-server`` + - Contains the :program:`mongod` daemon and associated + configuration and init scripts. -The ``mongodb-enterprise`` package includes various :term:`init scripts -`, including the init script ``/etc/rc.d/init.d/mongod``. + * - ``mongodb-enterprise-mongos`` + - Contains the :program:`mongos` daemon. -The package configures MongoDB using the ``/etc/mongod.conf`` file in -conjunction with the init scripts. See -the :doc:`Configuration File ` -reference for documentation of settings available in the configuration file. + * - ``mongodb-enterprise-shell`` + - Contains the :program:`mongo` shell. -As of version |release|, there are no init scripts for -:program:`mongos`. The :program:`mongos` process is used only in -:doc:`sharding `. You can use the ``mongod`` init script -to derive your own :program:`mongos` init script. + * - ``mongodb-enterprise-tools`` + - Contains the following MongoDB tools: :program:`mongoimport` + :program:`bsondump`, :program:`mongodump`, :program:`mongoexport`, + :program:`mongofiles`, :program:`mongooplog`, + :program:`mongoperf`, :program:`mongorestore`, :program:`mongostat`, + and :program:`mongotop`. diff --git a/source/includes/list-mongodb-org-packages.rst b/source/includes/list-mongodb-org-packages.rst index eb977f29f79..48c32c33c10 100644 --- a/source/includes/list-mongodb-org-packages.rst +++ b/source/includes/list-mongodb-org-packages.rst @@ -1,49 +1,26 @@ -Packages --------- - MongoDB provides officially supported packages in their own repository. This repository contains the following packages: -- ``mongodb-org`` - - This package is a ``metapackage`` that will automatically install - the four component packages listed below. - -- ``mongodb-org-server`` - - This package contains the :program:`mongod` daemon and associated - configuration and init scripts. - -- ``mongodb-org-mongos`` - - This package contains the :program:`mongos` daemon. - -- ``mongodb-org-shell`` - - This package contains the :program:`mongo` shell. - -- ``mongodb-org-tools`` +.. list-table:: + :widths: 25 75 - This package contains the following MongoDB tools: :program:`mongoimport` - :program:`bsondump`, :program:`mongodump`, :program:`mongoexport`, - :program:`mongofiles`, :program:`mongooplog`, - :program:`mongoperf`, :program:`mongorestore`, :program:`mongostat`, - and :program:`mongotop`. + * - ``mongodb-org`` + - A ``metapackage`` that will automatically install + the four component packages listed below. -Init Scripts ------------- + * - ``mongodb-org-server`` + - Contains the :program:`mongod` daemon and associated + configuration and init scripts. -The ``mongodb-org`` package includes various :term:`init scripts -`, including the init script |init-script-path|. These scripts -are used to stop, start, and restart daemon processes. + * - ``mongodb-org-mongos`` + - Contains the :program:`mongos` daemon. -The package configures MongoDB using the ``/etc/mongod.conf`` file in -conjunction with the init scripts. See -the :doc:`Configuration File ` -reference for documentation of settings available in the configuration file. + * - ``mongodb-org-shell`` + - Contains the :program:`mongo` shell. -As of version |release|, there are no init scripts for -:program:`mongos`. The :program:`mongos` process is used only in -:doc:`sharding `. You can use the ``mongod`` init script -to derive your own :program:`mongos` init script for use in such -environments. See the :program:`mongos` reference for configuration details. + * - ``mongodb-org-tools`` + - Contains the following MongoDB tools: :program:`mongoimport` + :program:`bsondump`, :program:`mongodump`, :program:`mongoexport`, + :program:`mongofiles`, :program:`mongooplog`, + :program:`mongoperf`, :program:`mongorestore`, :program:`mongostat`, + and :program:`mongotop`. diff --git a/source/includes/note-package-change.rst b/source/includes/note-package-change.rst deleted file mode 100644 index b4cefe95e53..00000000000 --- a/source/includes/note-package-change.rst +++ /dev/null @@ -1,5 +0,0 @@ -.. versionchanged:: 2.6 - - The package structure and names have changed as of version 2.6. For - instructions on installation of an older release, please refer to the - documentation for the appropriate version. diff --git a/source/includes/steps-install-mongodb-enterprise-on-ubuntu.yaml b/source/includes/steps-install-mongodb-enterprise-on-ubuntu.yaml index 35cc39b9641..f6dc8313c17 100644 --- a/source/includes/steps-install-mongodb-enterprise-on-ubuntu.yaml +++ b/source/includes/steps-install-mongodb-enterprise-on-ubuntu.yaml @@ -33,7 +33,6 @@ action: language: sh code: | echo "deb http://repo.mongodb.com/apt/ubuntu "$(lsb_release -sc)"/mongodb-enterprise/2.6 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-enterprise-2.6.list - - pre: | --- stepnum: 3 source: diff --git a/source/includes/steps-install-mongodb-on-debian.yaml b/source/includes/steps-install-mongodb-on-debian.yaml index 5f141641fd8..bc8523f8f77 100644 --- a/source/includes/steps-install-mongodb-on-debian.yaml +++ b/source/includes/steps-install-mongodb-on-debian.yaml @@ -1,13 +1,7 @@ -title: Import the public key used by the package management system. stepnum: 1 -ref: import-key -action: - pre: | - Issue the following command to add the `MongoDB public GPG Key - `_ to the system key ring. - language: sh - code: | - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com --recv EA312927 +source: + file: steps-install-mongodb-on-ubuntu.yaml + ref: import-key --- title: Create a ``/etc/apt/sources.list.d/mongodb-org-3.2.list`` file for MongoDB. stepnum: 2 diff --git a/source/includes/steps-install-mongodb-on-red-hat.yaml b/source/includes/steps-install-mongodb-on-red-hat.yaml index 1a40d2b653f..39acc31c55e 100644 --- a/source/includes/steps-install-mongodb-on-red-hat.yaml +++ b/source/includes/steps-install-mongodb-on-red-hat.yaml @@ -72,8 +72,4 @@ action: language: ini code: | exclude=mongodb-org,mongodb-org-server,mongodb-org-shell,mongodb-org-mongos,mongodb-org-tools -post: | - Versions of the MongoDB packages before 2.6 use a different repo - location. Refer to the version of the documentation appropriate for - your MongoDB version. ... diff --git a/source/includes/steps-install-mongodb-on-ubuntu.yaml b/source/includes/steps-install-mongodb-on-ubuntu.yaml index 9ec62d420a1..7fe5e648bca 100644 --- a/source/includes/steps-install-mongodb-on-ubuntu.yaml +++ b/source/includes/steps-install-mongodb-on-ubuntu.yaml @@ -6,7 +6,7 @@ action: The Ubuntu package management tools (i.e. ``dpkg`` and ``apt``) ensure package consistency and authenticity by requiring that distributors sign packages with GPG keys. Issue the following command to import the - `MongoDB public GPG Key `_: + `MongoDB public GPG Key `_: language: sh code: | sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv EA312927 @@ -78,8 +78,4 @@ action: echo "mongodb-org-shell hold" | sudo dpkg --set-selections echo "mongodb-org-mongos hold" | sudo dpkg --set-selections echo "mongodb-org-tools hold" | sudo dpkg --set-selections -post: | - Versions of the MongoDB packages before 2.6 use a different repository - location. Refer to the version of the documentation appropriate for - your MongoDB version. ... diff --git a/source/tutorial/install-mongodb-enterprise-on-amazon.txt b/source/tutorial/install-mongodb-enterprise-on-amazon.txt index bea317067d2..7393c421022 100644 --- a/source/tutorial/install-mongodb-enterprise-on-amazon.txt +++ b/source/tutorial/install-mongodb-enterprise-on-amazon.txt @@ -32,6 +32,8 @@ To install all of MongoDB's dependencies, run the following command: Install MongoDB Enterprise -------------------------- +.. include:: /includes/extracts/install-past-mongodb-enterprise-amazon.rst + .. note:: The Enterprise packages include an example SNMP configuration file diff --git a/source/tutorial/install-mongodb-enterprise-on-debian.txt b/source/tutorial/install-mongodb-enterprise-on-debian.txt index 9af37bf0592..b7075670aa1 100644 --- a/source/tutorial/install-mongodb-enterprise-on-debian.txt +++ b/source/tutorial/install-mongodb-enterprise-on-debian.txt @@ -23,18 +23,15 @@ Debian 7 "Wheezy". .. include:: /includes/list-mongodb-enterprise-packages.rst -Considerations --------------- +Install MongoDB Enterprise +-------------------------- -.. include:: /includes/fact-installation-64bit.rst +.. include:: /includes/extracts/install-past-mongodb-enterprise-debian.rst -.. include:: /includes/note-package-change.rst +.. include:: /includes/fact-installation-64bit.rst .. include:: /includes/fact-use-distribution-package.rst -Install MongoDB Enterprise --------------------------- - .. include:: /includes/steps/install-mongodb-enterprise-on-debian.rst .. _install-debian-from-tarball: diff --git a/source/tutorial/install-mongodb-enterprise-on-linux.txt b/source/tutorial/install-mongodb-enterprise-on-linux.txt index c65944a400f..77dd6ca5083 100644 --- a/source/tutorial/install-mongodb-enterprise-on-linux.txt +++ b/source/tutorial/install-mongodb-enterprise-on-linux.txt @@ -20,6 +20,8 @@ installing MongoDB for other Linux systems without supported packages. Install MongoDB --------------- +.. include:: /includes/extracts/install-past-mongodb-enterprise-tarball.rst + .. include:: /includes/steps/install-mongodb-enterprise-on-linux.rst Run MongoDB diff --git a/source/tutorial/install-mongodb-enterprise-on-red-hat.txt b/source/tutorial/install-mongodb-enterprise-on-red-hat.txt index c0a7aa5eb86..acb57d3da9a 100644 --- a/source/tutorial/install-mongodb-enterprise-on-red-hat.txt +++ b/source/tutorial/install-mongodb-enterprise-on-red-hat.txt @@ -26,22 +26,19 @@ Linux versions 5, 6, and 7 from ``.rpm`` packages. .. include:: /includes/list-mongodb-enterprise-packages.rst -Considerations --------------- - -.. include:: /includes/fact-use-distribution-package.rst - .. include:: /includes/fact-installation-bind-ip-default-in-config.rst -.. include:: /includes/note-package-change.rst - Install MongoDB Enterprise -------------------------- +.. include:: /includes/extracts/install-past-mongodb-enterprise-red-hat.rst + When you install the packages for MongoDB Enterprise, you choose whether to install the current release or a previous one. This procedure describes how to do both. +.. include:: /includes/fact-use-distribution-package.rst + .. include:: /includes/steps/install-mongodb-enterprise-on-red-hat.rst .. _install-redhat-from-tarball: diff --git a/source/tutorial/install-mongodb-enterprise-on-suse.txt b/source/tutorial/install-mongodb-enterprise-on-suse.txt index 7970938aaf2..fcc5a49ac16 100644 --- a/source/tutorial/install-mongodb-enterprise-on-suse.txt +++ b/source/tutorial/install-mongodb-enterprise-on-suse.txt @@ -37,6 +37,8 @@ Enterprise Linux version 11. Install MongoDB Enterprise -------------------------- +.. include:: /includes/extracts/install-past-mongodb-enterprise-suse.rst + .. include:: /includes/steps/install-mongodb-enterprise-on-suse.rst .. _install-suse-from-tarball: diff --git a/source/tutorial/install-mongodb-enterprise-on-ubuntu.txt b/source/tutorial/install-mongodb-enterprise-on-ubuntu.txt index 14b563a397b..4994e39f1a0 100644 --- a/source/tutorial/install-mongodb-enterprise-on-ubuntu.txt +++ b/source/tutorial/install-mongodb-enterprise-on-ubuntu.txt @@ -23,18 +23,15 @@ Use this tutorial to install :products:`MongoDB Enterprise .. include:: /includes/list-mongodb-enterprise-packages.rst -Considerations --------------- +Install MongoDB Enterprise +-------------------------- -.. include:: /includes/fact-ubuntu-lts-support.rst +.. include:: /includes/extracts/install-past-mongodb-enterprise-ubuntu.rst -.. include:: /includes/note-package-change.rst +.. include:: /includes/fact-ubuntu-lts-support.rst .. include:: /includes/fact-use-distribution-package.rst -Install MongoDB Enterprise --------------------------- - .. include:: /includes/steps/install-mongodb-enterprise-on-ubuntu.rst .. _install-ubuntu-from-tarball: diff --git a/source/tutorial/install-mongodb-enterprise-on-windows.txt b/source/tutorial/install-mongodb-enterprise-on-windows.txt index 6aa1466bcd8..6bcd6ac33a7 100644 --- a/source/tutorial/install-mongodb-enterprise-on-windows.txt +++ b/source/tutorial/install-mongodb-enterprise-on-windows.txt @@ -31,6 +31,8 @@ file. Get MongoDB Enterprise ---------------------- +.. include:: /includes/extracts/install-past-mongodb-enterprise-windows.rst + .. include:: /includes/steps/get-mongodb-enterprise-for-windows.rst Install MongoDB Enterprise diff --git a/source/tutorial/install-mongodb-on-amazon.txt b/source/tutorial/install-mongodb-on-amazon.txt index 4e2ef7e52c1..23276d8d09c 100644 --- a/source/tutorial/install-mongodb-on-amazon.txt +++ b/source/tutorial/install-mongodb-on-amazon.txt @@ -18,25 +18,26 @@ Use this tutorial to install MongoDB Community Edition on Amazon Linux from .. include:: /includes/fact-installation-64bit.rst -.. The following include includes two h2 headers: -.. Packages and Init Scripts - -.. |init-script-path| replace:: ``/etc/rc.d/init.d/mongod`` +Packages +-------- .. include:: /includes/list-mongodb-org-packages.rst -Considerations --------------- - -.. include:: /includes/fact-installation-64bit.rst - .. include:: /includes/fact-installation-bind-ip-default-in-config.rst -.. include:: /includes/note-package-change.rst +Init Scripts +------------ + +.. |init-script-path| replace:: ``/etc/rc.d/init.d/mongod`` +.. include:: /includes/fact-mongodb-org-package-init-scripts.rst Install MongoDB Community Edition --------------------------------- +.. include:: /includes/extracts/install-past-mongodb-org-amazon.rst + +.. include:: /includes/fact-installation-64bit.rst + .. include:: /includes/steps/install-mongodb-on-amazon.rst Run MongoDB Community Edition diff --git a/source/tutorial/install-mongodb-on-debian.txt b/source/tutorial/install-mongodb-on-debian.txt index a7e555e5ed5..9230ade28ed 100644 --- a/source/tutorial/install-mongodb-on-debian.txt +++ b/source/tutorial/install-mongodb-on-debian.txt @@ -20,28 +20,29 @@ official MongoDB Community Edition packages are more up to date. MongoDB only provides packages for 64-bit Debian "Wheezy". These packages may work with other Debian releases, but this is not a supported configuration. -.. The following include includes two h2 headers: -.. Packages and Init Scripts +Packages +-------- -.. |init-script-path| replace:: ``/etc/init.d/mongod`` .. include:: /includes/list-mongodb-org-packages.rst -Considerations --------------- - -.. include:: /includes/fact-installation-64bit.rst - -You cannot install this package concurrently with the ``mongodb``, -``mongodb-server``, or ``mongodb-clients`` packages that -your release of Debian may include. +These packages conflict with the ``mongodb``, ``mongodb-server``, and +``mongodb-clients`` packages provided by Debian. .. include:: /includes/fact-installation-bind-ip-default-in-config.rst -.. include:: /includes/note-package-change.rst +Init Scripts +------------ + +.. |init-script-path| replace:: ``/etc/init.d/mongod`` +.. include:: /includes/fact-mongodb-org-package-init-scripts.rst Install MongoDB Community Edition --------------------------------- +.. include:: /includes/extracts/install-past-mongodb-org-debian.rst + +.. include:: /includes/fact-installation-64bit.rst + The Debian package management tools (i.e. ``dpkg`` and ``apt``) ensure package consistency and authenticity by requiring that distributors sign packages with GPG keys. diff --git a/source/tutorial/install-mongodb-on-linux.txt b/source/tutorial/install-mongodb-on-linux.txt index ee4b62f11a4..a5215b9dca0 100644 --- a/source/tutorial/install-mongodb-on-linux.txt +++ b/source/tutorial/install-mongodb-on-linux.txt @@ -18,19 +18,13 @@ Compiled versions of MongoDB Community Edition for Linux provide a simple option for installing MongoDB Community Edition for other Linux systems without supported packages. -Considerations --------------- - -For production deployments, always run MongoDB on 64-bit systems. - Install MongoDB Community Edition --------------------------------- -MongoDB provides archives for both 64-bit and 32-bit Linux. Follow the -installation procedure appropriate for your system. +MongoDB provides archives for both 64-bit and 32-bit (depreciated) builds of +Linux. Follow the installation procedure appropriate for your system. -.. note:: - .. include:: /includes/fact-deprecated-32bit.rst +.. include:: /includes/extracts/install-past-mongodb-org-tarball.rst Install for 64-bit Linux ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/source/tutorial/install-mongodb-on-os-x.txt b/source/tutorial/install-mongodb-on-os-x.txt index bd7002a886c..e9616d0aec1 100644 --- a/source/tutorial/install-mongodb-on-os-x.txt +++ b/source/tutorial/install-mongodb-on-os-x.txt @@ -27,6 +27,8 @@ MongoDB Community Edition is available through the popular OS X package manager Install MongoDB Community Edition --------------------------------- +.. include:: /includes/extracts/install-past-mongodb-org-osx.rst + You can install MongoDB Community Edition with `Homebrew `_ or manually. This section describes both methods. diff --git a/source/tutorial/install-mongodb-on-red-hat.txt b/source/tutorial/install-mongodb-on-red-hat.txt index aca260caa86..53d3df3f146 100644 --- a/source/tutorial/install-mongodb-on-red-hat.txt +++ b/source/tutorial/install-mongodb-on-red-hat.txt @@ -22,25 +22,28 @@ Community Edition packages are generally more up to date. .. include:: /includes/fact-installation-64bit.rst -.. The following include includes two h2 headers: -.. Packages and Init Scripts - -.. |init-script-path| replace:: ``/etc/rc.d/init.d/mongod`` +Packages +-------- .. include:: /includes/list-mongodb-org-packages.rst -Considerations --------------- +.. include:: /includes/fact-installation-bind-ip-default-in-config.rst -.. include:: /includes/fact-installation-64bit.rst +Init Scripts +------------ -.. include:: /includes/fact-installation-bind-ip-default-in-config.rst +.. |init-script-path| replace:: ``/etc/rc.d/init.d/mongod`` +.. include:: /includes/fact-mongodb-org-package-init-scripts.rst -.. include:: /includes/note-package-change.rst +.. include:: /includes/fact-installation-bind-ip-default-in-config.rst Install MongoDB Community Edition --------------------------------- +.. include:: /includes/extracts/install-past-mongodb-org-red-hat.rst + +.. include:: /includes/fact-installation-64bit.rst + .. include:: /includes/steps/install-mongodb-on-red-hat.rst Run MongoDB Community Edition diff --git a/source/tutorial/install-mongodb-on-suse.txt b/source/tutorial/install-mongodb-on-suse.txt index 4e239383c6d..6578e1acf35 100644 --- a/source/tutorial/install-mongodb-on-suse.txt +++ b/source/tutorial/install-mongodb-on-suse.txt @@ -22,27 +22,31 @@ more up to date. .. include:: /includes/fact-installation-64bit.rst -.. The following include includes two h2 headers: -.. Packages and Init Scripts - -.. |init-script-path| replace:: ``/etc/rc.d/init.d/mongod`` +Packages +-------- .. include:: /includes/list-mongodb-org-packages.rst -Considerations --------------- - -.. include:: /includes/fact-installation-64bit.rst +These packages conflict with the ``mongodb``, ``mongodb-server``, and +``mongodb-clients`` packages provided by Ubuntu. .. include:: /includes/fact-installation-bind-ip-default-in-config.rst -.. include:: /includes/note-package-change.rst +Init Scripts +------------ + +.. |init-script-path| replace:: ``/etc/rc.d/init.d/mongod`` +.. include:: /includes/fact-mongodb-org-package-init-scripts.rst .. include:: /includes/note-suse-ulimit.rst Install MongoDB Community Edition --------------------------------- +.. include:: /includes/extracts/install-past-mongodb-org-suse.rst + +.. include:: /includes/fact-installation-64bit.rst + .. include:: /includes/steps/install-mongodb-on-suse.rst Run MongoDB Community Edition diff --git a/source/tutorial/install-mongodb-on-ubuntu.txt b/source/tutorial/install-mongodb-on-ubuntu.txt index 1c147737ee4..1f4cfa59be8 100644 --- a/source/tutorial/install-mongodb-on-ubuntu.txt +++ b/source/tutorial/install-mongodb-on-ubuntu.txt @@ -21,28 +21,29 @@ MongoDB Community Edition packages are generally more up-to-date. .. include:: /includes/fact-ubuntu-lts-support.rst -.. The following include includes two h2 headers: -.. Packages and Init Scripts - -.. |init-script-path| replace:: ``/etc/init.d/mongod`` +Packages +-------- .. include:: /includes/list-mongodb-org-packages.rst -Considerations --------------- - -.. include:: /includes/fact-ubuntu-lts-support.rst - -You cannot install these packages concurrently with the ``mongodb``, -``mongodb-server``, or ``mongodb-clients`` packages provided by Ubuntu. +These packages conflict with the ``mongodb``, ``mongodb-server``, and +``mongodb-clients`` packages provided by Ubuntu. .. include:: /includes/fact-installation-bind-ip-default-in-config.rst -.. include:: /includes/note-package-change.rst +Init Scripts +------------ + +.. |init-script-path| replace:: ``/etc/init.d/mongod`` +.. include:: /includes/fact-mongodb-org-package-init-scripts.rst Install MongoDB Community Edition --------------------------------- +.. include:: /includes/extracts/install-past-mongodb-org-ubuntu.rst + +.. include:: /includes/fact-ubuntu-lts-support.rst + .. include:: /includes/steps/install-mongodb-on-ubuntu.rst Run MongoDB Community Edition diff --git a/source/tutorial/install-mongodb-on-windows.txt b/source/tutorial/install-mongodb-on-windows.txt index 17f78ed9ac1..2c77fadc1a1 100644 --- a/source/tutorial/install-mongodb-on-windows.txt +++ b/source/tutorial/install-mongodb-on-windows.txt @@ -36,6 +36,8 @@ using an ``.msi`` file. Get MongoDB Community Edition ----------------------------- +.. include:: /includes/extracts/install-past-mongodb-org-windows.rst + .. include:: /includes/steps/get-mongodb-for-windows.rst Install MongoDB Community Edition