mirror of
https://github.com/element-hq/synapse
synced 2024-08-20 05:00:20 +00:00
Merge branch 'master' into develop
This commit is contained in:
commit
4f7e4fc2fb
5 changed files with 25 additions and 11 deletions
|
@ -1,3 +1,12 @@
|
||||||
|
Synapse 1.11.0 (2020-02-21)
|
||||||
|
===========================
|
||||||
|
|
||||||
|
Improved Documentation
|
||||||
|
----------------------
|
||||||
|
|
||||||
|
- Small grammatical fixes to the ACME v1 deprecation notice. ([\#6944](https://github.com/matrix-org/synapse/issues/6944))
|
||||||
|
|
||||||
|
|
||||||
Synapse 1.11.0rc1 (2020-02-19)
|
Synapse 1.11.0rc1 (2020-02-19)
|
||||||
==============================
|
==============================
|
||||||
|
|
||||||
|
|
|
@ -420,11 +420,10 @@ so, you will need to edit `homeserver.yaml`, as follows:
|
||||||
Note that, as pointed out in that document, this feature will not
|
Note that, as pointed out in that document, this feature will not
|
||||||
work with installs set up after November 2020.
|
work with installs set up after November 2020.
|
||||||
|
|
||||||
If you are using your
|
If you are using your own certificate, be sure to use a `.pem` file that
|
||||||
own certificate, be sure to use a `.pem` file that includes the full
|
includes the full certificate chain including any intermediate certificates
|
||||||
certificate chain including any intermediate certificates (for
|
(for instance, if using certbot, use `fullchain.pem` as your certificate, not
|
||||||
instance, if using certbot, use `fullchain.pem` as your certificate,
|
`cert.pem`).
|
||||||
not `cert.pem`).
|
|
||||||
|
|
||||||
For a more detailed guide to configuring your server for federation, see
|
For a more detailed guide to configuring your server for federation, see
|
||||||
[federate.md](docs/federate.md)
|
[federate.md](docs/federate.md)
|
||||||
|
|
6
debian/changelog
vendored
6
debian/changelog
vendored
|
@ -1,3 +1,9 @@
|
||||||
|
matrix-synapse-py3 (1.11.0) stable; urgency=medium
|
||||||
|
|
||||||
|
* New synapse release 1.11.0.
|
||||||
|
|
||||||
|
-- Synapse Packaging team <packages@matrix.org> Fri, 21 Feb 2020 08:54:34 +0000
|
||||||
|
|
||||||
matrix-synapse-py3 (1.10.1) stable; urgency=medium
|
matrix-synapse-py3 (1.10.1) stable; urgency=medium
|
||||||
|
|
||||||
* New synapse release 1.10.1.
|
* New synapse release 1.10.1.
|
||||||
|
|
|
@ -36,7 +36,7 @@ try:
|
||||||
except ImportError:
|
except ImportError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
__version__ = "1.11.0rc1"
|
__version__ = "1.11.0"
|
||||||
|
|
||||||
if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
|
if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
|
||||||
# We import here so that we don't have to install a bunch of deps when
|
# We import here so that we don't have to install a bunch of deps when
|
||||||
|
|
|
@ -27,11 +27,11 @@ logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
ACME_REGISTER_FAIL_ERROR = """
|
ACME_REGISTER_FAIL_ERROR = """
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
Failed to register with the ACME provider. This is likely happening because the install
|
Failed to register with the ACME provider. This is likely happening because the installation
|
||||||
is new, and ACME v1 has been deprecated by Let's Encrypt and is disabled for installs set
|
is new, and ACME v1 has been deprecated by Let's Encrypt and disabled for
|
||||||
up after November 2019.
|
new installations since November 2019.
|
||||||
At the moment, Synapse doesn't support ACME v2. For more info and alternative solution,
|
At the moment, Synapse doesn't support ACME v2. For more information and alternative
|
||||||
check out https://github.com/matrix-org/synapse/blob/master/docs/ACME.md#deprecation-of-acme-v1
|
solutions, please read https://github.com/matrix-org/synapse/blob/master/docs/ACME.md#deprecation-of-acme-v1
|
||||||
--------------------------------------------------------------------------------"""
|
--------------------------------------------------------------------------------"""
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue