ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-12 14:16:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: nfs: Allow idmap-service-type to be extended.

Browse source 
* gnu/services/nfs.scm (idmap-service-type): Rewrite using SERVICE-TYPE to add
ability to extend the service.
This commit is contained in:
Ricardo Wurmus 2020-01-03 18:13:38 +01:00
parent 5d4ba49891
commit af32ea3583
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 39 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gnu/services/nfs.scm
View file

@ -170,8 +170,7 @@ (define-record-type* <idmap-configuration>
(default nfs-utils))) (default nfs-utils)))
(define idmap-service-type (define idmap-service-type
(shepherd-service-type (let ((proc
'idmap
(lambda (config) (lambda (config)
(define nfs-utils (define nfs-utils
@ -187,7 +186,8 @@ (define (idmap-config-file config)
(string-append (string-append
"\n[General]\n" "\n[General]\n"
(if domain (if domain
(format #f "Domain = ~a\n" domain)) (format #f "Domain = ~a\n" domain)
"")
"\n[Mapping]\n" "\n[Mapping]\n"
"Nobody-User = nobody\n" "Nobody-User = nobody\n"
"Nobody-Group = nogroup\n"))) "Nobody-Group = nogroup\n")))
@ -195,6 +195,7 @@ (define (idmap-config-file config)
(define idmap-command (define idmap-command
#~(list (string-append #$nfs-utils "/sbin/rpc.idmapd") "-f" #~(list (string-append #$nfs-utils "/sbin/rpc.idmapd") "-f"
"-p" #$pipefs-directory "-p" #$pipefs-directory
;; TODO: this is deprecated
"-c" #$(idmap-config-file config))) "-c" #$(idmap-config-file config)))
(shepherd-service (shepherd-service
@ -203,4 +204,14 @@ (define idmap-command
(provision '(idmap-daemon)) (provision '(idmap-daemon))
(start #~(make-forkexec-constructor #$idmap-command)) (start #~(make-forkexec-constructor #$idmap-command))
(stop #~(make-kill-destructor)))))) (stop #~(make-kill-destructor))))))
(service-type
(name 'idmap)
(extensions
(list (service-extension shepherd-root-service-type
(compose list proc))))
;; We use the extensions feature to allow other services to automatically
;; configure and start this service. Only one value can be provided. We
;; override it with the value returned by the extending service.
(compose identity)
(extend (lambda (config values) (first values)))
(default-value (idmap-configuration)))))