summary refs log tree commit diff
path: root/doc/guix.texi
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2019-08-07 22:26:55 +0200
committerRicardo Wurmus <rekado@elephly.net>2019-08-07 22:26:55 +0200
commit9bd1333e587c92fb3f0c12e080cb89e41713df01 (patch)
treef053e0174c052df046ef2ad320bcc5cdc8c76b01 /doc/guix.texi
parent378d94e51b00c30b19a39154278d01f1f3c4dbc1 (diff)
parent55e238f2ab24ce347047ebc7fd7c5eba62dac69d (diff)
downloadguix-9bd1333e587c92fb3f0c12e080cb89e41713df01.tar.gz
Merge remote-tracking branch 'origin/master' into wip-texlive
Diffstat (limited to 'doc/guix.texi')
-rw-r--r--doc/guix.texi20
1 files changed, 18 insertions, 2 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index cb60d5c7b7..734206a4b2 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -25510,7 +25510,7 @@ evaluates to.  As an example, @var{file} might contain a definition like this:
             %base-services))))
 
 (list (machine
-       (system %system)
+       (operating-system %system)
        (environment managed-host-environment-type)
        (configuration (machine-ssh-configuration
                        (host-name "localhost")
@@ -25530,12 +25530,28 @@ complex deployment may involve, for example, starting virtual machines through
 a Virtual Private Server (VPS) provider.  In such a case, a different
 @var{environment} type would be used.
 
+Do note that you first need to generate a key pair on the coordinator machine
+to allow the daemon to export signed archives of files from the store
+(@pxref{Invoking guix archive}).
+
+@example
+# guix archive --generate-key
+@end example
+
+@noindent
+Each target machine must authorize the key of the master machine so that it
+accepts store items it receives from the coordinator:
+
+@example
+# guix archive --authorize < coordinator-public-key.txt
+@end example
+
 @deftp {Data Type} machine
 This is the data type representing a single machine in a heterogeneous Guix
 deployment.
 
 @table @asis
-@item @code{system}
+@item @code{operating-system}
 The object of the operating system configuration to deploy.
 
 @item @code{environment}