diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2023-08-05 21:56:24 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-08-20 22:47:26 +0200 |
| commit | 9bfe7fbdbe51451d74a8fead5c1727d002050a52 (patch) | |
| tree | e62e5aa06a0aa0c422b35fc86ac448bf631a66be | |
| parent | 171ab374f9998e3664a4c6a62ea5b82ec5a818bc (diff) | |
| download | guix-9bfe7fbdbe51451d74a8fead5c1727d002050a52.tar guix-9bfe7fbdbe51451d74a8fead5c1727d002050a52.tar.gz | |
services: dicod: Pre-build the GCIDE index.
* 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.
| -rw-r--r-- | gnu/services/dict.scm | 28 |
1 files changed, 13 insertions, 15 deletions
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 @@ (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 @@ database { (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 @@ database { "/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 @@ database { (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)) |