opendev/system-config
Code Issues Proposed changes

Merge "Update redirects for legacy sides"

Browse Source
This commit is contained in:
Zuul 2020-02-28 03:30:59 +00:00 committed by Gerrit Code Review
commit 3417dc21c5
10 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/roles/static/files/50-ci.openstack.org.conf
View File

@ -4,9 +4,9 @@
RewriteRule ^/jenkins-job-builder(/.*|$) https://docs.openstack.org/infra/jenkins-job-builder$1 [last,redirect=permanent] RewriteRule ^/jenkins-job-builder(/.*|$) https://docs.openstack.org/infra/jenkins-job-builder$1 [last,redirect=permanent]
RewriteRule ^/nodepool(/.*|$) https://docs.openstack.org/infra/nodepool$1 [last,redirect=permanent] RewriteRule ^/nodepool(/.*|$) https://docs.openstack.org/infra/nodepool$1 [last,redirect=permanent]
RewriteRule ^/openstackid(/.*|$) https://docs.openstack.org/infra/openstackid$1 [last,redirect=permanent] RewriteRule ^/openstackid(/.*|$) https://docs.openstack.org/infra/openstackid$1 [last,redirect=permanent]
RewriteRule ^/shade(/.*|$) https://docs.openstack.org/infra/shade$1 [last,redirect=permanent] RewriteRule ^/shade(/.*|$) https://docs.openstack.org/shade/latest$1 [last,redirect=permanent]
RewriteRule ^/storyboard(/.*|$) https://docs.openstack.org/infra/storyboard$1 [last,redirect=permanent] RewriteRule ^/storyboard(/.*|$) https://docs.openstack.org/infra/storyboard$1 [last,redirect=permanent]
RewriteRule ^/zuul(/.*|$) https://docs.openstack.org/infra/zuul$1 [last,redirect=permanent] RewriteRule ^/zuul(/.*|$) https://zuul-ci.org/docs/zuul$1 [last,redirect=permanent]
RewriteRule ^/(.*) https://docs.openstack.org/infra/system-config/$1 [last,redirect=permanent] RewriteRule ^/(.*) https://docs.openstack.org/infra/system-config/$1 [last,redirect=permanent]
</Macro> </Macro>

4
playbooks/roles/static/files/50-cinder.openstack.org.conf
View File

@ -2,7 +2,7 @@
ServerName cinder.openstack.org ServerName cinder.openstack.org
RewriteEngine On RewriteEngine On
RewriteRule ^/(.*) https://docs.openstack.org/developer/cinder/$1 [last,redirect=permanent] RewriteRule ^/(.*) https://docs.openstack.org/cinder/latest/$1 [last,redirect=permanent]
LogLevel warn LogLevel warn
ErrorLog /var/log/apache2/cinder.openstack.org_error.log ErrorLog /var/log/apache2/cinder.openstack.org_error.log
@ -22,7 +22,7 @@
SSLHonorCipherOrder on SSLHonorCipherOrder on
RewriteEngine On RewriteEngine On
RewriteRule ^/(.*) https://docs.openstack.org/developer/cinder/$1 [last,redirect=permanent] RewriteRule ^/(.*) https://docs.openstack.org/cinder/latest/$1 [last,redirect=permanent]
LogLevel warn LogLevel warn
ErrorLog /var/log/apache2/cinder.openstack.org_error.log ErrorLog /var/log/apache2/cinder.openstack.org_error.log

4
playbooks/roles/static/files/50-devstack.org.conf
View File

@ -3,7 +3,7 @@
ServerAlias *.devstack.org ServerAlias *.devstack.org
RewriteEngine On RewriteEngine On
RewriteRule ^/(.*) https://docs.openstack.org/developer/devstack/$1 [last,redirect=permanent] RewriteRule ^/(.*) https://docs.openstack.org/devstack/latest/$1 [last,redirect=permanent]
LogLevel warn LogLevel warn
ErrorLog /var/log/apache2/devstack.org_error.log ErrorLog /var/log/apache2/devstack.org_error.log
@ -24,7 +24,7 @@
SSLHonorCipherOrder on SSLHonorCipherOrder on
RewriteEngine On RewriteEngine On
RewriteRule ^/(.*) https://docs.openstack.org/developer/devstack/$1 [last,redirect=permanent] RewriteRule ^/(.*) https://docs.openstack.org/devstack/latest/$1 [last,redirect=permanent]
LogLevel warn LogLevel warn
ErrorLog /var/log/apache2/devstack.org_error.log ErrorLog /var/log/apache2/devstack.org_error.log

4
playbooks/roles/static/files/50-glance.openstack.org.conf
View File

