summaryrefslogtreecommitdiff
path: root/gnu/services/base.scm
diff options
context:
space:
mode:
authorBruno Victal <mirai@makinata.eu>2023-02-25 18:57:53 +0000
committerLudovic Courtès <ludo@gnu.org>2023-03-03 17:55:32 +0100
commit6edacf249110ce9e59dc44f330d7f03ecd7c60d8 (patch)
tree0929afa243c78f275b53e9a09305f6ae174e4ebc /gnu/services/base.scm
parent98e9dc6ab7f66203fa9a921605ef7de0ff038e11 (diff)
services: base: Deprecate 'syslog-service' procedure.
* doc/guix.texi (Base Services): Replace syslog-service with syslog-service-type. * gnu/services/base.scm (%default-syslog.conf): Place before <syslog-configuration>. (syslog-service-type): Set default value. (syslog-service): Deprecate procedure. (%base-services): Use syslog-service-type. * gnu/system/hurd.scm (%base-services/hurd): Ditto. * gnu/system/install.scm (%installation-services): Ditto. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/services/base.scm')
-rw-r--r--gnu/services/base.scm61
1 files changed, 31 insertions, 30 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 423a38e39d..45e6c5f448 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -190,7 +190,7 @@
syslog-configuration
syslog-configuration?
- syslog-service
+ syslog-service ; deprecated
syslog-service-type
%default-syslog.conf
@@ -1511,6 +1511,32 @@ given @var{config}---an @code{<nscd-configuration>} object. @xref{Name
Service Switch}, for an example."
(service nscd-service-type config))
+;; Snippet adapted from the GNU inetutils manual.
+(define %default-syslog.conf
+ (plain-file "syslog.conf" "
+ # Log all error messages, authentication messages of
+ # level notice or higher and anything of level err or
+ # higher to the console.
+ # Don't log private authentication messages!
+ *.alert;auth.notice;authpriv.none -/dev/console
+
+ # Log anything (except mail) of level info or higher.
+ # Don't log private authentication messages!
+ *.info;mail.none;authpriv.none -/var/log/messages
+
+ # Log \"debug\"-level entries and nothing else.
+ *.=debug -/var/log/debug
+
+ # Same, in a different place.
+ *.info;mail.none;authpriv.none -/dev/tty12
+
+ # The authpriv file has restricted access.
+ # 'fsync' the file after each line (hence the lack of a leading dash).
+ authpriv.* /var/log/secure
+
+ # Log all the mail messages in one place.
+ mail.* -/var/log/maillog
+"))
(define-record-type* <syslog-configuration>
syslog-configuration make-syslog-configuration
@@ -1540,37 +1566,12 @@ Service Switch}, for an example."
(umask mask)
pid))))
(stop #~(make-kill-destructor))))
+ (syslog-configuration)
(description "Run the syslog daemon, @command{syslogd}, which is
responsible for logging system messages.")))
-;; Snippet adapted from the GNU inetutils manual.
-(define %default-syslog.conf
- (plain-file "syslog.conf" "
- # Log all error messages, authentication messages of
- # level notice or higher and anything of level err or
- # higher to the console.
- # Don't log private authentication messages!
- *.alert;auth.notice;authpriv.none -/dev/console
-
- # Log anything (except mail) of level info or higher.
- # Don't log private authentication messages!
- *.info;mail.none;authpriv.none -/var/log/messages
-
- # Log \"debug\"-level entries and nothing else.
- *.=debug -/var/log/debug
-
- # Same, in a different place.
- *.info;mail.none;authpriv.none -/dev/tty12
-
- # The authpriv file has restricted access.
- # 'fsync' the file after each line (hence the lack of a leading dash).
- authpriv.* /var/log/secure
-
- # Log all the mail messages in one place.
- mail.* -/var/log/maillog
-"))
-
-(define* (syslog-service #:optional (config (syslog-configuration)))
+(define-deprecated (syslog-service #:optional (config (syslog-configuration)))
+ syslog-service-type
"Return a service that runs @command{syslogd} and takes
@var{<syslog-configuration>} as a parameter.
@@ -3294,7 +3295,7 @@ login manager daemon.")
(cons tty %default-console-font))
'("tty1" "tty2" "tty3" "tty4" "tty5" "tty6")))
- (syslog-service)
+ (service syslog-service-type)
(service agetty-service-type (agetty-configuration
(extra-options '("-L")) ; no carrier detect
(term "vt100")