diff options
| author | Erik Johnston <erik@matrix.org> | 2015-09-25 11:38:28 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-09-25 11:38:28 +0100 |
| commit | a14665bde7730872627e956860be0d727a53e26d (patch) | |
| tree | eeb44967874a737bd2492b6591966a389de1aeda /synapse/config/tls.py | |
| parent | Bundle in some room state in the unsigned bit of the invite when sending to i... (diff) | |
| parent | Merge pull request #289 from matrix-org/markjh/fix_sql (diff) | |
| download | synapse-a14665bde7730872627e956860be0d727a53e26d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/invite_state
Diffstat (limited to 'synapse/config/tls.py')
| -rw-r--r-- | synapse/config/tls.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/synapse/config/tls.py b/synapse/config/tls.py index 4751d39bc9..0ac2698293 100644 --- a/synapse/config/tls.py +++ b/synapse/config/tls.py @@ -42,7 +42,15 @@ class TlsConfig(Config): config.get("tls_dh_params_path"), "tls_dh_params" ) - def default_config(self, config_dir_path, server_name): + # This config option applies to non-federation HTTP clients + # (e.g. for talking to recaptcha, identity servers, and such) + # It should never be used in production, and is intended for + # use only when running tests. + self.use_insecure_ssl_client_just_for_testing_do_not_use = config.get( + "use_insecure_ssl_client_just_for_testing_do_not_use" + ) + + def default_config(self, config_dir_path, server_name, **kwargs): base_key_name = os.path.join(config_dir_path, server_name) tls_certificate_path = base_key_name + ".tls.crt" |