@ -2,7 +2,7 @@
ServerName glance.openstack.org ServerName glance.openstack.org
RewriteEngine On RewriteEngine On
RewriteRule ^/(.*) https://docs.openstack.org/developer/glance/$1 [last,redirect=permanent] RewriteRule ^/(.*) https://docs.openstack.org/glance/latest/$1 [last,redirect=permanent]
LogLevel warn LogLevel warn
ErrorLog /var/log/apache2/glance.openstack.org_error.log ErrorLog /var/log/apache2/glance.openstack.org_error.log
@ -22,7 +22,7 @@
SSLHonorCipherOrder on SSLHonorCipherOrder on
RewriteEngine On RewriteEngine On
RewriteRule ^/(.*) https://docs.openstack.org/developer/glance/$1 [last,redirect=permanent] RewriteRule ^/(.*) https://docs.openstack.org/glance/latest/$1 [last,redirect=permanent]
LogLevel warn LogLevel warn
ErrorLog /var/log/apache2/glance.openstack.org_error.log ErrorLog /var/log/apache2/glance.openstack.org_error.log

4
playbooks/roles/static/files/50-horizon.openstack.org.conf
View File

@ -2,7 +2,7 @@
ServerName horizon.openstack.org ServerName horizon.openstack.org
RewriteEngine On RewriteEngine On
RewriteRule ^/(.*) https://docs.openstack.org/developer/horizon/$1 [last,redirect=permanent] RewriteRule ^/(.*) https://docs.openstack.org/horizon/latest/$1 [last,redirect=permanent]
LogLevel warn LogLevel warn
ErrorLog /var/log/apache2/horizon.openstack.org_error.log ErrorLog /var/log/apache2/horizon.openstack.org_error.log
@ -22,7 +22,7 @@
SSLHonorCipherOrder on SSLHonorCipherOrder on
RewriteEngine On RewriteEngine On
RewriteRule ^/(.*) https://docs.openstack.org/developer/horizon/$1 [last,redirect=permanent] RewriteRule ^/(.*) https://docs.openstack.org/horizon/latest/$1 [last,redirect=permanent]
LogLevel warn LogLevel warn
ErrorLog /var/log/apache2/horizon.openstack.org_error.log ErrorLog /var/log/apache2/horizon.openstack.org_error.log

4
playbooks/roles/static/files/50-keystone.openstack.org.conf
View File

@ -2,7 +2,7 @@
ServerName keystone.openstack.org ServerName keystone.openstack.org
RewriteEngine On RewriteEngine On
RewriteRule ^/(.*) https://docs.openstack.org/developer/keystone/$1 [last,redirect=permanent] RewriteRule ^/(.*) https://docs.openstack.org/keystone/latest/$1 [last,redirect=permanent]
LogLevel warn LogLevel warn
ErrorLog /var/log/apache2/keystone.openstack.org_error.log ErrorLog /var/log/apache2/keystone.openstack.org_error.log
@ -22,7 +22,7 @@
SSLHonorCipherOrder on SSLHonorCipherOrder on
RewriteEngine On RewriteEngine On
RewriteRule ^/(.*) https://docs.openstack.org/developer/keystone/$1 [last,redirect=permanent] RewriteRule ^/(.*) https://docs.openstack.org/keystone/latest/$1 [last,redirect=permanent]
LogLevel warn LogLevel warn
ErrorLog /var/log/apache2/keystone.openstack.org_error.log ErrorLog /var/log/apache2/keystone.openstack.org_error.log

4
playbooks/roles/static/files/50-nova.openstack.org.conf
View File

@ -2,7 +2,7 @@
ServerName nova.openstack.org ServerName nova.openstack.org
RewriteEngine On RewriteEngine On
RewriteRule ^/(.*) https://docs.openstack.org/developer/nova/$1 [last,redirect=permanent] RewriteRule ^/(.*) https://docs.openstack.org/nova/latest/$1 [last,redirect=permanent]
LogLevel warn LogLevel warn
ErrorLog /var/log/apache2/nova.openstack.org_error.log ErrorLog /var/log/apache2/nova.openstack.org_error.log
@ -22,7 +22,7 @@
SSLHonorCipherOrder on SSLHonorCipherOrder on
RewriteEngine On RewriteEngine On
RewriteRule ^/(.*) https://docs.openstack.org/developer/nova/$1 [last,redirect=permanent] RewriteRule ^/(.*) https://docs.openstack.org/nova/latest/$1 [last,redirect=permanent]
LogLevel warn LogLevel warn
ErrorLog /var/log/apache2/nova.openstack.org_error.log ErrorLog /var/log/apache2/nova.openstack.org_error.log

4
playbooks/roles/static/files/50-qa.openstack.org.conf
View File

