~ruther/guix-local: services: ngircd: Streamline wrapper definition.

7686fe9d4fa1c40fd78e2ed57c60531c94bc9fd7 — Maxim Cournoyer 1 year, 1 month ago b444fc0

services: ngircd: Streamline wrapper definition.

* gnu/services/messaging.scm (ngircd-shepherd-service): Streamline wrapper
definition.

Change-Id: Ie48a02d141ab329a5b684897fb2562b4e6745452

patch browse .tar.gz

1 files changed, 11 insertions(+), 26 deletions(-)

M gnu/services/messaging.scm

M gnu/services/messaging.scm => gnu/services/messaging.scm +11 -26

@@ 1558,32 1558,17 @@ wrapper for the 'ngircd' command."
                  (target source)))
           '())
       (if (maybe-value-set? ssl)
-          (let ((ca-file (ngircd-ssl-ca-file ssl))
-                (cert-file (ngircd-ssl-cert-file ssl))
-                (key-file (ngircd-ssl-key-file ssl))
-                (dh-file (ngircd-ssl-dh-file ssl)))
-            ;; When SSL is used, expose the specified keys and certificates.
-            (append
-             (if (maybe-value-set? ca-file)
-                 (list (file-system-mapping
-                        (source ca-file)
-                        (target source)))
-                 '())
-             (if (maybe-value-set? cert-file)
-                 (list (file-system-mapping
-                        (source cert-file)
-                        (target source)))
-                 '())
-             (if (maybe-value-set? key-file)
-                 (list (file-system-mapping
-                        (source key-file)
-                        (target source)))
-                 '())
-             (if (maybe-value-set? dh-file)
-                 (list (file-system-mapping
-                        (source dh-file)
-                        (target source)))
-                 '())))
+          ;; When SSL is used, expose the specified keys and certificates.
+          (filter-map (lambda (value)
+                        (if (maybe-value-set? value)
+                            (file-system-mapping
+                             (source value)
+                             (target source))
+                            #f))
+                      (list (ngircd-ssl-ca-file ssl)
+                            (ngircd-ssl-cert-file ssl)
+                            (ngircd-ssl-key-file ssl)
+                            (ngircd-ssl-dh-file ssl)))
           '())
       (if (maybe-value-set? channels)
           (filter-map (lambda (channel)