From fcb38dbddcabfdb2dcfce28fc089e1a47de71905 Mon Sep 17 00:00:00 2001
From: Tim Bishop <tim@bishnet.net>
Date: Fri, 9 Aug 2013 23:25:57 +0000
Subject: [PATCH] Update PGP key information.

There doesn't seem to be a huge benefit showing the whole armored key
directly on the webpage. Instead show the key details, including the
fingerprint, and provide a download for the armored key.
---
 www/i-scream-autobuild.key |  4 ++++
 www/i-scream-dev.key       |  4 ++++
 www/pgpkey.xhtml           | 22 ++++++++++++++--------
 3 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 www/i-scream-autobuild.key
 create mode 100644 www/i-scream-dev.key

diff --git a/www/i-scream-autobuild.key b/www/i-scream-autobuild.key
new file mode 100644
index 0000000..2b29faa
--- /dev/null
+++ b/www/i-scream-autobuild.key
@@ -0,0 +1,4 @@
+pub   4096R/0x863B2E8E1320D767 2013-08-07 [expires: 2015-08-07]
+      Key fingerprint = 480F 4872 D8D2 5106 E056  52F0 863B 2E8E 1320 D767
+uid                 [ultimate] i-scream Automated Builds <dev@i-scream.org>
+sub   4096R/0x8CC30FFAAD3737CD 2013-08-07 [expires: 2015-08-07]
diff --git a/www/i-scream-dev.key b/www/i-scream-dev.key
new file mode 100644
index 0000000..6f912ab
--- /dev/null
+++ b/www/i-scream-dev.key
@@ -0,0 +1,4 @@
+pub   4096R/0xA12F416AA37F3BD7 2013-08-07 [expires: 2015-08-07]
+      Key fingerprint = 4AD8 6566 CAD0 3297 A980  4702 A12F 416A A37F 3BD7
+uid                 [ultimate] i-scream Development Team <dev@i-scream.org>
+sub   4096R/0x29E38BE8BCE83B45 2013-08-07 [expires: 2015-08-07]
diff --git a/www/pgpkey.xhtml b/www/pgpkey.xhtml
index 5f454c6..9cbe4f2 100644
--- a/www/pgpkey.xhtml
+++ b/www/pgpkey.xhtml
@@ -18,13 +18,16 @@
           </h2>
           <p>
             This is the public key we use for signing i-scream software
-            releases.<br />
-            You can also download a copy
-            <a href="i-scream-dev.asc">here</a>.
+            releases.
           </p>
           <pre>
-<!--#include virtual="i-scream-dev.asc" -->
+<!--#include virtual="i-scream-dev.key" -->
 </pre>
+          <p>
+            You can download a copy directly from
+            <a href="i-scream-dev.asc">here</a> or you can search for
+            it on a key server of your choice.
+          </p>
           <h2>
             i-scream automated build pgp key
           </h2>
@@ -33,13 +36,16 @@
             on our build server. This key is less trusted as it has no
             passphrase. We will only use this to sign things such as
             snapshot builds - all proper releases will be signed with
-            the main key given above.<br />
-            You can also download a copy
-            <a href="i-scream-autobuild.asc">here</a>.
+            the main key given above.
           </p>
           <pre>
-<!--#include virtual="i-scream-autobuild.asc" -->
+<!--#include virtual="i-scream-autobuild.key" -->
 </pre>
+          <p>
+            You can download a copy directly from
+            <a href="i-scream-autobuild.asc">here</a> or you can
+            search for it on a key server of your choice.
+          </p>
         </div>
 <!--#include virtual="/footer.inc" -->
       </div>
-- 
2.44.0