Update middleman-hashicorp

website/Gemfile

@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem "middleman-hashicorp", "0.3.4"
+gem "middleman-hashicorp", "0.3.12"

website/Gemfile.lock

@@ -1,29 +1,28 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.7.1)
+    activesupport (4.2.8)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    autoprefixer-rails (6.5.1.1)
+    autoprefixer-rails (6.7.6)
       execjs
     bootstrap-sass (3.3.7)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
-    builder (3.2.2)
+    builder (3.2.3)
     capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    chunky_png (1.3.7)
+    chunky_png (1.3.8)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.10.0)
+    coffee-script-source (1.12.2)
     compass (1.0.3)
       chunky_png (~> 1.2)
       compass-core (~> 1.0.2)
@@ -40,9 +39,9 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
-    eventmachine (1.2.0.1)
+    eventmachine (1.2.3)
     execjs (2.7.0)
-    ffi (1.9.14)
+    ffi (1.9.18)
     haml (4.0.7)
       tilt
     hike (1.2.3)
@@ -50,8 +49,8 @@ GEM
       uber (~> 0.0.14)
     http_parser.rb (0.6.0)
     i18n (0.7.0)
-    json (1.8.3)
+    json (2.0.3)
-    kramdown (1.12.0)
+    kramdown (1.13.2)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -78,13 +77,14 @@ GEM
       rack (>= 1.4.5, < 2.0)
       thor (>= 0.15.2, < 2.0)
       tilt (~> 1.4.1, < 2.0)
-    middleman-hashicorp (0.3.4)
+    middleman-hashicorp (0.3.12)
       bootstrap-sass (~> 3.3)
       builder (~> 3.2)
       middleman (~> 3.4)
       middleman-livereload (~> 3.4)
       middleman-syntax (~> 3.0)
       redcarpet (~> 3.3)
+      turbolinks (~> 5.0)
     middleman-livereload (3.4.6)
       em-websocket (~> 0.5.1)
       middleman-core (>= 3.3)
@@ -101,9 +101,9 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.9.1)
+    minitest (5.10.1)
     multi_json (1.12.1)
-    nokogiri (1.6.8.1)
+    nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
     padrino-helpers (0.12.8.1)
       i18n (~> 0.6, >= 0.6.7)
@@ -111,17 +111,17 @@ GEM
       tilt (~> 1.4.1)
     padrino-support (0.12.8.1)
       activesupport (>= 3.1)
-    rack (1.6.4)
+    rack (1.6.5)
     rack-livereload (0.3.16)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
     rb-fsevent (0.9.8)
-    rb-inotify (0.9.7)
+    rb-inotify (0.9.8)
       ffi (>= 0.5.0)
-    redcarpet (3.3.4)
+    redcarpet (3.4.0)
-    rouge (2.0.6)
+    rouge (2.0.7)
-    sass (3.4.22)
+    sass (3.4.23)
     sprockets (2.12.4)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -132,9 +132,12 @@ GEM
     sprockets-sass (1.3.1)
       sprockets (~> 2.0)
       tilt (~> 1.1)
-    thor (0.19.1)
+    thor (0.19.4)
-    thread_safe (0.3.5)
+    thread_safe (0.3.6)
     tilt (1.4.1)
+    turbolinks (5.0.1)
+      turbolinks-source (~> 5)
+    turbolinks-source (5.0.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uber (0.0.15)
@@ -148,7 +151,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  middleman-hashicorp (= 0.3.4)
+  middleman-hashicorp (= 0.3.12)
 
 BUNDLED WITH
-   1.13.6
+   1.14.6

website/Makefile

@@ -1,4 +1,4 @@
-VERSION?="0.3.4"
+VERSION?="0.3.12"
 
 website:
 	@echo "==> Starting website in Docker..."

website/README.md

@@ -1,31 +1,21 @@
 # Consul Website
 
-This subdirectory contains the entire source for the
+This subdirectory contains the entire source for the [Consul Website][consul].
-[Consul Website](https://www.consul.io/). This is a
+This is a [Middleman][middleman] project, which builds a static site from these
-[Middleman](http://middlemanapp.com) project, which builds a static site from
+source files.
-these source files.
 
 ## Contributions Welcome!
 
 If you find a typo or you feel like you can improve the HTML, CSS, or
-JavaScript, we welcome contributions. Feel free to open issues or pull
+JavaScript, we welcome contributions. Feel free to open issues or pull requests
-requests like any normal GitHub project, and we'll merge it in.
+like any normal GitHub project, and we'll merge it in.
 
 ## Running the Site Locally
 
-To run the site locally, clone this repository and run:
+Running the site locally is simple. Clone this repo and run `make website`.
 
-```shell
+Then open up `http://localhost:4567`. Note that some URLs you may need to append
-$ make website
+".html" to make them work (in the navigation).
-```
 
-You must have Docker installed for this to work.
+[middleman]: https://www.middlemanapp.com
-
+[consul]: https://www.consul.io
-Alternatively, you can manually run the website like this:
-
-```shell
-$ bundle
-$ bundle exec middleman server
-```
-
-Then open up `http://localhost:4567`.

website/config.ru

@@ -1,38 +0,0 @@
-require "rack"
-require "rack/contrib/not_found"
-require "rack/contrib/response_headers"
-require "rack/contrib/static_cache"
-require "rack/contrib/try_static"
-require "rack/protection"
-
-# Protect against various bad things
-use Rack::Protection::JsonCsrf
-use Rack::Protection::RemoteReferrer
-use Rack::Protection::HttpOrigin
-use Rack::Protection::EscapedParams
-use Rack::Protection::XSSHeader
-use Rack::Protection::FrameOptions
-use Rack::Protection::PathTraversal
-use Rack::Protection::IPSpoofing
-
-# Properly compress the output if the client can handle it.
-use Rack::Deflater
-
-# Set the "forever expire" cache headers for these static assets. Since
-# we hash the contents of the assets to determine filenames, this is safe
-# to do.
-use Rack::StaticCache,
-  :root => "build",
-  :urls => ["/assets"],
-  :duration => 2,
-  :versioning => false
-
-# Try to find a static file that matches our request, since Middleman
-# statically generates everything.
-use Rack::TryStatic,
-  :root => "build",
-  :urls => ["/"],
-  :try  => [".html", "index.html", "/index.html"]
-
-# 404 if we reached this point. Sad times.
-run Rack::NotFound.new(File.expand_path("../build/404.html", __FILE__))

website/packer.json

@@ -8,7 +8,7 @@
   "builders": [
     {
       "type": "docker",
-      "image": "hashicorp/middleman-hashicorp:0.3.4",
+      "image": "hashicorp/middleman-hashicorp:0.3.12",
       "discard": "true",
       "run_command": ["-d", "-i", "-t", "{{ .Image }}", "/bin/sh"]
     }