2013-09-11 20:36:50 +00:00
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
monads: Move '%store-monad' and related procedures where they belong.
This turns (guix monads) into a generic module for monads, and moves the
store monad and related monadic procedures in their corresponding
module.
* guix/monads.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file, package-file, package->derivation,
package->cross-derivation, origin->derivation, imported-modules,
compiled, modules, built-derivations, run-with-store): Move to...
* guix/store.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file): ... here.
(%guile-for-build): New variable.
(run-with-store): Moved from monads.scm. Remove default value for
#:guile-for-build.
* guix/packages.scm (default-guile): Export.
(set-guile-for-build): New procedure.
(package-file, package->derivation, package->cross-derivation,
origin->derivation): Moved from monads.scm.
* guix/derivations.scm (%guile-for-build): Remove.
(imported-modules): Rename to...
(%imported-modules): ... this.
(compiled-modules): Rename to...
(%compiled-modules): ... this.
(built-derivations, imported-modules, compiled-modules): New
procedures.
* gnu/services/avahi.scm, gnu/services/base.scm, gnu/services/dbus.scm,
gnu/services/dmd.scm, gnu/services/networking.scm,
gnu/services/ssh.scm, gnu/services/xorg.scm, gnu/system/install.scm,
gnu/system/linux-initrd.scm, gnu/system/shadow.scm, guix/download.scm,
guix/gexp.scm, guix/git-download.scm, guix/profiles.scm,
guix/svn-download.scm, tests/monads.scm: Adjust imports accordingly.
* guix/monad-repl.scm (default-guile-derivation): New procedure.
(store-monad-language, run-in-store): Use it.
* build-aux/hydra/gnu-system.scm (qemu-jobs): Add explicit
'set-guile-for-build' call.
* guix/scripts/archive.scm (derivation-from-expression): Likewise.
* guix/scripts/build.scm (options/resolve-packages): Likewise.
* guix/scripts/environment.scm (guix-environment): Likewise.
* guix/scripts/system.scm (guix-system): Likewise.
* doc/guix.texi (The Store Monad): Adjust module names accordingly.
2015-01-14 12:34:52 +00:00
|
|
|
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
2013-09-11 20:36:50 +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 system shadow)
|
2013-09-26 19:52:39 +00:00
|
|
|
#:use-module (guix records)
|
2014-04-28 21:07:08 +00:00
|
|
|
#:use-module (guix gexp)
|
monads: Move '%store-monad' and related procedures where they belong.
This turns (guix monads) into a generic module for monads, and moves the
store monad and related monadic procedures in their corresponding
module.
* guix/monads.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file, package-file, package->derivation,
package->cross-derivation, origin->derivation, imported-modules,
compiled, modules, built-derivations, run-with-store): Move to...
* guix/store.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file): ... here.
(%guile-for-build): New variable.
(run-with-store): Moved from monads.scm. Remove default value for
#:guile-for-build.
* guix/packages.scm (default-guile): Export.
(set-guile-for-build): New procedure.
(package-file, package->derivation, package->cross-derivation,
origin->derivation): Moved from monads.scm.
* guix/derivations.scm (%guile-for-build): Remove.
(imported-modules): Rename to...
(%imported-modules): ... this.
(compiled-modules): Rename to...
(%compiled-modules): ... this.
(built-derivations, imported-modules, compiled-modules): New
procedures.
* gnu/services/avahi.scm, gnu/services/base.scm, gnu/services/dbus.scm,
gnu/services/dmd.scm, gnu/services/networking.scm,
gnu/services/ssh.scm, gnu/services/xorg.scm, gnu/system/install.scm,
gnu/system/linux-initrd.scm, gnu/system/shadow.scm, guix/download.scm,
guix/gexp.scm, guix/git-download.scm, guix/profiles.scm,
guix/svn-download.scm, tests/monads.scm: Adjust imports accordingly.
* guix/monad-repl.scm (default-guile-derivation): New procedure.
(store-monad-language, run-in-store): Use it.
* build-aux/hydra/gnu-system.scm (qemu-jobs): Add explicit
'set-guile-for-build' call.
* guix/scripts/archive.scm (derivation-from-expression): Likewise.
* guix/scripts/build.scm (options/resolve-packages): Likewise.
* guix/scripts/environment.scm (guix-environment): Likewise.
* guix/scripts/system.scm (guix-system): Likewise.
* doc/guix.texi (The Store Monad): Adjust module names accordingly.
2015-01-14 12:34:52 +00:00
|
|
|
#:use-module (guix store)
|
gnu: vm: Rewrite helper functions as monadic functions.
* gnu/system/dmd.scm (host-name-service, nscd-service, mingetty-service,
syslog-service, guix-service, static-networking-service): Rewrite as
monadic functions.
(dmd-configuration-file): Use 'text-file' instead of
'add-text-to-store'.
* gnu/system/grub.scm (grub-configuration-file): Rewrite as a monadic
function.
* gnu/system/linux.scm (pam-services->directory): Likewise.
* gnu/system/shadow.scm (group-file, passwd-file, guix-build-accounts):
Likewise.
* gnu/system/vm.scm (expression->derivation-in-linux-vm, qemu-image,
union, system-qemu-image): Likewise.
2013-10-03 19:30:30 +00:00
|
|
|
#:use-module (guix monads)
|
2014-07-22 21:13:53 +00:00
|
|
|
#:use-module ((gnu system file-systems)
|
|
|
|
#:select (%tty-gid))
|
2014-01-13 22:21:47 +00:00
|
|
|
#:use-module ((gnu packages admin)
|
2013-09-26 21:28:17 +00:00
|
|
|
#:select (shadow))
|
2013-12-09 21:29:01 +00:00
|
|
|
#:use-module (gnu packages bash)
|
2014-05-13 19:32:48 +00:00
|
|
|
#:use-module (gnu packages guile-wm)
|
2013-09-26 19:52:39 +00:00
|
|
|
#:export (user-account
|
|
|
|
user-account?
|
|
|
|
user-account-name
|
system: Make accounts and groups at activation time.
* gnu/services/base.scm (guix-build-accounts): Remove #:gid parameter;
add #:group. Remove 'password' and 'gid' fields in 'user-account'
form, and add 'group'.
(guix-service): Remove #:build-user-gid parameter. Remove 'id' field
in 'user-group' form.
* gnu/system.scm (etc-directory): Remove #:groups and #:accounts. No
longer produce files "passwd", "shadow", and "group". Adjust caller
accordingly.
(%root-account): New variable.
(operating-system-accounts): Add 'users' variable. Add %ROOT-ACCOUNT
only of 'operating-system-users' doesn't already contain a root
account.
(user-group->gexp, user-account->gexp): New procedures.
(operating-system-boot-script): Add calls to 'setenv' and
'activate-users+groups' in gexp.
* gnu/system/linux.scm (base-pam-services): Add PAM services for
"user{add,del,mode}" and "group{add,del,mod}".
* gnu/system/shadow.scm (<user-account>)[gid]: Rename to...
[group]: ... this.
[supplementary-groups]: New field.
[uid, password]: Default to #f.
(<user-group>)[id]: Default to #f.
(group-file, passwd-file): Remove.
* gnu/system/vm.scm (operating-system-default-contents)[user-directories]:
Remove. Add "/home" to the directives.
* guix/build/activation.scm (add-group, add-user,
activate-users+groups): New procedures.
2014-05-11 20:41:01 +00:00
|
|
|
user-account-password
|
2013-09-26 19:52:39 +00:00
|
|
|
user-account-uid
|
system: Make accounts and groups at activation time.
* gnu/services/base.scm (guix-build-accounts): Remove #:gid parameter;
add #:group. Remove 'password' and 'gid' fields in 'user-account'
form, and add 'group'.
(guix-service): Remove #:build-user-gid parameter. Remove 'id' field
in 'user-group' form.
* gnu/system.scm (etc-directory): Remove #:groups and #:accounts. No
longer produce files "passwd", "shadow", and "group". Adjust caller
accordingly.
(%root-account): New variable.
(operating-system-accounts): Add 'users' variable. Add %ROOT-ACCOUNT
only of 'operating-system-users' doesn't already contain a root
account.
(user-group->gexp, user-account->gexp): New procedures.
(operating-system-boot-script): Add calls to 'setenv' and
'activate-users+groups' in gexp.
* gnu/system/linux.scm (base-pam-services): Add PAM services for
"user{add,del,mode}" and "group{add,del,mod}".
* gnu/system/shadow.scm (<user-account>)[gid]: Rename to...
[group]: ... this.
[supplementary-groups]: New field.
[uid, password]: Default to #f.
(<user-group>)[id]: Default to #f.
(group-file, passwd-file): Remove.
* gnu/system/vm.scm (operating-system-default-contents)[user-directories]:
Remove. Add "/home" to the directives.
* guix/build/activation.scm (add-group, add-user,
activate-users+groups): New procedures.
2014-05-11 20:41:01 +00:00
|
|
|
user-account-group
|
|
|
|
user-account-supplementary-groups
|
2013-09-26 19:52:39 +00:00
|
|
|
user-account-comment
|
|
|
|
user-account-home-directory
|
|
|
|
user-account-shell
|
2014-06-27 16:57:33 +00:00
|
|
|
user-account-system?
|
2013-09-26 19:52:39 +00:00
|
|
|
|
2013-09-26 20:02:02 +00:00
|
|
|
user-group
|
|
|
|
user-group?
|
|
|
|
user-group-name
|
|
|
|
user-group-password
|
|
|
|
user-group-id
|
2014-07-24 22:12:35 +00:00
|
|
|
user-group-system?
|
2014-05-13 19:32:48 +00:00
|
|
|
|
|
|
|
default-skeletons
|
2014-06-22 20:16:14 +00:00
|
|
|
skeleton-directory
|
|
|
|
%base-groups))
|
2013-09-11 20:36:50 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
;;;
|
|
|
|
;;; Utilities for configuring the Shadow tool suite ('login', 'passwd', etc.)
|
|
|
|
;;;
|
|
|
|
;;; Code:
|
|
|
|
|
2013-09-26 19:52:39 +00:00
|
|
|
(define-record-type* <user-account>
|
|
|
|
user-account make-user-account
|
|
|
|
user-account?
|
|
|
|
(name user-account-name)
|
system: Make accounts and groups at activation time.
* gnu/services/base.scm (guix-build-accounts): Remove #:gid parameter;
add #:group. Remove 'password' and 'gid' fields in 'user-account'
form, and add 'group'.
(guix-service): Remove #:build-user-gid parameter. Remove 'id' field
in 'user-group' form.
* gnu/system.scm (etc-directory): Remove #:groups and #:accounts. No
longer produce files "passwd", "shadow", and "group". Adjust caller
accordingly.
(%root-account): New variable.
(operating-system-accounts): Add 'users' variable. Add %ROOT-ACCOUNT
only of 'operating-system-users' doesn't already contain a root
account.
(user-group->gexp, user-account->gexp): New procedures.
(operating-system-boot-script): Add calls to 'setenv' and
'activate-users+groups' in gexp.
* gnu/system/linux.scm (base-pam-services): Add PAM services for
"user{add,del,mode}" and "group{add,del,mod}".
* gnu/system/shadow.scm (<user-account>)[gid]: Rename to...
[group]: ... this.
[supplementary-groups]: New field.
[uid, password]: Default to #f.
(<user-group>)[id]: Default to #f.
(group-file, passwd-file): Remove.
* gnu/system/vm.scm (operating-system-default-contents)[user-directories]:
Remove. Add "/home" to the directives.
* guix/build/activation.scm (add-group, add-user,
activate-users+groups): New procedures.
2014-05-11 20:41:01 +00:00
|
|
|
(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
|
2013-09-26 19:52:39 +00:00
|
|
|
(comment user-account-comment (default ""))
|
|
|
|
(home-directory user-account-home-directory)
|
2014-04-28 21:07:08 +00:00
|
|
|
(shell user-account-shell ; gexp
|
2014-06-27 16:57:33 +00:00
|
|
|
(default #~(string-append #$bash "/bin/bash")))
|
|
|
|
(system? user-account-system? ; Boolean
|
|
|
|
(default #f)))
|
2013-09-26 19:52:39 +00:00
|
|
|
|
2013-09-26 20:02:02 +00:00
|
|
|
(define-record-type* <user-group>
|
|
|
|
user-group make-user-group
|
|
|
|
user-group?
|
|
|
|
(name user-group-name)
|
|
|
|
(password user-group-password (default #f))
|
2014-07-24 22:12:35 +00:00
|
|
|
(id user-group-id (default #f))
|
|
|
|
(system? user-group-system? ; Boolean
|
|
|
|
(default #f)))
|
2013-09-26 20:02:02 +00:00
|
|
|
|
2014-06-22 20:16:14 +00:00
|
|
|
(define %base-groups
|
|
|
|
;; Default set of groups.
|
2014-07-24 22:12:35 +00:00
|
|
|
(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.
|
2014-06-22 20:16:14 +00:00
|
|
|
|
2014-07-24 22:12:35 +00:00
|
|
|
;; 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"))
|
2014-09-16 20:43:55 +00:00
|
|
|
(system-group (name "input")) ; input devices, from udev
|
2014-07-24 22:12:35 +00:00
|
|
|
(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"))
|
2014-09-18 21:23:46 +00:00
|
|
|
(system-group (name "tape"))
|
|
|
|
(system-group (name "kvm"))))) ; for /dev/kvm
|
2014-06-22 20:16:14 +00:00
|
|
|
|
2014-05-13 19:32:48 +00:00
|
|
|
(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)))
|
|
|
|
|
2014-12-05 12:01:07 +00:00
|
|
|
(mlet %store-monad ((profile (text-file "bash_profile" "\
|
|
|
|
# Honor per-interactive-shell startup file
|
|
|
|
if [ -f ~/.bashrc ]; then . ~/.bashrc; fi\n"))
|
|
|
|
(bashrc (text-file "bashrc" "\
|
|
|
|
PS1='\\u@\\h \\w\\$ '
|
|
|
|
alias ls='ls -p --color'
|
|
|
|
alias ll='ls -l'\n"))
|
2014-12-05 13:17:49 +00:00
|
|
|
(zlogin (text-file "zlogin" "\
|
|
|
|
# Honor system-wide environment variables
|
|
|
|
source /etc/profile\n"))
|
2014-05-13 19:32:48 +00:00
|
|
|
(guile-wm (gexp->derivation "guile-wm" copy-guile-wm
|
|
|
|
#:modules
|
|
|
|
'((guix build utils))))
|
|
|
|
(xdefaults (text-file "Xdefaults" "\
|
|
|
|
XTerm*utf8: always
|
|
|
|
XTerm*metaSendsEscape: true\n"))
|
|
|
|
(gdbinit (text-file "gdbinit" "\
|
|
|
|
# Tell GDB where to look for separate debugging files.
|
|
|
|
set debug-file-directory ~/.guix-profile/lib/debug\n")))
|
2014-12-05 12:01:07 +00:00
|
|
|
(return `((".bash_profile" ,profile)
|
|
|
|
(".bashrc" ,bashrc)
|
2014-12-05 13:17:49 +00:00
|
|
|
(".zlogin" ,zlogin)
|
2014-05-13 19:32:48 +00:00
|
|
|
(".Xdefaults" ,xdefaults)
|
|
|
|
(".guile-wm" ,guile-wm)
|
|
|
|
(".gdbinit" ,gdbinit)))))
|
|
|
|
|
|
|
|
(define (skeleton-directory skeletons)
|
|
|
|
"Return a directory containing SKELETONS, a list of name/derivation pairs."
|
|
|
|
(gexp->derivation "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)))
|
|
|
|
|
2013-09-11 20:36:50 +00:00
|
|
|
;;; shadow.scm ends here
|