From 411827a5c3c2ad499ac294e93c5f2b62a247ce28 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Wed, 26 Jul 2023 13:44:21 -0400 Subject: [PATCH] Update docs. --- docs/architecture.rst | 14 ++++++-------- docs/configuration.rst | 6 ++---- newsfragments/4041.feature | 1 + 3 files changed, 9 insertions(+), 12 deletions(-) create mode 100644 newsfragments/4041.feature diff --git a/docs/architecture.rst b/docs/architecture.rst index 64e81ea99..0e22741f1 100644 --- a/docs/architecture.rst +++ b/docs/architecture.rst @@ -62,14 +62,12 @@ There are two supported protocols: * Foolscap, the only supported protocol in release before v1.19. * HTTPS, new in v1.19. -By default HTTPS is disabled (this will change in -https://tahoe-lafs.org/trac/tahoe-lafs/ticket/4041). When HTTPS is enabled on -the server, the server transparently listens for both Foolscap and HTTP on the -same port. Clients can use either; by default they will only use Foolscap, but -when configured appropriately they will use HTTPS when possible (this will -change in https://tahoe-lafs.org/trac/tahoe-lafs/ticket/4041). At this time the -only limitations of HTTPS is that I2P is not supported, so any usage of I2P only -uses Foolscap. +By default HTTPS is enabled. When HTTPS is enabled on the server, the server +transparently listens for both Foolscap and HTTP on the same port. When it is +disabled, the server only supports Foolscap. Clients can use either; by default +they will use HTTPS when possible, falling back to I2p, but when configured +appropriately they will only use Foolscap. At this time the only limitations of +HTTPS is that I2P is not supported, so any usage of I2P only uses Foolscap. Storage servers hold data in the form of "shares". Shares are encoded pieces of files. There are a configurable number of shares for each file, 10 by diff --git a/docs/configuration.rst b/docs/configuration.rst index feb29c0ca..7f038192e 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -684,8 +684,7 @@ Client Configuration If this is ``True``, the client will only connect to storage servers via Foolscap, regardless of whether they support HTTPS. If this is ``False``, the client will prefer HTTPS when it is available on the server. The default - value is ``True`` (this will change in - https://tahoe-lafs.org/trac/tahoe-lafs/ticket/4041). + value is ``False``. In addition, see :doc:`accepting-donations` for a convention for donating to storage server operators. @@ -809,8 +808,7 @@ Storage Server Configuration If this is ``True``, the node will expose the storage server via Foolscap only, with no support for HTTPS. If this is ``False``, the server will support both Foolscap and HTTPS on the same port. The default value is - ``True`` (this will change in - https://tahoe-lafs.org/trac/tahoe-lafs/ticket/4041). + ``False``. In addition, see :doc:`accepting-donations` for a convention encouraging donations to storage server operators. diff --git a/newsfragments/4041.feature b/newsfragments/4041.feature new file mode 100644 index 000000000..ea4c65171 --- /dev/null +++ b/newsfragments/4041.feature @@ -0,0 +1 @@ +The storage server now supports a new, HTTPS-based protocol. \ No newline at end of file