18253: documentation updates around the Arvados GPG package signing key.

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/doc/_includes/_install_redhat_key.liquid b/doc/_includes/_gpg_key_fingerprint.liquid
similarity index 82%
rename from doc/_includes/_install_redhat_key.liquid
rename to doc/_includes/_gpg_key_fingerprint.liquid
index c9430515f16619ca1aeda22f387573d113aef6e4..a10fd8688db40d53638b9f068518e585181b91d2 100644 (file)
--- a/doc/_includes/_install_redhat_key.liquid
+++ b/doc/_includes/_gpg_key_fingerprint.liquid
@@ -10,7 +10,6 @@ The Arvados signing key fingerprint is
 <pre><code>pub   rsa2048 2010-11-15 [SC]
       B2DA 2991 656E B4A5 0314  CA2B 5716 5911 1078 ECD7
 uid           [ unknown] Arvados Automatic Signing Key <sysadmin@arvados.org>
-uid           [ unknown] Curoverse, Inc Automatic Signing Key <sysadmin@curoverse.com>
 sub   rsa2048 2010-11-15 [E]
 </code></pre>
 </notextile>

diff --git a/doc/_includes/_install_debian_key.liquid b/doc/_includes/_install_debian_key.liquid
index adfdff8733a3d779893a35089fb8c1e0c0025e99..1d5f73a4d28ef9d6863832668f6a8474f756204d 100644 (file)
--- a/doc/_includes/_install_debian_key.liquid
+++ b/doc/_includes/_install_debian_key.liquid
@@ -4,10 +4,14 @@ Copyright (C) The Arvados Authors. All rights reserved.
 SPDX-License-Identifier: CC-BY-SA-3.0
 {% endcomment %}
 
+<notextile>
+<pre><code># <span class="userinput">apt-get --no-install-recommends install curl gnupg2</span>
+# <span class="userinput">curl https://apt.arvados.org/pubkey.gpg -o /etc/apt/trusted.gpg.d/arvados.asc</span>
+</code></pre>
+</notextile>
 
+The Arvados package signing GPG key is also available via the keyservers, though they can be unreliable. To retrieve the signing key via keyserver.ubuntu.com:
 
 <notextile>
-<pre><code># <span class="userinput">apt-get --no-install-recommends install gnupg</span>
-# <span class="userinput">/usr/bin/apt-key adv --keyserver pgp.mit.edu --recv 1078ECD7</span>
-</code></pre>
+<pre><code># <span class="userinput">/usr/bin/apt-key adv --keyserver keyserver.ubuntu.com --recv 1078ECD7</code></pre>
 </notextile>

diff --git a/doc/install/packages.html.textile.liquid b/doc/install/packages.html.textile.liquid
index fb296ad5ad47019024d49fe6e0bf61f30a48b0d5..a111843a6545f646d40064768967d6e01f005af4 100644 (file)
--- a/doc/install/packages.html.textile.liquid
+++ b/doc/install/packages.html.textile.liquid
@@ -23,11 +23,11 @@ Packages are available for CentOS 7. To install them with yum, save this configu
 name=Arvados
 baseurl=http://rpm.arvados.org/CentOS/$releasever/os/$basearch/
 gpgcheck=1
-gpgkey=http://rpm.arvados.org/CentOS/RPM-GPG-KEY-curoverse
+gpgkey=http://rpm.arvados.org/CentOS/RPM-GPG-KEY-arvados
 </code></pre>
 </notextile>
 
-{% include 'install_redhat_key' %}
+{% include 'gpg_key_fingerprint' %}
 
 h3(#debian). Debian and Ubuntu
 
@@ -37,6 +37,8 @@ First, register the Arvados signing key in apt's database:
 
 {% include 'install_debian_key' %}
 
+{% include 'gpg_key_fingerprint' %}
+
 As root, add the Arvados package repository to your sources.  This command depends on your OS vendor and version:
 
 table(table table-bordered table-condensed).