bug#62005: [PATCH v2] services: tor: Deprecate 'tor-hidden-service' procedure.

["Ludovic Courtès" <ludo@gnu.org>]

[-- Attachment #1: Type: text/plain, Size: 1766 bytes --]

Hi Bruno,

Bruno Victal <mirai@makinata.eu> 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 <tor-configuration> 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 <tor-configuration> 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 <tor-onion-service-configuration>. 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.
> (<tor-configuration>)[control-socket?]: Rename accessor.
> (<hidden-service>): Replace with …
> (<tor-onion-service-configuration>): … 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’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1343 bytes --]

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{<tor-configuration>} 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{<tor-onion-service-configuration>} 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})