summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dbkr@matrix.org>2014-09-25 19:18:32 +0200
committerDavid Baker <dbkr@matrix.org>2014-09-25 19:18:32 +0200
commitec5fb77a66131382a179c349cf239859be7d8f4e (patch)
tree8693ec59f906c076abb534f01c32573619bf7c8c
parentMore change log lines (diff)
downloadsynapse-ec5fb77a66131382a179c349cf239859be7d8f4e.tar.xz
Just use a yaml list for turn servers
-rw-r--r--docs/turn-howto.rst4
-rw-r--r--synapse/config/voip.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/turn-howto.rst b/docs/turn-howto.rst
index 2cb0c4170d..82b59538c8 100644
--- a/docs/turn-howto.rst
+++ b/docs/turn-howto.rst
@@ -62,8 +62,8 @@ synapse Setup
 
 Your home server configuration file needs the following extra keys:
 
- 1. "turn_uris": This needs to be a comma-separated
-    list of public-facing URIs for your TURN server to be given out 
+ 1. "turn_uris": This needs to be a yaml list
+    of public-facing URIs for your TURN server to be given out 
     to your clients. Add separate entries for each transport your
     TURN server supports.
 
diff --git a/synapse/config/voip.py b/synapse/config/voip.py
index c5131d9bcd..3a51664f46 100644
--- a/synapse/config/voip.py
+++ b/synapse/config/voip.py
@@ -19,7 +19,7 @@ class VoipConfig(Config):
 
     def __init__(self, args):
         super(VoipConfig, self).__init__(args)
-        self.turn_uris = args.turn_uris.split(",") if args.turn_uris else None
+        self.turn_uris = args.turn_uris
         self.turn_shared_secret = args.turn_shared_secret
         self.turn_user_lifetime = args.turn_user_lifetime