From 76287a9207ce9b0fbab7ae49f6fa405f0c1ef9ab Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 29 May 2023 18:17:29 +0300 Subject: [PATCH 1/2] distributed-builds.md: Clarify warning ssh access requirements --- doc/manual/src/advanced-topics/distributed-builds.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/manual/src/advanced-topics/distributed-builds.md b/doc/manual/src/advanced-topics/distributed-builds.md index fefd10100..8f61380e8 100644 --- a/doc/manual/src/advanced-topics/distributed-builds.md +++ b/doc/manual/src/advanced-topics/distributed-builds.md @@ -39,10 +39,11 @@ contains Nix. > **Warning** > > If you are building via the Nix daemon, it is the Nix daemon user -> account (that is, `root`) that should have SSH access to the remote +> account (that is, `root`) that should have SSH access to a user (not necessarily `root`) on the remote > machine. If you can’t or don’t want to configure `root` to be able to -> access to remote machine, you can use a private Nix store instead by -> passing e.g. `--store ~/my-nix`. +> access the remote machine, you can use a private Nix store instead by +> passing e.g. `--store ~/my-nix` when running a nix command from the +> local machine. The list of remote machines can be specified on the command line or in the Nix configuration file. The former is convenient for testing. For From e2f33e0df10062cfc6d918c9431205cb7c66be4e Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Wed, 31 May 2023 01:32:02 +0200 Subject: [PATCH 2/2] rewrap lines to use one line per sentence this makes future reviews easier as it reduces diff noise --- doc/manual/src/advanced-topics/distributed-builds.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/doc/manual/src/advanced-topics/distributed-builds.md b/doc/manual/src/advanced-topics/distributed-builds.md index 8f61380e8..73a113d35 100644 --- a/doc/manual/src/advanced-topics/distributed-builds.md +++ b/doc/manual/src/advanced-topics/distributed-builds.md @@ -38,12 +38,9 @@ contains Nix. > **Warning** > -> If you are building via the Nix daemon, it is the Nix daemon user -> account (that is, `root`) that should have SSH access to a user (not necessarily `root`) on the remote -> machine. If you can’t or don’t want to configure `root` to be able to -> access the remote machine, you can use a private Nix store instead by -> passing e.g. `--store ~/my-nix` when running a nix command from the -> local machine. +> If you are building via the Nix daemon, it is the Nix daemon user account (that is, `root`) that should have SSH access to a user (not necessarily `root`) on the remote machine. +> +> If you can’t or don’t want to configure `root` to be able to access the remote machine, you can use a private Nix store instead by passing e.g. `--store ~/my-nix` when running a Nix command from the local machine. The list of remote machines can be specified on the command line or in the Nix configuration file. The former is convenient for testing. For