summary refs log tree commit diff
path: root/synapse/config/voip.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-07-19 10:26:13 +0100
committerErik Johnston <erik@matrix.org>2018-07-19 10:26:13 +0100
commit742f75733701e345b9e717ac16537b82a00aa452 (patch)
treec785759d5ea7176def6fe2b52832a1ad7a89561b /synapse/config/voip.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentMerge pull request #3554 from matrix-org/erikj/response_metrics_code (diff)
downloadsynapse-742f75733701e345b9e717ac16537b82a00aa452.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/config/voip.py')
-rw-r--r--synapse/config/voip.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/config/voip.py b/synapse/config/voip.py

index 3a4e16fa96..d07bd24ffd 100644 --- a/synapse/config/voip.py +++ b/synapse/config/voip.py
@@ -30,10 +30,10 @@ class VoipConfig(Config): ## Turn ## # The public URIs of the TURN server to give to clients - turn_uris: [] + #turn_uris: [] # The shared secret used to compute passwords for the TURN server - turn_shared_secret: "YOUR_SHARED_SECRET" + #turn_shared_secret: "YOUR_SHARED_SECRET" # The Username and password if the TURN server needs them and # does not use a token