From 24480f29563744f6775d0b23c6e8353e8ddeab7c Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 14 Oct 2013 14:19:59 +0000 Subject: [PATCH] Revert "Rework redirections of old content" This reverts commit 1bf1bc686f24d8e0049aa87c6129f3c379387346 --- www/.htaccess | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/www/.htaccess b/www/.htaccess index 0b767f7bfc..a2ba2a37cf 100644 --- a/www/.htaccess +++ b/www/.htaccess @@ -1,8 +1,8 @@ -# Redirect for the original version of compute to apt (could be yum, analytics show more seek apt) -redirect 301 /openstack-compute/ /trunk/install-guide/install/apt/ +# Redirect for the original version of compute +redirect 301 /openstack-compute/ /trunk/openstack-compute/ # Redirect for the original version of storage -redirectmatch 301 /openstack-object-storage/.*$ /admin-guide-cloud/content/ +redirect 301 /openstack-object-storage/ /trunk/openstack-object-storage/ # Redirect for the 1.1 version of the Compute API going to v2 redirect 301 /api/openstack-compute/1.1/ /api/openstack-compute/2/ @@ -24,24 +24,20 @@ redirect 301 /cactus/ /trunk/ redirect 301 /bexar/ /trunk/ # Redirecting incubation quantum -redirectmatch 301 /incubation/openstack-network/admin/content/.*$ /trunk/ +redirect 301 /incubation/openstack-network/admin/content/ /trunk/openstack-network/admin/content redirect 301 /incubation/openstack-network/developer/quantum-api-1.0/content/ /api/openstack-network/1.0/content/ # Redirecting old install guide to apt (could be yum, analytics show more seek apt) -redirect 301 /trunk/openstack-compute/install/content /trunk/install-guide/install/apt/content +redirect 301 /trunk/openstack-compute/install/content /trunk/openstack-compute/install/yum/content # Redirecting trunk basic install to install guide -redirectmatch 301 /trunk/basic-install/apt/.*$ /trunk/install-guide/install/apt/content/ -redirectmatch 301 /trunk/basic-install/yum/.*$ /trunk/install-guide/install/yum/content/ - -# Redirect old trunk Install Guide -redirectmatch 301 /trunk/openstack-compute/install/apt/.*$ /trunk/install-guide/install/apt/content/ -redirectmatch 301 /trunk/openstack-compute/install/yum/.*$ /trunk/install-guide/install/yum/ +redirect 301 /trunk/basic-install/apt/content /trunk/install-guide/apt/content/ +redirect 301 /trunk/basic-install/yum/content /trunk/install-guide/yum/content/ # Redirecting trunk admin guides to admin-guide-cloud -redirectmatch 301 /trunk/openstack-block-storage/admin/content/.*$ /admin-guide-cloud/content/ -redirectmatch 301 /trunk/openstack-compute/admin/content/.*$ /admin-guide-cloud/content/ -redirectmatch 301 /trunk/openstack-object-storage/admin/content/.*$ /admin-guide-cloud/content/ +redirect 301 /trunk/openstack-block-storage/admin/content/ /admin-guide-cloud/content/ +redirect 301 /trunk/openstack-compute/admin/content/ /admin-guide-cloud/content/ +redirect 301 /trunk/openstack-object-storage/admin/content/ /admin-guide-cloud/content/ # Redirecting Image Guide to new location redirect 301 /trunk/openstack-image/content/ /image-guide/content @@ -68,12 +64,3 @@ redirect 301 /cli/ / # Redirect old identity/api to api site redirectmatch /identity/api/.*$ http://api.openstack.org/ - -# Redirect Training Guide to new location -redirect 301 /trunk/openstack-training/ trunk/training-guide/ - -# Redirect Configuration Reference to new location -redirect 301 /trunk/openstack-config/ trunk/config-reference/ - -# Redirect Network Guide to index.page -redirectmatch 301 /trunk/openstack-network/admin/content/.*$ /trunk/