mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-05-16 14:15:56 +02:00
services: guix-data-service: Add extra environment variable options.
Also export guix-data-service-extra-options and guix-data-service-extra-process-jobs-options since this was missed previously. * gnu/services/guix.scm (<guix-data-service-configuration>): Add extra-environment-variables and extra-process-jobs-environment-variables. (guix-data-service-shepherd-services): Use them. * doc/guix.texi (Guix Services): Document them. Change-Id: I60f1371a86a01c4fb3dbde204dba84b9a8657ace
This commit is contained in:
+18
-3
@@ -108,6 +108,10 @@
|
||||
guix-data-service-host
|
||||
guix-data-service-getmail-idle-mailboxes
|
||||
guix-data-service-commits-getmail-retriever-configuration
|
||||
guix-data-service-extra-options
|
||||
guix-data-service-extra-process-jobs-options
|
||||
guix-data-service-extra-environment-variables
|
||||
guix-data-service-extra-process-jobs-environment-variables
|
||||
guix-data-service-configuration-git-repositories
|
||||
guix-data-service-configuration-build-servers
|
||||
|
||||
@@ -587,6 +591,12 @@
|
||||
(extra-process-jobs-options
|
||||
guix-data-service-extra-process-jobs-options
|
||||
(default '()))
|
||||
(extra-environment-variables
|
||||
guix-data-service-extra-environment-variables
|
||||
(default '()))
|
||||
(extra-process-jobs-environment-variables
|
||||
guix-data-service-extra-process-jobs-environment-variables
|
||||
(default '()))
|
||||
(git-repositories guix-data-service-configuration-git-repositories
|
||||
(default #f))
|
||||
(build-servers guix-data-service-configuration-build-servers
|
||||
@@ -601,6 +611,8 @@ ca-certificates.crt file in the system profile."
|
||||
(define (guix-data-service-shepherd-services config)
|
||||
(match-record config <guix-data-service-configuration>
|
||||
(package user group port host extra-options extra-process-jobs-options
|
||||
extra-environment-variables
|
||||
extra-process-jobs-environment-variables
|
||||
git-repositories build-servers)
|
||||
(list
|
||||
(shepherd-service
|
||||
@@ -626,7 +638,8 @@ ca-certificates.crt file in the system profile."
|
||||
`(,(string-append
|
||||
"GUIX_LOCPATH="
|
||||
#$(libc-utf8-locales-for-target) "/lib/locale")
|
||||
"LC_ALL=en_US.UTF-8")
|
||||
"LC_ALL=en_US.UTF-8"
|
||||
#$@extra-environment-variables)
|
||||
#:log-file "/var/log/guix-data-service/web.log"))
|
||||
(stop #~(make-kill-destructor)))
|
||||
|
||||
@@ -678,7 +691,8 @@ ca-certificates.crt file in the system profile."
|
||||
`(,(string-append
|
||||
"GUIX_LOCPATH="
|
||||
#$(libc-utf8-locales-for-target) "/lib/locale")
|
||||
"LC_ALL=en_US.utf8")
|
||||
"LC_ALL=en_US.utf8"
|
||||
#$@extra-environment-variables)
|
||||
#:log-file "/var/log/guix-data-service/setup-database.log"))
|
||||
(auto-start? #t))
|
||||
|
||||
@@ -700,7 +714,8 @@ ca-certificates.crt file in the system profile."
|
||||
,(string-append
|
||||
"GUIX_LOCPATH="
|
||||
#$(libc-utf8-locales-for-target) "/lib/locale")
|
||||
"LC_ALL=en_US.UTF-8")
|
||||
"LC_ALL=en_US.UTF-8"
|
||||
#$@extra-process-jobs-environment-variables)
|
||||
#:log-file "/var/log/guix-data-service/process-jobs.log"))
|
||||
(stop #~(make-kill-destructor))))))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user