Subdomain Consolidation v4.2 (#960)

* Update URLs for subdomain consolidation

* DOP-2811: Makefile: Remove -qa suffix and non-dotcom publishing

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
-DOTCOM_STGPREFIX=docs-qa
+DOTCOM_PREFIX=docs
+DOTCOM_STGPREFIX=docs
 
 
 
@@ -59,16 +59,10 @@ publish: examples ## Builds this branch's publishable HTML and other artifacts u
 #   <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}/${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"
 
 
-	
-
 # - Enter build/public/<branch>, as well as any symbolic links pointing
 #   to it, and recurse over each file <basename>/<filename>.
 #   * Upload each to the S3 bucket under <project>/<basename>/<filename>.
@@ -84,14 +78,8 @@ 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 --redirect-prefix='v[0-9]\.[0-9]' --redirect-prefix='manual' --redirect-prefix='master' ${ARGS}
-
-	@echo "Hosted at ${PRODUCTION_URL}/index.html"
-
 	mut-publish build/public ${DOTCOM_PRODUCTION_BUCKET} --prefix=${DOTCOM_PREFIX} --deploy --redirect-prefix='v[0-9]\.[0-9]' --redirect-prefix='manual' --redirect-prefix='master' ${ARGS}
-
 	@echo "Hosted at ${DOTCOM_PRODUCTION_URL}/${DOTCOM_PREFIX}/index.html"
-
 	$(MAKE) deploy-search-index
 
 deploy-search-index: ## Update the search index for this branch

conf.py

@@ -91,17 +91,17 @@ def has(self, *args):
 
 
 extlinks = {
-    'hardlink' : ( 'https://docs.mongodb.com/{0}/%s'.format(conf.git.branches.current), ''),
+    'hardlink' : ( 'https://www.mongodb.com/docs/{0}/%s'.format(conf.git.branches.current), ''),
     'issue': ('https://jira.mongodb.org/browse/%s', '' ),
-    'api': ('https://docs.mongodb.com/drivers/%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', ''),
+    'api': ('https://www.mongodb.com/docs/drivers/%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', ''),
-    'atlas': ('https://docs.atlas.mongodb.com%s',''),
-    'compass': ('https://docs.mongodb.com/compass/current%s', ''),
+    'opsmgr': ('https://www.mongodb.com/docs/ops-manager/current%s', ''),
+    'atlas': ('https://www.mongodb.com/docs/atlas%s',''),
+    'compass': ('https://www.mongodb.com/docs/compass/current%s', ''),
     'products': ('https://www.mongodb.com/products%s', ''),
     'wtdocs': ('https://source.wiredtiger.com/mongodb-4.2%s', ''),
     'perl-api': ('https://metacpan.org/pod/MongoDB::%s', ''),
@@ -114,14 +114,14 @@ def has(self, *args):
     'java-async-docs': ('https://mongodb.github.io/mongo-java-driver-reactivestreams/1.6/%s', ''),
     'java-async-api': ('https://mongodb.github.io/mongo-java-driver-reactivestreams/1.6/javadoc/%s', ''),
     'go-api': ('https://godoc.org/github.com/mongodb/mongo-go-driver/%s', ''),
-    'v4.0': ('https://docs.mongodb.com/v4.0%s', ''),
-    'v3.6': ('https://docs.mongodb.com/v3.6%s', ''),
-    'v3.4': ('https://docs.mongodb.com/v3.4%s', ''),
-    'v3.2': ('https://docs.mongodb.com/v3.2%s', ''),
-    'v3.0': ('https://docs.mongodb.com/v3.0%s', ''),
-    'v2.6': ('https://docs.mongodb.com/v2.6%s', ''),
-    'v2.4': ('https://docs.mongodb.com/v2.4%s', ''),
-    'v2.2': ('https://docs.mongodb.com/v2.2%s', '')
+    'v4.0': ('https://www.mongodb.com/docs/v4.0%s', ''),
+    'v3.6': ('https://www.mongodb.com/docs/v3.6%s', ''),
+    'v3.4': ('https://www.mongodb.com/docs/v3.4%s', ''),
+    'v3.2': ('https://www.mongodb.com/docs/v3.2%s', ''),
+    'v3.0': ('https://www.mongodb.com/docs/v3.0%s', ''),
+    'v2.6': ('https://www.mongodb.com/docs/v2.6%s', ''),
+    'v2.4': ('https://www.mongodb.com/docs/v2.4%s', ''),
+    'v2.2': ('https://www.mongodb.com/docs/v2.2%s', '')
 }
 
 ## add `extlinks` for each published version.

config/intersphinx.yaml

@@ -7,14 +7,14 @@ url: https://motor.readthedocs.io/en/stable/
 path: motor.inv
 ---
 name: phplib
-url: https://docs.mongodb.com/php-library/master/
+url: https://www.mongodb.com/docs/php-library/master/
 path: phplib.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
 ...