opendev/system-config
Code Issues Proposed changes

Use https://docs.openstack.org everywhere

Browse Source 
We have lots of links and redirects into docs.o.o using http but we host
via https now. Avoid unnecessary redirects and point directly at https.

Change-Id: I3a01533afa5915dcfc0a7220dd511819911108ca
This commit is contained in:
Clark Boylan 2017-04-18 16:41:35 -07:00
parent 87d00c5603
commit e940f7737e
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openstack_project/files/gerrit/system-cla.html
View File

@ -6,7 +6,7 @@ Gerrit System Role Accounts Proxy CLA
<p> <p>
This is not a real CLA and cannot be signed. See <a This is not a real CLA and cannot be signed. See <a
href="http://docs.openstack.org/infra/manual/developers.html#account-setup">the href="https://docs.openstack.org/infra/manual/developers.html#account-setup">the
account setup instructions</a> for more information on OpenStack Contributor account setup instructions</a> for more information on OpenStack Contributor
License Agreements. License Agreements.
</p> </p>

2
modules/openstack_project/files/gerrit/usg-cla.html
View File

@ -8,7 +8,7 @@ OpenStack Project U.S. Government Contributor License Agreement
This agreement is not managed through Gerrit. If you need to sign the U.S. This agreement is not managed through Gerrit. If you need to sign the U.S.
Government Contributor License Agreement, please contact the OpenStack Government Contributor License Agreement, please contact the OpenStack
Foundation to initiate the process. See <a Foundation to initiate the process. See <a
href="http://docs.openstack.org/infra/manual/developers.html#account-setup">the href="https://docs.openstack.org/infra/manual/developers.html#account-setup">the
account setup instructions</a> for more information on OpenStack Contributor account setup instructions</a> for more information on OpenStack Contributor
License Agreements. License Agreements.
</p> </p>

2
modules/openstack_project/manifests/gerrit.pp
View File

@ -74,7 +74,7 @@ class openstack_project::gerrit (
$web_repo_url_encode = false, $web_repo_url_encode = false,
$secondary_index = true, $secondary_index = true,
$report_bug_text = 'Get Help', $report_bug_text = 'Get Help',
$report_bug_url = 'http://docs.openstack.org/infra/system-config/project.html#contributing', $report_bug_url = 'https://docs.openstack.org/infra/system-config/project.html#contributing',
$index_threads = 1, $index_threads = 1,
$download = {}, $download = {},
$receive_max_object_size_limit = '100 m', $receive_max_object_size_limit = '100 m',

14
modules/openstack_project/templates/ci.vhost.erb
View File

@ -7,13 +7,13 @@ 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(/.*|$) https://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(/.*|$) https://docs.openstack.org/infra/nodepool$1 [last,redirect=permanent]
RewriteRule ^/openstackid(/.*|$) http://docs.openstack.org/infra/openstackid$1 [last,redirect=permanent] RewriteRule ^/openstackid(/.*|$) https://docs.openstack.org/infra/openstackid$1 [last,redirect=permanent]
RewriteRule ^/shade(/.*|$) http://docs.openstack.org/infra/shade$1 [last,redirect=permanent] RewriteRule ^/shade(/.*|$) https://docs.openstack.org/infra/shade$1 [last,redirect=permanent]
RewriteRule ^/storyboard(/.*|$) http://docs.openstack.org/infra/storyboard$1 [last,redirect=permanent] RewriteRule ^/storyboard(/.*|$) https://docs.openstack.org/infra/storyboard$1 [last,redirect=permanent]
RewriteRule ^/zuul(/.*|$) http://docs.openstack.org/infra/zuul$1 [last,redirect=permanent] RewriteRule ^/zuul(/.*|$) https://docs.openstack.org/infra/zuul$1 [last,redirect=permanent]
RewriteRule ^/(.*) http://docs.openstack.org/infra/system-config/$1 [last,redirect=permanent] RewriteRule ^/(.*) https://docs.openstack.org/infra/system-config/$1 [last,redirect=permanent]
ErrorLog /var/log/apache2/<%= @name %>_error.log ErrorLog /var/log/apache2/<%= @name %>_error.log
LogLevel warn LogLevel warn

2
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/<%= @name.split('.')[0] %>/$1 [last,redirect=permanent] RewriteRule ^/(.*) https://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