Skip to content

Commit 27434df

Browse files
author
Kay Kim
committed
DOCS-11921: package name change + some fix for DOCS-10909
1 parent f6e76b9 commit 27434df

11 files changed

+78
-131
lines changed

‎conf.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,16 @@ def has(self, *args):
7676

7777
source_constants = {
7878
'package-branch': '4.1',
79+
'windows-dir-version': '4.1', # Not sure if always equal to package-branch.
7980
'package-name-org': 'mongodb-org-unstable',
8081
'package-name-enterprise': 'mongodb-enterprise-unstable',
8182
'version': version,
8283
'release': release,
83-
'pgp-version': '4.1',
84-
'pgp-fingerprint': 'E162F504A20CDF15827F718D4B7C549A058F8B6B'
84+
'pgp-version': version,
85+
'pgp-fingerprint': 'E162F504A20CDF15827F718D4B7C549A058F8B6B',
86+
'rsa-key': '4B7C549A058F8B6B',
87+
'pgp-fingerprint-fmt': 'E162 F504 A20C DF15 827F 718D 4B7C 549A 058F 8B6B',
88+
'windows-sha256': 'C777DF7816BB8C9A760FDEA782113949408B6F39D72BE29A2551FA51E2FE0473'
8589
}
8690

8791

‎source/includes/release-base.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ ref: _install-windows
1414
copyable: true
1515
language: bat
1616
code: |
17-
msiexec.exe /l*v mdbinstall.log /qb /i mongodb-win32-x86_64-2008plus-ssl-{{version}}-signed.msi
17+
msiexec.exe /l*v mdbinstall.log /qb /i mongodb-win32-x86_64-2012plus-{{version}}-signed.msi
1818
---
1919
ref: _install-windows-service
2020
copyable: true
2121
language: bat
2222
code: |
23-
msiexec.exe /l*v mdbinstall.log /qb /i mongodb-win32-x86_64-2008plus-ssl-{{version}}-signed.msi ^
23+
msiexec.exe /l*v mdbinstall.log /qb /i mongodb-win32-x86_64-2012plus-{{version}}-signed.msi ^
2424
ADDLOCAL="Server,ServerService,Client" ^
2525
SHOULD_INSTALL_COMPASS="0"
2626
# Adding SHOULD_INSTALL_COMPASS="0" since the install page states that this installs just what's specified in ADDLOCAL
@@ -29,7 +29,7 @@ ref: _install-windows-nocompass
2929
copyable: true
3030
language: bat
3131
code: |
32-
msiexec.exe /l*v mdbinstall.log /qb /i mongodb-win32-x86_64-2008plus-ssl-{{version}}-signed.msi ^
32+
msiexec.exe /l*v mdbinstall.log /qb /i mongodb-win32-x86_64-2012plus-{{version}}-signed.msi ^
3333
SHOULD_INSTALL_COMPASS="0"
3434
---
3535
ref: _install-windows-ent
@@ -58,14 +58,14 @@ ref: _install-windows-custom-location
5858
copyable: true
5959
language: bat
6060
code: |
61-
msiexec.exe /l*v mdbinstall.log /qb /i mongodb-win32-x86_64-2008plus-ssl-{{version}}-signed.msi ^
61+
msiexec.exe /l*v mdbinstall.log /qb /i mongodb-win32-x86_64-2012plus-{{version}}-signed.msi ^
6262
INSTALLLOCATION="{{location}}"
6363
---
6464
ref: _install-windows-custom-location-nocompass
6565
copyable: true
6666
language: bat
6767
code: |
68-
msiexec.exe /l*v mdbinstall.log /qb /i mongodb-win32-x86_64-2008plus-ssl-{{version}}-signed.msi ^
68+
msiexec.exe /l*v mdbinstall.log /qb /i mongodb-win32-x86_64-2012plus-{{version}}-signed.msi ^
6969
INSTALLLOCATION="{{location}}" ^
7070
SHOULD_INSTALL_COMPASS="0"
7171
# Adding SHOULD_INSTALL_COMPASS="0" for Windows7
@@ -90,7 +90,7 @@ ref: _install-windows-specify-local
9090
copyable: true
9191
language: bat
9292
code: |
93-
msiexec.exe /l*v mdbinstall.log /qb /i mongodb-win32-x86_64-2008plus-ssl-{{version}}-signed.msi ^
93+
msiexec.exe /l*v mdbinstall.log /qb /i mongodb-win32-x86_64-2012plus-{{version}}-signed.msi ^
9494
ADDLOCAL="{{addlocal}}" ^
9595
SHOULD_INSTALL_COMPASS="0"
9696

‎source/includes/release-specifications.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ source:
33
file: release-base.yaml
44
ref: _untar-release
55
replacement:
6-
platform: 'osx-ssl'
6+
platform: 'macos'
77
builder: 'x86_64'
88
---
99
ref: untar-release-ent-osx-x86_64
1010
source:
1111
file: release-base.yaml
1212
ref: _untar-release-ent
1313
replacement:
14-
platform: 'osx-ssl'
14+
platform: 'macos'
1515
builder: 'x86_64'
1616
---
1717
ref: install-windows-default

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pre: |
3737
.. include:: {{release_specification_default}}
3838
3939
The operation installs the binaries to the default directory
40-
``C:\Program Files\MongoDB\Server\{+version+}\bin``.
40+
``C:\Program Files\MongoDB\Server\{+windows-dir-version+}\bin``.
4141
4242
To specify a different installation location for the executables,
4343
add the ``INSTALLLOCATION`` value.
@@ -108,7 +108,7 @@ pre: |
108108
.. include:: {{release_specification_nocompass}}
109109
110110
The operation installs the binaries to the default directory
111-
``C:\Program Files\MongoDB\Server\{+version+}\bin``.
111+
``C:\Program Files\MongoDB\Server\{+windows-dir-version+}\bin``.
112112
113113
To specify a different installation location for the executables,
114114
add the ``INSTALLLOCATION`` value.

‎source/includes/steps-install-verify-files-pgp.yaml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ action:
66
Download the binaries from `MongoDB Download Center <https://www.mongodb.com/download-center?jmp=doc>`__
77
based on your environment.
88
9-
For example, to download the ``3.4.9`` release for macOS through the
9+
For example, to download the ``{+release+}`` release for macOS through the
1010
shell, run this command:
1111
language: sh
1212
copyable: true
1313
code: |
14-
curl -LO https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-3.4.9.tgz
14+
curl -LO https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-{+release+}.tgz
1515
---
1616
title: Download the public signature file.
1717
stepnum: 2
@@ -20,25 +20,25 @@ action:
2020
language: sh
2121
copyable: true
2222
code: |
23-
curl -LO https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-3.4.9.tgz.sig
23+
curl -LO https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-{+release+}.tgz.sig
2424
---
2525
title: Download then import the key file.
2626
stepnum: 3
2727
ref: download-key-file
2828
action:
2929
- pre: |
30-
If you have not downloaded and imported the MongoDB 3.4 public key,
30+
If you have not downloaded and imported the MongoDB {+version+} public key,
3131
run these commands:
3232
language: sh
3333
copyable: true
3434
code: |
35-
curl -LO https://www.mongodb.org/static/pgp/server-3.4.asc
36-
gpg --import server-3.4.asc
35+
curl -LO https://www.mongodb.org/static/pgp/server-{+version+}.asc
36+
gpg --import server-{+version+}.asc
3737
- pre: |
3838
PGP should return this response:
3939
language: sh
4040
code: |
41-
gpg: key BC711F9BA15703C6: public key "MongoDB 3.4 Release Signing Key <[email protected]>" imported
41+
gpg: key {+rsa-key+}: public key "MongoDB {+version+} Release Signing Key <[email protected]>" imported
4242
gpg: Total number processed: 1
4343
gpg: imported: 1
4444
---
@@ -51,20 +51,19 @@ action:
5151
language: sh
5252
copyable: true
5353
code: |
54-
gpg --verify mongodb-osx-ssl-x86_64-3.4.9.tgz.sig mongodb-osx-ssl-x86_64-3.4.9.tgz
54+
gpg --verify mongodb-macos-x86_64-{+release+}.tgz.sig mongodb-macos-x86_64-{+release+}.tgz
5555
- pre: |
5656
GPG should return this response:
5757
language: sh
5858
code: |
59-
gpg: Signature made Mon Sep 11 12:03:48 2017 EDT
60-
gpg: using RSA key BC711F9BA15703C6
61-
gpg: Good signature from "MongoDB 3.4 Release Signing Key <[email protected]>" [unknown]
59+
gpg: Signature made Tue Dec 4 11:57:16 2018 EST
60+
gpg: using RSA key {+rsa-key+}
61+
gpg: Good signature from "MongoDB {+version+} Release Signing Key <[email protected]>" [unknown]
6262
- pre: |
63-
If you receive a message this error message, confirm that you imported the correct
63+
If you receive the following error message, confirm that you imported the correct
6464
public key:
6565
language: sh
6666
code: |
67-
gpg: Signature made Mon Sep 11 12:03:48 2017 EDT using RSA key BC711F9BA15703C6
6867
gpg: Can't check signature: public key not found
6968
- pre: |
7069
``gpg`` will return the following message if the package is
@@ -74,5 +73,5 @@ action:
7473
code: |
7574
gpg: WARNING: This key is not certified with a trusted signature!
7675
gpg: There is no indication that the signature belongs to the owner.
77-
Primary key fingerprint: 0C49 F373 0359 A145 1858 5931 BC71 1F9B A157 03C6
76+
Primary key fingerprint: {+pgp-fingerprint-fmt+}
7877
...

