aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-07-31 18:56:22 -0400
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-07-31 18:56:22 -0400
commit4d1b64f118cf6ebcbf530bea4a3c531704d7d6ba (patch)
tree07a51356c5c580d76aec2e8c7edef26f8fcc1359 /doc
parenteb7849e3a281511a59abf72ae5c3133f903bbaab (diff)
Allow daemon users to override ‘binary-caches’
For security reasons, daemon users can only specify caches that appear in the ‘binary-caches’ and ‘trusted-binary-caches’ options in nix.conf.
Diffstat (limited to 'doc')
-rw-r--r--doc/manual/conf-file.xml13
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/manual/conf-file.xml b/doc/manual/conf-file.xml
index c19e44ebf..c09d46206 100644
--- a/doc/manual/conf-file.xml
+++ b/doc/manual/conf-file.xml
@@ -329,6 +329,19 @@ build-use-chroot = /dev /proc /bin</programlisting>
</varlistentry>
+ <varlistentry><term><literal>trusted-binary-caches</literal></term>
+
+ <listitem><para>A list of URLs of binary caches, separated by
+ whitespace. These are not used by default, but can be enabled by
+ users of the Nix daemon by specifying <literal>--option
+ binary-caches <replaceable>urls</replaceable></literal> on the
+ command line. Daemon users are only allowed to pass a subset of
+ the URLs listed in <literal>binary-caches</literal> and
+ <literal>trusted-binary-caches</literal>.</para></listitem>
+
+ </varlistentry>
+
+
<varlistentry><term><literal>binary-caches-parallel-connections</literal></term>
<listitem><para>The maximum number of parallel HTTP connections