DOP-2812: Post-consolidation update

mongodb · i80and · Mar 21, 2022 · Mar 18, 2022 · Mar 18, 2022 · 3c9f26c405ba4144cbb714736f1ae45984dc0c0b
commit 3c9f26c405ba4144cbb714736f1ae45984dc0c0b
diff --git a/themes/bi-connector/theme.conf b/themes/bi-connector/theme.conf
@@ -21,4 +21,4 @@ stable = STABLE
 sitename = MongoDB
 nav_excluded = NAV
 is_upcoming =
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/charts/theme.conf b/themes/charts/theme.conf
@@ -22,4 +22,4 @@ sitename = MongoDB
 nav_excluded = NAV
 is_saas =
 is_upcoming =
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/compass/theme.conf b/themes/compass/theme.conf
@@ -21,4 +21,4 @@ stable = STABLE
 sitename = MongoDB
 nav_excluded = NAV
 is_upcoming =
-base_url = https://docs.mongodb.com 
+base_url = https://www.mongodb.com/docs
diff --git a/themes/database-tools/theme.conf b/themes/database-tools/theme.conf
@@ -21,4 +21,4 @@ stable = STABLE
 sitename = MongoDB
 nav_excluded = NAV
 is_upcoming =
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/datalake/theme.conf b/themes/datalake/theme.conf
@@ -22,4 +22,4 @@ sitename = MongoDB
 nav_excluded = NAV
 is_upcoming =
 is_alpha =
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/drivers/theme.conf b/themes/drivers/theme.conf
@@ -18,4 +18,4 @@ version = VERSION
 version_selector = VERSION_SELECTOR
 latest = LATEST
 stable = STABLE
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/ecosystem/theme.conf b/themes/ecosystem/theme.conf
@@ -10,4 +10,4 @@ google_analytics = GACODE
 project = PROJECT
 translations = LANGUAGES
 language = LANGUAGE
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/guides/theme.conf b/themes/guides/theme.conf
@@ -24,4 +24,4 @@ active_branches =
 upcoming = UPCOMING
 eol_msg = EOL_MSG
 eol =
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/kubernetes-operator/theme.conf b/themes/kubernetes-operator/theme.conf
@@ -22,4 +22,4 @@ sitename = MongoDB
 nav_excluded = NAV
 is_upcoming =
 active_branches =
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/manual/theme.conf b/themes/manual/theme.conf
@@ -20,4 +20,4 @@ latest = LATEST
 stable = STABLE
 sitename = MongoDB
 nav_excluded = NAV
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/meta-driver/theme.conf b/themes/meta-driver/theme.conf
@@ -23,4 +23,4 @@ nav_excluded = NAV
 is_upcoming =
 is_private = False
 privacy_warning = ""
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/mms-cloud/page.html b/themes/mms-cloud/page.html
@@ -12,17 +12,9 @@
 
 {%- block canonicalref %}
   {%- if pagename == 'index' %}
-    {%- if 'mongodb.com/docs' in theme_base_url %}
-      <link rel="canonical" href="{{theme_base_url}}/cloudmanager/" />
-    {%- else %}
-      <link rel="canonical" href="https://docs.cloudmanager.mongodb.com/" />
-    {%- endif %}
+    <link rel="canonical" href="{{theme_base_url}}/cloudmanager/" />
   {%- else %}
-    {%- if 'mongodb.com/docs' in theme_base_url %}
-      <link rel="canonical" href="{{theme_base_url}}/cloudmanager/{{pagename}}/" />
-    {%- else %}
-      <link rel="canonical" href="https://docs.cloudmanager.mongodb.com/{{pagename}}/" />
-    {%- endif %}
+    <link rel="canonical" href="{{theme_base_url}}/cloudmanager/{{pagename}}/" />
   {%- endif -%}
 {%- endblock -%}
 
@@ -36,19 +28,11 @@
 
 {%- block sitesearch %}
   {%- if builder != 'singlehtml' %}
-    {%- if 'mongodb.com/docs' in theme_base_url %}
-      <script type="text/javascript">
-        window.googleSearchCx = "017213726194841070573:sntjladnaos"
-        window.googleSearchPlaceholder = "Search Cloud Manager"
-        window.googleSearchResultsUrl = "{{theme_base_url}}/cloudmanager/search/"
-      </script>
-    {%- else %}
-      <script type="text/javascript">
-        window.googleSearchCx = "017213726194841070573:sntjladnaos"
-        window.googleSearchPlaceholder = "Search Cloud Manager"
-        window.googleSearchResultsUrl = "https://docs.cloudmanager.mongodb.com/search/"
-      </script>
-    {%- endif %}
+    <script type="text/javascript">
+      window.googleSearchCx = "017213726194841070573:sntjladnaos"
+      window.googleSearchPlaceholder = "Search Cloud Manager"
+      window.googleSearchResultsUrl = "{{theme_base_url}}/cloudmanager/search/"
+    </script>
   {%- endif %}
 {%- endblock -%}
 
