From unknown Tue Jun 17 20:32:22 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#77045 <77045@debbugs.gnu.org> To: bug#77045 <77045@debbugs.gnu.org> Subject: Status: [PATCH] services: wireguard: Add the shepherd-requirement field. Reply-To: bug#77045 <77045@debbugs.gnu.org> Date: Wed, 18 Jun 2025 03:32:22 +0000 retitle 77045 [PATCH] services: wireguard: Add the shepherd-requirement fie= ld. reassign 77045 guix-patches submitter 77045 Sergey Trofimov severity 77045 normal tag 77045 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 16 03:56:02 2025 Received: (at submit) by debbugs.gnu.org; 16 Mar 2025 07:56:02 +0000 Received: from localhost ([127.0.0.1]:45224 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ttiqn-00034V-MF for submit@debbugs.gnu.org; Sun, 16 Mar 2025 03:56:02 -0400 Received: from lists.gnu.org ([2001:470:142::17]:35674) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ttiqk-000334-9m for submit@debbugs.gnu.org; Sun, 16 Mar 2025 03:56: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 1ttiqa-0006ck-8P for guix-patches@gnu.org; Sun, 16 Mar 2025 03:55:49 -0400 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ttiqY-0006w6-Ab for guix-patches@gnu.org; Sun, 16 Mar 2025 03:55:48 -0400 Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-ac2ab99e16eso118176666b.0 for ; Sun, 16 Mar 2025 00:55:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1742111742; x=1742716542; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=mv575txBlWXuSca5X6KJXez11Xj5b51JOKzKu5KJe3M=; b=ujzfwvs5iS786mXbm9AGDtuDs9KTt1Pr/ifmYVVge26z1OxTR0YiZaBWjcgfww+4HW RkswT1F11pST69CLW0QYDhWr8jjwWxCDDOYDRJCEppJVnt/75aq3WTh+DUTUS6iFXgMd ucC0KUm5BZeyJ8dCkCGusZF/8LjOKawhurPRMFFLHpB9goJ0rUbaTDB80yfG1qJU/0XD 9u7ID6W5ZRw6re+akqzJH9z4EbaBqnovHPisL3C4CkJ7mH0cqe64pywiXgdRAx3T+Yfp GfKhfPul+lO8V9p5+evMerFe7pRJdZQpQvq80DInBehOTlYKXLbiNjgefJilKK00wlil k/Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742111742; x=1742716542; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=mv575txBlWXuSca5X6KJXez11Xj5b51JOKzKu5KJe3M=; b=GkEmjWZgWea2VXOsXwDs8qszqIMjqZHWprOr4hgxmT9bjjoNG0QyiYLB6vn6vcubN/ yElqc/inwDdns09Lky6Ve88HXbvTNFfhSusPdZMkptI9X5bc+67QSj1iB0ZjV5eOa9gb Xt1J9ZBV1mm7E4NsxO6Q93IUscrURJkqmSqY0mWxxM4LqouhE4IsBVnCBMwyD9A3p0af QnlhhFT9iUKgs2ZRQkzpVO8HLw+yLD3C6Dd+hmXtSHN+nCErpLpGD+iNnjlZJ8KZoGHn GkxBzKe/ULkUx8jXg560oDrWvw6wJ8WlSnJjrYcbyFp2zUOAaeDosWp0afeym0cbKabg kGiQ== X-Gm-Message-State: AOJu0YwRrDHJOjaazmPHEQEHwhHBhEl8v4oz92UMtVxRXWxPX5RXFRQE h922JDWUQwHIiXhIqxPNY16YSc8xPzDzshz+c7u9lBPTDQ/gs9xgsQOMpfSC8RKmzR1PaOsSwTf 1Yw4= X-Gm-Gg: ASbGncvKxOJR3x06cxo5mQ/QzWqO599MmiXyKuzSl9cQ84XpI1PFWuUCgCqmicXDwtQ 3tv8uZh08fXjYFTMxygVz1ycBf/xCx7rgXATZjGvztgzOnO24kkIarKIFb/a72LH11KLf0bDYHE Vq+lQ6IswyTPoLcml1svSgSzn9+TG3XhUFOzvgoJXluEqk1yZkQmY4K8ir9sQUjbYlnE0JuOkN3 qWfKwVutUMSrnpLOY8UylfTNLS5VRZW9NhG8bqDnZ3wtQRTmTtkOZgUlfwojtvKugqRPaPCGitu bWVCjwgVugcJscJbK0nhlL1wLnup0Qc8ELBDr5mz+sN589EX93Yb X-Google-Smtp-Source: AGHT+IFAm6wc6Ok640VjWh9e/Khm0SK0EGarD8LHsxyBUpzkGExDLWaXDWfMpuvnVFY5eb4UN1QdmQ== X-Received: by 2002:a17:907:da5:b0:ac2:6bb5:413c with SMTP id a640c23a62f3a-ac330317c9cmr1001150766b.31.1742111741835; Sun, 16 Mar 2025 00:55:41 -0700 (PDT) Received: from localhost ([2a02:2454:a0a5:2400:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac32c6de6ecsm366657566b.173.2025.03.16.00.55.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Mar 2025 00:55:40 -0700 (PDT) From: Sergey Trofimov To: guix-patches@gnu.org Subject: [PATCH] services: wireguard: Add the shepherd-requirement field. Date: Sun, 16 Mar 2025 08:55:37 +0100 Message-ID: <92993d415b51bd7e4b0828b3fd87163f8b7a4219.1742111625.git.sarg@sarg.org.ru> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 X-Debbugs-Cc: Ludovic Courtès , Maxim Cournoyer Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=sarg@sarg.org.ru; helo=mail-ej1-x633.google.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_SBL_A=0.1 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.7 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/services/vpn.scm (): Add shepherd-requirement. (wireguard-shepherd-service): Pass shepherd-requirement. * doc/guix.texi (VPN Services):[wireguard]: Document it. --- doc/ [...] Content analysis details: (1.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.1 URIBL_SBL_A Contains URL's A record listed in the Spamhaus SBL blocklist [URIs: sarg.org.ru] 0.6 URIBL_SBL Contains an URL's NS IP listed in the Spamhaus SBL blocklist [URIs: sarg.org.ru] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2001:470:142:0:0:0:0:17 listed in] [list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) X-Debbugs-Envelope-To: submit Cc: Sergey Trofimov X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.7 (/) * gnu/services/vpn.scm (): Add shepherd-requirement. (wireguard-shepherd-service): Pass shepherd-requirement. * doc/guix.texi (VPN Services):[wireguard]: Document it. --- doc/guix.texi | 4 ++++ gnu/services/vpn.scm | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 883cdc2803..681200e5f9 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -35711,6 +35711,10 @@ VPN Services List of strings or G-expressions. These are script snippets which will be executed after tearing down the interface. +@item @code{shepherd-requirement} (default: @code{'()}) (type: list-of-symbols) +A list of symbols naming Shepherd services that this service +will depend on. + @item @code{table} (default: @code{"auto"}) The routing table to which routes are added, as a string. There are two special values: @code{"off"} that disables the creation of routes diff --git a/gnu/services/vpn.scm b/gnu/services/vpn.scm index 478a0d543e..2b5886c9fa 100644 --- a/gnu/services/vpn.scm +++ b/gnu/services/vpn.scm @@ -88,6 +88,7 @@ (define-module (gnu services vpn) wireguard-configuration-post-up wireguard-configuration-pre-down wireguard-configuration-post-down + wireguard-configuration-shepherd-requirement wireguard-configuration-table wireguard-configuration-auto-start? @@ -765,6 +766,8 @@ (define-record-type* (default '())) (post-down wireguard-configuration-post-down ;list of strings (default '())) + (shepherd-requirement wireguard-configuration-shepherd-requirement ; list of symbols + (default '())) (table wireguard-configuration-table ;string (default "auto")) (auto-start? wireguard-configuration-auto-start? ;boolean @@ -918,12 +921,12 @@ (define (endpoint-host-names peers) (define (wireguard-shepherd-service config) (match-record config - (wireguard interface) + (wireguard interface shepherd-requirement) (let ((wg-quick (file-append wireguard "/bin/wg-quick")) (auto-start? (wireguard-configuration-auto-start? config)) (config (wireguard-configuration-file config))) (list (shepherd-service - (requirement '(networking)) + (requirement `(networking ,@shepherd-requirement)) (provision (list (wireguard-service-name interface))) (start #~(lambda _ (invoke #$wg-quick "up" #$config))) base-commit: b8024fa1ade69a4f97990f0e3379eef01dfd40c2 prerequisite-patch-id: f9cc903b8048c8c6fde576fbf38ab110263020e3 prerequisite-patch-id: 54f1264dad23a74efa9aa3823350b2ee055bda97 prerequisite-patch-id: 220ddf11addf3a6c7ab3b349077bca6849241556 prerequisite-patch-id: 18f3d7d0a9ed1f267adeb3630b3801a0c179d9ea -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 18 06:51:34 2025 Received: (at 77045) by debbugs.gnu.org; 18 Mar 2025 10:51:34 +0000 Received: from localhost ([127.0.0.1]:37351 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tuUXl-00064S-1p for submit@debbugs.gnu.org; Tue, 18 Mar 2025 06:51:33 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:37000) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tuUXh-000631-BU for 77045@debbugs.gnu.org; Tue, 18 Mar 2025 06:51:30 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 275D93CF; Tue, 18 Mar 2025 11:51:23 +0100 (CET) Authentication-Results: hera.aquilenet.fr; none X-Virus-Scanned: Debian amavis at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavis, port 10024) with ESMTP id c0Uddcw6lics; Tue, 18 Mar 2025 11:51:22 +0100 (CET) Received: from ribbon (unknown [193.50.110.142]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 38D2818D; Tue, 18 Mar 2025 11:51:22 +0100 (CET) From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Sergey Trofimov Subject: Re: [bug#77045] [PATCH] services: wireguard: Add the shepherd-requirement field. In-Reply-To: <92993d415b51bd7e4b0828b3fd87163f8b7a4219.1742111625.git.sarg@sarg.org.ru> (Sergey Trofimov's message of "Sun, 16 Mar 2025 08:55:37 +0100") References: <92993d415b51bd7e4b0828b3fd87163f8b7a4219.1742111625.git.sarg@sarg.org.ru> Date: Tue, 18 Mar 2025 11:51:21 +0100 Message-ID: <87tt7qipcm.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 275D93CF X-Spamd-Result: default: False [4.84 / 15.00]; SPAM_FLAG(5.00)[]; BAYES_HAM(-3.00)[99.99%]; NEURAL_SPAM(2.94)[0.981]; MIME_GOOD(-0.10)[text/plain]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; TAGGED_RCPT(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; RCPT_COUNT_THREE(0.00)[3]; FREEMAIL_CC(0.00)[debbugs.gnu.org,gmail.com] X-Spam-Level: **** X-Rspamd-Action: no action X-Spamd-Bar: ++++ X-Rspamd-Server: hera X-Spam-Score: 1.7 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Sergey Trofimov skribis: > * gnu/services/vpn.scm > (): Add shepherd-requirement. > (wireguard-shepherd-service): Pass shepherd-requirement. > * doc/guix.texi (VPN Services):[wireguard]: Document it. Content analysis details: (1.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [185.233.100.1 listed in bl.score.senderscore.com] 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [185.233.100.1 listed in sa-trusted.bondedsender.org] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 URIBL_SBL_A Contains URL's A record listed in the Spamhaus SBL blocklist [URIs: sarg.org.ru] 0.6 URIBL_SBL Contains an URL's NS IP listed in the Spamhaus SBL blocklist [URIs: sarg.org.ru] X-Debbugs-Envelope-To: 77045 Cc: 77045@debbugs.gnu.org, Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.7 (/) Sergey Trofimov skribis: > * gnu/services/vpn.scm > (): Add shepherd-requirement. > (wireguard-shepherd-service): Pass shepherd-requirement. > * doc/guix.texi (VPN Services):[wireguard]: Document it. [...] > @@ -765,6 +766,8 @@ (define-record-type* > (default '())) > (post-down wireguard-configuration-post-down ;list of str= ings > (default '())) > + (shepherd-requirement wireguard-configuration-shepherd-requirement ;= list of symbols > + (default '())) It should default to '(user-processes). This is a bug that was already present; see for background. Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 18 17:00:46 2025 Received: (at 77045) by debbugs.gnu.org; 18 Mar 2025 21:00:47 +0000 Received: from localhost ([127.0.0.1]:43540 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tue3G-0003tv-14 for submit@debbugs.gnu.org; Tue, 18 Mar 2025 17:00:46 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]:51543) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tue3D-0003t4-Em for 77045@debbugs.gnu.org; Tue, 18 Mar 2025 17:00:40 -0400 Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-abbd96bef64so1070396466b.3 for <77045@debbugs.gnu.org>; Tue, 18 Mar 2025 14:00:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1742331632; x=1742936432; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=n+KdtPkWs5QGUUpSjKwPw1F+QOu94O/64Vne4HuyHCg=; b=Y22i5Uw039b/vAgxNljYMCgRPd7ESFj+wfovyzG3dGJRd+ky5++TRnpsnGJip4niv5 ZJKRHnlktkXoQq8fPoP+kPEjFH3eIQXNDc3iAhIFVx4bN7v9ksSAlUW4RFTN1fAopNRP b09JvpABuXBfy7Ot1sNn+dBene0ZXNVc2ZGjW7q4K2hu2jBhKbZxjADLcwZz6AhV+MpG TjX95W231ZxHvQL4eTOrOaEv7NVgxoPngRoXOCTCtnDudeld3qf7HIK6O0Iey5K5UOqG 28GTcEb0dNzWXr4Zfifh955/Jut9UJPQUyEONBbW2Nr2cmBbZl9bcSpdEq1O1fhJGOwZ P7xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742331632; x=1742936432; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=n+KdtPkWs5QGUUpSjKwPw1F+QOu94O/64Vne4HuyHCg=; b=NX1TklOaKpOqrDrvXRfU71ed4XEUx96s5oHRpF6vVGewa4BLEHzsct7pF98y+d0TPs j0xCHtcB0m4OQ0i8lVQgJ09/ahLZOUNj3Lm/RZQDU97DFOkpKAGALnIfbAxOtThdcidL ASeqzXAly8Gvl0XB7D+Ek9gz2sLhVU5Vlp3YifwOHGQ8NlWWvTBB5JSIb4q6dZQGy1wz +zEUq+7FN4QR5Omel00caKRq9Pn4d2i8/dCmwgyuL2CkpIr4PlG3DW26YVa3+FTQlx50 RbI+t+rSyKXDK9hTYC4VAQqOydL+VJchkzmBedWshxIBJh1XFR+qfz14I0VA3YSX2xZ6 SEDw== X-Gm-Message-State: AOJu0Ywk6ZLleCSqhNmlDVVhHbZRJlGTU0psEsrh9fr1hUrJr6DK8GVz By4ha01SMA6f0DFjYgciUjDfnMKCCXEjJiHzQ3+eT2s2hckHLJkJE4eq4yLdhTUowG6453ecys4 s+xM= X-Gm-Gg: ASbGncuz5y7N5Y77Rot1f4Pqwx3AxAdYko5aCjU0LDDtUPOFpfBM/N9qc9XvsXIpmB2 wcY5P30GqzQSCDARDkoS1owg8JtRTI1vBmv1keLS1smNf1iyh9gvCNzvrRVKzYCxS+2+CURBzJO GAE/v1FCVzNvH9hIHzI83vyPitlP5AcTM6U1Gjd4JMAFSN8MInOYj/BTntW1ej+yphZooH+O09X OMgHKYACrn8M8GkJV+/U7dKXZCEdW95Sw2yMlD7PldBun4feJnfB+0UUkzEv2J2zXsEYgmsQuzC DErsZ0vGkd0TyYvf2BwGb7TCWymMofDo6P7vJ1Cz/Sg= X-Google-Smtp-Source: AGHT+IHZKRw3vJ+kMN9xnc+hoxgmEKbdmyUnfa8e+yYuCmckmSRYKlrS4FtDWnEzo7GMpfc+sO5fgA== X-Received: by 2002:a17:906:6a0a:b0:ac2:a4ec:46c2 with SMTP id a640c23a62f3a-ac3b7fb201fmr8497066b.49.1742331632293; Tue, 18 Mar 2025 14:00:32 -0700 (PDT) Received: from localhost ([2a02:2454:a0a5:2400:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac3149cec1esm899614766b.114.2025.03.18.14.00.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Mar 2025 14:00:31 -0700 (PDT) From: Sergey Trofimov To: 77045@debbugs.gnu.org Subject: [PATCH v1] services: wireguard: Add the shepherd-requirement field. Date: Tue, 18 Mar 2025 22:00:14 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 X-Debbugs-Cc: Sergey Trofimov , Ludovic Courtès , Maxim Cournoyer Content-Transfer-Encoding: 8bit X-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: 77045 Cc: Sergey Trofimov X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) * gnu/services/vpn.scm (): Add shepherd-requirement. (wireguard-shepherd-service): Pass shepherd-requirement. Add user-processes to requirements. * doc/guix.texi (VPN Services):[wireguard]: Document it. Change-Id: Ia85add5067f6f9e023b8d65d6ce067b98eeb111e --- doc/guix.texi | 4 ++++ gnu/services/vpn.scm | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 794afcd8c4..9352c56563 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -35739,6 +35739,10 @@ VPN Services List of strings or G-expressions. These are script snippets which will be executed after tearing down the interface. +@item @code{shepherd-requirement} (default: @code{'()}) (type: list-of-symbols) +A list of symbols naming Shepherd services that this service +will depend on. + @item @code{table} (default: @code{"auto"}) The routing table to which routes are added, as a string. There are two special values: @code{"off"} that disables the creation of routes diff --git a/gnu/services/vpn.scm b/gnu/services/vpn.scm index 478a0d543e..3f1f8661d8 100644 --- a/gnu/services/vpn.scm +++ b/gnu/services/vpn.scm @@ -88,6 +88,7 @@ (define-module (gnu services vpn) wireguard-configuration-post-up wireguard-configuration-pre-down wireguard-configuration-post-down + wireguard-configuration-shepherd-requirement wireguard-configuration-table wireguard-configuration-auto-start? @@ -765,6 +766,8 @@ (define-record-type* (default '())) (post-down wireguard-configuration-post-down ;list of strings (default '())) + (shepherd-requirement wireguard-configuration-shepherd-requirement ; list of symbols + (default '())) (table wireguard-configuration-table ;string (default "auto")) (auto-start? wireguard-configuration-auto-start? ;boolean @@ -918,12 +921,12 @@ (define (endpoint-host-names peers) (define (wireguard-shepherd-service config) (match-record config - (wireguard interface) + (wireguard interface shepherd-requirement) (let ((wg-quick (file-append wireguard "/bin/wg-quick")) (auto-start? (wireguard-configuration-auto-start? config)) (config (wireguard-configuration-file config))) (list (shepherd-service - (requirement '(networking)) + (requirement `(networking user-processes ,@shepherd-requirement)) (provision (list (wireguard-service-name interface))) (start #~(lambda _ (invoke #$wg-quick "up" #$config))) base-commit: df799a61ef73451e587cb81942c7bfcbbade9e7e prerequisite-patch-id: f9cc903b8048c8c6fde576fbf38ab110263020e3 prerequisite-patch-id: 220ddf11addf3a6c7ab3b349077bca6849241556 prerequisite-patch-id: fc7d254c8dc198bc2f083e1c8aea18960c73b165 -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 19 06:26:29 2025 Received: (at 77045-done) by debbugs.gnu.org; 19 Mar 2025 10:26:29 +0000 Received: from localhost ([127.0.0.1]:48553 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tuqd3-0001Jo-1s for submit@debbugs.gnu.org; Wed, 19 Mar 2025 06:26:29 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:59572) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tuqcx-0001JT-Cy for 77045-done@debbugs.gnu.org; Wed, 19 Mar 2025 06:26:25 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 64A9250E; Wed, 19 Mar 2025 11:26:17 +0100 (CET) Authentication-Results: hera.aquilenet.fr; none X-Virus-Scanned: Debian amavis at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavis, port 10024) with ESMTP id Dk4QrbblpPxN; Wed, 19 Mar 2025 11:26:16 +0100 (CET) Received: from ribbon (91-160-117-201.subs.proxad.net [91.160.117.201]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 2348542C; Wed, 19 Mar 2025 11:26:16 +0100 (CET) From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Sergey Trofimov Subject: Re: bug#77045: [PATCH] services: wireguard: Add the shepherd-requirement field. In-Reply-To: (Sergey Trofimov's message of "Tue, 18 Mar 2025 22:00:14 +0100") References: <92993d415b51bd7e4b0828b3fd87163f8b7a4219.1742111625.git.sarg@sarg.org.ru> Date: Wed, 19 Mar 2025 11:26:15 +0100 Message-ID: <87zfhhfha0.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Rspamd-Queue-Id: 64A9250E X-Spamd-Result: default: False [-5.99 / 15.00]; NEURAL_HAM(-2.98)[-0.993]; BAYES_HAM(-2.91)[99.63%]; MIME_GOOD(-0.10)[text/plain]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; URIBL_BLOCKED(0.00)[localhost:rdns,localhost:helo,sarg.org.ru:email]; RCVD_VIA_SMTP_AUTH(0.00)[]; TAGGED_RCPT(0.00)[]; FROM_HAS_DN(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; RCPT_COUNT_THREE(0.00)[3]; FREEMAIL_CC(0.00)[debbugs.gnu.org,gmail.com] X-Rspamd-Action: no action X-Spamd-Bar: ----- X-Rspamd-Server: hera X-Spam-Score: 1.7 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Sergey Trofimov skribis: > * gnu/services/vpn.scm (): Add > shepherd-requirement. > (wireguard-shepherd-service): Pass shepherd-requirement. Add > user-processes to requirements. > * doc/guix.texi (VP [...] Content analysis details: (1.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [185.233.100.1 listed in bl.score.senderscore.com] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [185.233.100.1 listed in sa-accredit.habeas.com] 0.1 URIBL_SBL_A Contains URL's A record listed in the Spamhaus SBL blocklist [URIs: sarg.org.ru] 0.6 URIBL_SBL Contains an URL's NS IP listed in the Spamhaus SBL blocklist [URIs: sarg.org.ru] X-Debbugs-Envelope-To: 77045-done Cc: 77045-done@debbugs.gnu.org, Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.7 (/) Sergey Trofimov skribis: > * gnu/services/vpn.scm (): Add > shepherd-requirement. > (wireguard-shepherd-service): Pass shepherd-requirement. Add > user-processes to requirements. > * doc/guix.texi (VPN Services):[wireguard]: Document it. > > Change-Id: Ia85add5067f6f9e023b8d65d6ce067b98eeb111e Applied, thanks! From unknown Tue Jun 17 20:32:22 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 16 Apr 2025 11:24:19 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator