DOCS-4569

source/includes/steps-create-manually-windows-service-for-mongodb-enterprise.yaml

@@ -24,8 +24,8 @@ action:
     configuration file:
   language: powershell
   code: |
-    echo logpath=c:\data\log\mongod.log> "C:\Program Files\MongoDB 2.6 Enterprise\mongod.cfg"
-    echo dbpath=c:\data\db>> "C:\Program Files\MongoDB 2.6 Enterprise\mongod.cfg"
+    echo logpath=c:\data\log\mongod.log> "C:\mongodb\mongod.cfg"
+    echo dbpath=c:\data\db>> "C:\mongodb\mongod.cfg"
 ---
 stepnum: 4
 inherit:
@@ -35,7 +35,7 @@ action:
   - pre: "Create the MongoDB service."
     language: powershell
     code: |
-      sc.exe create MongoDB binPath= "\"C:\Program Files\MongoDB 2.6 Enterprise\bin\mongod.exe\" --service --config=\"C:\Program Files\MongoDB 2.6 Enterprise\mongod.cfg\"" DisplayName= "MongoDB 2.6 Enterprise" start= "auto"
+      sc.exe create MongoDB binPath= "\"C:\mongodb\bin\mongod.exe\" --service --config=\"C:\mongodb\mongod.cfg\"" DisplayName= "MongoDB" start= "auto"
     post: |
       ``sc.exe`` requires a space between "=" and the configuration values
       (eg "binPath= "), and a "\" to escape double quotes.

source/includes/steps-create-manually-windows-service-for-mongodb.yaml

@@ -43,8 +43,8 @@ action:
     configuration file:
   language: powershell
   code: |
-    echo logpath=c:\data\log\mongod.log> "C:\Program Files\MongoDB 2.6 Standard\mongod.cfg"
-    echo dbpath=c:\data\db>> "C:\Program Files\MongoDB 2.6 Standard\mongod.cfg"
+    echo logpath=c:\data\log\mongod.log> "C:\mongodb\mongod.cfg"
+    echo dbpath=c:\data\db>> "C:\mongodb\mongod.cfg"
 ---
 title: Create the MongoDB service.
 stepnum: 4
@@ -53,10 +53,10 @@ action:
   - pre: "Create the MongoDB service."
     language: powershell
     code: |
-      sc.exe create MongoDB binPath= "\"C:\Program Files\MongoDB 2.6 Standard\bin\mongod.exe\" --service --config=\"C:\Program Files\MongoDB 2.6 Standard\mongod.cfg\"" DisplayName= "MongoDB 2.6 Standard" start= "auto"
+      sc.exe create MongoDB binPath= "\"C:\mongodb\mongod.exe\" --service --config= \"C:\mongodb\mongod.cfg\"" DisplayName= "MongoDB" start= "auto"
     post: |
       ``sc.exe`` requires a space between "=" and the configuration values
-      (eg "binPath= "), and a "\" to escape double quotes.
+      (eg "binPath= "), and a "\\" to escape double quotes.
   - pre: "If successfully created, the following log message will display:"
     language: powershell
     code: |

source/includes/steps-get-mongodb-enterprise-for-windows.yaml

@@ -0,0 +1,7 @@
+title: Download MongoDB Enterprise for Windows.
+stepnum: 1
+ref: download
+pre: |
+  Download the latest production release of `MongoDB Enterprise
+  <http://www.mongodb.com/products/mongodb-enterprise>`_.
+...

source/includes/steps-get-mongodb-for-windows.yaml

