Skip to content

Commit de54a95

Browse files
pneedle-rhpneedle-rh
authored
Merge pull request #46229 from bscott-rh/convert-302-to-301
Converting 302's to 301 for redirects >2 weeks old
2 parents d0b1860 + 674718d commit de54a95

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ AddType text/vtt vtt
145145
RewriteRule ^acs/(3\.65|3\.66|3\.67|3\.68|3\.69|3\.70)/?$ /acs/$1/welcome/index.html [L,R=301]
146146

147147
# this pipeline redirect has to come before the latest kicks in generically
148-
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]
148+
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=301]
149149

150150
# remove aro docs to just the welcome page
151151
RewriteRule aro/4/(?!welcome)(.*)?$ /container-platform/latest/$1 [L,R=301]
@@ -160,17 +160,17 @@ AddType text/vtt vtt
160160
RewriteRule ^container-platform\/3\.(.+)\/release_notes\/ocp_3_((?!\1).+)_release_notes.html /container-platform/3.$1/release_notes/ocp_3_$1_release_notes.html [NE,R=301]
161161

162162
# Redirects for the Updating book
163-
RewriteRule ^container-platform/(4\.8|4\.9)/updating/installing-update-service.html /container-platform/$1/updating/updating-restricted-network-cluster.html [NE,R=302]
164-
RewriteRule ^container-platform/(4\.8|4\.9)/updating/understanding-the-update-service.html /container-platform/$1/updating/updating-restricted-network-cluster.html [NE,R=302]
163+
RewriteRule ^container-platform/(4\.8|4\.9)/updating/installing-update-service.html /container-platform/$1/updating/updating-restricted-network-cluster.html [NE,R=301]
164+
RewriteRule ^container-platform/(4\.8|4\.9)/updating/understanding-the-update-service.html /container-platform/$1/updating/updating-restricted-network-cluster.html [NE,R=301]
165165

166166
# CNV scenarios based redirect
167167
RewriteRule ^container-platform/4\.8/virt/learn_more_about_ov.html /container-platform/4.8/virt/virt-learn-more-about-openshift-virtualization.html [NE,R=301]
168168

169169
# PR https://github.com/openshift/openshift-docs/pull/35208/files for oc-compliance plugin
170-
RewriteRule ^container-platform/4\.8/security/oc_compliance_plug_in/oc-compliance-plug-in-using.html /container-platform/4.8/security/compliance_operator/oc-compliance-plug-in-using.html [NE,R=302]
170+
RewriteRule ^container-platform/4\.8/security/oc_compliance_plug_in/oc-compliance-plug-in-using.html /container-platform/4.8/security/compliance_operator/oc-compliance-plug-in-using.html [NE,R=301]
171171

172172
# OSD redirects for new content
173-
RewriteRule dedicated/4/cloud_infrastructure_access/dedicated-aws-vpn.html dedicated/osd_private_connections/aws-private-connections.html [NE,R=302]
173+
RewriteRule dedicated/4/cloud_infrastructure_access/dedicated-aws-vpn.html dedicated/osd_private_connections/aws-private-connections.html [NE,R=301]
174174

175175
# Redirects for the ROSA restructure applied in https://github.com/openshift/openshift-docs/pull/41923 and https://github.com/openshift/openshift-docs/pull/43807
176176
RewriteRule rosa/rosa_policy/?(.*)$ rosa/rosa_architecture/rosa_policy_service_definition/$1 [NE,R=301]
@@ -213,7 +213,7 @@ AddType text/vtt vtt
213213
RewriteRule rosa/rosa_getting_started/rosa-sts-required-aws-service-quotas.html rosa/rosa_planning/rosa-sts-required-aws-service-quotas.html [NE,R=301]
214214
RewriteRule rosa/rosa_getting_started/rosa-sts-setting-up-environment.html rosa/rosa_planning/rosa-sts-setting-up-environment.html [NE,R=301]
215215
RewriteRule rosa/rosa_getting_started/(rosa-getting-started|rosa-sts-getting-started-workflow).html - [L]
216-
RewriteRule rosa/rosa_getting_started/?(.*)$ rosa/rosa_install_access_delete_clusters/$1 [NE,R=302]
216+
RewriteRule rosa/rosa_getting_started/?(.*)$ rosa/rosa_install_access_delete_clusters/$1 [NE,R=301]
217217

218218
RewriteRule rosa/logging/?(.*)$ rosa/rosa_cluster_admin/rosa_logging/$1 [NE,R=301]
219219

@@ -226,7 +226,7 @@ AddType text/vtt vtt
226226
RewriteRule rosa/nodes/nodes-about-autoscaling-nodes.html rosa/rosa_cluster_admin/rosa_nodes/rosa-nodes-about-autoscaling-nodes.html [NE,R=301]
227227

