diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-05-01 22:35:09 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-05-03 23:14:13 -0400 |
| commit | 0f583f60f882d74f4cf2332c85343a2db67410c7 (patch) | |
| tree | 4b75bf6d5aa34f90bcd4e4db6da498c019fd13b4 /doc | |
| parent | 82c0f34c7e62366c415470a3fe1a6a0c46e3d946 (diff) | |
| download | guix-patches-0f583f60f882d74f4cf2332c85343a2db67410c7.tar guix-patches-0f583f60f882d74f4cf2332c85343a2db67410c7.tar.gz | |
doc: Update to cover for an additional OpenPGP signing key.
The upcoming 1.3.0 release will be signed with my OpenPGP key; subsequent
releases may also be.
* doc/guix.texi (OPENPGP-SIGNING-KEY-ID, OPENPGP-SIGNING-KEY-URL): Rename to...
(OPENPGP-SIGNING-KEY-ID-1, OPENPGP-SIGNING-KEY-URL-1): ... these,
respectively.
(OPENPGP-SIGNING-KEY-ID-2, OPENPGP-SIGNING-KEY-URL-2): New variables.
(Binary Installation): Adjust to cover for the new key.
(USB Stick and DVD Installation): Likewise.
(Invoking guix refresh): Adjust accordingly.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/guix.texi | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index ff592ce364..5cb7c2bb96 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9,9 +9,11 @@ @include version.texi -@c Identifier of the OpenPGP key used to sign tarballs and such. -@set OPENPGP-SIGNING-KEY-ID 3CE464558A84FDC69DB40CFB090B11993D9AEBB5 -@set OPENPGP-SIGNING-KEY-URL https://sv.gnu.org/people/viewgpg.php?user_id=15145 +@c Identifier of the OpenPGP keys used to sign tarballs and such. +@set OPENPGP-SIGNING-KEY-ID-1 3CE464558A84FDC69DB40CFB090B11993D9AEBB5 @c ludo +@set OPENPGP-SIGNING-KEY-URL-1 https://sv.gnu.org/people/viewgpg.php?user_id=15145 +@set OPENPGP-SIGNING-KEY-ID-2 27D586A4F8900854329FF09F1260E46482E63562 @c maxim +@set OPENPGP-SIGNING-KEY-URL-2 https://sv.gnu.org/people/viewgpg.php?user_id=127547 @c Base URL for downloads. @set BASE-URL https://ftp.gnu.org/gnu/guix @@ -653,7 +655,9 @@ If that command fails because you do not have the required public key, then run this command to import it: @example -$ wget '@value{OPENPGP-SIGNING-KEY-URL}' \ +$ wget '@value{OPENPGP-SIGNING-KEY-URL-1}' \ + -qO - | gpg --import - +$ wget '@value{OPENPGP-SIGNING-KEY-URL-2}' \ -qO - | gpg --import - @end example @@ -2123,7 +2127,9 @@ If that command fails because you do not have the required public key, then run this command to import it: @example -$ wget @value{OPENPGP-SIGNING-KEY-URL} \ +$ wget @value{OPENPGP-SIGNING-KEY-URL-1} \ + -qO - | gpg --import - +$ wget @value{OPENPGP-SIGNING-KEY-URL-2} \ -qO - | gpg --import - @end example @@ -11888,7 +11894,7 @@ Likewise, you can fetch keys to a specific keybox file like this: @example gpg --no-default-keyring --keyring mykeyring.kbx \ - --recv-keys @value{OPENPGP-SIGNING-KEY-ID} + --recv-keys @value{OPENPGP-SIGNING-KEY-ID-1} @end example @xref{GPG Configuration Options, @option{--keyring},, gnupg, Using the GNU |