2014-06-30 20:33:48 +00:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
2023-05-20 13:41:07 +00:00
|
|
|
|
;;; Copyright © 2014-2019, 2022, 2023 Ludovic Courtès <ludo@gnu.org>
|
2016-07-13 16:13:12 +00:00
|
|
|
|
;;; Copyright © 2016 David Craven <david@craven.ch>
|
2016-08-05 13:20:15 +00:00
|
|
|
|
;;; Copyright © 2016 Julien Lepiller <julien@lepiller.eu>
|
2017-01-24 22:50:33 +00:00
|
|
|
|
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
|
2019-01-17 16:53:57 +00:00
|
|
|
|
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
|
2020-05-05 07:31:11 +00:00
|
|
|
|
;;; Copyright © 2020 pinoaffe <pinoaffe@airmail.cc>
|
2020-09-28 20:52:51 +00:00
|
|
|
|
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
|
2021-06-20 13:15:55 +00:00
|
|
|
|
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
|
|
|
|
|
;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
2014-06-30 20:33:48 +00:00
|
|
|
|
;;;
|
|
|
|
|
;;; This file is part of GNU Guix.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
|
|
|
;;; under the terms of the GNU General Public License as published by
|
|
|
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
|
|
|
;;; your option) any later version.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
|
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;;; GNU General Public License for more details.
|
|
|
|
|
;;;
|
|
|
|
|
;;; You should have received a copy of the GNU General Public License
|
|
|
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
(define-module (gnu services ssh)
|
2016-07-13 16:13:12 +00:00
|
|
|
|
#:use-module (gnu packages ssh)
|
2016-08-05 13:20:15 +00:00
|
|
|
|
#:use-module (gnu packages admin)
|
2014-06-30 20:33:48 +00:00
|
|
|
|
#:use-module (gnu services)
|
2016-01-27 12:45:01 +00:00
|
|
|
|
#:use-module (gnu services shepherd)
|
2020-09-28 20:52:51 +00:00
|
|
|
|
#:use-module (gnu services web)
|
2015-11-03 17:08:47 +00:00
|
|
|
|
#:use-module (gnu system pam)
|
2016-08-05 13:20:15 +00:00
|
|
|
|
#:use-module (gnu system shadow)
|
2021-06-20 13:15:55 +00:00
|
|
|
|
#:use-module (guix deprecation)
|
2016-07-13 16:13:12 +00:00
|
|
|
|
#:use-module (guix gexp)
|
|
|
|
|
#:use-module (guix records)
|
2017-07-25 13:27:58 +00:00
|
|
|
|
#:use-module (guix modules)
|
2017-07-30 14:03:43 +00:00
|
|
|
|
#:use-module (srfi srfi-1)
|
2015-11-27 21:46:27 +00:00
|
|
|
|
#:use-module (srfi srfi-26)
|
2016-08-05 13:20:15 +00:00
|
|
|
|
#:use-module (ice-9 match)
|
2021-10-29 16:25:24 +00:00
|
|
|
|
#:use-module (ice-9 vlist)
|
2016-07-19 13:19:14 +00:00
|
|
|
|
#:export (lsh-configuration
|
|
|
|
|
lsh-configuration?
|
2023-02-25 18:57:58 +00:00
|
|
|
|
lsh-service ; deprecated
|
2016-07-19 13:19:14 +00:00
|
|
|
|
lsh-service-type
|
2016-07-13 16:13:12 +00:00
|
|
|
|
|
2016-08-05 13:20:15 +00:00
|
|
|
|
openssh-configuration
|
|
|
|
|
openssh-configuration?
|
2023-05-17 20:30:43 +00:00
|
|
|
|
openssh-configuration-openssh
|
|
|
|
|
openssh-configuration-pid-file
|
|
|
|
|
openssh-configuration-port-number
|
|
|
|
|
openssh-configuration-max-connections
|
|
|
|
|
openssh-configuration-permit-root-login
|
|
|
|
|
openssh-configuration-allow-empty-passwords?
|
|
|
|
|
openssh-configuration-password-authentication?
|
|
|
|
|
openssh-configuration-public-key-authentication?
|
|
|
|
|
openssh-configuration-x11-forwarding?
|
|
|
|
|
openssh-configuration-allow-agent-forwarding?
|
|
|
|
|
openssh-configuration-allow-tcp-forwarding?
|
|
|
|
|
openssh-configuration-gateway-ports?
|
2023-05-18 01:45:08 +00:00
|
|
|
|
openssh-configuration-challenge-response-authentication?
|
2023-05-17 20:30:43 +00:00
|
|
|
|
openssh-configuration-use-pam?
|
|
|
|
|
openssh-configuration-print-last-log?
|
|
|
|
|
openssh-configuration-subsystems
|
|
|
|
|
openssh-configuration-accepted-environment
|
|
|
|
|
openssh-configuration-log-level
|
|
|
|
|
openssh-configuration-extra-content
|
|
|
|
|
openssh-configuration-authorized-keys
|
|
|
|
|
openssh-configuration-generate-host-keys?
|
2016-08-05 13:20:15 +00:00
|
|
|
|
openssh-service-type
|
|
|
|
|
|
2016-07-13 16:13:12 +00:00
|
|
|
|
dropbear-configuration
|
|
|
|
|
dropbear-configuration?
|
|
|
|
|
dropbear-service-type
|
2023-02-25 18:57:59 +00:00
|
|
|
|
dropbear-service ; deprecated
|
2020-05-05 07:31:11 +00:00
|
|
|
|
|
|
|
|
|
autossh-configuration
|
|
|
|
|
autossh-configuration?
|
2020-09-28 20:52:51 +00:00
|
|
|
|
autossh-service-type
|
|
|
|
|
|
|
|
|
|
webssh-configuration
|
|
|
|
|
webssh-configuration?
|
|
|
|
|
webssh-service-type
|
|
|
|
|
%webssh-configuration-nginx))
|
2014-06-30 20:33:48 +00:00
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
;;;
|
|
|
|
|
;;; This module implements secure shell (SSH) services.
|
|
|
|
|
;;;
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 21:44:26 +00:00
|
|
|
|
(define-record-type* <lsh-configuration>
|
|
|
|
|
lsh-configuration make-lsh-configuration
|
|
|
|
|
lsh-configuration?
|
|
|
|
|
(lsh lsh-configuration-lsh
|
|
|
|
|
(default lsh))
|
2023-02-25 18:57:58 +00:00
|
|
|
|
(daemonic? lsh-configuration-daemonic?
|
|
|
|
|
(default #t))
|
|
|
|
|
(host-key lsh-configuration-host-key
|
|
|
|
|
(default "/etc/lsh/host-key"))
|
|
|
|
|
(interfaces lsh-configuration-interfaces
|
|
|
|
|
(default '()))
|
|
|
|
|
(port-number lsh-configuration-port-number
|
|
|
|
|
(default 22))
|
|
|
|
|
(allow-empty-passwords? lsh-configuration-allow-empty-passwords?
|
|
|
|
|
(default #f))
|
|
|
|
|
(root-login? lsh-configuration-root-login?
|
|
|
|
|
(default #f))
|
|
|
|
|
(syslog-output? lsh-configuration-syslog-output?
|
|
|
|
|
(default #t))
|
|
|
|
|
(pid-file? lsh-configuration-pid-file?
|
|
|
|
|
(default #f))
|
|
|
|
|
(pid-file lsh-configuration-pid-file
|
|
|
|
|
(default "/var/run/lshd.pid"))
|
|
|
|
|
(x11-forwarding? lsh-configuration-x11-forwarding?
|
|
|
|
|
(default #t))
|
|
|
|
|
(tcp/ip-forwarding? lsh-configuration-tcp/ip-forwarding?
|
|
|
|
|
(default #t))
|
|
|
|
|
(password-authentication? lsh-configuration-password-authentication?
|
|
|
|
|
(default #t))
|
|
|
|
|
(public-key-authentication? lsh-configuration-public-key-authentication?
|
|
|
|
|
(default #t))
|
|
|
|
|
(initialize? lsh-configuration-initialize?
|
|
|
|
|
(default #t)))
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 21:44:26 +00:00
|
|
|
|
|
2014-06-30 20:33:48 +00:00
|
|
|
|
(define %yarrow-seed
|
|
|
|
|
"/var/spool/lsh/yarrow-seed-file")
|
|
|
|
|
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 21:44:26 +00:00
|
|
|
|
(define (lsh-initialization lsh host-key)
|
|
|
|
|
"Return the gexp to initialize the LSH service for HOST-KEY."
|
2014-06-30 20:33:48 +00:00
|
|
|
|
#~(begin
|
|
|
|
|
(unless (file-exists? #$%yarrow-seed)
|
|
|
|
|
(system* (string-append #$lsh "/bin/lsh-make-seed")
|
|
|
|
|
"--sloppy" "-o" #$%yarrow-seed))
|
|
|
|
|
|
|
|
|
|
(unless (file-exists? #$host-key)
|
|
|
|
|
(mkdir-p (dirname #$host-key))
|
|
|
|
|
(format #t "creating SSH host key '~a'...~%" #$host-key)
|
|
|
|
|
|
|
|
|
|
;; FIXME: We're just doing a simple pipeline, but 'system' cannot be
|
|
|
|
|
;; used yet because /bin/sh might be dangling; factorize this somehow.
|
|
|
|
|
(let* ((in+out (pipe))
|
|
|
|
|
(keygen (primitive-fork)))
|
|
|
|
|
(case keygen
|
|
|
|
|
((0)
|
|
|
|
|
(close-port (car in+out))
|
|
|
|
|
(close-fdes 1)
|
|
|
|
|
(dup2 (fileno (cdr in+out)) 1)
|
|
|
|
|
(execl (string-append #$lsh "/bin/lsh-keygen")
|
|
|
|
|
"lsh-keygen" "--server"))
|
|
|
|
|
(else
|
|
|
|
|
(let ((write-key (primitive-fork)))
|
|
|
|
|
(case write-key
|
|
|
|
|
((0)
|
|
|
|
|
(close-port (cdr in+out))
|
|
|
|
|
(close-fdes 0)
|
|
|
|
|
(dup2 (fileno (car in+out)) 0)
|
|
|
|
|
(execl (string-append #$lsh "/bin/lsh-writekey")
|
|
|
|
|
"lsh-writekey" "--server" "-o" #$host-key))
|
|
|
|
|
(else
|
|
|
|
|
(close-port (car in+out))
|
|
|
|
|
(close-port (cdr in+out))
|
|
|
|
|
(waitpid keygen)
|
|
|
|
|
(waitpid write-key))))))))))
|
|
|
|
|
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 21:44:26 +00:00
|
|
|
|
(define (lsh-activation config)
|
|
|
|
|
"Return the activation gexp for CONFIG."
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (guix build utils))
|
|
|
|
|
(mkdir-p "/var/spool/lsh")
|
|
|
|
|
#$(if (lsh-configuration-initialize? config)
|
|
|
|
|
(lsh-initialization (lsh-configuration-lsh config)
|
|
|
|
|
(lsh-configuration-host-key config))
|
|
|
|
|
#t)))
|
|
|
|
|
|
services: Rename 'dmd' services to 'shepherd'.
* gnu/services/shepherd.scm (dmd-root-service-type, %dmd-root-service)
(dmd-service-type, <dmd-service>, dmd-service, dmd-service?)
(make-dmd-service, dmd-service-documentation, dmd-service-provision)
(dmd-service-requirement, dmd-service-respawn, dmd-service-start)
(dmd-service-stop, dmd-service-auto-start?, dmd-service-modules)
(dmd-service-imported-modules, dmd-service-file-name, dmd-service-file)
(dmd-service-back-edges): Rename to...
(shepherd-root-service-type, %shepherd-root-service, shepherd-service-type)
(<shepherd-service>, shepherd-service, shepherd-service?)
(make-shepherd-service, shepherd-service-documentation)
(shepherd-service-provision, shepherd-service-requirement)
(shepherd-service-respawn, shepherd-service-start)
(shepherd-service-stop, shepherd-service-auto-start?)
(shepherd-service-modules, shepherd-service-imported-modules)
(shepherd-service-file-name, shepherd-service-file)
(shepherd-service-back-edges): ...this
* gnu/services.scm: Adjust comments.
* gnu/services/avahi.scm (avahi-dmd-service): Rename to...
(avahi-shepherd-service): ... this.
* gnu/services/base.scm (%root-file-system-dmd-service)
(file-system->dmd-service-name, mapped-device->dmd-service-name)
(dependency->dmd-service-name, file-system-dmd-service)
(mingetty-dmd-service, nscd-dmd-service, guix-dmd-service)
(guix-publish-dmd-service, udev-dmd-service, gpm-dmd-service): Rename to...
(%root-file-system-shepherd-service)
(file-system->shepherd-service-name, mapped-device->shepherd-service-name)
(dependency->shepherd-service-name, file-system-shepherd-service)
(mingetty-shepherd-service, nscd-shepherd-service, guix-shepherd-service)
(guix-publish-shepherd-service, udev-shepherd-service)
(gpm-shepherd-service): ... this.
* gnu/services/databases.scm (postgresql-dmd-service): Rename to...
(postgresql-shepherd-service): ... this.
* gnu/services/desktop.scm (upower-dmd-service, elogind-dmd-service):
Rename to...
(upower-shepherd-service, elogind-shepherd-service): ... this.
* gnu/services/dbus.scm (dbus-dmd-service): Rename to...
(dbus-shepherd-service): ... this.
* gnu/services/lirc.scm (lirc-dmd-service): Rename to...
(lirc-shepherd-service): ... this.
* gnu/services/mail.scm (dovecot-dmd-service): Rename to...
(dovecot-shepherd-service): ... this.
* gnu/services/networking.scm (ntp-dmd-service, tor-dmd-service)
(bitlbee-dmd-service, wicd-dmd-service, network-manager-dmd-service): Rename to...
(dbus-shepherd-service): ... this.
* gnu/services/ssh.scm (lsh-dmd-service): Rename to...
(lsh-shepherd-service): ... this.
* gnu/services/web.scm (nginx-dmd-service): Rename to...
(nginx-shepherd-service): ... this.
* gnu/services/xorg.scm (slim-dmd-service): Rename to...
(slim-shepherd-service): ... this.
* gnu/system.scm (essential-services): Use '%shepherd-root-service'.
* gnu/system/install.scm (cow-store-service-type): Adjust accordingly.
* guix/scripts/system.scm (dmd-service-node-label, dmd-service-node-type)
(export-dmd-graph): Likewise.
* tests/guix-system.sh: Likewise.
* tests/services.scm ("dmd-service-back-edges"): Rename to...
("shepherd-service-back-edges"): Adjust accordingly.
* doc/guix.texi: Likewise.
* doc/images/service-graph.dot: Use 'shepherd' service name.
2016-01-27 20:02:31 +00:00
|
|
|
|
(define (lsh-shepherd-service config)
|
|
|
|
|
"Return a <shepherd-service> for lsh with CONFIG."
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 21:44:26 +00:00
|
|
|
|
(define lsh (lsh-configuration-lsh config))
|
|
|
|
|
(define pid-file (lsh-configuration-pid-file config))
|
|
|
|
|
(define pid-file? (lsh-configuration-pid-file? config))
|
|
|
|
|
(define daemonic? (lsh-configuration-daemonic? config))
|
|
|
|
|
(define interfaces (lsh-configuration-interfaces config))
|
|
|
|
|
|
|
|
|
|
(define lsh-command
|
|
|
|
|
(append
|
system: Use 'file-append' to denote file names.
* gnu/services/avahi.scm, gnu/services/base.scm,
gnu/services/databases.scm, gnu/services/dbus.scm,
gnu/services/desktop.scm, gnu/services/dict.scm,
gnu/services/mail.scm, gnu/services/networking.scm,
gnu/services/sddm.scm, gnu/services/spice.scm,
gnu/services/ssh.scm, gnu/services/web.scm,
gnu/services/xorg.scm, gnu/system.scm: Replace the
#~(string-append #$pkg "/bin/foo") idiom with
(file-append pkg "/bin/foo").
2016-09-10 10:03:47 +00:00
|
|
|
|
(cons (file-append lsh "/sbin/lshd")
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 21:44:26 +00:00
|
|
|
|
(if daemonic?
|
|
|
|
|
(let ((syslog (if (lsh-configuration-syslog-output? config)
|
|
|
|
|
'()
|
|
|
|
|
(list "--no-syslog"))))
|
|
|
|
|
(cons "--daemonic"
|
|
|
|
|
(if pid-file?
|
|
|
|
|
(cons #~(string-append "--pid-file=" #$pid-file)
|
|
|
|
|
syslog)
|
|
|
|
|
(cons "--no-pid-file" syslog))))
|
|
|
|
|
(if pid-file?
|
|
|
|
|
(list #~(string-append "--pid-file=" #$pid-file))
|
|
|
|
|
'())))
|
|
|
|
|
(cons* #~(string-append "--host-key="
|
|
|
|
|
#$(lsh-configuration-host-key config))
|
|
|
|
|
#~(string-append "--password-helper=" #$lsh "/sbin/lsh-pam-checkpw")
|
|
|
|
|
#~(string-append "--subsystems=sftp=" #$lsh "/sbin/sftp-server")
|
|
|
|
|
"-p" (number->string (lsh-configuration-port-number config))
|
|
|
|
|
(if (lsh-configuration-password-authentication? config)
|
|
|
|
|
"--password" "--no-password")
|
|
|
|
|
(if (lsh-configuration-public-key-authentication? config)
|
|
|
|
|
"--publickey" "--no-publickey")
|
|
|
|
|
(if (lsh-configuration-root-login? config)
|
|
|
|
|
"--root-login" "--no-root-login")
|
|
|
|
|
(if (lsh-configuration-x11-forwarding? config)
|
|
|
|
|
"--x11-forward" "--no-x11-forward")
|
|
|
|
|
(if (lsh-configuration-tcp/ip-forwarding? config)
|
|
|
|
|
"--tcpip-forward" "--no-tcpip-forward")
|
|
|
|
|
(if (null? interfaces)
|
|
|
|
|
'()
|
2015-11-27 21:46:27 +00:00
|
|
|
|
(map (cut string-append "--interface=" <>)
|
|
|
|
|
interfaces)))))
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 21:44:26 +00:00
|
|
|
|
|
|
|
|
|
(define requires
|
2023-05-09 16:45:07 +00:00
|
|
|
|
`(networking
|
|
|
|
|
pam
|
|
|
|
|
,@(if (and daemonic? (lsh-configuration-syslog-output? config))
|
|
|
|
|
'(syslogd)
|
|
|
|
|
'())))
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 21:44:26 +00:00
|
|
|
|
|
services: Rename 'dmd' services to 'shepherd'.
* gnu/services/shepherd.scm (dmd-root-service-type, %dmd-root-service)
(dmd-service-type, <dmd-service>, dmd-service, dmd-service?)
(make-dmd-service, dmd-service-documentation, dmd-service-provision)
(dmd-service-requirement, dmd-service-respawn, dmd-service-start)
(dmd-service-stop, dmd-service-auto-start?, dmd-service-modules)
(dmd-service-imported-modules, dmd-service-file-name, dmd-service-file)
(dmd-service-back-edges): Rename to...
(shepherd-root-service-type, %shepherd-root-service, shepherd-service-type)
(<shepherd-service>, shepherd-service, shepherd-service?)
(make-shepherd-service, shepherd-service-documentation)
(shepherd-service-provision, shepherd-service-requirement)
(shepherd-service-respawn, shepherd-service-start)
(shepherd-service-stop, shepherd-service-auto-start?)
(shepherd-service-modules, shepherd-service-imported-modules)
(shepherd-service-file-name, shepherd-service-file)
(shepherd-service-back-edges): ...this
* gnu/services.scm: Adjust comments.
* gnu/services/avahi.scm (avahi-dmd-service): Rename to...
(avahi-shepherd-service): ... this.
* gnu/services/base.scm (%root-file-system-dmd-service)
(file-system->dmd-service-name, mapped-device->dmd-service-name)
(dependency->dmd-service-name, file-system-dmd-service)
(mingetty-dmd-service, nscd-dmd-service, guix-dmd-service)
(guix-publish-dmd-service, udev-dmd-service, gpm-dmd-service): Rename to...
(%root-file-system-shepherd-service)
(file-system->shepherd-service-name, mapped-device->shepherd-service-name)
(dependency->shepherd-service-name, file-system-shepherd-service)
(mingetty-shepherd-service, nscd-shepherd-service, guix-shepherd-service)
(guix-publish-shepherd-service, udev-shepherd-service)
(gpm-shepherd-service): ... this.
* gnu/services/databases.scm (postgresql-dmd-service): Rename to...
(postgresql-shepherd-service): ... this.
* gnu/services/desktop.scm (upower-dmd-service, elogind-dmd-service):
Rename to...
(upower-shepherd-service, elogind-shepherd-service): ... this.
* gnu/services/dbus.scm (dbus-dmd-service): Rename to...
(dbus-shepherd-service): ... this.
* gnu/services/lirc.scm (lirc-dmd-service): Rename to...
(lirc-shepherd-service): ... this.
* gnu/services/mail.scm (dovecot-dmd-service): Rename to...
(dovecot-shepherd-service): ... this.
* gnu/services/networking.scm (ntp-dmd-service, tor-dmd-service)
(bitlbee-dmd-service, wicd-dmd-service, network-manager-dmd-service): Rename to...
(dbus-shepherd-service): ... this.
* gnu/services/ssh.scm (lsh-dmd-service): Rename to...
(lsh-shepherd-service): ... this.
* gnu/services/web.scm (nginx-dmd-service): Rename to...
(nginx-shepherd-service): ... this.
* gnu/services/xorg.scm (slim-dmd-service): Rename to...
(slim-shepherd-service): ... this.
* gnu/system.scm (essential-services): Use '%shepherd-root-service'.
* gnu/system/install.scm (cow-store-service-type): Adjust accordingly.
* guix/scripts/system.scm (dmd-service-node-label, dmd-service-node-type)
(export-dmd-graph): Likewise.
* tests/guix-system.sh: Likewise.
* tests/services.scm ("dmd-service-back-edges"): Rename to...
("shepherd-service-back-edges"): Adjust accordingly.
* doc/guix.texi: Likewise.
* doc/images/service-graph.dot: Use 'shepherd' service name.
2016-01-27 20:02:31 +00:00
|
|
|
|
(list (shepherd-service
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 21:44:26 +00:00
|
|
|
|
(documentation "GNU lsh SSH server")
|
2019-12-03 00:31:15 +00:00
|
|
|
|
(provision '(ssh-daemon ssh sshd))
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 21:44:26 +00:00
|
|
|
|
(requirement requires)
|
|
|
|
|
(start #~(make-forkexec-constructor (list #$@lsh-command)))
|
|
|
|
|
(stop #~(make-kill-destructor)))))
|
|
|
|
|
|
|
|
|
|
(define (lsh-pam-services config)
|
|
|
|
|
"Return a list of <pam-services> for lshd with CONFIG."
|
|
|
|
|
(list (unix-pam-service
|
|
|
|
|
"lshd"
|
2019-05-09 10:02:20 +00:00
|
|
|
|
#:login-uid? #t
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 21:44:26 +00:00
|
|
|
|
#:allow-empty-passwords?
|
|
|
|
|
(lsh-configuration-allow-empty-passwords? config))))
|
|
|
|
|
|
|
|
|
|
(define lsh-service-type
|
2023-02-25 18:57:58 +00:00
|
|
|
|
(service-type
|
|
|
|
|
(name 'lsh)
|
|
|
|
|
(extensions
|
|
|
|
|
(list (service-extension shepherd-root-service-type
|
|
|
|
|
lsh-shepherd-service)
|
|
|
|
|
(service-extension pam-root-service-type
|
|
|
|
|
lsh-pam-services)
|
|
|
|
|
(service-extension activation-service-type
|
|
|
|
|
lsh-activation)))
|
|
|
|
|
(description "Run the GNU@tie{}lsh secure shell (SSH) daemon,
|
2017-11-05 14:29:52 +00:00
|
|
|
|
@command{lshd}.")
|
2023-02-25 18:57:58 +00:00
|
|
|
|
(default-value (lsh-configuration))))
|
|
|
|
|
|
|
|
|
|
(define-deprecated (lsh-service #:key
|
2014-06-30 20:33:48 +00:00
|
|
|
|
(lsh lsh)
|
2014-12-03 21:51:48 +00:00
|
|
|
|
(daemonic? #t)
|
2014-06-30 20:33:48 +00:00
|
|
|
|
(host-key "/etc/lsh/host-key")
|
|
|
|
|
(interfaces '())
|
|
|
|
|
(port-number 22)
|
|
|
|
|
(allow-empty-passwords? #f)
|
|
|
|
|
(root-login? #f)
|
|
|
|
|
(syslog-output? #t)
|
2014-12-03 21:51:48 +00:00
|
|
|
|
(pid-file? #f)
|
|
|
|
|
(pid-file "/var/run/lshd.pid")
|
2014-06-30 20:33:48 +00:00
|
|
|
|
(x11-forwarding? #t)
|
|
|
|
|
(tcp/ip-forwarding? #t)
|
|
|
|
|
(password-authentication? #t)
|
|
|
|
|
(public-key-authentication? #t)
|
2015-04-03 20:12:26 +00:00
|
|
|
|
(initialize? #t))
|
2023-02-25 18:57:58 +00:00
|
|
|
|
lsh-service-type
|
2014-06-30 20:33:48 +00:00
|
|
|
|
"Run the @command{lshd} program from @var{lsh} to listen on port @var{port-number}.
|
|
|
|
|
@var{host-key} must designate a file containing the host key, and readable
|
|
|
|
|
only by root.
|
|
|
|
|
|
2014-12-03 21:51:48 +00:00
|
|
|
|
When @var{daemonic?} is true, @command{lshd} will detach from the
|
|
|
|
|
controlling terminal and log its output to syslogd, unless one sets
|
|
|
|
|
@var{syslog-output?} to false. Obviously, it also makes lsh-service
|
|
|
|
|
depend on existence of syslogd service. When @var{pid-file?} is true,
|
|
|
|
|
@command{lshd} writes its PID to the file called @var{pid-file}.
|
|
|
|
|
|
2014-06-30 20:33:48 +00:00
|
|
|
|
When @var{initialize?} is true, automatically create the seed and host key
|
|
|
|
|
upon service activation if they do not exist yet. This may take long and
|
|
|
|
|
require interaction.
|
|
|
|
|
|
2014-11-24 20:15:40 +00:00
|
|
|
|
When @var{initialize?} is false, it is up to the user to initialize the
|
|
|
|
|
randomness generator (@pxref{lsh-make-seed,,, lsh, LSH Manual}), and to create
|
|
|
|
|
a key pair with the private key stored in file @var{host-key} (@pxref{lshd
|
|
|
|
|
basics,,, lsh, LSH Manual}).
|
|
|
|
|
|
2014-06-30 20:33:48 +00:00
|
|
|
|
When @var{interfaces} is empty, lshd listens for connections on all the
|
|
|
|
|
network interfaces; otherwise, @var{interfaces} must be a list of host names
|
|
|
|
|
or addresses.
|
|
|
|
|
|
2014-11-24 20:15:40 +00:00
|
|
|
|
@var{allow-empty-passwords?} specifies whether to accept log-ins with empty
|
|
|
|
|
passwords, and @var{root-login?} specifies whether to accept log-ins as
|
2014-06-30 20:33:48 +00:00
|
|
|
|
root.
|
|
|
|
|
|
|
|
|
|
The other options should be self-descriptive."
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 21:44:26 +00:00
|
|
|
|
(service lsh-service-type
|
|
|
|
|
(lsh-configuration (lsh lsh) (daemonic? daemonic?)
|
|
|
|
|
(host-key host-key) (interfaces interfaces)
|
|
|
|
|
(port-number port-number)
|
|
|
|
|
(allow-empty-passwords? allow-empty-passwords?)
|
|
|
|
|
(root-login? root-login?)
|
|
|
|
|
(syslog-output? syslog-output?)
|
|
|
|
|
(pid-file? pid-file?) (pid-file pid-file)
|
|
|
|
|
(x11-forwarding? x11-forwarding?)
|
|
|
|
|
(tcp/ip-forwarding? tcp/ip-forwarding?)
|
|
|
|
|
(password-authentication?
|
|
|
|
|
password-authentication?)
|
|
|
|
|
(public-key-authentication?
|
|
|
|
|
public-key-authentication?)
|
|
|
|
|
(initialize? initialize?))))
|
2014-06-30 20:33:48 +00:00
|
|
|
|
|
2016-08-05 13:20:15 +00:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; OpenSSH.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define-record-type* <openssh-configuration>
|
|
|
|
|
openssh-configuration make-openssh-configuration
|
|
|
|
|
openssh-configuration?
|
2021-11-18 21:44:26 +00:00
|
|
|
|
;; file-like object
|
2017-03-18 10:17:57 +00:00
|
|
|
|
(openssh openssh-configuration-openssh
|
2017-03-05 18:23:21 +00:00
|
|
|
|
(default openssh))
|
2017-03-18 10:17:57 +00:00
|
|
|
|
;; string
|
2016-10-02 21:18:08 +00:00
|
|
|
|
(pid-file openssh-configuration-pid-file
|
|
|
|
|
(default "/var/run/sshd.pid"))
|
2017-03-18 10:17:57 +00:00
|
|
|
|
;; integer
|
|
|
|
|
(port-number openssh-configuration-port-number
|
2016-10-02 21:18:08 +00:00
|
|
|
|
(default 22))
|
2022-03-28 12:03:45 +00:00
|
|
|
|
;; integer
|
|
|
|
|
(max-connections openssh-configuration-max-connections
|
|
|
|
|
(default 200))
|
2021-06-20 13:15:55 +00:00
|
|
|
|
;; Boolean | 'prohibit-password
|
2017-03-18 10:17:57 +00:00
|
|
|
|
(permit-root-login openssh-configuration-permit-root-login
|
2016-10-02 21:18:08 +00:00
|
|
|
|
(default #f))
|
2017-03-18 10:17:57 +00:00
|
|
|
|
;; Boolean
|
|
|
|
|
(allow-empty-passwords? openssh-configuration-allow-empty-passwords?
|
2016-10-02 21:18:08 +00:00
|
|
|
|
(default #f))
|
2017-03-18 10:17:57 +00:00
|
|
|
|
;; Boolean
|
|
|
|
|
(password-authentication? openssh-configuration-password-authentication?
|
2020-12-11 16:26:03 +00:00
|
|
|
|
(default #t))
|
2017-03-18 10:17:57 +00:00
|
|
|
|
;; Boolean
|
2016-10-02 21:18:08 +00:00
|
|
|
|
(public-key-authentication? openssh-configuration-public-key-authentication?
|
2017-03-18 10:17:57 +00:00
|
|
|
|
(default #t))
|
|
|
|
|
;; Boolean
|
|
|
|
|
(x11-forwarding? openssh-configuration-x11-forwarding?
|
2016-10-02 21:18:08 +00:00
|
|
|
|
(default #f))
|
2018-07-24 21:19:40 +00:00
|
|
|
|
|
|
|
|
|
;; 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))
|
|
|
|
|
|
2017-03-18 10:17:57 +00:00
|
|
|
|
;; Boolean
|
2023-05-18 01:45:08 +00:00
|
|
|
|
(challenge-response-authentication?
|
|
|
|
|
openssh-configuration-challenge-response-authentication?
|
|
|
|
|
(default #f))
|
|
|
|
|
|
2017-03-18 10:17:57 +00:00
|
|
|
|
;; Boolean
|
2017-03-02 21:06:27 +00:00
|
|
|
|
(use-pam? openssh-configuration-use-pam?
|
2017-03-18 10:17:57 +00:00
|
|
|
|
(default #t))
|
|
|
|
|
;; Boolean
|
2017-03-02 21:06:29 +00:00
|
|
|
|
(print-last-log? openssh-configuration-print-last-log?
|
2017-02-20 23:53:55 +00:00
|
|
|
|
(default #t))
|
|
|
|
|
;; list of two-element lists
|
|
|
|
|
(subsystems openssh-configuration-subsystems
|
2017-07-25 13:27:58 +00:00
|
|
|
|
(default '(("sftp" "internal-sftp"))))
|
|
|
|
|
|
2018-03-15 22:40:58 +00:00
|
|
|
|
;; list of strings
|
|
|
|
|
(accepted-environment openssh-configuration-accepted-environment
|
|
|
|
|
(default '()))
|
|
|
|
|
|
2018-08-28 10:33:50 +00:00
|
|
|
|
;; symbol
|
|
|
|
|
(log-level openssh-configuration-log-level
|
|
|
|
|
(default 'info))
|
|
|
|
|
|
2019-01-17 16:53:57 +00:00
|
|
|
|
;; String
|
|
|
|
|
;; This is an "escape hatch" to provide configuration that isn't yet
|
|
|
|
|
;; supported by this configuration record.
|
|
|
|
|
(extra-content openssh-configuration-extra-content
|
|
|
|
|
(default ""))
|
|
|
|
|
|
2017-07-25 13:27:58 +00:00
|
|
|
|
;; list of user-name/file-like tuples
|
2022-03-10 22:45:06 +00:00
|
|
|
|
(authorized-keys openssh-configuration-authorized-keys
|
2017-12-04 22:31:15 +00:00
|
|
|
|
(default '()))
|
|
|
|
|
|
2022-03-10 21:33:58 +00:00
|
|
|
|
;; Boolean
|
|
|
|
|
(generate-host-keys? openssh-configuration-generate-host-keys?
|
|
|
|
|
(default #t))
|
|
|
|
|
|
2017-12-04 22:31:15 +00:00
|
|
|
|
;; Boolean
|
|
|
|
|
;; XXX: This should really be handled in an orthogonal way, for instance as
|
|
|
|
|
;; proposed in <https://bugs.gnu.org/27155>. Keep it internal/undocumented
|
|
|
|
|
;; for now.
|
|
|
|
|
(%auto-start? openssh-auto-start?
|
|
|
|
|
(default #t)))
|
2016-08-05 13:20:15 +00:00
|
|
|
|
|
|
|
|
|
(define %openssh-accounts
|
|
|
|
|
(list (user-group (name "sshd") (system? #t))
|
|
|
|
|
(user-account
|
|
|
|
|
(name "sshd")
|
|
|
|
|
(group "sshd")
|
|
|
|
|
(system? #t)
|
|
|
|
|
(comment "sshd privilege separation user")
|
|
|
|
|
(home-directory "/var/run/sshd")
|
2019-03-04 12:34:43 +00:00
|
|
|
|
(shell (file-append shadow "/sbin/nologin")))))
|
2016-08-05 13:20:15 +00:00
|
|
|
|
|
|
|
|
|
(define (openssh-activation config)
|
|
|
|
|
"Return the activation GEXP for CONFIG."
|
2017-07-25 13:27:58 +00:00
|
|
|
|
(with-imported-modules '((guix build utils))
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (guix build utils))
|
|
|
|
|
|
|
|
|
|
(define (touch file-name)
|
|
|
|
|
(call-with-output-file file-name (const #t)))
|
|
|
|
|
|
|
|
|
|
;; Make sure /etc/ssh can be read by the 'sshd' user.
|
|
|
|
|
(mkdir-p "/etc/ssh")
|
|
|
|
|
(chmod "/etc/ssh" #o755)
|
|
|
|
|
(mkdir-p (dirname #$(openssh-configuration-pid-file config)))
|
|
|
|
|
|
|
|
|
|
;; 'sshd' complains if the authorized-key directory and its parents
|
|
|
|
|
;; are group-writable, which rules out /gnu/store. Thus we copy the
|
|
|
|
|
;; authorized-key directory to /etc.
|
|
|
|
|
(catch 'system-error
|
|
|
|
|
(lambda ()
|
2022-05-26 15:00:33 +00:00
|
|
|
|
(delete-file-recursively "/etc/ssh/authorized_keys.d"))
|
2017-07-25 13:27:58 +00:00
|
|
|
|
(lambda args
|
|
|
|
|
(unless (= ENOENT (system-error-errno args))
|
|
|
|
|
(apply throw args))))
|
|
|
|
|
(copy-recursively #$(authorized-key-directory
|
2022-03-10 22:45:06 +00:00
|
|
|
|
(openssh-configuration-authorized-keys config))
|
2017-07-25 13:27:58 +00:00
|
|
|
|
"/etc/ssh/authorized_keys.d")
|
|
|
|
|
|
|
|
|
|
(chmod "/etc/ssh/authorized_keys.d" #o555)
|
|
|
|
|
|
|
|
|
|
(let ((lastlog "/var/log/lastlog"))
|
|
|
|
|
(when #$(openssh-configuration-print-last-log? config)
|
|
|
|
|
(unless (file-exists? lastlog)
|
|
|
|
|
(touch lastlog))))
|
|
|
|
|
|
2022-03-10 21:33:58 +00:00
|
|
|
|
(when #$(openssh-configuration-generate-host-keys? config)
|
|
|
|
|
;; Generate missing host keys.
|
|
|
|
|
(system* (string-append #$(openssh-configuration-openssh config)
|
|
|
|
|
"/bin/ssh-keygen") "-A")))))
|
2017-07-25 13:27:58 +00:00
|
|
|
|
|
|
|
|
|
(define (authorized-key-directory keys)
|
|
|
|
|
"Return a directory containing the authorized keys specified in KEYS, a list
|
|
|
|
|
of user-name/file-like tuples."
|
|
|
|
|
(define build
|
|
|
|
|
(with-imported-modules (source-module-closure '((guix build utils)))
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (ice-9 match) (srfi srfi-26)
|
|
|
|
|
(guix build utils))
|
|
|
|
|
|
|
|
|
|
(mkdir #$output)
|
|
|
|
|
(for-each (match-lambda
|
|
|
|
|
((user keys ...)
|
|
|
|
|
(let ((file (string-append #$output "/" user)))
|
|
|
|
|
(call-with-output-file file
|
|
|
|
|
(lambda (port)
|
|
|
|
|
(for-each (lambda (key)
|
|
|
|
|
(call-with-input-file key
|
|
|
|
|
(cut dump-port <> port)))
|
|
|
|
|
keys))))))
|
|
|
|
|
'#$keys))))
|
|
|
|
|
|
|
|
|
|
(computed-file "openssh-authorized-keys" build))
|
2016-08-05 13:20:15 +00:00
|
|
|
|
|
|
|
|
|
(define (openssh-config-file config)
|
|
|
|
|
"Return the sshd configuration file corresponding to CONFIG."
|
|
|
|
|
(computed-file
|
|
|
|
|
"sshd_config"
|
2017-02-20 23:53:55 +00:00
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (ice-9 match))
|
|
|
|
|
(call-with-output-file #$output
|
|
|
|
|
(lambda (port)
|
|
|
|
|
(display "# Generated by 'openssh-service'.\n" port)
|
|
|
|
|
(format port "Port ~a\n"
|
|
|
|
|
#$(number->string
|
|
|
|
|
(openssh-configuration-port-number config)))
|
|
|
|
|
(format port "PermitRootLogin ~a\n"
|
|
|
|
|
#$(match (openssh-configuration-permit-root-login config)
|
|
|
|
|
(#t "yes")
|
|
|
|
|
(#f "no")
|
2021-06-20 13:15:55 +00:00
|
|
|
|
('without-password (warn-about-deprecation
|
|
|
|
|
'without-password #f
|
|
|
|
|
#:replacement 'prohibit-password)
|
|
|
|
|
"prohibit-password")
|
|
|
|
|
('prohibit-password "prohibit-password")))
|
2017-02-20 23:53:55 +00:00
|
|
|
|
(format port "PermitEmptyPasswords ~a\n"
|
|
|
|
|
#$(if (openssh-configuration-allow-empty-passwords? config)
|
|
|
|
|
"yes" "no"))
|
|
|
|
|
(format port "PasswordAuthentication ~a\n"
|
|
|
|
|
#$(if (openssh-configuration-password-authentication? config)
|
|
|
|
|
"yes" "no"))
|
|
|
|
|
(format port "PubkeyAuthentication ~a\n"
|
|
|
|
|
#$(if (openssh-configuration-public-key-authentication?
|
|
|
|
|
config)
|
|
|
|
|
"yes" "no"))
|
|
|
|
|
(format port "X11Forwarding ~a\n"
|
|
|
|
|
#$(if (openssh-configuration-x11-forwarding? config)
|
|
|
|
|
"yes" "no"))
|
2018-07-24 21:19:40 +00:00
|
|
|
|
(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"))
|
2017-02-20 23:53:55 +00:00
|
|
|
|
(format port "PidFile ~a\n"
|
|
|
|
|
#$(openssh-configuration-pid-file config))
|
|
|
|
|
(format port "ChallengeResponseAuthentication ~a\n"
|
2023-05-18 02:26:41 +00:00
|
|
|
|
#$(if (openssh-configuration-challenge-response-authentication?
|
|
|
|
|
config)
|
2017-02-20 23:53:55 +00:00
|
|
|
|
"yes" "no"))
|
|
|
|
|
(format port "UsePAM ~a\n"
|
|
|
|
|
#$(if (openssh-configuration-use-pam? config)
|
|
|
|
|
"yes" "no"))
|
|
|
|
|
(format port "PrintLastLog ~a\n"
|
|
|
|
|
#$(if (openssh-configuration-print-last-log? config)
|
|
|
|
|
"yes" "no"))
|
2018-08-28 10:33:50 +00:00
|
|
|
|
(format port "LogLevel ~a\n"
|
|
|
|
|
#$(string-upcase
|
|
|
|
|
(symbol->string
|
|
|
|
|
(openssh-configuration-log-level config))))
|
2017-07-25 13:27:58 +00:00
|
|
|
|
|
|
|
|
|
;; Add '/etc/authorized_keys.d/%u', which we populate.
|
|
|
|
|
(format port "AuthorizedKeysFile \
|
|
|
|
|
.ssh/authorized_keys .ssh/authorized_keys2 /etc/ssh/authorized_keys.d/%u\n")
|
|
|
|
|
|
2018-03-15 22:40:58 +00:00
|
|
|
|
(for-each (lambda (s) (format port "AcceptEnv ~a\n" s))
|
|
|
|
|
'#$(openssh-configuration-accepted-environment config))
|
|
|
|
|
|
2017-02-20 23:53:55 +00:00
|
|
|
|
(for-each
|
|
|
|
|
(match-lambda
|
|
|
|
|
((name command) (format port "Subsystem\t~a\t~a\n" name command)))
|
|
|
|
|
'#$(openssh-configuration-subsystems config))
|
2019-01-17 16:53:57 +00:00
|
|
|
|
|
|
|
|
|
(format port "~a\n"
|
|
|
|
|
#$(openssh-configuration-extra-content config))
|
2017-02-20 23:53:55 +00:00
|
|
|
|
#t)))))
|
2016-08-05 13:20:15 +00:00
|
|
|
|
|
|
|
|
|
(define (openssh-shepherd-service config)
|
|
|
|
|
"Return a <shepherd-service> for openssh with CONFIG."
|
|
|
|
|
|
|
|
|
|
(define pid-file
|
|
|
|
|
(openssh-configuration-pid-file config))
|
|
|
|
|
|
2022-03-28 12:03:45 +00:00
|
|
|
|
(define port-number
|
|
|
|
|
(openssh-configuration-port-number config))
|
|
|
|
|
|
|
|
|
|
(define max-connections
|
|
|
|
|
(openssh-configuration-max-connections config))
|
|
|
|
|
|
2022-11-11 17:56:35 +00:00
|
|
|
|
(define config-file
|
|
|
|
|
(openssh-config-file config))
|
|
|
|
|
|
2016-08-05 13:20:15 +00:00
|
|
|
|
(define openssh-command
|
2017-03-05 18:23:21 +00:00
|
|
|
|
#~(list (string-append #$(openssh-configuration-openssh config) "/sbin/sshd")
|
2022-11-11 17:56:35 +00:00
|
|
|
|
"-D" "-f" #$config-file))
|
2016-08-05 13:20:15 +00:00
|
|
|
|
|
2022-05-22 18:12:27 +00:00
|
|
|
|
(define inetd-style?
|
|
|
|
|
;; Whether to use 'make-inetd-constructor'. That procedure appeared in
|
|
|
|
|
;; Shepherd 0.9.0, but in 0.9.0, 'make-inetd-constructor' wouldn't let us
|
|
|
|
|
;; pass a list of endpoints, and it wouldn't let us define a service
|
|
|
|
|
;; listening on both IPv4 and IPv6, hence the conditional below.
|
|
|
|
|
#~(and (defined? 'make-inetd-constructor)
|
|
|
|
|
(not (string=? (@ (shepherd config) Version) "0.9.0"))))
|
|
|
|
|
|
2022-07-01 14:29:53 +00:00
|
|
|
|
(define ipv6-support?
|
|
|
|
|
;; Expression that returns true if IPv6 support is available.
|
|
|
|
|
#~(catch 'system-error
|
|
|
|
|
(lambda ()
|
|
|
|
|
(let ((sock (socket AF_INET6 SOCK_STREAM 0)))
|
|
|
|
|
(close-port sock)
|
|
|
|
|
#t))
|
|
|
|
|
(const #f)))
|
|
|
|
|
|
2016-08-05 13:20:15 +00:00
|
|
|
|
(list (shepherd-service
|
|
|
|
|
(documentation "OpenSSH server.")
|
2023-05-09 16:45:07 +00:00
|
|
|
|
(requirement '(pam syslogd loopback))
|
2019-12-03 00:31:15 +00:00
|
|
|
|
(provision '(ssh-daemon ssh sshd))
|
2022-05-22 18:12:27 +00:00
|
|
|
|
|
|
|
|
|
(start #~(if #$inetd-style?
|
2022-03-28 12:03:45 +00:00
|
|
|
|
(make-inetd-constructor
|
|
|
|
|
(append #$openssh-command '("-i"))
|
2022-07-01 14:29:53 +00:00
|
|
|
|
(cons (endpoint
|
2022-05-22 18:12:27 +00:00
|
|
|
|
(make-socket-address AF_INET INADDR_ANY
|
|
|
|
|
#$port-number))
|
2022-07-01 14:29:53 +00:00
|
|
|
|
(if #$ipv6-support?
|
|
|
|
|
(list
|
|
|
|
|
(endpoint
|
|
|
|
|
(make-socket-address AF_INET6 IN6ADDR_ANY
|
|
|
|
|
#$port-number)))
|
|
|
|
|
'()))
|
2023-05-20 13:41:07 +00:00
|
|
|
|
#:requirements '#$requirement
|
2022-03-28 12:03:45 +00:00
|
|
|
|
#:max-connections #$max-connections)
|
|
|
|
|
(make-forkexec-constructor #$openssh-command
|
|
|
|
|
#:pid-file #$pid-file)))
|
2022-05-22 18:12:27 +00:00
|
|
|
|
(stop #~(if #$inetd-style?
|
2022-03-28 12:03:45 +00:00
|
|
|
|
(make-inetd-destructor)
|
|
|
|
|
(make-kill-destructor)))
|
2022-11-11 17:56:35 +00:00
|
|
|
|
(actions (list (shepherd-configuration-action config-file)))
|
2017-12-04 22:31:15 +00:00
|
|
|
|
(auto-start? (openssh-auto-start? config)))))
|
2016-08-05 13:20:15 +00:00
|
|
|
|
|
2017-03-02 21:06:27 +00:00
|
|
|
|
(define (openssh-pam-services config)
|
|
|
|
|
"Return a list of <pam-services> for sshd with CONFIG."
|
|
|
|
|
(list (unix-pam-service
|
|
|
|
|
"sshd"
|
2019-05-09 10:02:20 +00:00
|
|
|
|
#:login-uid? #t
|
2017-03-02 21:06:27 +00:00
|
|
|
|
#:allow-empty-passwords?
|
|
|
|
|
(openssh-configuration-allow-empty-passwords? config))))
|
|
|
|
|
|
2017-07-30 14:03:43 +00:00
|
|
|
|
(define (extend-openssh-authorized-keys config keys)
|
|
|
|
|
"Extend CONFIG with the extra authorized keys listed in KEYS."
|
|
|
|
|
(openssh-configuration
|
|
|
|
|
(inherit config)
|
|
|
|
|
(authorized-keys
|
2022-05-26 05:10:01 +00:00
|
|
|
|
(match (append (openssh-configuration-authorized-keys config) keys)
|
2022-05-26 14:38:51 +00:00
|
|
|
|
((and alist ((users _ ...) ...))
|
2021-10-29 16:25:24 +00:00
|
|
|
|
;; Build a user/key-list mapping.
|
2022-05-26 14:38:51 +00:00
|
|
|
|
(let ((user-keys (alist->vhash alist)))
|
2021-10-29 16:25:24 +00:00
|
|
|
|
;; Coalesce the key lists associated with each user.
|
|
|
|
|
(map (lambda (user)
|
|
|
|
|
`(,user
|
|
|
|
|
,@(concatenate (vhash-fold* cons '() user user-keys))))
|
|
|
|
|
users)))))))
|
2017-07-30 14:03:43 +00:00
|
|
|
|
|
2016-08-05 13:20:15 +00:00
|
|
|
|
(define openssh-service-type
|
|
|
|
|
(service-type (name 'openssh)
|
2017-11-05 14:29:52 +00:00
|
|
|
|
(description
|
|
|
|
|
"Run the OpenSSH secure shell (SSH) server, @command{sshd}.")
|
2016-08-05 13:20:15 +00:00
|
|
|
|
(extensions
|
|
|
|
|
(list (service-extension shepherd-root-service-type
|
|
|
|
|
openssh-shepherd-service)
|
2017-03-02 21:06:27 +00:00
|
|
|
|
(service-extension pam-root-service-type
|
|
|
|
|
openssh-pam-services)
|
2016-08-05 13:20:15 +00:00
|
|
|
|
(service-extension activation-service-type
|
|
|
|
|
openssh-activation)
|
|
|
|
|
(service-extension account-service-type
|
2018-11-24 15:07:30 +00:00
|
|
|
|
(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))))))
|
2017-07-30 14:03:43 +00:00
|
|
|
|
(compose concatenate)
|
|
|
|
|
(extend extend-openssh-authorized-keys)
|
2017-04-15 22:06:43 +00:00
|
|
|
|
(default-value (openssh-configuration))))
|
2016-08-05 13:20:15 +00:00
|
|
|
|
|
2016-07-13 16:13:12 +00:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Dropbear.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define-record-type* <dropbear-configuration>
|
|
|
|
|
dropbear-configuration make-dropbear-configuration
|
|
|
|
|
dropbear-configuration?
|
|
|
|
|
(dropbear dropbear-configuration-dropbear
|
|
|
|
|
(default dropbear))
|
|
|
|
|
(port-number dropbear-configuration-port-number
|
|
|
|
|
(default 22))
|
|
|
|
|
(syslog-output? dropbear-configuration-syslog-output?
|
|
|
|
|
(default #t))
|
|
|
|
|
(pid-file dropbear-configuration-pid-file
|
|
|
|
|
(default "/var/run/dropbear.pid"))
|
|
|
|
|
(root-login? dropbear-configuration-root-login?
|
|
|
|
|
(default #f))
|
|
|
|
|
(allow-empty-passwords? dropbear-configuration-allow-empty-passwords?
|
|
|
|
|
(default #f))
|
|
|
|
|
(password-authentication? dropbear-configuration-password-authentication?
|
|
|
|
|
(default #t)))
|
|
|
|
|
|
|
|
|
|
(define (dropbear-activation config)
|
|
|
|
|
"Return the activation gexp for CONFIG."
|
|
|
|
|
#~(begin
|
2017-01-24 22:50:33 +00:00
|
|
|
|
(use-modules (guix build utils))
|
2016-07-13 16:13:12 +00:00
|
|
|
|
(mkdir-p "/etc/dropbear")))
|
|
|
|
|
|
|
|
|
|
(define (dropbear-shepherd-service config)
|
|
|
|
|
"Return a <shepherd-service> for dropbear with CONFIG."
|
|
|
|
|
(define dropbear
|
|
|
|
|
(dropbear-configuration-dropbear config))
|
|
|
|
|
|
|
|
|
|
(define pid-file
|
|
|
|
|
(dropbear-configuration-pid-file config))
|
|
|
|
|
|
|
|
|
|
(define dropbear-command
|
|
|
|
|
#~(list (string-append #$dropbear "/sbin/dropbear")
|
|
|
|
|
|
|
|
|
|
;; '-R' allows host keys to be automatically generated upon first
|
|
|
|
|
;; connection, at a time when /dev/urandom is more likely securely
|
|
|
|
|
;; seeded.
|
|
|
|
|
"-F" "-R"
|
|
|
|
|
|
|
|
|
|
"-p" #$(number->string (dropbear-configuration-port-number config))
|
|
|
|
|
"-P" #$pid-file
|
|
|
|
|
#$@(if (dropbear-configuration-syslog-output? config) '() '("-E"))
|
|
|
|
|
#$@(if (dropbear-configuration-root-login? config) '() '("-w"))
|
|
|
|
|
#$@(if (dropbear-configuration-password-authentication? config)
|
|
|
|
|
'()
|
|
|
|
|
'("-s" "-g"))
|
|
|
|
|
#$@(if (dropbear-configuration-allow-empty-passwords? config)
|
|
|
|
|
'("-B")
|
|
|
|
|
'())))
|
|
|
|
|
|
|
|
|
|
(define requires
|
|
|
|
|
(if (dropbear-configuration-syslog-output? config)
|
|
|
|
|
'(networking syslogd) '(networking)))
|
|
|
|
|
|
|
|
|
|
(list (shepherd-service
|
|
|
|
|
(documentation "Dropbear SSH server.")
|
|
|
|
|
(requirement requires)
|
2019-12-03 00:31:15 +00:00
|
|
|
|
(provision '(ssh-daemon ssh sshd))
|
2016-07-13 16:13:12 +00:00
|
|
|
|
(start #~(make-forkexec-constructor #$dropbear-command
|
|
|
|
|
#:pid-file #$pid-file))
|
|
|
|
|
(stop #~(make-kill-destructor)))))
|
|
|
|
|
|
|
|
|
|
(define dropbear-service-type
|
|
|
|
|
(service-type (name 'dropbear)
|
2017-11-05 14:29:52 +00:00
|
|
|
|
(description
|
|
|
|
|
"Run the Dropbear secure shell (SSH) server.")
|
2016-07-13 16:13:12 +00:00
|
|
|
|
(extensions
|
|
|
|
|
(list (service-extension shepherd-root-service-type
|
|
|
|
|
dropbear-shepherd-service)
|
|
|
|
|
(service-extension activation-service-type
|
2019-04-07 16:04:08 +00:00
|
|
|
|
dropbear-activation)))
|
|
|
|
|
(default-value (dropbear-configuration))))
|
2016-07-13 16:13:12 +00:00
|
|
|
|
|
2023-02-25 18:57:59 +00:00
|
|
|
|
(define-deprecated (dropbear-service #:optional
|
|
|
|
|
(config (dropbear-configuration)))
|
|
|
|
|
dropbear-service-type
|
2016-07-13 16:13:12 +00:00
|
|
|
|
"Run the @uref{https://matt.ucc.asn.au/dropbear/dropbear.html,Dropbear SSH
|
|
|
|
|
daemon} with the given @var{config}, a @code{<dropbear-configuration>}
|
|
|
|
|
object."
|
|
|
|
|
(service dropbear-service-type config))
|
|
|
|
|
|
2020-05-05 07:31:11 +00:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; AutoSSH.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(define-record-type* <autossh-configuration>
|
|
|
|
|
autossh-configuration make-autossh-configuration
|
|
|
|
|
autossh-configuration?
|
|
|
|
|
(user autossh-configuration-user
|
|
|
|
|
(default "autossh"))
|
|
|
|
|
(poll autossh-configuration-poll
|
|
|
|
|
(default 600))
|
|
|
|
|
(first-poll autossh-configuration-first-poll
|
|
|
|
|
(default #f))
|
|
|
|
|
(gate-time autossh-configuration-gate-time
|
|
|
|
|
(default 30))
|
|
|
|
|
(log-level autossh-configuration-log-level
|
|
|
|
|
(default 1))
|
|
|
|
|
(max-start autossh-configuration-max-start
|
|
|
|
|
(default #f))
|
|
|
|
|
(message autossh-configuration-message
|
|
|
|
|
(default ""))
|
|
|
|
|
(port autossh-configuration-port
|
|
|
|
|
(default "0"))
|
|
|
|
|
(ssh-options autossh-configuration-ssh-options
|
|
|
|
|
(default '())))
|
|
|
|
|
|
|
|
|
|
(define (autossh-file-name config file)
|
|
|
|
|
"Return a path in /var/run/autossh/ that is writable
|
|
|
|
|
by @code{user} from @code{config}."
|
|
|
|
|
(string-append "/var/run/autossh/"
|
|
|
|
|
(autossh-configuration-user config)
|
|
|
|
|
"/" file))
|
|
|
|
|
|
|
|
|
|
(define (autossh-shepherd-service config)
|
|
|
|
|
(shepherd-service
|
|
|
|
|
(documentation "Automatically set up ssh connections (and keep them alive).")
|
|
|
|
|
(provision '(autossh))
|
|
|
|
|
(start #~(make-forkexec-constructor
|
|
|
|
|
(list #$(file-append autossh "/bin/autossh")
|
|
|
|
|
#$@(autossh-configuration-ssh-options config))
|
|
|
|
|
#:user #$(autossh-configuration-user config)
|
|
|
|
|
#:group (passwd:gid (getpw #$(autossh-configuration-user config)))
|
|
|
|
|
#:pid-file #$(autossh-file-name config "pid")
|
|
|
|
|
#:log-file #$(autossh-file-name config "log")
|
|
|
|
|
#:environment-variables
|
|
|
|
|
'(#$(string-append "AUTOSSH_PIDFILE="
|
|
|
|
|
(autossh-file-name config "pid"))
|
|
|
|
|
#$(string-append "AUTOSSH_LOGFILE="
|
|
|
|
|
(autossh-file-name config "log"))
|
|
|
|
|
#$(string-append "AUTOSSH_POLL="
|
|
|
|
|
(number->string
|
|
|
|
|
(autossh-configuration-poll config)))
|
|
|
|
|
#$(string-append "AUTOSSH_FIRST_POLL="
|
|
|
|
|
(number->string
|
|
|
|
|
(or
|
|
|
|
|
(autossh-configuration-first-poll config)
|
|
|
|
|
(autossh-configuration-poll config))))
|
|
|
|
|
#$(string-append "AUTOSSH_GATETIME="
|
|
|
|
|
(number->string
|
|
|
|
|
(autossh-configuration-gate-time config)))
|
|
|
|
|
#$(string-append "AUTOSSH_LOGLEVEL="
|
|
|
|
|
(number->string
|
|
|
|
|
(autossh-configuration-log-level config)))
|
|
|
|
|
#$(string-append "AUTOSSH_MAXSTART="
|
|
|
|
|
(number->string
|
|
|
|
|
(or (autossh-configuration-max-start config)
|
|
|
|
|
-1)))
|
|
|
|
|
#$(string-append "AUTOSSH_MESSAGE="
|
|
|
|
|
(autossh-configuration-message config))
|
|
|
|
|
#$(string-append "AUTOSSH_PORT="
|
|
|
|
|
(autossh-configuration-port config)))))
|
|
|
|
|
(stop #~(make-kill-destructor))))
|
|
|
|
|
|
|
|
|
|
(define (autossh-service-activation config)
|
|
|
|
|
(with-imported-modules '((guix build utils))
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (guix build utils))
|
|
|
|
|
(define %user
|
|
|
|
|
(getpw #$(autossh-configuration-user config)))
|
|
|
|
|
(let* ((directory #$(autossh-file-name config ""))
|
|
|
|
|
(log (string-append directory "/log")))
|
|
|
|
|
(mkdir-p directory)
|
|
|
|
|
(chown directory (passwd:uid %user) (passwd:gid %user))
|
|
|
|
|
(call-with-output-file log (const #t))
|
|
|
|
|
(chown log (passwd:uid %user) (passwd:gid %user))))))
|
|
|
|
|
|
|
|
|
|
(define autossh-service-type
|
|
|
|
|
(service-type
|
|
|
|
|
(name 'autossh)
|
|
|
|
|
(description "Automatically set up ssh connections (and keep them alive).")
|
|
|
|
|
(extensions
|
|
|
|
|
(list (service-extension shepherd-root-service-type
|
|
|
|
|
(compose list autossh-shepherd-service))
|
|
|
|
|
(service-extension activation-service-type
|
|
|
|
|
autossh-service-activation)))
|
|
|
|
|
(default-value (autossh-configuration))))
|
|
|
|
|
|
2020-09-28 20:52:51 +00:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; WebSSH
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define-record-type* <webssh-configuration>
|
|
|
|
|
webssh-configuration make-webssh-configuration
|
|
|
|
|
webssh-configuration?
|
2021-11-18 21:44:26 +00:00
|
|
|
|
(package webssh-configuration-package ;file-like
|
2020-09-28 20:52:51 +00:00
|
|
|
|
(default webssh))
|
|
|
|
|
(user-name webssh-configuration-user-name ;string
|
|
|
|
|
(default "webssh"))
|
|
|
|
|
(group-name webssh-configuration-group-name ;string
|
|
|
|
|
(default "webssh"))
|
|
|
|
|
(policy webssh-configuration-policy ;symbol
|
|
|
|
|
(default #f))
|
|
|
|
|
(known-hosts webssh-configuration-known-hosts ;list of strings
|
|
|
|
|
(default #f))
|
|
|
|
|
(port webssh-configuration-port ;number
|
|
|
|
|
(default #f))
|
|
|
|
|
(address webssh-configuration-address ;string
|
|
|
|
|
(default #f))
|
|
|
|
|
(log-file webssh-configuration-log-file ;string
|
|
|
|
|
(default "/var/log/webssh.log"))
|
|
|
|
|
(log-level webssh-configuration-log-level ;symbol
|
|
|
|
|
(default #f)))
|
|
|
|
|
|
|
|
|
|
(define %webssh-configuration-nginx
|
|
|
|
|
(nginx-server-configuration
|
|
|
|
|
(listen '("80"))
|
|
|
|
|
(locations
|
|
|
|
|
(list (nginx-location-configuration
|
|
|
|
|
(uri "/")
|
|
|
|
|
(body '("proxy_pass http://127.0.0.1:8888;"
|
|
|
|
|
"proxy_http_version 1.1;"
|
|
|
|
|
"proxy_read_timeout 300;"
|
|
|
|
|
"proxy_set_header Upgrade $http_upgrade;"
|
|
|
|
|
"proxy_set_header Connection \"upgrade\";"
|
|
|
|
|
"proxy_set_header Host $http_host;"
|
|
|
|
|
"proxy_set_header X-Real-IP $remote_addr;"
|
|
|
|
|
"proxy_set_header X-Real-PORT $remote_port;")))))))
|
|
|
|
|
|
|
|
|
|
(define webssh-account
|
|
|
|
|
;; Return the user accounts and user groups for CONFIG.
|
|
|
|
|
(match-lambda
|
|
|
|
|
(($ <webssh-configuration> _ user-name group-name _ _ _ _ _ _)
|
|
|
|
|
(list (user-group
|
|
|
|
|
(name group-name))
|
|
|
|
|
(user-account
|
|
|
|
|
(name user-name)
|
|
|
|
|
(group group-name)
|
|
|
|
|
(comment "webssh privilege separation user")
|
|
|
|
|
(home-directory (string-append "/var/run/" user-name))
|
|
|
|
|
(shell #~(string-append #$shadow "/sbin/nologin")))))))
|
|
|
|
|
|
|
|
|
|
(define webssh-activation
|
|
|
|
|
;; Return the activation GEXP for CONFIG.
|
|
|
|
|
(match-lambda
|
|
|
|
|
(($ <webssh-configuration> _ user-name group-name policy known-hosts _ _
|
|
|
|
|
log-file _)
|
|
|
|
|
(with-imported-modules '((guix build utils))
|
|
|
|
|
#~(begin
|
|
|
|
|
(let* ((home-dir (string-append "/var/run/" #$user-name))
|
|
|
|
|
(ssh-dir (string-append home-dir "/.ssh"))
|
|
|
|
|
(known-hosts-file (string-append ssh-dir "/known_hosts")))
|
|
|
|
|
(call-with-output-file #$log-file (const #t))
|
|
|
|
|
(mkdir-p ssh-dir)
|
|
|
|
|
(case '#$policy
|
|
|
|
|
((reject)
|
|
|
|
|
(if '#$known-hosts
|
|
|
|
|
(call-with-output-file known-hosts-file
|
|
|
|
|
(lambda (port)
|
|
|
|
|
(for-each (lambda (host) (display host port) (newline port))
|
|
|
|
|
'#$known-hosts)))
|
|
|
|
|
(display-hint (G_ "webssh: reject policy requires `known-hosts'.")))))
|
|
|
|
|
(for-each (lambda (file)
|
|
|
|
|
(chown file
|
|
|
|
|
(passwd:uid (getpw #$user-name))
|
|
|
|
|
(group:gid (getpw #$group-name))))
|
|
|
|
|
(list #$log-file ssh-dir known-hosts-file))
|
|
|
|
|
(chmod ssh-dir #o700)))))))
|
|
|
|
|
|
|
|
|
|
(define webssh-shepherd-service
|
|
|
|
|
(match-lambda
|
|
|
|
|
(($ <webssh-configuration> package user-name group-name policy _ port
|
|
|
|
|
address log-file log-level)
|
|
|
|
|
(list (shepherd-service
|
|
|
|
|
(provision '(webssh))
|
|
|
|
|
(documentation "Run webssh daemon.")
|
|
|
|
|
(start #~(make-forkexec-constructor
|
|
|
|
|
`(,(string-append #$webssh "/bin/wssh")
|
|
|
|
|
,(string-append "--log-file-prefix=" #$log-file)
|
|
|
|
|
,@(case '#$log-level
|
|
|
|
|
((debug) '("--logging=debug"))
|
|
|
|
|
(else '()))
|
|
|
|
|
,@(case '#$policy
|
|
|
|
|
((reject) '("--policy=reject"))
|
|
|
|
|
(else '()))
|
|
|
|
|
,@(if #$port
|
|
|
|
|
(list (string-append "--port=" (number->string #$port)))
|
|
|
|
|
'())
|
|
|
|
|
,@(if #$address
|
|
|
|
|
(list (string-append "--address=" #$address))
|
|
|
|
|
'()))
|
|
|
|
|
#:user #$user-name
|
|
|
|
|
#:group #$group-name))
|
|
|
|
|
(stop #~(make-kill-destructor)))))))
|
|
|
|
|
|
|
|
|
|
(define webssh-service-type
|
|
|
|
|
(service-type
|
|
|
|
|
(name 'webssh)
|
|
|
|
|
(extensions
|
|
|
|
|
(list (service-extension shepherd-root-service-type
|
|
|
|
|
webssh-shepherd-service)
|
|
|
|
|
(service-extension account-service-type
|
|
|
|
|
webssh-account)
|
|
|
|
|
(service-extension activation-service-type
|
|
|
|
|
webssh-activation)))
|
|
|
|
|
(default-value (webssh-configuration))
|
|
|
|
|
(description
|
|
|
|
|
"Run the webssh.")))
|
|
|
|
|
|
2014-06-30 20:33:48 +00:00
|
|
|
|
;;; ssh.scm ends here
|