From 92eec4171a4ff4ea47131b8f0d7cfdce9bc69ab2 Mon Sep 17 00:00:00 2001 From: Heli Aldridge Date: Tue, 22 Mar 2022 16:37:03 -0400 Subject: [PATCH 1/2] Update URLs for subdomain consolidation --- conf.py | 34 +++++++++++++++++----------------- config/intersphinx.yaml | 6 +++--- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/conf.py b/conf.py index 1bbbcced03..6d8ca30fd1 100644 --- a/conf.py +++ b/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. diff --git a/config/intersphinx.yaml b/config/intersphinx.yaml index a976f69316..1fc6032585 100644 --- a/config/intersphinx.yaml +++ b/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 ... From 8dd89edc1f4a95e39563929a46ca98ad277d3a03 Mon Sep 17 00:00:00 2001 From: Heli Aldridge Date: Tue, 22 Mar 2022 16:49:06 -0400 Subject: [PATCH 2/2] DOP-2811: Makefile: Remove -qa suffix and non-dotcom publishing --- Makefile | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index fff093fbb4..8a4ff71291 100644 --- a/Makefile +++ b/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 # /. # * Upload each to the S3 bucket under /// 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/, as well as any symbolic links pointing # to it, and recurse over each file /. # * Upload each to the S3 bucket under //. @@ -84,14 +78,8 @@ stage: ## Host online for review # The recursive behavior would CHANGE if --all-subdirectories were # given: ALL contents of build/public/ 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