aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/globals.hh
diff options
context:
space:
mode:
authorValentin Gagarin <valentin.gagarin@tweag.io>2023-03-05 02:36:26 +0100
committerValentin Gagarin <valentin.gagarin@tweag.io>2023-06-15 02:19:13 +0200
commite09b40e0d0b68ca7c3646ddffb50e1356daec997 (patch)
tree7a323a0172f9fb08053f630a914add56bb86acef /src/libstore/globals.hh
parent946cd9e3f91c273e8124390c1dac9c0f0a538b8c (diff)
reword documentation on trusted users and substituters
this is to make it slightly easier to scan over
Diffstat (limited to 'src/libstore/globals.hh')
-rw-r--r--src/libstore/globals.hh14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index 820898350..b0c025c8e 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -700,8 +700,8 @@ public:
At least one of the following conditions must be met for Nix to use a substituter:
- - the substituter is in the [`trusted-substituters`](#conf-trusted-substituters) list
- - the user calling Nix is in the [`trusted-users`](#conf-trusted-users) list
+ - The substituter is in the [`trusted-substituters`](#conf-trusted-substituters) list
+ - The user calling Nix is in the [`trusted-users`](#conf-trusted-users) list
In addition, each store path should be trusted as described in [`trusted-public-keys`](#conf-trusted-public-keys)
)",
@@ -710,12 +710,10 @@ public:
Setting<StringSet> trustedSubstituters{
this, {}, "trusted-substituters",
R"(
- A list of [URLs of Nix stores](@docroot@/command-ref/new-cli/nix3-help-stores.md#store-url-format),
- separated by whitespace. These are
- not used by default, but can be enabled by users of the Nix daemon
- by specifying `--option substituters urls` on the command
- line. Unprivileged users are only allowed to pass a subset of the
- URLs listed in `substituters` and `trusted-substituters`.
+ A list of [URLs of Nix stores](@docroot@/command-ref/new-cli/nix3-help-stores.md#store-url-format), separated by whitespace.
+ These are not used by default, but can be enabled by users of the Nix daemon by specifying [`substituters`](#conf-substituters).
+
+ Unprivileged users are only allowed to pass as `substituters` only those URLs listed in `trusted-substituters`.
)",
{"trusted-binary-caches"}};