From patchwork Mon Apr 24 20:11:09 2023 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: 49474 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 6218B27BBE9; Mon, 24 Apr 2023 21:12:19 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 4BF4827BBE2 for ; Mon, 24 Apr 2023 21:12:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pr2Xm-0006YE-Io; Mon, 24 Apr 2023 16:12:14 -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 1pr2Xf-0006VK-0R for guix-patches@gnu.org; Mon, 24 Apr 2023 16:12:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pr2Xa-0002VF-SU for guix-patches@gnu.org; Mon, 24 Apr 2023 16:12:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pr2Xa-0008DE-FN for guix-patches@gnu.org; Mon, 24 Apr 2023 16:12:02 -0400 Subject: bug#62005: [PATCH v2] services: tor: Deprecate 'tor-hidden-service' procedure. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Mon, 24 Apr 2023 20:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 62005 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Bruno Victal Cc: 62005-done@debbugs.gnu.org Mail-Followup-To: 62005@debbugs.gnu.org, ludo@gnu.org, mirai@makinata.eu Received: via spool by 62005-done@debbugs.gnu.org id=D62005.168236708131512 (code D ref 62005); Mon, 24 Apr 2023 20:12:02 +0000 Received: (at 62005-done) by debbugs.gnu.org; 24 Apr 2023 20:11:21 +0000 Received: from localhost ([127.0.0.1]:50409 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pr2Wu-0008CC-PP for submit@debbugs.gnu.org; Mon, 24 Apr 2023 16:11:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56824) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pr2Wt-0008Bz-2l for 62005-done@debbugs.gnu.org; Mon, 24 Apr 2023 16:11:19 -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 1pr2Wn-0002N0-0R; Mon, 24 Apr 2023 16:11:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=K5NcgAV++gKDxRh1cgeJ90TaW9Kub/iP/AZifoDFmGc=; b=nh7njnsL0bjnujsYl11T 03UdtQCwNZspMtgEhWwPJDbg6KcVVm2RTS8o1y2Rpbl+aIzWsjXVRHb+1aO8RhC+sOn2VTGKsiWO5 nVua6TTpHVPzKo1VDEJAckB0tKs+AjLrl1O8US07sfBkFCBMon0P0206lohWzS713czEnZC2UtSkL QlQivLAEZxgpOOZQrwU8C5MDUr4iVEoXzOGPo3FAIiJ/duXfbo5kHimXywP//RCY5rd0Eiw03NUyN t0LMCYcOyCjkU+seCWit0ohNaomXkDEYje/1U46meuqYN+8SrnlcUlsJM/jIJpiLUDmtebkmIEcMj v0ldoVMxscZ7nA==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pr2Wm-0002xH-A7; Mon, 24 Apr 2023 16:11:12 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= References: <2f32f2b2bb371a2356cc385ccafdf86e7135d4cd.1681051448.git.mirai@makinata.eu> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Quintidi 5 =?utf-8?q?Flor=C3=A9al?= an 231 de la =?utf-8?b?UsOpdm9sdXRpb24s?= jour du Rossignol X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 24 Apr 2023 22:11:09 +0200 In-Reply-To: <2f32f2b2bb371a2356cc385ccafdf86e7135d4cd.1681051448.git.mirai@makinata.eu> (Bruno Victal's message of "Sun, 9 Apr 2023 15:47:19 +0100") Message-ID: <87mt2x2g82.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) 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 Hi Bruno, Bruno Victal skribis: > Due to (now renamed) 'hidden-service' record type not being exported, the only > way Onion services (formely hidden services) could have worked is through the > now deprecated 'tor-hidden-service' procedure. > > This commit updates the Tor service documentation, corrects some inconsistently > named accessors in record-type, renames and refactors > tor-hidden-service-configuration to tor-onion-service-configuration using > define-configuration and also exports it, allowing Onion services to be > configured directly within a record. > Lastly, it also deprecates the 'tor-hidden-service' procedure. > > * doc/guix.texi (Networking Services): Substitute mentions of “Hidden services” > with “Onion Services”. Add a Tor Onion service configuration example. > Document . Remove mention of > 'tor-hidden-service' procedure. > * gnu/services/networking.scm: Export tor-configuration-tor, > tor-configuration-config-file, tor-configuration-hidden-services, > tor-configuration-socks-socket-type, tor-configuration-control-socket-path, > tor-onion-service-configuration, tor-onion-service-configuration?, > tor-onion-service-configuration-name, tor-onion-service-configuration-mapping. > ()[control-socket?]: Rename accessor. > (): Replace with … > (): … this. > (tor-configuration->torrc): Update record-type name. > (tor-activation): Ditto. > (tor-hidden-service-type): Remove variable. > (tor-hidden-service): Deprecate procedure. Finally applied; I tweaked wording in the manual as shown below. Thank you! Ludo’. diff --git a/doc/guix.texi b/doc/guix.texi index 6ebb245dd7..8afacfb54c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -20600,9 +20600,10 @@ anonymous networking daemon. The service is configured using a @code{} record. By default, the Tor daemon runs as the @code{tor} unprivileged user, which is a member of the @code{tor} group. -In addition to adding Tor @dfn{Onion Service}s records to the service -configuration directly, this service can be extended by other services to add -Onion Services, as in this example: +@cindex onion services, for Tor +Services of this type can be extended by other services to specify +@dfn{onion services} (in addition to those already specified in +@code{tor-configuration}) as in this example: @lisp (simple-service 'my-extra-onion-service tor-service-type @@ -20629,8 +20630,8 @@ syntax. @item @code{hidden-services} (default: @code{'()}) The list of @code{} records to use. -For any Onion Service you include in this list, appropriate -configuration to enable the Onion Service will be automatically added to +For any onion service you include in this list, appropriate +configuration to enable the onion service will be automatically added to the default configuration file. @item @code{socks-socket-type} (default: @code{'tcp})