@@ -70,11 +54,7 @@
         <h4 class="alert-heading" style="margin-bottom: 10px;">The MongoDB Agent has been released!</h4>
         The Monitoring, Backup and Automation Agents have been merged into the MongoDB Agent.
 
-        {%- if 'mongodb.com/docs' in theme_base_url %}
-          <a class="btn btn-success" style="margin-left: 5px; margin-bottom: 5px;" href="{{theme_base_url}}/cloudmanager/reference/faq/faq-mongodb-agent/">Learn More</a>
-        {%- else %}
-          <a class="btn btn-success" style="margin-left: 5px; margin-bottom: 5px;" href="https://docs.cloudmanager.mongodb.com/reference/faq/faq-mongodb-agent/">Learn More</a>
-        {%- endif %}
+        <a class="btn btn-success" style="margin-left: 5px; margin-bottom: 5px;" href="{{theme_base_url}}/cloudmanager/reference/faq/faq-mongodb-agent/">Learn More</a>
       </span>
     </div>
   {%- endif %}
@@ -85,20 +65,11 @@ <h4 class="alert-heading" style="margin-bottom: 10px;">The MongoDB Agent has bee
         <span aria-hidden="true">&times;</span>
       </button>
       <span class="alert-message">
-        {%- if 'mongodb.com/docs' in theme_base_url %}
-          <h4 class="alert-heading" style="margin-bottom: 10px;">Cloud Manager will no longer 
-            support Automation for MongoDB 3.4 clusters after February 10, 2022. 
-            Please <a href="{{theme_base_url}}/cloudmanager/tutorial/change-mongodb-version/">upgrade your MongoDB deployment</a> 
-            or <a href="{{theme_base_url}}/atlas/migration-to-atlas-choosing/">migrate to Atlas.</a>
-          </h4>
-        {%- else %}
-          <h4 class="alert-heading" style="margin-bottom: 10px;">Cloud Manager will no longer 
-            support Automation for MongoDB 3.4 clusters after February 10, 2022. 
-            Please <a href="https://docs.cloudmanager.mongodb.com/tutorial/change-mongodb-version/">upgrade your MongoDB deployment</a> 
-            or <a href="https://docs.atlas.mongodb.com/migration-to-atlas-choosing/">migrate to Atlas.</a>
-          </h4>
-        {%- endif %}
-
+        <h4 class="alert-heading" style="margin-bottom: 10px;">Cloud Manager will no longer
+          support Automation for MongoDB 3.4 clusters after February 10, 2022.
+          Please <a href="{{theme_base_url}}/cloudmanager/tutorial/change-mongodb-version/">upgrade your MongoDB deployment</a>
+          or <a href="{{theme_base_url}}/atlas/migration-to-atlas-choosing/">migrate to Atlas.</a>
+        </h4>
       </span>
     </div>
   {%- endif %}

diff --git a/themes/mms-cloud/theme.conf b/themes/mms-cloud/theme.conf
@@ -14,4 +14,4 @@ has_mdb_agent =
 edition = EDITION
 nav_excluded = NAV
 automation_eol =
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/mms-managed/theme.conf b/themes/mms-managed/theme.conf
@@ -12,4 +12,4 @@ version_selector = VERSION_SELECTOR
 stable = STABLE
 edition = EDITION
 nav_excluded = NAV
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/mms-onprem/page.html b/themes/mms-onprem/page.html
@@ -14,17 +14,9 @@
 
 {%- block canonicalref %}
   {%- if pagename == 'index' %}
-    {%- if 'mongodb.com/docs' in theme_base_url %}
-      <link rel="canonical" href="{{theme_base_url}}/opsmanager/current/" />
-    {%- else %}
-      <link rel="canonical" href="https://docs.opsmanager.mongodb.com/current/" />
-    {%- endif %}
+    <link rel="canonical" href="{{theme_base_url}}/opsmanager/current/" />
   {%- else %}
-    {%- if 'mongodb.com/docs' in theme_base_url %}
-      <link rel="canonical" href="{{theme_base_url}}/opsmanager/current/{{pagename}}/" />
-    {%- else %}
-      <link rel="canonical" href="https://docs.opsmanager.mongodb.com/current/{{pagename}}/" />
-    {%- endif %}
+    <link rel="canonical" href="{{theme_base_url}}/opsmanager/current/{{pagename}}/" />
   {%- endif -%}
 {%- endblock -%}
 
@@ -44,11 +36,7 @@
         <h4 class="alert-heading" style="margin-bottom: 10px;">The MongoDB Agent has been released!</h4>
         The Monitoring, Backup and Automation Agents have been merged into the MongoDB Agent.
 
