From 8492a3c8962664db4bd0e7475f63be0ef59db87a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 3 Feb 2025 15:41:07 +0100
Subject: [PATCH] =?UTF-8?q?services:=20Switch=20to=20=E2=80=98shepherd-sys?=
 =?UTF-8?q?tem-log-service-type=E2=80=99=20in=20=E2=80=98%base-services?=
 =?UTF-8?q?=E2=80=99.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reinstates c83bfc0415ba928b746362915d67600cdbb5da62, which had been
reverted in 8c483c12e94bcf43e4c44170f1d5fea5fbba4970 in response to
<https://issues.guix.gnu.org/76315>.

* gnu/services/base.scm (%base-services): Replace ‘syslog-service-type’
by ‘shepherd-system-log-service-type’.
* doc/guix.texi (Base Services): Update ‘syslog-service-type’
documentation.
(Shepherd Services): Mention that ‘system-log-service-type’ is in
‘%base-services’.  Add anchor.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I21082300f6a052865a6ab1bdff27fbe71f73d492
---
 doc/guix.texi         | 17 +++++++++++++----
 gnu/services/base.scm |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 8b6c011eccb179d7f7f65a9edc790d3540a18460..78bc4ae02a0b67472661b3d5eb92060c081061ed 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -19898,11 +19898,17 @@ privacy---often the result of host name lookups is in local cache, so
 external name servers do not even need to be queried.
 @end defvar
 
-@cindex syslog
-@cindex logging
+@cindex syslog, with external syslogd
+@cindex logging, syslog
 @defvar syslog-service-type
-Type of the service that runs the syslog daemon, whose value is a
-@code{<syslog-configuration>} object.
+Type of the service that runs the syslog daemon (@command{syslogd}),
+whose value is a @code{<syslog-configuration>} object (see below).
+
+@quotation Note
+This service is redundant with and for the most part superseded by
+@code{shepherd-system-log-service-type} (@pxref{shepherd-system-log, the
+Shepherd system log}).
+@end quotation
 @end defvar
 
 To have a modified @code{syslog-configuration} come into effect after
@@ -46866,6 +46872,7 @@ herd schedule timer at 07:00 -- mpg123 Music/alarm.mp3
 on the @code{timer} service.
 @end defvar
 
+@anchor{shepherd-system-log}
 @cindex system log service, from Shepherd
 @cindex syslogd, Shepherd system log service
 @defvar shepherd-system-log-service-type
@@ -46876,6 +46883,8 @@ traditionally implemented by @command{syslogd} programs.
 
 The value of services of this type must be a
 @code{system-log-configuration} record, as described below.
+
+This service is part of @code{%base-services} (@pxref{Base Services}).
 @end defvar
 
 @c %start of fragment
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 220642e8ebbd182aa08345b8155d44a4db344277..a5d9e6334e293493dae60a5aa9c710c9a5cdb247 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -3945,7 +3945,7 @@ login manager daemon.")
                         (cons tty %default-console-font))
                       '("tty1" "tty2" "tty3" "tty4" "tty5" "tty6")))
 
-        (service syslog-service-type)
+        (service shepherd-system-log-service-type)
         (service agetty-service-type (agetty-configuration
                                        (extra-options '("-L")) ; no carrier detect
                                        (term "vt100")