‎source/includes/steps-install-verify-files-sha.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ pre: |
55
Download the binaries from `MongoDB Download Center <https://www.mongodb.com/download-center?jmp=docs>`__
66
based on your environment.
77
8-
For example, to download the ``3.4.9`` release for macOS through the
8+
For example, to download the ``{+release+}`` release for macOS through the
99
shell, type this command:
1010
action:
1111
language: sh
1212
copyable: true
1313
code: |
14-
curl -LO https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-3.4.9.tgz
14+
curl -LO https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-{+release+}.tgz
1515
---
1616
title: Download the SHA256 file.
1717
stepnum: 2
@@ -20,7 +20,7 @@ action:
2020
language: sh
2121
copyable: true
2222
code: |
23-
curl -LO https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-3.4.9.tgz.sha256
23+
curl -LO https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-{+release+}.tgz.sha256
2424
---
2525
title: Use the SHA-256 checksum to verify the MongoDB package file.
2626
stepnum: 3
@@ -31,12 +31,12 @@ action:
3131
language: sh
3232
copyable: true
3333
code: |
34-
shasum -c mongodb-osx-ssl-x86_64-3.4.9.tgz.sha256
34+
shasum -c mongodb-macos-x86_64-{+release+}.tgz.sha256
3535
- pre: |
3636
which should return the following if the checksum matched the downloaded
3737
package:
3838
language: sh
3939
copyable: true
4040
code: |
41-
mongodb-osx-ssl-x86_64-3.4.9.tgz: OK
41+
mongodb-macos-x86_64-{+release+}.tgz: OK
4242
...

‎source/includes/steps-install-verify-files-windows.yaml

