summary refs log tree commit diff
path: root/contrib
diff options
context:
space:
mode:
authorMichael Kaye <1917473+michaelkaye@users.noreply.github.com>2018-05-16 10:01:03 +0100
committerNeil Johnson <neil@matrix.org>2018-05-17 18:12:00 +0100
commit82b0361f02b2860da572356c317de9690e88a146 (patch)
tree8bd8a36661ed9dbd7ad9609ee5d36a9ef1877718 /contrib
parentReference synapse docker image and docker-compose (diff)
downloadsynapse-82b0361f02b2860da572356c317de9690e88a146.tar.xz
Document macaroon env var correctly
Diffstat (limited to '')
-rw-r--r--contrib/docker/README.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/docker/README.md b/contrib/docker/README.md
index aed56646c2..dee5e92cab 100644
--- a/contrib/docker/README.md
+++ b/contrib/docker/README.md
@@ -111,8 +111,6 @@ variables are available for configuration:
 * ``SYNAPSE_SERVER_NAME`` (mandatory), the current server public hostname.
 * ``SYNAPSE_REPORT_STATS``, (mandatory, ``yes`` or ``no``), enable anonymous
   statistics reporting back to the Matrix project which helps us to get funding.
-* ``SYNAPSE_MACAROON_SECRET_KEY`` (mandatory) secret for signing access tokens
-  to the server, set this to a proper random key.
 * ``SYNAPSE_NO_TLS``, set this variable to disable TLS in Synapse (use this if
   you run your own TLS-capable reverse proxy).
 * ``SYNAPSE_ENABLE_REGISTRATION``, set this variable to enable registration on
@@ -132,6 +130,8 @@ Shared secrets, that will be initialized to random values if not set:
 
 * ``SYNAPSE_REGISTRATION_SHARED_SECRET``, secret for registrering users if
   registration is disable.
+* ``SYNAPSE_MACAROON_SECRET_KEY`` secret for signing access tokens
+  to the server.
 
 Database specific values (will use SQLite if not set):