Skip to content

Commit 1534c31

Browse files
authored
Merge pull request #44781 from bmcelvee/pr44497-followup-update-redirects
Follow-up to PR44497 making redirects permanent
2 parents 0b3338c + 89e9b84 commit 1534c31

File tree

1 file changed

+45
-45
lines changed

1 file changed

+45
-45
lines changed

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

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -171,57 +171,57 @@ AddType text/vtt vtt
171171
RewriteRule dedicated/4/cloud_infrastructure_access/dedicated-aws-vpn.html dedicated/osd_private_connections/aws-private-connections.html [NE,R=302]
172172

173173
# Redirects for the ROSA restructure applied in https://github.com/openshift/openshift-docs/pull/41923 and https://github.com/openshift/openshift-docs/pull/43807
174-
RewriteRule rosa/rosa_policy/?(.*)$ rosa/rosa_architecture/rosa_policy_service_definition/$1 [NE,R=302]
175-
176-
RewriteRule rosa/rosa_architecture/rosa-basic-architecture-concepts.html rosa/rosa_architecture/rosa_architecture_sub/rosa-basic-architecture-concepts.html [NE,R=302]
177-
RewriteRule rosa/rosa_architecture/rosa-architecture-models.html rosa/rosa_architecture/rosa_architecture_sub/rosa-architecture-models.html [NE,R=302]
178-
RewriteRule rosa/rosa_architecture/rosa-policy-?(.*)$ rosa/rosa_architecture/rosa_policy_service_definition/rosa-policy-$1 [NE,R=302]
179-
RewriteRule rosa/rosa_architecture/rosa-service-definition.html rosa/rosa_architecture/rosa_policy_service_definition/rosa-service-definition.html [NE,R=302]
180-
RewriteRule rosa/rosa_architecture/rosa-life-cycle.html rosa/rosa_architecture/rosa_policy_service_definition/rosa-life-cycle.html [NE,R=302]
181-
RewriteRule rosa/rosa_architecture/rosa-sts-getting-started-workflow.html rosa/rosa_getting_started/rosa-sts-getting-started-workflow.html [NE,R=302]
182-
183-
RewriteRule rosa/rosa_planning/rosa-aws-prereqs.html rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-aws-prereqs.html [NE,R=302]
184-
185-
RewriteRule rosa/rosa_support/rosa-getting-support.html rosa/rosa_architecture/rosa-getting-support.html [NE,R=302]
186-
187-
RewriteRule rosa/rosa_getting_started_sts/rosa-sts-getting-started-workflow.html rosa/rosa_getting_started/rosa-sts-getting-started-workflow.html [NE,R=302]
188-
RewriteRule rosa/rosa_getting_started_sts/rosa-sts-aws-prereqs.html rosa/rosa_planning/rosa-sts-aws-prereqs.html [NE,R=302]
189-
RewriteRule rosa/rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/rosa-sts-about-iam-resources.html rosa/rosa_architecture/rosa-sts-about-iam-resources.html [NE,R=302]
190-
RewriteRule rosa/rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/?(.*)$ rosa/rosa_install_access_delete_clusters/$1 [NE,R=302]
191-
RewriteRule rosa/rosa_getting_started_sts/rosa-sts-setting-up-environment.html rosa/rosa_planning/rosa-sts-setting-up-environment.html [NE,R=302]
192-
RewriteRule rosa/rosa_getting_started_sts/rosa-sts-required-aws-service-quotas.html rosa/rosa_planning/rosa-sts-required-aws-service-quotas.html [NE,R=302]
193-
RewriteRule rosa/rosa_getting_started_sts/?(.*)$ rosa/rosa_install_access_delete_clusters/$1 [NE,R=302]
194-
195-
RewriteRule rosa/rosa_getting_started/rosa-aws-prereqs.html rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-aws-prereqs.html [NE,R=302]
196-
RewriteRule rosa/rosa_getting_started/rosa_getting_started_iam/rosa-aws-privatelink-creating-cluster.html rosa/rosa_install_access_delete_clusters/rosa-aws-privatelink-creating-cluster.html [NE,R=302]
197-
RewriteRule rosa/rosa_getting_started/rosa-getting-started-workflow.html rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-getting-started-workflow.html [NE,R=302]
198-
RewriteRule rosa/rosa_getting_started/rosa-required-aws-service-quotas.html rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-required-aws-service-quotas.html [NE,R=302]
199-
RewriteRule rosa/rosa_getting_started/rosa-config-aws-account.html rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-config-aws-account.html [NE,R=302]
200-
RewriteRule rosa/rosa_getting_started/rosa-installing-rosa.html rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-installing-rosa.html [NE,R=302]
201-
RewriteRule rosa/rosa_getting_started/rosa-creating-cluster.html rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-creating-cluster.html [NE,R=302]
202-
RewriteRule rosa/rosa_getting_started/rosa-accessing-cluster.html rosa/rosa_install_access_delete_clusters/rosa-sts-accessing-cluster.html [NE,R=302]
203-
RewriteRule rosa/rosa_getting_started/rosa_getting_started_iam/rosa-accessing-cluster.html rosa/rosa_install_access_delete_clusters/rosa-sts-accessing-cluster.html [NE,R=302]
204-
RewriteRule rosa/rosa_getting_started/rosa-config-identity-providers.html rosa/rosa_install_access_delete_clusters/rosa-sts-config-identity-providers.html [NE,R=302]
205-
RewriteRule rosa/rosa_getting_started/rosa_getting_started_iam/rosa-config-identity-providers.html rosa/rosa_install_access_delete_clusters/rosa-sts-config-identity-providers.html [NE,R=302]
206-
RewriteRule rosa/rosa_getting_started/rosa-deleting-access-cluster.html rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-deleting-access-cluster.html [NE,R=302]
207-
RewriteRule rosa/rosa_getting_started/rosa-deleting-cluster.html rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-deleting-cluster.html [NE,R=302]
208-
RewriteRule rosa/rosa_getting_started/rosa-quickstart.html rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-quickstart.html [NE,R=302]
209-
RewriteRule rosa/rosa_getting_started/rosa_getting_started_iam/?(.*)$ rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/$1 [NE,R=302]
210-
RewriteRule rosa/rosa_getting_started/rosa-sts-about-iam-resources.html rosa/rosa_architecture/rosa-sts-about-iam-resources.html [NE,R=302]
211-
RewriteRule rosa/rosa_getting_started/rosa-sts-required-aws-service-quotas.html rosa/rosa_planning/rosa-sts-required-aws-service-quotas.html [NE,R=302]
212-
RewriteRule rosa/rosa_getting_started/rosa-sts-setting-up-environment.html rosa/rosa_planning/rosa-sts-setting-up-environment.html [NE,R=302]
174+
RewriteRule rosa/rosa_policy/?(.*)$ rosa/rosa_architecture/rosa_policy_service_definition/$1 [NE,R=301]
175+
176+
RewriteRule rosa/rosa_architecture/rosa-basic-architecture-concepts.html rosa/rosa_architecture/rosa_architecture_sub/rosa-basic-architecture-concepts.html [NE,R=301]
177+
RewriteRule rosa/rosa_architecture/rosa-architecture-models.html rosa/rosa_architecture/rosa_architecture_sub/rosa-architecture-models.html [NE,R=301]
178+
RewriteRule rosa/rosa_architecture/rosa-policy-?(.*)$ rosa/rosa_architecture/rosa_policy_service_definition/rosa-policy-$1 [NE,R=301]
179+
RewriteRule rosa/rosa_architecture/rosa-service-definition.html rosa/rosa_architecture/rosa_policy_service_definition/rosa-service-definition.html [NE,R=301]
180+
RewriteRule rosa/rosa_architecture/rosa-life-cycle.html rosa/rosa_architecture/rosa_policy_service_definition/rosa-life-cycle.html [NE,R=301]
181+
RewriteRule rosa/rosa_architecture/rosa-sts-getting-started-workflow.html rosa/rosa_getting_started/rosa-sts-getting-started-workflow.html [NE,R=301]
182+
183+
RewriteRule rosa/rosa_planning/rosa-aws-prereqs.html rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-aws-prereqs.html [NE,R=301]
184+
185+
RewriteRule rosa/rosa_support/rosa-getting-support.html rosa/rosa_architecture/rosa-getting-support.html [NE,R=301]
186+
187+
RewriteRule rosa/rosa_getting_started_sts/rosa-sts-getting-started-workflow.html rosa/rosa_getting_started/rosa-sts-getting-started-workflow.html [NE,R=301]
188+
RewriteRule rosa/rosa_getting_started_sts/rosa-sts-aws-prereqs.html rosa/rosa_planning/rosa-sts-aws-prereqs.html [NE,R=301]
189+
RewriteRule rosa/rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/rosa-sts-about-iam-resources.html rosa/rosa_architecture/rosa-sts-about-iam-resources.html [NE,R=301]
190+
RewriteRule rosa/rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/?(.*)$ rosa/rosa_install_access_delete_clusters/$1 [NE,R=301]
191+
RewriteRule rosa/rosa_getting_started_sts/rosa-sts-setting-up-environment.html rosa/rosa_planning/rosa-sts-setting-up-environment.html [NE,R=301]
192+
RewriteRule rosa/rosa_getting_started_sts/rosa-sts-required-aws-service-quotas.html rosa/rosa_planning/rosa-sts-required-aws-service-quotas.html [NE,R=301]
193+
RewriteRule rosa/rosa_getting_started_sts/?(.*)$ rosa/rosa_install_access_delete_clusters/$1 [NE,R=301]
194+
195+
RewriteRule rosa/rosa_getting_started/rosa-aws-prereqs.html rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-aws-prereqs.html [NE,R=301]
196+
RewriteRule rosa/rosa_getting_started/rosa_getting_started_iam/rosa-aws-privatelink-creating-cluster.html rosa/rosa_install_access_delete_clusters/rosa-aws-privatelink-creating-cluster.html [NE,R=301]
197+
RewriteRule rosa/rosa_getting_started/rosa-getting-started-workflow.html rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-getting-started-workflow.html [NE,R=301]
198+
RewriteRule rosa/rosa_getting_started/rosa-required-aws-service-quotas.html rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-required-aws-service-quotas.html [NE,R=301]
199+
RewriteRule rosa/rosa_getting_started/rosa-config-aws-account.html rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-config-aws-account.html [NE,R=301]
200+
RewriteRule rosa/rosa_getting_started/rosa-installing-rosa.html rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-installing-rosa.html [NE,R=301]
201+
RewriteRule rosa/rosa_getting_started/rosa-creating-cluster.html rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-creating-cluster.html [NE,R=301]
202+
RewriteRule rosa/rosa_getting_started/rosa-accessing-cluster.html rosa/rosa_install_access_delete_clusters/rosa-sts-accessing-cluster.html [NE,R=301]
203+
RewriteRule rosa/rosa_getting_started/rosa_getting_started_iam/rosa-accessing-cluster.html rosa/rosa_install_access_delete_clusters/rosa-sts-accessing-cluster.html [NE,R=301]
204+
RewriteRule rosa/rosa_getting_started/rosa-config-identity-providers.html rosa/rosa_install_access_delete_clusters/rosa-sts-config-identity-providers.html [NE,R=301]
205+
RewriteRule rosa/rosa_getting_started/rosa_getting_started_iam/rosa-config-identity-providers.html rosa/rosa_install_access_delete_clusters/rosa-sts-config-identity-providers.html [NE,R=301]
206+
RewriteRule rosa/rosa_getting_started/rosa-deleting-access-cluster.html rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-deleting-access-cluster.html [NE,R=301]
207+
RewriteRule rosa/rosa_getting_started/rosa-deleting-cluster.html rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-deleting-cluster.html [NE,R=301]
208+
RewriteRule rosa/rosa_getting_started/rosa-quickstart.html rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-quickstart.html [NE,R=301]
209+
RewriteRule rosa/rosa_getting_started/rosa_getting_started_iam/?(.*)$ rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/$1 [NE,R=301]
210+
RewriteRule rosa/rosa_getting_started/rosa-sts-about-iam-resources.html rosa/rosa_architecture/rosa-sts-about-iam-resources.html [NE,R=301]
211+
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]
212+
RewriteRule rosa/rosa_getting_started/rosa-sts-setting-up-environment.html rosa/rosa_planning/rosa-sts-setting-up-environment.html [NE,R=301]
213213
RewriteRule rosa/rosa_getting_started/(rosa-getting-started|rosa-sts-getting-started-workflow).html - [L]
214214
RewriteRule rosa/rosa_getting_started/?(.*)$ rosa/rosa_install_access_delete_clusters/$1 [NE,R=302]
215215

