diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-11-20 17:29:54 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-11-20 17:32:34 +0100 |
| commit | 7a2b64e55c7d57707f4d1ed54ee21bf69d0d0d16 (patch) | |
| tree | 26b4270cdbbd180c0253e50310211ac29a4b1637 /doc/manual | |
| parent | ea94a87493df0a60cadba291e31bbe7c6847c0c5 (diff) | |
binary-cache-public-keys -> trusted-public-keys
The name had become a misnomer since it's not only for substitution
from binary caches, but when adding/copying any
(non-content-addressed) path to a store.
Diffstat (limited to 'doc/manual')
| -rw-r--r-- | doc/manual/command-ref/conf-file.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/manual/command-ref/conf-file.xml b/doc/manual/command-ref/conf-file.xml index fb4d8cefc..a28f70899 100644 --- a/doc/manual/command-ref/conf-file.xml +++ b/doc/manual/command-ref/conf-file.xml @@ -406,17 +406,17 @@ false</literal>.</para> <listitem><para>If set to <literal>*</literal> (the default), Nix will only download binaries if they are signed using one of the - keys listed in <option>binary-cache-public-keys</option>. Set to + keys listed in <option>trusted-public-keys</option>. Set to the empty string to disable signature checking.</para></listitem> </varlistentry> - <varlistentry><term><literal>binary-cache-public-keys</literal></term> + <varlistentry><term><literal>trusted-public-keys</literal></term> - <listitem><para>A whitespace-separated list of public keys - corresponding to the secret keys trusted to sign binary - caches. For example: + <listitem><para>A whitespace-separated list of public keys. When + paths are copied from another Nix store (such as a binary cache), + they must be signed with one of these keys. For example: <literal>cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=</literal>.</para></listitem> |