From f01ea673e4feabbe62a70790e212347a8749ffa9 Mon Sep 17 00:00:00 2001 From: Charlie Voiselle <464492+angrycub@users.noreply.github.com> Date: Mon, 23 Mar 2020 10:49:12 -0400 Subject: [PATCH] Fix double redirects (cherry picked from commit 5cb4e48571609bf391e8dc0afcf832275990f33e) --- website/_redirects | 232 ++++++++++++++++++++++----------------------- 1 file changed, 116 insertions(+), 116 deletions(-) diff --git a/website/_redirects b/website/_redirects index 06485a884..8d2ab36e0 100644 --- a/website/_redirects +++ b/website/_redirects @@ -156,9 +156,6 @@ /guides/ui.html https://learn.hashicorp.com/nomad?track=web-ui#web-ui /guides/ui https://learn.hashicorp.com/nomad?track=web-ui#web-ui -# Guide Catch-all Redirects -/guides https://learn.hashicorp.com/nomad 301! -/guides/* https://learn.hashicorp.com/nomad 301! # Website /community.html /resources @@ -166,32 +163,31 @@ # Docs /docs/index /docs -/api/index /api +/api/index /api-docs /resources /resources /docs/agent/config.html /docs/configuration /docs/agent/config /docs/configuration -/docs/jobops /guides/operating-a-job -/docs/jobops/ /guides/operating-a-job -/docs/jobops/index.html /guides/operating-a-job -/docs/jobops/taskconfig.html /guides/operating-a-job/configuring-tasks -/docs/jobops/taskconfig /guides/operating-a-job/configuring-tasks -/docs/jobops/inspecting.html /guides/operating-a-job/inspecting-state -/docs/jobops/inspecting /guides/operating-a-job/inspecting-state -/docs/jobops/resources.html /guides/operating-a-job/resource-utilization -/docs/jobops/resources /guides/operating-a-job/resource-utilization -/docs/jobops/logs.html /guides/operating-a-job/accessing-logs -/docs/jobops/logs /guides/operating-a-job/accessing-logs -/docs/jobops/updating.html /guides/operating-a-job/update-strategies -/docs/jobops/updating /guides/operating-a-job/update-strategies -/docs/jobops/servicediscovery.html /guides/operations/consul-integration -/docs/jobops/servicediscovery /guides/operations/consul-integration +/docs/jobops https://learn.hashicorp.com/nomad?track=managing-jobs#managing-jobs +/docs/jobops/index.html https://learn.hashicorp.com/nomad?track=managing-jobs#managing-jobs +/docs/jobops/taskconfig.html https://learn.hashicorp.com/nomad/managing-jobs/configuring-tasks +/docs/jobops/taskconfig https://learn.hashicorp.com/nomad/managing-jobs/configuring-tasks +/docs/jobops/inspecting.html https://learn.hashicorp.com/nomad/managing-jobs/inspecting-state +/docs/jobops/inspecting https://learn.hashicorp.com/nomad/managing-jobs/inspecting-state +/docs/jobops/resources.html https://learn.hashicorp.com/nomad/managing-jobs/resource-utilization +/docs/jobops/resources https://learn.hashicorp.com/nomad/managing-jobs/resource-utilization +/docs/jobops/logs.html https://learn.hashicorp.com/nomad/managing-jobs/accessing-logs +/docs/jobops/logs https://learn.hashicorp.com/nomad/managing-jobs/accessing-logs +/docs/jobops/updating.html https://learn.hashicorp.com/nomad/update-strategies/ +/docs/jobops/updating https://learn.hashicorp.com/nomad/update-strategies/ +/docs/jobops/servicediscovery.html /docs/integrations/consul-integration +/docs/jobops/servicediscovery /docs/integrations/consul-integration /docs/jobspec /docs/job-specification /docs/jobspec/ /docs/job-specification /docs/jobspec/index.html /docs/job-specification /docs/jobspec/interpreted.html /docs/runtime/interpolation /docs/jobspec/interpreted /docs/runtime/interpolation -/docs/jobspec/json.html /api/json-jobs -/docs/jobspec/json /api/json-jobs +/docs/jobspec/json.html /api-docs/json-jobs +/docs/jobspec/json /api-docs/json-jobs /docs/jobspec/environment.html /docs/runtime/environment /docs/jobspec/environment /docs/runtime/environment /docs/jobspec/schedulers.html /docs/schedulers @@ -200,14 +196,14 @@ /docs/jobspec/servicediscovery /docs/job-specification/service /docs/jobspec/networking.html /docs/job-specification/network /docs/jobspec/networking /docs/job-specification/network -/docs/cluster/automatic.html /guides/operations/cluster/automatic -/docs/cluster/automatic /guides/operations/cluster/automatic -/docs/cluster/manual.html /guides/operations/cluster/manual -/docs/cluster/manual /guides/operations/cluster/manual -/docs/cluster/federation.html /guides/operations/federation -/docs/cluster/federation /guides/operations/federation -/docs/cluster/requirements.html /guides/operations/requirements -/docs/cluster/requirements /guides/operations/requirements +/docs/cluster/automatic.html https://learn.hashicorp.com/nomad/operating-nomad/clustering +/docs/cluster/automatic https://learn.hashicorp.com/nomad/operating-nomad/clustering +/docs/cluster/manual.html https://learn.hashicorp.com/nomad/operating-nomad/clustering +/docs/cluster/manual https://learn.hashicorp.com/nomad/operating-nomad/clustering +/docs/cluster/federation.html https://learn.hashicorp.com/nomad/operating-nomad/federation +/docs/cluster/federation https://learn.hashicorp.com/nomad/operating-nomad/federation +/docs/cluster/requirements.html /docs/install/production/requirements/ +/docs/cluster/requirements /docs/install/production/requirements/ /docs/commands/operator-index.html /docs/commands/operator /docs/commands/operator-index /docs/commands/operator /docs/commands/operator-raft-list-peers.html /docs/commands/operator/raft-list-peers @@ -256,31 +252,31 @@ /docs/internals/scheduling /docs/internals/scheduling/scheduling # Moved /docs/operating-a-job/ -> /guides/operating-a-job/ -/docs/operating-a-job /guides/operating-a-job -/docs/operating-a-job/index.html /guides/operating-a-job -/docs/operating-a-job/accessing-logs.html /guides/operating-a-job/accessing-logs -/docs/operating-a-job/inspecting-state.html /guides/operating-a-job/inspecting-state -/docs/operating-a-job/resource-utilization.html /guides/operating-a-job/resource-utilization -/docs/operating-a-job/configuring-tasks.html /guides/operating-a-job/configuring-tasks -/docs/operating-a-job/submitting-jobs.html /guides/operating-a-job/submitting-jobs +/docs/operating-a-job https://learn.hashicorp.com/nomad?track=managing-jobs#managing-jobs +/docs/operating-a-job/index.html https://learn.hashicorp.com/nomad?track=managing-jobs#managing-jobs +/docs/operating-a-job/accessing-logs.html https://learn.hashicorp.com/nomad/managing-jobs/accessing-logs +/docs/operating-a-job/inspecting-state.html https://learn.hashicorp.com/nomad/managing-jobs/inspecting-state +/docs/operating-a-job/resource-utilization.html https://learn.hashicorp.com/nomad/managing-jobs/resource-utilization +/docs/operating-a-job/configuring-tasks.html https://learn.hashicorp.com/nomad/managing-jobs/configuring-tasks +/docs/operating-a-job/submitting-jobs.html https://learn.hashicorp.com/nomad/managing-jobs/submitting-jobs -/docs/operating-a-job/failure-handling-strategies /guides/operating-a-job/failure-handling-strategies -/docs/operating-a-job/failure-handling-strategies/index.html /guides/operating-a-job/failure-handling-strategies -/docs/operating-a-job/failure-handling-strategies/check-restart.html /guides/operating-a-job/failure-handling-strategies/check-restart -/docs/operating-a-job/failure-handling-strategies/check-restart /guides/operating-a-job/failure-handling-strategies/check-restart -/docs/operating-a-job/failure-handling-strategies/reschedule.html /guides/operating-a-job/failure-handling-strategies/reschedule -/docs/operating-a-job/failure-handling-strategies/reschedule /guides/operating-a-job/failure-handling-strategies/reschedule -/docs/operating-a-job/failure-handling-strategies/restart.html /guides/operating-a-job/failure-handling-strategies/restart -/docs/operating-a-job/failure-handling-strategies/restart /guides/operating-a-job/failure-handling-strategies/restart +/docs/operating-a-job/failure-handling-strategies https://learn.hashicorp.com/nomad/job-failure-handling/failure-handling +/docs/operating-a-job/failure-handling-strategies/index.html https://learn.hashicorp.com/nomad/job-failure-handling/failure-handling +/docs/operating-a-job/failure-handling-strategies/check-restart.html https://learn.hashicorp.com/nomad/job-failure-handling/check-restart +/docs/operating-a-job/failure-handling-strategies/check-restart https://learn.hashicorp.com/nomad/job-failure-handling/check-restart +/docs/operating-a-job/failure-handling-strategies/reschedule.html https://learn.hashicorp.com/nomad/job-failure-handling/reschedule +/docs/operating-a-job/failure-handling-strategies/reschedule https://learn.hashicorp.com/nomad/job-failure-handling/reschedule +/docs/operating-a-job/failure-handling-strategies/restart.html https://learn.hashicorp.com/nomad/job-failure-handling/restart +/docs/operating-a-job/failure-handling-strategies/restart https://learn.hashicorp.com/nomad/job-failure-handling/restart -/docs/operating-a-job/update-strategies /guides/operating-a-job/update-strategies/ -/docs/operating-a-job/update-strategies/index.html /guides/operating-a-job/update-strategies/ -/docs/operating-a-job/update-strategies/blue-green-and-canary-deployments.html /guides/operating-a-job/update-strategies/blue-green-and-canary-deployments -/docs/operating-a-job/update-strategies/blue-green-and-canary-deployments /guides/operating-a-job/update-strategies/blue-green-and-canary-deployments -/docs/operating-a-job/update-strategies/handling-signals.html /guides/operating-a-job/update-strategies/handling-signals -/docs/operating-a-job/update-strategies/handling-signals /guides/operating-a-job/update-strategies/handling-signals -/docs/operating-a-job/update-strategies/rolling-upgrades.html /guides/operating-a-job/update-strategies/rolling-upgrades -/docs/operating-a-job/update-strategies/rolling-upgrades /guides/operating-a-job/update-strategies/rolling-upgrades +/docs/operating-a-job/update-strategies https://learn.hashicorp.com/nomad/update-strategies/ +/docs/operating-a-job/update-strategies/index.html https://learn.hashicorp.com/nomad/update-strategies/ +/docs/operating-a-job/update-strategies/blue-green-and-canary-deployments.html https://learn.hashicorp.com/nomad/update-strategies/blue-green-and-canary-deployments +/docs/operating-a-job/update-strategies/blue-green-and-canary-deployments https://learn.hashicorp.com/nomad/update-strategies/blue-green-and-canary-deployments +/docs/operating-a-job/update-strategies/handling-signals.html https://learn.hashicorp.com/nomad/update-strategies/handling-signals +/docs/operating-a-job/update-strategies/handling-signals https://learn.hashicorp.com/nomad/update-strategies/handling-signals +/docs/operating-a-job/update-strategies/rolling-upgrades.html https://learn.hashicorp.com/nomad/update-strategies/rolling-upgrades +/docs/operating-a-job/update-strategies/rolling-upgrades https://learn.hashicorp.com/nomad/update-strategies/rolling-upgrades # Moved /docs/agent/configuration/ -> /docs/configuration/ @@ -309,16 +305,16 @@ /docs/agent/configuration/vault /docs/configuration/vault # Moved guide-like docs to /guides -/docs/agent /guides/operations/agent -/docs/agent/index.html /guides/operations/agent -/docs/agent/cloud_auto_join.html /guides/operations/cluster/cloud_auto_join -/docs/agent/cloud_auto_join /guides/operations/cluster/cloud_auto_join -/docs/agent/telemetry.html /guides/operations/monitoring/telemetry -/docs/agent/telemetry /guides/operations/monitoring/telemetry -/docs/agent/encryption.html /guides/security/encryption -/docs/agent/encryption /guides/security/encryption -/docs/service-discovery /guides/operations/consul-integration -/docs/service-discovery/index.html /guides/operations/consul-integration +/docs/agent /docs/install/production/nomad-agent/ +/docs/agent/index.html /docs/install/production/nomad-agent/ +/docs/agent/cloud_auto_join.html https://learn.hashicorp.com/nomad/operating-nomad/clustering +/docs/agent/cloud_auto_join https://learn.hashicorp.com/nomad/operating-nomad/clustering +/docs/agent/telemetry.html https://learn.hashicorp.com/nomad/operating-nomad/prometheus-metrics +/docs/agent/telemetry https://learn.hashicorp.com/nomad/operating-nomad/prometheus-metrics +/docs/agent/encryption.html https://learn.hashicorp.com/nomad/transport-security/gossip-encryption +/docs/agent/encryption https://learn.hashicorp.com/nomad/transport-security/gossip-encryption +/docs/service-discovery /docs/integrations/consul-integration +/docs/service-discovery/index.html /docs/integrations/consul-integration # Redirect old LXC driver doc to new one in /docs/external /docs/drivers/lxc.html /docs/drivers/external/lxc @@ -372,69 +368,69 @@ # Guides # Reorganized Guides by Persona -/guides/autopilot.html /guides/operations/autopilot -/guides/autopilot /guides/operations/autopilot -/guides/cluster/automatic.html /guides/operations/cluster/automatic -/guides/cluster/automatic /guides/operations/cluster/automatic -/guides/cluster/bootstrapping.html /guides/operations/cluster -/guides/cluster/bootstrapping /guides/operations/cluster -/guides/operations/cluster/bootstrapping.html /guides/operations/cluster -/guides/operations/cluster/bootstrapping /guides/operations/cluster -/guides/cluster/manual.html /guides/operations/cluster/manual -/guides/cluster/manual /guides/operations/cluster/manual -/guides/cluster/federation /guides/operations/federation -/guides/cluster/requirements /guides/operations/requirements -/guides/nomad-metrics.html /guides/operations/monitoring/nomad-metrics -/guides/nomad-metrics /guides/operations/monitoring/nomad-metrics -/guides/node-draining.html /guides/operations/node-draining -/guides/node-draining /guides/operations/node-draining -/guides/outage.html /guides/operations/outage -/guides/outage /guides/operations/outage -/guides/acl.html /guides/security/acl -/guides/acl /guides/security/acl +/guides/autopilot.html https://learn.hashicorp.com/nomad/operating-nomad/autopilot +/guides/autopilot https://learn.hashicorp.com/nomad/operating-nomad/autopilot +/guides/cluster/automatic.html https://learn.hashicorp.com/nomad/operating-nomad/clustering +/guides/cluster/automatic https://learn.hashicorp.com/nomad/operating-nomad/clustering +/guides/cluster/bootstrapping.html https://learn.hashicorp.com/nomad/operating-nomad/clustering +/guides/cluster/bootstrapping https://learn.hashicorp.com/nomad/operating-nomad/clustering +/guides/operations/cluster/bootstrapping.html https://learn.hashicorp.com/nomad/operating-nomad/clustering +/guides/operations/cluster/bootstrapping https://learn.hashicorp.com/nomad/operating-nomad/clustering +/guides/cluster/manual.html https://learn.hashicorp.com/nomad/operating-nomad/clustering +/guides/cluster/manual https://learn.hashicorp.com/nomad/operating-nomad/clustering +/guides/cluster/federation https://learn.hashicorp.com/nomad/operating-nomad/federation +/guides/cluster/requirements /docs/install/production/requirements +/guides/nomad-metrics.html https://learn.hashicorp.com/nomad/operating-nomad/prometheus-metrics +/guides/nomad-metrics https://learn.hashicorp.com/nomad/operating-nomad/prometheus-metrics +/guides/node-draining.html https://learn.hashicorp.com/nomad/operating-nomad/node-draining +/guides/node-draining https://learn.hashicorp.com/nomad/operating-nomad/node-draining +/guides/outage.html https://learn.hashicorp.com/nomad/operating-nomad/outage +/guides/outage https://learn.hashicorp.com/nomad/operating-nomad/outage +/guides/acl.html https://learn.hashicorp.com/nomad?track=acls#acls +/guides/acl https://learn.hashicorp.com/nomad?track=acls#acls /guides/namespaces.html https://learn.hashicorp.com/nomad/governance-and-policy/namespaces /guides/namespaces https://learn.hashicorp.com/nomad/governance-and-policy/namespaces /guides/quotas.html https://learn.hashicorp.com/nomad/governance-and-policy/quotas /guides/quotas https://learn.hashicorp.com/nomad/governance-and-policy/quotas -/guides/securing-nomad.html /guides/security/securing-nomad -/guides/securing-nomad /guides/security/securing-nomad +/guides/securing-nomad.html https://learn.hashicorp.com/nomad/transport-security/enable-tls +/guides/securing-nomad https://learn.hashicorp.com/nomad/transport-security/enable-tls /guides/sentinel-policy.html https://learn.hashicorp.com/nomad/governance-and-policy/sentinel /guides/sentinel-policy https://learn.hashicorp.com/nomad/governance-and-policy/sentinel /guides/sentinel/job.html https://learn.hashicorp.com/nomad/governance-and-policy/sentinel /guides/sentinel/job https://learn.hashicorp.com/nomad/governance-and-policy/sentinel -/guides/analytical-workloads/spark/spark.html /guides/analytical-workloads/spark -/guides/analytical-workloads/spark/spark /guides/analytical-workloads/spark -/guides/spark /guides/analytical-workloads/spark -/guides/spark/index.html /guides/analytical-workloads/spark -/guides/spark/spark.html /guides/analytical-workloads/spark -/guides/spark/spark /guides/analytical-workloads/spark -/guides/spark/pre.html /guides/analytical-workloads/spark/pre -/guides/spark/pre /guides/analytical-workloads/spark/pre -/guides/security/namespaces.html /guides/governance-and-policy/namespaces -/guides/security/namespaces /guides/governance-and-policy/namespaces -/guides/security/quotas.html /guides/governance-and-policy/quotas -/guides/security/quotas /guides/governance-and-policy/quotas -/guides/security/sentinel/job.html /guides/governance-and-policy/sentinel/job -/guides/security/sentinel/job /guides/governance-and-policy/sentinel/job -/guides/security/sentinel-policy.html /guides/governance-and-policy/sentinel/sentinel-policy -/guides/security/sentinel-policy /guides/governance-and-policy/sentinel/sentinel-policy -/guides/operations/install/index.html /guides/install/index -/guides/operations/install/index /guides/install/index -/guides/operations/deployment-guide.html /guides/install/production/deployment-guide -/guides/operations/deployment-guide /guides/install/production/deployment-guide -/guides/operations/agent/index.html /guides/install/production/nomad-agent -/guides/operations/reference-architecture.html /guides/install/production/reference-architecture -/guides/operations/reference-architecture /guides/install/production/reference-architecture -/guides/operations/requirements.html /guides/install/production/requirements -/guides/operations/requirements /guides/install/production/requirements -/guides/operations/consul-integration/index.html /guides/integrations/consul-integration -/guides/operations/vault-integration/index.html /guides/integrations/vault-integration -/guides/advanced-scheduling/ /guides/operating-a-job/advanced-scheduling/ -/guides/external /guides/operating-a-job/external -/guides/external/index.html /guides/operating-a-job/external -/guides/external/lxc.html /guides/operating-a-job/external/lxc -/guides/external/lxc /guides/operating-a-job/external/lxc +/guides/analytical-workloads/spark/spark.html https://learn.hashicorp.com/nomad?track=spark#spark +/guides/analytical-workloads/spark/spark https://learn.hashicorp.com/nomad?track=spark#spark +/guides/spark https://learn.hashicorp.com/nomad?track=spark#spark +/guides/spark/index.html https://learn.hashicorp.com/nomad?track=spark#spark +/guides/spark/spark.html https://learn.hashicorp.com/nomad?track=spark#spark +/guides/spark/spark https://learn.hashicorp.com/nomad?track=spark#spark +/guides/spark/pre.html https://learn.hashicorp.com/nomad/spark/pre +/guides/spark/pre https://learn.hashicorp.com/nomad/spark/pre +/guides/security/namespaces.html https://learn.hashicorp.com/nomad/governance-and-policy/namespaces +/guides/security/namespaces https://learn.hashicorp.com/nomad/governance-and-policy/namespaces +/guides/security/quotas.html https://learn.hashicorp.com/nomad/governance-and-policy/quotas +/guides/security/quotas https://learn.hashicorp.com/nomad/governance-and-policy/quotas +/guides/security/sentinel/job.html https://learn.hashicorp.com/nomad/governance-and-policy/quotas +/guides/security/sentinel/job https://learn.hashicorp.com/nomad/governance-and-policy/quotas +/guides/security/sentinel-policy.html https://learn.hashicorp.com/nomad/governance-and-policy/sentinel +/guides/security/sentinel-policy https://learn.hashicorp.com/nomad/governance-and-policy/sentinel +/guides/operations/install/index.html /docs/install/index +/guides/operations/install/index /docs/install/index +/guides/operations/deployment-guide.html /docs/install/production/deployment-guide +/guides/operations/deployment-guide /docs/install/production/deployment-guide +/guides/operations/agent/index.html /docs/install/production/nomad-agent +/guides/operations/reference-architecture.html /docs/install/production/reference-architecture +/guides/operations/reference-architecture /docs/install/production/reference-architecture +/guides/operations/requirements.html /docs/install/production/requirements +/guides/operations/requirements /docs/install/production/requirements +/guides/operations/consul-integration/index.html /docs/integrations/consul-integration +/guides/operations/vault-integration/index.html /docs/integrations/vault-integration +/guides/advanced-scheduling/ https://learn.hashicorp.com/nomad/advanced-scheduling/advanced-scheduling +/guides/external https://learn.hashicorp.com/nomad?track=using-plugins#using-plugins +/guides/external/index.html https://learn.hashicorp.com/nomad?track=spark#spark +/guides/external/lxc.html https://learn.hashicorp.com/nomad/using-plugins/lxc +/guides/external/lxc https://learn.hashicorp.com/nomad/using-plugins/lxc /guides/operations/upgrade /docs/upgrade /guides/operations/upgrade/index.html /docs/upgrade /guides/operations/upgrade/upgrade-specific.html /docs/upgrade/upgrade-specific @@ -453,3 +449,7 @@ /docs/enterprise/sentinel/index.html /docs/enterprise#sentinel-policies /docs/enterprise/autopilot /docs/enterprise#nomad-enterprise-platform /docs/enterprise/autopilot/index.html /docs/enterprise#nomad-enterprise-platform + +# Guide Catch-all Redirects +/guides https://learn.hashicorp.com/nomad 301! +/guides/* https://learn.hashicorp.com/nomad 301!