Lines changed: 32 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,47 @@
1-
title: Download the Sigcheck utility from Microsoft.
2-
stepnum: 1
3-
level: 4
4-
ref: download-sigcheck
5-
content: |
6-
a. Visit the `Sigcheck utility page <https://docs.microsoft.com/en-us/sysinternals/downloads/sigcheck>`__.
7-
8-
b. Click the :guilabel:`Download Sigcheck` link.
9-
10-
c. Unzip ``Sigcheck.zip``.
11-
12-
d. Move the Sigcheck directory to an appropriate location on your
13-
Windows host.
14-
15-
For this tutorial, this location is
16-
``$Env:ProgramFiles\Sigcheck``.
17-
---
18-
title: Download the MongoDB installation file.
19-
stepnum: 2
1+
title: Download the MongoDB ``.msi`` installation file.
202
level: 4
213
ref: download-install-file
224
content: |
23-
Download the binaries from `MongoDB Download Center <https://www.mongodb.com/download-center?jmp=docs>`__.
24-
25-
.. example::
265
27-
To download the ``v3.4-latest`` release for Windows using
28-
Powershell, invoke this command:
29-
30-
.. code-block:: powershell
6+
Download the ``.msi`` from the `MongoDB Download Center
7+
<https://www.mongodb.com/download-center?jmp=docs>`__.
8+
9+
For example to download the latest {+version+} of MongoDB Community
10+
Edition, from the `MongoDB Download Center
11+
<https://www.mongodb.com/download-center/community?jmp=docs>`__:
12+
13+
#. In the :guilabel:`Version` dropdown, select the version that
14+
corresponds to the latest MongoDB Server |version|.
3115
32-
Invoke-WebRequest -Uri "https://downloads.mongodb.org/win32/mongodb-win32-x86_64-2008plus-ssl-v3.4-latest-signed.msi" `
33-
-OutFile "$Env:HomePath\Downloads\mongodb-win32-x86_64-2008plus-ssl-v3.4-latest-signed.msi"
16+
.. note::
3417
35-
---
36-
title: Download the public signature file.
37-
stepnum: 3
38-
level: 4
39-
ref: download-sig-file
40-
content: |
41-
Download the ``md5`` from ``https://www.mongodb.org/downloads``.
18+
MongoDB |version| is currently available via the ``4.1.x``
19+
developer series.
4220
43-
.. example::
21+
#. In the :guilabel:`OS` dropdown, :guilabel:`Windows 64-bit X64`
22+
should be selected.
4423
45-
To download the SHA256 signature for the ``v3.4-latest`` release
46-
for Windows using Powershell, invoke this command:
24+
#. In the :guilabel:`Package` drop down, :guilabel:`MSI` should be
25+
selected.
4726
48-
.. code-block:: powershell
27+
#. Click :guilabel:`Download` and save the file to your Downloads folder.
4928
50-
Invoke-WebRequest -Uri "https://downloads.mongodb.org/win32/mongodb-win32-x86_64-2008plus-ssl-v3.4-latest-signed.msi.sha256" `
51-
-OutFile "$Env:HomePath\Downloads\mongodb-win32-x86_64-2008plus-ssl-v3.4-latest-signed.msi.sha256"
5229
---
53-
title: Verify the signature of the MongoDB installer.
54-
stepnum: 4
30+
title: Get the public signature file.
5531
level: 4
56-
ref: verify-sig
32+
ref: download-sig-file
5733
content: |
34+
You can access the public signature file rom the `MongoDB Download Center
35+
<https://www.mongodb.com/download-center?jmp=docs>`__.
5836
59-
Invoke ``Sigcheck``:
60-
61-
.. code-block:: powershell
62-
63-
$Env:ProgramFiles\Sigcheck\sigcheck64.exe `
64-
-h $Env:HomePath\Downloads\mongodb-win32-x86_64-2008plus-ssl-v3.4-latest-signed.msi
65-
66-
.. note::
67-
Click :guilabel:`Agree` to accept the
68-
:abbr:`EULA (End User License Agreement)` when it displays.
69-
70-
``Sigcheck`` returns this verification information for the latest
71-
release of MongoDB 3.4:
72-
73-
.. code-block:: bat
74-
:emphasize-lines: 19
75-
76-
Sigcheck v2.60 - File version and signature viewer
77-
Copyright (C) 2004-2017 Mark Russinovich
78-
Sysinternals - www.sysinternals.com
79-
80-
$Env:HomePath\downloads\mongodb-win32-x86_64-2008plus-ssl-v3.4-latest-signed.msi:
81-
Verified: Signed
82-
Signing date: 12:34 AM 6/20/2018
83-
Publisher: MongoDB, Inc.
84-
Company: n/a
85-
Description: n/a
86-
Product: n/a
87-
Prod version: n/a
88-
File version: n/a
89-
MachineType: n/a
90-
MD5: D7866C013989AEE2FA87774EFFF884F0
91-
SHA1: E5D7D78E8FFFF9CFF3BD605C3407A55F87F4C8DD
92-
PESHA1: E5D7D78E8FFFF9CFF3BD605C3407A55F87F4C8DD
93-
PE256: 8FE0670DF2AB74CCD33910C0AF2F000225BA2ED21330767D95E3F6DED96E6893
94-
SHA256: 8FE0670DF2AB74CCD33910C0AF2F000225BA2ED21330767D95E3F6DED96E6893
95-
IMP: n/a
96-
37+
For example, for the SHA256 signature for the latest {+version+},
38+
39+
#. From `<https://downloads.mongodb.org/win32/mongodb-win32-x86_64-2012plus-{+release+}-signed.msi.sha256>`_, copy the content.
40+
41+
#. Save the content to a file ``mongodb-win32-x86_64-2012plus-{+release+}-signed.msi.sha256`` in your Downloads folder.
42+
9743
---
9844
title: Compare the signature file to the MongoDB installer hash.
99-
stepnum: 5
10045
level: 4
10146
ref: download-key-file
10247
content: |
@@ -106,16 +51,16 @@ content: |
10651
10752
.. code-block:: powershell
10853
109-
$sigHash = (Get-Content $Env:HomePath\Downloads\mongodb-win32-x86_64-2008plus-ssl-v3.4-latest-signed.msi.sha256 | Out-String).SubString(0,64).ToUpper(); `
110-
$fileHash = (Get-FileHash $Env:HomePath\Downloads\mongodb-win32-x86_64-2008plus-ssl-v3.4-latest-signed.msi).Hash.Trim(); `
54+
$sigHash = (Get-Content $Env:HomePath\Downloads\mongodb-win32-x86_64-2012plus-{+release+}-signed.msi.sha256 | Out-String).SubString(0,64).ToUpper(); `
55+
$fileHash = (Get-FileHash $Env:HomePath\Downloads\mongodb-win32-x86_64-2012plus-{+release+}-signed.msi).Hash.Trim(); `
11156
echo $sigHash; echo $fileHash; `
11257
$sigHash -eq $fileHash
11358
11459
.. code-block:: bat
11560
:emphasize-lines: 1-2
11661
117-
8FE0670DF2AB74CCD33910C0AF2F000225BA2ED21330767D95E3F6DED96E6893
118-
8FE0670DF2AB74CCD33910C0AF2F000225BA2ED21330767D95E3F6DED96E6893
62+
{+windows-sha256+}
63+
{+windows-sha256+}
11964
True
12065
12166
The command outputs three lines:

0 commit comments

Comments
 (0)