Merge "Correct ci.o.o redirects so slashes are optional"

This commit is contained in:
Jenkins 2015-05-14 01:00:23 +00:00 committed by Gerrit Code Review
commit 3c6c837448

View File

@ -7,12 +7,12 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
ServerName <%= @srvname %> ServerName <%= @srvname %>
RewriteEngine On RewriteEngine On
RewriteRule ^/jenkins-job-builder/(.*) http://docs.openstack.org/infra/jenkins-job-builder/$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 ^/nodepool(/.*|$) http://docs.openstack.org/infra/nodepool$1 [last,redirect=permanent]
RewriteRule ^/openstackid/(.*) http://docs.openstack.org/infra/openstackid/$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 ^/shade(/.*|$) http://docs.openstack.org/infra/shade$1 [last,redirect=permanent]
RewriteRule ^/storyboard/(.*) http://docs.openstack.org/infra/storyboard/$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 ^/zuul(/.*|$) http://docs.openstack.org/infra/zuul$1 [last,redirect=permanent]
RewriteRule ^/(.*) http://docs.openstack.org/infra/system-config/$1 [last,redirect=permanent] RewriteRule ^/(.*) http://docs.openstack.org/infra/system-config/$1 [last,redirect=permanent]
ErrorLog /var/log/apache2/<%= @name %>_error.log ErrorLog /var/log/apache2/<%= @name %>_error.log