From 060211853d3f18f9d582549fcfb803e9ec8d2837 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 12 Jul 2020 15:05:51 +0200 Subject: 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. --- gnu/services/web.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu/services/web.scm') diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 63d2324b91..3c5b4d2586 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -37,6 +37,7 @@ #:use-module (gnu system pam) #:use-module (gnu system shadow) #:use-module (gnu packages admin) + #:use-module (gnu packages base) #:use-module (gnu packages databases) #:use-module (gnu packages web) #:use-module (gnu packages patchutils) @@ -1720,6 +1721,11 @@ WSGIPassAuthorization On (shell (file-append shadow "/sbin/nologin"))))) (define (mumi-shepherd-services config) + (define environment + #~(list "LC_ALL=en_US.utf8" + (string-append "GUIX_LOCPATH=" #$glibc-utf8-locales + "/lib/locale"))) + (match config (($ mumi mailer? sender smtp) (list (shepherd-service @@ -1729,6 +1735,7 @@ WSGIPassAuthorization On (start #~(make-forkexec-constructor `(#$(file-append mumi "/bin/mumi") "web" ,@(if #$mailer? '() '("--disable-mailer"))) + #:environment-variables #$environment #:user "mumi" #:group "mumi" #:log-file "/var/log/mumi.log")) (stop #~(make-kill-destructor))) @@ -1738,6 +1745,7 @@ WSGIPassAuthorization On (requirement '(networking)) (start #~(make-forkexec-constructor '(#$(file-append mumi "/bin/mumi") "worker") + #:environment-variables #$environment #:user "mumi" #:group "mumi" #:log-file "/var/log/mumi.worker.log")) (stop #~(make-kill-destructor))) @@ -1753,6 +1761,7 @@ WSGIPassAuthorization On ,@(if #$smtp (list (string-append "--smtp=" #$smtp)) '())) + #:environment-variables #$environment #:user "mumi" #:group "mumi" #:log-file "/var/log/mumi.mailer.log")) (stop #~(make-kill-destructor))))))) -- cgit v1.2.3 From a143e92446859bd1edc7a7aea85b2089c82c77da Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 12 Jul 2020 23:13:25 +0200 Subject: services: web: Do not export record type descriptors. * gnu/services/web.scm (, ) (, , ) (, ) (, ) (, ) () () (, ) (, ) (, ) (): Do not export. --- gnu/services/web.scm | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'gnu/services/web.scm') diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 3c5b4d2586..3b9f9e40be 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -59,20 +59,17 @@ #:use-module (srfi srfi-9) #:use-module (ice-9 match) #:use-module (ice-9 format) - #:export ( - httpd-configuration + #:export (httpd-configuration httpd-configuration? httpd-configuration-package httpd-configuration-pid-file httpd-configuration-config - httpd-virtualhost httpd-virtualhost? httpd-virtualhost-addresses-and-ports httpd-virtualhost-contents - httpd-config-file httpd-config-file? httpd-config-file-modules @@ -84,14 +81,12 @@ httpd-config-file-user httpd-config-file-group - httpd-module httpd-module? %default-httpd-modules httpd-service-type - nginx-configuration nginx-configuration? nginx-configuartion-nginx @@ -106,7 +101,6 @@ nginx-configuration-extra-content nginx-configuration-file - nginx-server-configuration nginx-server-configuration? nginx-server-configuration-listen @@ -119,19 +113,16 @@ nginx-server-configuration-server-tokens? nginx-server-configuration-raw-content - nginx-upstream-configuration nginx-upstream-configuration? nginx-upstream-configuration-name nginx-upstream-configuration-servers - nginx-location-configuration nginx-location-configuration? nginx-location-configuration-uri nginx-location-configuration-body - nginx-named-location-configuration nginx-named-location-configuration? nginx-named-location-configuration-name @@ -144,7 +135,6 @@ fcgiwrap-configuration? fcgiwrap-service-type - php-fpm-configuration make-php-fpm-configuration php-fpm-configuration? @@ -162,7 +152,6 @@ php-fpm-configuration-workers-log-file php-fpm-configuration-file - php-fpm-dynamic-process-manager-configuration make-php-fpm-dynamic-process-manager-configuration php-fpm-dynamic-process-manager-configuration? @@ -171,13 +160,11 @@ php-fpm-dynamic-process-manager-configuration-min-spare-servers php-fpm-dynamic-process-manager-configuration-max-spare-servers - php-fpm-static-process-manager-configuration make-php-fpm-static-process-manager-configuration php-fpm-static-process-manager-configuration? php-fpm-static-process-manager-configuration-max-children - php-fpm-on-demand-process-manager-configuration make-php-fpm-on-demand-process-manager-configuration php-fpm-on-demand-process-manager-configuration? @@ -193,7 +180,6 @@ hpcguix-web-configuration? hpcguix-web-service-type - tailon-configuration-file tailon-configuration-file? tailon-configuration-file-files @@ -207,7 +193,6 @@ tailon-configuration-file-http-auth tailon-configuration-file-users - tailon-configuration tailon-configuration? tailon-configuration-config-file @@ -215,7 +200,6 @@ tailon-service-type - varnish-configuration varnish-configuration? varnish-configuration-package @@ -229,7 +213,6 @@ varnish-service-type - patchwork-database-configuration patchwork-database-configuration? patchwork-database-configuration-engine @@ -239,7 +222,6 @@ patchwork-database-configuration-host patchwork-database-configuration-port - patchwork-settings-module patchwork-settings-module? patchwork-settings-module-database-configuration @@ -254,7 +236,6 @@ patchwork-settings-module-force-https-links? patchwork-settings-module-extra-settings - patchwork-configuration patchwork-configuration? patchwork-configuration-patchwork @@ -264,7 +245,6 @@ patchwork-virtualhost patchwork-service-type - mumi-configuration mumi-configuration? mumi-configuration-mumi -- cgit v1.2.3