228228
# ROSA UI short-term redirect https://issues.redhat.com/browse/OSDOCS-3511
229-
RewriteRule rosa/post_installation_configuration/machine-configuration-tasks.html rosa/rosa_getting_started/rosa-getting-started.html#rosa-getting-started-configure-an-idp-and-grant-access_rosa-getting-started [NE,R=302]
229+
RewriteRule rosa/post_installation_configuration/machine-configuration-tasks.html rosa/rosa_getting_started/rosa-getting-started.html#rosa-getting-started-configure-an-idp-and-grant-access_rosa-getting-started [NE,R=301]
230230

231231
# ACS welcome page redirect to StackRox docs
232232
# RewriteRule ^acs/?(.*)$ https://help.stackrox.com/ [NE,R=301]
@@ -316,7 +316,7 @@ AddType text/vtt vtt
316316
RewriteRule container-platform/(4\.3|4\.4|4\.5)/serverless/knative_cli/knative-cli.html /container-platform/$1/serverless/knative_serving/serving-kn-commands.html [NE,R=301]
317317

318318
# Service Mesh
319-
RewriteRule ^container-platform/(4\.3|4\.4|4\.5|4\.6)/service_mesh/threescale_adapter/threescale-adapter\.html /container-platform/$1/service_mesh/v1x/threescale-adapter.html [NE,R=302]
319+
RewriteRule ^container-platform/(4\.3|4\.4|4\.5|4\.6)/service_mesh/threescale_adapter/threescale-adapter\.html /container-platform/$1/service_mesh/v1x/threescale-adapter.html [NE,R=301]
320320

321321
RewriteRule ^container-platform/(4\.3|4\.4|4\.5|4\.6)/service_mesh/servicemesh-release-notes\.html$ /container-platform/$1/service_mesh/v1x/servicemesh-release-notes.html [NE,R=301]
322322

@@ -337,10 +337,10 @@ AddType text/vtt vtt
337337
RewriteRule ^container-platform/(4\.3|4\.4|4\.5|4\.6)/service_mesh/service_mesh_support/ossm-collecting-ossm-data\.html$ /container-platform/$1/service_mesh/v1x/servicemesh-release-notes.html [NE,R=301]
338338

339339
RewriteRule ^container-platform/(4\.3|4\.4|4\.5|4\.6)/service_mesh/threescale_adapter/threescale-adapter\.html$ /container-platform/$1/service_mesh/v1x/threescale-adapter.html [NE,R=301]
340-
RewriteRule ^container-platform/4\.(.*)/service_mesh/service_mesh_install/updating-ossm\.html$ /container-platform/4.$1/service_mesh/v1x/installing-ossm.html#manual-updates [NE,R=302]
341-
RewriteRule ^container-platform/4\.(.*)/service_mesh/service_mesh_install/removing-ossm\.html$ /container-platform/4.$1/service_mesh/v1x/installing-ossm.html#removing-red-hat-openshift-service-mesh [NE,R=302]
340+
RewriteRule ^container-platform/4\.(.*)/service_mesh/service_mesh_install/updating-ossm\.html$ /container-platform/4.$1/service_mesh/v1x/installing-ossm.html#manual-updates [NE,R=301]
341+
RewriteRule ^container-platform/4\.(.*)/service_mesh/service_mesh_install/removing-ossm\.html$ /container-platform/4.$1/service_mesh/v1x/installing-ossm.html#removing-red-hat-openshift-service-mesh [NE,R=301]
342342

343-
RewriteRule ^container-platform/4\.(.*)/service_mesh/service_mesh_install/(.*)\.html$ /container-platform/4.$1/service_mesh/v1x/$2.html [NE,R=302]
343+
RewriteRule ^container-platform/4\.(.*)/service_mesh/service_mesh_install/(.*)\.html$ /container-platform/4.$1/service_mesh/v1x/$2.html [NE,R=301]
344344

345345

346346
# Service Mesh redirect from 3 to 4
@@ -407,7 +407,7 @@ AddType text/vtt vtt
407407
RewriteRule ^container-platform/(4\.2|4\.3)/metering/metering-about-installing-metering.html/?(.*)$ /container-platform/$1/metering-installing-metering.html/$2 [NE,R=301]
408408

409409
# Redirect for OSD 4 to just versionless OSD
410-
RewriteRule ^dedicated/4/(?!authentication/using-rbac\.html) /dedicated/welcome/index.html [NE,R=302]
410+
RewriteRule ^dedicated/4/(?!authentication/using-rbac\.html) /dedicated/welcome/index.html [NE,R=301]
411411

412412
# Redirect for OSD latest and version less to OSD 3 - this will change when there is no OSD 3 and go to OSD 4
413413
# Use "/latest" in it's own rule to prevent any ambiguity

0 commit comments

Comments
 (0)