[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/12: services: nscd-service: Fit everything into <nscd-configuration>.
From: |
Ludovic Courtès |
Subject: |
07/12: services: nscd-service: Fit everything into <nscd-configuration>. |
Date: |
Mon, 05 Oct 2015 22:11:58 +0000 |
civodul pushed a commit to branch wip-service-refactor
in repository guix.
commit cd4f86939f2a0141c19e14d97c223b2635b32085
Author: Ludovic Courtès <address@hidden>
Date: Sun Sep 13 12:43:28 2015 +0200
services: nscd-service: Fit everything into <nscd-configuration>.
* gnu/services/base.scm (<nscd-configuration>)[glibc, name-services]:
New fields.
(nscd-service): Remove #:glibc and #:name-services parameters. Adjust
body to take those from CONFIG.
* gnu/services/desktop.scm (%desktop-services): Adjust accordingly.
* doc/guix.texi (Base Services): Adjust accordingly.
(Name Service Switch): Adjust example.
---
doc/guix.texi | 20 +++++++++++++-------
gnu/services/base.scm | 22 +++++++++++++---------
gnu/services/desktop.scm | 4 ++--
3 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index e9b8c42..2054c77 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -5792,11 +5792,9 @@ The Mingetty package to use.
@cindex nscd
@deffn {Scheme Procedure} nscd-service address@hidden [#:glibc glibc] @
[#:name-services '()]
-Return a service that runs libc's name service cache daemon (nscd) with
-the given @var{config}---an @code{<nscd-configuration>} object.
-Optionally, @code{#:name-services} is a list of packages that provide
-name service switch (NSS) modules needed by nscd. @xref{Name Service
-Switch}, for an example.
+Return a service that runs libc's name service cache daemon (nscd) with the
+given @var{config}---an @code{<nscd-configuration>} object. @xref{Name
+Service Switch}, for an example.
@end deffn
@defvr {Scheme Variable} %nscd-default-configuration
@@ -5811,6 +5809,14 @@ configuration.
@table @asis
address@hidden @code{name-services} (default: @code{'()})
+List of packages denoting @dfn{name services} that must be visible to
+the nscd---e.g., @code{(list @var{nss-mdns})}.
+
address@hidden @code{glibc} (default: @var{glibc})
+Package object denoting the GNU C Library providing the @command{nscd}
+command.
+
@item @code{log-file} (default: @code{"/var/log/nscd.log"})
Name of nscd's log file. This is where debugging output goes when
@code{debug-level} is strictly positive.
@@ -6539,8 +6545,8 @@ configuration file:
;; about nss-mdns.
(map (lambda (service)
(if (member 'nscd (service-provision service))
- (nscd-service (nscd-configuration)
- #:name-services (list nss-mdns))
+ (nscd-service (nscd-configuration
+ (name-services (list nss-mdns))))
service))
%base-services))
@end example
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 0b4bd7e..d9d73b4 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -412,7 +412,11 @@ other things."
(default 0))
;; TODO: See nscd.conf in glibc for other options to add.
(caches nscd-configuration-caches ;list of <nscd-cache>
- (default %nscd-default-caches)))
+ (default %nscd-default-caches))
+ (name-services nscd-configuration-name-services ;list of <packages>
+ (default '()))
+ (glibc nscd-configuration-glibc ;<package>
+ (default (canonical-package glibc))))
(define-record-type* <nscd-cache> nscd-cache make-nscd-cache
nscd-cache?
@@ -502,13 +506,10 @@ other things."
(string-concatenate
(map cache->config caches)))))))
-(define* (nscd-service #:optional (config %nscd-default-configuration)
- #:key (glibc (canonical-package glibc))
- (name-services '()))
+(define* (nscd-service #:optional (config %nscd-default-configuration))
"Return a service that runs libc's name service cache daemon (nscd) with the
-given @var{config}---an @code{<nscd-configuration>} object. Optionally,
address@hidden:name-services} is a list of packages that provide name service
switch
- (NSS) modules needed by nscd. @xref{Name Service Switch}, for an example."
+given @var{config}---an @code{<nscd-configuration>} object. @xref{Name
+Service Switch}, for an example."
(let ((nscd.conf (nscd.conf-file config)))
(service
(documentation "Run libc's name service cache daemon (nscd).")
@@ -521,7 +522,8 @@ given @var{config}---an @code{<nscd-configuration>} object.
Optionally,
(mkdir-p "/var/db/nscd"))) ;for the persistent cache
(start #~(make-forkexec-constructor
- (list (string-append #$glibc "/sbin/nscd")
+ (list (string-append #$(nscd-configuration-glibc config)
+ "/sbin/nscd")
"-f" #$nscd.conf "--foreground")
#:environment-variables
@@ -529,7 +531,9 @@ given @var{config}---an @code{<nscd-configuration>} object.
Optionally,
(string-join
(map (lambda (dir)
(string-append dir "/lib"))
- (list address@hidden))
+ (list
+ #$@(nscd-configuration-name-services
+ config)))
":")))))
(stop #~(make-kill-destructor))
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index 35b1914..346f916 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -594,8 +594,8 @@ when they log out."
(cond
;; Provide an nscd ready to use nss-mdns.
((memq 'nscd (service-provision service))
- (nscd-service (nscd-configuration)
- #:name-services (list nss-mdns)))
+ (nscd-service (nscd-configuration
+ (name-services (list nss-mdns)))))
;; Add more rules to udev-service.
;;
- branch wip-service-refactor created (now c17408c), Ludovic Courtès, 2015/10/08
- 04/12: services: 'mingetty-service' no longer takes monadic values., Ludovic Courtès, 2015/10/08
- 06/12: services: mingetty-service: Use <mingetty-configuration> objects., Ludovic Courtès, 2015/10/08
- 02/12: gexp: Add 'program-file'., Ludovic Courtès, 2015/10/08
- 05/12: system: Make service procedures non-monadic., Ludovic Courtès, 2015/10/08
- 12/12: PRELIM: services: Introduce extensible abstract services., Ludovic Courtès, 2015/10/08
- 03/12: gexp: Add 'mixed-text-file'., Ludovic Courtès, 2015/10/08
- 08/12: gexp: Add 'scheme-file'., Ludovic Courtès, 2015/10/08
- 11/12: system: Account skeleton API is non-monadic., Ludovic Courtès, 2015/10/08
- 07/12: services: nscd-service: Fit everything into <nscd-configuration>.,
Ludovic Courtès <=
- 10/12: guix system: Add '--derivation'., Ludovic Courtès, 2015/10/08
- 09/12: system: pam: Use 'computed-file' instead of 'gexp->derivation'., Ludovic Courtès, 2015/10/08
- 01/12: gexp: Add 'computed-file'., Ludovic Courtès, 2015/10/08