diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-08 13:45:21 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-08-08 13:45:21 +0100 |
| commit | be59910b93252e83af348bcfd8781eed75fcb674 (patch) | |
| tree | 3b9145795bff0076067070d7f1d4351cd7a622c3 /README.rst | |
| parent | Ability to whitelist specific threepids against monthly active user limiting (diff) | |
| parent | Merge pull request #3633 from matrix-org/neilj/mau_tracker (diff) | |
| download | synapse-be59910b93252e83af348bcfd8781eed75fcb674.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/reserved_users
Diffstat (limited to 'README.rst')
| -rw-r--r-- | README.rst | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/README.rst b/README.rst index 5fdfad345f..4c5971d043 100644 --- a/README.rst +++ b/README.rst @@ -157,12 +157,19 @@ if you prefer. In case of problems, please see the _`Troubleshooting` section below. -There is an offical synapse image available at https://hub.docker.com/r/matrixdotorg/synapse/tags/ which can be used with the docker-compose file available at `contrib/docker`. Further information on this including configuration options is available in `contrib/docker/README.md`. +There is an offical synapse image available at +https://hub.docker.com/r/matrixdotorg/synapse/tags/ which can be used with +the docker-compose file available at `contrib/docker <contrib/docker>`_. Further information on +this including configuration options is available in the README on +hub.docker.com. -Alternatively, Andreas Peters (previously Silvio Fricke) has contributed a Dockerfile to automate a synapse server in a single Docker image, at https://hub.docker.com/r/avhost/docker-matrix/tags/ +Alternatively, Andreas Peters (previously Silvio Fricke) has contributed a +Dockerfile to automate a synapse server in a single Docker image, at +https://hub.docker.com/r/avhost/docker-matrix/tags/ Also, Martin Giess has created an auto-deployment process with vagrant/ansible, -tested with VirtualBox/AWS/DigitalOcean - see https://github.com/EMnify/matrix-synapse-auto-deploy +tested with VirtualBox/AWS/DigitalOcean - see +https://github.com/EMnify/matrix-synapse-auto-deploy for details. Configuring synapse |