summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorMarvin Steadfast <marvin@xsteadfastx.org>2017-01-19 14:08:20 +0100
committerMarvin Steadfast <marvin@xsteadfastx.org>2017-01-19 14:08:20 +0100
commit1e38be3a7aaea1b6570b27e271855ee380a9129b (patch)
tree44794213a43551f9d389fb4aef9befd04d4932ab /synapse/config
parentMerge pull request #1828 from matrix-org/erikj/iterable_cache_size (diff)
downloadsynapse-1e38be3a7aaea1b6570b27e271855ee380a9129b.tar.xz
Added username and password for turn server
It makes it possible to use a turn server that needs a username and
password instead of a token.
Diffstat (limited to '')
-rw-r--r--synapse/config/voip.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/config/voip.py b/synapse/config/voip.py
index 169980f60d..ef9d61adfc 100644
--- a/synapse/config/voip.py
+++ b/synapse/config/voip.py
@@ -19,7 +19,9 @@ class VoipConfig(Config):
 
     def read_config(self, config):
         self.turn_uris = config.get("turn_uris", [])
-        self.turn_shared_secret = config["turn_shared_secret"]
+        self.turn_shared_secret = config.get("turn_shared_secret")
+        self.turn_username = config.get("turn_username")
+        self.turn_password = config.get("turn_password")
         self.turn_user_lifetime = self.parse_duration(config["turn_user_lifetime"])
 
     def default_config(self, **kwargs):