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.
		
			
				
	
	
		
			309 lines
		
	
	
	
		
			11 KiB
		
	
	
	
		
			Scheme
		
	
	
	
	
	
			
		
		
	
	
			309 lines
		
	
	
	
		
			11 KiB
		
	
	
	
		
			Scheme
		
	
	
	
	
	
| ;;; GNU Guix --- Functional package management for GNU
 | ||
| ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 | ||
| ;;;
 | ||
| ;;; 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 system shadow)
 | ||
|   #:use-module (guix records)
 | ||
|   #:use-module (guix gexp)
 | ||
|   #:use-module (guix store)
 | ||
|   #:use-module (guix sets)
 | ||
|   #:use-module (guix ui)
 | ||
|   #:use-module (gnu services)
 | ||
|   #:use-module ((gnu system file-systems)
 | ||
|                 #:select (%tty-gid))
 | ||
|   #:use-module ((gnu packages admin)
 | ||
|                 #:select (shadow))
 | ||
|   #:use-module (gnu packages bash)
 | ||
|   #:use-module (gnu packages guile-wm)
 | ||
|   #:use-module (srfi srfi-1)
 | ||
|   #:use-module (srfi srfi-26)
 | ||
|   #:use-module (srfi srfi-34)
 | ||
|   #:use-module (srfi srfi-35)
 | ||
|   #:export (user-account
 | ||
|             user-account?
 | ||
|             user-account-name
 | ||
|             user-account-password
 | ||
|             user-account-uid
 | ||
|             user-account-group
 | ||
|             user-account-supplementary-groups
 | ||
|             user-account-comment
 | ||
|             user-account-home-directory
 | ||
|             user-account-shell
 | ||
|             user-account-system?
 | ||
| 
 | ||
|             user-group
 | ||
|             user-group?
 | ||
|             user-group-name
 | ||
|             user-group-password
 | ||
|             user-group-id
 | ||
|             user-group-system?
 | ||
| 
 | ||
|             default-skeletons
 | ||
|             skeleton-directory
 | ||
|             %base-groups
 | ||
|             %base-user-accounts
 | ||
| 
 | ||
|             account-service-type
 | ||
|             account-service))
 | ||
| 
 | ||
| ;;; Commentary:
 | ||
| ;;;
 | ||
| ;;; Utilities for configuring the Shadow tool suite ('login', 'passwd', etc.)
 | ||
| ;;;
 | ||
| ;;; Code:
 | ||
| 
 | ||
