From 12c6a94590e0b6c3bf176375ef9ef147f7089417 Mon Sep 17 00:00:00 2001
From: Rob Genova <rcgenova@gmail.com>
Date: Mon, 8 Jan 2018 21:33:26 +0000
Subject: [PATCH 1/4] Merge Community page content into Resources page

---
 website/source/resources.html.erb | 69 ++++++++++++++++++++-----------
 1 file changed, 45 insertions(+), 24 deletions(-)

diff --git a/website/source/resources.html.erb b/website/source/resources.html.erb
index 06e43b96b..bbcfde46b 100644
--- a/website/source/resources.html.erb
+++ b/website/source/resources.html.erb
@@ -13,6 +13,25 @@ description: |-
   integration with third-party tools. 
 </p>
 
+<h2>Community</h2>
+
+<p>
+  <strong>Gitter:</strong> <a href="https://gitter.im/hashicorp-nomad/Lobby">Nomad Gitter Room</a>
+</p>
+<p>
+  <strong>IRC:</strong> Use the <a href="https://irc.gitter.im">Gitter IRC bridge</a>
+</p>
+<p>
+  <strong>Mailing list:</strong>
+  <a href="https://groups.google.com/group/nomad-tool">Nomad Google Group</a>
+</p>
+<p>
+  <strong>Bug Tracker:</strong>
+  <a href="https://github.com/hashicorp/nomad/issues">Issue tracker
+    on GitHub</a>. Please only use this for reporting bugs. Do not ask
+  for general help here. Use IRC or the mailing list for that.
+</p>
+
 <h2>Videos</h2>
 
 <ul>
@@ -29,45 +48,47 @@ description: |-
 <h2>Blog Posts</h2>
 
 <ul>
-  <li><a href="https://medium.com/@copyconstruct/schedulers-kubernetes-and-nomad-b0f2e14a896">Cluster Schedulers</a> - <strong>Cindy Sridharan</li>
-  <li><a href="https://medium.com/@gabrielteles/migrating-from-aws-to-aws-e2bb1bfaa0e0">Migrating from AWS to AWS</a> - <strong>Gabriel Teles</li>
-  <li><a href="https://stackshare.io/circleci/how-circleci-processes-4-5-million-builds-per-month">How <strong>CircleCI</strong> Processes 4.5 Million Builds Per Month</a> - <strong>Rob Zuber</li>
-  <li><a href="http://timperrett.com/2017/05/13/nomad-with-envoy-and-consul">Envoy with Nomad and Consul</a> - <strong>Tim Perrett</strong></li>
-  <li><a href="https://www.hashicorp.com/blog/continuous-deployment-with-nomad-and-terraform">Continuous Deployment with Nomad and Terraform</a> - <strong>Nic Jackson</strong></li>
-  <li><a href="https://www.hashicorp.com/blog/running-apache-spark-on-nomad">Running Apache Spark on HashiCorp Nomad</a> - <strong>Rob Genova</strong></li>
-  <li><a href="https://www.hashicorp.com/blog/auto-bootstrapping-a-nomad-cluster">Auto-bootstrapping a Nomad Cluster</a> - <strong>Nic Jackson</strong></li>
-  <li><a href="https://www.hashicorp.com/blog/replacing-queues-with-nomad-dispatch">Replacing Queues with Nomad Dispatch</a> - <strong>Armon Dadgar</strong></li>
-  <li><a href="https://sanderknape.com/2016/08/nomad-consul-multi-datacenter-container-orchestration/">Multi-datacenter Container Orchestration with Nomad and Consul</a> - <strong>Sander Knape</strong></li>
+  <li><a href="https://medium.com/@copyconstruct/schedulers-kubernetes-and-nomad-b0f2e14a896">Cluster Schedulers</a> - Cindy Sridharan</li>
+  <li><a href="https://medium.com/@gabrielteles/migrating-from-aws-to-aws-e2bb1bfaa0e0">Migrating from AWS to AWS</a> - Gabriel Teles</li>
+  <li><a href="https://stackshare.io/circleci/how-circleci-processes-4-5-million-builds-per-month">How <strong>CircleCI</strong> Processes 4.5 Million Builds Per Month</a> - Rob Zuber</li>
+  <li><a href="http://timperrett.com/2017/05/13/nomad-with-envoy-and-consul">Envoy with Nomad and Consul</a> - Tim Perrett</li>
+  <li><a href="https://www.hashicorp.com/blog/continuous-deployment-with-nomad-and-terraform">Continuous Deployment with Nomad and Terraform</a> - Nic Jackson</li>
+  <li><a href="https://www.hashicorp.com/blog/running-apache-spark-on-nomad">Running Apache Spark on HashiCorp Nomad</a> - Rob Genova</li>
+  <li><a href="https://www.hashicorp.com/blog/auto-bootstrapping-a-nomad-cluster">Auto-bootstrapping a Nomad Cluster</a> - Nic Jackson</li>
+  <li><a href="https://www.hashicorp.com/blog/replacing-queues-with-nomad-dispatch">Replacing Queues with Nomad Dispatch</a> - Armon Dadgar</li>
+  <li><a href="https://sanderknape.com/2016/08/nomad-consul-multi-datacenter-container-orchestration/">Multi-datacenter Container Orchestration with Nomad and Consul</a> - Sander Knape</li>
 </ul>
 
 <h2>Tools for Provisioning and Experimentation</h2>
 
 <ul>
