summary refs log tree commit diff
diff options
context:
space:
mode:
author*=0=1=4=* <21157384+f35f0ef9d0e827dae86552d3899f78fc@users.noreply.github.com>2019-04-04 04:38:16 -0500
committerErik Johnston <erikj@jki.re>2019-04-04 10:38:16 +0100
commit40810b81d273b3f51b745a996e4b982aeb81fb29 (patch)
tree513ec6909c58d3d9c81b2a4e8baceb5edd3eddee
parentFix grammar and document get_current_users_in_room (#4998) (diff)
downloadsynapse-40810b81d273b3f51b745a996e4b982aeb81fb29.tar.xz
Correct default POSTGRES_USER in Docker README (#4987)
Correct default POSTGRES_USER in Docker README
-rw-r--r--changelog.d/4987.misc1
-rw-r--r--docker/README.md5
2 files changed, 4 insertions, 2 deletions
diff --git a/changelog.d/4987.misc b/changelog.d/4987.misc
new file mode 100644

index 0000000000..33490e146f --- /dev/null +++ b/changelog.d/4987.misc
@@ -0,0 +1 @@ +README updates: Corrected the default POSTGRES_USER. Added port forwarding hint in TLS section. 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):