From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id iBFROFoQMWZiUQEA62LTzQ:P1 (envelope-from ) for ; Tue, 30 Apr 2024 17:38:03 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id iBFROFoQMWZiUQEA62LTzQ (envelope-from ) for ; Tue, 30 Apr 2024 17:38:03 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=m4x.org header.s=gapps header.b=MD1JLa9y; dmarc=fail reason="SPF not aligned (relaxed)" header.from=m4x.org (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1714491482; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=/w3xHwvtEpCoev1vFgT0U1fzSmE1KnKzTX8KbNNw+Yw=; b=HycT6TjkLyj/H7/efBtvXz4XcW3stKsUhM6AKkVtoefD1YAO0pn0lL3E3KBsT5ly6qvpJ2 Wp9tfdAejSjUxBTB9kO2bI8W4C21Gauixcp8P/8MVBmTfcobSjm+9K4Rj5fS1Lr9MYJk0C q+MoLprjqhh55V4lORsq0v5ETz+yH5mnp/M/qykFM/Vd0pb2qVTB9F73hz828YsYQMwknP 8fg1pVLdql6cru4Cea03+YBzkZ5LY23Uj76NbE8Rg9kQveuxZkn3noCY56wMFWDs1745wg kUu7pfLWLQ+sW8tRYPobeshSE4xzuOdyu4/shFJ47SfIetJ51LLzwPrXmOw7WQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1714491482; a=rsa-sha256; cv=none; b=nfl2SXWsVhX0Qf/yK+I4zyUAcaGmQpO8ZlSpZBUwZdG8ToA3Pdq4rlW6uz6fs1NKVpPTTD Kp5cXWyvP6HqZFeeZLlrDnvIlcKfTX/G0lSzqr29wxHdjaekvoHA4vTK00loc4HA5ElquH 3tO2qcdcfYOa+0QBqxBYiuAmOsDevHIQpszERvsxsZNsaUATFn4Mw4ZXlhh1llzd5wt9AD jr3KFXKH0dZmDWM9DOg1YoYqryHjve/DFY/ABefiBtLwp+l+ZzWbjWlQZIsz85NMqU60th FjGuspHajMhkatplWbdbnUc1jZA+uKebV4w0xJ5ru8gR5Hfsp/i+mblQLwcV1A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=m4x.org header.s=gapps header.b=MD1JLa9y; dmarc=fail reason="SPF not aligned (relaxed)" header.from=m4x.org (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D43333CA3 for ; Tue, 30 Apr 2024 17:38:02 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1pY6-000668-Mz; Tue, 30 Apr 2024 11:37:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s1pY5-00065g-Jz for guix-patches@gnu.org; Tue, 30 Apr 2024 11:37:41 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s1pY5-0006Qp-Bx for guix-patches@gnu.org; Tue, 30 Apr 2024 11:37:41 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s1pYP-00052a-VM for guix-patches@gnu.org; Tue, 30 Apr 2024 11:38:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70677] [PATCH 1/2] services: syslog: Add extra-options argument to syslog service. Resent-From: Jean-Baptiste Note Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Apr 2024 15:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70677@debbugs.gnu.org Cc: Jean-Baptiste Note Received: via spool by 70677-submit@debbugs.gnu.org id=B70677.171449143719337 (code B ref 70677); Tue, 30 Apr 2024 15:38:01 +0000 Received: (at 70677) by debbugs.gnu.org; 30 Apr 2024 15:37:17 +0000 Received: from localhost ([127.0.0.1]:60013 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1pXg-00051j-Eb for submit@debbugs.gnu.org; Tue, 30 Apr 2024 11:37:17 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:50582) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1pXd-00051X-OJ for 70677@debbugs.gnu.org; Tue, 30 Apr 2024 11:37:14 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-41bab13ca4eso29094495e9.1 for <70677@debbugs.gnu.org>; Tue, 30 Apr 2024 08:36:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=m4x.org; s=gapps; t=1714491407; x=1715096207; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/w3xHwvtEpCoev1vFgT0U1fzSmE1KnKzTX8KbNNw+Yw=; b=MD1JLa9yiDVPIXWu/53E8YiqzA6jXUq+TB3elmEhSzEf8mVj2Ld1EkgSi1ofN+j4US 0ZzQ08YXpkzShSaNr4scGXQbP9zTK5eZOTq8pOiq3hJI13BEGsxiBkvo0OomjcsFk8P/ gl2YaEmMOFHSv6w+L4pojAFz2XkFScOfbopno= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714491407; x=1715096207; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/w3xHwvtEpCoev1vFgT0U1fzSmE1KnKzTX8KbNNw+Yw=; b=WeF5ZNTrW08blaZuucRCj76bSxc5EWFLnOU73RasbSFfrZ1MYGTLu7y/VWRY9WMMeR McBdP+7WSdEs4mJw2omP7QvsYAAoHz409dOM+AJCXAiQVUq1I+dGNWQzzjYkftorvevq 90YbPgXr6zOTALQbbHkrSQs/Kqzf6HDmgQzxc5Ug9xVkRNM8ARmsdj7Mx4hhvhmBz7cM 2MfNF5/3Iv8l/8iPAe3evEnKswsWFSs/VAzgnw4qhVvW/93pziUxFPU5U0XzBFc+9IjP cEECcFVH8e97acgA5Ib1PaEyaFi+xbIWTgf98oNM3r11nf50ZWcsGUZujPmNLvBDNKIQ E4pg== X-Gm-Message-State: AOJu0Yx3vYsIIBX/R2dq9Squfq9w3+3Ufvsw6/vPc+hbp+zKpH68jeuj FvbtCMEALAW2gjrAhnFsS3HM3xR6mmFuE1j2lV7hLv5F+a5Jqbj5KVO+N+7YlSBWo5X/IlIgVcX WNzOm0kDxx8/+p0Q4DO4okXuMke0KmrRK3tSj/sYe/jdgPs9uCc/rrRyOKkCyQfWf+48CygqSMj dR7H5dJEcUUgi5uZoYFPBo32jy5EKTdyFB1NWo0dY5LHdEUrk7edHEwd8f22ANQHU= X-Google-Smtp-Source: AGHT+IG6ZfAUWLwRXY6U5Uov+TXibsXwqhNs92cMRDjbkt3kvNCmTPH5KeV2iHSWWwb2QrotIblTsg== X-Received: by 2002:a05:600c:1c21:b0:418:e08c:817 with SMTP id j33-20020a05600c1c2100b00418e08c0817mr9595858wms.32.1714491406612; Tue, 30 Apr 2024 08:36:46 -0700 (PDT) Received: from guixrules.lan (2a01cb0808d89bcce2cec3fffe74cec8.ipv6.abo.wanadoo.fr. [2a01:cb08:8d8:9bcc:e2ce:c3ff:fe74:cec8]) by smtp.gmail.com with ESMTPSA id ay39-20020a05600c1e2700b0041b61504565sm19269436wmb.28.2024.04.30.08.36.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 08:36:46 -0700 (PDT) From: Jean-Baptiste Note Date: Tue, 30 Apr 2024 15:36:21 +0000 Message-ID: <44cb8b9fe93ffc2fb653657ea18374543d4f33db.1714490986.git.jean-baptiste.note@m4x.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -0.79 X-Spam-Score: -0.79 X-Migadu-Queue-Id: D43333CA3 X-Migadu-Scanner: mx11.migadu.com X-TUID: V7B+kQBJs4ro * gnu/services/base.scm (): 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* (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