[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
104/155: services: cuirass: Cache defaults to /var/cache/cuirass.
From: |
John Darrington |
Subject: |
104/155: services: cuirass: Cache defaults to /var/cache/cuirass. |
Date: |
Wed, 21 Dec 2016 20:48:37 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 460dfc5658ce180d6881d69dbacac60a40cbb62a
Author: Ludovic Courtès <address@hidden>
Date: Mon Dec 19 23:29:09 2016 +0100
services: cuirass: Cache defaults to /var/cache/cuirass.
The previous default value depended on the 'HOME' environment variable,
which happened to be unset. Thus, /.cache was being used.
* gnu/services/cuirass.scm (<cuirass-configuration>)[cache-directory]:
Change default value to "/var/cache/cuirass".
(cuirass-shepherd-service): Always pass "--cache-directory".
(cuirass-activation): New procedure.
(cuirass-service-type): Use it as an extension to
ACTIVATION-SERVICE-TYPE.
* doc/guix.texi (Continuous Integration): Adjust accordingly.
---
doc/guix.texi | 2 +-
gnu/services/cuirass.scm | 23 +++++++++++++++++++----
2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 46d006d..c218209 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -11993,7 +11993,7 @@ Data type representing the configuration of Cuirass.
@item @code{log-file} (default: @code{"/var/log/cuirass.log"})
Location of the log file.
address@hidden @code{cache-directory} (default: @code{""})
address@hidden @code{cache-directory} (default: @code{"/var/cache/cuirass"})
Location of the repository cache.
@item @code{user} (default: @code{"cuirass"})
diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm
index c2fe9d9..d585e26 100644
--- a/gnu/services/cuirass.scm
+++ b/gnu/services/cuirass.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Mathieu Lirzin <address@hidden>
+;;; Copyright © 2016 Ludovic Courtès <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -45,7 +46,7 @@
(log-file cuirass-configuration-log-file ;string
(default "/var/log/cuirass.log"))
(cache-directory cuirass-configuration-cache-directory ;string (dir-name)
- (default ""))
+ (default "/var/cache/cuirass"))
(user cuirass-configuration-user ;string
(default "cuirass"))
(group cuirass-configuration-group ;string
@@ -80,9 +81,7 @@
(requirement '(guix-daemon))
(start #~(make-forkexec-constructor
(list (string-append #$cuirass "/bin/cuirass")
- #$@(if (string=? "" cache-directory)
- '()
- (list "--cache-directory" cache-directory))
+ "--cache-directory" #$cache-directory
#$@(if (null? specs)
'()
(let ((str (format #f "'~S" specs)))
@@ -112,11 +111,27 @@
(home-directory (string-append "/var/run/" cuirass-user))
(shell #~(string-append #$shadow "/sbin/nologin"))))))
+(define (cuirass-activation config)
+ "Return the activation code for CONFIG."
+ (let ((cache (cuirass-configuration-cache-directory config))
+ (user (cuirass-configuration-user config))
+ (group (cuirass-configuration-group config)))
+ (with-imported-modules '((guix build utils))
+ #~(begin
+ (use-modules (guix build utils))
+
+ (mkdir-p #$cache)
+
+ (let ((uid (passwd:uid (getpw #$user)))
+ (gid (group:gid (getgr #$group))))
+ (chown #$cache uid gid))))))
+
(define cuirass-service-type
(service-type
(name 'cuirass)
(extensions
(list
+ (service-extension activation-service-type cuirass-activation)
(service-extension shepherd-root-service-type cuirass-shepherd-service)
(service-extension account-service-type cuirass-account)))))
- 130/155: environment: Add '--root' option., (continued)
- 130/155: environment: Add '--root' option., John Darrington, 2016/12/21
- 144/155: gnu: imagemagick: Update to 6.9.7-0., John Darrington, 2016/12/21
- 149/155: gnu: jsoncpp: Update to 1.8.0., John Darrington, 2016/12/21
- 152/155: gnu: lablgtk: Update to 2.18.5, John Darrington, 2016/12/21
- 88/155: gnu: kdbusaddons: Embed kinit store dir, avoid dependency cycles., John Darrington, 2016/12/21
- 102/155: services: cuirass: Add 'log-file' option., John Darrington, 2016/12/21
- 94/155: gnu: grub: Use qemu-minimal for tests., John Darrington, 2016/12/21
- 101/155: gnu: cuirass: Add Git to 'PATH'., John Darrington, 2016/12/21
- 103/155: services: cuirass: Honor 'user' and 'group'., John Darrington, 2016/12/21
- 98/155: gnu: Add c-toxcore., John Darrington, 2016/12/21
- 104/155: services: cuirass: Cache defaults to /var/cache/cuirass.,
John Darrington <=
- 110/155: gnu: weechat: Use new xz-compressed tarball., John Darrington, 2016/12/21
- 127/155: gnu: gnupg: Update to 2.1.17., John Darrington, 2016/12/21
- 120/155: services: cuirass: Add 'cuirass' field., John Darrington, 2016/12/21
- 116/155: gnu: argon2: Update to 20161029., John Darrington, 2016/12/21
- 115/155: gnu: cppcheck: Update to 1.76.1., John Darrington, 2016/12/21
- 135/155: gnu: gnupg: Remove unneeded input., John Darrington, 2016/12/21
- 132/155: Revert "gnu: nss, nss-certs: Update to 3.27.2.", John Darrington, 2016/12/21
- 140/155: gnu: getmail: Update to 4.52.0., John Darrington, 2016/12/21
- 129/155: gnu: Add alsa-plugins., John Darrington, 2016/12/21
- 139/155: gnu: bogofilter: Use 'modify-phases'., John Darrington, 2016/12/21