diff options
| author | David Baker <dbkr@users.noreply.github.com> | 2018-07-18 11:56:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-18 11:56:18 +0100 |
| commit | c91a44572e06345573a6fed409a479f72e59dede (patch) | |
| tree | a5e7ac49d88830869b535d18bbf916787c3255b9 | |
| parent | Merge pull request #3546 from matrix-org/rav/fix_erasure_over_federation (diff) | |
| parent | I failed to correctly guess the PR number (diff) | |
| download | synapse-c91a44572e06345573a6fed409a479f72e59dede.tar.xz | |
Merge pull request #3514 from matrix-org/dbkr/turn_dont_add_defaults
Comment dummy TURN parameters in default config
| -rw-r--r-- | changelog.d/3514.bugfix | 1 | ||||
| -rw-r--r-- | synapse/config/voip.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/3514.bugfix b/changelog.d/3514.bugfix new file mode 100644 index 0000000000..460fe24ac9 --- /dev/null +++ b/changelog.d/3514.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 |