From: Jean-Baptiste Note <jean-baptiste.note@m4x.org>
To: 70677@debbugs.gnu.org
Cc: Jean-Baptiste Note <jean-baptiste.note@m4x.org>
Subject: [bug#70677] [PATCH 1/2] services: syslog: Add extra-options argument to syslog service.
Date: Tue, 30 Apr 2024 15:36:21 +0000 [thread overview]
Message-ID: <44cb8b9fe93ffc2fb653657ea18374543d4f33db.1714490986.git.jean-baptiste.note@m4x.org> (raw)
In-Reply-To: <cover.1714490986.git.jean-baptiste.note@m4x.org>
* gnu/services/base.scm (<syslog-configuration>): Add extra-options field.
(syslog-shepherd-service): Use it when running the service.
* doc/guix.texi: Document it.
Change-Id: I540d070b9a9678b45ec9fa28d6fdc761f9b3fd9a
---
doc/guix.texi | 3 +++
gnu/services/base.scm | 7 +++++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 3a9afcd814..81e6283196 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -19442,6 +19442,9 @@ Base Services
@xref{syslogd invocation,,, inetutils, GNU Inetutils}, for more
information on the configuration file syntax.
+@item @code{extra-options} (default: @code{'()})
+List of extra command-line options for @command{syslog}.
+
@end table
@end deftp
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index f35d74ee40..47565a3d5a 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1553,7 +1553,9 @@ (define-record-type* <syslog-configuration>
(syslogd syslog-configuration-syslogd
(default (file-append inetutils "/libexec/syslogd")))
(config-file syslog-configuration-config-file
- (default %default-syslog.conf)))
+ (default %default-syslog.conf))
+ (extra-options syslog-configuration-extra-options
+ (default '())))
;;; Note: a static file name is used for syslog.conf so that the reload action
;;; work as intended.
@@ -1589,7 +1591,8 @@ (define (syslog-shepherd-service config)
;; action work as intended.
(start #~(make-forkexec-constructor
(list #$(syslog-configuration-syslogd config)
- #$(string-append "--rcfile=" syslog.conf))
+ #$(string-append "--rcfile=" syslog.conf)
+ #$@(syslog-configuration-extra-options config))
#:file-creation-mask #o137
#:pid-file "/var/run/syslog.pid"))
(stop #~(make-kill-destructor))))
--
2.41.0
next prev parent reply other threads:[~2024-04-30 15:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-30 15:34 [bug#70677] [PATCH 0/2] Improve syslog service flexibility Jean-Baptiste Note
2024-04-30 15:36 ` Jean-Baptiste Note [this message]
2024-04-30 15:36 ` [bug#70677] [PATCH 2/2] services: syslog: Adjust service for rsyslog compatibility Jean-Baptiste Note
2024-12-23 17:13 ` bug#70677: [PATCH 0/2] Improve syslog service flexibility Ludovic Courtès
2024-12-23 22:34 ` [bug#70677] " Jean-Baptiste Note
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=44cb8b9fe93ffc2fb653657ea18374543d4f33db.1714490986.git.jean-baptiste.note@m4x.org \
--to=jean-baptiste.note@m4x.org \
--cc=70677@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).