Skip to content

Commit 0baed60

Browse files
authored
Merge pull request #77691 from danielclowers/CNV-42655--adding-redirect-rule
CNV#42655: Adding redirect rule for CNV asynchronous release
2 parents 1dd2d0c + d8fce94 commit 0baed60

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -505,15 +505,15 @@ AddType text/vtt vtt
505505
RewriteRule ^container-platform/(4\.4|4\.5)/authentication/(allowing-javascript-access-api-server|encrypting-etcd|certificate-types-descriptions)\.html$ /container-platform/$1/security/$2\.html [NE,R=301]
506506

507507

508-
# The following rule prevents an infinite redirect loop when browsing to /container-platform/4.15/virt/about_virt/about-virt.html
509-
# RewriteRule ^container-platform/4\.15/virt/about_virt/about-virt.html$ - [L]
508+
# The following rule prevents an infinite redirect loop when browsing to /container-platform/4.16/virt/about_virt/about-virt.html
509+
RewriteRule ^container-platform/4\.16/virt/about_virt/about-virt.html$ - [L]
510510

511511
# OpenShift Virtualization (CNV) catchall redirect; use when CNV releases asynchronously from OCP. Do not change the 302 to a 301.
512512
# When uncommented, this redirects all `virt` directory traffic to the about-virt page.
513513
# Pay mind to the redirect directly above this which prevents redirect loops.
514514
# To activate the redirects, uncomment the next and previous lines and update the version number to the pending release.
515515

516-
# RewriteRule container-platform/4\.15/virt/(?!about-virt\.html)(.+)$ /container-platform/4.15/virt/about_virt/about-virt.html [NE,R=302]
516+
RewriteRule container-platform/4\.16/virt/(?!about-virt\.html)(.+)$ /container-platform/4.16/virt/about_virt/about-virt.html [NE,R=302]
517517

518518

519519
# Red Hat OpenShift support for Windows Containers (WMCO) catchall redirect; use when WMCO releases asynchronously from OCP. Do not change the 302 to a 301.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,14 @@ AddType text/vtt vtt
159159
RewriteRule ^latest/install_config/upgrades\.html(.*)$ /latest/install_config/upgrading/index.html$1 [NE,R=301]
160160
RewriteRule ^latest/install_config/upgrading/(.*)$ /latest/upgrading/$1 [NE,R=301]
161161

162-
# The following rule prevents an infinite redirect loop when browsing to /(latest|4\.15)/virt/about_virt/about-virt.html
163-
# RewriteRule ^(latest|4\.15)/virt/about_virt/about-virt.html$ - [L]
162+
# The following rule prevents an infinite redirect loop when browsing to /(latest|4\.16)/virt/about_virt/about-virt.html
163+
RewriteRule ^(latest|4\.16)/virt/about_virt/about-virt.html$ - [L]
164164

165165
# OpenShift Virtualization (CNV) catchall redirect; use when CNV releases asynchronously from OCP. Do not change the 302 to a 301.
166166
# When uncommented, this redirects all `virt` directory traffic to the about-virt page.
167167
# Pay mind to the redirect directly above this which prevents redirect loops.
168168
# To activate the redirects, uncomment the next and previous lines and update the version number to the pending release.
169-
# RewriteRule ^(latest|4\.15)/virt/(?!about-virt\.html)(.+)$ /$1/virt/about_virt/about-virt.html [NE,R=302]
169+
RewriteRule ^(latest|4\.16)/virt/(?!about-virt\.html)(.+)$ /$1/virt/about_virt/about-virt.html [NE,R=302]
170170

171171
# Red Hat OpenShift support for Windows Containers (WMCO) catchall redirect; use when WMCO releases asynchronously from OCP. Do not change the 302 to a 301.
172172
# When uncommented, this redirects all `windows_containers` directory traffic to the /windows_containers/index.html page.

0 commit comments

Comments
 (0)