From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id SJ9JOETjRmT39AAASxT56A (envelope-from ) for ; Mon, 24 Apr 2023 22:15:00 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id oJ4kOETjRmQblQAAauVa8A (envelope-from ) for ; Mon, 24 Apr 2023 22:15:00 +0200 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 1794171CF for ; Mon, 24 Apr 2023 22:15:00 +0200 (CEST) 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?Q?R=C3=A9volution,?= 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 Content-Type: multipart/mixed; boundary="=-=-=" 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 ARC-Seal: i=1; s=key1; d=yhetil.org; t=1682367300; a=rsa-sha256; cv=none; b=JDtiBnmWvPyOu9RKBQ4HupONuzIXZKsqSuMuSbZFPW/qP7jCdzBxPfb0zsjJjJX3J65S7C D5dlBldabHr2aiitsyuuO6AHfW3STUmUchFOjPrt94x7tuAdyu8YUFa5oE/5tWD8eLqQqC bbhcsAyL6QLBehC517YqMdNiMa2Xi55ZC+bd+s6h+YDSl9Xf3+6U+wCuzSw0KrPkKUyEXt 48dI8+wZ/vkMS+rGoHGw+UIpDFrjY/ZhJcIQ9S2gh0ohBE54saDvtR+Dbu+my3pU9HDphr BZyIsibyD37duw6cDK49fDHRSc29/4hQ08s/eoR1KCJ0ZIPdJTMP7h95yRuOYw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=nh7njnsL; dmarc=pass (policy=none) header.from=gnu.org; 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=1682367300; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-to: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=K5NcgAV++gKDxRh1cgeJ90TaW9Kub/iP/AZifoDFmGc=; b=grK1Ke9fn4WKq3tLDiLls3nrgtgL/lPbaUp5VATkZTIBiJtJYhQUFD+r+ZTkv0akJDd3gl Z7xtoCWXEE7Rv2lx8b+eyBXH+uFM7QI9p6WIr6Mz98fIcBLY1ssS7nFhT9vObXazy9JWQc ijReV+VwMF2by0bL/wV26jpFiazlI9LIj6i7u2icDB7CevOF1syKzjGXO54o4mvMA3eseP PqcMRchEJma4Z+rxQY67y/Vif7+dFj8wPUFSFv+odgx4DLWpJJsi9ZuOlPviLNduKgF1Sq GMIzUnUVfdrlA0RxkxH08NcH45/Ivz2HTLOpxYzw3Iq5zCr8gR5BuIGeVK0njw== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=nh7njnsL; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Spam-Score: -1.61 X-Spam-Score: -1.61 X-Migadu-Queue-Id: 1794171CF X-TUID: 5NZgMxZDtky8 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 inconsis= tently > 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 =E2=80=9CHi= dden services=E2=80=9D > with =E2=80=9COnion Services=E2=80=9D. Add a Tor Onion service configurat= ion 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-pat= h, > tor-onion-service-configuration, tor-onion-service-configuration?, > tor-onion-service-configuration-name, tor-onion-service-configuration-map= ping. > ()[control-socket?]: Rename accessor. > (): Replace with =E2=80=A6 > (): =E2=80=A6 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=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: inline 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}) --=-=-=--