216-
RewriteRule rosa/logging/?(.*)$ rosa/rosa_cluster_admin/rosa_logging/$1 [NE,R=302]
216+
RewriteRule rosa/logging/?(.*)$ rosa/rosa_cluster_admin/rosa_logging/$1 [NE,R=301]
217217

218-
RewriteRule rosa/monitoring/osd?(.*)$ rosa/rosa_cluster_admin/rosa_monitoring/rosa$1 [NE,R=302]
218+
RewriteRule rosa/monitoring/osd?(.*)$ rosa/rosa_cluster_admin/rosa_monitoring/rosa$1 [NE,R=301]
219219

220-
RewriteRule rosa/cloud_infrastructure_access/?(.*)$ rosa/rosa_cluster_admin/cloud_infrastructure_access/$1 [NE,R=302]
220+
RewriteRule rosa/cloud_infrastructure_access/?(.*)$ rosa/rosa_cluster_admin/cloud_infrastructure_access/$1 [NE,R=301]
221221

222-
RewriteRule rosa/nodes/nodes-machinepools-about.html rosa/rosa_cluster_admin/rosa_nodes/rosa-nodes-machinepools-about.html [NE,R=302]
223-
RewriteRule rosa/nodes/rosa-managing-worker-nodes.html rosa/rosa_cluster_admin/rosa_nodes/rosa-managing-worker-nodes.html [NE,R=302]
224-
RewriteRule rosa/nodes/nodes-about-autoscaling-nodes.html rosa/rosa_cluster_admin/rosa_nodes/rosa-nodes-about-autoscaling-nodes.html [NE,R=302]
222+
RewriteRule rosa/nodes/nodes-machinepools-about.html rosa/rosa_cluster_admin/rosa_nodes/rosa-nodes-machinepools-about.html [NE,R=301]
223+
RewriteRule rosa/nodes/rosa-managing-worker-nodes.html rosa/rosa_cluster_admin/rosa_nodes/rosa-managing-worker-nodes.html [NE,R=301]
224+
RewriteRule rosa/nodes/nodes-about-autoscaling-nodes.html rosa/rosa_cluster_admin/rosa_nodes/rosa-nodes-about-autoscaling-nodes.html [NE,R=301]
225225

226226
# ROSA UI short-term redirect https://issues.redhat.com/browse/OSDOCS-3511
227227
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]

0 commit comments

Comments
 (0)