mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-11 13:49:23 -05:00
services: mumi: Run in a UTF-8 locale.
* gnu/services/web.scm (mumi-shepherd-services)[environment]: New variable. Pass it as #:environment-variables to each 'make-forkexec-constructor' call.
This commit is contained in:
parent
c54b9afb87
commit
060211853d
1 changed files with 9 additions and 0 deletions
|
@ -37,6 +37,7 @@ (define-module (gnu services web)
|
||||||
#:use-module (gnu system pam)
|
#:use-module (gnu system pam)
|
||||||
#:use-module (gnu system shadow)
|
#:use-module (gnu system shadow)
|
||||||
#:use-module (gnu packages admin)
|
#:use-module (gnu packages admin)
|
||||||
|
#:use-module (gnu packages base)
|
||||||
#:use-module (gnu packages databases)
|
#:use-module (gnu packages databases)
|
||||||
#:use-module (gnu packages web)
|
#:use-module (gnu packages web)
|
||||||
#:use-module (gnu packages patchutils)
|
#:use-module (gnu packages patchutils)
|
||||||
|
@ -1720,6 +1721,11 @@ (define %mumi-accounts
|
||||||
(shell (file-append shadow "/sbin/nologin")))))
|
(shell (file-append shadow "/sbin/nologin")))))
|
||||||
|
|
||||||
(define (mumi-shepherd-services config)
|
(define (mumi-shepherd-services config)
|
||||||
|
(define environment
|
||||||
|
#~(list "LC_ALL=en_US.utf8"
|
||||||
|
(string-append "GUIX_LOCPATH=" #$glibc-utf8-locales
|
||||||
|
"/lib/locale")))
|
||||||
|
|
||||||
(match config
|
(match config
|
||||||
(($ <mumi-configuration> mumi mailer? sender smtp)
|
(($ <mumi-configuration> mumi mailer? sender smtp)
|
||||||
(list (shepherd-service
|
(list (shepherd-service
|
||||||
|
@ -1729,6 +1735,7 @@ (define (mumi-shepherd-services config)
|
||||||
(start #~(make-forkexec-constructor
|
(start #~(make-forkexec-constructor
|
||||||
`(#$(file-append mumi "/bin/mumi") "web"
|
`(#$(file-append mumi "/bin/mumi") "web"
|
||||||
,@(if #$mailer? '() '("--disable-mailer")))
|
,@(if #$mailer? '() '("--disable-mailer")))
|
||||||
|
#:environment-variables #$environment
|
||||||
#:user "mumi" #:group "mumi"
|
#:user "mumi" #:group "mumi"
|
||||||
#:log-file "/var/log/mumi.log"))
|
#:log-file "/var/log/mumi.log"))
|
||||||
(stop #~(make-kill-destructor)))
|
(stop #~(make-kill-destructor)))
|
||||||
|
@ -1738,6 +1745,7 @@ (define (mumi-shepherd-services config)
|
||||||
(requirement '(networking))
|
(requirement '(networking))
|
||||||
(start #~(make-forkexec-constructor
|
(start #~(make-forkexec-constructor
|
||||||
'(#$(file-append mumi "/bin/mumi") "worker")
|
'(#$(file-append mumi "/bin/mumi") "worker")
|
||||||
|
#:environment-variables #$environment
|
||||||
#:user "mumi" #:group "mumi"
|
#:user "mumi" #:group "mumi"
|
||||||
#:log-file "/var/log/mumi.worker.log"))
|
#:log-file "/var/log/mumi.worker.log"))
|
||||||
(stop #~(make-kill-destructor)))
|
(stop #~(make-kill-destructor)))
|
||||||
|
@ -1753,6 +1761,7 @@ (define (mumi-shepherd-services config)
|
||||||
,@(if #$smtp
|
,@(if #$smtp
|
||||||
(list (string-append "--smtp=" #$smtp))
|
(list (string-append "--smtp=" #$smtp))
|
||||||
'()))
|
'()))
|
||||||
|
#:environment-variables #$environment
|
||||||
#:user "mumi" #:group "mumi"
|
#:user "mumi" #:group "mumi"
|
||||||
#:log-file "/var/log/mumi.mailer.log"))
|
#:log-file "/var/log/mumi.mailer.log"))
|
||||||
(stop #~(make-kill-destructor)))))))
|
(stop #~(make-kill-destructor)))))))
|
||||||
|
|
Loading…
Reference in a new issue