From ba1b158de1e1074f286bfb8639e0cc4c8f89964a Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 23 Apr 2015 11:39:48 +0000 Subject: [PATCH] Revert "Revert "Adds user guide and admin user guide redirects"" Merge change back in and adjust it: Change "redirect match" to "redirect", we do not need a regex here. This reverts commit 9a15279a862d1bdf8cd82e578f30777d437669f9. Change-Id: I27f1cd549525533a7cdfa2bc675d040e2e037d56 --- www/static/.htaccess | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/www/static/.htaccess b/www/static/.htaccess index 68e06c8c74..9c33871685 100644 --- a/www/static/.htaccess +++ b/www/static/.htaccess @@ -144,3 +144,23 @@ redirectmatch 301 /icehouse/install-guide/install/apt-debian/.*$ / # Redirect old networking content to root for now redirectmatch 301 /openstack-network/.*$ /index.html + +# Redirect top ten (or so) User Guide pages post-migration +redirect 301 /user-guide/content/app_community_support.html /user-guide/common/app_support.html +redirect 301 /user-guide/content/checking_version_cli.html /user-guide/common/cli_discover_version_number_for_a_client.html +redirect 301 /user-guide/content/install_clients.html /user-guide/common/cli_install_openstack_command_line_clients.html +redirect 301 /user-guide/content/ssh-into-instance.html /user-guide/enduser/dashboard_launch_instances.html#connect-to-your-instance-by-using-ssh +redirect 301 /user-guide/content/app_cheat_sheet.html /user-guide/cli_cheat_sheet.html +redirect 301 /user-guide/content/Launching_Instances_using_Dashboard.html /user-guide/enduser/dashboard_launch_instances.html + +# Redirect top ten (or so) Admin User Guide pages post-migration +redirect 301 /user-guide-admin/content/admin_cli_manage_projects_users.html /user-guide-admin/adminuser/manage_projects_users_and_roles.html +redirect 301 /user-guide-admin/content/specify-host-to-boot-instances-on.html /user-guide-admin/adminuser/cli_nova_specify_host.html +redirect 301 /user-guide-admin/content/nova_cli_migrate_single.html /user-guide-admin/adminuser/cli_nova_migrate.html + +# All the rest of the files should be a direct match, file name for file name, +# Or they are not high in pageview count. + +redirectmatch 301 /user-guide/content/(.*) /user-guide/enduser/$1 +redirectmatch 301 /user-guide-admin/content/(.*) /user-guide-admin/adminuser/$1 +redirectmatch 301 /hot-guide/content/(.*) /user-guide/hot-guide/$1