-  <li><a href="https://registry.terraform.io/search?q=nomad">Terraform Module Registry</a> - <strong>Official Nomad modules for AWS, Azure and Google Cloud</strong></li>
-  <li><a href="https://aws.amazon.com/quickstart/architecture/nomad/">HashiCorp Nomad on AWS</a> - <strong>AWS Quickstart Guide for Nomad</strong></li>
-  <li><a href="https://github.com/hashicorp/nomad/tree/master/terraform">Nomad Sandbox Environment for AWS and Azure</a> - <strong>Easily Provision a Combined Nomad, Consul and Vault Cluster on AWS or Azure</strong></li>
-  <li><a href="https://www.katacoda.com/hashicorp/scenarios/nomad-introduction">Introduction to Nomad (Katacoda)</a> - <strong>Interactive Introduction to Nomad</strong></li>
-  <li><a href="https://katacoda.com/hashicorp/scenarios/playground">Nomad Playground (Katacoda)</a> - <strong>Online Nomad Playground Environment</strong></li>
+  <li><a href="https://registry.terraform.io/search?q=nomad">Terraform Module Registry</a> - Official Nomad modules for AWS, Azure and Google Cloud</li>
+  <li><a href="https://aws.amazon.com/quickstart/architecture/nomad/">HashiCorp Nomad on AWS</a> - AWS Quickstart Guide for Nomad</li>
+  <li><a href="https://github.com/hashicorp/nomad/tree/master/terraform">Nomad Sandbox Environment for AWS and Azure</a> - Easily Provision a Combined Nomad, Consul and Vault Cluster on AWS or Azure</li>
+  <li><a href="https://www.katacoda.com/hashicorp/scenarios/nomad-introduction">Introduction to Nomad (Katacoda)</a> - Interactive Introduction to Nomad</li>
+  <li><a href="https://katacoda.com/hashicorp/scenarios/playground">Nomad Playground (Katacoda)</a> - Online Nomad Playground Environment</li>
 </ul>
 
 <h2>Integrations</h2>
 
 <ul>
