From da6039bc84348f0d29f7190591c1a86df24e40c8 Mon Sep 17 00:00:00 2001 From: Yishan Lin Date: Tue, 14 May 2019 08:56:13 -0700 Subject: [PATCH 1/3] Correct Spark links in redirects.txt --- website/redirects.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/redirects.txt b/website/redirects.txt index 635aab549..f7e85c8b9 100644 --- a/website/redirects.txt +++ b/website/redirects.txt @@ -180,7 +180,7 @@ /guides/cluster/bootstrapping.html /guides/operations/cluster/bootstrapping.html /guides/cluster/manual.html /guides/operations/cluster/manual.html /guides/cluster/federation /guides/operations/federation -/guides/cluster/requirements.html /guides/operations/requirements.html +/guides/cluster/requirements.html /guides/operations/requirements.html /guides/nomad-metrics.html /guides/operations/monitoring/nomad-metrics.html /guides/node-draining.html /guides/operations/node-draining.html /guides/outage.html /guides/operations/outage.html From 84193504bca19fb10073e89c86ed56df346d601e Mon Sep 17 00:00:00 2001 From: Mahmood Ali Date: Tue, 14 May 2019 16:52:48 -0400 Subject: [PATCH 2/3] More redirects for website I expected redirects to handle directory rewrites without needing to specify every file. --- website/redirects.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/website/redirects.txt b/website/redirects.txt index f7e85c8b9..db71846c3 100644 --- a/website/redirects.txt +++ b/website/redirects.txt @@ -191,7 +191,9 @@ /guides/sentinel-policy.html /guides/security/sentinel-policy.html /guides/sentinel/job.html /guides/governance-and-policy/sentinel/job.html +/guides/spark /guides/analytical-workloads/spark/spark.html /guides/spark/ /guides/analytical-workloads/spark/spark.html +/guides/spark/index.html /guides/analytical-workloads/spark/spark.html /guides/spark/pre.html /guides/analytical-workloads/spark/pre.html /guides/security/namespaces.html /guides/governance-and-policy/namespaces.html /guides/security/quotas.html /guides/governance-and-policy/quotas.html @@ -205,5 +207,11 @@ /guides/operations/consul-integration/index.html /guides/integrations/consul-integration/index.html /guides/operations/vault-integration/index.html /guides/integrations/vault-integration/index.html /guides/advanced-scheduling/ /guides/operating-a-job/advanced-scheduling/ -/guides/external/ /guides/operating-a-job/external/ -/guides/operations/upgrade/ /guides/upgrade/ +/guides/external /guides/operating-a-job/external/index.html +/guides/external/ /guides/operating-a-job/external/index.html +/guides/external/index.html /guides/operating-a-job/external/index.html +/guides/external/lxc.html /guides/operating-a-job/external/lxc.html +/guides/operations/upgrade /guides/upgrade/index.html +/guides/operations/upgrade/ /guides/upgrade/index.html +/guides/operations/upgrade/index.html /guides/upgrade/index.html +/guides/operations/upgrade/upgrade-specific.html /guides/upgrade/upgrade-specific.html From 18c63d4c3f3aef9aef749d124d57dedb4c476804 Mon Sep 17 00:00:00 2001 From: Mahmood Ali Date: Tue, 14 May 2019 16:56:59 -0400 Subject: [PATCH 3/3] Make spark.html the index --- website/redirects.txt | 8 +++++--- .../spark/{spark.html.md => index.html.md} | 0 website/source/layouts/guides.erb | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) rename website/source/guides/analytical-workloads/spark/{spark.html.md => index.html.md} (100%) diff --git a/website/redirects.txt b/website/redirects.txt index db71846c3..e8c9f18ff 100644 --- a/website/redirects.txt +++ b/website/redirects.txt @@ -191,9 +191,11 @@ /guides/sentinel-policy.html /guides/security/sentinel-policy.html /guides/sentinel/job.html /guides/governance-and-policy/sentinel/job.html -/guides/spark /guides/analytical-workloads/spark/spark.html -/guides/spark/ /guides/analytical-workloads/spark/spark.html -/guides/spark/index.html /guides/analytical-workloads/spark/spark.html +/guides/analytical-workloads/spark/spark.html /guides/analytical-workloads/spark/index.html +/guides/spark /guides/analytical-workloads/spark/index.html +/guides/spark/ /guides/analytical-workloads/spark/index.html +/guides/spark/index.html /guides/analytical-workloads/spark/index.html +/guides/spark/spark.html /guides/analytical-workloads/spark/index.html /guides/spark/pre.html /guides/analytical-workloads/spark/pre.html /guides/security/namespaces.html /guides/governance-and-policy/namespaces.html /guides/security/quotas.html /guides/governance-and-policy/quotas.html diff --git a/website/source/guides/analytical-workloads/spark/spark.html.md b/website/source/guides/analytical-workloads/spark/index.html.md similarity index 100% rename from website/source/guides/analytical-workloads/spark/spark.html.md rename to website/source/guides/analytical-workloads/spark/index.html.md diff --git a/website/source/layouts/guides.erb b/website/source/layouts/guides.erb index 2cde69e02..1193d715a 100644 --- a/website/source/layouts/guides.erb +++ b/website/source/layouts/guides.erb @@ -211,7 +211,7 @@