Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Correct default POSTGRES_USER in Docker README #4987

Merged
merged 10 commits into from
Apr 4, 2019
2 changes: 2 additions & 0 deletions changelog.d/4987.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
README updates: Corrected the default POSTGRES_USER. Added port forwarding hint in TLS section.
Adjusted Docker conf for issue #4663.
5 changes: 3 additions & 2 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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):

Expand Down
4 changes: 2 additions & 2 deletions docker/conf/homeserver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## TLS ##

{% if not SYNAPSE_NO_TLS %}
{% if not SYNAPSE_NO_TLS == '1' %}
f35f0ef9d0e827dae86552d3899f78fc marked this conversation as resolved.
Show resolved Hide resolved

tls_certificate_path: "/data/{{ SYNAPSE_SERVER_NAME }}.tls.crt"
tls_private_key_path: "/data/{{ SYNAPSE_SERVER_NAME }}.tls.key"
Expand All @@ -26,7 +26,7 @@ log_config: "/compiled/log.config"
## Ports ##

listeners:
{% if not SYNAPSE_NO_TLS %}
{% if not SYNAPSE_NO_TLS == '1' %}
-
port: 8448
bind_addresses: ['::']
Expand Down