You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datafu.apache.org by mh...@apache.org on 2018/02/27 17:53:29 UTC

incubator-datafu git commit: DATAFU-137 KEYS sigs and hashes must be linked from the download page

Repository: incubator-datafu
Updated Branches:
  refs/heads/master 678a26082 -> d4afac6d5


DATAFU-137 KEYS sigs and hashes must be linked from the download page


Project: http://git-wip-us.apache.org/repos/asf/incubator-datafu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-datafu/commit/d4afac6d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-datafu/tree/d4afac6d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-datafu/diff/d4afac6d

Branch: refs/heads/master
Commit: d4afac6d5fc5e79bbbe3747b294a3e054c214f11
Parents: 678a260
Author: Matthew Hayes <mh...@apache.org>
Authored: Thu Feb 22 21:10:12 2018 -0800
Committer: Matthew Hayes <mh...@apache.org>
Committed: Thu Feb 22 21:10:12 2018 -0800

----------------------------------------------------------------------
 site/config.rb                              | 24 ++++++++++++++++++++++++
 site/source/docs/download.html.markdown.erb | 19 ++++++++++---------
 2 files changed, 34 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/d4afac6d/site/config.rb
----------------------------------------------------------------------
diff --git a/site/config.rb b/site/config.rb
index 745a3f8..1f5c505 100644
--- a/site/config.rb
+++ b/site/config.rb
@@ -59,6 +59,30 @@ Dir['./lib/*'].each { |f| require f }
 
 # Methods defined in the helpers block are available in templates
 helpers do
+  # Use this for the current release.
+  def current_source_release_link(version)
+    "<a href=\"http://www.apache.org/dyn/closer.cgi/incubator/datafu/apache-datafu-incubating-#{version}/\">
+     apache-datafu-incubating-#{version}</a>
+     [ <a href=\"https://www.apache.org/dist/incubator/datafu/apache-datafu-incubating-#{version}/apache-datafu-incubating-sources-#{version}.tgz.asc\">
+     PGP</a> ]
+     [ <a href=\"https://www.apache.org/dist/incubator/datafu/apache-datafu-incubating-#{version}/apache-datafu-incubating-sources-#{version}.tgz.md5\">
+     MD5</a> ]
+     [ <a href=\"https://www.apache.org/dist/incubator/datafu/apache-datafu-incubating-#{version}/apache-datafu-incubating-sources-#{version}.tgz.sha512\">
+     SHA512</a> ]"
+  end
+
+  # Use this for releases > 1.3.2 and < the current release
+  def archived_source_release_link(version)
+    "<a href=\"https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-#{version}/apache-datafu-incubating-sources-#{version}.tgz\">
+     apache-datafu-incubating-#{version}</a>
+     [ <a href=\"https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-#{version}/apache-datafu-incubating-sources-#{version}.tgz.asc\">
+     PGP</a> ]
+     [ <a href=\"https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-#{version}/apache-datafu-incubating-sources-#{version}.tgz.md5\">
+     MD5</a> ]
+     [ <a href=\"https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-#{version}/apache-datafu-incubating-sources-#{version}.tgz.sha512\">
+     SHA512</a> ]"
+  end
+
   def inner_text(html)
     Nokogiri.HTML(html).text.gsub(/\s+/, " ")
   end

http://git-wip-us.apache.org/repos/asf/incubator-datafu/blob/d4afac6d/site/source/docs/download.html.markdown.erb
----------------------------------------------------------------------
diff --git a/site/source/docs/download.html.markdown.erb b/site/source/docs/download.html.markdown.erb
index 0a400f5..bfe7160 100644
--- a/site/source/docs/download.html.markdown.erb
+++ b/site/source/docs/download.html.markdown.erb
@@ -25,20 +25,21 @@ Apache DataFu is available for download as a source release and as compiled arti
 
 ## Source Releases
 
-Download one of the source releases from the list below:
+The latest source release can be found here:
 
-* [apache-datafu-incubating-1.3.3](http://www.apache.org/dyn/closer.cgi/incubator/datafu/apache-datafu-incubating-1.3.3/)
-* [apache-datafu-incubating-1.3.2](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.2/)
-* [apache-datafu-incubating-1.3.1](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.1/)
-* [apache-datafu-incubating-1.3.0](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.0/)
+* <%= current_source_release_link("1.3.3") %>
 
-### Validation
+Previous releases:
+
+* [apache-datafu-incubating-sources-1.3.2.tgz](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.2/apache-datafu-incubating-sources-1.3.2.tgz) [ [PGP](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.2/apache-datafu-incubating-sources-1.3.2.tgz.asc) ] [ [MD5](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.2/apache-datafu-incubating-sources-1.3.2.tgz.MD5) ] [ [SHA512](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.2/apache-datafu-incubating-sources-1.3.2.tgz.SHA-512) ]
+* [apache-datafu-incubating-sources-1.3.1.tgz](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.1/apache-datafu-incubating-sources-1.3.1.tgz) [ [PGP](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.1/apache-datafu-incubating-sources-1.3.1.tgz.asc) ] [ [MD5](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.1/apache-datafu-incubating-sources-1.3.1.tgz.MD5) ] [ [SHA512](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.1/apache-datafu-incubating-sources-1.3.1.tgz.SHA-512) ]
+* [apache-datafu-incubating-sources-1.3.0.tgz](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.0/apache-datafu-incubating-sources-1.3.0.tgz) [ [PGP](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.0/apache-datafu-incubating-sources-1.3.0.tgz.asc) ] [ [MD5](https://archive.apache.org/dist/incubator/datafu/apache-datafu-incubating-1.3.0/apache-datafu-incubating-sources-1.3.0.tgz.MD5) ]
 
-It is important to validate the release using either the PGP signature (`.asc` file) or hashes (`.md5` or `.sha512` files).  Information on validating a release can be found on the download page for the most recent release.  For more information on verification of Apache releases, see [here](https://www.apache.org/info/verification.html).
+### Validation
 
-As indicated on the download page, the KEYS file can be found on the backup mirrors [here](http://www-us.apache.org/dist/incubator/datafu/KEYS) or [here](http://www-eu.apache.org/dist/incubator/datafu/KEYS).  The signature and hash files for the most recent release are available from the backup sites listed on the download page.  For archived releases, you will find the signature and hash files alongside the source archive.
+It is important to validate the release using either the PGP signature (`.asc` file) or hashes (`.md5` or `.sha512` files).  For more information on verification of Apache releases, see [here](https://www.apache.org/info/verification.html).  The `KEYS` file can be found [here](https://www.apache.org/dist/incubator/datafu/KEYS).
 
-Once fetched, the the `KEYS` file can be imported and the `.asc` file can used to verify the release.
+Once fetched, the `KEYS` file can be imported and the `.asc` file can used to verify the release.
 
 ```
 gpg --import KEYS