From patchwork Wed May 22 14:53:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 64827 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2FE8F27BBEA; Wed, 22 May 2024 15:55:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A4E2727BBE2 for ; Wed, 22 May 2024 15:55:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s9nMr-0005T8-8x; Wed, 22 May 2024 10:55:01 -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 1s9nMp-0005SZ-V9 for guix-patches@gnu.org; Wed, 22 May 2024 10:55:00 -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 1s9nMp-0007Zi-HS; Wed, 22 May 2024 10:54:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s9nMs-0003v9-A5; Wed, 22 May 2024 10:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71118] [PATCH 1/5] services: nscd: =?utf-8?b?4oCYbG9nLWZpbGU=?= =?utf-8?b?4oCZ?= defaults to #f. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: pelzflorian@pelzflorian.de, ludo@gnu.org, matt@excalamus.com, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 22 May 2024 14:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71118 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71118@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Florian Pelz , Ludovic =?utf-8?q?Court=C3=A8s?= , Matthew Trzcinski , Maxim Cournoyer X-Debbugs-Original-Xcc: Florian Pelz , Ludovic =?utf-8?q?Court=C3=A8s?= , Matthew Trzcinski , Maxim Cournoyer Received: via spool by 71118-submit@debbugs.gnu.org id=B71118.171638964615015 (code B ref 71118); Wed, 22 May 2024 14:55:02 +0000 Received: (at 71118) by debbugs.gnu.org; 22 May 2024 14:54:06 +0000 Received: from localhost ([127.0.0.1]:56419 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9nLy-0003u7-38 for submit@debbugs.gnu.org; Wed, 22 May 2024 10:54:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33848) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9nLw-0003t1-DZ for 71118@debbugs.gnu.org; Wed, 22 May 2024 10:54:04 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s9nLk-0007Rl-GD; Wed, 22 May 2024 10:53:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=58PgpLji3JvoVQfDpvKQBKEmHPBVYo90p9Dtpb6fvG8=; b=SSYfCAyGm2s0pD03vzqH +NyN7eqr34KGRdvbiG0vUHMjO16pK4cotaATEsAQ01PcZe7v+nu+78dT2GNei7Am2FWnJf4uvIm8Y MO2lrQDcUkdv2jOrufTqtEdstEEiq6cMmWwUK60SAvLqRlc57UkYcu0nkupm0wNxD1I0aMg7uYqJ9 gVSi780icb/MIh4573B35h7+ERZ7XWw/cz3j0LhOJ7eHxQrrm9XouvGJFv32b3jtUQkGbRoCsUZ8N T8wqVVasMrcXDD+ZKoW6RSBwcXBS2rAL87U9ZVPpM4xZoKn7+Wjfvda0se2BZVE1jw+vd5i60LQec 4zNQPK8Lj3/h1g==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Wed, 22 May 2024 16:53:36 +0200 Message-ID: <91683e6a6059df7816833d4e4d1e3bfc43aa74e7.1716386553.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/base.scm ()[log-file]: Default to #f. * doc/guix.texi (Base Services): Clarify documentation. Change-Id: Ia75914fc2665db13bef688d53659083a615ebef4 --- doc/guix.texi | 8 +++++--- gnu/services/base.scm | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 8073e3f6d49..0055724e658 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19446,9 +19446,11 @@ Base Services Package object denoting the GNU C Library providing the @command{nscd} command. -@item @code{log-file} (default: @code{"/var/log/nscd.log"}) -Name of the nscd log file. This is where debugging output goes when -@code{debug-level} is strictly positive. +@item @code{log-file} (default: @code{#f}) +Name of the nscd log file. Debugging output goes to that file when +@code{debug-level} is strictly positive, or to standard error if it is +@code{#f}. Regular messages are written to syslog when +@code{debug-level} is zero, regardless of the value of @code{log-file}. @item @code{debug-level} (default: @code{0}) Integer denoting the debugging levels. Higher numbers mean that more diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 85160bd3abb..984670cd32c 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1285,7 +1285,7 @@ (define-record-type* nscd-configuration make-nscd-configuration nscd-configuration? (log-file nscd-configuration-log-file ;string - (default "/var/log/nscd.log")) + (default #f)) (debug-level nscd-debug-level ;integer (default 0)) ;; TODO: See nscd.conf in glibc for other options to add. From patchwork Wed May 22 14:53:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 64826 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A7B5E27BBEA; Wed, 22 May 2024 15:55:48 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3A4E127BBE2 for ; Wed, 22 May 2024 15:55:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s9nMo-0005Rr-ND; Wed, 22 May 2024 10:54:58 -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 1s9nMn-0005RD-6h for guix-patches@gnu.org; Wed, 22 May 2024 10:54:57 -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 1s9nMm-0007ZK-U8 for guix-patches@gnu.org; Wed, 22 May 2024 10:54:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s9nMs-0003vH-Ld for guix-patches@gnu.org; Wed, 22 May 2024 10:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71118] [PATCH 2/5] services: tor: Log to stderr rather than syslog. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 May 2024 14:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71118 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71118@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 71118-submit@debbugs.gnu.org id=B71118.171638965015033 (code B ref 71118); Wed, 22 May 2024 14:55:02 +0000 Received: (at 71118) by debbugs.gnu.org; 22 May 2024 14:54:10 +0000 Received: from localhost ([127.0.0.1]:56426 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9nM2-0003uO-Gb for submit@debbugs.gnu.org; Wed, 22 May 2024 10:54:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33854) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9nLw-0003t2-HA for 71118@debbugs.gnu.org; Wed, 22 May 2024 10:54:05 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s9nLl-0007Rp-DK; Wed, 22 May 2024 10:53:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=e+J93AjiklSLAX0MWVVvu5SgBaazvf4BZRDdjGbVv4I=; b=Eo+9EhXrpHhjiCKVBWyD xM3qYroHhjMVLAc3pxKZ/r1fSpXfbQBwW6Oy2fGmWaJ/AKoSuPJBV7nTpCQ2PK/l1uCKy0uk/H16O IVnun0nlYxXp1qli9HGEeE17kUlagCfdUezW86bGh+qjV7iuvYvdk9wy6CdOawqbzEgD6LrXMPePw 1H2nDvtGYGVZskMIpO3FmLdtyVDZ6hWKdlUh3vTMwHQEBQoxbYf35C5c9LE+Rwo5YQWUNHUMrvWeP dTWhpQ+GZ5YUYuxg51ky3WDQZzL8oBeT3AVPpxQmmNdfLHFkfDi6tqpe1RIGwmRnGJXZ1MC3xsHzu ynx0mxelDxdIiw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Wed, 22 May 2024 16:53:37 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/networking.scm (tor-configuration->torrc): Change ‘Log’ directive to ‘stderr’. (tor-shepherd-service): Remove /dev/log file system mapping. Change-Id: I2e33ad8033f884ce59d929a4181172325331efe0 --- gnu/services/networking.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 8e64e529abf..378e117a869 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -1001,7 +1001,7 @@ (define (tor-configuration->torrc config) (display "\ ### These lines were generated from your system configuration: DataDirectory /var/lib/tor -Log notice syslog\n" port) +Log notice stderr\n" port) (when (eq? 'unix '#$socks-socket-type) (display "\ SocksPort unix:/var/run/tor/socks-sock @@ -1046,9 +1046,6 @@ (define (tor-shepherd-service config) (source "/var/lib/tor") (target source) (writable? #t)) - (file-system-mapping - (source "/dev/log") ;for syslog - (target source)) (file-system-mapping (source "/var/run/tor") (target source) From patchwork Wed May 22 14:53:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 64824 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1382E27BBE9; Wed, 22 May 2024 15:55:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 00F2F27BBE2 for ; Wed, 22 May 2024 15:55:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s9nMp-0005SD-0U; Wed, 22 May 2024 10:54:59 -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 1s9nMn-0005RL-KD for guix-patches@gnu.org; Wed, 22 May 2024 10:54:57 -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 1s9nMn-0007ZQ-Ba for guix-patches@gnu.org; Wed, 22 May 2024 10:54:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s9nMt-0003vO-4M for guix-patches@gnu.org; Wed, 22 May 2024 10:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71118] [PATCH 3/5] services: dbus: Log to stderr rather than syslog. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 May 2024 14:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71118 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71118@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 71118-submit@debbugs.gnu.org id=B71118.171638965115040 (code B ref 71118); Wed, 22 May 2024 14:55:03 +0000 Received: (at 71118) by debbugs.gnu.org; 22 May 2024 14:54:11 +0000 Received: from localhost ([127.0.0.1]:56428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9nM2-0003uQ-RE for submit@debbugs.gnu.org; Wed, 22 May 2024 10:54:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9nLx-0003t3-Dw for 71118@debbugs.gnu.org; Wed, 22 May 2024 10:54:05 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s9nLm-0007Ry-A1; Wed, 22 May 2024 10:53:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=q90TZPyZyXCLfuaQmdmwaw24fECWOVDEZqC0O6Ka/cU=; b=XcBL37NoIyNqfdx2Op9p 6njUyHwX4UH7lzCy+HO8UgRmRKSINdDFE2tesu8l9o1dM13+6UIM1xj7IZx+S5ExBHji5CDSEEnqg Z4DIA7zCH8XQlfyCcIfuKT0cC4lON+g0Fm4sJLffCS0Pg2/fXqN7nBAnwTas8rtTftuZU5aI8O3QM 7wPCLKNR8q8v9FUBhkZbEO9PTT3SiCX/9KQt3nEz0Q12xOZajuPLxnWKMB3paxW01pJMl4his3vWl ZfzabFhqIK6YO6BtWhV6dbqA6LqapIG7s19eNzEe3Y46H+Dud9MnR/8FHb05gH9L/PTCuI/26HuVS F74xJYC1eUa8pA==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Wed, 22 May 2024 16:53:38 +0200 Message-ID: <9fed6be4971d5b89621dd68db2597898eecf91b1.1716386553.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/dbus.scm (dbus-shepherd-service): Remove ‘--syslog-only’ option and pass #:log-file unconditionally. Change-Id: I9e42f241e08b95ff01e9ad69551bc2c7ce869d6d --- gnu/services/dbus.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm index 8dee91a3f7b..1e1380185a4 100644 --- a/gnu/services/dbus.scm +++ b/gnu/services/dbus.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2019, 2020, 2021 Ludovic Courtès +;;; Copyright © 2013-2017, 2019-2021, 2024 Ludovic Courtès ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 Brice Waegeneire @@ -234,12 +234,12 @@ (define dbus-shepherd-service (requirement '(user-processes syslogd)) (start #~(make-forkexec-constructor (list (string-append #$dbus "/bin/dbus-daemon") - "--nofork" "--system" "--syslog-only") + "--nofork" "--system") + #:log-file "/var/log/dbus-daemon.log" #$@(if verbose? ;; Since the verbose output goes to the console, ;; not syslog, add a log file to capture it. - '(#:environment-variables '("DBUS_VERBOSE=1") - #:log-file "/var/log/dbus-daemon.log") + '(#:environment-variables '("DBUS_VERBOSE=1")) '()) #:pid-file "/run/dbus/pid")) (stop #~(make-kill-destructor))))))) From patchwork Wed May 22 14:53:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 64825 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 74D7027BBEA; Wed, 22 May 2024 15:55:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EB99D27BBE2 for ; Wed, 22 May 2024 15:55:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s9nMq-0005Se-DB; Wed, 22 May 2024 10:55:00 -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 1s9nMo-0005Rd-6p for guix-patches@gnu.org; Wed, 22 May 2024 10:54:58 -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 1s9nMn-0007ZW-UQ for guix-patches@gnu.org; Wed, 22 May 2024 10:54:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s9nMt-0003vV-NN for guix-patches@gnu.org; Wed, 22 May 2024 10:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71118] [PATCH 4/5] services: avahi: Use socket activation and log to stderr. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 May 2024 14:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71118 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71118@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 71118-submit@debbugs.gnu.org id=B71118.171638965115047 (code B ref 71118); Wed, 22 May 2024 14:55:03 +0000 Received: (at 71118) by debbugs.gnu.org; 22 May 2024 14:54:11 +0000 Received: from localhost ([127.0.0.1]:56430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9nM3-0003uX-82 for submit@debbugs.gnu.org; Wed, 22 May 2024 10:54:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33872) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9nLy-0003t4-9p for 71118@debbugs.gnu.org; Wed, 22 May 2024 10:54:06 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s9nLn-0007S8-5t; Wed, 22 May 2024 10:53:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=GORMkBKHm0X3E7XZXTrV1X0/6lbmwHkT/NS4V/brjP8=; b=ZlgdnpGOaiPWhNPhGMKS LtBqahMdZZ7WwcfcnkydTv313BGtVRCDUd4UG1rjU2xAyI87WakjIigsRVHU2Ug6p6eV0pLPAq9iw Q2XJnd8VU4KpsrmNwX1ux+8QcjmPf015Trvf1JgfKry8TXVThpEPZOxkGxfS+pIRacHInhzyJ3cH5 2awiHQQMCMoCtnvD5TNjWqanxCkiF1hAOs6WpJiuhwwGMyxyRjX7Sy0EGeHRfD7OSYK9Ojqo8GJVN syPyeHIwr3R/AsXA3E4FciB7zuLva/ov9LkOSNXnPi7bvCYEXxukPuoW2XIewOxVcQITCVlwPG7XE /5AJRg1p2jTJcQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Wed, 22 May 2024 16:53:39 +0200 Message-ID: <4c2a4c6f80531b1e051c00c9d2f12cfec8dcf85b.1716386553.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/avahi.scm (avahi-shepherd-service): Change to systemd style. Remove ‘--daemonize’ option and #:pid-file. Add #:lazy-start? and #:log-file. Change-Id: I1915243f057ff3bbe281f46f17826f24b124f659 --- gnu/services/avahi.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gnu/services/avahi.scm b/gnu/services/avahi.scm index 1c4220e490b..9352492bbda 100644 --- a/gnu/services/avahi.scm +++ b/gnu/services/avahi.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014-2020, 2022 Ludovic Courtès +;;; Copyright © 2014-2020, 2022, 2024 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -131,13 +131,17 @@ (define (avahi-shepherd-service config) (provision '(avahi-daemon)) (requirement '(user-processes dbus-system networking)) - (start #~(make-forkexec-constructor + (start #~(make-systemd-constructor (list #$(file-append avahi "/sbin/avahi-daemon") - "--daemonize" #$@(if debug? #~("--debug") #~()) "-f" #$config) - #:pid-file "/run/avahi-daemon/pid")) - (stop #~(make-kill-destructor)) + (list (endpoint + (make-socket-address + AF_UNIX + "/run/avahi-daemon/socket"))) + #:lazy-start? #f + #:log-file "/var/log/avahi-daemon.log")) + (stop #~(make-systemd-destructor)) (actions (list (shepherd-configuration-action config))))))) (define avahi-service-type From patchwork Wed May 22 14:53:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 64828 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C786C27BBEA; Wed, 22 May 2024 15:56:02 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 699E927BBE2 for ; Wed, 22 May 2024 15:56:02 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s9nN1-0005Tk-1Q; Wed, 22 May 2024 10:55:12 -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 1s9nMo-0005Rs-MM for guix-patches@gnu.org; Wed, 22 May 2024 10:54:58 -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 1s9nMo-0007Zc-EB for guix-patches@gnu.org; Wed, 22 May 2024 10:54:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s9nMu-0003vc-6j for guix-patches@gnu.org; Wed, 22 May 2024 10:55:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71118] [PATCH 5/5] services: darkstat: Depend on =?utf-8?b?4oCYdXNlci1wcm9jZXNzZXPigJku?= Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 May 2024 14:55:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71118 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71118@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 71118-submit@debbugs.gnu.org id=B71118.171638965215053 (code B ref 71118); Wed, 22 May 2024 14:55:04 +0000 Received: (at 71118) by debbugs.gnu.org; 22 May 2024 14:54:12 +0000 Received: from localhost ([127.0.0.1]:56432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9nM3-0003ue-Pj for submit@debbugs.gnu.org; Wed, 22 May 2024 10:54:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9nLz-0003tC-CX for 71118@debbugs.gnu.org; Wed, 22 May 2024 10:54:07 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s9nLo-0007SK-8a; Wed, 22 May 2024 10:53:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=/gLFltWKIMgKe5qFzpn/hvW75+DR3i5Kf+l1pBDetLQ=; b=evkzVbeh/pGvJQhikdtw PFw3OuQlYhgc9YL2VzaxtkfLR+R0Txpo4oAJH6f365IHQQiaxP7Qxc2JpnFRLNfCi58ttN6KGbCNg 95l9kqz9hIXuKtmPuh4xnu3exg15OavRBZ6FT/VN+UgWuSoFn+/cww75XNaQqZ2mjSLJkasKUgCgs yAS8zbbiAmGoBQJ9NrQbbeMxnZq7lchTU7tHorpwp9utrMFNYLFRI+mOWEKSfcPcOox2QrAEUOss0 ZWj2LStotmIORaKi9dfbSXmxb7bIkox2EDJgX46yvmmioj8KW7dkjo7I/d3AvsjodJK8oXNdsqHYv 822CuG+2/UtxpQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Wed, 22 May 2024 16:53:40 +0200 Message-ID: <04823875cab4d8bc0277827abbc3e511dee04c4a.1716386553.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/monitoring.scm (darkstat-shepherd-service): Add ‘user-processes’ to ‘requirement’. Change-Id: I6abaefd88c6075a0379e5867838653765dfaa08e Reviewed-by: Maxim Cournoyer --- gnu/services/monitoring.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/services/monitoring.scm b/gnu/services/monitoring.scm index e698040078e..0a93c907eea 100644 --- a/gnu/services/monitoring.scm +++ b/gnu/services/monitoring.scm @@ -132,7 +132,7 @@ (define darkstat-shepherd-service (shepherd-service (documentation "Network statistics gatherer.") (provision '(darkstat)) - (requirement '(networking)) + (requirement '(user-processes networking)) (start #~(make-forkexec-constructor (list #$(file-append package "/sbin/darkstat") "-i" #$interface