aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2025-02-03 15:41:07 +0100
committerLudovic Courtès <ludo@gnu.org>2025-02-15 22:47:59 +0100
commitc83bfc0415ba928b746362915d67600cdbb5da62 (patch)
tree7db0cce89401fad8777df9b411be196829b3bebc
parent190a4275bd40e59f1873180f42b66e7200b13496 (diff)
downloadguix-c83bfc0415ba928b746362915d67600cdbb5da62.tar.gz
guix-c83bfc0415ba928b746362915d67600cdbb5da62.zip
services: Switch to ‘shepherd-system-log-service-type’ in ‘%base-services’.
* 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
-rw-r--r--doc/guix.texi17
-rw-r--r--gnu/services/base.scm2
2 files changed, 14 insertions, 5 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index b57da0527e..f8b3022ccf 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -19880,11 +19880,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
@@ -46047,6 +46053,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
@@ -46057,6 +46064,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 4bc0433def..684de754e6 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -3931,7 +3931,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")