Merge pull request #1336 from hashicorp/sethvargo/releases

Use releases for pulling binaries

website/Gemfile

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-ruby "2.2.3"
+ruby "2.2.2"
 
 gem "middleman-hashicorp", github: "hashicorp/middleman-hashicorp"

website/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: git://github.com/hashicorp/middleman-hashicorp.git
-  revision: b152b6436348e8e1f9990436228b25b4c5c6fcb8
+  revision: 15cbda0cf1d963fa71292dee921229e7ee618272
   specs:
-    middleman-hashicorp (0.1.0)
+    middleman-hashicorp (0.2.0)
       bootstrap-sass (~> 3.3)
       builder (~> 3.2)
       less (~> 2.6)
@@ -79,7 +79,7 @@ GEM
     kramdown (1.9.0)
     less (2.6.0)
       commonjs (~> 0.2.7)
-    libv8 (3.16.14.11)
+    libv8 (3.16.14.13)
     listen (3.0.3)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)

website/config.rb

@@ -5,21 +5,9 @@
 set :base_url, "https://www.consul.io/"
 
 activate :hashicorp do |h|
+  h.name        = "consul"
   h.version     = "0.5.2"
-  h.bintray_enabled = ENV["BINTRAY_ENABLED"]
-  h.bintray_repo    = "mitchellh/consul"
-  h.bintray_user    = "mitchellh"
-  h.bintray_key     = ENV["BINTRAY_API_KEY"]
   h.github_slug = "hashicorp/consul"
-
-  # Do not include the "web" in the default list of packages
-  h.bintray_exclude_proc = Proc.new do |os, filename|
-    os == "web"
-  end
-
-  # Consul packages are not prefixed with consul_ - they should be in the
-  # future though!
-  h.bintray_prefixed = false
 end
 
 helpers do

website/source/downloads.html.erb

@@ -12,31 +12,43 @@ description: |-
   <div class="description row">
     <div class="col-md-12">
       <p>
-			Below are all available downloads for the latest version of Consul
+        Below are the available downloads for the latest version of Consul
         (<%= latest_version %>). Please download the proper package for your
-			operating system and architecture. You can find SHA256 checksums
-			for packages <a href="https://dl.bintray.com/mitchellh/consul/<%= latest_version %>_SHA256SUMS?direct">here</a>.
+        operating system and architecture.
+      </p>
+      <p>
+        You can find the
+        <a href="https://releases.hashicorp.com/consul/<%= latest_version %>/consul_<%= latest_version %>_SHA256SUMS">
+          SHA256 checksums for Consul <%= latest_version %>
+        </a>
+        online and you can
+        <a href="https://releases.hashicorp.com/consul/<%= latest_version %>/consul_<%= latest_version %>_SHA256SUMS.sig">
+          verify the checksums signature file
+        </a>
+        which has been signed using <a href="https://hashicorp.com/security.html" target="_TOP">HashiCorp's GPG key</a>.
+        You can also <a href="https://releases.hashicorp.com/consul" target="_TOP">download older versions of Consul</a> from the releases service.
       </p>
     </div>
   </div>
 
   <div class="row">
     <div class="col-md-12 download center">
-      <a href="https://dl.bintray.com/mitchellh/consul/<%= latest_version %>_web_ui.zip" class="btn btn-lg btn-default">
+      <a href="https://releases.hashicorp.com/consul/<%= latest_version %>/consul_<%= latest_version %>_web_ui.zip" class="btn btn-lg btn-default">
         Download Consul Web UI
       </a>
     </div>
   </div>
 
-	<% product_versions.each do |os, versions| %>
+  <% product_versions.each do |os, arches| %>
+    <% next if os == "web" %>
     <div class="row">
       <div class="col-md-12 download">
         <div class="icon pull-left"><%= system_icon(os) %></div>
         <div class="details">
-    			<h2 class="os-name"><%= os %></h2>
+          <h2 class="os-name"><%= pretty_os(os) %></h2>
           <ul>
-    				<% versions.each do |url| %>
-    					<li><a href="<%= url %>"><%= arch_for_filename(url) %></a></li>
+            <% arches.each do |arch, url| %>
+              <li><a href="<%= url %>"><%= pretty_arch(arch) %></a></li>
             <% end %>
           </ul>
           <div class="clearfix"></div>
@@ -47,8 +59,8 @@ description: |-
 
   <div class="row">
     <div class="col-md-12 poweredby">
-			<a href='http://www.bintray.com'>
-				<img src="https://www.bintray.com/docs/images/poweredByBintray_ColorTransparent.png">
+      <a href="https://www.fastly.com?utm_source=hashicorp" target="_TOP">
+        <%= image_tag "fastly_logo.png" %>
       </a>
     </div>
   </div>