From b6e8093c625dc5098cc650f23d7f8a7df883e422 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Wed, 13 May 2015 18:54:29 +0000 Subject: [PATCH] Correct ci.o.o redirects so slashes are optional Make it so that browsers will be redirected from old ci.openstack.org URLS regardless of whether trailing slashes are appended. Change-Id: I7902993730b36df850c5438df23a10b4a41d7c96 --- modules/openstack_project/templates/ci.vhost.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/openstack_project/templates/ci.vhost.erb b/modules/openstack_project/templates/ci.vhost.erb index 8f87633062..e5010025b5 100644 --- a/modules/openstack_project/templates/ci.vhost.erb +++ b/modules/openstack_project/templates/ci.vhost.erb @@ -7,12 +7,12 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %> ServerName <%= @srvname %> RewriteEngine On - RewriteRule ^/jenkins-job-builder/(.*) http://docs.openstack.org/infra/jenkins-job-builder/$1 [last,redirect=permanent] - RewriteRule ^/nodepool/(.*) http://docs.openstack.org/infra/nodepool/$1 [last,redirect=permanent] - RewriteRule ^/openstackid/(.*) http://docs.openstack.org/infra/openstackid/$1 [last,redirect=permanent] - RewriteRule ^/shade/(.*) http://docs.openstack.org/infra/shade/$1 [last,redirect=permanent] - RewriteRule ^/storyboard/(.*) http://docs.openstack.org/infra/storyboard/$1 [last,redirect=permanent] - RewriteRule ^/zuul/(.*) http://docs.openstack.org/infra/zuul/$1 [last,redirect=permanent] +RewriteRule ^/jenkins-job-builder(/.*|$) http://docs.openstack.org/infra/jenkins-job-builder$1 [last,redirect=permanent] + RewriteRule ^/nodepool(/.*|$) http://docs.openstack.org/infra/nodepool$1 [last,redirect=permanent] + RewriteRule ^/openstackid(/.*|$) http://docs.openstack.org/infra/openstackid$1 [last,redirect=permanent] + RewriteRule ^/shade(/.*|$) http://docs.openstack.org/infra/shade$1 [last,redirect=permanent] + RewriteRule ^/storyboard(/.*|$) http://docs.openstack.org/infra/storyboard$1 [last,redirect=permanent] + RewriteRule ^/zuul(/.*|$) http://docs.openstack.org/infra/zuul$1 [last,redirect=permanent] RewriteRule ^/(.*) http://docs.openstack.org/infra/system-config/$1 [last,redirect=permanent] ErrorLog /var/log/apache2/<%= @name %>_error.log