diff options
author | Martin Castillo <castilma@uni-bremen.de> | 2018-03-15 23:40:58 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2018-03-18 00:02:05 +0100 |
commit | 985934cb218eaa44b255cfc464b11ce05f691973 (patch) | |
tree | 40372bef4d767d1605d8f3c694e6154b5d1bc8f0 | |
parent | 3c274149688472cca4f506483b82d0b7865481b3 (diff) | |
download | guix-985934cb218eaa44b255cfc464b11ce05f691973.tar guix-985934cb218eaa44b255cfc464b11ce05f691973.tar.gz |
services: openssh: Add 'accepted-environment' field.
* gnu/services/ssh.scm (<openssh-configuration>)[accepted-environment]: New field.
(openssh-config-file): Honor 'acccepted-environment'.
* doc/guix.texi (Networking Services): Document it.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r-- | doc/guix.texi | 17 | ||||
-rw-r--r-- | gnu/services/ssh.scm | 7 |
2 files changed, 24 insertions, 0 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index bcea89e07b..b768b20d6b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11158,6 +11158,23 @@ server. Alternately, one can specify the @command{sftp-server} command: `(("sftp" ,(file-append openssh "/libexec/sftp-server")))))) @end example +@item @code{accepted-environment} (default: @code{'()}) +List of strings describing which environment variables may be exported. + +Each string gets on its own line. See the @code{AcceptEnv} option in +@code{man sshd_config}. + +This example allows ssh-clients to export the @code{COLORTERM} variable. +It is set by terminal emulators, which support colors. You can use it in +your shell's ressource file to enable colors for the prompt and commands +if this variable is set. + +@example +(service openssh-service-type + (openssh-configuration + (accepted-environment '("COLORTERM")))) +@end example + @item @code{authorized-keys} (default: @code{'()}) @cindex authorized keys, SSH @cindex SSH authorized keys diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm index 301ba74041..f1d2be3f6b 100644 --- a/gnu/services/ssh.scm +++ b/gnu/services/ssh.scm @@ -302,6 +302,10 @@ The other options should be self-descriptive." (subsystems openssh-configuration-subsystems (default '(("sftp" "internal-sftp")))) + ;; list of strings + (accepted-environment openssh-configuration-accepted-environment + (default '())) + ;; list of user-name/file-like tuples (authorized-keys openssh-authorized-keys (default '())) @@ -430,6 +434,9 @@ of user-name/file-like tuples." (format port "AuthorizedKeysFile \ .ssh/authorized_keys .ssh/authorized_keys2 /etc/ssh/authorized_keys.d/%u\n") + (for-each (lambda (s) (format port "AcceptEnv ~a\n" s)) + '#$(openssh-configuration-accepted-environment config)) + (for-each (match-lambda ((name command) (format port "Subsystem\t~a\t~a\n" name command))) |