2015-08-03 03:29:53 +00:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
|
|
|
|
;;; Copyright © 2015 David Thompson <davet@gnu.org>
|
2017-01-19 13:40:04 +00:00
|
|
|
|
;;; Copyright © 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
Correct name and Email for ng0.
* .mailmap: Correct name and Email for ng0.
* Makefile.am, doc/guix.texi, etc/completion/fish/guix.fish
gnu/packages/accessibility.scm, gnu/packages/admin.scm,
gnu/packages/audio.scm, gnu/packages/autotools.scm,
gnu/packages/cdrom.scm, gnu/packages/check.scm,
gnu/packages/cinnamon.scm, gnu/packages/compression.scm,
gnu/packages/crypto.scm, gnu/packages/databases.scm,
gnu/packages/django.scm, gnu/packages/dns.scm,
gnu/packages/emacs.scm, gnu/packages/enlightenment.scm,
gnu/packages/fonts.scm, gnu/packages/fontutils.scm,
gnu/packages/forth.scm, gnu/packages/fvwm.scm,
gnu/packages/games.scm, gnu/packages/gl.scm,
gnu/packages/gnome.scm, gnu/packages/gnunet.scm,
gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm,
gnu/packages/gtk.scm, gnu/packages/guile-wm.scm,
gnu/packages/guile.scm, gnu/packages/haskell-check.scm,
gnu/packages/haskell-crypto.scm, gnu/packages/haskell.scm,
gnu/packages/image-viewers.scm, gnu/packages/image.scm,
gnu/packages/irc.scm, gnu/packages/language.scm,
gnu/packages/libcanberra.scm, gnu/packages/linux.scm,
gnu/packages/lisp.scm, gnu/packages/lolcode.scm,
gnu/packages/lxde.scm, gnu/packages/lxqt.scm,
gnu/packages/mail.scm, gnu/packages/markup.scm,
gnu/packages/mate.scm, gnu/packages/maths.scm,
gnu/packages/mc.scm, gnu/packages/messaging.scm,
gnu/packages/music.scm, gnu/packages/ncurses.scm,
gnu/packages/networking.scm, gnu/packages/nickle.scm,
gnu/packages/openbox.scm, gnu/packages/pdf.scm,
gnu/packages/perl-check.scm, gnu/packages/perl.scm,
gnu/packages/python-crypto.scm, gnu/packages/python-web.scm,
gnu/packages/python.scm, gnu/packages/qt.scm,
gnu/packages/ruby.scm, gnu/packages/rust.scm,
gnu/packages/scheme.scm, gnu/packages/serialization.scm,
gnu/packages/shells.scm, gnu/packages/ssh.scm,
gnu/packages/suckless.scm, gnu/packages/tbb.scm,
gnu/packages/telephony.scm, gnu/packages/text-editors.scm,
gnu/packages/textutils.scm, gnu/packages/time.scm,
gnu/packages/tls.scm, gnu/packages/tor.scm,
gnu/packages/version-control.scm, gnu/packages/video.scm,
gnu/packages/vim.scm, gnu/packages/web.scm,
gnu/packages/wm.scm, gnu/packages/xdisorg.scm,
gnu/packages/xfce.scm, gnu/packages/xml.scm,
gnu/packages/xorg.scm, gnu/services/certbot.scm,
gnu/services/desktop.scm, gnu/services/version-control.scm,
gnu/services/web.scm, guix/import/hackage.scm,
guix/licenses.scm: Likewise.
Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
2018-03-20 15:39:45 +00:00
|
|
|
|
;;; Copyright © 2016 Nils Gillmann <ng0@n0.is>
|
2018-01-12 22:14:14 +00:00
|
|
|
|
;;; Copyright © 2016, 2017, 2018 Julien Lepiller <julien@lepiller.eu>
|
2017-01-18 08:08:06 +00:00
|
|
|
|
;;; Copyright © 2017 Christopher Baines <mail@cbaines.net>
|
2017-10-09 21:06:05 +00:00
|
|
|
|
;;; Copyright © 2017 nee <nee-git@hidamari.blue>
|
2017-12-09 11:59:12 +00:00
|
|
|
|
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
|
2018-05-30 09:47:04 +00:00
|
|
|
|
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
|
2015-08-03 03:29:53 +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 web)
|
|
|
|
|
#:use-module (gnu services)
|
2016-01-27 12:45:01 +00:00
|
|
|
|
#:use-module (gnu services shepherd)
|
2018-05-30 09:47:04 +00:00
|
|
|
|
#:use-module (gnu system pam)
|
2015-08-03 03:29:53 +00:00
|
|
|
|
#:use-module (gnu system shadow)
|
|
|
|
|
#:use-module (gnu packages admin)
|
|
|
|
|
#:use-module (gnu packages web)
|
2017-10-09 21:06:05 +00:00
|
|
|
|
#:use-module (gnu packages php)
|
2018-05-30 09:47:04 +00:00
|
|
|
|
#:use-module (gnu packages guile)
|
2015-08-03 03:29:53 +00:00
|
|
|
|
#:use-module (guix records)
|
2018-05-30 09:47:04 +00:00
|
|
|
|
#:use-module (guix modules)
|
2015-08-03 03:29:53 +00:00
|
|
|
|
#:use-module (guix gexp)
|
2017-10-09 21:06:05 +00:00
|
|
|
|
#:use-module ((guix utils) #:select (version-major))
|
|
|
|
|
#:use-module ((guix packages) #:select (package-version))
|
2016-12-13 20:00:53 +00:00
|
|
|
|
#:use-module (srfi srfi-1)
|
2017-12-12 06:48:48 +00:00
|
|
|
|
#:use-module (srfi srfi-9)
|
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
|
|
|
|
#:use-module (ice-9 match)
|
2017-12-12 06:48:48 +00:00
|
|
|
|
#:export (<httpd-configuration>
|
|
|
|
|
httpd-configuration
|
|
|
|
|
httpd-configuration?
|
|
|
|
|
httpd-configuration-package
|
|
|
|
|
httpd-configuration-pid-file
|
|
|
|
|
httpd-configuration-config
|
|
|
|
|
|
|
|
|
|
<httpd-virtualhost>
|
|
|
|
|
httpd-virtualhost
|
|
|
|
|
httpd-virtualhost?
|
|
|
|
|
httpd-virtualhost-addresses-and-ports
|
|
|
|
|
httpd-virtualhost-contents
|
|
|
|
|
|
|
|
|
|
<httpd-config-file>
|
|
|
|
|
httpd-config-file
|
|
|
|
|
httpd-config-file?
|
|
|
|
|
httpd-config-file-modules
|
|
|
|
|
httpd-config-file-server-root
|
|
|
|
|
httpd-config-file-server-name
|
|
|
|
|
httpd-config-file-listen
|
|
|
|
|
httpd-config-file-pid-file
|
|
|
|
|
httpd-config-file-error-log
|
|
|
|
|
httpd-config-file-user
|
|
|
|
|
httpd-config-file-group
|
|
|
|
|
|
|
|
|
|
httpd-service-type
|
|
|
|
|
|
|
|
|
|
<nginx-configuration>
|
2017-07-30 10:21:16 +00:00
|
|
|
|
nginx-configuration
|
2016-07-19 13:19:14 +00:00
|
|
|
|
nginx-configuration?
|
2017-07-30 10:21:16 +00:00
|
|
|
|
nginx-configuartion-nginx
|
|
|
|
|
nginx-configuration-log-directory
|
|
|
|
|
nginx-configuration-run-directory
|
|
|
|
|
nginx-configuration-server-blocks
|
|
|
|
|
nginx-configuration-upstream-blocks
|
2017-11-25 11:57:37 +00:00
|
|
|
|
nginx-configuration-server-names-hash-bucket-size
|
|
|
|
|
nginx-configuration-server-names-hash-bucket-max-size
|
2017-07-30 10:21:16 +00:00
|
|
|
|
nginx-configuration-file
|
|
|
|
|
|
|
|
|
|
<nginx-server-configuration>
|
2016-12-13 19:44:31 +00:00
|
|
|
|
nginx-server-configuration
|
|
|
|
|
nginx-server-configuration?
|
2017-12-09 11:59:12 +00:00
|
|
|
|
nginx-server-configuration-listen
|
2017-07-30 10:21:16 +00:00
|
|
|
|
nginx-server-configuration-server-name
|
|
|
|
|
nginx-server-configuration-root
|
|
|
|
|
nginx-server-configuration-locations
|
|
|
|
|
nginx-server-configuration-index
|
|
|
|
|
nginx-server-configuration-ssl-certificate
|
|
|
|
|
nginx-server-configuration-ssl-certificate-key
|
|
|
|
|
nginx-server-configuration-server-tokens?
|
2017-12-09 21:47:53 +00:00
|
|
|
|
nginx-server-configuration-raw-content
|
2017-07-30 10:21:16 +00:00
|
|
|
|
|
|
|
|
|
<nginx-upstream-configuration>
|
2017-01-18 08:08:06 +00:00
|
|
|
|
nginx-upstream-configuration
|
|
|
|
|
nginx-upstream-configuration?
|
2017-07-30 10:21:16 +00:00
|
|
|
|
nginx-upstream-configuration-name
|
|
|
|
|
nginx-upstream-configuration-servers
|
|
|
|
|
|
|
|
|
|
<nginx-location-configuration>
|
2017-01-18 08:08:07 +00:00
|
|
|
|
nginx-location-configuration
|
|
|
|
|
nginx-location-configuration?
|
2017-07-30 10:21:16 +00:00
|
|
|
|
nginx-location-configuration-uri
|
|
|
|
|
nginx-location-configuration-body
|
|
|
|
|
|
|
|
|
|
<nginx-named-location-configuration>
|
2017-01-18 08:08:07 +00:00
|
|
|
|
nginx-named-location-configuration
|
|
|
|
|
nginx-named-location-configuration?
|
2017-07-30 10:21:16 +00:00
|
|
|
|
nginx-named-location-configuration-name
|
|
|
|
|
nginx-named-location-configuration-body
|
|
|
|
|
|
2016-07-19 13:19:14 +00:00
|
|
|
|
nginx-service
|
2017-04-27 08:08:36 +00:00
|
|
|
|
nginx-service-type
|
|
|
|
|
|
|
|
|
|
fcgiwrap-configuration
|
|
|
|
|
fcgiwrap-configuration?
|
2017-10-09 21:06:05 +00:00
|
|
|
|
fcgiwrap-service-type
|
|
|
|
|
|
|
|
|
|
<php-fpm-configuration>
|
|
|
|
|
php-fpm-configuration
|
|
|
|
|
make-php-fpm-configuration
|
|
|
|
|
php-fpm-configuration?
|
|
|
|
|
php-fpm-configuration-php
|
|
|
|
|
php-fpm-configuration-socket
|
|
|
|
|
php-fpm-configuration-user
|
|
|
|
|
php-fpm-configuration-group
|
|
|
|
|
php-fpm-configuration-socket-user
|
|
|
|
|
php-fpm-configuration-socket-group
|
|
|
|
|
php-fpm-configuration-pid-file
|
|
|
|
|
php-fpm-configuration-log-file
|
|
|
|
|
php-fpm-configuration-process-manager
|
|
|
|
|
php-fpm-configuration-display-errors
|
|
|
|
|
php-fpm-configuration-workers-log-file
|
|
|
|
|
php-fpm-configuration-file
|
|
|
|
|
|
|
|
|
|
<php-fpm-dynamic-process-manager-configuration>
|
|
|
|
|
php-fpm-dynamic-process-manager-configuration
|
|
|
|
|
make-php-fpm-dynamic-process-manager-configuration
|
|
|
|
|
php-fpm-dynamic-process-manager-configuration?
|
|
|
|
|
php-fpm-dynamic-process-manager-configuration-max-children
|
|
|
|
|
php-fpm-dynamic-process-manager-configuration-start-servers
|
|
|
|
|
php-fpm-dynamic-process-manager-configuration-min-spare-servers
|
|
|
|
|
php-fpm-dynamic-process-manager-configuration-max-spare-servers
|
|
|
|
|
|
|
|
|
|
<php-fpm-static-process-manager-configuration>
|
|
|
|
|
php-fpm-static-process-manager-configuration
|
|
|
|
|
make-php-fpm-static-process-manager-configuration
|
|
|
|
|
php-fpm-static-process-manager-configuration?
|
|
|
|
|
php-fpm-static-process-manager-configuration-max-children
|
|
|
|
|
|
|
|
|
|
<php-fpm-on-demand-process-manager-configuration>
|
|
|
|
|
php-fpm-on-demand-process-manager-configuration
|
|
|
|
|
make-php-fpm-on-demand-process-manager-configuration
|
|
|
|
|
php-fpm-on-demand-process-manager-configuration?
|
|
|
|
|
php-fpm-on-demand-process-manager-configuration-max-children
|
|
|
|
|
php-fpm-on-demand-process-manager-configuration-process-idle-timeout
|
|
|
|
|
|
|
|
|
|
php-fpm-service-type
|
2018-01-12 22:14:14 +00:00
|
|
|
|
nginx-php-location
|
|
|
|
|
|
2018-05-30 09:47:04 +00:00
|
|
|
|
cat-avatar-generator-service
|
|
|
|
|
|
|
|
|
|
hpcguix-web-configuration
|
|
|
|
|
hpcguix-web-configuration?
|
|
|
|
|
hpcguix-web-service-type))
|
2015-08-03 03:29:53 +00:00
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
;;;
|
|
|
|
|
;;; Web services.
|
|
|
|
|
;;;
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
2017-12-12 06:48:48 +00:00
|
|
|
|
(define-record-type* <httpd-module>
|
|
|
|
|
httpd-module make-httpd-module
|
|
|
|
|
httpd-module?
|
|
|
|
|
(name httpd-load-module-name)
|
|
|
|
|
(file httpd-load-module-file))
|
|
|
|
|
|
|
|
|
|
;; Default modules for the httpd-service-type, taken from etc/httpd/httpd.conf
|
|
|
|
|
;; file in the httpd package.
|
|
|
|
|
(define %default-httpd-modules
|
|
|
|
|
(map (match-lambda
|
|
|
|
|
((name file)
|
|
|
|
|
(httpd-module
|
|
|
|
|
(name name)
|
|
|
|
|
(file file))))
|
|
|
|
|
'(("authn_file_module" "modules/mod_authn_file.so")
|
|
|
|
|
("authn_core_module" "modules/mod_authn_core.so")
|
|
|
|
|
("authz_host_module" "modules/mod_authz_host.so")
|
|
|
|
|
("authz_groupfile_module" "modules/mod_authz_groupfile.so")
|
|
|
|
|
("authz_user_module" "modules/mod_authz_user.so")
|
|
|
|
|
("authz_core_module" "modules/mod_authz_core.so")
|
|
|
|
|
("access_compat_module" "modules/mod_access_compat.so")
|
|
|
|
|
("auth_basic_module" "modules/mod_auth_basic.so")
|
|
|
|
|
("reqtimeout_module" "modules/mod_reqtimeout.so")
|
|
|
|
|
("filter_module" "modules/mod_filter.so")
|
|
|
|
|
("mime_module" "modules/mod_mime.so")
|
|
|
|
|
("log_config_module" "modules/mod_log_config.so")
|
|
|
|
|
("env_module" "modules/mod_env.so")
|
|
|
|
|
("headers_module" "modules/mod_headers.so")
|
|
|
|
|
("setenvif_module" "modules/mod_setenvif.so")
|
|
|
|
|
("version_module" "modules/mod_version.so")
|
|
|
|
|
("unixd_module" "modules/mod_unixd.so")
|
|
|
|
|
("status_module" "modules/mod_status.so")
|
|
|
|
|
("autoindex_module" "modules/mod_autoindex.so")
|
|
|
|
|
("dir_module" "modules/mod_dir.so")
|
|
|
|
|
("alias_module" "modules/mod_alias.so"))))
|
|
|
|
|
|
|
|
|
|
(define-record-type* <httpd-config-file>
|
|
|
|
|
httpd-config-file make-httpd-config-file
|
|
|
|
|
httpd-config-file?
|
|
|
|
|
(modules httpd-config-file-modules
|
|
|
|
|
(default %default-httpd-modules))
|
|
|
|
|
(server-root httpd-config-file-server-root
|
|
|
|
|
(default httpd))
|
|
|
|
|
(server-name httpd-config-file-server-name
|
|
|
|
|
(default #f))
|
|
|
|
|
(document-root httpd-config-file-document-root
|
|
|
|
|
(default "/srv/http"))
|
|
|
|
|
(listen httpd-config-file-listen
|
|
|
|
|
(default '("80")))
|
|
|
|
|
(pid-file httpd-config-file-pid-file
|
|
|
|
|
(default "/var/run/httpd"))
|
|
|
|
|
(error-log httpd-config-file-error-log
|
|
|
|
|
(default "/var/log/httpd/error_log"))
|
|
|
|
|
(user httpd-config-file-user
|
|
|
|
|
(default "httpd"))
|
|
|
|
|
(group httpd-config-file-group
|
|
|
|
|
(default "httpd"))
|
|
|
|
|
(extra-config httpd-config-file-extra-config
|
|
|
|
|
(default
|
|
|
|
|
(list "TypesConfig etc/httpd/mime.types"))))
|
|
|
|
|
|
|
|
|
|
(define-gexp-compiler (httpd-config-file-compiler
|
|
|
|
|
(file <httpd-config-file>) system target)
|
|
|
|
|
(match file
|
|
|
|
|
(($ <httpd-config-file> load-modules server-root server-name
|
|
|
|
|
document-root listen pid-file error-log
|
|
|
|
|
user group extra-config)
|
|
|
|
|
(gexp->derivation
|
|
|
|
|
"httpd.conf"
|
|
|
|
|
#~(call-with-output-file (ungexp output "out")
|
|
|
|
|
(lambda (port)
|
|
|
|
|
(display
|
|
|
|
|
(string-append
|
|
|
|
|
(ungexp-splicing
|
|
|
|
|
`(,@(append-map
|
|
|
|
|
(match-lambda
|
|
|
|
|
(($ <httpd-module> name module)
|
|
|
|
|
`("LoadModule " ,name " " ,module "\n")))
|
|
|
|
|
load-modules)
|
|
|
|
|
,@`("ServerRoot " ,server-root "\n")
|
|
|
|
|
,@(if server-name
|
|
|
|
|
`("ServerName " ,server-name "\n")
|
|
|
|
|
'())
|
|
|
|
|
,@`("DocumentRoot " ,document-root "\n")
|
|
|
|
|
,@(append-map
|
|
|
|
|
(lambda (listen-value)
|
|
|
|
|
`("Listen " ,listen-value "\n"))
|
|
|
|
|
listen)
|
|
|
|
|
,@(if pid-file
|
|
|
|
|
`("Pidfile " ,pid-file "\n")
|
|
|
|
|
'())
|
|
|
|
|
,@(if error-log
|
|
|
|
|
`("ErrorLog " ,error-log "\n")
|
|
|
|
|
'())
|
|
|
|
|
,@(if user
|
|
|
|
|
`("User " ,user "\n")
|
|
|
|
|
'())
|
|
|
|
|
,@(if group
|
|
|
|
|
`("Group " ,group "\n")
|
|
|
|
|
'())
|
|
|
|
|
"\n\n"
|
|
|
|
|
,@extra-config)))
|
|
|
|
|
port)))
|
|
|
|
|
#:local-build? #t))))
|
|
|
|
|
|
|
|
|
|
(define-record-type <httpd-virtualhost>
|
|
|
|
|
(httpd-virtualhost addresses-and-ports contents)
|
|
|
|
|
httpd-virtualhost?
|
|
|
|
|
(addresses-and-ports httpd-virtualhost-addresses-and-ports)
|
|
|
|
|
(contents httpd-virtualhost-contents))
|
|
|
|
|
|
|
|
|
|
(define-record-type* <httpd-configuration>
|
|
|
|
|
httpd-configuration make-httpd-configuration
|
|
|
|
|
httpd-configuration?
|
|
|
|
|
(package httpd-configuration-package
|
|
|
|
|
(default httpd))
|
|
|
|
|
(pid-file httpd-configuration-pid-file
|
|
|
|
|
(default "/var/run/httpd"))
|
|
|
|
|
(config httpd-configuration-config
|
|
|
|
|
(default (httpd-config-file))))
|
|
|
|
|
|
|
|
|
|
(define %httpd-accounts
|
|
|
|
|
(list (user-group (name "httpd") (system? #t))
|
|
|
|
|
(user-account
|
|
|
|
|
(name "httpd")
|
|
|
|
|
(group "httpd")
|
|
|
|
|
(system? #t)
|
|
|
|
|
(comment "Apache HTTPD server user")
|
|
|
|
|
(home-directory "/var/empty")
|
|
|
|
|
(shell (file-append shadow "/sbin/nologin")))))
|
|
|
|
|
|
|
|
|
|
(define httpd-shepherd-services
|
|
|
|
|
(match-lambda
|
|
|
|
|
(($ <httpd-configuration> package pid-file config)
|
|
|
|
|
(list (shepherd-service
|
|
|
|
|
(provision '(httpd))
|
|
|
|
|
(documentation "The Apache HTTP Server")
|
|
|
|
|
(requirement '(networking))
|
|
|
|
|
(start #~(make-forkexec-constructor
|
|
|
|
|
`(#$(file-append package "/bin/httpd")
|
|
|
|
|
#$@(if config
|
|
|
|
|
(list "-f" config)
|
|
|
|
|
'()))
|
|
|
|
|
#:pid-file #$pid-file))
|
|
|
|
|
(stop #~(make-kill-destructor)))))))
|
|
|
|
|
|
|
|
|
|
(define httpd-activation
|
|
|
|
|
(match-lambda
|
|
|
|
|
(($ <httpd-configuration> package pid-file config)
|
|
|
|
|
(match-record
|
|
|
|
|
config
|
|
|
|
|
<httpd-config-file>
|
|
|
|
|
(error-log document-root)
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (guix build utils))
|
|
|
|
|
|
|
|
|
|
(mkdir-p #$(dirname error-log))
|
|
|
|
|
(mkdir-p #$document-root))))))
|
|
|
|
|
|
|
|
|
|
(define (httpd-process-extensions original-config extension-configs)
|
|
|
|
|
(let ((config (httpd-configuration-config
|
|
|
|
|
original-config)))
|
|
|
|
|
(if (httpd-config-file? config)
|
|
|
|
|
(httpd-configuration
|
|
|
|
|
(inherit original-config)
|
|
|
|
|
(config
|
|
|
|
|
(httpd-config-file
|
|
|
|
|
(inherit config)
|
|
|
|
|
(extra-config
|
|
|
|
|
(append (httpd-config-file-extra-config config)
|
|
|
|
|
(append-map
|
|
|
|
|
(match-lambda
|
|
|
|
|
(($ <httpd-virtualhost>
|
|
|
|
|
addresses-and-ports
|
|
|
|
|
contents)
|
|
|
|
|
`(,(string-append
|
|
|
|
|
"<VirtualHost " addresses-and-ports ">\n")
|
|
|
|
|
,@contents
|
|
|
|
|
"\n</VirtualHost>\n"))
|
|
|
|
|
((? string? x)
|
|
|
|
|
`("\n" ,x "\n"))
|
|
|
|
|
((? list? x)
|
|
|
|
|
`("\n" ,@x "\n")))
|
|
|
|
|
extension-configs)))))))))
|
|
|
|
|
|
|
|
|
|
(define httpd-service-type
|
|
|
|
|
(service-type (name 'httpd)
|
|
|
|
|
(extensions
|
|
|
|
|
(list (service-extension shepherd-root-service-type
|
|
|
|
|
httpd-shepherd-services)
|
|
|
|
|
(service-extension activation-service-type
|
|
|
|
|
httpd-activation)
|
|
|
|
|
(service-extension account-service-type
|
|
|
|
|
(const %httpd-accounts))))
|
|
|
|
|
(compose concatenate)
|
|
|
|
|
(extend httpd-process-extensions)
|
|
|
|
|
(default-value
|
|
|
|
|
(httpd-configuration))))
|
|
|
|
|
|
2016-12-13 19:44:31 +00:00
|
|
|
|
(define-record-type* <nginx-server-configuration>
|
|
|
|
|
nginx-server-configuration make-nginx-server-configuration
|
|
|
|
|
nginx-server-configuration?
|
2017-12-09 11:59:12 +00:00
|
|
|
|
(listen nginx-server-configuration-listen
|
|
|
|
|
(default '("80" "443 ssl")))
|
2016-12-13 19:44:31 +00:00
|
|
|
|
(server-name nginx-server-configuration-server-name
|
2016-09-26 21:55:58 +00:00
|
|
|
|
(default (list 'default)))
|
2016-12-13 19:44:31 +00:00
|
|
|
|
(root nginx-server-configuration-root
|
2016-09-26 21:55:58 +00:00
|
|
|
|
(default "/srv/http"))
|
2017-01-18 08:08:07 +00:00
|
|
|
|
(locations nginx-server-configuration-locations
|
|
|
|
|
(default '()))
|
2016-12-13 19:44:31 +00:00
|
|
|
|
(index nginx-server-configuration-index
|
2016-09-26 21:55:58 +00:00
|
|
|
|
(default (list "index.html")))
|
2017-09-23 00:27:49 +00:00
|
|
|
|
(try-files nginx-server-configuration-try-files
|
|
|
|
|
(default '()))
|
2016-12-13 19:44:31 +00:00
|
|
|
|
(ssl-certificate nginx-server-configuration-ssl-certificate
|
2017-12-09 09:24:07 +00:00
|
|
|
|
(default #f))
|
2016-12-13 19:44:31 +00:00
|
|
|
|
(ssl-certificate-key nginx-server-configuration-ssl-certificate-key
|
2017-12-09 09:24:07 +00:00
|
|
|
|
(default #f))
|
2016-12-13 19:44:31 +00:00
|
|
|
|
(server-tokens? nginx-server-configuration-server-tokens?
|
2017-12-09 21:47:53 +00:00
|
|
|
|
(default #f))
|
|
|
|
|
(raw-content nginx-server-configuration-raw-content
|
|
|
|
|
(default '())))
|
2016-09-26 21:55:58 +00:00
|
|
|
|
|
2017-01-18 08:08:06 +00:00
|
|
|
|
(define-record-type* <nginx-upstream-configuration>
|
|
|
|
|
nginx-upstream-configuration make-nginx-upstream-configuration
|
|
|
|
|
nginx-upstream-configuration?
|
|
|
|
|
(name nginx-upstream-configuration-name)
|
|
|
|
|
(servers nginx-upstream-configuration-servers))
|
|
|
|
|
|
2017-01-18 08:08:07 +00:00
|
|
|
|
(define-record-type* <nginx-location-configuration>
|
|
|
|
|
nginx-location-configuration make-nginx-location-configuration
|
|
|
|
|
nginx-location-configuration?
|
|
|
|
|
(uri nginx-location-configuration-uri
|
|
|
|
|
(default #f))
|
|
|
|
|
(body nginx-location-configuration-body))
|
|
|
|
|
|
|
|
|
|
(define-record-type* <nginx-named-location-configuration>
|
|
|
|
|
nginx-named-location-configuration make-nginx-named-location-configuration
|
|
|
|
|
nginx-named-location-configuration?
|
|
|
|
|
(name nginx-named-location-configuration-name
|
|
|
|
|
(default #f))
|
|
|
|
|
(body nginx-named-location-configuration-body))
|
|
|
|
|
|
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* <nginx-configuration>
|
|
|
|
|
nginx-configuration make-nginx-configuration
|
|
|
|
|
nginx-configuration?
|
2017-01-19 13:40:04 +00:00
|
|
|
|
(nginx nginx-configuration-nginx ;<package>
|
|
|
|
|
(default nginx))
|
|
|
|
|
(log-directory nginx-configuration-log-directory ;string
|
|
|
|
|
(default "/var/log/nginx"))
|
|
|
|
|
(run-directory nginx-configuration-run-directory ;string
|
|
|
|
|
(default "/var/run/nginx"))
|
|
|
|
|
(server-blocks nginx-configuration-server-blocks
|
|
|
|
|
(default '())) ;list of <nginx-server-configuration>
|
|
|
|
|
(upstream-blocks nginx-configuration-upstream-blocks
|
|
|
|
|
(default '())) ;list of <nginx-upstream-configuration>
|
2017-11-25 11:57:37 +00:00
|
|
|
|
(server-names-hash-bucket-size nginx-configuration-server-names-hash-bucket-size
|
|
|
|
|
(default #f))
|
|
|
|
|
(server-names-hash-bucket-max-size nginx-configuration-server-names-hash-bucket-max-size
|
|
|
|
|
(default #f))
|
2017-01-19 13:40:04 +00:00
|
|
|
|
(file nginx-configuration-file ;#f | string | file-like
|
|
|
|
|
(default #f)))
|
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
|
|
|
|
|
2016-09-26 21:55:58 +00:00
|
|
|
|
(define (config-domain-strings names)
|
|
|
|
|
"Return a string denoting the nginx config representation of NAMES, a list
|
|
|
|
|
of domain names."
|
2017-04-27 17:49:02 +00:00
|
|
|
|
(map (match-lambda
|
2016-12-13 19:48:16 +00:00
|
|
|
|
('default "_ ")
|
2017-04-27 17:49:02 +00:00
|
|
|
|
((? string? str) (list str " ")))
|
|
|
|
|
names))
|
2016-09-26 21:55:58 +00:00
|
|
|
|
|
|
|
|
|
(define (config-index-strings names)
|
|
|
|
|
"Return a string denoting the nginx config representation of NAMES, a list
|
|
|
|
|
of index files."
|
2017-04-27 17:49:02 +00:00
|
|
|
|
(map (match-lambda
|
|
|
|
|
((? string? str) (list str " ")))
|
|
|
|
|
names))
|
2016-09-26 21:55:58 +00:00
|
|
|
|
|
2017-04-27 17:49:02 +00:00
|
|
|
|
(define emit-nginx-location-config
|
2017-01-18 08:08:07 +00:00
|
|
|
|
(match-lambda
|
|
|
|
|
(($ <nginx-location-configuration> uri body)
|
2017-04-27 17:49:02 +00:00
|
|
|
|
(list
|
2017-01-18 08:08:07 +00:00
|
|
|
|
" location " uri " {\n"
|
2017-04-27 17:49:02 +00:00
|
|
|
|
(map (lambda (x) (list " " x "\n")) body)
|
2017-01-18 08:08:07 +00:00
|
|
|
|
" }\n"))
|
|
|
|
|
(($ <nginx-named-location-configuration> name body)
|
2017-04-27 17:49:02 +00:00
|
|
|
|
(list
|
2017-01-18 08:08:07 +00:00
|
|
|
|
" location @" name " {\n"
|
2017-04-27 17:49:02 +00:00
|
|
|
|
(map (lambda (x) (list " " x "\n")) body)
|
2017-01-18 08:08:07 +00:00
|
|
|
|
" }\n"))))
|
|
|
|
|
|
2017-04-27 17:49:02 +00:00
|
|
|
|
(define (emit-nginx-server-config server)
|
2017-12-09 11:59:12 +00:00
|
|
|
|
(let ((listen (nginx-server-configuration-listen server))
|
2017-04-27 17:49:02 +00:00
|
|
|
|
(server-name (nginx-server-configuration-server-name server))
|
|
|
|
|
(ssl-certificate (nginx-server-configuration-ssl-certificate server))
|
|
|
|
|
(ssl-certificate-key
|
|
|
|
|
(nginx-server-configuration-ssl-certificate-key server))
|
|
|
|
|
(root (nginx-server-configuration-root server))
|
|
|
|
|
(index (nginx-server-configuration-index server))
|
2017-09-23 00:27:49 +00:00
|
|
|
|
(try-files (nginx-server-configuration-try-files server))
|
2017-04-27 17:49:02 +00:00
|
|
|
|
(server-tokens? (nginx-server-configuration-server-tokens? server))
|
2017-12-09 21:47:53 +00:00
|
|
|
|
(locations (nginx-server-configuration-locations server))
|
|
|
|
|
(raw-content (nginx-server-configuration-raw-content server)))
|
2017-04-27 17:49:02 +00:00
|
|
|
|
(define-syntax-parameter <> (syntax-rules ()))
|
|
|
|
|
(define-syntax-rule (and/l x tail ...)
|
|
|
|
|
(let ((x* x))
|
|
|
|
|
(if x*
|
|
|
|
|
(syntax-parameterize ((<> (identifier-syntax x*)))
|
|
|
|
|
(list tail ...))
|
|
|
|
|
'())))
|
|
|
|
|
(list
|
|
|
|
|
" server {\n"
|
2017-12-09 11:59:12 +00:00
|
|
|
|
(map (lambda (directive) (list " listen " directive ";\n")) listen)
|
2017-04-27 17:49:02 +00:00
|
|
|
|
" server_name " (config-domain-strings server-name) ";\n"
|
|
|
|
|
(and/l ssl-certificate " ssl_certificate " <> ";\n")
|
|
|
|
|
(and/l ssl-certificate-key " ssl_certificate_key " <> ";\n")
|
|
|
|
|
" root " root ";\n"
|
|
|
|
|
" index " (config-index-strings index) ";\n"
|
2017-09-23 00:27:49 +00:00
|
|
|
|
(if (not (nil? try-files))
|
|
|
|
|
(and/l (config-index-strings try-files) " try_files " <> ";\n")
|
|
|
|
|
"")
|
2017-04-27 17:49:02 +00:00
|
|
|
|
" server_tokens " (if server-tokens? "on" "off") ";\n"
|
|
|
|
|
"\n"
|
|
|
|
|
(map emit-nginx-location-config locations)
|
|
|
|
|
"\n"
|
2017-12-09 21:47:53 +00:00
|
|
|
|
(map (lambda (x) (list " " x "\n")) raw-content)
|
2017-04-27 17:49:02 +00:00
|
|
|
|
" }\n")))
|
2017-01-18 08:08:06 +00:00
|
|
|
|
|
2017-04-27 17:49:02 +00:00
|
|
|
|
(define (emit-nginx-upstream-config upstream)
|
|
|
|
|
(list
|
2017-01-18 08:08:06 +00:00
|
|
|
|
" upstream " (nginx-upstream-configuration-name upstream) " {\n"
|
2017-04-27 17:49:02 +00:00
|
|
|
|
(map (lambda (server)
|
|
|
|
|
(simple-format #f " server ~A;\n" server))
|
|
|
|
|
(nginx-upstream-configuration-servers upstream))
|
2016-09-26 21:55:58 +00:00
|
|
|
|
" }\n"))
|
|
|
|
|
|
2017-04-27 17:49:02 +00:00
|
|
|
|
(define (flatten . lst)
|
|
|
|
|
"Return a list that recursively concatenates all sub-lists of LST."
|
|
|
|
|
(define (flatten1 head out)
|
|
|
|
|
(if (list? head)
|
|
|
|
|
(fold-right flatten1 out head)
|
|
|
|
|
(cons head out)))
|
|
|
|
|
(fold-right flatten1 '() lst))
|
|
|
|
|
|
2017-12-03 19:36:40 +00:00
|
|
|
|
(define (default-nginx-config config)
|
|
|
|
|
(match-record config
|
|
|
|
|
<nginx-configuration>
|
|
|
|
|
(nginx log-directory run-directory
|
|
|
|
|
server-blocks upstream-blocks
|
|
|
|
|
server-names-hash-bucket-size
|
|
|
|
|
server-names-hash-bucket-max-size)
|
|
|
|
|
(apply mixed-text-file "nginx.conf"
|
|
|
|
|
(flatten
|
|
|
|
|
"user nginx nginx;\n"
|
|
|
|
|
"pid " run-directory "/pid;\n"
|
|
|
|
|
"error_log " log-directory "/error.log info;\n"
|
|
|
|
|
"http {\n"
|
|
|
|
|
" client_body_temp_path " run-directory "/client_body_temp;\n"
|
|
|
|
|
" proxy_temp_path " run-directory "/proxy_temp;\n"
|
|
|
|
|
" fastcgi_temp_path " run-directory "/fastcgi_temp;\n"
|
|
|
|
|
" uwsgi_temp_path " run-directory "/uwsgi_temp;\n"
|
|
|
|
|
" scgi_temp_path " run-directory "/scgi_temp;\n"
|
|
|
|
|
" access_log " log-directory "/access.log;\n"
|
|
|
|
|
" include " nginx "/share/nginx/conf/mime.types;\n"
|
|
|
|
|
(if server-names-hash-bucket-size
|
|
|
|
|
(string-append
|
|
|
|
|
" server_names_hash_bucket_size "
|
|
|
|
|
(number->string server-names-hash-bucket-size)
|
|
|
|
|
";\n")
|
|
|
|
|
"")
|
|
|
|
|
(if server-names-hash-bucket-max-size
|
|
|
|
|
(string-append
|
|
|
|
|
" server_names_hash_bucket_max_size "
|
|
|
|
|
(number->string server-names-hash-bucket-max-size)
|
|
|
|
|
";\n")
|
|
|
|
|
"")
|
|
|
|
|
"\n"
|
|
|
|
|
(map emit-nginx-upstream-config upstream-blocks)
|
|
|
|
|
(map emit-nginx-server-config server-blocks)
|
|
|
|
|
"}\n"
|
|
|
|
|
"events {}\n"))))
|
2015-08-03 03:29:53 +00:00
|
|
|
|
|
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 %nginx-accounts
|
|
|
|
|
(list (user-group (name "nginx") (system? #t))
|
|
|
|
|
(user-account
|
|
|
|
|
(name "nginx")
|
|
|
|
|
(group "nginx")
|
|
|
|
|
(system? #t)
|
|
|
|
|
(comment "nginx server user")
|
|
|
|
|
(home-directory "/var/empty")
|
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
|
|
|
|
(shell (file-append shadow "/sbin/nologin")))))
|
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
|
|
|
|
|
2017-12-03 19:36:40 +00:00
|
|
|
|
(define (nginx-activation config)
|
|
|
|
|
(match-record config
|
|
|
|
|
<nginx-configuration>
|
|
|
|
|
(nginx log-directory run-directory file)
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (guix build utils))
|
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
|
|
|
|
|
2017-12-03 19:36:40 +00:00
|
|
|
|
(format #t "creating nginx log directory '~a'~%" #$log-directory)
|
|
|
|
|
(mkdir-p #$log-directory)
|
|
|
|
|
(format #t "creating nginx run directory '~a'~%" #$run-directory)
|
|
|
|
|
(mkdir-p #$run-directory)
|
|
|
|
|
(format #t "creating nginx temp directories '~a/{client_body,proxy,fastcgi,uwsgi,scgi}_temp'~%" #$run-directory)
|
|
|
|
|
(mkdir-p (string-append #$run-directory "/client_body_temp"))
|
|
|
|
|
(mkdir-p (string-append #$run-directory "/proxy_temp"))
|
|
|
|
|
(mkdir-p (string-append #$run-directory "/fastcgi_temp"))
|
|
|
|
|
(mkdir-p (string-append #$run-directory "/uwsgi_temp"))
|
|
|
|
|
(mkdir-p (string-append #$run-directory "/scgi_temp"))
|
|
|
|
|
;; Start-up logs. Once configuration is loaded, nginx switches to
|
|
|
|
|
;; log-directory.
|
|
|
|
|
(mkdir-p (string-append #$run-directory "/logs"))
|
|
|
|
|
;; Check configuration file syntax.
|
|
|
|
|
(system* (string-append #$nginx "/sbin/nginx")
|
|
|
|
|
"-c" #$(or file
|
|
|
|
|
(default-nginx-config config))
|
|
|
|
|
"-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
|
|
|
|
|
2017-12-03 19:36:40 +00:00
|
|
|
|
(define (nginx-shepherd-service config)
|
|
|
|
|
(match-record config
|
|
|
|
|
<nginx-configuration>
|
|
|
|
|
(nginx file run-directory)
|
|
|
|
|
(let* ((nginx-binary (file-append nginx "/sbin/nginx"))
|
|
|
|
|
(nginx-action
|
|
|
|
|
(lambda args
|
|
|
|
|
#~(lambda _
|
|
|
|
|
(zero?
|
|
|
|
|
(system* #$nginx-binary "-c"
|
|
|
|
|
#$(or file
|
|
|
|
|
(default-nginx-config config))
|
|
|
|
|
#$@args))))))
|
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
|
|
|
|
|
2017-12-03 19:36:40 +00:00
|
|
|
|
;; TODO: Add 'reload' action.
|
|
|
|
|
(list (shepherd-service
|
|
|
|
|
(provision '(nginx))
|
|
|
|
|
(documentation "Run the nginx daemon.")
|
|
|
|
|
(requirement '(user-processes loopback))
|
|
|
|
|
(start (nginx-action "-p" run-directory))
|
|
|
|
|
(stop (nginx-action "-s" "stop")))))))
|
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 nginx-service-type
|
|
|
|
|
(service-type (name 'nginx)
|
|
|
|
|
(extensions
|
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 (service-extension shepherd-root-service-type
|
|
|
|
|
nginx-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
|
|
|
|
(service-extension activation-service-type
|
|
|
|
|
nginx-activation)
|
|
|
|
|
(service-extension account-service-type
|
2016-12-13 20:00:53 +00:00
|
|
|
|
(const %nginx-accounts))))
|
|
|
|
|
(compose concatenate)
|
|
|
|
|
(extend (lambda (config servers)
|
|
|
|
|
(nginx-configuration
|
|
|
|
|
(inherit config)
|
|
|
|
|
(server-blocks
|
|
|
|
|
(append (nginx-configuration-server-blocks config)
|
2017-07-30 12:51:35 +00:00
|
|
|
|
servers)))))
|
|
|
|
|
(default-value
|
|
|
|
|
(nginx-configuration))))
|
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
|
|
|
|
|
2017-04-27 08:08:36 +00:00
|
|
|
|
(define-record-type* <fcgiwrap-configuration> fcgiwrap-configuration
|
|
|
|
|
make-fcgiwrap-configuration
|
|
|
|
|
fcgiwrap-configuration?
|
|
|
|
|
(package fcgiwrap-configuration-package ;<package>
|
|
|
|
|
(default fcgiwrap))
|
|
|
|
|
(socket fcgiwrap-configuration-socket
|
|
|
|
|
(default "tcp:127.0.0.1:9000"))
|
|
|
|
|
(user fcgiwrap-configuration-user
|
|
|
|
|
(default "fcgiwrap"))
|
|
|
|
|
(group fcgiwrap-configuration-group
|
|
|
|
|
(default "fcgiwrap")))
|
|
|
|
|
|
|
|
|
|
(define fcgiwrap-accounts
|
|
|
|
|
(match-lambda
|
|
|
|
|
(($ <fcgiwrap-configuration> package socket user group)
|
|
|
|
|
(filter identity
|
|
|
|
|
(list
|
|
|
|
|
(and (equal? group "fcgiwrap")
|
|
|
|
|
(user-group
|
|
|
|
|
(name "fcgiwrap")
|
|
|
|
|
(system? #t)))
|
|
|
|
|
(and (equal? user "fcgiwrap")
|
|
|
|
|
(user-account
|
|
|
|
|
(name "fcgiwrap")
|
|
|
|
|
(group group)
|
|
|
|
|
(system? #t)
|
|
|
|
|
(comment "Fcgiwrap Daemon")
|
|
|
|
|
(home-directory "/var/empty")
|
|
|
|
|
(shell (file-append shadow "/sbin/nologin")))))))))
|
|
|
|
|
|
|
|
|
|
(define fcgiwrap-shepherd-service
|
|
|
|
|
(match-lambda
|
|
|
|
|
(($ <fcgiwrap-configuration> package socket user group)
|
|
|
|
|
(list (shepherd-service
|
|
|
|
|
(provision '(fcgiwrap))
|
|
|
|
|
(documentation "Run the fcgiwrap daemon.")
|
|
|
|
|
(requirement '(networking))
|
|
|
|
|
(start #~(make-forkexec-constructor
|
|
|
|
|
'(#$(file-append package "/sbin/fcgiwrap")
|
|
|
|
|
"-s" #$socket)
|
|
|
|
|
#:user #$user #:group #$group))
|
|
|
|
|
(stop #~(make-kill-destructor)))))))
|
|
|
|
|
|
|
|
|
|
(define fcgiwrap-service-type
|
|
|
|
|
(service-type (name 'fcgiwrap)
|
|
|
|
|
(extensions
|
|
|
|
|
(list (service-extension shepherd-root-service-type
|
|
|
|
|
fcgiwrap-shepherd-service)
|
|
|
|
|
(service-extension account-service-type
|
|
|
|
|
fcgiwrap-accounts)))
|
|
|
|
|
(default-value (fcgiwrap-configuration))))
|
2017-10-09 21:06:05 +00:00
|
|
|
|
|
|
|
|
|
(define-record-type* <php-fpm-configuration> php-fpm-configuration
|
|
|
|
|
make-php-fpm-configuration
|
|
|
|
|
php-fpm-configuration?
|
|
|
|
|
(php php-fpm-configuration-php ;<package>
|
|
|
|
|
(default php))
|
|
|
|
|
(socket php-fpm-configuration-socket
|
|
|
|
|
(default (string-append "/var/run/php"
|
|
|
|
|
(version-major (package-version php))
|
|
|
|
|
"-fpm.sock")))
|
|
|
|
|
(user php-fpm-configuration-user
|
|
|
|
|
(default "php-fpm"))
|
|
|
|
|
(group php-fpm-configuration-group
|
|
|
|
|
(default "php-fpm"))
|
|
|
|
|
(socket-user php-fpm-configuration-socket-user
|
|
|
|
|
(default "php-fpm"))
|
|
|
|
|
(socket-group php-fpm-configuration-socket-group
|
|
|
|
|
(default "nginx"))
|
|
|
|
|
(pid-file php-fpm-configuration-pid-file
|
|
|
|
|
(default (string-append "/var/run/php"
|
|
|
|
|
(version-major (package-version php))
|
|
|
|
|
"-fpm.pid")))
|
|
|
|
|
(log-file php-fpm-configuration-log-file
|
|
|
|
|
(default (string-append "/var/log/php"
|
|
|
|
|
(version-major (package-version php))
|
|
|
|
|
"-fpm.log")))
|
|
|
|
|
(process-manager php-fpm-configuration-process-manager
|
|
|
|
|
(default (php-fpm-dynamic-process-manager-configuration)))
|
|
|
|
|
(display-errors php-fpm-configuration-display-errors
|
|
|
|
|
(default #f))
|
|
|
|
|
(workers-log-file php-fpm-configuration-workers-log-file
|
|
|
|
|
(default (string-append "/var/log/php"
|
|
|
|
|
(version-major (package-version php))
|
|
|
|
|
"-fpm.www.log")))
|
|
|
|
|
(file php-fpm-configuration-file ;#f | file-like
|
|
|
|
|
(default #f)))
|
|
|
|
|
|
|
|
|
|
(define-record-type* <php-fpm-dynamic-process-manager-configuration>
|
|
|
|
|
php-fpm-dynamic-process-manager-configuration
|
|
|
|
|
make-php-fpm-dynamic-process-manager-configuration
|
|
|
|
|
php-fpm-dynamic-process-manager-configuration?
|
|
|
|
|
(max-children php-fpm-dynamic-process-manager-configuration-max-children
|
|
|
|
|
(default 5))
|
|
|
|
|
(start-servers php-fpm-dynamic-process-manager-configuration-start-servers
|
|
|
|
|
(default 2))
|
|
|
|
|
(min-spare-servers php-fpm-dynamic-process-manager-configuration-min-spare-servers
|
|
|
|
|
(default 1))
|
|
|
|
|
(max-spare-servers php-fpm-dynamic-process-manager-configuration-max-spare-servers
|
|
|
|
|
(default 3)))
|
|
|
|
|
|
|
|
|
|
(define-record-type* <php-fpm-static-process-manager-configuration>
|
|
|
|
|
php-fpm-static-process-manager-configuration
|
|
|
|
|
make-php-fpm-static-process-manager-configuration
|
|
|
|
|
php-fpm-static-process-manager-configuration?
|
|
|
|
|
(max-children php-fpm-static-process-manager-configuration-max-children
|
|
|
|
|
(default 5)))
|
|
|
|
|
|
|
|
|
|
(define-record-type* <php-fpm-on-demand-process-manager-configuration>
|
|
|
|
|
php-fpm-on-demand-process-manager-configuration
|
|
|
|
|
make-php-fpm-on-demand-process-manager-configuration
|
|
|
|
|
php-fpm-on-demand-process-manager-configuration?
|
|
|
|
|
(max-children php-fpm-on-demand-process-manager-configuration-max-children
|
|
|
|
|
(default 5))
|
|
|
|
|
(process-idle-timeout php-fpm-on-demand-process-manager-configuration-process-idle-timeout
|
|
|
|
|
(default 10)))
|
|
|
|
|
|
|
|
|
|
(define php-fpm-accounts
|
|
|
|
|
(match-lambda
|
|
|
|
|
(($ <php-fpm-configuration> php socket user group socket-user socket-group _ _ _ _ _ _)
|
|
|
|
|
(list
|
|
|
|
|
(user-group (name "php-fpm") (system? #t))
|
|
|
|
|
(user-group
|
|
|
|
|
(name group)
|
|
|
|
|
(system? #t))
|
|
|
|
|
(user-account
|
|
|
|
|
(name user)
|
|
|
|
|
(group group)
|
|
|
|
|
(supplementary-groups '("php-fpm"))
|
|
|
|
|
(system? #t)
|
|
|
|
|
(comment "php-fpm daemon user")
|
|
|
|
|
(home-directory "/var/empty")
|
|
|
|
|
(shell (file-append shadow "/sbin/nologin")))))))
|
|
|
|
|
|
|
|
|
|
(define (default-php-fpm-config socket user group socket-user socket-group
|
|
|
|
|
pid-file log-file pm display-errors workers-log-file)
|
|
|
|
|
(apply mixed-text-file "php-fpm.conf"
|
|
|
|
|
(flatten
|
|
|
|
|
"[global]\n"
|
|
|
|
|
"pid =" pid-file "\n"
|
|
|
|
|
"error_log =" log-file "\n"
|
|
|
|
|
"[www]\n"
|
|
|
|
|
"user =" user "\n"
|
|
|
|
|
"group =" group "\n"
|
|
|
|
|
"listen =" socket "\n"
|
|
|
|
|
"listen.owner =" socket-user "\n"
|
|
|
|
|
"listen.group =" socket-group "\n"
|
|
|
|
|
|
|
|
|
|
(match pm
|
|
|
|
|
(($ <php-fpm-dynamic-process-manager-configuration>
|
|
|
|
|
pm.max-children
|
|
|
|
|
pm.start-servers
|
|
|
|
|
pm.min-spare-servers
|
|
|
|
|
pm.max-spare-servers)
|
|
|
|
|
(list
|
|
|
|
|
"pm = dynamic\n"
|
|
|
|
|
"pm.max_children =" (number->string pm.max-children) "\n"
|
|
|
|
|
"pm.start_servers =" (number->string pm.start-servers) "\n"
|
|
|
|
|
"pm.min_spare_servers =" (number->string pm.min-spare-servers) "\n"
|
|
|
|
|
"pm.max_spare_servers =" (number->string pm.max-spare-servers) "\n"))
|
|
|
|
|
|
|
|
|
|
(($ <php-fpm-static-process-manager-configuration>
|
|
|
|
|
pm.max-children)
|
|
|
|
|
(list
|
|
|
|
|
"pm = static\n"
|
|
|
|
|
"pm.max_children =" (number->string pm.max-children) "\n"))
|
|
|
|
|
|
|
|
|
|
(($ <php-fpm-on-demand-process-manager-configuration>
|
|
|
|
|
pm.max-children
|
|
|
|
|
pm.process-idle-timeout)
|
|
|
|
|
(list
|
|
|
|
|
"pm = ondemand\n"
|
|
|
|
|
"pm.max_children =" (number->string pm.max-children) "\n"
|
|
|
|
|
"pm.process_idle_timeout =" (number->string pm.process-idle-timeout) "s\n")))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
"php_flag[display_errors] = " (if display-errors "on" "off") "\n"
|
|
|
|
|
|
|
|
|
|
(if workers-log-file
|
|
|
|
|
(list "catch_workers_output = yes\n"
|
|
|
|
|
"php_admin_value[error_log] =" workers-log-file "\n"
|
|
|
|
|
"php_admin_flag[log_errors] = on\n")
|
|
|
|
|
(list "catch_workers_output = no\n")))))
|
|
|
|
|
|
|
|
|
|
(define php-fpm-shepherd-service
|
|
|
|
|
(match-lambda
|
|
|
|
|
(($ <php-fpm-configuration> php socket user group socket-user socket-group
|
|
|
|
|
pid-file log-file pm display-errors workers-log-file file)
|
|
|
|
|
(list (shepherd-service
|
|
|
|
|
(provision '(php-fpm))
|
|
|
|
|
(documentation "Run the php-fpm daemon.")
|
|
|
|
|
(requirement '(networking))
|
|
|
|
|
(start #~(make-forkexec-constructor
|
|
|
|
|
'(#$(file-append php "/sbin/php-fpm")
|
|
|
|
|
"--fpm-config"
|
|
|
|
|
#$(or file
|
|
|
|
|
(default-php-fpm-config socket user group
|
|
|
|
|
socket-user socket-group pid-file log-file
|
|
|
|
|
pm display-errors workers-log-file)))
|
|
|
|
|
#:pid-file #$pid-file))
|
|
|
|
|
(stop #~(make-kill-destructor)))))))
|
|
|
|
|
|
|
|
|
|
(define php-fpm-activation
|
|
|
|
|
(match-lambda
|
|
|
|
|
(($ <php-fpm-configuration> _ _ user _ _ _ _ log-file _ _ workers-log-file _)
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (guix build utils))
|
|
|
|
|
(let* ((user (getpwnam #$user))
|
|
|
|
|
(touch (lambda (file-name)
|
|
|
|
|
(call-with-output-file file-name (const #t))))
|
|
|
|
|
(init-log-file
|
|
|
|
|
(lambda (file-name)
|
|
|
|
|
(when #$workers-log-file
|
|
|
|
|
(when (not (file-exists? file-name))
|
|
|
|
|
(touch file-name))
|
|
|
|
|
(chown file-name (passwd:uid user) (passwd:gid user))
|
|
|
|
|
(chmod file-name #o660)))))
|
|
|
|
|
(init-log-file #$log-file)
|
|
|
|
|
(init-log-file #$workers-log-file))))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(define php-fpm-service-type
|
|
|
|
|
(service-type
|
|
|
|
|
(name 'php-fpm)
|
|
|
|
|
(description
|
|
|
|
|
"Run @command{php-fpm} to provide a fastcgi socket for calling php through
|
|
|
|
|
a webserver.")
|
|
|
|
|
(extensions
|
|
|
|
|
(list (service-extension shepherd-root-service-type
|
|
|
|
|
php-fpm-shepherd-service)
|
|
|
|
|
(service-extension activation-service-type
|
|
|
|
|
php-fpm-activation)
|
|
|
|
|
(service-extension account-service-type
|
|
|
|
|
php-fpm-accounts)))
|
|
|
|
|
(default-value (php-fpm-configuration))))
|
|
|
|
|
|
|
|
|
|
(define* (nginx-php-location
|
|
|
|
|
#:key
|
|
|
|
|
(nginx-package nginx)
|
|
|
|
|
(socket (string-append "/var/run/php"
|
|
|
|
|
(version-major (package-version php))
|
|
|
|
|
"-fpm.sock")))
|
|
|
|
|
"Return a nginx-location-configuration that makes nginx run .php files."
|
|
|
|
|
(nginx-location-configuration
|
|
|
|
|
(uri "~ \\.php$")
|
|
|
|
|
(body (list
|
|
|
|
|
"fastcgi_split_path_info ^(.+\\.php)(/.+)$;"
|
|
|
|
|
(string-append "fastcgi_pass unix:" socket ";")
|
|
|
|
|
"fastcgi_index index.php;"
|
|
|
|
|
(list "include " nginx-package "/share/nginx/conf/fastcgi.conf;")))))
|
2018-01-12 22:14:14 +00:00
|
|
|
|
|
|
|
|
|
(define* (cat-avatar-generator-service
|
|
|
|
|
#:key
|
|
|
|
|
(cache-dir "/var/cache/cat-avatar-generator")
|
|
|
|
|
(package cat-avatar-generator)
|
|
|
|
|
(configuration (nginx-server-configuration)))
|
|
|
|
|
(simple-service
|
|
|
|
|
'cat-http-server nginx-service-type
|
|
|
|
|
(list (nginx-server-configuration
|
|
|
|
|
(inherit configuration)
|
|
|
|
|
(locations
|
|
|
|
|
(cons
|
|
|
|
|
(let ((base (nginx-php-location)))
|
|
|
|
|
(nginx-location-configuration
|
|
|
|
|
(inherit base)
|
|
|
|
|
(body (list (string-append "fastcgi_param CACHE_DIR \""
|
|
|
|
|
cache-dir "\";")
|
|
|
|
|
(nginx-location-configuration-body base)))))
|
|
|
|
|
(nginx-server-configuration-locations configuration)))
|
|
|
|
|
(root #~(string-append #$package
|
|
|
|
|
"/share/web/cat-avatar-generator"))))))
|
2018-05-30 09:47:04 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(define-record-type* <hpcguix-web-configuration>
|
|
|
|
|
hpcguix-web-configuration make-hpcguix-web-configuration
|
|
|
|
|
hpcguix-web-configuration?
|
|
|
|
|
|
|
|
|
|
(package hpcguix-web-package (default hpcguix-web)) ;<package>
|
|
|
|
|
|
|
|
|
|
;; Specs is gexp of hpcguix-web configuration file
|
|
|
|
|
(specs hpcguix-web-configuration-specs))
|
|
|
|
|
|
|
|
|
|
(define %hpcguix-web-accounts
|
|
|
|
|
(list (user-group
|
|
|
|
|
(name "hpcguix-web")
|
|
|
|
|
(system? #t))
|
|
|
|
|
(user-account
|
|
|
|
|
(name "hpcguix-web")
|
|
|
|
|
(group "hpcguix-web")
|
|
|
|
|
(system? #t)
|
|
|
|
|
(comment "hpcguix-web")
|
|
|
|
|
(home-directory "/var/empty")
|
|
|
|
|
(shell (file-append shadow "/sbin/nologin")))))
|
|
|
|
|
|
|
|
|
|
(define %hpcguix-web-activation
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (guix build utils))
|
|
|
|
|
(let ((home-dir "/var/cache/guix/web")
|
|
|
|
|
(user (getpwnam "hpcguix-web")))
|
|
|
|
|
(mkdir-p home-dir)
|
|
|
|
|
(chown home-dir (passwd:uid user) (passwd:gid user))
|
|
|
|
|
(chmod home-dir #o755))))
|
|
|
|
|
|
|
|
|
|
(define (hpcguix-web-shepherd-service config)
|
|
|
|
|
(let ((specs (hpcguix-web-configuration-specs config))
|
|
|
|
|
(hpcguix-web (hpcguix-web-package config)))
|
|
|
|
|
(with-imported-modules (source-module-closure
|
|
|
|
|
'((gnu build shepherd)))
|
|
|
|
|
(shepherd-service
|
|
|
|
|
(documentation "hpcguix-web daemon")
|
|
|
|
|
(provision '(hpcguix-web))
|
|
|
|
|
(requirement '(networking))
|
|
|
|
|
(start #~(make-forkexec-constructor
|
|
|
|
|
(list #$(file-append hpcguix-web "/bin/run")
|
|
|
|
|
(string-append "--config="
|
|
|
|
|
#$(scheme-file "hpcguix-web.scm" specs)))
|
|
|
|
|
#:user "hpcguix-web"
|
|
|
|
|
#:group "hpcguix-web"
|
|
|
|
|
#:environment-variables
|
|
|
|
|
(list "XDG_CACHE_HOME=/var/cache")))
|
|
|
|
|
(stop #~(make-kill-destructor))))))
|
|
|
|
|
|
|
|
|
|
(define hpcguix-web-service-type
|
|
|
|
|
(service-type
|
|
|
|
|
(name 'hpcguix-web)
|
|
|
|
|
(description "Run the hpcguix-web server.")
|
|
|
|
|
(extensions
|
|
|
|
|
(list (service-extension account-service-type
|
|
|
|
|
(const %hpcguix-web-accounts))
|
|
|
|
|
(service-extension activation-service-type
|
|
|
|
|
(const %hpcguix-web-activation))
|
|
|
|
|
(service-extension shepherd-root-service-type
|
|
|
|
|
(compose list hpcguix-web-shepherd-service))))))
|