nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

services: openssh: Install OpenSSH in the system profile. 

This ensures one can scp to or from the GuixSD machine that uses the
service.

* gnu/services/ssh.scm (openssh-service-type)[extensions]: Add
PROFILE-SERVICE-TYPE extension.
* gnu/system/examples/bare-bones.tmpl <packages>: Remove OPENSSH.
* doc/guix.texi (Using the Configuration System): Adjust accordingly.
This commit is contained in:
Ludovic Courtès 2018-11-24 16:07:30 +01:00
parent 608d3dca89
commit 0c17f72070
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/guix.texi
View File

@ -9727,9 +9727,9 @@ environment variable---in addition to the per-user profiles
provides all the tools one would expect for basic user and administrator provides all the tools one would expect for basic user and administrator
tasks---including the GNU Core Utilities, the GNU Networking Utilities, tasks---including the GNU Core Utilities, the GNU Networking Utilities,
the GNU Zile lightweight text editor, @command{find}, @command{grep}, the GNU Zile lightweight text editor, @command{find}, @command{grep},
etc. The example above adds GNU@tie{}Screen and OpenSSH to those, etc. The example above adds GNU@tie{}Screen to those,
taken from the @code{(gnu packages screen)} and @code{(gnu packages ssh)} taken from the @code{(gnu packages screen)}
modules (@pxref{Package Modules}). The module (@pxref{Package Modules}). The
@code{(list package output)} syntax can be used to add a specific output @code{(list package output)} syntax can be used to add a specific output
of a package: of a package:

10
gnu/services/ssh.scm
View File

@ -518,7 +518,15 @@ of user-name/file-like tuples."
(service-extension activation-service-type (service-extension activation-service-type
openssh-activation) openssh-activation)
(service-extension account-service-type (service-extension account-service-type
(const %openssh-accounts)))) (const %openssh-accounts))
;; Install OpenSSH in the system profile. That way,
;; 'scp' is found when someone tries to copy to or from
;; this machine.
(service-extension profile-service-type
(lambda (config)
(list (openssh-configuration-openssh
config))))))
(compose concatenate) (compose concatenate)
(extend extend-openssh-authorized-keys) (extend extend-openssh-authorized-keys)
(default-value (openssh-configuration)))) (default-value (openssh-configuration))))

4
gnu/system/examples/bare-bones.tmpl
View File

@ -3,7 +3,7 @@
(use-modules (gnu)) (use-modules (gnu))
(use-service-modules networking ssh) (use-service-modules networking ssh)
(use-package-modules screen ssh) (use-package-modules screen)
(operating-system (operating-system
(host-name "komputilo") (host-name "komputilo")
@ -40,7 +40,7 @@
%base-user-accounts)) %base-user-accounts))
;; Globally-installed packages. ;; Globally-installed packages.
(packages (cons* screen openssh %base-packages)) (packages (cons screen %base-packages))
;; Add services to the baseline: a DHCP client and ;; Add services to the baseline: a DHCP client and
;; an SSH server. ;; an SSH server.