diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-03-19 10:06:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-19 10:06:40 +0000 |
| commit | fd463b4f5db3fb164505bc2b2300c6a5f73c73e4 (patch) | |
| tree | 5191eb24d335448e701abd326956c55dfc9d4fa1 /synapse/config/voip.py | |
| parent | Migrate the user directory initial population to a background task (#4864) (diff) | |
| download | synapse-fd463b4f5db3fb164505bc2b2300c6a5f73c73e4.tar.xz | |
Comment out most options in the generated config. (#4863)
Make it so that most options in the config are optional, and commented out in the generated config. The reasons this is a good thing are as follows: * If we decide that we should change the default for an option, we can do so, and only those admins that have deliberately chosen to override that option will be stuck on the old setting. * It moves us towards a point where we can get rid of the super-surprising feature of synapse where the default settings for the config come from the generated yaml. * It makes setting up a test config for unit testing an order of magnitude easier (see forthcoming PR). * It makes the generated config more consistent, and hopefully easier for users to understand.
Diffstat (limited to 'synapse/config/voip.py')
| -rw-r--r-- | synapse/config/voip.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/synapse/config/voip.py b/synapse/config/voip.py index 257f7c86e7..2a1f005a37 100644 --- a/synapse/config/voip.py +++ b/synapse/config/voip.py @@ -22,7 +22,9 @@ class VoipConfig(Config): 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"]) + self.turn_user_lifetime = self.parse_duration( + config.get("turn_user_lifetime", "1h"), + ) self.turn_allow_guests = config.get("turn_allow_guests", True) def default_config(self, **kwargs): @@ -45,7 +47,7 @@ class VoipConfig(Config): # How long generated TURN credentials last # - turn_user_lifetime: "1h" + #turn_user_lifetime: 1h # Whether guests should be allowed to use the TURN server. # This defaults to True, otherwise VoIP will be unreliable for guests. @@ -53,5 +55,5 @@ class VoipConfig(Config): # connect to arbitrary endpoints without having first signed up for a # valid account (e.g. by passing a CAPTCHA). # - turn_allow_guests: True + #turn_allow_guests: True """ |