-  <li><a href="https://getnelson.github.io/nelson/">Nelson</a> - <strong>Automated, Multi-region Container Deployment with HashiCorp Nomad</strong></li>
-  <li><a href="https://github.com/elsevier-core-engineering/replicator"><strong>Elsevier</strong> Replicator</a> - <strong>Automated Cluster and Job Scaling For HashiCorp Nomad</strong></li>
-  <li><a href="https://github.com/jrasell/levant">Levant</a> - <strong>An open source templating and deployment tool for HashiCorp Nomad jobs</strong></li>
-  <li><a href="https://github.com/underarmour/libra"><strong>Under Armour</strong> Libra</a> - <strong>A Nomad Auto Scaler</strong></li>
-  <li><a href="https://help.spotinst.com/hc/en-us/articles/115005038289-Nomad-Container-Management">Nomad Container Management with SpotInst</a> - <strong>Nomad Integration for SpotInst Elastigroup</strong></li>
-  <li><a href="https://github.com/jenkinsci/nomad-plugin">Jenkins Nomad Plugin</a> - <strong>Nomad Cloud Plugin for Jenkins</strong></li>
-  <li>OpenFaaS (<a href="https://registry.terraform.io/modules/nicholasjackson/open-faas-nomad/aws/0.4.0">Terraform</a> | <a href="https://github.com/openfaas/faas">GitHub</a>) - <strong>Nomad Integration for OpenFaas (Functions as a Service)</strong></li>
-  <li><a href="https://github.com/ValFadeev/rundeck-nomad-plugin">Rundeck Plugin for Nomad</a> - <strong>A Rundeck Plugin for Running Jobs on a Nomad Cluster</strong></li>
+  <li><a href="https://github.com/jet/nomad-service-alerter"><strong>Jet.com</strong> Nomad Service Alerter</a> - Alerting for your Nomad services</li>
+  <li><a href="https://getnelson.github.io/nelson/">Nelson</a> - Automated, Multi-region Container Deployment with HashiCorp Nomad</li>
+  <li><a href="https://github.com/elsevier-core-engineering/replicator"><strong>Elsevier</strong> Replicator</a> - Automated Cluster and Job Scaling For HashiCorp Nomad</li>
+  <li><a href="https://github.com/jrasell/levant">Levant</a> - An open source templating and deployment tool for HashiCorp Nomad jobs</li>
+  <li><a href="https://github.com/underarmour/libra"><strong>Under Armour</strong> Libra</a> - A Nomad Auto Scaler</li>
+  <li><a href="https://help.spotinst.com/hc/en-us/articles/115005038289-Nomad-Container-Management">Nomad Container Management with SpotInst</a> - Nomad Integration for SpotInst Elastigroup</li>
+  <li><a href="https://github.com/jenkinsci/nomad-plugin">Jenkins Nomad Plugin</a> - Nomad Cloud Plugin for Jenkins</li>
+  <li>OpenFaaS (<a href="https://registry.terraform.io/modules/nicholasjackson/open-faas-nomad/aws/0.4.0">Terraform</a> | <a href="https://github.com/openfaas/faas">GitHub</a>) - Nomad Integration for OpenFaas (Functions as a Service)</li>
+  <li><a href="https://github.com/ValFadeev/rundeck-nomad-plugin">Rundeck Plugin for Nomad</a> - A Rundeck Plugin for Running Jobs on a Nomad Cluster</li>
 </ul>
 
 <h2>Other</h2>
 
 <ul>
-  <li><a href="https://github.com/jippi/awesome-nomad">jippi/awesome-nomad</a> - <strong>A Curated List of Nomad Tools</strong></li>
-  <li><a href="https://github.com/jrasell/nomadfiles">jrasell/nomadfiles</a> - <strong>A Collection of Nomad Job Files for Deploying Applications</strong></li>
+  <li><a href="https://github.com/jippi/hashi-ui">hashi-ui</a> - Hashi-UI is a simple to deploy, web based UI for interacting with Nomad and Consul</li>
+  <li><a href="https://github.com/jippi/awesome-nomad">jippi/awesome-nomad</a> - A Curated List of Nomad Tools</li>
+  <li><a href="https://github.com/jrasell/nomadfiles">jrasell/nomadfiles</a> - A Collection of Nomad Job Files for Deploying Applications</li>
 </ul>
 
 <h2>Trusted By</h2>

