amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: mumi: Add file-tags configuration.

Browse source 
* 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.
This commit is contained in:
Arun Isaac 2025-03-08 22:03:51 +00:00
parent 7bea040382
commit ded45b7b9f
No known key found for this signature in database
GPG key ID: 2E25EE8B61802BB3
2 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
doc/guix.texi
View file

@ -33746,6 +33746,12 @@ something like @code{sendmail:///path/to/bin/msmtp} or any other URI
supported by Mailutils. @xref{SMTP Mailboxes, SMTP Mailboxes,, supported by Mailutils. @xref{SMTP Mailboxes, SMTP Mailboxes,,
mailutils, GNU@tie{}Mailutils}. 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 table
@end deftp @end deftp

25
gnu/services/web.scm
View file

@ -11,7 +11,7 @@
;;; Copyright © 2019, 2020 Florian Pelz <pelzflorian@pelzflorian.de> ;;; Copyright © 2019, 2020 Florian Pelz <pelzflorian@pelzflorian.de>
;;; Copyright © 2020, 2022 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2020, 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; 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 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020, 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro> ;;; Copyright © 2020, 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
;;; Copyright © 2022 Simen Endsjø <simendsjo@gmail.com> ;;; Copyright © 2022 Simen Endsjø <simendsjo@gmail.com>
@ -2024,7 +2024,8 @@ WSGIPassAuthorization On
(mumi mumi-configuration-mumi (default mumi)) (mumi mumi-configuration-mumi (default mumi))
(mailer? mumi-configuration-mailer? (default #t)) (mailer? mumi-configuration-mailer? (default #t))
(sender mumi-configuration-sender (default #f)) (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 (define %mumi-activation
(with-imported-modules '((guix build utils)) (with-imported-modules '((guix build utils))
@ -2056,6 +2057,18 @@ WSGIPassAuthorization On
(define %mumi-worker-log "/var/log/mumi.worker.log") (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 (mumi-shepherd-services config)
(define environment (define environment
#~(list "LC_ALL=en_US.utf8" #~(list "LC_ALL=en_US.utf8"
@ -2071,6 +2084,8 @@ WSGIPassAuthorization On
(requirement '(user-processes networking)) (requirement '(user-processes networking))
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
`(#$(file-append mumi "/bin/mumi") "web" `(#$(file-append mumi "/bin/mumi") "web"
,(string-append "--config="
#$(mumi-config-file config))
,@(if #$mailer? '() '("--disable-mailer"))) ,@(if #$mailer? '() '("--disable-mailer")))
#:environment-variables #$environment #:environment-variables #$environment
#:user "mumi" #:group "mumi" #:user "mumi" #:group "mumi"
@ -2081,7 +2096,9 @@ WSGIPassAuthorization On
(documentation "Mumi bug-tracking web interface database worker.") (documentation "Mumi bug-tracking web interface database worker.")
(requirement '(user-processes networking)) (requirement '(user-processes networking))
(start #~(make-forkexec-constructor (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 #:environment-variables #$environment
#:user "mumi" #:group "mumi" #:user "mumi" #:group "mumi"
#:log-file #$%mumi-worker-log)) #:log-file #$%mumi-worker-log))
@ -2092,6 +2109,8 @@ WSGIPassAuthorization On
(requirement '(user-processes networking)) (requirement '(user-processes networking))
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
`(#$(file-append mumi "/bin/mumi") "mailer" `(#$(file-append mumi "/bin/mumi") "mailer"
,(string-append "--config="
#$(mumi-config-file config))
,@(if #$sender ,@(if #$sender
(list (string-append "--sender=" #$sender)) (list (string-append "--sender=" #$sender))
'()) '())