[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#38902] [PATCH 6/9] services: nfs: Allow idmap-service-type to be ex
From: |
Ricardo Wurmus |
Subject: |
[bug#38902] [PATCH 6/9] services: nfs: Allow idmap-service-type to be extended. |
Date: |
Fri, 3 Jan 2020 18:35:03 +0100 |
* gnu/services/nfs.scm (idmap-service-type): Rewrite using SERVICE-TYPE to add
ability to extend the service.
---
gnu/services/nfs.scm | 67 ++++++++++++++++++++++++++------------------
1 file changed, 39 insertions(+), 28 deletions(-)
diff --git a/gnu/services/nfs.scm b/gnu/services/nfs.scm
index 451020be31..9fb95bde7e 100644
--- a/gnu/services/nfs.scm
+++ b/gnu/services/nfs.scm
@@ -170,37 +170,48 @@
(default nfs-utils)))
(define idmap-service-type
- (shepherd-service-type
- 'idmap
- (lambda (config)
-
- (define nfs-utils
- (idmap-configuration-nfs-utils config))
+ (let ((proc
+ (lambda (config)
- (define pipefs-directory
- (idmap-configuration-pipefs-directory config))
+ (define nfs-utils
+ (idmap-configuration-nfs-utils config))
- (define domain (idmap-configuration-domain config))
+ (define pipefs-directory
+ (idmap-configuration-pipefs-directory config))
- (define (idmap-config-file config)
- (plain-file "idmapd.conf"
- (string-append
- "\n[General]\n"
- (if domain
- (format #f "Domain = ~a\n" domain))
- "\n[Mapping]\n"
- "Nobody-User = nobody\n"
- "Nobody-Group = nogroup\n")))
+ (define domain (idmap-configuration-domain config))
- (define idmap-command
- #~(list (string-append #$nfs-utils "/sbin/rpc.idmapd") "-f"
- "-p" #$pipefs-directory
- "-c" #$(idmap-config-file config)))
+ (define (idmap-config-file config)
+ (plain-file "idmapd.conf"
+ (string-append
+ "\n[General]\n"
+ (if domain
+ (format #f "Domain = ~a\n" domain)
+ "")
+ "\n[Mapping]\n"
+ "Nobody-User = nobody\n"
+ "Nobody-Group = nogroup\n")))
- (shepherd-service
- (documentation "Start the RPC IDMAP daemon.")
- (requirement '(rpcbind-daemon rpc-pipefs))
- (provision '(idmap-daemon))
- (start #~(make-forkexec-constructor #$idmap-command))
- (stop #~(make-kill-destructor))))))
+ (define idmap-command
+ #~(list (string-append #$nfs-utils "/sbin/rpc.idmapd") "-f"
+ "-p" #$pipefs-directory
+ ;; TODO: this is deprecated
+ "-c" #$(idmap-config-file config)))
+ (shepherd-service
+ (documentation "Start the RPC IDMAP daemon.")
+ (requirement '(rpcbind-daemon rpc-pipefs))
+ (provision '(idmap-daemon))
+ (start #~(make-forkexec-constructor #$idmap-command))
+ (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)))))
--
2.24.1
- [bug#38902] [PATCH 0/9] Add NFS service, Ricardo Wurmus, 2020/01/03
- [bug#38902] [PATCH 1/9] gnu: nfs-utils: Update to 2.4.2., Ricardo Wurmus, 2020/01/03
- [bug#38902] [PATCH 2/9] services: nfs: Fix name of package variable., Ricardo Wurmus, 2020/01/03
- [bug#38902] [PATCH 3/9] services: nfs: Allow rpcbind-service-type to be extended., Ricardo Wurmus, 2020/01/03
- [bug#38902] [PATCH 5/9] services: nfs: Fix indentation and typo., Ricardo Wurmus, 2020/01/03
- [bug#38902] [PATCH 6/9] services: nfs: Allow idmap-service-type to be extended.,
Ricardo Wurmus <=
- [bug#38902] [PATCH 4/9] services: nfs: Allow pipefs-service-type to be extended., Ricardo Wurmus, 2020/01/03
- [bug#38902] [PATCH 7/9] services: nfs: Add verbosity control to idmap-service-type., Ricardo Wurmus, 2020/01/03
- [bug#38902] [PATCH 9/9] services: nfs: Add nfs-service-type., Ricardo Wurmus, 2020/01/03
- [bug#38902] [PATCH 8/9] services: nfs: Allow gss-service-type to be extended., Ricardo Wurmus, 2020/01/03