1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00

gnu: Fix patchwork service test.

* gnu/packages/patchutils.scm (patchwork):[arguments]: Write version.txt,
tweak some indentation, patch the STATICFILES_DIRS entry.
[propagated-inputs]: Add python-tzdata.
* gnu/services/web.scm (patchwork-settings-module-compiler): Don't set
STATIC_ROOT on debug, as this clashes with STATICFILES_DIRS.
(patchwork-django-admin-gexp): Fix.
(patchwork-shepherd-services): Workaround issue referencing random-token.
* gnu/tests/web.scm (patchwork-initial-database-setup-service): Don't use
primitive-fork, as this doesn't work with newer shepherds.
(run-patchwork-test): Check the setup runs.

Change-Id: I7dfeb816b4f6c9070358d433fb7ca8faa1fbfd2a
This commit is contained in:
Christopher Baines
2025-11-10 10:19:48 +00:00
parent 9bf06d93a4
commit f7125fb55d
3 changed files with 64 additions and 47 deletions

View File

@@ -1771,11 +1771,9 @@ DATABASES = {
},
}
" #$(if debug?
#~(string-append "STATIC_ROOT = '"
#$(file-append patchwork "/share/patchwork/htdocs")
"'")
#~(string-append "STATIC_URL = '" #$static-url "'")) "
" #$(if static-url
#~(string-append "STATIC_URL = '" #$static-url "'")
"") "
STATICFILES_STORAGE = (
'django.contrib.staticfiles.storage.StaticFilesStorage'
@@ -1840,7 +1838,7 @@ WSGIPassAuthorization On
#~(lambda command
(zero? (spawn-command
`(#$(file-append patchwork "/bin/patchwork-admin")
,command)
,@command)
#:user "httpd"
#:group "httpd"
#:environment-variables
@@ -1864,10 +1862,9 @@ WSGIPassAuthorization On
(with-extensions (list guile-gcrypt)
#~(let ((secret-key-file
#$(patchwork-settings-module-secret-key-file
settings-module)))
(use-modules (guix build utils)
(gcrypt random))
settings-module))
(random-token
(@ (gcrypt random) random-token)))
(unless (file-exists? secret-key-file)
(mkdir-p (dirname secret-key-file))
(call-with-output-file secret-key-file