Merge pull request #340 from hashicorp/sethvargo/releases

Use releases for releases
hashicorp · Oct 26, 2015 · ba80348 · ba80348
2 parents c2c1909 + d9f827f
commit ba80348
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 77 deletions.
diff --git a/website/Gemfile.lock b/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)
@@ -186,6 +186,3 @@ PLATFORMS
 
 DEPENDENCIES
   middleman-hashicorp!
-
-BUNDLED WITH
-   1.10.6
diff --git a/website/config.rb b/website/config.rb
@@ -1,23 +1,9 @@
-#-------------------------------------------------------------------------
-# Configure Middleman
-#-------------------------------------------------------------------------
-
-helpers do
-  def livestream_active?
-    # Must set key for date
-    ENV["LIVESTREAM_ACTIVE"].present?
-  end
-end
-
 set :base_url, "https://www.nomadproject.io/"
 
 activate :hashicorp do |h|
-  h.version         = ENV["NOMAD_VERSION"]
-  h.bintray_enabled = ENV["BINTRAY_ENABLED"] == "1"
-  h.bintray_repo    = "mitchellh/nomad"
-  h.bintray_user    = "mitchellh"
-  h.bintray_key     = ENV["BINTRAY_API_KEY"]
-  h.github_slug     = "hashicorp/nomad"
+  h.name        = "nomad"
+  h.version     = "0.1.2"
+  h.github_slug = "hashicorp/nomad"
 
   h.minify_javascript = false
 end
diff --git a/website/source/downloads.html.erb b/website/source/downloads.html.erb
@@ -9,40 +9,51 @@ description: |-
 <h1>Download Nomad</h1>
 
 <section class="downloads">
-	<div class="description row">
-		<div class="col-md-12">
-			<p>
-			Below are all available downloads for the latest version of Nomad
-			(<%= 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/nomad/nomad_<%= latest_version %>_SHA256SUMS?direct">here</a>. You can verify the SHA256 checksums using <a href="https://hashicorp.com/security.html">our PGP public key</a> and the <a href="https://dl.bintray.com/mitchellh/nomad/nomad_<%= latest_version %>_SHA256SUMS.sig?direct">SHA256SUMs signature file</a>.
-			</p>
-		</div>
-	</div>
-	<% product_versions.each do |os, versions| %>
-		<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>
-				<ul>
-					<% versions.each do |url| %>
-						<li><a href="<%= url %>"><%= arch_for_filename(url) %></a></li>
-					<% end %>
-				</ul>
-				<div class="clearfix">
-				</div>
-			</div>
-		</div>
-	</div>
-<% end %>
+  <div class="description row">
+    <div class="col-md-12">
+      <p>
+        Below are the available downloads for the latest version of Nomad
+        (<%= latest_version %>). Please download the proper package for your
+        operating system and architecture.
+      </p>
+      <p>
+        You can find the
+        <a href="https://releases.hashicorp.com/nomad/<%= latest_version %>/nomad_<%= latest_version %>_SHA256SUMS">
+          SHA256 checksums for Nomad <%= latest_version %>
+        </a>
+        online and you can
+        <a href="https://releases.hashicorp.com/nomad/<%= latest_version %>/nomad_<%= 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/nomad" target="_TOP">download older versions of Nomad</a> from the releases service.
+      </p>
+    </div>
+  </div>
 
-	<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>
-		</div>
-	</div>
+  <% 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"><%= pretty_os(os) %></h2>
+          <ul>
+            <% arches.each do |arch, url| %>
+              <li><a href="<%= url %>"><%= pretty_arch(arch) %></a></li>
+            <% end %>
+          </ul>
+          <div class="clearfix"></div>
+        </div>
+      </div>
+    </div>
+  <% end %>
+
+  <div class="row">
+    <div class="col-md-12 poweredby">
+      <a href="https://www.fastly.com?utm_source=hashicorp" target="_TOP">
+        <%= image_tag "fastly_logo.png" %>
+      </a>
+    </div>
+  </div>
 </section>
diff --git a/website/source/layouts/_meta.erb b/website/source/layouts/_meta.erb
@@ -5,11 +5,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="<%= current_page.data.description %>">
 
-    <% unless livestream_active? %>
     <link rel="shortcut icon" href="<%= image_path('favicon.png') %>">
 
     <title><%= [current_page.data.page_title, "Nomad by HashiCorp"].compact.join(" - ") %></title>
-    <% end %>
+
     <%= stylesheet_link_tag "application" %>
 
     <!--[if lt IE 9]>

diff --git a/website/source/layouts/layout.erb b/website/source/layouts/layout.erb
@@ -1,24 +1,7 @@
-<% if livestream_active? %>
-<% content_for(:body_class, "livestream") %>
-
-<%= partial "layouts/meta" %>
-<div class="livestream-container">
-    <div class="livestream-video">
-        <iframe src="https://www.ustream.tv/embed/21243866?html5ui=1" id="live-stream-video" webkitallowfullscreen allowfullscreen frameborder="no"></iframe>
-    </div>
-</div>
-
-<!-- closing tags from layouts/meta, keep this -->
-</body>
-</html>
-
-<% else %>
-
 <%= partial "layouts/meta" %>
 <%= partial "layouts/header" %>
 <%= partial "layouts/sidebar" %>
 
 <%= yield %>
 
 <%= partial "layouts/footer" %>
-<% end %>