729f5a4fb6
Review comments
2019-06-27 16:06:23 +01:00
555b6fa0d5
Docker image: Add a migrate_config mode ( #5567 )
...
... to help people escape env var hell
2019-06-27 13:52:40 +01:00
1ddc7b39c9
Docker image: open the non-TLS port by default. ( #5568 )
...
There's not much point in binding to localhost when it's in a docker container.
2019-06-27 13:50:10 +01:00
2f7ebc2a55
Deprecate the env var way of running the docker image ( #5566 )
...
This is mostly a documentation change, but also adds a default value for
SYNAPSE_CONFIG_PATH, so that running from the generated config is the default,
and will Just Work provided your config is in the right place.
2019-06-27 13:49:48 +01:00
856ea04eb3
Fix JWT login ( #5555 )
...
* Fix JWT login with register
Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>
* Add pyjwt conditional dependency
Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>
* Added changelog file
Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>
* Improved changelog description
Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>
2019-06-27 12:02:41 +01:00
b4db70e167
Merge pull request #5565 from matrix-org/rav/docker/fix_log_config
...
Docker: generate our own log config
2019-06-27 11:19:37 +01:00
b2d2617c0d
Reduce the amount of stuff we send in the docker context ( #5564 )
...
this makes docker builds a bit faster.
2019-06-27 11:18:51 +01:00
b1b8a24b63
Merge pull request #5563 from matrix-org/rav/docker/data_dir
...
Docker image: add support for SYNAPSE_DATA_DIR parameter
2019-06-27 11:17:44 +01:00
53faa6a429
Merge pull request #5562 from matrix-org/rav/docker/no-generate-keys
...
Docker: only run --generate-keys when generating config on-the-fly.
2019-06-27 11:17:21 +01:00
02aeb5a98a
Merge pull request #5561 from matrix-org/rav/docker/refactor
...
Refactor the docker/start.py script
2019-06-27 11:16:37 +01:00
42a3619ef4
Merge pull request #5570 from almereyda/patch-2
...
Update purge_api README
2019-06-27 00:58:17 +01:00
a11475f396
fix changelog
2019-06-27 00:57:59 +01:00
47fa836abb
Merge pull request #5313 from twrist/patch-1
...
Update HAProxy example rules
2019-06-27 00:53:48 +01:00
79b9d9076d
rename BaseSSORedirectServlet for consistency
2019-06-27 00:46:57 +01:00
dde4118341
update sample config
2019-06-27 00:41:04 +01:00
28db0ae537
cleanups
2019-06-27 00:37:41 +01:00
a0acfcc73e
update sample config
2019-06-26 23:56:28 +01:00
36f4953dec
Add support for tracking SAML2 sessions.
...
This allows us to correctly handle `allow_unsolicited: False`.
2019-06-26 23:50:55 +01:00
536820e572
Create 5570.misc
...
Signed-off-by: Jon Richter <jon@allmende.io>
2019-06-27 00:13:34 +02:00
db56383b24
Update purge_api README
...
This points the reverse links at the intended location.
2019-06-27 00:08:18 +02:00
3705322103
Move all the saml stuff out to a centralised handler
2019-06-26 22:52:02 +01:00
0ade403f55
Revert redundant changes to static js
2019-06-26 22:46:23 +01:00
a4daa899ec
Merge branch 'develop' into rav/saml2_client
2019-06-26 22:34:41 +01:00
82028d723b
Move changelog
2019-06-26 19:39:49 +01:00
8624db3194
Refactor and comment sync device list code
2019-06-26 19:39:49 +01:00
f335e77d53
Use batch_iter and correct docstring
2019-06-26 19:39:46 +01:00
806a06daf2
Rename get_users_whose_devices_changed
2019-06-26 19:39:19 +01:00
b051cefc75
Merge pull request #5552 from matrix-org/rav/github_templates
...
Update github templates
2019-06-26 16:15:41 +01:00
befa116b31
changelog
2019-06-26 15:52:00 +01:00
28e30c6581
Docker: generate our own log config
...
When running under docker, we want to use docker's own logging stuff rather
than losing the logs somewhere on the container's filesystem, so let's use log
configs that spit logs out to stdout instead.
2019-06-26 15:48:38 +01:00
6347dc1bed
Add support for SYNAPSE_CONFIG_DIR
2019-06-26 15:48:38 +01:00
a0f2921ccf
changelog
2019-06-26 15:41:10 +01:00
7e433beb65
Docker image: add support for SYNAPSE_DATA_DIR parameter
...
Fixes #4830 .
2019-06-26 15:38:08 +01:00
c58a6e6108
document supported env vars for docker 'generate' option
2019-06-26 15:38:08 +01:00
7c453472e4
changelog
2019-06-26 15:32:55 +01:00
a5fba9c27c
Docker: only run --generate-keys when generating config on-the-fly.
...
We don't want to generate any missing configs when running from a precanned
config.
(There's a strong argument that we don't want to do this at all, since
generating a new signing key on each invocation sounds disasterous, but I don't
fancy unpicking that for now.)
2019-06-26 15:31:19 +01:00
a1732bbff9
improve logging for generate_config_from_template
2019-06-26 15:31:19 +01:00
043ab6da13
changelog
2019-06-26 15:28:28 +01:00
2d91988799
Improve docs on choosing server_name ( #5558 )
...
Fixes #4901
2019-06-26 15:15:04 +01:00
508c3ce3d7
Newsfile
2019-06-26 12:03:49 +01:00
a2f6d31a63
Refactor get_user_ids_changed to pull less from DB
...
When a client asks for users whose devices have changed since a token we
used to pull *all* users from the database since the token, which could
easily be thousands of rows for old tokens.
This PR changes this to only check for changes for users the client is
actually interested in.
Fixes #5553
2019-06-26 12:03:44 +01:00
0e97284dfa
Remove & changelog ( #5548 )
2019-06-26 04:36:34 +10:00
3eb8c7b0eb
Merge branch 'master' into develop
...
* master:
Fix broken link in MSC1711 FAQ
Update changelog to better expain password reset change (#5545 )
2019-06-25 18:08:56 +01:00
52a4a90d05
Merge branch 'release-v1.0.0'
...
* release-v1.0.0:
Update changelog to better expain password reset change (#5545 )
2019-06-25 18:08:41 +01:00
5375c3a9b8
isort
2019-06-25 15:30:19 +01:00
3f24e4dce7
Add a main() function
2019-06-25 15:30:19 +01:00
b1fddb7f69
Factor out a run_generate_config function
2019-06-25 15:30:19 +01:00
a52e1a3b6c
Factor out "generate_config_from_template"
...
... and inline generate_secrets
2019-06-25 15:30:19 +01:00
ef8c62758c
Prevent multiple upgrades on the same room at once ( #5051 )
...
Closes #4583
Does slightly less than #5045 , which prevented a room from being upgraded multiple times, one after another. This PR still allows that, but just prevents two from happening at the same time.
Mostly just to mitigate the fact that servers are slow and it can take a moment for the room upgrade to actually complete. We don't want people sending another request to upgrade the room when really they just thought the first didn't go through.
2019-06-25 14:19:21 +01:00
c8cb186260
Fix broken link in MSC1711 FAQ
2019-06-25 12:27:56 +01:00
Erik Johnston