diff options
| author | David Baker <dave@matrix.org> | 2018-07-11 15:45:44 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2018-07-11 15:49:29 +0100 |
| commit | 36f4fd3e1edfa6032a5ace89e38ec7268e06dee6 (patch) | |
| tree | 518eb3d1c79ecf90e2d75b81a32b5cfcbd5bbcff | |
| parent | Merge pull request #3498 from OlegGirko/fix_attrs_syntax (diff) | |
| download | synapse-36f4fd3e1edfa6032a5ace89e38ec7268e06dee6.tar.xz | |
Comment dummy TURN parameters in default config
This default config is parsed and used a base before the actual config is overlaid, so with these values not commented out, the code to detect when no turn params were set and refuse to generate credentials was never firing because the dummy default was always set.
| -rw-r--r-- | changelog.d/3511.bugfix | 1 | ||||
| -rw-r--r-- | synapse/config/voip.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/3511.bugfix b/changelog.d/3511.bugfix new file mode 100644 index 0000000000..460fe24ac9 --- /dev/null +++ b/changelog.d/3511.bugfix @@ -0,0 +1 @@ +Don't generate TURN credentials if no TURN config options are set 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 |