diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-03-14 01:42:02 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-14 01:42:02 +0100 |
commit | bb4674b43fa413a6d41694b2093c3b00d11eea47 (patch) | |
tree | e9de75e813e90459c5313ba73ac22473b0e0e565 /gnu/services/web.scm | |
parent | 41c6e4f2b40f41cdbf4e8c7ade29845709f9cdf4 (diff) | |
parent | 989d564f4434c6e43df7ccb0d1701e89e243e404 (diff) | |
download | guix-bb4674b43fa413a6d41694b2093c3b00d11eea47.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/services/web.scm')
-rw-r--r-- | gnu/services/web.scm | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 075140816a..d093f60c8d 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017, 2018, 2019 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de> +;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1670,12 +1671,14 @@ WSGIPassAuthorization On #~(begin (use-modules (guix build utils)) + (mkdir-p "/var/mumi/db") (mkdir-p "/var/mumi/mails") (let* ((pw (getpwnam "mumi")) (uid (passwd:uid pw)) (gid (passwd:gid pw))) (chown "/var/mumi" uid gid) - (chown "/var/mumi/mails" uid gid))))) + (chown "/var/mumi/mails" uid gid) + (chown "/var/mumi/db" uid gid))))) (define %mumi-accounts (list (user-group (name "mumi") (system? #t)) @@ -1696,6 +1699,15 @@ WSGIPassAuthorization On '(#$(file-append mumi "/bin/mumi")) #:user "mumi" #:group "mumi" #:log-file "/var/log/mumi.log")) + (stop #~(make-kill-destructor))) + (shepherd-service + (provision '(mumi-worker)) + (documentation "Mumi bug-tracking web interface.") + (requirement '(networking)) + (start #~(make-forkexec-constructor + '(#$(file-append mumi "/bin/mumi") "--worker") + #:user "mumi" #:group "mumi" + #:log-file "/var/log/mumi.worker.log")) (stop #~(make-kill-destructor))))) (define mumi-service-type |