From 75dd4004ff6c3c39f60cec7f50846159772aa29d Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Sun, 25 Oct 2015 17:46:22 -0400 Subject: [PATCH 1/2] Use releases for releases --- website/Gemfile.lock | 9 ++- website/config.rb | 18 +---- website/source/assets/images/fastly_logo.png | 3 + website/source/downloads.html.erb | 76 +++++++++++--------- 4 files changed, 56 insertions(+), 50 deletions(-) create mode 100644 website/source/assets/images/fastly_logo.png diff --git a/website/Gemfile.lock b/website/Gemfile.lock index 4a6daa8bb..6a9d55fc0 100644 --- a/website/Gemfile.lock +++ b/website/Gemfile.lock @@ -1,8 +1,8 @@ GIT remote: git://github.com/hashicorp/middleman-hashicorp.git - revision: b152b6436348e8e1f9990436228b25b4c5c6fcb8 + revision: f21146d03182b7236b85ee8bc430fd613125d5bb 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,3 +186,6 @@ PLATFORMS DEPENDENCIES middleman-hashicorp! + +BUNDLED WITH + 1.10.6 diff --git a/website/config.rb b/website/config.rb index 9fe973fea..8cc1d9bd0 100644 --- a/website/config.rb +++ b/website/config.rb @@ -5,21 +5,9 @@ set :base_url, "https://www.consul.io/" activate :hashicorp do |h| - 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 + h.name = "consul" + h.version = "0.5.2" + h.github_slug = "hashicorp/consul" end helpers do diff --git a/website/source/assets/images/fastly_logo.png b/website/source/assets/images/fastly_logo.png new file mode 100644 index 000000000..e9e208162 --- /dev/null +++ b/website/source/assets/images/fastly_logo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64c5dc4d4876560bfdaa44705459a66d15feee2aacc0c67698c2bb4c87433d29 +size 182835 diff --git a/website/source/downloads.html.erb b/website/source/downloads.html.erb index 6eab61d36..2c63e068f 100644 --- a/website/source/downloads.html.erb +++ b/website/source/downloads.html.erb @@ -9,47 +9,59 @@ description: |-

Download Consul

-
-
-

- Below are all 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 here. -

-
-
+
+
+

+ 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 the + + SHA256 checksums for Consul <%= latest_version %> + + online and you can + + verify the checksums signature file + + which has been signed using HashiCorp's GPG key. + You can also download older versions of Consul from the releases service. +

+
+
- + Download Consul Web UI
- <% product_versions.each do |os, versions| %> -
-
-
<%= system_icon(os) %>
-
-

<%= os %>

- -
-
-
+ <% product_versions.each do |os, arches| %> + <% next if os == "web" %> +
+
+
<%= system_icon(os) %>
+
+

<%= pretty_os(os) %>

+ +
+
+
<% end %> -
-
- - - -
-
+
+
+ + <%= image_tag "fastly_logo.png" %> + +
+
From f6abfc1cd1f0b1d0e23213a7d2eb6b87cee46122 Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Mon, 26 Oct 2015 12:08:30 -0400 Subject: [PATCH 2/2] Use vendored fastly logo --- website/Gemfile | 2 +- website/Gemfile.lock | 5 +---- website/source/assets/images/fastly_logo.png | 3 --- 3 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 website/source/assets/images/fastly_logo.png diff --git a/website/Gemfile b/website/Gemfile index d0e5a286b..2b35e2810 100644 --- a/website/Gemfile +++ b/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" diff --git a/website/Gemfile.lock b/website/Gemfile.lock index 6a9d55fc0..64e5f4fd8 100644 --- a/website/Gemfile.lock +++ b/website/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/hashicorp/middleman-hashicorp.git - revision: f21146d03182b7236b85ee8bc430fd613125d5bb + revision: 15cbda0cf1d963fa71292dee921229e7ee618272 specs: middleman-hashicorp (0.2.0) bootstrap-sass (~> 3.3) @@ -186,6 +186,3 @@ PLATFORMS DEPENDENCIES middleman-hashicorp! - -BUNDLED WITH - 1.10.6 diff --git a/website/source/assets/images/fastly_logo.png b/website/source/assets/images/fastly_logo.png deleted file mode 100644 index e9e208162..000000000 --- a/website/source/assets/images/fastly_logo.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64c5dc4d4876560bfdaa44705459a66d15feee2aacc0c67698c2bb4c87433d29 -size 182835