From 346a632144b89f45b3966732edacc2bfa07126a7 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Sat, 28 Jul 2018 02:50:06 -0700 Subject: doc: Clarify some of guix-daemon's GC options. Reported by Pierre Neidhardt . * doc/guix.texi (Invoking guix-daemon): Fix an incorrect statement regarding --gc-keep-outputs. Add a little to the description of this option and --gc-keep-derivations. --- doc/guix.texi | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'doc/guix.texi') diff --git a/doc/guix.texi b/doc/guix.texi index 2df4064524..19c9813f6a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -1375,8 +1375,8 @@ derivations. @cindex garbage collector roots When set to ``yes'', the GC will keep the outputs of any live derivation available in the store---the @code{.drv} files. The default is ``no'', -meaning that derivation outputs are kept only if they are GC roots. -@xref{Invoking guix gc}, for more on GC roots. +meaning that derivation outputs are kept only if they are reachable from a GC +root. @xref{Invoking guix gc}, for more on GC roots. @item --gc-keep-derivations[=yes|no] Tell whether the garbage collector (GC) must keep derivations @@ -1387,12 +1387,13 @@ derivations---i.e., @code{.drv} files---as long as at least one of their outputs is live. This allows users to keep track of the origins of items in their store. Setting it to ``no'' saves a bit of disk space. -Note that when both @code{--gc-keep-derivations} and -@code{--gc-keep-outputs} are used, the effect is to keep all the build -prerequisites (the sources, compiler, libraries, and other build-time -tools) of live objects in the store, regardless of whether these -prerequisites are live. This is convenient for developers since it -saves rebuilds or downloads. +In this way, setting @code{--gc-keep-derivations} to ``yes'' causes liveness +to flow from outputs to derivations, and setting @code{--gc-keep-outputs} to +``yes'' causes liveness to flow from derivations to outputs. When both are +set to ``yes'', the effect is to keep all the build prerequisites (the +sources, compiler, libraries, and other build-time tools) of live objects in +the store, regardless of whether these prerequisites are reachable from a GC +root. This is convenient for developers since it saves rebuilds or downloads. @item --impersonate-linux-2.6 On Linux-based systems, impersonate Linux 2.6. This means that the -- cgit 1.4.1 From 5b6823907216d6c6c98fdb962f2005f154328878 Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Tue, 24 Jul 2018 16:19:40 -0500 Subject: services: openssh: Add forwarding options. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/ssh.scm ()[allow-agent-forwarding?] [allow-tcp-forwarding?, gateway-ports?]: New fields. (openssh-config-file): Handle them. * doc/guix.texi (Networking Services): Adjust accordingly. Signed-off-by: Ludovic Courtès --- doc/guix.texi | 9 +++++++++ gnu/services/ssh.scm | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) (limited to 'doc/guix.texi') diff --git a/doc/guix.texi b/doc/guix.texi index 19c9813f6a..d5588066bb 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11650,6 +11650,15 @@ When true, forwarding of X11 graphical client connections is enabled---in other words, @command{ssh} options @option{-X} and @option{-Y} will work. +@item @code{allow-agent-forwarding?} (default: @code{#t}) +Whether to allow agent forwarding. + +@item @code{allow-tcp-forwarding?} (default: @code{#t}) +Whether to allow TCP forwarding. + +@item @code{gateway-ports?} (default: @code{#f}) +Whether to allow gateway ports. + @item @code{challenge-response-authentication?} (default: @code{#f}) Specifies whether challenge response authentication is allowed (e.g. via PAM). diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm index f158fdf01f..dd96ad6aec 100644 --- a/gnu/services/ssh.scm +++ b/gnu/services/ssh.scm @@ -289,6 +289,19 @@ The other options should be self-descriptive." ;; Boolean (x11-forwarding? openssh-configuration-x11-forwarding? (default #f)) + + ;; Boolean + (allow-agent-forwarding? openssh-configuration-allow-agent-forwarding? + (default #t)) + + ;; Boolean + (allow-tcp-forwarding? openssh-configuration-allow-tcp-forwarding? + (default #t)) + + ;; Boolean + (gateway-ports? openssh-configuration-gateway-ports? + (default #f)) + ;; Boolean (challenge-response-authentication? openssh-challenge-response-authentication? (default #f)) @@ -418,6 +431,15 @@ of user-name/file-like tuples." (format port "X11Forwarding ~a\n" #$(if (openssh-configuration-x11-forwarding? config) "yes" "no")) + (format port "AllowAgentForwarding ~a\n" + #$(if (openssh-configuration-allow-agent-forwarding? config) + "yes" "no")) + (format port "AllowTcpForwarding ~a\n" + #$(if (openssh-configuration-allow-tcp-forwarding? config) + "yes" "no")) + (format port "GatewayPorts ~a\n" + #$(if (openssh-configuration-gateway-ports? config) + "yes" "no")) (format port "PidFile ~a\n" #$(openssh-configuration-pid-file config)) (format port "ChallengeResponseAuthentication ~a\n" -- cgit 1.4.1 From 4bfa256ca1ba4cd5539d0c5956b36ed423683d52 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Mon, 30 Jul 2018 21:44:51 +0200 Subject: doc: Fix Cuirass URL. * doc/guix.texi (Continuous Integration): Fix Cuirass URL. --- doc/guix.texi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc/guix.texi') diff --git a/doc/guix.texi b/doc/guix.texi index d5588066bb..080b091b31 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -17688,9 +17688,9 @@ If it is @code{#f} then the daemon will use the host's fully qualified domain na @subsubsection Continuous Integration @cindex continuous integration -@uref{https://notabug.org/mthl/cuirass, Cuirass} is a continuous -integration tool for Guix. It can be used both for development and for -providing substitutes to others (@pxref{Substitutes}). +@uref{https://git.savannah.gnu.org/cgit/guix/guix-cuirass.git, Cuirass} is a +continuous integration tool for Guix. It can be used both for development and +for providing substitutes to others (@pxref{Substitutes}). The @code{(gnu services cuirass)} module provides the following service. -- cgit 1.4.1