Docsp 35854 ubuntu url v6.0 (#6133)

* DOCSP-35854 Fixes Installation URL's (#6008)

* DOCSP-35854 Fixes Ubuntu Community/Enterprise URL

* Fixes Debian key

* Fixes url

* Fixes url

* Fixes url

* Fixes link

* Refactors Debian calls

* Fixes Debian curl include

* Adds blank line to force build

* Fixes build issue

Author: kennethdyer

source/includes/curl-apt-gpg.rst renamed to source/includes/curl-apt-com-gpg.rst

@@ -0,0 +1,17 @@
+
+From a terminal, install ``gnupg`` and ``curl`` if they are not already
+available:
+
+.. code-block:: bash
+
+     sudo apt-get install gnupg curl
+
+To import the MongoDB public GPG key from
+`https://www.mongodb.org/static/pgp/server-{+version+}.asc`__, run the
+following command:
+
+.. code-block:: bash
+
+   curl -fsSL https://www.mongodb.org/static/pgp/server-{+version+}.asc | \
+      sudo gpg -o /usr/share/keyrings/mongodb-server-{+version+}.gpg \
+      --dearmor

source/includes/curl-apt-org-gpg.rst

@@ -1,8 +1,8 @@
 stepnum: 1
 level: 4
-source:
-  file: steps-install-mongodb-on-debian.yaml
-  ref: import-key
+ref: import-key
+content: |
+  .. include:: /includes/curl-apt-com-gpg
 ---
 title: Create a ``/etc/apt/sources.list.d/mongodb-enterprise.list`` file for MongoDB.
 stepnum: 2

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

@@ -1,9 +1,8 @@
 stepnum: 1
 level: 4
-ref: import-deb-key
-source:
-  file: steps-install-mongodb-on-ubuntu.yaml
-  ref: import-key
+ref: import-key
+content: |
+  .. include:: /includes/curl-apt-com-gpg
 ---
 title: Create a list file for MongoDB
 stepnum: 2

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

@@ -1,8 +1,8 @@
 stepnum: 1
 level: 4
-source:
-  file: steps-install-mongodb-on-ubuntu.yaml
-  ref: import-key
+ref: import-key
+content: |
+  .. include:: /includes/curl-apt-org-gpg
 ---
 title: Create a ``/etc/apt/sources.list.d/mongodb-org-{+version+}.list`` file for MongoDB.
 stepnum: 2

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

@@ -3,7 +3,7 @@ stepnum: 1
 level: 4
 ref: import-key
 content: |
-    .. include:: /includes/curl-apt-gpg
+    .. include:: /includes/curl-apt-org-gpg
 ---
 title: Create a list file for MongoDB
 stepnum: 2
@@ -34,6 +34,7 @@ content: |
              .. code-block:: bash
 
                 echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-{+version+}.gpg ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/{+version+} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-{+version+}.list
+
          
          - id: focal
            name: Ubuntu 20.04 (Focal)