Skip to content

Commit

Permalink
3.9 Release Configuration files
Browse files Browse the repository at this point in the history
  • Loading branch information
vikram-redhat committed Mar 28, 2018
1 parent 19806a3 commit aca5488
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 5 deletions.
16 changes: 12 additions & 4 deletions .s2i/httpd-cfg/01-commercial.conf
Original file line number Diff line number Diff line change
Expand Up @@ -127,20 +127,28 @@ AddType text/vtt vtt

# Redirects for "latest" version
RewriteRule ^(container-platform|enterprise)/?$ /container-platform/latest [R=301]
RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/3.7/$2 [NE,R=301]
RewriteRule ^(dedicated|online)/(3\.0|3\.1|3\.2|3\.3|3\.4|3\.5|3\.6|3\.7|latest)/?(.*)$ /$1/$3 [NE,R=301]
RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/3.9/$2 [NE,R=301]
RewriteRule ^(dedicated|online)/(3\.0|3\.1|3\.2|3\.3|3\.4|3\.5|3\.6|3\.7|3\.9|latest)/?(.*)$ /$1/$3 [NE,R=301]

# Welcome page redirects
RewriteRule ^(online|dedicated)/?$ /$1/welcome/index.html [L,R=301]
RewriteRule ^enterprise/(3\.0|3\.1|3\.2)/?$ /enterprise/$1/welcome/index.html [L,R=301]
RewriteRule ^enterprise/3\.3/?$ /container-platform/3.3/welcome/index.html [L,R=301]
RewriteRule ^container-platform/(3\.3|3\.4|3\.5|3\.6|3\.7)/?$ /container-platform/$1/welcome/index.html [L,R=301]
RewriteRule ^container-platform/(3\.3|3\.4|3\.5|3\.6|3\.7|3\.9)/?$ /container-platform/$1/welcome/index.html [L,R=301]

# Overview page has moved to Index page
RewriteRule ^(.*)/overview\.html(.*)$ /$1/index.html$2 [NE,L,R=301]

# OCP redirects for 3.9
RewriteRule ^container-platform/3\.9/install_config/deploying_cfme\.html(.*)$ container-platform/3.9/install_config/cfme/index.html [L,R=301]
RewriteRule ^container-platform/3\.9/admin_solutions/index\.html(.*)$ container-platform/3.9/day_two_guide/index.html [L,R=301]
RewriteRule ^container-platform/3\.9/admin_solutions/master_node_config\.html(.*)$ container-platform/3.9/install_config/master_node_configuration.html [L,R=301]
RewriteRule ^container-platform/3\.9/admin_solutions/user_role_mgmt\.html(.*)$ container-platform/3.9/admin_guide/manage_users.html [L,R=301]
RewriteRule ^container-platform/3\.9/admin_solutions/authentication\.html(.*)$ container-platform/3.9/install_config/configuring_authentication.html [L,R=301]
RewriteRule ^container-platform/3\.9/admin_solutions/certificate_management\.html(.*)$ container-platform/3.9/day_two_guide/certificate_management.html [L,R=301]

# OCP redirects for 3.7
# Page currently missing - RewriteRule ^container-platform/3\.7/install_config/deploying_cfme\.html(.*)$ container-platform/3.7/install_config/cfme/index.html [L,R=301]
RewriteRule ^container-platform/3\.7/install_config/deploying_cfme\.html(.*)$ container-platform/3.7/install_config/cfme/index.html [L,R=301]
RewriteRule ^container-platform/3\.7/rest_api/(openshift|kubernetes)_v1\.html(.*)$ /container-platform/3.7/rest_api/index.html [L,R=301]
RewriteRule ^container-platform/3\.7/admin_guide/manage_authorization_policy\.html(.*)$ /container-platform/3.7/admin_guide/manage_rbac.html [L,R=301]
RewriteRule ^container-platform/3\.7/admin_guide/aws_cluster_labeling\.html(.*)$ /container-platform/3.7/install_config/configuring_aws.html#aws-cluster-labeling [NE,L,R=301]
Expand Down
3 changes: 3 additions & 0 deletions _distro_map.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ openshift-enterprise:
enterprise-3.7:
name: '3.7'
dir: container-platform/3.7
enterprise-3.9:
name: '3.9'
dir: container-platform/3.9
openshift-dedicated:
name: OpenShift Dedicated
author: OpenShift Documentation Project <dev@lists.openshift.redhat.com>
Expand Down
1 change: 0 additions & 1 deletion _templates/_page_openshift.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<meta charset="utf-8">
<meta content="IE=edge" http-equiv="X-UA-Compatible">
<meta content="width=device-width, initial-scale=1.0" name="viewport">
<%= (version == "3.9") ? '<meta name="robots" content="noindex">' : '' %>
<title><%= [topic_title, subgroup_title].compact.join(' - ') %> | <%= group_title %> | <%= distro %> <%= version %></title>
<link href="https://assets.openshift.net/content/subdomain.css" rel="stylesheet" type="text/css">
<link href="<%= File.join(css_path, 'docs.css') %>" rel="stylesheet" />
Expand Down
1 change: 1 addition & 0 deletions index-commercial.html
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,7 @@ <h2>OpenShift Container Platform</h2>
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Select Version<span class="caret"></span></button>
<ul class="dropdown-menu" role="menu">
<li><a href="container-platform/3.9/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 3.9</a></li>
<li><a href="container-platform/3.7/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 3.7</a></li>
<li><a href="container-platform/3.6/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 3.6</a></li>
<li><a href="container-platform/3.5/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 3.5</a></li>
Expand Down

0 comments on commit aca5488

Please sign in to comment.