-        {%- if 'mongodb.com/docs' in theme_base_url %}
-          <a class="btn btn-success" style="margin-left: 5px; margin-bottom: 5px;" href="{{theme_base_url}}/opsmanager/master/reference/faq/faq-mongodb-agent/">Learn More</a>
-        {%- else %}
-          <a class="btn btn-success" style="margin-left: 5px; margin-bottom: 5px;" href="https://docs.opsmanager.mongodb.com/master/reference/faq/faq-mongodb-agent/">Learn More</a>
-        {%- endif %}
+        <a class="btn btn-success" style="margin-left: 5px; margin-bottom: 5px;" href="{{theme_base_url}}/opsmanager/master/reference/faq/faq-mongodb-agent/">Learn More</a>
       </span>
     </div>
   {%- endif %}
@@ -80,21 +68,13 @@ <h4 class="alert-heading" style="margin-bottom: 10px;">The MongoDB Agent has bee
 
 {%- block sitesearch %}
   {%- if builder != 'singlehtml' %}
-    {%- if 'mongodb.com/docs' in theme_base_url %}
-      <script type="text/javascript">
-        window.googleSearchCx = "017938353964985089139:s4tijscdeac"
-        window.googleSearchPlaceholder = "Search Ops Manager"
-        window.googleSearchResultsUrl = "{{theme_base_url}}/opsmanager/current/search/"
-      </script>
-    {%- else %}
-      <script type="text/javascript">
-        window.googleSearchCx = "017938353964985089139:s4tijscdeac"
-        window.googleSearchPlaceholder = "Search Ops Manager"
-        window.googleSearchResultsUrl = "https://docs.opsmanager.mongodb.com/current/search/"
-      </script>
-    {%- endif %}
+    <script type="text/javascript">
+      window.googleSearchCx = "017938353964985089139:s4tijscdeac"
+      window.googleSearchPlaceholder = "Search Ops Manager"
+      window.googleSearchResultsUrl = "{{theme_base_url}}/opsmanager/current/search/"
+    </script>
   {%- endif %}
-  
+
 {%- endblock -%}
 
 {%- block header %}

diff --git a/themes/mms-onprem/theme.conf b/themes/mms-onprem/theme.conf
@@ -15,4 +15,4 @@ edition = EDITION
 nav_excluded = NAV
 eol_date = EOL_DATE
 eol_remove = EOL_REMOVE
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/mms/theme.conf b/themes/mms/theme.conf
@@ -19,4 +19,4 @@ sitename = MMS
 nav_excluded = NAV
 saas_base = SAAS
 basepath = BASEPATH
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/mongocli/theme.conf b/themes/mongocli/theme.conf
@@ -22,4 +22,4 @@ sitename = MongoDB
 nav_excluded = NAV
 is_upcoming =
 is_alpha =
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/mongodb/theme.conf b/themes/mongodb/theme.conf
@@ -23,8 +23,8 @@ nav_excluded = NAV
 active_branches =
 upcoming = UPCOMING
 eol_msg = EOL_MSG
-eol = 
+eol =
 eol_upgrade_url =
-banner = 
+banner =
 banner_msg = BANNER_MSG
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/mongoid/theme.conf b/themes/mongoid/theme.conf
@@ -10,4 +10,4 @@ google_analytics = GACODE
 project = PROJECT
 translations = LANGUAGES
 language = LANGUAGE
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/php-library/theme.conf b/themes/php-library/theme.conf
@@ -10,4 +10,4 @@ google_analytics = GACODE
 project = PROJECT
 translations = LANGUAGES
 language = LANGUAGE
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/primer/theme.conf b/themes/primer/theme.conf
@@ -18,4 +18,4 @@ version = VERSION
 version_selector = VERSION_SELECTOR
 latest = LATEST
 stable = STABLE
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/realm/theme.conf b/themes/realm/theme.conf
@@ -21,4 +21,4 @@ stable = STABLE
 sitename = MongoDB
 nav_excluded = NAV
 is_upcoming =
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/ruby-driver/theme.conf b/themes/ruby-driver/theme.conf
@@ -10,4 +10,4 @@ google_analytics = GACODE
 project = PROJECT
 translations = LANGUAGES
 language = LANGUAGE
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/spark-connector/theme.conf b/themes/spark-connector/theme.conf
@@ -21,4 +21,4 @@ stable = STABLE
 sitename = MongoDB
 nav_excluded = NAV
 is_upcoming =
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/stitch/theme.conf b/themes/stitch/theme.conf
@@ -21,4 +21,4 @@ stable = STABLE
 sitename = MongoDB
 nav_excluded = NAV
 is_upcoming =
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/training/theme.conf b/themes/training/theme.conf
@@ -21,4 +21,4 @@ nav_excluded = NAV
 basepath = BASEPATH
 instructor_base = BASE
 student_base = BASE
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs
diff --git a/themes/wip/theme.conf b/themes/wip/theme.conf
@@ -21,4 +21,4 @@ stable = STABLE
 sitename = MongoDB
 nav_excluded = NAV
 is_upcoming =
-base_url = https://docs.mongodb.com
+base_url = https://www.mongodb.com/docs