>From f66520181a65566b1f191583c3e1344c1af93ecc Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Sat, 28 Mar 2015 15:42:23 +0300 Subject: [PATCH 2/2] services: syslog-service: Add 'config-file' argument. * gnu/services/base.scm (syslog-service): Add 'config-file' keyword argument. * doc/guix.texi (Base Services): Document it. --- doc/guix.texi | 5 +++-- gnu/services/base.scm | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 3c72e65..73d79e3 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -4489,8 +4489,9 @@ external name servers do not even need to be queried. @end defvr address@hidden {Monadic Procedure} syslog-service -Return a service that runs @code{syslogd} with reasonable default address@hidden {Monadic Procedure} syslog-service [#:config-file #f] +Return a service that runs @code{syslogd}. If configuration file name address@hidden is not specified, use some reasonable default settings. @end deffn diff --git a/gnu/services/base.scm b/gnu/services/base.scm index f5ee8f5..d752948 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -526,8 +526,10 @@ given @var{config}---an @code{} object. Optionally, (respawn? #f))))) -(define (syslog-service) - "Return a service that runs @code{syslogd} with reasonable default settings." +(define* (syslog-service #:key config-file) + "Return a service that runs @code{syslogd}. +If configuration file name @var{config-file} is not specified, use some +reasonable default settings." ;; Snippet adapted from the GNU inetutils manual. (define contents " @@ -561,7 +563,7 @@ mail.* /var/log/maillog (start #~(make-forkexec-constructor (list (string-append #$inetutils "/libexec/syslogd") - "--no-detach" "--rcfile" #$syslog.conf))) + "--no-detach" "--rcfile" #$(or config-file syslog.conf)))) (stop #~(make-kill-destructor)))))) (define* (guix-build-accounts count #:key -- 2.2.1