DOP-2671: Update conf.py for subdomain consolidation

Author: i80and

Makefile

@@ -12,8 +12,8 @@ DOTCOM_STAGING_URL="https://mongodbcom-cdn.website.staging.corp.mongodb.com"
 DOTCOM_STAGING_BUCKET=docs-mongodb-org-dotcomstg
 DOTCOM_PRODUCTION_URL="https://mongodb.com"
 DOTCOM_PRODUCTION_BUCKET=docs-mongodb-org-dotcomprd
-DOTCOM_PREFIX=docs-qa/meta
-DOTCOM_STGPREFIX=docs-qa/meta
+DOTCOM_PREFIX=docs/meta
+DOTCOM_STGPREFIX=docs/meta
 
 .PHONY: help lint html stage deploy
 
@@ -37,9 +37,6 @@ publish: ## Builds this branch's publishable HTML and other artifacts under buil
 #   <basename>/<filename>.
 #   * Upload each to the S3 bucket under <project>/<username>/<basename>/<filename>
 stage: ## Host online for review
-	mut-publish build/${GIT_BRANCH}/html ${STAGING_BUCKET} --prefix=${PROJECT} --stage ${ARGS}
-	@echo "Hosted at ${STAGING_URL}/${PROJECT}/${USER}/${GIT_BRANCH}/index.html"
-
 	mut-publish build/${GIT_BRANCH}/html ${DOTCOM_STAGING_BUCKET} --prefix=${DOTCOM_STGPREFIX} --stage ${ARGS}
 	@echo "Hosted at ${DOTCOM_STAGING_URL}/${DOTCOM_STGPREFIX}/${USER}/${GIT_BRANCH}/index.html"
 
@@ -61,11 +58,5 @@ stage: ## Host online for review
 # The recursive behavior would CHANGE if --all-subdirectories were
 # given: ALL contents of build/public/<branch> would be upload
 deploy: build/public ## Deploy to the production bucket
-	mut-publish build/public ${PRODUCTION_BUCKET} --prefix=${PROJECT} --deploy --all-subdirectories ${ARGS}
-
-	@echo "Hosted at ${PRODUCTION_URL}/index.html"
-
-
 	mut-publish build/public ${DOTCOM_PRODUCTION_BUCKET} --prefix=${DOTCOM_PREFIX} --deploy --all-subdirectories ${ARGS}
-
 	@echo "Hosted at ${DOTCOM_PRODUCTION_URL}/${DOTCOM_PREFIX}/index.html"

conf.py

@@ -77,34 +77,34 @@ def has(self, *args):
     'hardlink' : ( 'http://docs.mongodb.com/{0}/%s'.format(conf.git.branches.current), ''),
     'issue': ('https://jira.mongodb.org/browse/%s', '' ),
     'api': ('https://api.mongodb.com/%s', ''),
-    'gettingstarted': ('https://docs.mongodb.com/getting-started%s', ''),
-    'manual': ('https://docs.mongodb.com/manual%s', ''),
-    'ecosystem': ('https://docs.mongodb.com/ecosystem%s', ''),
-    'mms-docs': ('https://docs.cloudmanager.mongodb.com%s', ''),
+    'gettingstarted': ('https://www.mongodb.com/docs/getting-started%s', ''),
+    'manual': ('https://www.mongodb.com/docs/manual%s', ''),
+    'ecosystem': ('https://www.mongodb.com/docs/ecosystem%s', ''),
+    'mms-docs': ('https://www.mongodb.com/docs/cloud-manager%s', ''),
     'mms-home': ('https://www.mongodb.com/cloud/cloud-manager%s', ''),