| (define-record-type* <user-account>
 | ||
|   user-account make-user-account
 | ||
|   user-account?
 | ||
|   (name           user-account-name)
 | ||
|   (password       user-account-password (default #f))
 | ||
|   (uid            user-account-uid (default #f))
 | ||
|   (group          user-account-group)             ; number | string
 | ||
|   (supplementary-groups user-account-supplementary-groups
 | ||
|                         (default '()))            ; list of strings
 | ||
|   (comment        user-account-comment (default ""))
 | ||
|   (home-directory user-account-home-directory)
 | ||
|   (shell          user-account-shell              ; gexp
 | ||
|                   (default #~(string-append #$bash "/bin/bash")))
 | ||
|   (system?        user-account-system?            ; Boolean
 | ||
|                   (default #f)))
 | ||
| 
 | ||
| (define-record-type* <user-group>
 | ||
|   user-group make-user-group
 | ||
|   user-group?
 | ||
|   (name           user-group-name)
 | ||
|   (password       user-group-password (default #f))
 | ||
|   (id             user-group-id (default #f))
 | ||
|   (system?        user-group-system?              ; Boolean
 | ||
|                   (default #f)))
 | ||
| 
 | ||
| 
 | ||
| (define %base-groups
 | ||
|   ;; Default set of groups.
 | ||
|   (let-syntax ((system-group (syntax-rules ()
 | ||
|                                ((_ args ...)
 | ||
|                                 (user-group (system? #t) args ...)))))
 | ||
|     (list (system-group (name "root") (id 0))
 | ||
|           (system-group (name "wheel"))           ; root-like users
 | ||
|           (system-group (name "users"))           ; normal users
 | ||
|           (system-group (name "nogroup"))         ; for daemons etc.
 | ||
| 
 | ||
|           ;; The following groups are conventionally used by things like udev to
 | ||
|           ;; control access to hardware devices.
 | ||
|           (system-group (name "tty") (id %tty-gid))
 | ||
|           (system-group (name "dialout"))
 | ||
|           (system-group (name "kmem"))
 | ||
|           (system-group (name "input"))           ; input devices, from udev
 | ||
|           (system-group (name "video"))
 | ||
|           (system-group (name "audio"))
 | ||
|           (system-group (name "netdev"))          ; used in avahi-dbus.conf
 | ||
|           (system-group (name "lp"))
 | ||
|           (system-group (name "disk"))
 | ||
|           (system-group (name "floppy"))
 | ||
|           (system-group (name "cdrom"))
 | ||
|           (system-group (name "tape"))
 | ||
|           (system-group (name "kvm")))))          ; for /dev/kvm
 | ||
| 
 | ||
| (define %base-user-accounts
 | ||
|   ;; List of standard user accounts.  Note that "root" is a special case, so
 | ||
|   ;; it's not listed here.
 | ||
|   (list (user-account
 | ||
|          (name "nobody")
 | ||
|          (uid 65534)
 | ||
|          (group "nogroup")
 | ||
|          (home-directory "/var/empty")
 | ||
|          (system? #t))))
 | ||
| 
 | ||
| (define (default-skeletons)
 | ||
|   "Return the default skeleton files for /etc/skel.  These files are copied by
 | ||
| 'useradd' in the home directory of newly created user accounts."
 | ||
|   (define copy-guile-wm
 | ||
|     #~(begin
 | ||
|         (use-modules (guix build utils))
 | ||
|         (copy-file (car (find-files #$guile-wm "wm-init-sample.scm"))
 | ||
|                    #$output)))
 | ||
| 
 | ||
|   (let ((profile (plain-file "bash_profile" "\
 | ||
| # Honor per-interactive-shell startup file
 | ||
| if [ -f ~/.bashrc ]; then . ~/.bashrc; fi\n"))
 | ||
|         (bashrc  (plain-file "bashrc" "\
 | ||
| # Bash initialization for interactive non-login shells and
 | ||
| # for remote shells (info \"(bash) Bash Startup Files\").
 | ||
| 
 | ||
| # Export 'SHELL' to child processes.  Programs such as 'screen'
 | ||
| # honor it and otherwise use /bin/sh.
 | ||
| export SHELL
 | ||
| 
 | ||
| if [ -n \"$SSH_CLIENT\" -a -z \"`type -P cat`\" ]
 | ||
| then
 | ||
|     # We are being invoked from a non-interactive SSH session
 | ||
|     # (as in \"ssh host command\") but 'cat' cannot be found
 | ||
|     # in $PATH.  Source /etc/profile so we get $PATH and other
 | ||
|     # essential variables.
 | ||
|     source /etc/profile
 | ||
| fi
 | ||
| 
 | ||
| # Adjust the prompt depending on whether we're in 'guix environment'.
 | ||
| if [ -n \"$GUIX_ENVIRONMENT\" ]
 | ||
| then
 | ||
|     export PS1='\\u@\\h \\w [env]\\$ '
 | ||
| else
 | ||
|     export PS1='\\u@\\h \\w\\$ '
 | ||
| fi
 | ||
| alias ls='ls -p --color'
 | ||
| alias ll='ls -l'\n"))
 | ||
|         (zlogin    (plain-file "zlogin" "\
 | ||
| # Honor system-wide environment variables
 | ||
| source /etc/profile\n"))
 | ||
|         (guile-wm  (computed-file "guile-wm" copy-guile-wm
 | ||
|                                   #:modules '((guix build utils))))
 | ||
|         (xdefaults (plain-file "Xdefaults" "\
 | ||
| XTerm*utf8: always
 | ||
| XTerm*metaSendsEscape: true\n"))
 | ||
|         (gdbinit   (plain-file "gdbinit" "\
 | ||
| # Tell GDB where to look for separate debugging files.
 | ||
| set debug-file-directory ~/.guix-profile/lib/debug\n")))
 | ||
|     `((".bash_profile" ,profile)
 | ||
|       (".bashrc" ,bashrc)
 | ||
|       (".zlogin" ,zlogin)
 | ||
|       (".Xdefaults" ,xdefaults)
 | ||
|       (".guile-wm" ,guile-wm)
 | ||
|       (".gdbinit" ,gdbinit))))
 | ||
| 
 | ||
| (define (skeleton-directory skeletons)
 | ||
|   "Return a directory containing SKELETONS, a list of name/derivation tuples."
 | ||
|   (computed-file "skel"
 | ||
|                  #~(begin
 | ||
|                      (use-modules (ice-9 match))
 | ||
| 
 | ||
|                      (mkdir #$output)
 | ||
|                      (chdir #$output)
 | ||
| 
 | ||
|                      ;; Note: copy the skeletons instead of symlinking
 | ||
|                      ;; them like 'file-union' does, because 'useradd'
 | ||
|                      ;; would just copy the symlinks as is.
 | ||
|                      (for-each (match-lambda
 | ||
|                                  ((target source)
 | ||
|                                   (copy-file source target)))
 | ||
|                                '#$skeletons)
 | ||
|                      #t)))
 | ||
| 
 | ||
| (define (assert-valid-users/groups users groups)
 | ||
|   "Raise an error if USERS refer to groups not listed in GROUPS."
 | ||
|   (let ((groups (list->set (map user-group-name groups))))
 | ||
|     (define (validate-supplementary-group user group)
 | ||
|       (unless (set-contains? groups group)
 | ||
|         (raise (condition
 | ||
|                 (&message
 | ||
|                  (message
 | ||
|                   (format #f (_ "supplementary group '~a' \
 | ||
| of user '~a' is undeclared")
 | ||
|                           group
 | ||
|                           (user-account-name user))))))))
 | ||
| 
 | ||
|     (for-each (lambda (user)
 | ||
|                 (unless (set-contains? groups (user-account-group user))
 | ||
|                   (raise (condition
 | ||
|                           (&message
 | ||
|                            (message
 | ||
|                             (format #f (_ "primary group '~a' \
 | ||
| of user '~a' is undeclared")
 | ||
|                                     (user-account-group user)
 | ||
|                                     (user-account-name user)))))))
 | ||
| 
 | ||
|                 (for-each (cut validate-supplementary-group user <>)
 | ||
|                           (user-account-supplementary-groups user)))
 | ||
|               users)))
 | ||
| 
 | ||
| 
 | ||
| ;;;
 | ||
| ;;; Service.
 | ||
| ;;;
 | ||
| 
 | ||
| (define (user-group->gexp group)
 | ||
|   "Turn GROUP, a <user-group> object, into a list-valued gexp suitable for
 | ||
| 'active-groups'."
 | ||
|   #~(list #$(user-group-name group)
 | ||
|           #$(user-group-password group)
 | ||
|           #$(user-group-id group)
 | ||
|           #$(user-group-system? group)))
 | ||
| 
 | ||
| (define (user-account->gexp account)
 | ||
|   "Turn ACCOUNT, a <user-account> object, into a list-valued gexp suitable for
 | ||
| 'activate-users'."
 | ||
|   #~`(#$(user-account-name account)
 | ||
|       #$(user-account-uid account)
 | ||
|       #$(user-account-group account)
 | ||
|       #$(user-account-supplementary-groups account)
 | ||
|       #$(user-account-comment account)
 | ||
|       #$(user-account-home-directory account)
 | ||
|       ,#$(user-account-shell account)             ; this one is a gexp
 | ||
|       #$(user-account-password account)
 | ||
|       #$(user-account-system? account)))
 | ||
| 
 | ||
| (define (account-activation accounts+groups)
 | ||
|   "Return a gexp that activates ACCOUNTS+GROUPS, a list of <user-account> and
 | ||
| <user-group> objects.  Raise an error if a user account refers to a undefined
 | ||
| group."
 | ||
|   (define accounts
 | ||
|     (filter user-account? accounts+groups))
 | ||
| 
 | ||
|   (define user-specs
 | ||
|     (map user-account->gexp accounts))
 | ||
| 
 | ||
|   (define groups
 | ||
|     (filter user-group? accounts+groups))
 | ||
| 
 | ||
|   (define group-specs
 | ||
|     (map user-group->gexp groups))
 | ||
| 
 | ||
|   (assert-valid-users/groups accounts groups)
 | ||
| 
 | ||
|   ;; Add users and user groups.
 | ||
|   #~(begin
 | ||
|       (setenv "PATH"
 | ||
|               (string-append #$(@ (gnu packages admin) shadow) "/sbin"))
 | ||
|       (activate-users+groups (list #$@user-specs)
 | ||
|                              (list #$@group-specs))))
 | ||
| 
 | ||
| (define (etc-skel arguments)
 | ||
|   "Filter out among ARGUMENTS things corresponding to skeletons, and return
 | ||
| the /etc/skel directory for those."
 | ||
|   (let ((skels (filter pair? arguments)))
 | ||
|     `(("skel" ,(skeleton-directory skels)))))
 | ||
| 
 | ||
| (define account-service-type
 | ||
|   (service-type (name 'account)
 | ||
| 
 | ||
|                 ;; Concatenate <user-account>, <user-group>, and skeleton
 | ||
|                 ;; lists.
 | ||
|                 (compose concatenate)
 | ||
|                 (extend append)
 | ||
| 
 | ||
|                 (extensions
 | ||
|                  (list (service-extension activation-service-type
 | ||
|                                           account-activation)
 | ||
|                        (service-extension etc-service-type
 | ||
|                                           etc-skel)))))
 | ||
| 
 | ||
| (define (account-service accounts+groups skeletons)
 | ||
|   "Return a <service> that takes care of user accounts and user groups, with
 | ||
| ACCOUNTS+GROUPS as its initial list of accounts and groups."
 | ||
|   (service account-service-type
 | ||
|            (append skeletons accounts+groups)))
 | ||
| 
 | ||
| ;;; shadow.scm ends here
 |