From 2a2ee1da3a5d4dc1afd8edd69188871835b6fb3a Mon Sep 17 00:00:00 2001 From: annegentle Date: Mon, 23 Jul 2012 12:37:45 -0500 Subject: [PATCH] Adds the old .htaccess file back to the site as the new one completely broke the site. Puts the .htaccess under version control too. Change-Id: Ia1b26a739341c2604d63a0c080e48af6fb6aff97 --- www/.htaccess | 45 +-------------------------------------------- 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/www/.htaccess b/www/.htaccess index fc06fab77..4781c77f1 100644 --- a/www/.htaccess +++ b/www/.htaccess @@ -7,9 +7,6 @@ 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/ -# Redirect from temporary docblitz site -redirect 301 /docblitz/ /trunk/ - # Redirecting cactus version redirect 301 /cactus/ /trunk/ # redirect 301 /cactus/openstack-compute/ /trunk/openstack-compute/ @@ -21,45 +18,5 @@ redirect 301 /bexar/ /trunk/ # redirect 301 /bexar/openstack-object-storage/ /trunk/openstack-object-storage/admin/content/ # Redirecting incubation quantum -redirect 301 /incubation/openstack-network/admin/content/ /trunk/openstack-network/admin/content/ +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/ - -# Redirect single install guide to yum-based guide -redirect 301 /essex/openstack-compute/install/ essex/openstack-compute/install/apt/ - -# Fix bug 1022712, orphaned files in Compute Admin Manual -redirect 301 trunk/openstack-compute/admin/content/reference-for-options-in-nova-conf.html /trunk/openstack-compute/admin/content/compute-options-reference.html -redirect 301 /trunk/openstack-compute/admin/content/veewee.html /trunk/openstack-compute/admin/content/creating-new-images.html -redirect 301 /trunk/openstack-compute/admin/content/ubuntu-vm-builder.html /trunk/openstack-compute/admin/content/creating-new-images.htmlredirect 301 /trunk/openstack-compute/admin/content/oz.html /trunk/openstack-compute/admin/content/creating-new-images.html -redirect 301 /trunk/openstack-compute/admin/content/vpn-access.html /trunk/openstack-compute/admin/content/cloudpipe-per-project-vpns.html -redirect 301 /trunk/openstack-compute/admin/content/restarting-and-logging-into-cloudpipe-vpn.html /trunk/openstack-compute/admin/content/cloudpipe-per-project-vpns.html -redirect 301 /trunk/openstack-compute/admin/content/creating-a-cloudpipe-image.html /trunk/openstack-compute/admin/content/cloudpipe-per-project-vpns.html -redirect 301 /trunk/openstack-compute/admin/content/certificates-and-revocation.html /trunk/openstack-compute/admin/content/cloudpipe-per-project-vpns.html -redirect 301 /trunk/openstack-compute/admin/content/vmware-wsdl.html /trunk/openstack-compute/admin/content/vmware.html -redirect 301 /trunk/openstack-compute/admin/content/vmware-intro.html /trunk/openstack-compute/admin/content/vmware.html -redirect 301 /trunk/openstack-compute/admin/content/vmware-prereqs.html /trunk/openstack-compute/admin/content/vmware.html -redirect 301 /trunk/openstack-compute/admin/content/VMWare_configuration_options.html /trunk/openstack-compute/admin/content/vmware.html -redirect 301 /trunk/openstack-compute/admin/content/using-multiple-nics-introduction.html /trunk/openstack-compute/admin/content/using-multi-nics.html -redirect 301 /trunk/openstack-compute/admin/content/using-multiple-nics-usage.html /trunk/openstack-compute/admin/content/using-multi-nics.html -redirect 301 /trunk/openstack-compute/admin/content/allocating-associating-ip-addresses.html /trunk/openstack-compute/admin/content/associating-public-ip.html -redirect 301 /trunk/openstack-compute/admin/content/Private_and_Public_IP_Addresses.html /trunk/openstack-compute/admin/content/associating-public-ip.html -redirect 301 /trunk/openstack-compute/admin/content/Troubleshooting.html /trunk/openstack-compute/admin/content/associating-public-ip.html -redirect 301 /trunk/openstack-compute/admin/content/Adding_a_Floating_IP_to_an_Instance.html /trunk/openstack-compute/admin/content/associating-public-ip.html -redirect 301 /trunk/openstack-compute/admin/content/Automatically_adding_floating_IPs.html /trunk/openstack-compute/admin/content/associating-public-ip.html -redirect 301 /trunk/openstack-compute/admin/content/Creating_a_List_of_Available_Floating_IP_Addresses.html /trunk/openstack-compute/admin/content/associating-public-ip.html -redirect 301 /trunk/openstack-compute/admin/content/run-the-server.html /trunk/openstack-compute/admin/content/about-the-dashboard.html -redirect 301 /trunk/openstack-compute/admin/content/installing-openstack-dashboard.html /trunk/openstack-compute/admin/content/about-the-dashboard.html -redirect 301 /trunk/openstack-compute/admin/content/install-dashboard.html /trunk/openstack-compute/admin/content/about-the-dashboard.html -redirect 301 /trunk/openstack-compute/admin/content/build-and-configure-openstack-dashboard.html /trunk/openstack-compute/admin/content/about-the-dashboard.html -redirect 301 /trunk/openstack-compute/admin/content/getting-an-instances-vnc-console.html /trunk/openstack-compute/admin/content/getting-started-with-vnc-proxy.html -redirect 301 /trunk/openstack-compute/admin/content/getting-started-with-the-vnc-proxy.html /trunk/openstack-compute/admin/content/getting-started-with-vnc-proxy.html -redirect 301 /trunk/openstack-compute/admin/content/enabling-vnc-consoles-in-nova.html /trunk/openstack-compute/admin/content/getting-started-with-vnc-proxy.html -redirect 301 /trunk/openstack-compute/admin/content/dashboard-system-requirements.html /trunk/openstack-compute/admin/content/about-the-dashboard.html -redirect 301 /trunk/openstack-compute/admin/content/configuring-the-vnc-proxy.html /trunk/openstack-compute/admin/content/getting-started-with-vnc-proxy.html -redirect 301 /trunk/openstack-compute/admin/content/build-and-configure-openstack-dashboard.html /trunk/openstack-compute/admin/content/about-the-dashboard.html -redirect 301 -redirect 301 /trunk/openstack-compute/admin/content/Launching_Instance.html /trunk/openstack-compute/admin/content/about-the-dashboard.html#Launching_Instances_using_Dashboard -redirect 301 /trunk/openstack-compute/admin/content/Launching_Instances_using_Dashboard.html /trunk/openstack-compute/admin/content/about-the-dashboard.html#Launching_Instances_using_Dashboard -redirect 301 /trunk/openstack-compute/admin/content/Modify_Security_Groups.html /trunk/openstack-compute/admin/content/about-the-dashboard.html#Modify_Security_Groups -redirect 301 /trunk/openstack-compute/admin/content/Adding_Keypair.html /trunk/openstack-compute/admin/content/about-the-dashboard.html#Adding_Keypair -redirect 301 /trunk/openstack-compute/admin/content/reference-for-flags-in-nova-conf.html /trunk/openstack-compute/admin/content/compute-options-reference.html \ No newline at end of file