@@ -0,0 +1,36 @@
+title: Determine which MongoDB build you need.
+stepnum: 1
+ref: select-mongodb
+pre: |
+  There are three builds of MongoDB for Windows:
+
+  **MongoDB for Windows 64-bit** runs only
+  on Windows Server 2008 R2, Windows 7 64-bit, and newer versions of
+  Windows. This build takes advantage of recent enhancements to the
+  Windows Platform and cannot operate on older versions of Windows.
+
+  **MongoDB for Windows 32-bit** runs on any 32-bit version of Windows
+  newer than Windows Vista. 32-bit versions of MongoDB are only intended for
+  older systems and for use in testing and development systems. 32-bit
+  versions of MongoDB only support databases smaller than 2GB.
+
+  **MongoDB for Windows 64-bit Legacy** runs on Windows Vista, Windows
+  Server 2003, and Windows Server 2008 and does not include recent
+  performance enhancements.
+action:
+  pre: |
+    To find which version of Windows you are running, enter the following
+    command in the :guilabel:`Command Prompt`:
+  language: powershell
+  code: |
+    wmic os get osarchitecture
+---
+title: Download MongoDB for Windows.
+stepnum: 2
+ref: download
+pre: |
+  Download the latest production release of MongoDB from the `MongoDB
+  downloads page <http://www.mongodb.org/downloads>`_. Ensure you download
+  the correct version of MongoDB for your Windows system. The 64-bit
+  versions of MongoDB does not work with 32-bit Windows.
+...

source/includes/steps-install-mongodb-enterprise-on-windows-unattended.yaml

@@ -0,0 +1,6 @@
+title: Install MongoDB Enterprise for Windows.
+stepnum: 1
+inherit:
+  file: steps-install-mongodb-on-windows-unattended.yaml
+  ref: install
+...

source/includes/steps-install-mongodb-enterprise-on-windows.yaml

@@ -1,20 +1,6 @@
-title: Download MongoDB Enterprise for Windows.
-stepnum: 1
-ref: download
-pre: |
-  Download the latest production release of `MongoDB Enterprise
-  <http://www.mongodb.com/products/mongodb-enterprise>`_
----
 title: Install MongoDB Enterprise for Windows.
-stepnum: 2
-ref: install
-action:
-  pre: |
-    Run the downloaded MSI installer. Make configuration choices as
-    prompted.
-post: |
-  MongoDB is self-contained and does not have any other system
-  dependencies. You can install MongoDB into any folder (e.g.
-  ``D:\test\mongodb``) and run it from there. The installation wizard
-  includes an option to select an installation directory.
+stepnum: 1
+inherit:
+  file: steps-install-mongodb-on-windows.yaml
+  ref: install
 ...

source/includes/steps-install-mongodb-on-windows-unattended.yaml

@@ -0,0 +1,52 @@
+title: Install MongoDB for Windows.
+stepnum: 1
+ref: install
+action:
+  pre: |
+    Open a shell in the directory containing the ``.msi`` installation
+    binary of your choice and invoke:
+  language: powershell
+  code: |
+    msiexec.exe /q /i mongodb-<version>-signed.msi INSTALLLOCATION="<installation directory>"
+  post: |
+    By default, this method installs the following MongoDB binaries:
+    ``mongod.exe``, ``mongo.exe``, ``mongodump.exe``,
+    ``mongorestore.exe``, ``mongoimport.exe``, ``mongoexport.exe``,
+    ``mongostat.exe``, and ``mongotop.exe``.
+    You can specify the installation location for the executable by
+    modifying the ``<installation directory>`` value. To install specific
+    subsets of the binaries, you may specify an ``ADDLOCAL`` argument:
+
+    .. code-block:: powershell
+
+       msiexec.exe /q /i mongodb-<version>-signed.msi INSTALLLOCATION="<installation directory>" ADDLOCAL=<binary set(s)>
+
+    The ``<binary set(s)>`` value is a comma-separated list including one
+    or more of the following:
+
+    - ``Server`` - includes ``mongod.exe``
+
+    - ``Client`` - includes ``mongo.exe``
+
+    - ``MonitoringTools`` - includes ``mongostat.exe`` and ``mongotop.exe``
+
+    - ``ImportExportTools`` - includes ``mongodump.exe``,
+      ``mongorestore.exe``, ``mongoexport.exe``, and ``mongoimport.exe``)
+
+    - ``MiscellaneousTools`` - includes ``bsondump.exe``,
+      ``mongofiles.exe``, ``mongooplog.exe``, and ``mongoperf.exe``
+
+    For instance, to install *only* the entire set of tools to
+    ``C:\mongodb``, invoke:
+
+    .. code-block:: powershell
+
+       msiexec.exe /q /i mongodb-<version>-signed.msi INSTALLLOCATION="C:\mongodb" ADDLOCAL=MonitoringTools,ImportExportTools,MiscellaneousTools
+
+    You may also specify ``ADDLOCAL=ALL`` to install the complete set of
+    binaries, as in the following:
+
+    .. code-block:: powershell
+
+       msiexec.exe /q /i mongodb-<version>-signed.msi INSTALLLOCATION="C:\mongodb" ADDLOCAL=ALL
+...

