Merge #669: Verification instructions: suggest keyserver

dffb4cc Verification instructions: suggest keyserver (David A. Harding)

Pull request description:

  Closes #667

  Adds the parameters necessary for using the Ubuntu keyserver to each case where we describe how to download a key.  I put the string in the config file so it's easy to change or disable globally.  Also makes a small unrelated change to the heading id tag to hopefully address #668

Top commit has no ACKs.

Tree-SHA512: d44f310b34221692621348706eeefb8e028a716bf9d660023edfcf9efb1402b8135b0478187567e84cffab9c698d0b6de5cbb250ce56ab393b66302dfd390408

Author: harding

_config.yml

@@ -99,3 +99,6 @@ collections:
     output: true
   doc:
     output: true
+
+strings:
+  gpg_keyserver: " --keyserver hkp://keyserver.ubuntu.com"  ## Prefix with a space

_includes/dev-keys.md

@@ -8,7 +8,7 @@
   {% else %}{% comment %}fallback to English{% endcomment %}
     {% assign _includes_dev_keys-name = "Name" %}
     {% assign _includes_dev_keys-fingerprint = "Fingerprint" %}
-    {% capture _includes_dev_keys-import %}You can import a key by running the following command with that individual's fingerprint: `gpg --recv-keys "<fingerprint>"`  Ensure that you put quotes around fingerprints containing spaces.{% endcapture %}
+    {% capture _includes_dev_keys-import %}You can import a key by running the following command with that individual's fingerprint: `gpg{{site.strings.gpg_keyserver}} --recv-keys "<fingerprint>"`  Ensure that you put quotes around fingerprints containing spaces.{% endcapture %}
 {% endcase %}
 {% endcapture %}
 

_includes/templates/download.html

@@ -80,7 +80,7 @@ <h2>{{ page.latestversion }} {{CURRENT_RELEASE}} <a type="application/rss+xml" h
     <p class="downloadkeys">
       <span>{{ page.releasekeys }}</span>
       v0.11.0+ <code title="{{page.pgp_key_fingerprint}}">{{SIGNING_KEY_FINGERPRINT}}</code><br>
-      {% if page.version > 2 %}<i>{{page.key_refresh}}</i> <code>gpg --refresh-keys</code>{% endif %}
+      {% if page.version > 2 %}<i>{{page.key_refresh}}</i><br><code>gpg{{site.strings.gpg_keyserver}} --refresh-keys</code>{% endif %}
     </p>
   </div>
 
@@ -90,7 +90,7 @@ <h2 style="text-align: center">{{ page.patient }}</h2>
   <p>{{ page.notesync | replace: '$(DATADIR_SIZE)', site.data.stats.datadir_gb | replace: '$(PRUNED_SIZE)', site.data.stats.pruned_gb | replace: '$(MONTHLY_RANGE_GB)', site.data.stats.monthly_storage_increase_range_gb }} {{ page.full_node_guide }}</p>
 
 {% if page.version > 1 %}
-  <h2 style="text-align: center">{{page.verify_download}}</h2>
+  <h2 style="text-align: center" id="{{page.verify_download | slugify}}">{{page.verify_download}}</h2>
   <p>{{page.verification_recommended}}</p>
   <details>
   {% assign GPG = "C:\Program Files\Gnu\GnuPg\gpg.exe" %}
@@ -122,7 +122,7 @@ <h2 style="text-align: center">{{page.verify_download}}</h2>
 
       <li><p>{{page.obtain_release_key}}</p>
 
-        <pre class="highlight"><code>{{GPG}} --recv-keys {{SIGNING_KEY_FINGERPRINT}}</code></pre>
+        <pre class="highlight"><code>{{GPG}}{{site.strings.gpg_keyserver}} --recv-keys {{SIGNING_KEY_FINGERPRINT}}</code></pre>
 
         <p>{{page.release_key_obtained}}</p></li>
 
@@ -166,7 +166,7 @@ <h2 style="text-align: center">{{page.verify_download}}</h2>
 
       <li><p>{{page.obtain_release_key}}</p>
 
-        <pre class="highlight"><code>gpg --recv-keys {{SIGNING_KEY_FINGERPRINT}}</code></pre>
+        <pre class="highlight"><code>gpg{{site.strings.gpg_keyserver}} --recv-keys {{SIGNING_KEY_FINGERPRINT}}</code></pre>
 
         <p>{{page.release_key_obtained}}</p></li>
 
@@ -204,7 +204,7 @@ <h2 style="text-align: center">{{page.verify_download}}</h2>
 
       <li><p>{{page.obtain_release_key}}</p>
 
-        <pre class="highlight"><code>gpg --recv-keys {{SIGNING_KEY_FINGERPRINT}}</code></pre>
+        <pre class="highlight"><code>gpg{{site.strings.gpg_keyserver}} --recv-keys {{SIGNING_KEY_FINGERPRINT}}</code></pre>
 
         <p>{{page.release_key_obtained}}</p></li>