01/01: services: syslog-service: Add 'config-file' argument.

[Alex Kost]

alezost pushed a commit to branch master
in repository guix.

commit 1bb76f75232c755ff70a43bffa28745f9a32aceb
Author: Alex Kost <address@hidden>
Date:   Sat Mar 28 15:42:23 2015 +0300

    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 4e549ac..556f138 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -4508,8 +4508,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 24e6d32..cd1ba0b 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -526,8 +526,10 @@ given @var{config}---an @code{<nscd-configuration>} 
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 @@ given @var{config}---an @code{<nscd-configuration>} object. 
 Optionally,
       (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