source/includes/steps-install-mongodb-on-windows.yaml

@@ -1,46 +1,10 @@
-title: Determine which MongoDB build you need.
+title: Install MongoDB for Windows.
 stepnum: 1
-ref: select-mongodb
+ref: install
 pre: |
-  There are three builds of MongoDB for Windows:
-
-  **MongoDB for Windows 64-bit** runs only
-  on Windows Server 2008 R2, Windows 7 64-bit, and newer versions of
-  Windows. This build takes advantage of recent enhancements to the
-  Windows Platform and cannot operate on older versions of Windows.
-
-  **MongoDB for Windows 32-bit** runs on any 32-bit version of Windows
-  newer than Windows Vista. 32-bit versions of MongoDB are only intended for
-  older systems and for use in testing and development systems. 32-bit
-  versions of MongoDB only support databases smaller than 2GB.
-
-  **MongoDB for Windows 64-bit Legacy** runs on Windows Vista, Windows
-  Server 2003, and Windows Server 2008 and does not include recent
-  performance enhancements.
-action:
-  pre: |
-    To find which version of Windows you are running, enter the following
-    command in the :guilabel:`Command Prompt`:
-  language: powershell
-  code: |
-    wmic os get osarchitecture
----
-title: Download MongoDB for Windows.
-stepnum: 2
-ref: download
-pre: |
-  Download the latest production release of MongoDB from the `MongoDB
-  downloads page <http://www.mongodb.org/downloads>`_. Ensure you download
-  the correct version of MongoDB for your Windows system. The 64-bit
-  versions of MongoDB does not work with 32-bit Windows.
----
-title: Install the downloaded file.
-stepnum: 3
-ref: extract
-pre: |
-  In Windows Explorer, locate the downloaded MongoDB ``msi`` file, which
+  In Windows Explorer, locate the downloaded MongoDB ``.msi`` file, which
   typically is located in the default ``Downloads`` folder. Double-click
-  the ``msi`` file. A set of screens will appear to guide you through the
+  the ``.msi`` file. A set of screens will appear to guide you through the
   installation process.
 
   You may specify an installation directory if you choose the "Custom"
@@ -49,5 +13,5 @@ pre: |
 post: |
   MongoDB is self-contained and does not have any other system
   dependencies. You can run MongoDB from any folder you choose. You may
-  install MongoDB in any folder (e.g. ``D:\test\mongodb``)
+  install MongoDB in any folder (e.g. ``D:\test\mongodb``).
 ...

source/release-notes/2.2.txt

@@ -425,7 +425,7 @@ Service Support for ``mongos.exe``
 
 You may now run :program:`mongos.exe` instances as a Windows
 Service. See the :program:`mongos.exe` reference and
-:ref:`tutorial-mongod-as-windows-service` and :issue:`SERVER-1589` for
+:ref:`manually-create-windows-service` and :issue:`SERVER-1589` for
 more information.
 
 Log Rotate Command Support