From 5d5d9f6723f0116fdb1a48c27315bf5af9098ad5 Mon Sep 17 00:00:00 2001 From: Michael Paik Date: Mon, 2 Mar 2015 18:49:37 -0500 Subject: [PATCH 1/4] DOCS-4569 Windows fixes --- source/includes/fact-windows-unattended.rst | 48 +------------- ...configure-windows-service-for-mongodb.yaml | 65 ------------------- ...indows-service-for-mongodb-enterprise.yaml | 6 +- ...-manually-windows-service-for-mongodb.yaml | 6 +- ...ps-get-mongodb-enterprise-for-windows.yaml | 7 ++ .../steps-get-mongodb-for-windows.yaml | 36 ++++++++++ ...install-mongodb-enterprise-on-windows.yaml | 22 ++----- ...install-mongodb-on-windows-unattended.yaml | 52 +++++++++++++++ .../steps-install-mongodb-on-windows.yaml | 40 +----------- source/release-notes/2.2.txt | 2 +- .../install-mongodb-enterprise-on-windows.txt | 37 ++++++----- .../tutorial/install-mongodb-on-windows.txt | 36 +++++----- source/tutorial/manage-mongodb-processes.txt | 10 +-- 13 files changed, 153 insertions(+), 214 deletions(-) delete mode 100644 source/includes/steps-configure-windows-service-for-mongodb.yaml create mode 100644 source/includes/steps-get-mongodb-enterprise-for-windows.yaml create mode 100644 source/includes/steps-get-mongodb-for-windows.yaml create mode 100644 source/includes/steps-install-mongodb-on-windows-unattended.yaml diff --git a/source/includes/fact-windows-unattended.rst b/source/includes/fact-windows-unattended.rst index bda0dd32697..d00670f84fe 100644 --- a/source/includes/fact-windows-unattended.rst +++ b/source/includes/fact-windows-unattended.rst @@ -1,48 +1,4 @@ You may install MongoDB unattended on Windows from the command line -using ``msiexec.exe``. Open a shell in the directory containing the -``.msi`` installation binary of your choice and invoke: +using ``msiexec.exe``. -.. code-block:: powershell - - msiexec.exe /q /i mongodb--signed.msi INSTALLLOCATION="" - -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 ```` value. To install specific -subsets of the binaries, you may specify an``ADDLOCAL`` argument: - -.. code-block:: powershell - - msiexec.exe /q /i mongodb--signed.msi INSTALLLOCATION="" ADDLOCAL= - -The ```` 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--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--signed.msi INSTALLLOCATION="C:\mongodb" ADDLOCAL=ALL +.. include:: /includes/steps/install-mongodb-on-windows-unattended.rst diff --git a/source/includes/steps-configure-windows-service-for-mongodb.yaml b/source/includes/steps-configure-windows-service-for-mongodb.yaml deleted file mode 100644 index 444e969c65f..00000000000 --- a/source/includes/steps-configure-windows-service-for-mongodb.yaml +++ /dev/null @@ -1,65 +0,0 @@ -title: Configure directories and files. -stepnum: 1 -ref: directories -pre: | - Create a :doc:`configuration file ` - and a directory path for MongoDB log output (:setting:`logpath`): -action: - - pre: | - Create a specific directory for MongoDB log files: - language: powershell - code: | - md "C:\mongodb\log" - - pre: | - In the :guilabel:`Command Prompt`, create a configuration file for - the :setting:`logpath` option for MongoDB: - language: powershell - code: | - echo logpath=C:\mongodb\log\mongo.log > "C:\mongodb\mongod.cfg" ---- -title: Run the MongoDB service. -stepnum: 2 -ref: mongodb-service -pre: | - Run all of the following commands in :guilabel:`Command Prompt` with - "Administrative Privileges:" -action: - - pre: | - Install the MongoDB service. For :option:`--install ` to succeed, you *must* specify the :setting:`logpath` - run-time option. - language: powershell - code: | - "C:\mongodb\bin\mongod.exe" --config "C:\mongodb\mongod.cfg" --install - - pre: | - Modify the path to the ``mongod.cfg`` file as needed. -post: | - To use an alternate :setting:`dbpath`, specify the path in the - configuration file (e.g. ``C:\mongodb\mongod.cfg``) or - on the command line with the :option:`--dbpath ` option. - - If the :setting:`dbpath` directory does not exist, :program:`mongod.exe` - will not start. The default value for :setting:`dbpath` is ``\data\db``. - - If needed, you can install services for multiple instances of - :program:`mongod.exe` or :program:`mongos.exe`. Install each service - with a unique :option:`--serviceName ` and - :option:`--serviceDisplayName `. Use - multiple instances only when sufficient system resources exist and your - system design requires it. ---- -title: Stop or remove the MongoDB service as needed. -stepnum: 3 -ref: stop -action: - - pre: | - To stop the MongoDB service use the following command: - language: powershell - code: | - net stop MongoDB - - pre: | - To remove the MongoDB service use the following command: - language: powershell - code: | - "C:\mongodb\bin\mongod.exe" --remove -... diff --git a/source/includes/steps-create-manually-windows-service-for-mongodb-enterprise.yaml b/source/includes/steps-create-manually-windows-service-for-mongodb-enterprise.yaml index af432f94e7c..2aae14a0e16 100644 --- a/source/includes/steps-create-manually-windows-service-for-mongodb-enterprise.yaml +++ b/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. diff --git a/source/includes/steps-create-manually-windows-service-for-mongodb.yaml b/source/includes/steps-create-manually-windows-service-for-mongodb.yaml index b66c3ab170f..711014cce27 100644 --- a/source/includes/steps-create-manually-windows-service-for-mongodb.yaml +++ b/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,7 +53,7 @@ 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. diff --git a/source/includes/steps-get-mongodb-enterprise-for-windows.yaml b/source/includes/steps-get-mongodb-enterprise-for-windows.yaml new file mode 100644 index 00000000000..8cbd815e3df --- /dev/null +++ b/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 + `_ +... diff --git a/source/includes/steps-get-mongodb-for-windows.yaml b/source/includes/steps-get-mongodb-for-windows.yaml new file mode 100644 index 00000000000..8473ed619df --- /dev/null +++ b/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 `_. 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. +... \ No newline at end of file diff --git a/source/includes/steps-install-mongodb-enterprise-on-windows.yaml b/source/includes/steps-install-mongodb-enterprise-on-windows.yaml index d5b3d8f533f..e2eb4ab509b 100644 --- a/source/includes/steps-install-mongodb-enterprise-on-windows.yaml +++ b/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 - `_ ---- 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 ... diff --git a/source/includes/steps-install-mongodb-on-windows-unattended.yaml b/source/includes/steps-install-mongodb-on-windows-unattended.yaml new file mode 100644 index 00000000000..ec2b2a78c96 --- /dev/null +++ b/source/includes/steps-install-mongodb-on-windows-unattended.yaml @@ -0,0 +1,52 @@ +title: Install the downloaded file. +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--signed.msi INSTALLLOCATION="" + 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 ```` value. To install specific + subsets of the binaries, you may specify an ``ADDLOCAL`` argument: + + .. code-block:: powershell + + msiexec.exe /q /i mongodb--signed.msi INSTALLLOCATION="" ADDLOCAL= + + The ```` 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--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--signed.msi INSTALLLOCATION="C:\mongodb" ADDLOCAL=ALL +... \ No newline at end of file diff --git a/source/includes/steps-install-mongodb-on-windows.yaml b/source/includes/steps-install-mongodb-on-windows.yaml index f9d77cf664e..9ddbf49d089 100644 --- a/source/includes/steps-install-mongodb-on-windows.yaml +++ b/source/includes/steps-install-mongodb-on-windows.yaml @@ -1,42 +1,6 @@ -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 `_. 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 +stepnum: 1 +ref: install pre: | In Windows Explorer, locate the downloaded MongoDB ``msi`` file, which typically is located in the default ``Downloads`` folder. Double-click diff --git a/source/release-notes/2.2.txt b/source/release-notes/2.2.txt index 116221b6c79..b70a2015f33 100644 --- a/source/release-notes/2.2.txt +++ b/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 diff --git a/source/tutorial/install-mongodb-enterprise-on-windows.txt b/source/tutorial/install-mongodb-enterprise-on-windows.txt index 856b1f3b862..999287b030c 100644 --- a/source/tutorial/install-mongodb-enterprise-on-windows.txt +++ b/source/tutorial/install-mongodb-enterprise-on-windows.txt @@ -17,13 +17,28 @@ Prerequisites ------------- MongoDB Enterprise Server for Windows requires Windows Server 2008 R2 or -later. The MSI installer includes all other software dependencies. +later. The MSI installer includes all other software dependencies and will +automatically upgrade any older version of MongoDB installed using an MSI +file. + +Get MongoDB Enterprise +---------------------- + +.. include:: /includes/steps/get-mongodb-enterprise-for-windows.rst Install MongoDB Enterprise -------------------------- +Interactive Installation +~~~~~~~~~~~~~~~~~~~~~~~~ + .. include:: /includes/steps/install-mongodb-enterprise-on-windows.rst +Unattended Installation +~~~~~~~~~~~~~~~~~~~~~~~ + +.. include:: /includes/fact-windows-unattended.rst + Run MongoDB Enterprise ---------------------- @@ -36,32 +51,18 @@ Run MongoDB Enterprise .. include:: /includes/steps/run-mongodb-on-windows.rst -Configure a Windows Service for MongoDB Enterprise --------------------------------------------------- - -You can set up the MongoDB server as a :guilabel:`Windows Service` that -starts automatically at boot time. - -.. include:: /includes/steps/configure-windows-service-for-mongodb.rst - .. _manually-create-windows-service-enterprise: Manually Create a Windows Service for MongoDB Enterprise -------------------------------------------------------- -Interactive Installation -~~~~~~~~~~~~~~~~~~~~~~~~ +You can set up the MongoDB server as a :guilabel:`Windows Service` that +starts automatically at boot time. The following procedure assumes you have installed MongoDB using the -MSI installer, with the default path ``C:\Program Files\MongoDB 2.6 -Enterprise``. +MSI installer, with the default path ``C:\MongoDB\``. If you have installed in an alternative directory, you will need to adjust the paths as appropriate. .. include:: /includes/steps/create-manually-windows-service-for-mongodb-enterprise.rst - -Unattended Installation -~~~~~~~~~~~~~~~~~~~~~~~ - -.. include:: /includes/fact-windows-unattended.rst diff --git a/source/tutorial/install-mongodb-on-windows.txt b/source/tutorial/install-mongodb-on-windows.txt index ee3937b6dae..faea603ec0a 100644 --- a/source/tutorial/install-mongodb-on-windows.txt +++ b/source/tutorial/install-mongodb-on-windows.txt @@ -23,13 +23,28 @@ Requirements ------------ On Windows MongoDB requires Windows Server 2008 R2, Windows Vista, or -later. The MSI installer includes all other software dependencies. +later. The MSI installer includes all other software dependencies and will +automatically upgrade any older version of MongoDB installed using an MSI +file. + +Get MongoDB +----------- + +.. include:: /includes/steps/get-mongodb-for-windows.rst Install MongoDB --------------- +Interactive Installation +~~~~~~~~~~~~~~~~~~~~~~~~ + .. include:: /includes/steps/install-mongodb-on-windows.rst +Unattended Installation +~~~~~~~~~~~~~~~~~~~~~~~ + +.. include:: /includes/fact-windows-unattended.rst + Run MongoDB ----------- @@ -42,31 +57,18 @@ Run MongoDB .. include:: /includes/steps/run-mongodb-on-windows.rst -.. _tutorial-mongod-as-windows-service: - -Configure a Windows Service for MongoDB ---------------------------------------- - -.. include:: /includes/steps/configure-windows-service-for-mongodb.rst - .. _manually-create-windows-service: Manually Create a Windows Service for MongoDB --------------------------------------------- -Interactive Installation -~~~~~~~~~~~~~~~~~~~~~~~~ +You can set up the MongoDB server as a :guilabel:`Windows Service` that +starts automatically at boot time. The following procedure assumes you have installed MongoDB using the -MSI installer, with the default path ``C:\Program Files\MongoDB -2.6 Standard``. +MSI installer with the path ``C:\mongodb\``. If you have installed in an alternative directory, you will need to adjust the paths as appropriate. .. include:: /includes/steps/create-manually-windows-service-for-mongodb.rst - -Unattended Installation -~~~~~~~~~~~~~~~~~~~~~~~ - -.. include:: /includes/fact-windows-unattended.rst diff --git a/source/tutorial/manage-mongodb-processes.txt b/source/tutorial/manage-mongodb-processes.txt index 32abb534424..9d9e11fd265 100644 --- a/source/tutorial/manage-mongodb-processes.txt +++ b/source/tutorial/manage-mongodb-processes.txt @@ -4,11 +4,11 @@ Manage ``mongod`` Processes .. default-domain:: mongodb -MongoDB runs as a standard program. You can start MongoDB from a command -line by issuing the :program:`mongod` command and specifying options. -For a list of options, see the :program:`mongod` reference. MongoDB can also run -as a Windows service. For details, see -:ref:`tutorial-mongod-as-windows-service`. To install MongoDB, see +MongoDB runs as a standard program. You can start MongoDB from a +command line by issuing the :program:`mongod` command and specifying +options. For a list of options, see the :program:`mongod` +reference. MongoDB can also run as a Windows service. For details, see +:ref:`manually-create-windows-service`. To install MongoDB, see :doc:`/installation`. The following examples assume the directory containing the From 7670c8d909311d288e4217ec519514552de1997b Mon Sep 17 00:00:00 2001 From: Michael Paik Date: Mon, 2 Mar 2015 19:02:37 -0500 Subject: [PATCH 2/4] DOCS-4569 Further edits --- source/includes/fact-windows-unattended.rst | 2 +- .../steps-get-mongodb-enterprise-for-windows.yaml | 2 +- ...-install-mongodb-enterprise-on-windows-unattended.yaml | 6 ++++++ .../steps-install-mongodb-on-windows-unattended.yaml | 2 +- source/includes/steps-install-mongodb-on-windows.yaml | 8 ++++---- source/tutorial/install-mongodb-enterprise-on-windows.txt | 6 +++--- source/tutorial/install-mongodb-on-windows.txt | 8 ++++---- 7 files changed, 20 insertions(+), 14 deletions(-) create mode 100644 source/includes/steps-install-mongodb-enterprise-on-windows-unattended.yaml diff --git a/source/includes/fact-windows-unattended.rst b/source/includes/fact-windows-unattended.rst index d00670f84fe..5f220e9287a 100644 --- a/source/includes/fact-windows-unattended.rst +++ b/source/includes/fact-windows-unattended.rst @@ -1,4 +1,4 @@ You may install MongoDB unattended on Windows from the command line using ``msiexec.exe``. -.. include:: /includes/steps/install-mongodb-on-windows-unattended.rst +.. include:: /includes/steps/install-mongodb-enterprise-on-windows-unattended.rst diff --git a/source/includes/steps-get-mongodb-enterprise-for-windows.yaml b/source/includes/steps-get-mongodb-enterprise-for-windows.yaml index 8cbd815e3df..519a73d3f65 100644 --- a/source/includes/steps-get-mongodb-enterprise-for-windows.yaml +++ b/source/includes/steps-get-mongodb-enterprise-for-windows.yaml @@ -3,5 +3,5 @@ stepnum: 1 ref: download pre: | Download the latest production release of `MongoDB Enterprise - `_ + `_. ... diff --git a/source/includes/steps-install-mongodb-enterprise-on-windows-unattended.yaml b/source/includes/steps-install-mongodb-enterprise-on-windows-unattended.yaml new file mode 100644 index 00000000000..b07521a135d --- /dev/null +++ b/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 +... diff --git a/source/includes/steps-install-mongodb-on-windows-unattended.yaml b/source/includes/steps-install-mongodb-on-windows-unattended.yaml index ec2b2a78c96..e0c85771970 100644 --- a/source/includes/steps-install-mongodb-on-windows-unattended.yaml +++ b/source/includes/steps-install-mongodb-on-windows-unattended.yaml @@ -1,4 +1,4 @@ -title: Install the downloaded file. +title: Install MongoDB for Windows. stepnum: 1 ref: install action: diff --git a/source/includes/steps-install-mongodb-on-windows.yaml b/source/includes/steps-install-mongodb-on-windows.yaml index 9ddbf49d089..f75ee949060 100644 --- a/source/includes/steps-install-mongodb-on-windows.yaml +++ b/source/includes/steps-install-mongodb-on-windows.yaml @@ -1,10 +1,10 @@ -title: Install the downloaded file. +title: Install MongoDB for Windows. stepnum: 1 ref: install 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" @@ -13,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``). ... \ No newline at end of file diff --git a/source/tutorial/install-mongodb-enterprise-on-windows.txt b/source/tutorial/install-mongodb-enterprise-on-windows.txt index 999287b030c..f0b8cb8d171 100644 --- a/source/tutorial/install-mongodb-enterprise-on-windows.txt +++ b/source/tutorial/install-mongodb-enterprise-on-windows.txt @@ -17,8 +17,8 @@ Prerequisites ------------- MongoDB Enterprise Server for Windows requires Windows Server 2008 R2 or -later. The MSI installer includes all other software dependencies and will -automatically upgrade any older version of MongoDB installed using an MSI +later. The ``.msi`` installer includes all other software dependencies and will +automatically upgrade any older version of MongoDB installed using an ``.msi`` file. Get MongoDB Enterprise @@ -60,7 +60,7 @@ You can set up the MongoDB server as a :guilabel:`Windows Service` that starts automatically at boot time. The following procedure assumes you have installed MongoDB using the -MSI installer, with the default path ``C:\MongoDB\``. +``.msi`` installer with the path ``C:\mongodb\``. If you have installed in an alternative directory, you will need to adjust the paths as appropriate. diff --git a/source/tutorial/install-mongodb-on-windows.txt b/source/tutorial/install-mongodb-on-windows.txt index faea603ec0a..e9ce5a66c4d 100644 --- a/source/tutorial/install-mongodb-on-windows.txt +++ b/source/tutorial/install-mongodb-on-windows.txt @@ -23,9 +23,9 @@ Requirements ------------ On Windows MongoDB requires Windows Server 2008 R2, Windows Vista, or -later. The MSI installer includes all other software dependencies and will -automatically upgrade any older version of MongoDB installed using an MSI -file. +later. The ``.msi`` installer includes all other software dependencies +and will automatically upgrade any older version of MongoDB installed +using an ``.msi`` file. Get MongoDB ----------- @@ -66,7 +66,7 @@ You can set up the MongoDB server as a :guilabel:`Windows Service` that starts automatically at boot time. The following procedure assumes you have installed MongoDB using the -MSI installer with the path ``C:\mongodb\``. +``.msi`` installer with the path ``C:\mongodb\``. If you have installed in an alternative directory, you will need to adjust the paths as appropriate. From bd8403cdb9f6037d036ca13af676e9ba8bd0ced6 Mon Sep 17 00:00:00 2001 From: Michael Paik Date: Mon, 2 Mar 2015 19:22:31 -0500 Subject: [PATCH 3/4] DOCS-4569 bugfix --- .../steps-create-manually-windows-service-for-mongodb.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/includes/steps-create-manually-windows-service-for-mongodb.yaml b/source/includes/steps-create-manually-windows-service-for-mongodb.yaml index 711014cce27..65986d10e5a 100644 --- a/source/includes/steps-create-manually-windows-service-for-mongodb.yaml +++ b/source/includes/steps-create-manually-windows-service-for-mongodb.yaml @@ -53,10 +53,10 @@ action: - pre: "Create the MongoDB service." language: powershell code: | - sc.exe create MongoDB binPath= "\"C:\mongodb\mongod.exe\" --service --config=\"C:\mongodb\mongod.cfg\"" DisplayName= "MongoDB" 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: | From 98430d4d9f1b7a1be98d9eb8503d9a5b236b892c Mon Sep 17 00:00:00 2001 From: Michael Paik Date: Mon, 2 Mar 2015 19:58:40 -0500 Subject: [PATCH 4/4] DOCS-4569 bugfixes 2 --- source/includes/fact-windows-unattended.rst | 4 ---- source/tutorial/install-mongodb-enterprise-on-windows.txt | 5 ++++- source/tutorial/install-mongodb-on-windows.txt | 5 ++++- 3 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 source/includes/fact-windows-unattended.rst diff --git a/source/includes/fact-windows-unattended.rst b/source/includes/fact-windows-unattended.rst deleted file mode 100644 index 5f220e9287a..00000000000 --- a/source/includes/fact-windows-unattended.rst +++ /dev/null @@ -1,4 +0,0 @@ -You may install MongoDB unattended on Windows from the command line -using ``msiexec.exe``. - -.. include:: /includes/steps/install-mongodb-enterprise-on-windows-unattended.rst diff --git a/source/tutorial/install-mongodb-enterprise-on-windows.txt b/source/tutorial/install-mongodb-enterprise-on-windows.txt index f0b8cb8d171..026876ac5c1 100644 --- a/source/tutorial/install-mongodb-enterprise-on-windows.txt +++ b/source/tutorial/install-mongodb-enterprise-on-windows.txt @@ -37,7 +37,10 @@ Interactive Installation Unattended Installation ~~~~~~~~~~~~~~~~~~~~~~~ -.. include:: /includes/fact-windows-unattended.rst +You may install MongoDB unattended on Windows from the command line +using ``msiexec.exe``. + +.. include:: /includes/steps/install-mongodb-enterprise-on-windows-unattended.rst Run MongoDB Enterprise ---------------------- diff --git a/source/tutorial/install-mongodb-on-windows.txt b/source/tutorial/install-mongodb-on-windows.txt index e9ce5a66c4d..47d3750cd26 100644 --- a/source/tutorial/install-mongodb-on-windows.txt +++ b/source/tutorial/install-mongodb-on-windows.txt @@ -43,7 +43,10 @@ Interactive Installation Unattended Installation ~~~~~~~~~~~~~~~~~~~~~~~ -.. include:: /includes/fact-windows-unattended.rst +You may install MongoDB unattended on Windows from the command line +using ``msiexec.exe``. + +.. include:: /includes/steps/install-mongodb-on-windows-unattended.rst Run MongoDB -----------