summary refs log tree commit diff
path: root/docker
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-04-04 15:28:08 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2019-04-04 15:28:08 +0100
commitacc4003baa11e51a249c340d776ac3180688aef6 (patch)
treefd1104a8470157df1d4ec6b3331f300539fac2b7 /docker
parentMake it actually work (diff)
parentClean up the database pagination code (#5007) (diff)
downloadsynapse-github/anoa/widgets_room_upgrade.tar.xz
Merge branch 'develop' into anoa/widgets_room_upgrade github/anoa/widgets_room_upgrade anoa/widgets_room_upgrade
Diffstat (limited to 'docker')
-rw-r--r--docker/README.md5
1 files changed, 3 insertions, 2 deletions
diff --git a/docker/README.md b/docker/README.md

index 44ade63f27..b48d74e09c 100644 --- a/docker/README.md +++ b/docker/README.md
@@ -60,7 +60,8 @@ Synapse requires a valid TLS certificate. You can do one of the following: * Provide your own certificate and key (as `${DATA_PATH}/${SYNAPSE_SERVER_NAME}.tls.crt` and `${DATA_PATH}/${SYNAPSE_SERVER_NAME}.tls.key`, or elsewhere by providing an - entire config as `${SYNAPSE_CONFIG_PATH}`). + entire config as `${SYNAPSE_CONFIG_PATH}`). In this case, you should forward + traffic to port 8448 in the container, for example with `-p 443:8448`. * Use a reverse proxy to terminate incoming TLS, and forward the plain http traffic to port 8008 in the container. In this case you should set `-e @@ -138,7 +139,7 @@ Database specific values (will use SQLite if not set): **NOTE**: You are highly encouraged to use postgresql! Please use the compose file to make it easier to deploy. * `POSTGRES_USER` - The user for the synapse postgres database. [default: - `matrix`] + `synapse`] Mail server specific values (will not send emails if not set):