From 39b6f8986b661aff11e55eb69275b541ce39d631 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 22 Jul 2019 21:17:04 +0200 Subject: [PATCH] Add redirects for moved documents Api-guide and api-ref documents are now all on docs.openstack.org, add redirects for them. This fixes also a few broken redirects. Depends-On: https://review.opendev.org/672250 Change-Id: If9dc21ffb7c6995f4b017c78eed8833f90db61c1 --- www/.htaccess | 82 +++++++++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 35 deletions(-) diff --git a/www/.htaccess b/www/.htaccess index e9fb0da22..40353ad24 100644 --- a/www/.htaccess +++ b/www/.htaccess @@ -1,74 +1,86 @@ # Redirect the old API reference URLs to the new location with official service types -redirect 301 /api-ref/networking/ /api-ref/network/ -redirect 301 /api-ref/object-storage/ /api-ref/object-store/ -redirect 301 /api-ref/messaging/ /api-ref/message/ -redirect 301 /api-ref/shared-file-systems/ /api-ref/shared-file-system/ -redirect 301 /api-ref/resource-cluster/ /api-ref/clustering/ +redirect 301 /api-ref/networking/ https://docs.openstack.org/api-ref/network/ +redirect 301 /api-ref/object-storage/ https://docs.openstack.org/api-ref/object-store/ +redirect 301 /api-ref/messaging/ https://docs.openstack.org/api-ref/message/ +redirect 301 /api-ref/shared-file-systems/ https://docs.openstack.org/api-ref/shared-file-system/ +redirect 301 /api-ref/resource-cluster/ https://docs.openstack.org/api-ref/clustering/ # -------------------------------------------- # Redirect related to API ref per project team # -------------------------------------------- # Redirect Block Storage API v1 to v2 and v3 landing -redirect 301 /api-ref/block-storage/v1/index.html /api-ref/block-storage/index.html +redirect 301 /api-ref/block-storage/v1/index.html https://docs.openstack.org/api-ref/block-storage/index.html # Redirect Networking extensions to landing -redirect 301 /api-ref/networking/v2-ext/ /api-ref/network/index.html +redirect 301 /api-ref/networking/v2-ext/ https://docs.openstack.org/api-ref/network/index.html # ------------------------------------------------------------- # Redirect from centralized API ref to API ref per project team # ------------------------------------------------------------- # Redirect for the new file name for complete reference page -redirect 301 /api-reference.html /api-guide/quick-start/index.html -redirect 301 /api-specs.html /api-ref-guides.html -redirect 301 /api-ref.html /api-guide/quick-start/index.html +redirect 301 /api-reference.html https://docs.openstack.org/api-guide-start/index.html +redirect 301 /api-specs.html https://docs.openstack.org/api-guide-start/index.html +redirect 301 /api-ref.html https://docs.openstack.org/api-guide-start/index.html # Redirect Compute API reference v3 to v2.1 -redirect 301 /api-ref-compute-v3.html /api-ref/compute/ +redirect 301 /api-ref-compute-v3.html https://docs.openstack.org/api-ref/compute/ # Redirect Compute API reference v2.0 to v2.1 -redirect 301 /api-ref-compute-v2.html /api-ref/compute/ -redirect 301 /api-ref-compute-v2-ext.html /api-ref/compute/ +redirect 301 /api-ref-compute-v2.html https://docs.openstack.org/api-ref/compute/ +redirect 301 /api-ref-compute-v2-ext.html https://docs.openstack.org/api-ref/compute/ # Redirect Compute API v2.1 reference to in-tree Nova api-ref -redirect 301 /api-ref-compute-v2.1.html /api-ref/compute/ +redirect 301 /api-ref-compute-v2.1.html https://docs.openstack.org/api-ref/compute/ # Redirect Clustering API reference -redirect 301 /api-ref-clustering-v1.html /api-ref/api-ref/clustering/index.html +redirect 301 /api-ref-clustering-v1.html https://docs.openstack.org/api-ref/clustering/index.html # Redirect plural databases file name to database -redirect 301 /api-ref-databases-v1.html /api-ref-database-v1.html +redirect 301 /api-ref-databases-v1.html https://docs.openstack.org/api-ref/database/ # Redirect Data Processing v1.1 -redirect 301 /api-ref-data-processing-v1.1.html /api-ref/data-processing/index.html +redirect 301 /api-ref-data-processing-v1.1.html https://docs.openstack.org/api-ref/data-processing/index.html # Redirect WADL-based Bare Metal API docs to in-tree docs -redirect 301 /api-ref-baremetal-v1.html /api-ref/baremetal/index.html +redirect 301 /api-ref-baremetal-v1.html https://docs.openstack.org/api-ref/baremetal/index.html # Redirect WADL-based Block Storage API docs to in-tree docs -redirect 301 /api-ref-blockstorage-v1.html /api-ref/block-storage/index.html -redirect 301 /api-ref-blockstorage-v2.html /api-ref/block-storage/index.html +redirect 301 /api-ref-blockstorage-v1.html https://docs.openstack.org/api-ref/block-storage/index.html +redirect 301 /api-ref-blockstorage-v2.html https://docs.openstack.org/api-ref/block-storage/index.html # Redirect WADL-based Identity API docs to in-tree docs -redirect 301 /api-ref-identity-v2.html /api-ref/identity/v2/index.html -redirect 301 /api-ref-identity-admin-v2.html /api-ref/identity/v2-admin/index.html -redirect 301 /api-ref-identity-v2-ext.html /api-ref/identity/v2-ext/index.html -redirect 301 /api-ref-identity-v3.html /api-ref/identity/v3/index.html -redirect 301 /api-ref-identity-v3-ext.html /api-ref/identity/v3-ext/index.html +redirect 301 /api-ref-identity-v2.html https://docs.openstack.org/api-ref/identity/v2/index.html +redirect 301 /api-ref-identity-admin-v2.html https://docs.openstack.org/api-ref/identity/v2-admin/index.html +redirect 301 /api-ref-identity-v2-ext.html https://docs.openstack.org/api-ref/identity/v2-ext/index.html +redirect 301 /api-ref-identity-v3.html https://docs.openstack.org/api-ref/identity/v3/index.html +redirect 301 /api-ref-identity-v3-ext.html https://docs.openstack.org/api-ref/identity/v3-ext/index.html # Redirect WADL-based Images API docs to in-tree docs -redirect 301 /api-ref-image-v1.html /api-ref/image/index.html -redirect 301 /api-ref-image-v2.html /api-ref/image/index.html +redirect 301 /api-ref-image-v1.html https://docs.openstack.org/api-ref/image/index.html +redirect 301 /api-ref-image-v2.html https://docs.openstack.org/api-ref/image/index.html # Redirect WADL-based Networking API docs to in-tree docs -redirect 301 /api-ref-networking-v2.html /api-ref/network/v2/index.html -redirect 301 /api-ref-networking-v2-ext.html /api-ref/network/v2/index.html +redirect 301 /api-ref-networking-v2.html https://docs.openstack.org/api-ref/network/v2/index.html +redirect 301 /api-ref-networking-v2-ext.html https://docs.openstack.org/api-ref/network/v2/index.html # Redirect WADL-based Object Storage API docs to in-tree docs -redirect 301 /api-ref-objectstorage-v1.html /api-ref/object-store/index.html +redirect 301 /api-ref-objectstorage-v1.html https://docs.openstack.org/api-ref/object-store/index.html # Redirect Orchestration API -redirect 301 /api-ref-orchestration-v1.html /api-ref/orchestration/index.html +redirect 301 /api-ref-orchestration-v1.html https://docs.openstack.org/api-ref/orchestration/index.html # Redirect Shared File Systems API v2 -redirect 301 /api-ref-share-v2.html /api-ref/shared-file-system/index.html +redirect 301 /api-ref-share-v2.html https://docs.openstack.org/api-ref/shared-file-system/index.html # Redirect Shared File Systems API v1 -redirect 301 /api-ref-share-v1.html /api-ref/shared-file-system/index.html +redirect 301 /api-ref-share-v1.html https://docs.openstack.org/api-ref/shared-file-system/index.html # Redirect Telemetry (ceilometer only) API redirect 301 /api-ref-telemetry-v2.html https://docs.openstack.org/ceilometer/latest/webapi/v2.html # Redirect no-longer-existing Image API v1 docs to intro page -redirect 301 /api-ref/image/v1/ /api-ref/image/ +redirect 301 /api-ref/image/v1/ https://docs.openstack.org/api-ref/image/ # Redirect service-type aliases to service-type api-ref locations {% for alias, service_type in REVERSE.items() -%} -redirectmatch 301 /api-ref/{{ alias }}/(.*) /api-ref/{{ service_type }}/$1 +redirectmatch 301 /api-ref/{{ alias }}/(.*) https://docs.openstack.org/api-ref/{{ service_type }}/$1 {% endfor %} redirect 301 /sdks/python/openstacksdk https://docs.openstack.org/openstacksdk/latest/ # Redirect api-quick-start, now on docs.openstack.org redirect 301 /api-guide/quick-start/ https://docs.openstack.org/api-quick-start/ + +# Redirect translated api-quick-start documents +redirect 301 /de/api-guide/quick-start/ https://docs.openstack.org/de/api-quick-start/ +redirect 301 /eo/api-guide/quick-start/ https://docs.openstack.org/eo/api-quick-start/ +redirect 301 /id/api-guide/quick-start/ https://docs.openstack.org/id/api-quick-start/ +redirect 301 /ko_KR/api-guide/quick-start/ https://docs.openstack.org/ko_KR/api-quick-start/ +redirect 301 /tr_TR/api-guide/quick-start/ https://docs.openstack.org/tr_TR/api-quick-start/ +redirect 301 /zh_CN/api-guide/quick-start/ https://docs.openstack.org/zh_CN/api-quick-start/ + +# Redirect remaining api-ref and api-doc documents to docs.openstack.org +redirect 301 /api-guide/ https://docs.openstack.org/api-guide/ +redirect 301 /api-ref/ https://docs.openstack.org/api-ref/