diff options
author | Ludovic Courtès <ludo@gnu.org> | 2016-08-18 16:33:01 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2016-08-19 09:11:00 +0200 |
commit | 5b58c28b7e134e80a831d6849079b47f8d6abea7 (patch) | |
tree | 70dc06fd8e75b4d5b03a6c7c0a16a2264bbdd880 /doc | |
parent | c08533b2ccf37eaeedb336428c3b01a37249de06 (diff) | |
download | guix-5b58c28b7e134e80a831d6849079b47f8d6abea7.tar guix-5b58c28b7e134e80a831d6849079b47f8d6abea7.tar.gz |
services: guix: Add 'authorized-keys' configuration knob.
* gnu/services/base.scm (hydra-key-authorization): Add 'key' parameter
and honor it.
(%default-authorized-guix-keys): New variable.
(<guix-configuration>)[authorized-keys]: New field.
(guix-shepherd-service): Adjust 'match' clause accordingly.
(guix-activation): Adjust call to 'hydra-key-authorization'.
* doc/guix.texi (Base Services): Document 'authorized-keys'.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/guix.texi | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index c6b489eea5..533023854b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -7680,9 +7680,16 @@ Name of the group for build user accounts. Number of build user accounts to create. @item @code{authorize-key?} (default: @code{#t}) -Whether to authorize the substitute key for @code{hydra.gnu.org} +Whether to authorize the substitute keys listed in +@code{authorized-keys}---by default that of @code{hydra.gnu.org} (@pxref{Substitutes}). +@vindex %default-authorized-guix-keys +@item @code{authorized-keys} (default: @var{%default-authorized-guix-keys}) +The list of authorized key files for archive imports, as a list of +string-valued gexps (@pxref{Invoking guix archive}). By default, it +contains that of @code{hydra.gnu.org} (@pxref{Substitutes}). + @item @code{use-substitutes?} (default: @code{#t}) Whether to use substitutes. |