From 42f0f7e4fa4ae9e521b091baf83e5504ef0b1e3f Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Tue, 17 Oct 2017 15:20:12 +0200
Subject: [PATCH] docs: Document PGP keys used to sign tarballs

Closes #5635
---
 docs/appendices/compiling.rst                   |  5 +----
 docs/common/tarball-pgp-keys.rst                |  6 ++++++
 pdns/dnsdistdist/docs/install.rst               | 13 +++++++++++--
 pdns/recursordist/docs/appendices/compiling.rst | 14 ++++++++++++++
 4 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 docs/common/tarball-pgp-keys.rst

diff --git a/docs/appendices/compiling.rst b/docs/appendices/compiling.rst
index a185dcc08..8d5c8f502 100644
--- a/docs/appendices/compiling.rst
+++ b/docs/appendices/compiling.rst
@@ -31,10 +31,7 @@ You can also download snapshot tarballs `here <https://downloads.powerdns.com/au
 You can also download releases on the `website <https://downloads.powerdns.com/releases/>`__.
 These releases are PGP-signed with one of these key-ids:
 
-* `FBAE 0323 821C 7706 A5CA 151B DCF5 13FA 7EED 19F3 <https://pgp.mit.edu/pks/lookup?op=get&search=0xDCF513FA7EED19F3>`_
-* `1628 90D0 689D D12D D33E 4696 1C5E E990 D2E7 1575 <https://pgp.mit.edu/pks/lookup?op=get&search=0x1C5EE990D2E71575>`_
-* `B76C D467 1C09 68BA A87D E61C 5E50 715B F2FF E1A7 <https://pgp.mit.edu/pks/lookup?op=get&search=0x5E50715BF2FFE1A7>`_
-* `16E1 2866 B773 8C73 976A 5743 6FFC 3343 9B0D 04DF <https://pgp.mit.edu/pks/lookup?op=get&search=0x6FFC33439B0D04DF>`_
+.. include:: ../common/tarball-pgp-keys.rst
 
 Dependencies
 ------------
diff --git a/docs/common/tarball-pgp-keys.rst b/docs/common/tarball-pgp-keys.rst
new file mode 100644
index 000000000..f35bee694
--- /dev/null
+++ b/docs/common/tarball-pgp-keys.rst
@@ -0,0 +1,6 @@
+* `FBAE 0323 821C 7706 A5CA 151B DCF5 13FA 7EED 19F3 <https://pgp.mit.edu/pks/lookup?op=get&search=0xDCF513FA7EED19F3>`_
+* `1628 90D0 689D D12D D33E 4696 1C5E E990 D2E7 1575 <https://pgp.mit.edu/pks/lookup?op=get&search=0x1C5EE990D2E71575>`_
+* `B76C D467 1C09 68BA A87D E61C 5E50 715B F2FF E1A7 <https://pgp.mit.edu/pks/lookup?op=get&search=0x5E50715BF2FFE1A7>`_
+* `16E1 2866 B773 8C73 976A 5743 6FFC 3343 9B0D 04DF <https://pgp.mit.edu/pks/lookup?op=get&search=0x6FFC33439B0D04DF>`_
+
+There is a PGP keyblock with these keys available on `http://powerdns.com/powerdns-keyblock.asc <https://powerdns.com/powerdns-keyblock.asc>`_.
diff --git a/pdns/dnsdistdist/docs/install.rst b/pdns/dnsdistdist/docs/install.rst
index d81ae4856..5aef590e4 100644
--- a/pdns/dnsdistdist/docs/install.rst
+++ b/pdns/dnsdistdist/docs/install.rst
@@ -59,7 +59,16 @@ installed to have :program:`dnsdist` support ``systemd-notify``.
 From tarball
 ~~~~~~~~~~~~
 
-Release tarballs are available `from the downloads site <https://downloads.powerdns.com/releases>`_ and snapshot and pre-release tarballs `can be found as well <https://downloads.powerdns.com/autobuilt/dnsdist/dist/>`_.
+Release tarballs are available `from the downloads site <https://downloads.powerdns.com/releases>`_, snapshot and pre-release tarballs `can be found as well <https://downloads.powerdns.com/autobuilt/dnsdist/dist/>`_.
+
+The release tarballs have detached PGP signatures, signed by on these PGP keys:
+
+* `FBAE 0323 821C 7706 A5CA 151B DCF5 13FA 7EED 19F3 <https://pgp.mit.edu/pks/lookup?op=get&search=0xDCF513FA7EED19F3>`_
+* `1628 90D0 689D D12D D33E 4696 1C5E E990 D2E7 1575 <https://pgp.mit.edu/pks/lookup?op=get&search=0x1C5EE990D2E71575>`_
+* `B76C D467 1C09 68BA A87D E61C 5E50 715B F2FF E1A7 <https://pgp.mit.edu/pks/lookup?op=get&search=0x5E50715BF2FFE1A7>`_
+* `16E1 2866 B773 8C73 976A 5743 6FFC 3343 9B0D 04DF <https://pgp.mit.edu/pks/lookup?op=get&search=0x6FFC33439B0D04DF>`_
+
+There is a PGP keyblock with these keys available on `http://powerdns.com/powerdns-keyblock.asc <https://powerdns.com/powerdns-keyblock.asc>`_.
 
 * Untar the tarball and ``cd`` into the source directory
 * Run ``./configure``
@@ -88,4 +97,4 @@ dnsdist sourcecode lives in the `PowerDNS git repository <https://github.com/Pow
 OS Specific Instructions
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-
+None, really.
diff --git a/pdns/recursordist/docs/appendices/compiling.rst b/pdns/recursordist/docs/appendices/compiling.rst
index 3af5972b0..22abd9283 100644
--- a/pdns/recursordist/docs/appendices/compiling.rst
+++ b/pdns/recursordist/docs/appendices/compiling.rst
@@ -9,6 +9,20 @@ As the PowerDNS Recursor is distributed with a configure script, compiling it is
   make
   make install
 
+Getting the sources
+-------------------
+
+There are 3 ways of getting the source.
+
+If you want the bleeding edge, you can clone the `repository at GitHub <https://github.com/PowerDNS/pdns>`__ and run ``./bootstrap`` in the ``pdns/recursordist`` directory of the clone.
+
+You can also download snapshot tarballs `here <https://downloads.powerdns.com/autobuilt_browser/#/recursor>`__.
+
+You can also download releases on the `website <https://downloads.powerdns.com/releases/>`__.
+These releases are PGP-signed with one of these key-ids:
+
+.. include:: ../common/tarball-pgp-keys.rst
+
 Dependencies
 ------------
 
-- 
2.50.1