04/05: services: Add 'rottlog-service-type' to '%base-services'.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 0468455e7d279c89ea3ad1b51935efb2b785ec47
Author: Ludovic Courtès <address@hidden>
AuthorDate: Mon Apr 6 11:47:04 2020 +0200

    services: Add 'rottlog-service-type' to '%base-services'.
    
    * gnu/services/base.scm (%base-services): Add an instance of
    ROTTLOG-SERVICE-TYPE.
    * doc/guix.texi (Log Rotation): Mention that it's part of
    %BASE-SERVICES and change example.
---
 doc/guix.texi         | 20 +++++++++++++++-----
 gnu/services/base.scm |  2 ++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 4d1acf1..450ca3c 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -13186,17 +13186,27 @@ their contents in separate files, possibly 
compressed.  The @code{(gnu
 services admin)} module provides an interface to GNU@tie{}Rot[t]log, a
 log rotation tool (@pxref{Top,,, rottlog, GNU Rot[t]log Manual}).
 
-The example below defines an operating system that provides log rotation
-with the default settings, for commonly encountered log files.
+This service is part of @code{%base-services}, and thus enabled by
+default, with the default settings, for commonly encountered log files.
+The example below shows how to extend it with an additional
+@dfn{rotation}, should you need to do that (usually, services that
+produce log files already take care of that):
 
 @lisp
 (use-modules (guix) (gnu))
-(use-service-modules admin mcron)
-(use-package-modules base idutils)
+(use-service-modules admin)
+
+(define my-log-files
+  ;; Log files that I want to rotate.
+  '("/var/log/something.log" "/var/log/another.log"))
 
 (operating-system
   ;; @dots{}
-  (services (cons (service rottlog-service-type)
+  (services (cons (simple-service 'rotate-my-stuff
+                                  rottlog-service-type
+                                  (list (log-rotation
+                                         (frequency 'daily)
+                                         (files my-log-files))))
                   %base-services)))
 @end lisp
 
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 8d9a563..a0179c0 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -2444,6 +2444,8 @@ to handle."
         (service guix-service-type)
         (service nscd-service-type)
 
+        (service rottlog-service-type)
+
         ;; The LVM2 rules are needed as soon as LVM2 or the device-mapper is
         ;; used, so enable them by default.  The FUSE and ALSA rules are
         ;; less critical, but handy.