-    'opsmgr': ('https://docs.opsmanager.mongodb.com/current%s', ''),
-    'cldmgr': ('https://docs.cloudmanager.mongodb.com/%s', ''),
-    'atlas': ('https://docs.atlas.mongodb.com/%s', ''),
+    'opsmgr': ('https://www.mongodb.com/docs/ops-manager/current%s', ''),
+    'cldmgr': ('https://www.mongodb.com/docs/cloud-manager/%s', ''),
+    'atlas': ('https://www.mongodb.com/docs/atlas/%s', ''),
     'products': ('https://www.mongodb.com/products%s', ''),
     'wtdocs': ('http://source.wiredtiger.com/mongodb-3.4%s', ''),
-    'v2.2': ('https://docs.mongodb.com/v2.2%s', ''),
-    'v2.4': ('https://docs.mongodb.com/v2.4%s', ''),
-    'v2.6': ('https://docs.mongodb.com/v2.6%s', ''),
-    'v3.0': ('https://docs.mongodb.com/v3.0%s', ''),
-    'v3.2': ('https://docs.mongodb.com/v3.2%s', ''),
-    'v3.4': ('https://docs.mongodb.com/v3.4%s', ''),
-    'v3.6': ('https://docs.mongodb.com/v3.6%s', ''),
-    'v4.0': ('https://docs.mongodb.com/v4.0%s', ''),
-    'bic': ('https://docs.mongodb.com/bi-connector/current%s',''),
-    'k8s': ('https://docs.mongodb.com/kubernetes-operator/stable%s',''),
+    'v2.2': ('https://www.mongodb.com/docs/v2.2%s', ''),
+    'v2.4': ('https://www.mongodb.com/docs/v2.4%s', ''),
+    'v2.6': ('https://www.mongodb.com/docs/v2.6%s', ''),
+    'v3.0': ('https://www.mongodb.com/docs/v3.0%s', ''),
+    'v3.2': ('https://www.mongodb.com/docs/v3.2%s', ''),
+    'v3.4': ('https://www.mongodb.com/docs/v3.4%s', ''),
+    'v3.6': ('https://www.mongodb.com/docs/v3.6%s', ''),
+    'v4.0': ('https://www.mongodb.com/docs/v4.0%s', ''),
+    'bic': ('https://www.mongodb.com/docs/bi-connector/current%s',''),
+    'k8s': ('https://www.mongodb.com/docs/kubernetes-operator/stable%s',''),
     'product': ('http://www.mongodb.com/products/%s?jmp=docs',''),
     'website': ('https://www.mongodb.com%s?jmp=docs',''),
     'dl': ('http://www.mongodb.com/download-center/%s?jmp=docs',''),
     'aws': ('http://docs.aws.amazon.com%s',''),
-    'driver' : ('https://docs.mongodb.com/ecosystem/drivers%s', ''),
+    'driver' : ('https://www.mongodb.com/docs/drivers%s', ''),
     'wikipedia' : ('https://en.wikipedia.org/wiki%s', ''),
     'mw' : ('https://www.merriam-webster.com/dictionary/%s',''),
-    'mdbdrivers' : ('https://docs.mongodb.com/ecosystem/drivers/%s',''),
+    'mdbdrivers' : ('https://www.mongodb.com/docs/drivers/%s',''),
     'cmos17' : ('https://www.chicagomanualofstyle.org/book/ed17%s',''),
     'sphinx-rst' : ('https://www.sphinx-doc.org/en/master/usage/restructuredtext%s', ''),
     'sphinx' : ('https://www.sphinx-doc.org/en/master%s', ''),

config/intersphinx.yaml

@@ -1,12 +1,12 @@
 name: mongodb
-url: https://docs.mongodb.com/manual/
+url: https://www.mongodb.com/docs/manual/
 path: mongodb.inv
 ---
 name: clouddocs
-url: https://docs.atlas.mongodb.com/
+url: https://www.mongodb.com/docs/atlas/
 path: cloud-docs.inv
 ---
 name: compassdocs
-url: https://docs.mongodb.com/compass/current/
+url: https://www.mongodb.com/docs/compass/current/
 path: compass-docs.inv
 ...