opendev/system-config
Code Issues Proposed changes

Add legacy redirects to static.o.o

Browse Source 
The legacy redirects that are on old-wiki.o.o should go away. But they
certainly should stop being served by old-wiki.

Note, this excludes quantum, which is a dead redirect anyway and
workitems which never really got off the ground and only contains out of
date info from diablo-4.

Change-Id: If78ba98ff927420d003fa69b49ed073e3a44ea09
This commit is contained in:
Monty Taylor 2017-03-08 09:30:59 -06:00
parent 5916cf9533
commit ff52dd32e1
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
2 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
modules/openstack_project/manifests/static.pp
View File

@ -348,14 +348,63 @@ class openstack_project::static (
} }
########################################################### ###########################################################
# legacy devstack.org site redirect # legacy site redirects
::httpd::vhost { 'devstack.org': ::httpd::vhost { 'devstack.org':
port => 80, port => 80,
priority => '50', priority => '50',
docroot => 'MEANINGLESS_ARGUMENT', docroot => 'MEANINGLESS_ARGUMENT',
serveraliases => ['*.devstack.org'], serveraliases => ['*.devstack.org'],
template => 'openstack_project/devstack.vhost.erb', template => 'openstack_project/legacy.vhost.erb',
}
::httpd::vhost { 'cinder.openstack.org':
port => 80,
priority => '50',
docroot => 'MEANINGLESS_ARGUMENT',
template => 'openstack_project/legacy.vhost.erb',
}
::httpd::vhost { 'glance.openstack.org':
port => 80,
priority => '50',
docroot => 'MEANINGLESS_ARGUMENT',
template => 'openstack_project/legacy.vhost.erb',
}
::httpd::vhost { 'horizon.openstack.org':
port => 80,
priority => '50',
docroot => 'MEANINGLESS_ARGUMENT',
template => 'openstack_project/legacy.vhost.erb',
}
::httpd::vhost { 'keystone.openstack.org':
port => 80,
priority => '50',
docroot => 'MEANINGLESS_ARGUMENT',
template => 'openstack_project/legacy.vhost.erb',
}
::httpd::vhost { 'nova.openstack.org':
port => 80,
priority => '50',
docroot => 'MEANINGLESS_ARGUMENT',
template => 'openstack_project/legacy.vhost.erb',
}
::httpd::vhost { 'qa.openstack.org':
port => 80,
priority => '50',
docroot => 'MEANINGLESS_ARGUMENT',
template => 'openstack_project/legacy.vhost.erb',
}
::httpd::vhost { 'swift.openstack.org':
port => 80,
priority => '50',
docroot => 'MEANINGLESS_ARGUMENT',
template => 'openstack_project/legacy.vhost.erb',
} }
########################################################### ###########################################################

2
modules/openstack_project/templates/devstack.vhost.erb → modules/openstack_project/templates/legacy.vhost.erb
View File

@ -12,7 +12,7 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
<% end -%> <% end -%>
RewriteEngine On RewriteEngine On
RewriteRule ^/(.*) http://docs.openstack.org/developer/devstack/$1 [last,redirect=permanent] RewriteRule ^/(.*) http://docs.openstack.org/developer/<%= @name.split('.')[0] %>/$1 [last,redirect=permanent]
ErrorLog /var/log/apache2/<%= @name %>_error.log ErrorLog /var/log/apache2/<%= @name %>_error.log
LogLevel warn LogLevel warn