diff options
| author | Arun Isaac <arunisaac@systemreboot.net> | 2025-03-08 22:03:51 +0000 |
|---|---|---|
| committer | Arun Isaac <arunisaac@systemreboot.net> | 2025-03-08 22:57:36 +0000 |
| commit | ded45b7b9f7918cecf60baad07391131ee6c4aa2 (patch) | |
| tree | 503e388fd5b72a2657e81ef77a13c10d3e9d3d92 | |
| parent | 7bea040382401ea3a985ab8cf70f94f0df18de6d (diff) | |
services: mumi: Add file-tags configuration.
* gnu/services/web.scm (<mumi-configuration>)[file-tags]: New field.
* gnu/services/web.scm (mumi-config-file): New function.
(mumi-shepherd-services): Pass --config argument.
* doc/guix.texi (Web Services)[mumi]: Document file-tags.
| -rw-r--r-- | doc/guix.texi | 6 | ||||
| -rw-r--r-- | gnu/services/web.scm | 25 |
2 files changed, 28 insertions, 3 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 6529865c09..35c5e518e0 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -33746,6 +33746,12 @@ something like @code{sendmail:///path/to/bin/msmtp} or any other URI supported by Mailutils. @xref{SMTP Mailboxes, SMTP Mailboxes,, mailutils, GNU@tie{}Mailutils}. +@item @code{file-tags} +Association list mapping tags to filename regular expressions. Keys are +tag names, and values are lists of regular expressions. For each entry +of the association list, the tag is applied if a filename referred to in +a patch matches any of the regular expressions. + @end table @end deftp diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 7593cd2eaa..79e5221216 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2019, 2020 Florian Pelz <pelzflorian@pelzflorian.de> ;;; Copyright © 2020, 2022 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2020, 2025 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2020, 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro> ;;; Copyright © 2022 Simen Endsjø <simendsjo@gmail.com> @@ -2024,7 +2024,8 @@ WSGIPassAuthorization On (mumi mumi-configuration-mumi (default mumi)) (mailer? mumi-configuration-mailer? (default #t)) (sender mumi-configuration-sender (default #f)) - (smtp mumi-configuration-smtp (default #f))) + (smtp mumi-configuration-smtp (default #f)) + (file-tags mumi-configuration-file-tags (default '()))) (define %mumi-activation (with-imported-modules '((guix build utils)) @@ -2056,6 +2057,18 @@ WSGIPassAuthorization On (define %mumi-worker-log "/var/log/mumi.worker.log") +(define mumi-config-file + (match-record-lambda <mumi-configuration> + (file-tags) + (computed-file "mumi.conf" + #~(begin + (use-modules (srfi srfi-26)) + + (call-with-output-file #$output + (cut write + '((file-tags . #$file-tags)) + <>)))))) + (define (mumi-shepherd-services config) (define environment #~(list "LC_ALL=en_US.utf8" @@ -2071,6 +2084,8 @@ WSGIPassAuthorization On (requirement '(user-processes networking)) (start #~(make-forkexec-constructor `(#$(file-append mumi "/bin/mumi") "web" + ,(string-append "--config=" + #$(mumi-config-file config)) ,@(if #$mailer? '() '("--disable-mailer"))) #:environment-variables #$environment #:user "mumi" #:group "mumi" @@ -2081,7 +2096,9 @@ WSGIPassAuthorization On (documentation "Mumi bug-tracking web interface database worker.") (requirement '(user-processes networking)) (start #~(make-forkexec-constructor - '(#$(file-append mumi "/bin/mumi") "worker") + `(#$(file-append mumi "/bin/mumi") "worker" + ,(string-append "--config=" + #$(mumi-config-file config))) #:environment-variables #$environment #:user "mumi" #:group "mumi" #:log-file #$%mumi-worker-log)) @@ -2092,6 +2109,8 @@ WSGIPassAuthorization On (requirement '(user-processes networking)) (start #~(make-forkexec-constructor `(#$(file-append mumi "/bin/mumi") "mailer" + ,(string-append "--config=" + #$(mumi-config-file config)) ,@(if #$sender (list (string-append "--sender=" #$sender)) '()) |