summary refs log tree commit diff
diff options
context:
space:
mode:
authorkaiyou <pierre@jaury.eu>2018-02-05 21:53:53 +0100
committerkaiyou <pierre@jaury.eu>2018-02-05 21:53:53 +0100
commitcd51931b62aef63dacf4d79cdfa5de56da4eeda6 (patch)
tree374a7781fd367145a3b36c45db4d6e78849d3ff7
parentAdd dynamic recaptcha configuration in the Docker image (diff)
downloadsynapse-cd51931b62aef63dacf4d79cdfa5de56da4eeda6.tar.xz
Add dynamic TURN configuration in the Docker image
Diffstat (limited to '')
-rw-r--r--contrib/docker/README.md7
-rw-r--r--contrib/docker/conf/homeserver.yaml9
2 files changed, 14 insertions, 2 deletions
diff --git a/contrib/docker/README.md b/contrib/docker/README.md
index f4bc78908d..0da7b56628 100644
--- a/contrib/docker/README.md
+++ b/contrib/docker/README.md
@@ -87,9 +87,12 @@ Synapse specific settings:
 * ``SYNAPSE_REPORT_STATS``, set this variable to `yes` to enable anonymous
   statistics reporting back to the Matrix project which helps us to get funding.
 * ``SYNAPSE_RECAPTCHA_PUBLIC_KEY``, set this variable to the recaptcha public
-  key in order to enable recaptcha upon registration
+  key in order to enable recaptcha upon registration.
 * ``SYNAPSE_RECAPTCHA_PRIVATE_KEY``, set this variable to the recaptcha private
-  key in order to enable recaptcha upon registration
+  key in order to enable recaptcha upon registration.
+* ``SYNAPSE_TURN_URIS``, set this variable to the coma-separated list of TURN
+  uris to enable TURN for this homeserver.
+* ``SYNAPSE_TURN_SECRET``, set this to the TURN shared secret if required.
 
 Shared secrets, these will be initialized to random values if not set:
 
diff --git a/contrib/docker/conf/homeserver.yaml b/contrib/docker/conf/homeserver.yaml
index 6f1de24aad..6f8fb24e5f 100644
--- a/contrib/docker/conf/homeserver.yaml
+++ b/contrib/docker/conf/homeserver.yaml
@@ -126,10 +126,19 @@ recaptcha_siteverify_api: "https://www.google.com/recaptcha/api/siteverify"
 
 ## Turn ##
 
+{% if SYNAPSE_TURN_URIS %}
+turn_uris:
+{% for uri in SYNAPSE_TURN_URIS.split(',') %}  - {{ uri }}
+{% endfor %}
+turn_shared_secret: "{{ SYNAPSE_TURN_SECRET }}"
+turn_user_lifetime: "1h"
+turn_allow_guests: True
+{% else %}
 turn_uris: []
 turn_shared_secret: "YOUR_SHARED_SECRET"
 turn_user_lifetime: "1h"
 turn_allow_guests: True
+{% endif %}
 
 ## Registration ##