diff --git a/doc/guix.texi b/doc/guix.texi index de1ef2add..c495e39f4 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -10332,8 +10332,8 @@ TCP port on which the database server listens for incoming connections. @end deftp @defvr {Scheme Variable} redis-service-type -This is the type of the Redis service, whose value is a -@code{redis-configuration} object. +This is the service type for the @uref{https://redis.io/, Redis} +key/value store, whose value is a @code{redis-configuration} object. @end defvr @deftp {Data Type} redis-configuration diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index b6bdd6080..3ecc8aff7 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 David Thompson ;;; Copyright © 2015, 2016 Ludovic Courtès ;;; Copyright © 2016 Leo Famulari +;;; Copyright © 2017 Christopher Baines ;;; ;;; This file is part of GNU Guix. ;;; @@ -342,16 +343,15 @@ The optional @var{config} argument specifies the configuration for (define redis-shepherd-service (match-lambda (($ redis bind port working-directory config-file) - (let - ((config-file - (or config-file - (default-redis.conf bind port working-directory)))) + (let ((config-file + (or config-file + (default-redis.conf bind port working-directory)))) (list (shepherd-service (provision '(redis)) (documentation "Run the Redis daemon.") (requirement '(user-processes syslogd)) (start #~(make-forkexec-constructor - `(,(string-append #$redis "/bin/redis-server") + '(#$(file-append redis "/bin/redis-server") #$config-file) #:user "redis" #:group "redis"))