From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:37539) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1inQrm-00078T-CD for guix-patches@gnu.org; Fri, 03 Jan 2020 12:36:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1inQrk-0003HE-Tk for guix-patches@gnu.org; Fri, 03 Jan 2020 12:36:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35440) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1inQrk-0003G5-O4 for guix-patches@gnu.org; Fri, 03 Jan 2020 12:36:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1inQrk-0008HB-LM for guix-patches@gnu.org; Fri, 03 Jan 2020 12:36:04 -0500 Subject: [bug#38902] [PATCH 6/9] services: nfs: Allow idmap-service-type to be extended. Resent-Message-ID: From: Ricardo Wurmus Message-ID: <20200103173506.9779-6-rekado@elephly.net> Date: Fri, 3 Jan 2020 18:35:03 +0100 In-Reply-To: <20200103173506.9779-1-rekado@elephly.net> References: <20200103173506.9779-1-rekado@elephly.net> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf8 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 38902@debbugs.gnu.org Cc: Ricardo Wurmus * 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))) =20 (define idmap-service-type - (shepherd-service-type - 'idmap - (lambda (config) - - (define nfs-utils - (idmap-configuration-nfs-utils config)) + (let ((proc + (lambda (config) =20 - (define pipefs-directory - (idmap-configuration-pipefs-directory config)) + (define nfs-utils + (idmap-configuration-nfs-utils config)) =20 - (define domain (idmap-configuration-domain config)) + (define pipefs-directory + (idmap-configuration-pipefs-directory config)) =20 - (define (idmap-config-file config) - (plain-file "idmapd.conf" - (string-append - "\n[General]\n" - (if domain - (format #f "Domain =3D ~a\n" domain)) - "\n[Mapping]\n" - "Nobody-User =3D nobody\n" - "Nobody-Group =3D nogroup\n"))) + (define domain (idmap-configuration-domain config)) =20 - (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 =3D ~a\n" domain) + "") + "\n[Mapping]\n" + "Nobody-User =3D nobody\n" + "Nobody-Group =3D nogroup\n"))) =20 - (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))) =20 + (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 automatic= ally + ;; 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))))) --=20 2.24.1