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 20:37:55 -0400 |
| commit | b9fb13b28437a254683273094f189396a6e1421d (patch) | |
| tree | fd9293e9e51351ec975af13003be482a4d0f2660 /doc | |
| parent | d260bd51b58e2410e997b7e221b6698067b0d3f4 (diff) | |
| download | guix-patches-b9fb13b28437a254683273094f189396a6e1421d.tar guix-patches-b9fb13b28437a254683273094f189396a6e1421d.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 | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index dbea5cadcb..5ce09eca09 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 @@ -650,11 +652,13 @@ $ wget @value{BASE-URL}/guix-binary-@value{VERSION}.x86_64-linux.tar.xz.sig $ gpg --verify guix-binary-@value{VERSION}.x86_64-linux.tar.xz.sig @end example -If that command fails because you do not have the required public key, -then run this command to import it: +If that command fails because you do not have the required public keys, +then run these commands to import them: @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 @@ -2120,11 +2124,13 @@ $ wget @value{BASE-URL}/guix-system-install-@value{VERSION}.x86_64-linux.iso.xz. $ gpg --verify guix-system-install-@value{VERSION}.x86_64-linux.iso.xz.sig @end example -If that command fails because you do not have the required public key, -then run this command to import it: +If that command fails because you do not have the required public keys, +then run these commands to import them: @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 @@ -11913,7 +11919,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 |