diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-09-07 14:20:54 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-09-07 14:20:54 +0100 |
| commit | b8ad756bd0d7c42c7c241fa08f5e078561fddded (patch) | |
| tree | 212d86a440076fc2eab7523153a5e34058f7084b | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-b8ad756bd0d7c42c7c241fa08f5e078561fddded.tar.xz | |
Fix jwt import check
This handy code attempted to check that we could import jwt, but utterly failed to check it was the right jwt. Fixes https://github.com/matrix-org/synapse/issues/3793
| -rw-r--r-- | synapse/config/homeserver.py | 2 | ||||
| -rw-r--r-- | synapse/config/jwt_config.py (renamed from synapse/config/jwt.py) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py index 2fd9c48abf..b8d5690f2b 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -21,7 +21,7 @@ from .consent_config import ConsentConfig from .database import DatabaseConfig from .emailconfig import EmailConfig from .groups import GroupsConfig -from .jwt import JWTConfig +from .jwt_config import JWTConfig from .key import KeyConfig from .logger import LoggingConfig from .metrics import MetricsConfig diff --git a/synapse/config/jwt.py b/synapse/config/jwt_config.py index 51e7f7e003..51e7f7e003 100644 --- a/synapse/config/jwt.py +++ b/synapse/config/jwt_config.py |