Merge branch '8326-add-centos-repo-gpg-key'

closes #8326

diff --git a/doc/_includes/_install_redhat_key.liquid b/doc/_includes/_install_redhat_key.liquid
index 9fd219b3bd923ba67572c9f3113b4b85ab238857..90e3f0407b3fb264b0cab976e92cf5c7ece956a4 100644 (file)
--- a/doc/_includes/_install_redhat_key.liquid
+++ b/doc/_includes/_install_redhat_key.liquid
@@ -1,6 +1,9 @@
+The Curoverse signing key fingerprint is
+
 <notextile>
-<pre><code>~$ <span class="userinput">gpg --keyserver pool.sks-keyservers.net --recv-keys 1078ECD7</span>
-~$ <span class="userinput">gpg --armor --export 1078ECD7 >/tmp/curoverse.key</span>
-~$ <span class="userinput">sudo rpm --import /tmp/curoverse.key</span>
+<pre><code>
+pub  2048R/1078ECD7 2010-11-15 Curoverse, Inc Automatic Signing Key <sysadmin@curoverse.com>
+      Key fingerprint = B2DA 2991 656E B4A5 0314  CA2B 5716 5911 1078 ECD7
+sub  2048R/5A8C5A93 2010-11-15
 </code></pre>
 </notextile>

diff --git a/doc/install/install-manual-prerequisites.html.textile.liquid b/doc/install/install-manual-prerequisites.html.textile.liquid
index 86713f1bcad5599a1b588f83981c9591a0194fa3..943c3bad0e2fe26c7d118f05952fadfc1de4faf4 100644 (file)
--- a/doc/install/install-manual-prerequisites.html.textile.liquid
+++ b/doc/install/install-manual-prerequisites.html.textile.liquid
@@ -39,19 +39,19 @@ On any host where you install Arvados software, you'll need to set up an Arvados
 
 h3. CentOS
 
-Packages are available for CentOS 7.  First, register the Curoverse signing key in RPM's database:
-
-{% include 'install_redhat_key' %}
-
-Then save this configuration block in @/etc/yum.repos.d/arvados.repo@:
+Packages are available for CentOS 7. To install them with yum, save this configuration block in @/etc/yum.repos.d/arvados.repo@:
 
 <notextile>
 <pre><code>[arvados]
 name=Arvados
 baseurl=http://rpm.arvados.org/CentOS/$releasever/os/$basearch/
+gpgcheck=1
+gpgkey=http://rpm.arvados.org/CentOS/RPM-GPG-KEY-curoverse
 </code></pre>
 </notextile>
 
+{% include 'install_redhat_key' %}
+
 h3. Debian and Ubuntu
 
 Packages are available for Debian 8 ("jessie"), Ubuntu 14.04 ("trusty") and Ubuntu 16.04 ("xenial").