@ -2,7 +2,7 @@
ServerName qa.openstack.org ServerName qa.openstack.org
RewriteEngine On RewriteEngine On
RewriteRule ^/(.*) https://docs.openstack.org/developer/qa/$1 [last,redirect=permanent] RewriteRule ^/(.*) https://docs.openstack.org/ [last,redirect=permanent]
LogLevel warn LogLevel warn
ErrorLog /var/log/apache2/qa.openstack.org_error.log ErrorLog /var/log/apache2/qa.openstack.org_error.log
@ -22,7 +22,7 @@
SSLHonorCipherOrder on SSLHonorCipherOrder on
RewriteEngine On RewriteEngine On
RewriteRule ^/(.*) https://docs.openstack.org/developer/qa/$1 [last,redirect=permanent] RewriteRule ^/(.*) https://docs.openstack.org/ [last,redirect=permanent]
LogLevel warn LogLevel warn
ErrorLog /var/log/apache2/qa.openstack.org_error.log ErrorLog /var/log/apache2/qa.openstack.org_error.log

4
playbooks/roles/static/files/50-swift.openstack.org.conf
View File

@ -2,7 +2,7 @@
ServerName swift.openstack.org ServerName swift.openstack.org
RewriteEngine On RewriteEngine On
RewriteRule ^/(.*) https://docs.openstack.org/developer/swift/$1 [last,redirect=permanent] RewriteRule ^/(.*) https://docs.openstack.org/swift/latest/$1 [last,redirect=permanent]
LogLevel warn LogLevel warn
ErrorLog /var/log/apache2/swift.openstack.org_error.log ErrorLog /var/log/apache2/swift.openstack.org_error.log
@ -22,7 +22,7 @@
SSLHonorCipherOrder on SSLHonorCipherOrder on
RewriteEngine On RewriteEngine On
RewriteRule ^/(.*) https://docs.openstack.org/developer/swift/$1 [last,redirect=permanent] RewriteRule ^/(.*) https://docs.openstack.org/swift/latest/$1 [last,redirect=permanent]
LogLevel warn LogLevel warn
ErrorLog /var/log/apache2/swift.openstack.org_error.log ErrorLog /var/log/apache2/swift.openstack.org_error.log

22
testinfra/test_static.py
View File

@ -158,15 +158,15 @@ def test_git_redirects(host, url, target):
assert target in cmd.stdout assert target in cmd.stdout
doc_redirects = ( doc_redirects = (
('devstack.org', 'https://docs.openstack.org/developer/devstack'), ('devstack.org', 'https://docs.openstack.org/devstack/latest'),
('www.devstack.org', 'https://docs.openstack.org/developer/devstack'), ('www.devstack.org', 'https://docs.openstack.org/devstack/latest'),
('cinder.openstack.org', 'https://docs.openstack.org/developer/cinder'), ('cinder.openstack.org', 'https://docs.openstack.org/cinder/latest'),
('glance.openstack.org', 'https://docs.openstack.org/developer/glance'), ('glance.openstack.org', 'https://docs.openstack.org/glance/latest'),
('horizon.openstack.org', 'https://docs.openstack.org/developer/horizon'), ('horizon.openstack.org', 'https://docs.openstack.org/horizon/latest'),
('keystone.openstack.org', 'https://docs.openstack.org/developer/keystone'), ('keystone.openstack.org', 'https://docs.openstack.org/keystone/latest'),
('nova.openstack.org', 'https://docs.openstack.org/developer/nova'), ('nova.openstack.org', 'https://docs.openstack.org/nova/latest'),
('qa.openstack.org', 'https://docs.openstack.org/developer/qa'), ('qa.openstack.org', 'https://docs.openstack.org/'),
('swift.openstack.org', 'https://docs.openstack.org/developer/swift'), ('swift.openstack.org', 'https://docs.openstack.org/swift/latest'),
) )
@pytest.mark.parametrize("hostname,target", doc_redirects) @pytest.mark.parametrize("hostname,target", doc_redirects)
@ -197,9 +197,9 @@ ci_redirects = (
('/jenkins-job-builder', 'https://docs.openstack.org/infra/jenkins-job-builder'), ('/jenkins-job-builder', 'https://docs.openstack.org/infra/jenkins-job-builder'),
('/nodepool', 'https://docs.openstack.org/infra/nodepool'), ('/nodepool', 'https://docs.openstack.org/infra/nodepool'),
('/openstackid', 'https://docs.openstack.org/infra/openstackid'), ('/openstackid', 'https://docs.openstack.org/infra/openstackid'),
('/shade', 'https://docs.openstack.org/infra/shade'), ('/shade', 'https://docs.openstack.org/shade/latest'),
('/storyboard', 'https://docs.openstack.org/infra/storyboard'), ('/storyboard', 'https://docs.openstack.org/infra/storyboard'),
('/zuul', 'https://docs.openstack.org/infra/zuul'), ('/zuul', 'https://zuul-ci.org/docs/zuul'),
('/', 'https://docs.openstack.org/infra/system-config/'), ('/', 'https://docs.openstack.org/infra/system-config/'),
) )