From de3f7b4da8cea4c89f050c2f78d1a1f9ff73b090 Mon Sep 17 00:00:00 2001
From: Rob Genova <rcgenova@gmail.com>
Date: Mon, 8 Jan 2018 21:33:55 +0000
Subject: [PATCH 2/4] Remove Community links from header and footer

---
 website/source/layouts/layout.erb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/website/source/layouts/layout.erb b/website/source/layouts/layout.erb
index 7493446f9..d35945497 100644
--- a/website/source/layouts/layout.erb
+++ b/website/source/layouts/layout.erb
@@ -84,7 +84,6 @@
                   <li><a href="/guides/index.html">Guides</a></li>
                   <li><a href="/docs/index.html">Docs</a></li>
                   <li><a href="/api/index.html">API</a></li>
-                  <li><a href="/community.html">Community</a></li>
                   <li><a href="/resources.html">Resources</a></li>
                   <li><a href="https://www.hashicorp.com/products/nomad/?utm_source=oss&utm_medium=header-nav&utm_campaign=nomad">Enterprise</a></li>
                   <li><a href="https://demo.nomadproject.io">UI Demo</a></li>
@@ -119,7 +118,6 @@
               <li><a href="/guides/index.html">Guides</a></li>
               <li><a href="/docs/index.html">Docs</a></li>
               <li><a href="/api/index.html">API</a></li>
-              <li><a href="/community.html">Community</a></li>
               <li><a href="/resources.html">Resources</a></li>
               <li><a href="https://www.hashicorp.com/products/nomad/?utm_source=oss&utm_medium=header-nav&utm_campaign=nomad">Enterprise</a></li>
               <li><a href="https://demo.nomadproject.io">UI Demo</a></li>

From d30d89b89871c59b42344454c0895c3d8bf866b4 Mon Sep 17 00:00:00 2001
From: Rob Genova <rcgenova@gmail.com>
Date: Mon, 8 Jan 2018 21:34:26 +0000
Subject: [PATCH 3/4] Add redirect from Community page to Resources page

---
 website/redirects.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/website/redirects.txt b/website/redirects.txt
index f1ed702f6..c1a799093 100644
--- a/website/redirects.txt
+++ b/website/redirects.txt
@@ -36,6 +36,9 @@
 # - Items are case-sensitive (please use all lowercase)
 #
 
+# Website
+/community.html                               /resources.html
+
 # Docs
 /docs/agent/config.html                       /docs/agent/configuration/index.html
 /docs/jobops                                  /docs/operating-a-job/index.html

From 2f873299b485a794823991803c041badef8e053e Mon Sep 17 00:00:00 2001
From: Rob Genova <rcgenova@gmail.com>
Date: Mon, 8 Jan 2018 21:42:47 +0000
Subject: [PATCH 4/4] Add new blog post

---
 website/source/resources.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/website/source/resources.html.erb b/website/source/resources.html.erb
index bbcfde46b..2be3c7372 100644
--- a/website/source/resources.html.erb
+++ b/website/source/resources.html.erb
@@ -49,6 +49,7 @@ description: |-
 
 <ul>
   <li><a href="https://medium.com/@copyconstruct/schedulers-kubernetes-and-nomad-b0f2e14a896">Cluster Schedulers</a> - Cindy Sridharan</li>
+  <li><a href="https://danielparker.me/nomad/hashicorp/schedulers/nomad/">Playing with Nomad from HashiCorp</a> - Daniel Parker, <strong>Target</strong></li>
   <li><a href="https://medium.com/@gabrielteles/migrating-from-aws-to-aws-e2bb1bfaa0e0">Migrating from AWS to AWS</a> - Gabriel Teles</li>
   <li><a href="https://stackshare.io/circleci/how-circleci-processes-4-5-million-builds-per-month">How <strong>CircleCI</strong> Processes 4.5 Million Builds Per Month</a> - Rob Zuber</li>
   <li><a href="http://timperrett.com/2017/05/13/nomad-with-envoy-and-consul">Envoy with Nomad and Consul</a> - Tim Perrett</li>