diff options
author | Neil Johnson <neil@fragile.org.uk> | 2019-03-12 17:15:21 +0000 |
---|---|---|
committer | Neil Johnson <neil@fragile.org.uk> | 2019-03-12 17:15:21 +0000 |
commit | 332b60ec68f3f5ddc5d25326b5fbe3a69f27f23b (patch) | |
tree | b8a691915768113d341b6c53665e49f23c1800a0 /INSTALL.md | |
parent | Transfer local user's push rules on room upgrade (#4838) (diff) | |
parent | fix orphaned sentence (diff) | |
download | synapse-332b60ec68f3f5ddc5d25326b5fbe3a69f27f23b.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'INSTALL.md')
-rw-r--r-- | INSTALL.md | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/INSTALL.md b/INSTALL.md index 5c67f14ed6..76833e0f8c 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -71,7 +71,8 @@ set this to the hostname of your server. For a more production-ready setup, you will probably want to specify your domain (`example.com`) rather than a matrix-specific hostname here (in the same way that your email address is probably `user@example.com` rather than `user@email.example.com`) - but -doing so may require more advanced setup. - see [Setting up Federation](README.rst#setting-up-federation). Beware that the server name cannot be changed later. +doing so may require more advanced setup: see [Setting up Federation](docs/federate.md). +Beware that the server name cannot be changed later. This command will generate you a config file that you can then customise, but it will also generate a set of keys for you. These keys will allow your Home Server to @@ -375,9 +376,12 @@ To configure Synapse to expose an HTTPS port, you will need to edit `tls_private_key_path` lines under the `TLS` section. You can either point these settings at an existing certificate and key, or you can enable Synapse's built-in ACME (Let's Encrypt) support. Instructions - for having Synapse automatically provision and renew federation + for having Synapse automatically provision and renew federation certificates through ACME can be found at [ACME.md](docs/ACME.md). +For those of you upgrading your TLS certificate in readiness for Synapse 1.0, +please take a look at `our guide <docs/MSC1711_certificates_FAQ.md#configuring-certificates-for-compatibility-with-synapse-100>`_. + ## Registering a user You will need at least one user on your server in order to use a Matrix |