diff mbox series

[bug#65119,2/8] services: dicod: Pre-build the GCIDE index.

Message ID e885dd784b857cf88c5bed519e91d3856248b805.1691355218.git.ludo@gnu.org
State New
Headers show
Series Sharing service code between Home and System | expand

Commit Message

Ludovic Courtès Aug. 6, 2023, 9:07 p.m. UTC 
* gnu/services/dict.scm (%dicod-gcide-index): New variable.
(%dicod-database:gcide): Use it.
(%dicod-activation): Remove.
(dicod-shepherd-service): Remove reference to /var/run/dicod.
(dicod-service-type): Remove ACTIVATION-SERVICE-TYPE extension.
---
 gnu/services/dict.scm | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)
diff mbox series

Patch

diff --git a/gnu/services/dict.scm b/gnu/services/dict.scm
index 7d48953ef1..f542921302 100644
--- a/gnu/services/dict.scm
+++ b/gnu/services/dict.scm
@@ -73,12 +73,24 @@  (define-record-type* <dicod-database>
   (complex?    dicod-database-complex?       (default #f))
   (options     dicod-database-options        (default '())))
 
+(define %dicod-gcide-index
+  ;; The GCIDE pre-built index.  The Dico 'gcide' module can build it lazily;
+  ;; do it upfront so there's no need for a writable directory at run-time.
+  (computed-file "dicod-gcide-index"
+                 (with-imported-modules '((guix build utils))
+                   #~(begin
+                       (use-modules (guix build utils))
+                       (mkdir #$output)
+                       (invoke #+(file-append dico "/libexec/idxgcide")
+                               #+(file-append gcide "/share/gcide")
+                               #$output)))))
+
 (define %dicod-database:gcide
   (dicod-database
    (name "gcide")
    (handler "gcide")
    (options (list #~(string-append "dbdir=" #$gcide "/share/gcide")
-                  "idxdir=/var/run/dicod"))))
+                  #~(string-append "idxdir=" #$%dicod-gcide-index)))))
 
 (define %dicod-accounts
   (list (user-group
@@ -137,14 +149,6 @@  (define (dicod-configuration-file config)
 
   (apply mixed-text-file "dicod.conf" (configuration->text config)))
 
-(define %dicod-activation
-  #~(begin
-      (use-modules (guix build utils))
-      (let ((user   (getpwnam "dicod"))
-            (rundir "/var/run/dicod"))
-        (mkdir-p rundir)
-        (chown rundir (passwd:uid user) (passwd:gid user)))))
-
 (define (dicod-shepherd-service config)
   (let* ((dicod.conf (dicod-configuration-file config))
          (interfaces (dicod-configuration-interfaces config))
@@ -153,10 +157,6 @@  (define (dicod-shepherd-service config)
                                    "/bin/dicod")
                       #:name "dicod"
                       #:mappings (list (file-system-mapping
-                                        (source "/var/run/dicod")
-                                        (target source)
-                                        (writable? #t))
-                                       (file-system-mapping
                                         (source "/dev/log")
                                         (target source))
                                        (file-system-mapping
@@ -187,8 +187,6 @@  (define dicod-service-type
    (extensions
     (list (service-extension account-service-type
                              (const %dicod-accounts))
-          (service-extension activation-service-type
-                             (const %dicod-activation))
           (service-extension shepherd-root-service-type
                              dicod-shepherd-service)))
    (default-value (dicod-configuration))