Skip to content

Commit d4c87d0

Browse files
authored
Merge pull request #37442 from sjhala-ccs/cnv-4-9-redirects
CNV-12828: placing redirects to prevent CNV from releasing with OCP
2 parents 1cd0f1f + 22d62b6 commit d4c87d0

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.s2i/httpd-cfg/01-commercial.conf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ AddType text/vtt vtt
134134
# Redirect ROSA version 4 docs to go to non versioned docs
135135
RewriteRule ^rosa/4/?$ /rosa/welcome/index.html [L,R=301]
136136
RewriteRule ^rosa/4/(.*)$ /rosa/$1 [NE,R=301]
137-
137+
138138
# this pipeline redirect has to come before the latest kicks in generically
139-
RewriteRule ^container-platform/latest/pipelines/creating-applications-with-cicd-pipelines.html /container-platform/4.7/cicd/pipelines/creating-applications-with-cicd-pipelines.html [NE,R=302]
139+
RewriteRule ^container-platform/latest/pipelines/creating-applications-with-cicd-pipelines.html /container-platform/4.7/cicd/pipelines/creating-applications-with-cicd-pipelines.html [NE,R=302]
140140

141141
# remove aro docs to just the welcome page
142142
RewriteRule aro/4/(?!welcome)(.*)?$ /container-platform/latest/$1 [L,R=301]
@@ -161,10 +161,10 @@ AddType text/vtt vtt
161161

162162
# OSD redirects for new content
163163
RewriteRule dedicated/4/cloud_infrastructure_access/dedicated-aws-vpn.html dedicated/osd_private_connections/aws-private-connections.html [NE,R=302]
164-
164+
165165
# ROSA STS Creating Cluster to multiple pages - https://github.com/openshift/openshift-docs/pull/36955
166166
RewriteRule rosa/rosa_getting_started_sts/rosa-sts-creating-cluster\.html rosa/rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/rosa-sts-creating-a-cluster-quickly.html [NE,R=302]
167-
167+
168168
# ACS welcome page redirect to StackRox docs
169169
# RewriteRule ^acs/?(.*)$ https://help.stackrox.com/ [NE,R=301]
170170

@@ -224,8 +224,8 @@ AddType text/vtt vtt
224224
# NOTE THAT THESE ARE A 302 REDIRECT, not a 301. Replace with 301 at CNV GA
225225
# send all cnv/ to virt/about-virt.html.
226226
# send all virt/ to virt/about-virt.html excluding about-virt.html otherwise there is an infinite loop
227-
# RewriteRule container-platform/4\.5/virt/(?!about-virt\.html) /container-platform/4.5/virt/about-virt.html [NE,R=302]
228-
RewriteRule container-platform/4\.5/cnv/?(.*)$ /container-platform/4.5/virt/about-virt.html [NE,R=301]
227+
RewriteRule container-platform/4\.9/virt/(?!about-virt\.html) /container-platform/4.9/virt/about-virt.html [NE,R=302]
228+
# RewriteRule container-platform/4\.5/cnv/?(.*)$ /container-platform/4.5/virt/about-virt.html [NE,R=301]
229229

230230
# Serverless Redirects
231231
RewriteRule container-platform/(4\.5|4\.6)/serverless/knative_eventing/(serverless-subscriptions\.html|serverless-channels\.html|serverless-subscriptions\.html) /container-platform/$1/serverless/event_workflows/serverless-channels.html [NE,R=301]

0 commit comments

Comments
 (0)